hiddifypanel 10.80.0__tar.gz → 10.80.0.dev1__tar.gz

{hiddifypanel-10.80.0 → hiddifypanel-10.80.0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hiddifypanel
-Version: 10.80.0
+Version: 10.80.0.dev1
 Summary: hiddifypanel multi proxy panel
 Home-page: https://hiddify.com
 License: LICENSE.md
@@ -14,18 +14,15 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: ansi2html (==1.9.2)
-Requires-Dist: apiflask[async] (>=2.2.1,<3.0.0)
-Requires-Dist: asgiref (>=3.8.1,<4.0.0)
+Requires-Dist: apiflask (==2.2.1)
 Requires-Dist: babel (==2.16.0)
 Requires-Dist: bjoern (==3.2.2)
 Requires-Dist: bleach (==6.2.0)
 Requires-Dist: bootstrap-flask (==2.4.1)
 Requires-Dist: cachecontrol[filecache] (<0.15.0)
-Requires-Dist: celery (>=5.4.0,<6.0.0)
 Requires-Dist: click (==8.1.7)
 Requires-Dist: cloudflare (==3.1.0)
 Requires-Dist: cryptography (<42)
-Requires-Dist: dynaconf (>=3.2.6,<4.0.0)
 Requires-Dist: fastenumplus (==1.4.0)
 Requires-Dist: flask (==3.0.3)
 Requires-Dist: flask-admin (==1.6.1)
@@ -38,16 +35,13 @@ Requires-Dist: flask-restful (==0.3.10)
 Requires-Dist: flask-session (==0.8.0)
 Requires-Dist: flask-sqlalchemy (==3.1.1)
 Requires-Dist: flask-wtf (==1.2.2)
-Requires-Dist: json5 (>=0.9.28,<0.10.0)
 Requires-Dist: loguru (==0.7.2)
 Requires-Dist: markupsafe (==3.0.2)
 Requires-Dist: maxminddb (==2.6.2)
 Requires-Dist: mysqlclient (==2.2.5)
 Requires-Dist: netifaces (==0.11.0)
 Requires-Dist: ping3 (==4.0.8)
-Requires-Dist: protobuf (>=5.26.1,<6.0.0)
 Requires-Dist: psutil (==6.1.0)
-Requires-Dist: pydantic (==2.9.2)
 Requires-Dist: pymysql (==1.1.1)
 Requires-Dist: pytelegrambotapi (==4.23.0)
 Requires-Dist: python-dateutil (==2.9.0.post0)
@@ -57,15 +51,14 @@ Requires-Dist: python-slugify (==8.0.4)
 Requires-Dist: pyyaml (==6.0.2)
 Requires-Dist: redis (==5.2.0)
 Requires-Dist: requests (==2.32.3)
-Requires-Dist: sonora (>=0.2.3,<0.3.0)
-Requires-Dist: sqlalchemy-serializer (>=1.4.22,<2.0.0)
+Requires-Dist: sqlalchemy (==2.0.29)
+Requires-Dist: sqlalchemy-serializer (==1.4.22)
 Requires-Dist: sqlalchemy-utils (==0.41.2)
-Requires-Dist: sqlalchemy[asyncio] (>=2.0.29,<3.0.0)
 Requires-Dist: strenum (==0.4.15)
 Requires-Dist: user-agents (==2.2.0)
-Requires-Dist: werkzeug (==3.0.6)
+Requires-Dist: werkzeug (==3.1.2)
 Requires-Dist: wtforms (==3.1.2)
-Requires-Dist: xtlsapi (==3.3.0)
+Requires-Dist: xtlsapi (==3.1.2)
 Project-URL: Documentation, https://hiddify.com/manager
 Project-URL: Repository, https://github.com/hiddify/hiddify-manager/
 Description-Content-Type: text/markdown

hiddifypanel-10.80.0.dev1/hiddifypanel/VERSION

@@ -0,0 +1 @@
+10.80.0.dev7

{hiddifypanel-10.80.0 → hiddifypanel-10.80.0.dev1}/hiddifypanel/VERSION.py

@@ -2,5 +2,5 @@ import importlib.metadata
 from datetime import datetime
 
 __version__ = importlib.metadata.version(__package__ or __name__)
-__release_time__= datetime.strptime('2024-12-15T04:01:06','%Y-%m-%dT%H:%M:%S')
+__release_time__= datetime.strptime('2024-11-10T19:45:21','%Y-%m-%dT%H:%M:%S')
 is_released_version=True

hiddifypanel-10.80.0.dev1/hiddifypanel/base.py

@@ -0,0 +1,168 @@
+from flask import request, g
+# from hiddifypanel.cache import cache
+from hiddifypanel.models import *
+
+import flask_bootstrap
+import hiddifypanel
+from flask_babel import Babel
+from flask_session import Session
+
+import datetime
+
+from dotenv import dotenv_values
+import os
+import sys
+from apiflask import APIFlask
+from werkzeug.middleware.proxy_fix import ProxyFix
+from loguru import logger
+from hiddifypanel.panel.init_db import init_db
+
+
+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>'
+    return fmt + '\n'
+
+
+def init_logger(app, cli):
+    # configure logger
+    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)
+    logger.trace('Logger initiated :)')
+
+
+# TODO: refactor this function
+
+def create_app(*args, cli=False, **config):
+
+    app = APIFlask(__name__, static_url_path="/<proxy_path>/static/", instance_relative_config=True, version='2.2.0', title="Hiddify API",
+                   openapi_blueprint_url_prefix="/<proxy_path>/api", docs_ui='elements', json_errors=False, enable_openapi=not cli)
+    # app = Flask(__name__, static_url_path="/<proxy_path>/static/", instance_relative_config=True)
+
+    if not cli:
+        
+        from hiddifypanel import auth
+        app.config["PREFERRED_URL_SCHEME"] = "https"
+        app.wsgi_app = ProxyFix(
+            app.wsgi_app, x_for=1, x_proto=1, x_host=1, x_prefix=1,
+        )
+        app.secret_key="asdsad"
+        app.servers = {
+            'name': 'current',
+            'url': '',
+        }  # type: ignore
+        app.info = {
+            'description': 'Hiddify is a free and open source software. It is as it is.',
+            'termsOfService': 'https://hiddify.com',
+            'contact': {
+                'name': 'API Support',
+                'url': 'https://www.hiddify.com/support',
+                'email': 'panel@hiddify.com'
+            },
+            'license': {
+                'name': 'Creative Commons Zero v1.0 Universal',
+                'url': 'https://github.com/hiddify/Hiddify-Manager/blob/main/LICENSE'
+            }
+        }
+        # setup flask server-side session
+        # app.config['APPLICATION_ROOT'] = './'
+        # app.config['SESSION_COOKIE_DOMAIN'] = '/'
+        
+
+        app.jinja_env.line_statement_prefix = '%'
+        from hiddifypanel import hutils
+        app.jinja_env.filters['b64encode'] = hutils.encode.do_base_64
+        app.view_functions['admin.static'] = {}  # fix bug in apiflask
+        flask_bootstrap.Bootstrap4(app)
+
+    for c, v in dotenv_values(os.environ.get("HIDDIFY_CFG_PATH", 'app.cfg')).items():
+        if v.isdecimal():
+            v = int(v)
+        else:
+            v = True if v.lower() == "true" else (False if v.lower() == "false" else v)
+
+        app.config[c] = v
+    init_logger(app, cli)
+    hiddifypanel.database.init_app(app)
+    with app.app_context():
+        init_db()
+        logger.add(app.config['HIDDIFY_CONFIG_PATH'] + "/log/system/panel.log", format=logger_dynamic_formatter, level=hconfig(ConfigEnum.log_level),
+                   colorize=True, catch=True, enqueue=True, diagnose=False, backtrace=True)
+
+    def get_locale():
+        # Put your logic here. Application can store locale in
+        # user profile, cookie, session, etc.
+        if "admin" in request.base_url:
+            g.locale = hconfig(ConfigEnum.admin_lang) or 'en'
+        else:
+            g.locale = auth.current_account.lang or hconfig(ConfigEnum.lang) or 'en'
+        return g.locale
+    app.jinja_env.globals['get_locale'] = get_locale
+    babel = Babel(app, locale_selector=get_locale)
+    if not cli:
+        app.config['SESSION_TYPE'] = 'redis'
+        from hiddifypanel.cache import redis_client
+        app.config['SESSION_REDIS'] = redis_client
+        app.config['SESSION_PERMANENT'] = True
+        app.config['PERMANENT_SESSION_LIFETIME'] = datetime.timedelta(days=10)
+        app.security_schemes = {  # equals to use config SECURITY_SCHEMES
+            'Hiddify-API-Key': {
+                'type': 'apiKey',
+                'in': 'header',
+                'name': 'Hiddify-API-Key',
+            }
+        }
+        Session(app)
+        hiddifypanel.panel.common.init_app(app)
+        hiddifypanel.panel.common_bp.init_app(app)
+
+        from hiddifypanel.panel import user, commercial, admin
+        admin.init_app(app)
+        user.init_app(app)
+        commercial.init_app(app)
+
+    app.config.update(config)  # Override with passed config
+    # app.config['WTF_CSRF_CHECK_DEFAULT'] = False
+    # app.config['WTF_CSRF_ENABLED'] = False
+    # app.config['BABEL_TRANSLATION_DIRECTORIES'] = '/workspace/Hiddify-Server/hiddify-panel/src/translations.i18n'
+
+    # from flask_wtf.csrf import CSRFProtect
+
+    # csrf = CSRFProtect(app)
+
+    # @app.before_request
+    # def check_csrf():
+    # # if "/admin/user/" in request.base_url:
+    # #     return
+    # # if "/admin/domain/" in request.base_url:
+    # #     return
+    # # if "/admin/actions/" in request.base_url:
+    # #     return
+    # # if "/api/" in request.base_url:
+    # #     return
+    #     csrf.protect()
+
+    hiddifypanel.panel.cli.init_app(app)
+    return app
+
+
+def create_app_wsgi(*args, **kwargs):
+    # workaround for Flask issue
+    # that doesn't allow **config
+    # to be passed to create_app
+    # https://github.com/pallets/flask/issues/4170
+    cli = ("hiddifypanel" in sys.argv[0]) or (sys.argv[1] in ["update-usage", "all-configs", "admin_links", "admin_path"])
+    app = create_app(cli=cli)
+    return app
+
+
+# def create_cli_app(*args, **kwargs):
+#     #     # workaround for Flask issue
+#     #     # that doesn't allow **config
+#     #     # to be passed to create_app
+#     #     # https://github.com/pallets/flask/issues/4170
+#     # print(kwargs)
+#     app = create_app(*args, cli=True, **kwargs)
+#     return app

