hiddifypanel 10.20.1__py3-none-any.whl → 10.20.3__py3-none-any.whl

hiddifypanel/VERSION

@@ -1 +1 @@
-10.20.1
+10.20.3

hiddifypanel/VERSION.py

@@ -1,3 +1,3 @@
-__version__='10.20.1'
+__version__='10.20.3'
 from datetime import datetime
 __release_date__= datetime.strptime('2024-04-12','%Y-%m-%d')

hiddifypanel/hutils/proxy/xray.py

@@ -3,7 +3,7 @@ import json
 import copy
 from flask import render_template, request, g
 from hiddifypanel import hutils
-from hiddifypanel.models import Proxy, ProxyTransport, ProxyL3, ProxyCDN, ProxyProto, Domain, ConfigEnum, DomainType, hconfig
+from hiddifypanel.models import ProxyTransport, ProxyL3, ProxyProto, Domain, User, ConfigEnum, hconfig
 from flask_babel import gettext as _
 
 OUTBOUND_LEVEL = 8
@@ -145,46 +145,44 @@ def to_link(proxy: dict) -> str | dict:
     return proxy
 
 
-def make_v2ray_configs(user, user_activate, domains: list[Domain], expire_days, ip_debug, db_domain, has_auto_cdn, asn, profile_title, **kwargs) -> str:
+def make_v2ray_configs(domains: list[Domain], user: User, expire_days: int, ip_debug=None) -> str:
     res = []
 
-    ua = hutils.flask.get_user_agent()
-    if hconfig(ConfigEnum.show_usage_in_sublink):
+    if hconfig(ConfigEnum.show_usage_in_sublink) and not g.user_agent.get('is_hiddify'):
 
-        if not ua['is_hiddify']:
+        fake_ip_for_sub_link = datetime.datetime.now().strftime(f"%H.%M--%Y.%m.%d.time:%H%M")
+        # if ua['app'] == "Fair1":
+        #     res.append(f'trojan://1@{fake_ip_for_sub_link}?sni=fake_ip_for_sub_link&security=tls#{round(user.current_usage_GB,3)}/{user.usage_limit_GB}GB_Remain:{expire_days}days')
+        # else:
 
-            fake_ip_for_sub_link = datetime.datetime.now().strftime(f"%H.%M--%Y.%m.%d.time:%H%M")
-            # if ua['app'] == "Fair1":
-            #     res.append(f'trojan://1@{fake_ip_for_sub_link}?sni=fake_ip_for_sub_link&security=tls#{round(user.current_usage_GB,3)}/{user.usage_limit_GB}GB_Remain:{expire_days}days')
-            # else:
+        # res.append(f'trojan://1@{fake_ip_for_sub_link}?sni=fake_ip_for_sub_link&security=tls#{hutils.encode.url_encode(profile_title)}')
 
-            # res.append(f'trojan://1@{fake_ip_for_sub_link}?sni=fake_ip_for_sub_link&security=tls#{hutils.encode.url_encode(profile_title)}')
-
-            name = '⏳' if user_activate else '✖'
-            if user.usage_limit_GB < 1000:
-                name += f'{round(user.current_usage_GB,3)}/{str(user.usage_limit_GB).replace(".0","")}GB'
-            elif user.usage_limit_GB < 100000:
-                name += f'{round(user.current_usage_GB/1000,3)}/{str(round(user.usage_limit_GB/1000,1)).replace(".0","")}TB'
-            else:
-                res.append("#No Usage Limit")
-            if expire_days < 1000:
-                name += " " + _(f'📅%(expire_days)s days', expire_days=expire_days)
-            else:
-                res.append("#No Time Limit")
+        name = '⏳ ' if user.is_active else '✖ '
+        if user.usage_limit_GB < 1000:
+            name += f'{round(user.current_usage_GB,3)}/{str(user.usage_limit_GB).replace(".0","")}GB'
+        elif user.usage_limit_GB < 100000:
+            name += f'{round(user.current_usage_GB/1000,3)}/{str(round(user.usage_limit_GB/1000,1)).replace(".0","")}TB'
+        else:
+            res.append("#No Usage Limit")
+        name += " 📅 "
+        if expire_days < 1000:
+            name += _(f'%(expire_days)s days', expire_days=expire_days)
+        else:
+            res.append("#No Time Limit")
 
-            name = name.strip()
-            if len(name) > 3:
-                res.append(f'trojan://1@{fake_ip_for_sub_link}?sni=fake_ip_for_sub_link&security=tls#{hutils.encode.url_encode(name)}')
+        name = name.strip()
+        if len(name) > 3:
+            res.append(f'trojan://1@{fake_ip_for_sub_link}?sni=fake_ip_for_sub_link&security=tls#{hutils.encode.url_encode(name)}')
 
-    if ua['is_browser']:
+    if g.user_agent.get('is_browser') and ip_debug:
         res.append(f'#Hiddify auto ip: {ip_debug}')
 
-    if not user_activate:
+    if not user.is_active:
 
         if hconfig(ConfigEnum.lang) == 'fa':
-            res.append('trojan://1@1.1.1.1#' + hutils.encode.url_encode('✖بسته شما به پایان رسید'))
+            res.append('trojan://1@1.1.1.1#' + hutils.encode.url_encode('✖ بسته شما به پایان رسید'))
         else:
