hiddifypanel 10.80.12.dev1__py3-none-any.whl → 10.85.0b1__py3-none-any.whl

hiddifypanel/models/domain.py

@@ -3,10 +3,10 @@ import ipaddress
 import re
 from typing import Dict, List
 from flask import request
-from flask_babel import lazy_gettext as _
+
 from sqlalchemy.orm import backref
 from strenum import StrEnum
-from sqlalchemy_serializer import SerializerMixin
+
 
 
 from hiddifypanel.database import db
@@ -37,7 +37,7 @@ ShowDomain = db.Table('show_domain',
                       )
 
 
-class Domain(db.Model, SerializerMixin):
+class Domain(db.Model):
     id = db.Column(db.Integer, primary_key=True, autoincrement=True)
     child_id = db.Column(db.Integer, db.ForeignKey('child.id'), default=0)
     domain = db.Column(db.String(200), nullable=True, unique=False)
@@ -161,9 +161,9 @@ class Domain(db.Model, SerializerMixin):
     def get_domains(cls, always_add_ip=False, always_add_all_domains=False) -> List['Domain']:
         from hiddifypanel import hutils
         domains = []
-        domains = Domain.query.filter(Domain.mode == DomainType.sub_link_only, Domain.child_id == Child.current().id).all()
+        domains = db.session.query(Domain).filter(Domain.mode == DomainType.sub_link_only, Domain.child_id == Child.current().id).all()
         if not len(domains) or always_add_all_domains:
-            domains = Domain.query.filter(Domain.mode.notin_([DomainType.fake, DomainType.reality])).all()
+            domains = db.session.query(Domain).filter(Domain.mode.notin_([DomainType.fake, DomainType.reality])).all()
 
         if len(domains) == 0 and request:
             domains = [Domain(domain=request.host)]  # type: ignore

hiddifypanel/models/proxy.py

@@ -4,7 +4,7 @@ from enum import auto
 from sqlalchemy import Column, String, Integer, Boolean, Enum, ForeignKey
 
 from hiddifypanel.database import db
-from sqlalchemy_serializer import SerializerMixin
+
 
 
 class ProxyTransport(StrEnum):
@@ -59,7 +59,7 @@ class ProxyL3(StrEnum):
     custom = auto()
 
 
-class Proxy(db.Model, SerializerMixin):  # type: ignore
+class Proxy(db.Model):  # type: ignore
     id = Column(Integer, primary_key=True, autoincrement=True)
     child_id = Column(Integer, ForeignKey('child.id'), default=0)
     name = Column(String(200), nullable=False, unique=False)
@@ -96,6 +96,8 @@ class Proxy(db.Model, SerializerMixin):  # type: ignore
         dbproxy.enable = proxy['enable']
         dbproxy.name = proxy['name']
         dbproxy.proto = proxy['proto']
+        if proxy['transport']=="splithttp":
+            proxy['transport']="xhttp"
         dbproxy.transport = proxy['transport']
         dbproxy.cdn = proxy['cdn']
         dbproxy.l3 = proxy['l3']

hiddifypanel/models/report.py

@@ -2,10 +2,10 @@ import datetime
 
 
 from hiddifypanel.database import db
-from sqlalchemy_serializer import SerializerMixin
 
 
-class Report(db.Model, SerializerMixin):
+
+class Report(db.Model):
     id = db.Column(db.Integer, primary_key=True, autoincrement=True)
     user_id = db.Column(db.Integer, db.ForeignKey('user.id'), default=0, nullable=False)
     asn_id = db.Column(db.String(200), nullable=False, unique=False)
@@ -19,7 +19,7 @@ class Report(db.Model, SerializerMixin):
     details = db.relationship('ReportDetail', cascade="all,delete", backref='report', lazy='dynamic',)
 
 
-class ReportDetail(db.Model, SerializerMixin):
+class ReportDetail(db.Model):
     report_id = db.Column(db.Integer, db.ForeignKey('report.id'), primary_key=True, )
     proxy_id = db.Column(db.Integer, db.ForeignKey('proxy.id'), primary_key=True, )
     ping = db.Column(db.Integer, default=-1)