{hiddifypanel-10.80.0 → hiddifypanel-10.80.0.dev1}/hiddifypanel/cache.py

@@ -5,7 +5,7 @@ from pickle import dumps, loads
 from loguru import logger
 
 redis_client = redis.from_url(os.environ["REDIS_URI_MAIN"])
-# print(os.environ["REDIS_URI_MAIN"])
+
 
 class CustomRedisCache(RedisCache):
     def __init__(self, redis_client, prefix="rc", serializer=compact_dump, deserializer=loads, key_serializer=None, support_cluster=True, exception_handler=None):

{hiddifypanel-10.80.0 → hiddifypanel-10.80.0.dev1}/hiddifypanel/database.py

@@ -6,9 +6,6 @@ import os
 from sqlalchemy import Row, text, Sequence
 
 
-
-
-
 db: SQLAlchemy = SQLAlchemy()
 db.UUID = UUIDType  # type: ignore
 
@@ -16,10 +13,6 @@ db.UUID = UUIDType  # type: ignore
 def init_app(app):
     app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = True
     db.init_app(app)
-    with app.app_context():
-        from hiddifypanel.panel.init_db import init_db
-        init_db()
-        
 
 
 def db_execute(query: str, return_val: bool = False, commit: bool = False, **params: dict):

{hiddifypanel-10.80.0 → hiddifypanel-10.80.0.dev1}/hiddifypanel/hutils/flask.py