-            res.append('trojan://1@1.1.1.1#' + hutils.encode.url_encode('✖Package_Ended'))
+            res.append('trojan://1@1.1.1.1#' + hutils.encode.url_encode('✖ Package Ended'))
         return "\n".join(res)
 
     for pinfo in hutils.proxy.get_valid_proxies(domains):

hiddifypanel/hutils/proxy/xrayjson.py

@@ -2,55 +2,87 @@ import json
 import copy
 from flask import render_template, g
 from hiddifypanel import hutils
-from hiddifypanel.models import ProxyTransport, ProxyL3, ProxyProto, Domain
+from hiddifypanel.models import ProxyTransport, ProxyL3, ProxyProto, Domain, User
 from flask_babel import gettext as _
+from hiddifypanel.models import hconfig, ConfigEnum
 from .xray import is_muxable_agent
 OUTBOUND_LEVEL = 8
 
 
-def configs_as_json(domains: list[Domain], remarks: str) -> str:
+def configs_as_json(domains: list[Domain], user: User, expire_days: int,  remarks: str) -> str:
     '''Returns xray configs as json'''
-    outbounds = []
-
-    # TODO: check what are unsupported protocols in other apps
-    unsupported_protos = {}
-    if g.user_agent.get('is_v2rayng'):
-        # TODO: ensure which protocols are not supported in v2rayng
-        unsupported_protos = {ProxyProto.wireguard, ProxyProto.hysteria, ProxyProto.hysteria2, ProxyProto.tuic, ProxyProto.ss, ProxyProto.ssr, ProxyProto.ssh}
-
-    for proxy in hutils.proxy.get_valid_proxies(domains):
-        if unsupported_protos and proxy['proto'] in unsupported_protos:
-            continue
-        outbound = to_xray(proxy)
-        if 'msg' not in outbound:
-            outbounds.append(outbound)
-
-    outbounds_len = len(outbounds)
-    # reutrn no outbound
-    if outbounds_len < 1:
-        return ''
 
     all_configs = []
