hiddifypanel 10.80.6__py3-none-any.whl → 10.80.8__py3-none-any.whl

hiddifypanel/VERSION

@@ -1 +1 @@
-10.80.6
+10.80.8

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-15T21:59:00','%Y-%m-%dT%H:%M:%S')
+__release_time__= datetime.strptime('2024-12-18T01:39:58','%Y-%m-%dT%H:%M:%S')
 is_released_version=True

hiddifypanel/base.py

@@ -14,10 +14,10 @@ from loguru import logger
 
 from dynaconf import FlaskDynaconf
 
-def create_app(*args, cli=False, **config):
-
+def create_app(*args, app_mode="normal", **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)
+                   openapi_blueprint_url_prefix="/<proxy_path>/api", docs_ui='elements', json_errors=False, enable_openapi=app_mode=="normal")
     # app = Flask(__name__, static_url_path="/<proxy_path>/static/", instance_relative_config=True)
     # app.asgi_app = WsgiToAsgi(app)
     
@@ -29,14 +29,16 @@ def create_app(*args, cli=False, **config):
         app.config[c] = v
     dyn=FlaskDynaconf(app,settings_files=[os.environ.get("HIDDIFY_CFG_PATH", 'app.cfg')])
 
-    if cli:
+    if app_mode in ["cli","celery"]:
         app.config['EXTENSIONS']=[
             # "hiddifypanel.cache:init_app",
             "hiddifypanel.database:init_app",
             "hiddifypanel.panel.hlogger:init_cli",
-            "hiddifypanel.panel.cli:init_app",
-            "hiddifypanel.celery:init_app",
         ]