@@ -51,7 +51,7 @@ def hurl_for(endpoint, **values):
 def get_user_agent() -> dict:
     ua = __parse_user_agent(request.user_agent.string)
 
-    if ua.get('v', 1) < 9:
+    if ua.get('v', 1) < 8:
         __parse_user_agent.invalidate_all()  # type:ignore
         ua = __parse_user_agent(request.user_agent.string)
     return ua
@@ -66,13 +66,13 @@ def __parse_user_agent(ua: str) -> dict:
     # Example: SFA/1.7.0 (239; sing-box 1.7.0)
     # Example: HiddifyNext/0.13.6 (android) like ClashMeta v2ray sing-box
     if ua=="v2rayNG/1.8.23": #temporary fix for xray sub in hiddifynext
-        ua="HiddifyNextX/3.0.0 (android) like ClashMeta v2ray sing-box"
+        ua="HiddifyNextX/0.13.6 (android) like ClashMeta v2ray sing-box"
     uaa = user_agents.parse(ua)
 
     match = re.search(ua_version_pattern, ua)
     generic_version = list(map(int, match.group(1).split('.'))) if match else [0, 0, 0]
     res = {}
-    res['v'] = 9
+    res['v'] = 8
     res["is_bot"] = uaa.is_bot
     res["is_browser"] = re.match('^Mozilla', ua, re.IGNORECASE) and True
     res['os'] = uaa.os.family