-    base_config = json.loads(render_template('base_xray_config.json.j2', remarks=remarks))
-    # 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
-    if outbounds_len > 1:
-        for out in outbounds:
-            base_config['remarks'] = out['tag']
-            base_config['outbounds'].insert(0, out)
-            all_configs.append(copy.deepcopy(base_config))
-            del base_config['outbounds'][0]
-    else:  # single outbound
-        base_config['outbounds'].insert(0, outbounds[0])
-        all_configs = base_config
-
+    if hconfig(ConfigEnum.show_usage_in_sublink) and not g.user_agent.get('is_hiddify'):
+        # determine usages
+        tag = '⏳ ' if user.is_active else '✖ '
+        if user.usage_limit_GB < 1000:
+            tag += f'{round(user.current_usage_GB,3)}/{str(user.usage_limit_GB).replace(".0","")}GB'
+        elif user.usage_limit_GB < 100000:
+            tag += f'{round(user.current_usage_GB/1000,3)}/{str(round(user.usage_limit_GB/1000,1)).replace(".0","")}TB'
+        else:
+            tag += '#No Usage Limit'
+        tag += ' 📅 '
+        if expire_days < 1000:
+            tag += _(f'%(expire_days)s days', expire_days=expire_days)
+        else:
+            tag += '#No Time Limit'
+        tag = tag.strip()
+
+        # add usage as a config
+        all_configs.append(
+            null_config(tag)
+        )
+
+    active = True
+    if not user.is_active:
+        tag = '✖ ' + (hutils.encode.url_encode('بسته شما به پایان رسید') if hconfig(ConfigEnum.lang) == 'fa' else 'Package Ended')
+        # add user status
+        all_configs.append(
+            null_config(tag)
+        )
+        active = False
+
+    if active:
+        # TODO: check what are unsupported protocols in other apps
+        unsupported_protos = {}
+        if g.user_agent.get('is_v2rayng'):
+            # TODO: ensure which protocols are not supported in v2rayng
+            unsupported_protos = {ProxyProto.wireguard, ProxyProto.hysteria, ProxyProto.hysteria2, ProxyProto.tuic, ProxyProto.ss, ProxyProto.ssr, ProxyProto.ssh}
+
+        # 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
+        outbounds = []
+        for proxy in hutils.proxy.get_valid_proxies(domains):
+            if unsupported_protos and proxy['proto'] in unsupported_protos:
+                continue
+            outbound = to_xray(proxy)
+            if 'msg' not in outbound:
+                outbounds.append(outbound)
+
+        base_config = json.loads(render_template('base_xray_config.json.j2', remarks=remarks))
+        if len(outbounds) > 1:
+            for out in outbounds:
+                base_config['remarks'] = out['tag']
+                base_config['outbounds'].insert(0, out)
+                if all_configs:
+                    all_configs.insert(0, copy.deepcopy(base_config))
+                else:
+                    all_configs.append(copy.deepcopy(base_config))
+                del base_config['outbounds'][0]
+        else:  # single outbound
+            base_config['outbounds'].insert(0, outbounds[0])
+            all_configs = base_config
+
+    if not all_configs:
+        return ''
     json_configs = json.dumps(all_configs, indent=2, cls=hutils.proxy.ProxyJsonEncoder)
     return json_configs
 
 
 def to_xray(proxy: dict) -> dict:
     outbound = {
-        'tag': f'{proxy["extra_info"]} {proxy["name"]} § {proxy["port"]} {proxy["dbdomain"].id}',
+        'tag': f'{proxy["extra_info"]} {proxy["name"]}',
         'protocol': str(proxy['proto']),
         'settings': {},
         'streamSettings': {},
@@ -397,3 +429,8 @@ def add_mux_to_link(proxy: dict) -> str:
     out = {}
     add_mux_to_dict(out, proxy)
     return hutils.encode.convert_dict_to_url(out)
+
+
+def null_config(tag: str) -> dict:
+    base_config = json.loads(render_template('base_xray_config.json.j2', remarks=tag))
+    return base_config

hiddifypanel/panel/admin/SettingAdmin.py

@@ -55,7 +55,9 @@ class SettingAdmin(FlaskView):
                         if k.type == str:
                             if "_domain" in k or "_fakedomain" in k:
                                 v = v.lower()
-
+                            if k == ConfigEnum.warp_sites and 'https://' in v:
+                                hutils.flask.flash(_("config.warp-https-domain-for-warp-site"), 'error')
+                                return render_template('config.html', form=form)
                             if "port" in k:
                                 for p in v.split(","):
                                     for k2, v2 in c_items.items():
@@ -249,7 +251,7 @@ def get_config_form():
 
             elif c.key == ConfigEnum.warp_sites:
                 validators = [wtf.validators.Length(max=2048),
-                              wtf.validators.Regexp(r'^([\w.-]+)?(?:\n[\w.-]+)*$', re.IGNORECASE, _("config.invalid-pattern-for-warp-sites") + f' {c.key}')
+                              wtf.validators.Regexp(r'^(?:[\w.-]+\.\w+(?:\.\w+)?(?:\r?\n|$)|^$)', 0, _("config.invalid-pattern-for-warp-sites") + f' {c.key}')
                               ]
                 render_kw = {'class': "ltr", 'maxlength': 2048}
                 field = wtf.TextAreaField(_(f'config.{c.key}.label'), validators, default=c.value,

hiddifypanel/panel/user/user.py

@@ -57,8 +57,8 @@ class UserView(FlaskView):
     @route("/xray")
     @login_required(roles={Role.user})
     def xray(self):
-        c = c = get_common_data(g.account.uuid, mode="new")
-        configs = hutils.proxy.xrayjson.configs_as_json(c['domains'], c['profile_title'])
+        c = get_common_data(g.account.uuid, mode="new")
+        configs = hutils.proxy.xrayjson.configs_as_json(c['domains'], c['user'], c['expire_days'], c['profile_title'])
         return add_headers(configs, c, 'application/json')
 
     @route("/singbox/")
@@ -230,7 +230,7 @@ class UserView(FlaskView):
             resp = ""
         else:
             # render_template('all_configs.txt', **c, base64=hutils.encode.do_base_64)
-            resp = hutils.proxy.xray.make_v2ray_configs(**c)
+            resp = hutils.proxy.xray.make_v2ray_configs(c['domains'], c['user'], c['expire_days'], c['ip_debug'])
 
         if base64:
             resp = hutils.encode.do_base_64(resp)

hiddifypanel/translations/en/LC_MESSAGES/messages.po

@@ -11,6 +11,9 @@ msgstr "%(count)s records were successfully disabled."
 msgid "%(count)s records were successfully enabled."
 msgstr "%(count)s records were successfully enabled."
 
+msgid "%(expire_days)s days"
+msgstr "%(expire_days)s days"
+
 msgid "%(placeholder)s"
 msgstr "%(placeholder)s"
 
@@ -2162,6 +2165,9 @@ msgstr "Active VMess Protocol"
 msgid "config.vmess_enable.label"
 msgstr "♈️ Enable VMess"
 
+msgid "config.warp-https-domain-for-warp-site"
+msgstr "config.warp-https-domain-for-warp-site"
+
 msgid "config.warp.description"
 msgstr ""
 "Warp is a tool that hides your server IP in outbound traffic. It means if the users are visiting a website the Warp IP is exposed instead of our server IP.\n"
@@ -2812,6 +2818,3 @@ msgstr "📅 Weekly"
 
 msgid "worker"
 msgstr "✴️ Cloudflare Worker"
-
-msgid "📅%(expire_days)s days"
-msgstr "📅%(expire_days)s Days Remain"

hiddifypanel/translations/fa/LC_MESSAGES/messages.po

@@ -11,6 +11,9 @@ msgstr "%(count)s رکورد با موفقیت غیرفعال شد."
 msgid "%(count)s records were successfully enabled."
 msgstr "%(count)s رکوردها با موفقیت فعال شد."
 
+msgid "%(expire_days)s days"
+msgstr ""
+
 msgid "%(placeholder)s"
 msgstr "%(placeholder)s"
 
@@ -2157,6 +2160,9 @@ msgstr "فعال کردن پروتکل VMess"
 msgid "config.vmess_enable.label"
 msgstr "♈️ فعال کردن VMess"
 
+msgid "config.warp-https-domain-for-warp-site"
+msgstr ""
+
 msgid "config.warp.description"
 msgstr ""
 "وارپ ابزاری هست که آی پی سرور شما را در ترافیک خروجی مخفی می‌کند. بدین صورت وقتی کاربران از وبسایتی بازدید می‌کنند، آیپی وارپ به جای آیپی سرور شما نمایش داده می‌شود.\n"
@@ -2812,6 +2818,3 @@ msgstr "📅 هفتگی"
 
 msgid "worker"
 msgstr "✴️ ورکر کلودفلر"
-
-msgid "📅%(expire_days)s days"
-msgstr "📅%(expire_days)s روز اعتبار"

hiddifypanel/translations/pt/LC_MESSAGES/messages.po

@@ -11,6 +11,9 @@ msgstr "%(count)s registros foram desativados com sucesso."
 msgid "%(count)s records were successfully enabled."
 msgstr "%(count)s registros foram ativados com sucesso."
 
+msgid "%(expire_days)s days"
+msgstr ""
+
 msgid "%(placeholder)s"
 msgstr "%(placeholder)s"
 
@@ -2083,6 +2086,9 @@ msgstr ""
 msgid "config.vmess_enable.label"
 msgstr "♈️ Habilitar VMess"
 
+msgid "config.warp-https-domain-for-warp-site"
+msgstr ""
+
 msgid "config.warp.description"
 msgstr ""
 "Warp é uma ferramenta que esconde o IP do seu servidor dos sites onde os usuários navegam \n"
@@ -2705,6 +2711,3 @@ msgstr "📅 Semanal"
 
 msgid "worker"
 msgstr "✴️ Cloudflare Worker"
-
-msgid "📅%(expire_days)s days"
-msgstr "📅Remanescem: %(expire_days)s dias"

hiddifypanel/translations/ru/LC_MESSAGES/messages.po

@@ -11,6 +11,9 @@ msgstr "%(count)s записей были успешно отключены."
 msgid "%(count)s records were successfully enabled."
 msgstr "%(count)s записей были успешно включены."
 
+msgid "%(expire_days)s days"
+msgstr ""
+
 msgid "%(placeholder)s"
 msgstr "%(placeholder)s"
 
@@ -2178,6 +2181,9 @@ msgstr ""
 msgid "config.vmess_enable.label"
 msgstr "♈️ Включить VMess"
 
+msgid "config.warp-https-domain-for-warp-site"
+msgstr ""
+
 msgid "config.warp.description"
 msgstr ""
 "Warp — это инструмент, который скрывает IP-адрес вашего сервера от сайтов, которые посещают ваши пользователи.\n"
@@ -2812,6 +2818,3 @@ msgstr "📅 Еженедельно"
 
 msgid "worker"
 msgstr "✴️ Cloudflare Worker"
-
-msgid "📅%(expire_days)s days"
-msgstr "Осталось 📅%(expire_days)s дней"

hiddifypanel/translations/zh/LC_MESSAGES/messages.po

@@ -11,6 +11,9 @@ msgstr "%(count)s 条记录已成功禁用。"
 msgid "%(count)s records were successfully enabled."
 msgstr "%(count)s 条记录已成功启用。"
 
+msgid "%(expire_days)s days"
+msgstr ""
+
 msgid "%(placeholder)s"
 msgstr "%(placeholder)s"
 
@@ -2013,6 +2016,9 @@ msgstr "据多位人士透露，VMess 导致该系统被政府检测到。所以
 msgid "config.vmess_enable.label"
 msgstr "♈️启用VMess"
 
+msgid "config.warp-https-domain-for-warp-site"
+msgstr ""
+
 msgid "config.warp.description"
 msgstr ""
 "Warp 是一种在出站流量中隐藏服务器 IP 的工具。这意味着如果用户访问网站，则暴露的是 Warp IP，而不是我们的服务器 IP。\n"
@@ -2623,6 +2629,3 @@ msgstr "📅每周"
 
 msgid "worker"
 msgstr "✴️ Cloudflare 工作人员"
-
-msgid "📅%(expire_days)s days"
-msgstr "📅%(expire_days)s 天剩余"

hiddifypanel/translations.i18n/en.json

@@ -2,6 +2,7 @@
   " Search Settings": " Search Settings",
   "%(count)s records were successfully disabled.": "%(count)s records were successfully disabled.",
   "%(count)s records were successfully enabled.": "%(count)s records were successfully enabled.",
+  "%(expire_days)s days": "%(expire_days)s days",
   "%(placeholder)s": "%(placeholder)s",
   "0 - Last day": "Last Day",
   "Access Denied!": "Access Denied",
@@ -906,6 +907,7 @@
       "description": "Active VMess Protocol",
       "label": "♈️ Enable VMess"
     },
+    "warp-https-domain-for-warp-site": "config.warp-https-domain-for-warp-site",
     "warp": {
       "description": "Warp is a tool that hides your server IP in outbound traffic. It means if the users are visiting a website the Warp IP is exposed instead of our server IP.\n<br>\nFor example, if you have a problem with captcha on Google, it might be fixed this way.",
       "label": "WARP➕"
@@ -1170,6 +1172,5 @@
   "user.home.select os": "Please Select Your Operating System.",
   "user.home.select tool": "Please select the item.",
   "weekly": "📅 Weekly",
-  "worker": "✴️ Cloudflare Worker",
-  "📅%(expire_days)s days": "📅%(expire_days)s Days Remain"
+  "worker": "✴️ Cloudflare Worker"
 }

hiddifypanel/translations.i18n/fa.json

@@ -2,6 +2,7 @@
   " Search Settings": " تنظیمات جستجو",
   "%(count)s records were successfully disabled.": "%(count)s رکورد با موفقیت غیرفعال شد.",
   "%(count)s records were successfully enabled.": "%(count)s رکوردها با موفقیت فعال شد.",
+  "%(expire_days)s days": "",
   "%(placeholder)s": "%(placeholder)s",
   "0 - Last day": "آخرین روز",
   "Access Denied!": "دسترسی غیرمجاز",
@@ -906,6 +907,7 @@
       "description": "فعال کردن پروتکل VMess",
       "label": "♈️ فعال کردن VMess"
     },