hiddifypanel/models/usage.py

@@ -6,10 +6,10 @@ from sqlalchemy import func
 
 
 from hiddifypanel.database import db
-from sqlalchemy_serializer import SerializerMixin
 
 
-class DailyUsage(db.Model, SerializerMixin):
+
+class DailyUsage(db.Model):
     id = db.Column(db.Integer, primary_key=True, autoincrement=True)
     date = db.Column(db.Date, default=datetime.date.today(), index=True)
     usage = db.Column(db.BigInteger, default=0, nullable=False)

hiddifypanel/models/user.py

@@ -11,7 +11,7 @@ from hiddifypanel.database import db
 from hiddifypanel.models import Lang
 from hiddifypanel.models.base_account import BaseAccount
 from hiddifypanel.models.admin import AdminUser
-from sqlalchemy_serializer import SerializerMixin
+
 
 ONE_GIG = 1024 * 1024 * 1024
 
@@ -37,7 +37,7 @@ package_mode_dic = {
 }
 
 
-class UserDetail(db.Model, SerializerMixin):
+class UserDetail(db.Model):
     id = db.Column(db.Integer, primary_key=True, autoincrement=True)
     user_id = db.Column(db.Integer, db.ForeignKey('user.id'), default=0, nullable=False)
     child_id = db.Column(db.Integer, db.ForeignKey('child.id'), default=0, nullable=False)
@@ -59,7 +59,7 @@ class UserDetail(db.Model, SerializerMixin):
         # return [] if not self.connected_devices else self.connected_devices.split(",")
 
 