{hiddifypanel-10.80.0 → hiddifypanel-10.80.0.dev1}/hiddifypanel/hutils/proxy/__init__.py

@@ -3,4 +3,3 @@ from . import xray
 from . import xrayjson
 from . import singbox
 from . import clash
-from . import wireguard

{hiddifypanel-10.80.0 → hiddifypanel-10.80.0.dev1}/hiddifypanel/hutils/proxy/clash.py

@@ -33,7 +33,7 @@ def to_clash(proxy, meta_or_normal):
 
     if proxy['l3'] in ["kcp", ProxyL3.h3_quic]:
         return {'name': name, 'msg': f"clash does not support {proxy['l3']}", 'type': 'debug'}
-    if proxy['transport'] in [ProxyTransport.xhttp, ProxyTransport.httpupgrade]:
+    if proxy['transport'] in [ProxyTransport.splithttp, ProxyTransport.httpupgrade]:
         return {'name': name, 'msg': f"clash does not support {proxy['transport']}", 'type': 'debug'}
     # if proxy['proto'] in [Proxy.shado]:
 
@@ -44,7 +44,7 @@ def to_clash(proxy, meta_or_normal):
             return {'name': name, 'msg': f"clash does not support {proxy['proto']}", 'type': 'debug'}
         if proxy['proto'] in ["vless", 'tuic', 'hysteria2']:
             return {'name': name, 'msg': f"{proxy['proto']} not supported in clash", 'type': 'debug'}
-        if proxy['transport'] in ["shadowtls", "xhttp"]:
+        if proxy['transport'] in ["shadowtls", "splithttp"]:
             return {'name': name, 'msg': f"{proxy['transport']} not supported in clash", 'type': 'debug'}
     if proxy['l3'] == ProxyL3.tls_h2 and proxy['proto'] in [ProxyProto.vmess, ProxyProto.vless] and proxy['dbe'].cdn == ProxyCDN.direct:
         return {'name': name, 'msg': "bug tls_h2 vmess and vless in clash meta", 'type': 'warning'}