+    "warp-https-domain-for-warp-site": "",
     "warp": {
       "description": "وارپ ابزاری هست که آی پی سرور شما را در ترافیک خروجی مخفی می‌کند. بدین صورت وقتی کاربران از وبسایتی بازدید می‌کنند، آیپی وارپ به جای آیپی سرور شما نمایش داده می‌شود.\n<br>\nبرای مثال اگر با کپچای گوگل مشکل دارید با استفاده از این ابزار مشکل رفع شود",
       "label": "WARP"
@@ -1170,6 +1172,5 @@
   "user.home.select os": "لطفا سیستم عامل خود را انتخاب کنید.",
   "user.home.select tool": "لطفا یکی از موارد زیر را انتخاب کنید.",
   "weekly": "📅 هفتگی",
-  "worker": "✴️ ورکر کلودفلر",
-  "📅%(expire_days)s days": "📅%(expire_days)s روز اعتبار"
+  "worker": "✴️ ورکر کلودفلر"
 }

hiddifypanel/translations.i18n/pt.json

@@ -2,6 +2,7 @@
   " Search Settings": " Configurações de pesquisa",
   "%(count)s records were successfully disabled.": "%(count)s registros foram desativados com sucesso.",
   "%(count)s records were successfully enabled.": "%(count)s registros foram ativados com sucesso.",