-class User(BaseAccount, SerializerMixin):
+class User(BaseAccount):
     """
     This is a model class for a user in a database that includes columns for their ID, UUID, name, online status,
     account expiration date, usage limit, package days, mode, start date, current usage, last reset time, and comment.

hiddifypanel/panel/admin/templates/index.html

@@ -126,9 +126,9 @@
     {{info_box("ram","fa-solid fa-memory", _("RAM"),
     (stats['system']['ram_used']|round(3)) ~ " / " ~ (stats['system']['ram_total']|round(3)) ~ "GB (" ~((stats['system']['ram_used']*100/stats['system']['ram_total'])|int)~" %)",
     stats['system']['ram_used']*100/stats['system']['ram_total'],
-    ('<i class="fa-solid fa-gauge"></i> '|safe) ~ stats['top5']['memory'][0][0] ~ " &rlm;"|safe ~ ((stats['top5']['memory'][0][1]*100/stats['system']['ram_total'])|int) ~ "% &rlm;"|safe~
-    ('<i class="fa-solid fa-gauge"></i> '|safe) ~ stats['top5']['memory'][1][0] ~ " &rlm;"|safe ~ ((stats['top5']['memory'][1][1]*100/stats['system']['ram_total'])|int) ~ "% &rlm;"|safe~
-    ('<i class="fa-solid fa-gauge"></i> '|safe) ~ stats['top5']['memory'][2][0] ~ " &rlm;"|safe ~ ((stats['top5']['memory'][2][1]*100/stats['system']['ram_total'])|int) ~ "% ",
+    ('<i class="fa-solid fa-gauge"></i> '|safe) ~ stats['top5']['ram'][0][0] ~ " &rlm;"|safe ~ ((stats['top5']['ram'][0][1]*100/stats['system']['ram_total'])|int) ~ "% &rlm;"|safe~
+    ('<i class="fa-solid fa-gauge"></i> '|safe) ~ stats['top5']['ram'][1][0] ~ " &rlm;"|safe ~ ((stats['top5']['ram'][1][1]*100/stats['system']['ram_total'])|int) ~ "% &rlm;"|safe~
+    ('<i class="fa-solid fa-gauge"></i> '|safe) ~ stats['top5']['ram'][2][0] ~ " &rlm;"|safe ~ ((stats['top5']['ram'][2][1]*100/stats['system']['ram_total'])|int) ~ "% ",
     coloring=True,
     color_class="bg-h-pink"
     )}}
@@ -253,9 +253,9 @@
         info_box("ram", "fa-solid fa-memory", "RAM",
             stats['system']['ram_used'].toFixed(1) + " / " + stats['system']['ram_total'].toFixed(1) + "GB (" + (stats['system']['ram_used'] * 100 / stats['system']['ram_total']).toFixed(0) + " %)",
             stats['system']['ram_used'] * 100 / stats['system']['ram_total'].toFixed(0),
-            "<i class='fa-solid fa-gauge'></i> " + stats['top5']['memory'][0][0] + " &rlm;" + (stats['top5']['memory'][0][1] * 100 / stats['system']['ram_total']).toFixed(0) + "% &rlm; " +
-            " <i class='fa-solid fa-gauge'></i> " + stats['top5']['memory'][1][0] + " &rlm;" + (stats['top5']['memory'][1][1] * 100 / stats['system']['ram_total']).toFixed(0) + "% &rlm; " +
-            " <i class='fa-solid fa-gauge'></i> " + stats['top5']['memory'][2][0] + " &rlm;" + (stats['top5']['memory'][2][1] * 100 / stats['system']['ram_total']).toFixed(0) + "% ",
+            "<i class='fa-solid fa-gauge'></i> " + stats['top5']['ram'][0][0] + " &rlm;" + (stats['top5']['ram'][0][1] * 100 / stats['system']['ram_total']).toFixed(0) + "% &rlm; " +
+            " <i class='fa-solid fa-gauge'></i> " + stats['top5']['ram'][1][0] + " &rlm;" + (stats['top5']['ram'][1][1] * 100 / stats['system']['ram_total']).toFixed(0) + "% &rlm; " +
+            " <i class='fa-solid fa-gauge'></i> " + stats['top5']['ram'][2][0] + " &rlm;" + (stats['top5']['ram'][2][1] * 100 / stats['system']['ram_total']).toFixed(0) + "% ",
             true
         );
 

hiddifypanel/panel/cli.py

@@ -47,7 +47,7 @@ def backup_task():
         if not bot.username:
             register_bot(True)
         
-        for admin in AdminUser.query.filter(AdminUser.mode == AdminMode.super_admin, AdminUser.telegram_id is not None,AdminUser.telegram_id!=0).all():
+        for admin in db.session.query(AdminUser).filter(AdminUser.mode == AdminMode.super_admin, AdminUser.telegram_id is not None,AdminUser.telegram_id!=0).all():
             caption = ("Backup \n" + admin_links())
             with open(dst, 'rb') as document:
                     try:

hiddifypanel/panel/commercial/restapi/v1/tgbot.py

@@ -63,9 +63,8 @@ def register_bot(set_hook=False, remove_hook=False):
             if set_hook:
                 bot.set_webhook(url=f"https://{domain}/{admin_proxy_path}/{user_secret}/api/v1/tgbot/")
     except Exception as e:
-        print(e)
-        import traceback
-        traceback.print_stack()
+        logger.error(e)
+        
 
 
 def init_app(app):

hiddifypanel/panel/commercial/restapi/v2/user/apps_api.py

@@ -111,15 +111,17 @@ class AppAPI(MethodView):
                 singbox_dto = self.__get_singbox_app_dto()
                 # hiddifyng_dto = self.__get_hiddifyng_app_dto()
                 v2rayng_dto = self.__get_v2rayng_app_dto()
+                cmfa_dto = self.__get_cmfa_app_dto()
                 # hiddify_clash_android_dto = self.__get_hiddify_clash_android_app_dto()
                 nekobox_dto = self.__get_nekobox_app_dto()
-                apps_data += ([hiddify_next_dto, singbox_dto, v2rayng_dto, nekobox_dto])
+                apps_data += ([hiddify_next_dto, singbox_dto, v2rayng_dto, cmfa_dto, nekobox_dto])
             case Platform.windows:
                 hiddify_next_dto = self.__get_hiddify_next_app_dto()
+                clash_verge_rev_dto = self.__get_clash_verge_rev_app_dto()
                 # hiddify_clash_dto = self.__get_hiddify_clash_desktop_app_dto()
                 # hiddifyn_dto = self.__get_hiddifyn_app_dto()
                 v2rayn_dto = self.__get_v2rayn_app_dto()
-                apps_data += ([hiddify_next_dto, v2rayn_dto])
+                apps_data += ([hiddify_next_dto, v2rayn_dto, clash_verge_rev_dto ])
             case Platform.ios:
                 hiddify_next_dto = self.__get_hiddify_next_app_dto()
                 singbox_dto = self.__get_singbox_app_dto()
@@ -131,13 +133,15 @@ class AppAPI(MethodView):
                 apps_data += ([hiddify_next_dto, singbox_dto, streisand_dto, stash_dto, shadowrocket_dto, foxray_dto, loon_dto])
             case Platform.linux:
                 hiddify_next_dto = self.__get_hiddify_next_app_dto()
+                clash_verge_rev_dto = self.__get_clash_verge_rev_app_dto()
                 # hiddify_clash_dto = self.__get_hiddify_clash_desktop_app_dto()
-                apps_data += ([hiddify_next_dto])
+                apps_data += ([hiddify_next_dto, clash_verge_rev_dto ])
             case Platform.mac:
                 hiddify_next_dto = self.__get_hiddify_next_app_dto()
                 singbox_dto = self.__get_singbox_app_dto()
+                clash_verge_rev_dto = self.__get_clash_verge_rev_app_dto()
                 # hiddify_clash_dto = self.__get_hiddify_clash_desktop_app_dto()
-                apps_data += ([hiddify_next_dto, singbox_dto])
+                apps_data += ([hiddify_next_dto, singbox_dto, clash_verge_rev_dto ])
 
         return apps_data
 
@@ -168,11 +172,13 @@ class AppAPI(MethodView):
         stash_app_dto = self.__get_stash_app_dto()
         # hiddify_clash_app_dto = self.__get_hiddify_clash_desktop_app_dto()
         singbox_app_dto = self.__get_singbox_app_dto()
+        cmfa_app_dto = self.__get_cmfa_app_dto()
+        clash_verge_rev_app_dto = self.__get_clash_verge_rev_app_dto()
         hiddify_next_app_dto = self.__get_hiddify_next_app_dto()
         return [
             v2rayn_app_dto, v2rayng_app_dto, 
             foxray_app_dto, shadowrocket_app_dto, streisand_app_dto,
-            loon_app_dto, stash_app_dto,  singbox_app_dto, hiddify_next_app_dto
+            loon_app_dto, stash_app_dto,  singbox_app_dto, cmfa_app_dto, clash_verge_rev_app_dto, hiddify_next_app_dto
         ]
 
     def __get_app_icon_url(self, app_name):
@@ -182,6 +188,10 @@ class AppAPI(MethodView):
             url = base + static_url_for(filename='apps-icon/hiddify_next.ico')
         elif app_name == _('app.singbox.title'):
             url = base + static_url_for(filename='apps-icon/singbox.ico')
+        elif app_name == _('app.cmfa.title'):
+            url = base + static_url_for(filename='apps-icon/cmfa.ico')
+        elif app_name == _('app.clash_verge_rev.title'):
+            url = base + static_url_for(filename='apps-icon/clash_verge_rev.ico')
         elif app_name == _('app.hiddifyn.title'):
             url = base + static_url_for(filename='apps-icon/hiddifyn.ico')
         elif app_name == _('app.v2rayng.title'):
@@ -356,7 +366,7 @@ class AppAPI(MethodView):
         dto.description = _('app.singbox.description')
         dto.icon_url = self.__get_app_icon_url(_('app.singbox.title'))
         dto.guide_url = ''
-        dto.deeplink = f'sing-box://import-remote-profile/?url={self.user_panel_url}'
+        dto.deeplink = f'sing-box://import-remote-profile/?url={self.user_panel_url}#{self.profile_title}'
 
         # availabe installatoin types
         installation_types = []
@@ -409,6 +419,66 @@ class AppAPI(MethodView):
         dto.install = install_dtos
         return dto
 
+    def __get_clash_verge_rev_app_dto(self):
+        dto = AppSchema()
+        dto.title = _('app.clash_verge_rev.title')
+        dto.description = _('app.clash_verge_rev.description')
+        dto.icon_url = self.__get_app_icon_url(_('app.clash_verge_rev.title'))
+        dto.guide_url = ''
+        dto.deeplink = f'clash://install-config/?url={self.user_panel_encoded_url}&name={self.profile_title}'
+
+        # availabe installatoin types
+        installation_types = []
+        if self.platform == Platform.all:
+            installation_types = [AppInstallType.setup, AppInstallType.appimage, AppInstallType.dmg]
+        else:
+            match self.platform:
+                case Platform.windows:
+                    installation_types = [AppInstallType.setup]
+                case Platform.linux:
+                    installation_types = [AppInstallType.appimage]
+                case Platform.mac:
+                    installation_types = [AppInstallType.dmg]
+
+        install_dtos = []
+        for install_type in installation_types:
+            install_dto = AppInstall()
+            ins_url = ''
+            match install_type:
+                case AppInstallType.appimage:
+                    ins_url = 'https://www.clashverge.dev/install.html#__tabbed_1_2'
+                case AppInstallType.setup:
+                    ins_url = 'https://www.clashverge.dev/install.html#__tabbed_1_1'
+                case AppInstallType.dmg:
+                    ins_url = 'https://www.clashverge.dev/install.html#__tabbed_1_3'
+
+            install_dto = self.__get_app_install_dto(install_type, ins_url)
+            install_dtos.append(install_dto)
+
+        dto.install = install_dtos
+        return dto
+
+    def __get_cmfa_app_dto(self):
+        dto = AppSchema()
+        dto.title = _('app.cmfa.title')
+        dto.description = _('app.cmfa.description')
+        dto.icon_url = self.__get_app_icon_url(_('app.cmfa.title'))
+        dto.guide_url = ''
+        dto.deeplink = f'clash://install-config/?url={self.user_panel_encoded_url}&name={self.profile_title}'
+
+        latest_url, version = get_latest_release_url(f'https://github.com/MetaCubeX/ClashMetaForAndroid')
+        ins_url = latest_url.split('releases/')[0] + f'releases/download/{version}/cmfa-{version}-meta-universal-release.apk'
+        def remove_v_from_filename(url):
+            parts = url.split('/')
+            filename = parts[-1]
+            new_filename = filename.replace('cmfa-v', 'cmfa-')
+            parts[-1] = new_filename
+            new_url = '/'.join(parts)
+            return new_url
+        ins_url = remove_v_from_filename(ins_url)
+        dto.install = [self.__get_app_install_dto(AppInstallType.apk, ins_url)]
+        return dto
+
     def __get_hiddify_next_app_dto(self):
         dto = AppSchema()
         dto.title = _('app.hiddify.next.title')

hiddifypanel/panel/common.py

@@ -40,7 +40,11 @@ def init_app(app: APIFlask):
 
     @app.errorhandler(Exception)
     def internal_server_error(e):
-        logger.exception(e)
+        if hasattr(e, 'code') and e.code == 404:
+            logger.error(f'{e} {request.url}')
+        else:
+            logger.exception(e)
+        
         if isinstance(e, Exception):
             if hutils.flask.is_api_call(request.path):
                 return jsonify({

hiddifypanel/panel/common_bp/login.py

@@ -133,8 +133,9 @@ class LoginView(FlaskView):
     @ route('/<secret_uuid>/manifest.webmanifest')
     def create_pwa_manifest(self):
         domain = request.host
-        account=AdminUser.by_uuid(g.uuid)
-        name = (domain if hutils.flask.is_admin_panel_call() else account.name)
+        admin_call=hutils.flask.is_admin_panel_call()
+        account=AdminUser.by_uuid(g.uuid) if admin_call else User.by_uuid(g.uuid)
+        name = (domain if admin_call  else account.name)
         return jsonify({
             "name": f"Hiddify {name}",
             "short_name": f"{name}"[:12],

hiddifypanel/panel/hiddify.py

@@ -6,7 +6,7 @@ from typing import Tuple
 from flask import current_app, g
 from flask_babel import lazy_gettext as _
 from datetime import timedelta
-
+import os
 from hiddifypanel.cache import cache
 from hiddifypanel.models import *
 from hiddifypanel.database import db
@@ -41,7 +41,7 @@ def add_short_link_imp(link: str, period_min: int = 5) -> Tuple[str, datetime]:
 
     pattern = r"([^/]+)\("
 
-    with open(current_app.config['HIDDIFY_CONFIG_PATH'] + "/nginx/parts/short-link.conf", 'r') as f:
+    with open(os.environ['HIDDIFY_CONFIG_PATH'] + "/nginx/parts/short-link.conf", 'r') as f:
         for line in f:
             if link in line:
                 return re.search(pattern, line).group(1), datetime.now() + timedelta(minutes=period_min)
@@ -146,14 +146,14 @@ def get_child(unique_id):
 
 
 def dump_db_to_dict():
-    return {"childs": [u.to_dict() for u in Child.query.all()],
-            "users": [u.to_dict() for u in User.query.all()],
-            "domains": [u.to_dict() for u in Domain.query.all()],
-            "proxies": [u.to_dict() for u in Proxy.query.all()],
+    return {"childs": [u.to_dict() for u in db.session.query(Child).all()],
+            "users": [u.to_dict() for u in db.session.query(User).all()],
+            "domains": [u.to_dict() for u in db.session.query(Domain).all()],
+            "proxies": [u.to_dict() for u in db.session.query(Proxy).all()],
             # "parent_domains": [] if not hconfig(ConfigEnum.license) else [u.to_dict() for u in ParentDomain.query.all()],
-            'admin_users': [d.to_dict() for d in AdminUser.query.all()],
-            "hconfigs": [*[u.to_dict() for u in BoolConfig.query.all()],
-                         *[u.to_dict() for u in StrConfig.query.all()]]
+            'admin_users': [d.to_dict() for d in db.session.query(AdminUser).all()],
+            "hconfigs": [*[u.to_dict() for u in db.session.query(BoolConfig).all()],
+                         *[u.to_dict() for u in db.session.query(StrConfig).all()]]
             }
 
 

hiddifypanel/panel/hlogger.py

@@ -5,6 +5,8 @@ def logger_dynamic_formatter(record) -> str:
     fmt = '<green>{time:YYYY-MM-DD HH:mm:ss}</green> | <level>{level: <8}</level> | <cyan>{name}</cyan>:<cyan>{function}</cyan>:<cyan>{line}</cyan> - <level>{message}</level>'
     if record['extra']:
         fmt += ' | <level>{extra}</level>'
+    if record["exception"]:
+        fmt += "{exception}\n"
     return fmt + '\n'
 
 def init_app(app):
@@ -19,7 +21,7 @@ def init_logger(app, cli):
     
     logger.remove()
     logger.add(sys.stderr if cli else sys.stdout, format=logger_dynamic_formatter, level=app.config['STDOUT_LOG_LEVEL'],
-               colorize=True, catch=True, enqueue=True, diagnose=False, backtrace=True)
+               colorize=True, catch=True, enqueue=True, diagnose=True, backtrace=True)
     logger.trace('Logger initiated :)')
 
     with app.app_context():