{hiddifypanel-10.80.0 → hiddifypanel-10.80.0.dev1}/hiddifypanel/hutils/proxy/shared.py

@@ -134,8 +134,8 @@ def get_proxies(child_id: int = 0, only_enabled=False) -> list['Proxy']:
         proxies = [c for c in proxies if 'trojan' not in c.proto]
     if not hconfig(ConfigEnum.httpupgrade_enable, child_id):
         proxies = [c for c in proxies if ProxyTransport.httpupgrade not in c.transport]
-    if not hconfig(ConfigEnum.xhttp_enable, child_id):
-        proxies = [c for c in proxies if ProxyTransport.xhttp not in c.transport]
+    if not hconfig(ConfigEnum.splithttp_enable, child_id):
+        proxies = [c for c in proxies if ProxyTransport.splithttp not in c.transport]
     if not hconfig(ConfigEnum.ws_enable, child_id):
         proxies = [c for c in proxies if ProxyTransport.WS not in c.transport]
     # if not hconfig(ConfigEnum.xtls_enable, child_id):
@@ -189,7 +189,7 @@ def get_valid_proxies(domains: list[Domain]) -> list[dict]:
             noDomainProxies = False
             if proxy.proto in [ProxyProto.ssh, ProxyProto.wireguard]:
                 noDomainProxies = True
-            if proxy.proto in [ProxyProto.ss] and proxy.transport not in [ProxyTransport.grpc, ProxyTransport.h2, ProxyTransport.WS, ProxyTransport.httpupgrade, ProxyTransport.xhttp]:
+            if proxy.proto in [ProxyProto.ss] and proxy.transport not in [ProxyTransport.grpc, ProxyTransport.h2, ProxyTransport.WS, ProxyTransport.httpupgrade, ProxyTransport.splithttp]:
                 noDomainProxies = True
             options = []
             key = f'{proxy.proto}{proxy.transport}{proxy.cdn}{proxy.l3}'