+  "%(expire_days)s days": "",
   "%(placeholder)s": "%(placeholder)s",
   "0 - Last day": "Último dia",
   "Access Denied!": "Acesso negado",
@@ -906,6 +907,7 @@
       "description": "É relatado por várias pessoas que o VMess faz com que o sistema seja detectado pelo governo. Então não é recomendado",
       "label": "♈️ Habilitar VMess"
     },
+    "warp-https-domain-for-warp-site": "",
     "warp": {
       "description": "Warp é uma ferramenta que esconde o IP do seu servidor dos sites onde os usuários navegam \n<br>\nPor exemplo, se você tiver um problema com o Google, ele pode ser corrigido.",
       "label": "WARP Plus"
@@ -1170,6 +1172,5 @@
   "user.home.select os": "Selecione seu sistema operacional.",
   "user.home.select tool": "Selecione o item.",
   "weekly": "📅 Semanal",
-  "worker": "✴️ Cloudflare Worker",
-  "📅%(expire_days)s days": "📅Remanescem: %(expire_days)s dias"
+  "worker": "✴️ Cloudflare Worker"
 }

hiddifypanel/translations.i18n/ru.json

@@ -2,6 +2,7 @@
   " Search Settings": " Настройки поиска",
   "%(count)s records were successfully disabled.": "%(count)s записей были успешно отключены.",
   "%(count)s records were successfully enabled.": "%(count)s записей были успешно включены.",
+  "%(expire_days)s days": "",
   "%(placeholder)s": "%(placeholder)s",
   "0 - Last day": "Последний день",
   "Access Denied!": "Доступ запрещен",
@@ -906,6 +907,7 @@
       "description": "Несколько человек сообщили, что VMess позволляет правительствам обнаруживать систему.  Не рекомендуется",
       "label": "♈️ Включить VMess"
     },
+    "warp-https-domain-for-warp-site": "",
     "warp": {
       "description": "Warp — это инструмент, который скрывает IP-адрес вашего сервера от сайтов, которые посещают ваши пользователи.\n<br>\nНапример, если у вас возникла проблема с Google, ее можно исправить.",
       "label": "WARP➕"
@@ -1170,6 +1172,5 @@
   "user.home.select os": "Пожалуйста, выберите вашу операционную систему",
   "user.home.select tool": "Пожалуйста, выберите",
   "weekly": "📅 Еженедельно",
-  "worker": "✴️ Cloudflare Worker",
-  "📅%(expire_days)s days": "Осталось 📅%(expire_days)s дней"
+  "worker": "✴️ Cloudflare Worker"
 }

hiddifypanel/translations.i18n/zh.json

@@ -2,6 +2,7 @@
   " Search Settings": "搜索设置",
   "%(count)s records were successfully disabled.": "%(count)s 条记录已成功禁用。",
   "%(count)s records were successfully enabled.": "%(count)s 条记录已成功启用。",
+  "%(expire_days)s days": "",
   "%(placeholder)s": "%(placeholder)s",
   "0 - Last day": "最后一天",
   "Access Denied!": "拒绝访问",
@@ -906,6 +907,7 @@
       "description": "据多位人士透露，VMess 导致该系统被政府检测到。所以不推荐",
       "label": "♈️启用VMess"
     },
