hiddifypanel 10.20.2__tar.gz → 10.20.4__tar.gz

{hiddifypanel-10.20.2 → hiddifypanel-10.20.4}/HISTORY.md

@@ -1,6 +1,26 @@
 # Changelog
 
 
+## v10.20.3 (2024-04-12)
+
+#### Fix
+
+* Another warp_sites bug. 
+
+#### Other
+
+* Merge pull request #195 from Iam54r1n4/devp10-patch-5. 
+  _Add usage to xray sub & code refactor_
+
+* Add: usage to xray sub & code refactor. 
+
+* Merge pull request #194 from Iam54r1n4/devp10-patch-4. 
+  _Fix another warp_sites bug_
+
+* Update translations. 
+
+
+
 ## v10.20.2 (2024-04-12)
 
 #### Fix

{hiddifypanel-10.20.2 → hiddifypanel-10.20.4}/PKG-INFO

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

hiddifypanel-10.20.4/hiddifypanel/VERSION

@@ -0,0 +1 @@
+10.20.4

hiddifypanel-10.20.4/hiddifypanel/VERSION.py

@@ -0,0 +1,3 @@
+__version__='10.20.4'
+from datetime import datetime
+__release_date__= datetime.strptime('2024-04-13','%Y-%m-%d')

{hiddifypanel-10.20.2 → hiddifypanel-10.20.4}/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-10.20.2 → hiddifypanel-10.20.4}/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-10.20.2 → hiddifypanel-10.20.4}/hiddifypanel/panel/admin/SettingAdmin.py

@@ -251,7 +251,7 @@ def get_config_form():
 
             elif c.key == ConfigEnum.warp_sites:
                 validators = [wtf.validators.Length(max=2048),
-                              wtf.validators.Regexp(r'^[\w.-]+\.\w+(?:\.\w+)?(?:\r?\n|$)', 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-10.20.2 → hiddifypanel-10.20.4}/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-10.20.2 → hiddifypanel-10.20.4}/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"
 
@@ -2815,6 +2818,3 @@ msgstr "📅 Weekly"
 
 msgid "worker"
 msgstr "✴️ Cloudflare Worker"
-
-msgid "📅%(expire_days)s days"
-msgstr "📅%(expire_days)s Days Remain"

{hiddifypanel-10.20.2 → hiddifypanel-10.20.4}/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"
 
@@ -2815,6 +2818,3 @@ msgstr "📅 هفتگی"
 
 msgid "worker"
 msgstr "✴️ ورکر کلودفلر"
-
-msgid "📅%(expire_days)s days"
-msgstr "📅%(expire_days)s روز اعتبار"

{hiddifypanel-10.20.2 → hiddifypanel-10.20.4}/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"
 
@@ -2708,6 +2711,3 @@ msgstr "📅 Semanal"
 
 msgid "worker"
 msgstr "✴️ Cloudflare Worker"
-
-msgid "📅%(expire_days)s days"
-msgstr "📅Remanescem: %(expire_days)s dias"

{hiddifypanel-10.20.2 → hiddifypanel-10.20.4}/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"
 
@@ -2815,6 +2818,3 @@ msgstr "📅 Еженедельно"
 
 msgid "worker"
 msgstr "✴️ Cloudflare Worker"
-
-msgid "📅%(expire_days)s days"
-msgstr "Осталось 📅%(expire_days)s дней"

{hiddifypanel-10.20.2 → hiddifypanel-10.20.4}/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"
 
@@ -2626,6 +2629,3 @@ msgstr "📅每周"
 
 msgid "worker"
 msgstr "✴️ Cloudflare 工作人员"
-
-msgid "📅%(expire_days)s days"
-msgstr "📅%(expire_days)s 天剩余"

{hiddifypanel-10.20.2 → hiddifypanel-10.20.4}/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",
@@ -1171,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-10.20.2 → hiddifypanel-10.20.4}/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!": "دسترسی غیرمجاز",
@@ -1171,6 +1172,5 @@
   "user.home.select os": "لطفا سیستم عامل خود را انتخاب کنید.",
   "user.home.select tool": "لطفا یکی از موارد زیر را انتخاب کنید.",
   "weekly": "📅 هفتگی",
-  "worker": "✴️ ورکر کلودفلر",
-  "📅%(expire_days)s days": "📅%(expire_days)s روز اعتبار"
+  "worker": "✴️ ورکر کلودفلر"
 }

{hiddifypanel-10.20.2 → hiddifypanel-10.20.4}/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",
@@ -1171,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-10.20.2 → hiddifypanel-10.20.4}/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!": "Доступ запрещен",
@@ -1171,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-10.20.2 → hiddifypanel-10.20.4}/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!": "拒绝访问",
@@ -1171,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.2 → hiddifypanel-10.20.4}/hiddifypanel.egg-info/PKG-INFO

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

hiddifypanel-10.20.2/hiddifypanel/VERSION

@@ -1 +0,0 @@
-10.20.2

hiddifypanel-10.20.2/hiddifypanel/VERSION.py

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