@@ -413,9 +413,9 @@ def make_proxy(hconfigs: dict, proxy: Proxy, domain_db: Domain, phttp=80, ptls=4
         base['path'] = f'/{path[base["proto"]]}{hconfigs[ConfigEnum.path_httpupgrade]}'
         base["host"] = domain
         return base
-    if proxy.transport in [ProxyTransport.xhttp]:
-        base['transport'] = 'xhttp'
-        base['path'] = f'/{path[base["proto"]]}{hconfigs[ConfigEnum.path_xhttp]}'
+    if proxy.transport in [ProxyTransport.splithttp]:
+        base['transport'] = 'splithttp'
+        base['path'] = f'/{path[base["proto"]]}{hconfigs[ConfigEnum.path_splithttp]}'
         # if 0 and 'h2' in base['alpn'] or 'h3' in base['alpn']:
         #     base['path'] += "2"
         # else:

{hiddifypanel-10.80.0 → hiddifypanel-10.80.0.dev1}/hiddifypanel/hutils/proxy/singbox.py

@@ -47,7 +47,7 @@ def configs_as_json(domains: list[Domain], **kwargs) -> str:
 def is_xray_proxy(proxy: dict):
     if g.user_agent.get('is_hiddify_prefere_xray'):
         return True
-    if proxy['transport'] == ProxyTransport.xhttp:
+    if proxy['transport'] == ProxyTransport.splithttp:
         return True
     return False
 

{hiddifypanel-10.80.0 → hiddifypanel-10.80.0.dev1}/hiddifypanel/hutils/proxy/xray.py

@@ -126,10 +126,10 @@ def to_link(proxy: dict) -> str | dict:
         baseurl += "&encryption=none"
     if proxy.get('fingerprint', 'none') != 'none':
         baseurl += "&fp=" + proxy['fingerprint']
-    if proxy.get('transport') in {ProxyTransport.xhttp}:
+    if proxy.get('transport') in {ProxyTransport.splithttp}:
         baseurl += "&core=xray"
     if proxy['l3'] != 'quic':
-        if proxy.get('l3') != ProxyL3.reality and (proxy.get('transport') in {ProxyTransport.tcp, ProxyTransport.httpupgrade, ProxyTransport.xhttp}) and proxy['proto'] in [ProxyProto.vless, ProxyProto.trojan]:
+        if proxy.get('l3') != ProxyL3.reality and (proxy.get('transport') in {ProxyTransport.tcp, ProxyTransport.httpupgrade, ProxyTransport.splithttp}) and proxy['proto'] in [ProxyProto.vless, ProxyProto.trojan]:
             baseurl += '&headerType=http'
         else:
             baseurl += '&headerType=None'

{hiddifypanel-10.80.0 → hiddifypanel-10.80.0.dev1}/hiddifypanel/hutils/proxy/xrayjson.py

@@ -50,11 +50,10 @@ def configs_as_json(domains: list[Domain], user: User, expire_days: int, remarks
         unsupported_transport = {}
         if g.user_agent.get('is_v2rayng'):
             # TODO: ensure which protocols are not supported in v2rayng
-            unsupported_protos = { ProxyProto.hysteria, ProxyProto.hysteria2,
-                                  ProxyProto.tuic, ProxyProto.ssr, ProxyProto.ssh}
+            unsupported_protos = {ProxyProto.wireguard, ProxyProto.hysteria, ProxyProto.hysteria2,
+                                  ProxyProto.tuic, ProxyProto.ss, ProxyProto.ssr, ProxyProto.ssh}
             if not hutils.flask.is_client_version(hutils.flask.ClientVersion.v2ryang, 1, 8, 18):
                 unsupported_transport = {ProxyTransport.httpupgrade}
-                unsupported_protos.update({ProxyProto.wireguard})
 
         # multiple outbounds needs multiple whole base config not just one with multiple outbounds (at least for v2rayng)
         # https://github.com/2dust/v2rayNG/pull/2827#issue-2127534078
@@ -136,9 +135,7 @@ def add_wireguard_settings(base: dict, proxy: dict):
     base['settings']['mtu'] = 1380  # optional
     base['settings']['peers'] = [{
         'endpoint': f'{proxy["server"]}:{int(proxy["port"])}',
-        'publicKey': proxy["wg_server_pub"],
-        "preSharedKey": proxy['wg_psk']
-
+        'publicKey': proxy["wg_server_pub"]
         # 'allowedIPs':'', 'preSharedKey':'', 'keepAlive':'' # optionals
     }]
 
@@ -265,9 +262,9 @@ def add_stream_settings(base: dict, proxy: dict):
     if proxy['transport'] == ProxyTransport.httpupgrade:
         ss['network'] = proxy['transport']
         add_httpupgrade_stream(ss, proxy)
-    if proxy['transport'] == ProxyTransport.xhttp:
+    if proxy['transport'] == ProxyTransport.splithttp:
         ss['network'] = proxy['transport']
-        add_xhttp_stream(ss, proxy)
+        add_splithttp_stream(ss, proxy)
     if proxy['transport'] == 'ws':
         ss['network'] = proxy['transport']
         add_ws_stream(ss, proxy)
@@ -341,8 +338,8 @@ def add_httpupgrade_stream(ss: dict, proxy: dict):
     }
 
 
-def add_xhttp_stream(ss: dict, proxy: dict):
-    ss['xhttpSettings'] = {
+def add_splithttp_stream(ss: dict, proxy: dict):
+    ss['splithttpSettings'] = {
         'path': proxy['path'],
         'host': proxy['host'],
         "headers": {

{hiddifypanel-10.80.0 → hiddifypanel-10.80.0.dev1}/hiddifypanel/models/config.py

@@ -153,10 +153,7 @@ def add_or_update_config(commit: bool = True, child_id: int | None = None, overr
     if child_id is None:
         child_id = Child.current().id
     c = config['key']
-    try:
-        ckey = ConfigEnum(c)
-    except:
-        return
+    ckey = ConfigEnum(c)
     if c == ConfigEnum.unique_id and not override_unique_id:
         return
 

{hiddifypanel-10.80.0 → hiddifypanel-10.80.0.dev1}/hiddifypanel/models/config_enum.py

@@ -239,7 +239,7 @@ class ConfigEnum(metaclass=FastEnum):
     ws_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply_config)
     grpc_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply_config)
     httpupgrade_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply_config)
-    xhttp_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply_config)
+    splithttp_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply_config)
 
     vless_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply_config)
     trojan_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply_config)