+    "warp-https-domain-for-warp-site": "",
     "warp": {
       "description": "Warp 是一种在出站流量中隐藏服务器 IP 的工具。这意味着如果用户访问网站，则暴露的是 Warp IP，而不是我们的服务器 IP。\n<br>\n例如，如果您在 Google 上遇到验证码问题，则可能会通过这种方式修复。",
       "label": "扭曲➕"
@@ -1170,6 +1172,5 @@
   "user.home.select os": "请选择您的操作系统。",
   "user.home.select tool": "请选择该项目。",
   "weekly": "📅每周",
-  "worker": "✴️ Cloudflare 工作人员",
-  "📅%(expire_days)s days": "📅%(expire_days)s 天剩余"
+  "worker": "✴️ Cloudflare 工作人员"
 }

{hiddifypanel-10.20.1.dist-info → hiddifypanel-10.20.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hiddifypanel
-Version: 10.20.1
+Version: 10.20.3
 Summary: hiddifypanel multi proxy panel
 Home-page: https://github.com/hiddify/hiddify-manager/
 Author: hiddify

{hiddifypanel-10.20.1.dist-info → hiddifypanel-10.20.3.dist-info}/RECORD

@@ -1,6 +1,6 @@
 hiddifypanel/Events.py,sha256=AlnRdjVul0jP-NCT4-zoaQgowoOo-JhdQB4ytetAFKA,723
-hiddifypanel/VERSION,sha256=KnfsmD_isiM9oHwENXBfENLwz-kfBDeF-5NT4y-9VJg,8
-hiddifypanel/VERSION.py,sha256=xEzbPeU28VLr3xkRkbcITxhiEzIoyca-Qfa7Mgzvop8,113
+hiddifypanel/VERSION,sha256=IO52j1jVy4Bis2Net3pg7wjvnYTileI1AjndAMUY60k,8
+hiddifypanel/VERSION.py,sha256=xehpyJ2UmcW72n7u0fwzKPpwiK3LY3qZXZ1bW7Y4RNI,113
 hiddifypanel/__init__.py,sha256=aLukp3ORszdcH4G9J-MlxhjHN6yFlOuOE6mm-L3aG_g,266
 hiddifypanel/__main__.py,sha256=IVchnXpK6bm8T3N--mN17HBQNLMeLAjyP7iwzULexB4,218
 hiddifypanel/auth.py,sha256=5GUwwKCRY90RS0WTKPfqzuOYuLuwGLpNLpnKmubf7DE,7405
@@ -38,8 +38,8 @@ hiddifypanel/hutils/proxy/__init__.py,sha256=xXBa83kjYT_b-BNseEykfQYyJBQHTq1Zosf
 hiddifypanel/hutils/proxy/clash.py,sha256=ERyiuUZibOUYvkyC1HPLCRPNB1lrZpuuafey2St7XtI,5820
 hiddifypanel/hutils/proxy/shared.py,sha256=w6RWpPrcZpOauXotfbzC70QTrrvO26tyNbTDrtFyXIk,21801
 hiddifypanel/hutils/proxy/singbox.py,sha256=ssaO5lCK6CmZ3BIHgAdlD7GcMZljJSF8DaMissgw_Jw,10800
-hiddifypanel/hutils/proxy/xray.py,sha256=HDK4PsyY8qnnmQ51hNiP4UKJVXE-nMjIRuFjF1ZcHOY,10769
-hiddifypanel/hutils/proxy/xrayjson.py,sha256=to71KVhsh9scmRyQjgS19QYWKze2GjE4seQJM4_rIVk,13402
+hiddifypanel/hutils/proxy/xray.py,sha256=AlhgNgGS-D2TPrZvhlk2-wWVR1wpt4o0Aa4hNpult1o,10630
+hiddifypanel/hutils/proxy/xrayjson.py,sha256=GTtGkWiZHmOsIyg267f_VcmxcyBR3durIP1iIvGlFtM,14910
 hiddifypanel/models/__init__.py,sha256=W7lWG_7jNNPn-cdXV5wMmuPv1unHUFVlMd9OmwDn2gM,860
 hiddifypanel/models/admin.py,sha256=W1C0R9fhLtwjnIzgPgiVcaNXc6YzzIolAsyy4QaqQKw,6936
 hiddifypanel/models/base_account.py,sha256=T2vllZo1QTGzYos3njgdYtAlnYB77LYrfzpEoO8yRk8,3060
@@ -75,7 +75,7 @@ hiddifypanel/panel/admin/DomainAdmin.py,sha256=n6vNX58Bc7LxYwkXcAIOKf8GZuES3-AgW
 hiddifypanel/panel/admin/NodeAdmin.py,sha256=QAHQjF7e7F4KqsWNWpMt7SoLANlFEborVtWQV9OXJ2E,3102
 hiddifypanel/panel/admin/ProxyAdmin.py,sha256=e-tCTfsEjqjbRezhVJvFyQZHh-uluvHFZXXwc4aFRDE,5319
 hiddifypanel/panel/admin/QuickSetup.py,sha256=X8d492PLQu8vNtabh-X2R2IDZVs_5pmWeyn-Qz5_qXk,7560
-hiddifypanel/panel/admin/SettingAdmin.py,sha256=Xo3cFhwOtcsgwWgq5TE4kHCYe4kD1isDDrG9bPwndlc,18848
+hiddifypanel/panel/admin/SettingAdmin.py,sha256=NJr4ow2bTGf8w2mDmTlct_B4-2dd3w2E7BoJdepb1mQ,19115
 hiddifypanel/panel/admin/Terminal.py,sha256=fjLVLspXYHOwZGyMU_KbytWe1zf-m6KbmvBPEDps45w,1737
 hiddifypanel/panel/admin/UserAdmin.py,sha256=pAiZRoDxQRjcZOUhGu5nRqglTuippeXgiGxTOf-Thv4,17145
 hiddifypanel/panel/admin/__init__.py,sha256=hb0A2HuK_nBZRCNPumwahXX-25FMxODKYlNbk2ItF08,3015
@@ -177,7 +177,7 @@ hiddifypanel/panel/common_bp/login.py,sha256=eDynKaUI6Q015E8cByMNT9twBw7xIiFL6TD
 hiddifypanel/panel/common_bp/templates/login.html,sha256=jDl9-Nh2qMuCsLQmXm7e5jvSaRAlBxReVVCbNSTTHJw,1312
 hiddifypanel/panel/user/__init__.py,sha256=E9RxA2YGc0eXLGjfJbyryeLG3bXEWJ3DoVOyIpVaDIo,1859
 hiddifypanel/panel/user/link_maker.html,sha256=g420NAm_fUI8asYjyfCiXyUOIwEQfDPonZA9xh3p0-8,177
-hiddifypanel/panel/user/user.py,sha256=PU0PWsa4AoS1MKtr-8wvZObfIFg6385q7LD3B8xRHg8,13868
+hiddifypanel/panel/user/user.py,sha256=3xtEdHjogJomrgDflhSDG7_QERi9S9v6YO-KSjU0r6Q,13946
 hiddifypanel/panel/user/templates/all_configs copy.txt,sha256=u5jhAgjhH07_0csdIisuXy2HNCC9SWlP0whBAGFXA78,564
 hiddifypanel/panel/user/templates/all_configs.txt,sha256=i8I6g9ujOr3RIuRoGRqY2Q75I89mbHko_JVPvQt4E_g,1260
 hiddifypanel/panel/user/templates/base_singbox_config.json.j2,sha256=xhvQpm0fp2w3VA8N7zXbYs8RWlRgdyApiedFH_sRTfM,7107
@@ -820,24 +820,24 @@ hiddifypanel/templates/redirect.html,sha256=K9x_O4P96vEkqBhOXIhoGrWw1KIqd2bL0BjI
 hiddifypanel/templates/static.html,sha256=jp6q4wtx-k2A_cjqJoNiMS7Ee30arE45qI3ev4d5ky4,165
 hiddifypanel/templates/hiddify-flask-admin/actions.html,sha256=2NeITe2e-lPKCk_o511tCIqVtrPu8LYHE1wTCtrFUrI,1331
 hiddifypanel/templates/hiddify-flask-admin/list.html,sha256=MBGrTqZpzNLe4sZy0RozvXNr8seFUQc2C6v88BJtNWc,11095
-hiddifypanel/translations/en/LC_MESSAGES/messages.mo,sha256=l_WfRppCqbivGlI4mKQh9Q5m9cnKetdNeRrI5aoaxyM,74599
-hiddifypanel/translations/en/LC_MESSAGES/messages.po,sha256=JYdJWkz8ZjeqzNdbz1kOOAw11YHMpFU447R1SYaD1Sg,77783
-hiddifypanel/translations/fa/LC_MESSAGES/messages.mo,sha256=iH6adtqgLx5Z05BalNlPhWEKGvbnua2VjubnKYRgYOY,96482
-hiddifypanel/translations/fa/LC_MESSAGES/messages.po,sha256=c4_SjizFofBr6uNRAlD8j9HRbVv4f4SCGVlFGWxMWA8,101063
-hiddifypanel/translations/pt/LC_MESSAGES/messages.mo,sha256=rqrVjLXWQLOlqMJTTejOn99VDNwOvf8f-q4dvBDFWKk,60612
-hiddifypanel/translations/pt/LC_MESSAGES/messages.po,sha256=tUp3Ed-ZBDZeD99yb7o6I76wWUU_QQT2i_cQfNV_7Zk,69869
-hiddifypanel/translations/ru/LC_MESSAGES/messages.mo,sha256=4yCB1BiDkQl-jjH-_JLt7th-8wcsFuXFrLqyMY0SrjY,95543
-hiddifypanel/translations/ru/LC_MESSAGES/messages.po,sha256=ojNL5z1gvjgiO-5hjccCLhK0Z-CeZKrwE3yiEE4ekeg,102007
-hiddifypanel/translations/zh/LC_MESSAGES/messages.mo,sha256=2bRQTKmoZuvDIeK74v9yDAamllxDYLfv06pkAa5NGFA,60878
-hiddifypanel/translations/zh/LC_MESSAGES/messages.po,sha256=f0fv1MW5_Okc5GixUoPv5BkV0XwM6wKrjK7khLeiv18,69040
-hiddifypanel/translations.i18n/en.json,sha256=SEBuSZt0rP6l-IK3dkZteEEvzLs3JVMwfaWCiak_jBk,67764
-hiddifypanel/translations.i18n/fa.json,sha256=Xn6sJ8o74HE8qjzOjgjW-LzHJRrHk7Aze-6EYts2Gt0,91044
-hiddifypanel/translations.i18n/pt.json,sha256=Wh72C6ToJUVXgAfB_2JqJKQjw0_Rvv7gsYIp8-Nbd8Q,60171
-hiddifypanel/translations.i18n/ru.json,sha256=WNSflb5-l-CWOQ71SWhDSkgQLkJVHeZ_dehn3lRyv0s,91988
-hiddifypanel/translations.i18n/zh.json,sha256=17fERyiPhWV2899MMynfIeuZL6X7u-_pWd0h5n6FJUo,59588
-hiddifypanel-10.20.1.dist-info/LICENSE.md,sha256=oDrt-cUsyiDGnRPjEJh-3dH2ddAuK_bIVBD8ntkOtZw,19807
-hiddifypanel-10.20.1.dist-info/METADATA,sha256=Df5CZDriSxHUrZ6ZNpkpqH2g2mKCSD2lzR2U-EN0ZwI,4009
-hiddifypanel-10.20.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-hiddifypanel-10.20.1.dist-info/entry_points.txt,sha256=Xzpqlh3nwBtZhoV9AANJykano056VJvYzaujxPztJaM,60
-hiddifypanel-10.20.1.dist-info/top_level.txt,sha256=rv-b3qFWUZQTBy0kyBfsr7L6tPpeO7AaQlLHXn-HI5M,13
-hiddifypanel-10.20.1.dist-info/RECORD,,
+hiddifypanel/translations/en/LC_MESSAGES/messages.mo,sha256=G5s5HSSAXl_gS7XiO3wLQctGxIe_AJ37RIVRId1JQv0,74678
+hiddifypanel/translations/en/LC_MESSAGES/messages.po,sha256=8tJG6Ax9Pufa8Mf80afoWBIAN8zomLn_HxEi-Y_MhWw,77864
+hiddifypanel/translations/fa/LC_MESSAGES/messages.mo,sha256=2KbsrcjDAGp1RDsNb8lw48VPajvbuq-in-OTuMMJhys,96401
+hiddifypanel/translations/fa/LC_MESSAGES/messages.po,sha256=QNcaCNYTAn5HgZLdSal9Oxp9wpXANcfgRpBFJaCcHPk,101078
+hiddifypanel/translations/pt/LC_MESSAGES/messages.mo,sha256=mNYRmlCiWtc8eJIrQopCSFpMTFGN8k76O-0XDrVCfwo,60534
+hiddifypanel/translations/pt/LC_MESSAGES/messages.po,sha256=6-lVK4mB0qvYLwaduBpgxY1DE_DDKFVNZ-dUBPsOhJo,69887
+hiddifypanel/translations/ru/LC_MESSAGES/messages.mo,sha256=QnHAVqrFSoJhp8Rbt1Q78DHyAzndvGViT5mk4B-vToY,95456
+hiddifypanel/translations/ru/LC_MESSAGES/messages.po,sha256=2Xd_RMn2dvdHmL9KCwY2-DN-W76OuMTISQD_a0KToyc,102016
+hiddifypanel/translations/zh/LC_MESSAGES/messages.mo,sha256=KvM9AX0EuWWhqKdFvRKOwPTbTkw6zrh_oDUGIMHQLHU,60807
+hiddifypanel/translations/zh/LC_MESSAGES/messages.po,sha256=oE-v6foE3j8oECylwq1ovNkpoL7v6gDoLzjozZ2KmX0,69065
+hiddifypanel/translations.i18n/en.json,sha256=Qr2eumDQXKhcppbJuo9psZ_cJHVCTtj6ZOflGNig6dk,67830
+hiddifypanel/translations.i18n/fa.json,sha256=R9As455CkWu9d89_MYiypZvT-j2w282zje3Ygm_3qYA,91044
+hiddifypanel/translations.i18n/pt.json,sha256=DgHKvk-p0mJzm8RwHB7m0-JiOkgmv5YK65Wv3iydJqY,60174
+hiddifypanel/translations.i18n/ru.json,sha256=6NavdAs1-19oKWQfrIpkf0tKdP4vN4pwEx1c1r2nfYQ,91982
+hiddifypanel/translations.i18n/zh.json,sha256=jRezlHlG4PjDa4RxvIvsU_ByswoyQ1prn5O7KSFpGDM,59598
+hiddifypanel-10.20.3.dist-info/LICENSE.md,sha256=oDrt-cUsyiDGnRPjEJh-3dH2ddAuK_bIVBD8ntkOtZw,19807
+hiddifypanel-10.20.3.dist-info/METADATA,sha256=VM2mK04Tgzp0xICK9uVCUQJfUd434naibQ3dtkAyiPQ,4009
+hiddifypanel-10.20.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+hiddifypanel-10.20.3.dist-info/entry_points.txt,sha256=Xzpqlh3nwBtZhoV9AANJykano056VJvYzaujxPztJaM,60
+hiddifypanel-10.20.3.dist-info/top_level.txt,sha256=rv-b3qFWUZQTBy0kyBfsr7L6tPpeO7AaQlLHXn-HI5M,13
+hiddifypanel-10.20.3.dist-info/RECORD,,