+        if app_mode=="celery":
+            app.config['EXTENSIONS'].append("hiddifypanel.celery:init_app")
+        else:
+            app.config['EXTENSIONS'].append("hiddifypanel.panel.cli:init_app")
     else:
         app.config['EXTENSIONS']=[
             # "hiddifypanel.cache:init_app",
@@ -67,7 +69,7 @@ def create_app_wsgi(*args, **kwargs):
     # 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)
+    app = create_app(app_mode="cli" if cli else "normal")
     return app
 
 
@@ -78,5 +80,5 @@ def create_celery_app():
     #     # to be passed to create_app
     #     # https://github.com/pallets/flask/issues/4170
     # print(kwargs)
-    app = create_app(cli=True)
+    app = create_app(app_mode="celery")
     return app.extensions["celery"]

hiddifypanel/panel/admin/QuickSetup.py

@@ -67,7 +67,7 @@ def get_lang_form(empty=False):
     class LangForm(FlaskForm):
         step = wtf.HiddenField(default="1")
         admin_lang = wtf.SelectField(
-            _("config.admin_lang.label"), choices=[("en", _("lang.en")), ("fa", _("lang.fa")), ("pt", _("lang.pt")), ("zh", _("lang.zh")), ("ru", _("lang.ru"))],
+            _("config.admin_lang.label"), choices=[("en", _("lang.en")), ("fa", _("lang.fa")), ("pt", _("lang.pt")), ("zh", _("lang.zh")), ("ru", _("lang.ru")), ("my", _("lang.my"))],
             description=_("config.admin_lang.description"),
             default=hconfig(ConfigEnum.admin_lang))
         # lang=wtf.SelectField(_("config.lang.label"),choices=[("en",_("lang.en")),("fa",_("lang.fa"))],description=_("config.lang.description"),default=hconfig(ConfigEnum.lang))

hiddifypanel/panel/admin/SettingAdmin.py

@@ -216,7 +216,7 @@ def get_config_form():
             elif c.key == ConfigEnum.lang or c.key == ConfigEnum.admin_lang:
                 field = wtf.SelectField(
                     _(f"config.{c.key}.label"),
-                    choices=[("en", _("lang.en")), ("fa", Markup(_("lang.fa"))), ("zh", _("lang.zh")), ("pt", _("lang.pt")), ("ru", _("lang.ru"))],
+                    choices=[("en", _("lang.en")), ("fa", Markup(_("lang.fa"))), ("zh", _("lang.zh")), ("pt", _("lang.pt")), ("ru", _("lang.ru")), ("my", _("lang.my"))],
                     description=_(f"config.{c.key}.description"),
                     default=hconfig(c.key))
             elif c.key == ConfigEnum.country:

hiddifypanel/panel/hiddify.py

@@ -344,18 +344,18 @@ def get_backup_child_unique_id(backupdata: dict) -> str:
 def all_configs_for_cli():
     valid_users = [u.to_dict(dump_id=True) for u in User.query.filter((User.usage_limit > User.current_usage)).all() if u.is_active]
     host_child_ids = [c.id for c in Child.query.filter(Child.mode == ChildMode.virtual).all()]
+    domains = Domain.query.filter(Domain.child_id.in_(host_child_ids),~Domain.domain.contains("*")).all()
     configs = {
         "users": valid_users,
-        "domains": [u.to_dict(dump_ports=True, dump_child_id=True) for u in Domain.query.filter(Domain.child_id.in_(host_child_ids)).all() if "*" not in u.domain],
+        "domains": [u.to_dict(dump_ports=True, dump_child_id=True) for u in domains],
         # "hconfigs": get_hconfigs(json=True),
         "chconfigs": get_hconfigs_childs(host_child_ids, json=True)
     }
 
-    def_user = None if len(User.query.all()) > 1 else User.query.filter(User.name == 'default').first()
-    domains = Domain.query.all()
-    sslip_domains = [d.domain for d in domains if "sslip.io" in d.domain]
+    def_user = User.query.filter(User.name == 'default').first() if User.query.count() == 1 else None
+    
 
-    configs['chconfigs'][0]['first_setup'] = def_user is not None and len(sslip_domains) > 0
+    configs['chconfigs'][0]['first_setup'] = def_user is not None and Domain.query.filter(Domain.domain.contains("sslip.io")).limit(1).count() > 0
     server_ip = hutils.network.get_ip_str(4)
     owner = AdminUser.get_super_admin()
     configs['api_key'] = owner.uuid
@@ -364,9 +364,10 @@ def all_configs_for_cli():
     configs['panel_links'] = []
     configs['panel_links'].append(get_account_panel_link(owner, server_ip, is_https=False))
     configs['panel_links'].append(get_account_panel_link(owner, server_ip))
+    
     domains = Domain.get_domains()
-
     for d in domains:
         configs['panel_links'].append(get_account_panel_link(owner, d.domain))
+    
 
     return configs

hiddifypanel/panel/init_db.py

@@ -17,6 +17,12 @@ from loguru import logger
 MAX_DB_VERSION = 100
 
 
+def _v98(child_id):
+    add_config_if_not_exist(ConfigEnum.path_xhttp,hutils.random.get_random_string(7, 15))
+    add_config_if_not_exist(ConfigEnum.xhttp_enable, False)
+    db.session.bulk_save_objects(get_proxy_rows_v1())
+    
+
 def _v97(child_id):
     keys = hutils.crypto.generate_ssh_host_keys()
     # set_hconfig(ConfigEnum.ssh_host_dsa_pk, keys['dsa']['pk'])

hiddifypanel/translations/en/LC_MESSAGES/messages.po

@@ -10,13 +10,13 @@ msgstr ""
 "            Settings"
 
 msgid "%(count)s records were successfully disabled."
-msgstr "%(count)s records were successfully disabled."
+msgstr "%(count)s Records were successfully disabled."
 
 msgid "%(count)s records were successfully enabled."
-msgstr "%(count)s records were successfully enabled."
+msgstr "%(count)s Records were successfully enabled."
 
 msgid "%(expire_days)s days"
-msgstr "%(expire_days)s days"
+msgstr "%(expire_days)s Days"
 
 msgid "%(placeholder)s"
 msgstr "%(placeholder)s"
@@ -1707,10 +1707,10 @@ msgid "config.path_ws.label"
 msgstr "ℹ️ Path of Websocket Requests"
 
 msgid "config.path_xhttp.description"
-msgstr "This option defines the Path for Split HTTP"
+msgstr "This option defines the Path for XHTTP"
 
 msgid "config.path_xhttp.label"
-msgstr "ℹ️ Path for Split HTTP"
+msgstr "ℹ️ Path for XHTTP"
 
 msgid "config.proxies.description"
 msgstr "Define specific proxy settings"
@@ -2383,7 +2383,7 @@ msgstr ""
 "⚠️ <strong>Not Supported in SignBox based Clients. Only <a href=\"https://app.hiddify.com\" target=\"_blank\">Hiddify</a> App, and XRay base Clients are supported.</strong>"
 
 msgid "config.xhttp_enable.label"
-msgstr "🈁 Split HTTP"
+msgstr "🈁 XHTTP"
 
 msgid "config.xtls_enable.description"
 msgstr "Enables XTLS Protocol"
@@ -2490,6 +2490,9 @@ msgstr "🇺🇸 English"
 msgid "lang.fa"
 msgstr "🇮🇷 Persian - فارسی"
 
+msgid "lang.my"
+msgstr "lang.my"
+
 msgid "lang.pt"
 msgstr "🇵🇹 Portuguese - Português "
 

hiddifypanel/translations/fa/LC_MESSAGES/messages.po

@@ -1692,10 +1692,10 @@ msgid "config.path_ws.label"
 msgstr "ℹ️ مسیر درخواست های Websocket"
 
 msgid "config.path_xhttp.description"
-msgstr "این گزینه مسیر را برای Split HTTP تعریف می کند"
+msgstr "این گزینه مسیر را برای XHTTP تعریف می کند"
 
 msgid "config.path_xhttp.label"
-msgstr "ℹ️ مسیر برای Split HTTP"
+msgstr "ℹ️ مسیر برای XHTTP"
 
 msgid "config.proxies.description"
 msgstr "تنظیمات اختصاصی را مشخص کنید"
@@ -2370,7 +2370,7 @@ msgstr ""
 "⚠️<strong>&nbsp;این پروتکل در برنامه های با هسته SingBox پشتیبانی نمیشود. فقط در برنامه <a href=\"https://app.hiddify.com\" target=\"_blank\">Hiddify</a> و برنامه های با هسته XRay پشتیبانی میشود</strong>"
 
 msgid "config.xhttp_enable.label"
-msgstr "🈁 Split HTTP"
+msgstr "🈁 XHTTP"
 
 msgid "config.xtls_enable.description"
 msgstr "پروتکل XTLS را فعال می کند"
@@ -2476,6 +2476,9 @@ msgstr " 🇺🇸 انگلیسی - English "
 msgid "lang.fa"
 msgstr "🇮🇷 فارسی"
 
+msgid "lang.my"
+msgstr ""
+
 msgid "lang.pt"
 msgstr "🇵🇹 پرتغالی - Português "