@@ -262,7 +262,7 @@ class ConfigEnum(metaclass=FastEnum):
     path_v2ray = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply_config, hide_in_virtual_child=True)  # deprecated
     path_ss = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply_config, hide_in_virtual_child=True)
 
-    path_xhttp = _StrConfigDscr(ConfigCategory.too_advanced, ApplyMode.apply_config, hide_in_virtual_child=True)
+    path_splithttp = _StrConfigDscr(ConfigCategory.too_advanced, ApplyMode.apply_config, hide_in_virtual_child=True)
     path_httpupgrade = _StrConfigDscr(ConfigCategory.too_advanced, ApplyMode.apply_config, hide_in_virtual_child=True)
     path_ws = _StrConfigDscr(ConfigCategory.too_advanced, ApplyMode.apply_config, hide_in_virtual_child=True)
     path_tcp = _StrConfigDscr(ConfigCategory.too_advanced, ApplyMode.apply_config, hide_in_virtual_child=True)

{hiddifypanel-10.80.0 → hiddifypanel-10.80.0.dev1}/hiddifypanel/models/proxy.py

@@ -20,7 +20,7 @@ class ProxyTransport(StrEnum):
     tcp = auto()
     ssh = auto()
     httpupgrade = auto()
-    xhttp = auto()
+    splithttp = auto()
     custom = auto()
     shadowsocks = auto()
 

hiddifypanel-10.80.0.dev1/hiddifypanel/panel/__init__.py

@@ -0,0 +1,9 @@
+
+from . import user
+# from . import admin
+from . import cli
+# from .. import database
+from . import common
+# from . import commercial
+# from .. import auth
+from . import common_bp

{hiddifypanel-10.80.0 → hiddifypanel-10.80.0.dev1}/hiddifypanel/panel/admin/AdminstratorAdmin.py

@@ -143,18 +143,19 @@ class AdminstratorAdmin(AdminLTEModelView):
         """)
 
     def _max_active_users_formatter(view, context, model, name):
-        """Optimized user count formatter using database queries"""
-        active_count = model.recursive_users_query().filter(User.is_active == True).count()
+
+        actives = [u for u in model.recursive_users_query().all() if u.is_active]
+        u = len(actives)
         if model.mode == AdminMode.super_admin:
-            return f"{active_count} / ∞"
+            return f"{u} / ∞"
         t = model.max_active_users
-        rate = round(active_count * 100 / (t + 0.000001))
-        color = "#ff7e7e" if active_count >= t else ('#ffc107' if rate > 80 else '#9ee150')
-        
+        rate = round(u * 100 / (t + 0.000001))
+        state = "danger" if u >= t else ('warning' if rate > 80 else 'success')
+        color = "#ff7e7e" if u >= t else ('#ffc107' if rate > 80 else '#9ee150')
         return Markup(f"""
         <div class="progress progress-lg position-relative" style="min-width: 100px;">
           <div class="progress-bar progress-bar-striped" role="progressbar" style="width: {rate}%;background-color: {color};" aria-valuenow="{rate}" aria-valuemin="0" aria-valuemax="100"></div>
-              <span class='badge position-absolute' style="left:auto;right:auto;width: 100%;font-size:1em">{active_count} {_('user.home.usage.from')} {t}</span>
+              <span class='badge position-absolute' style="left:auto;right:auto;width: 100%;font-size:1em">{u} {_('user.home.usage.from')} {t}</span>
 
         </div>
         """)