hiddifypanel 8.0.0.dev58__py3-none-any.whl → 8.0.0.dev60__py3-none-any.whl

hiddifypanel/VERSION

@@ -1 +1 @@
-8.0.0.dev58
+8.0.0.dev60

hiddifypanel/VERSION.py

@@ -1,3 +1,3 @@
-__version__='8.0.0.dev58'
+__version__='8.0.0.dev60'
 from datetime import datetime
 __release_date__= datetime.strptime('2023-08-27','%Y-%m-%d')

hiddifypanel/panel/hiddify.py

@@ -742,18 +742,18 @@ def get_user_agent():
 def __parse_user_agent(ua):
     uaa = user_agents.parse(request.user_agent.string)
     res = {}
-    res["is_browser"] = re.match('^Mozilla', ua, re.IGNORECASE)
+    res["is_browser"] = re.match('^Mozilla', ua, re.IGNORECASE) and True
     res['os'] = uaa.os.family
     res['os_version'] = uaa.os.version
-    res['is_clash'] = re.match('^(Clash|Stash)', ua, re.IGNORECASE)
-    res['is_clash_meta'] = re.match('^(Clash-verge|Clash-?Meta|Stash|NekoBox|NekoRay|Pharos|hiddify-desktop)', ua, re.IGNORECASE)
-    res['is_singbox'] = re.match('^(HiddifyNext|Dart|SFI|SFA)', ua, re.IGNORECASE)
+    res['is_clash'] = re.match('^(Clash|Stash)', ua, re.IGNORECASE) and True
+    res['is_clash_meta'] = re.match('^(Clash-verge|Clash-?Meta|Stash|NekoBox|NekoRay|Pharos|hiddify-desktop)', ua, re.IGNORECASE) and True
+    res['is_singbox'] = re.match('^(HiddifyNext|Dart|SFI|SFA)', ua, re.IGNORECASE) and True
     if (res['is_singbox']):
         res['singbox_version'] = (1, 4, 0)
-    res['is_hiddify'] = re.match('^(HiddifyNext)', ua, re.IGNORECASE)
+    res['is_hiddify'] = re.match('^(HiddifyNext)', ua, re.IGNORECASE) and True
     if ['is_hiddify']:
         res['hiddify_version'] = uaa
-    res['is_v2ray'] = re.match('^(Hiddify|FoXray|Fair|v2rayNG|SagerNet|Shadowrocket|V2Box|Loon|Liberty)', ua, re.IGNORECASE)
+    res['is_v2ray'] = re.match('^(Hiddify|FoXray|Fair|v2rayNG|SagerNet|Shadowrocket|V2Box|Loon|Liberty)', ua, re.IGNORECASE) and True
 
     if res['os'] == 'Other':
         if re.match('^(FoXray|Fair|Shadowrocket|V2Box|Loon|Liberty)', ua, re.IGNORECASE):
@@ -766,3 +766,9 @@ def __parse_user_agent(ua):
     if res["is_browser"]:
         res['app'] = uaa.browser.family
     return res
+
+
+
+def url_encode(strr):
+    import urllib.parse
+    return urllib.parse.quote(strr)

hiddifypanel/panel/user/link_maker.py

@@ -222,7 +222,7 @@ def to_link(proxy):
     if 'error' in proxy:
         return proxy
 
-    name_link = proxy['extra_info'] + "_" + proxy["name"]
+    name_link = hiddify.url_encode(proxy['extra_info'] + "_" + proxy["name"])
     if proxy['proto'] == 'vmess':
         # print(proxy)
         vmess_type = None
@@ -683,28 +683,37 @@ def make_full_singbox_config(domains, **kwargs):
     return json.dumps(base_config, indent=4)
 
 
-def make_v2ray_configs(user, user_activate, domains, expire_days, ip_debug, **kwargs):
+def make_v2ray_configs(user, user_activate, domains, expire_days, ip_debug, db_domain, has_auto_cdn, asn, **kwargs):
     res = []
 
     ua = hiddify.get_user_agent()
     if hconfig(ConfigEnum.show_usage_in_sublink):
+        
         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'] == "Fair":
-                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')
+            name = '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:
+            emoji = '⏳' if user_activate else '✖'
+
+            if hconfig(ConfigEnum.lang) == 'fa':
+                name=f'{emoji}{round(user.current_usage_GB,3)}/{user.usage_limit_GB}GB 📅باقی:{expire_days} روز'
             else:
-                emoji = '✅' if user_activate else '✖'
-                if hconfig(ConfigEnum.lang) == 'fa':
-                    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 {emoji}باقی:{expire_days} روز')
-                else:
-                    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 {emoji}Remain:{expire_days} days')
+                name = f'{emoji}{round(user.current_usage_GB,3)}/{user.usage_limit_GB}GB 📅Remain:{expire_days} days'
+            profile_title = f'{db_domain.alias or db_domain.domain} {user.name}'
+            if has_auto_cdn:
+                profile_title += f" {asn}"
+
+            res.append(f'trojan://1@{fake_ip_for_sub_link}?sni=fake_ip_for_sub_link&security=tls#{hiddify.url_encode(profile_title)}')
+            res.append(
+                f'trojan://1@{fake_ip_for_sub_link}?sni=fake_ip_for_sub_link&security=tls#{hiddify.url_encode(name)}')
 
     if ua['is_browser']:
         res.append(f'#Hiddify auto ip: {ip_debug}')
 
     if not user_activate:
-        if ua['app'] == "Fair":
+        if ua['app'] == "Fair1":
             res.append('trojan://1@1.1.1.1#Package_Ended')
         else:
             if hconfig(ConfigEnum.lang) == 'fa':

hiddifypanel/translations/en/LC_MESSAGES/messages.po

@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HiddifyPanel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-27 12:09+0200\n"
-"PO-Revision-Date: 2023-08-27 04:25-0500\n"
+"POT-Creation-Date: 2023-08-27 19:09+0200\n"
+"PO-Revision-Date: 2023-08-27 07:04-0500\n"
 "Last-Translator: hidden u\n"
 "Language-Team: English (USA)\n"
 "Language: en_US\n"

hiddifypanel/translations/fa/LC_MESSAGES/messages.po

@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  HiddifyPanel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-27 12:09+0200\n"
-"PO-Revision-Date: 2023-08-27 04:25-0500\n"
+"POT-Creation-Date: 2023-08-27 19:09+0200\n"
+"PO-Revision-Date: 2023-08-27 07:04-0500\n"
 "Last-Translator: hidden u\n"
 "Language: fa\n"
 "Language-Team: Persian\n"

hiddifypanel/translations/pt/LC_MESSAGES/messages.po

@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  HiddifyPT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-27 12:09+0200\n"
-"PO-Revision-Date: 2023-08-27 04:25-0500\n"
+"POT-Creation-Date: 2023-08-27 19:09+0200\n"
+"PO-Revision-Date: 2023-08-27 07:04-0500\n"
 "Last-Translator: lymanrudni\n"
 "Language: pt\n"
 "Language-Team: Portuguese\n"

hiddifypanel/translations/zh/LC_MESSAGES/messages.po

@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  HiddifyPanel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-27 12:09+0200\n"
-"PO-Revision-Date: 2023-08-27 04:25-0500\n"
+"POT-Creation-Date: 2023-08-27 19:09+0200\n"
+"PO-Revision-Date: 2023-08-27 07:04-0500\n"
 "Last-Translator: hidden u\n"
 "Language: zh\n"
 "Language-Team: Chinese\n"

{hiddifypanel-8.0.0.dev58.dist-info → hiddifypanel-8.0.0.dev60.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hiddifypanel
-Version: 8.0.0.dev58
+Version: 8.0.0.dev60
 Summary: hiddifypanel multi proxy panel
 Home-page: https://github.com/hiddify/hiddify-config/
 Author: hiddify

{hiddifypanel-8.0.0.dev58.dist-info → hiddifypanel-8.0.0.dev60.dist-info}/RECORD

@@ -1,6 +1,6 @@
 hiddifypanel/Events.py,sha256=mkIsfz4YQqegdeFgH4quxvLIx7AundtjAW6HBSP9I-M,719
-hiddifypanel/VERSION,sha256=7sxxifM8RmBqgPajKoUJIytZlh2cubDKezjvK_AyBFk,12
-hiddifypanel/VERSION.py,sha256=4kdU0DPAVYN_B4hTGgGz0fUDVCL1X4ZlK8Dsag4PC-A,117
+hiddifypanel/VERSION,sha256=Gp7VehBbP06sdXPy3ZDGBNVjOfynDw88On4LBOW21_0,12
+hiddifypanel/VERSION.py,sha256=eVRC4MIhZdq_xHqEaAio46o29KGJaT4EZRpKQPXkzMk,117
 hiddifypanel/__init__.py,sha256=b4nIILUBiDaAWF1Mnkew84MxzR5OeWogcVbR-gpnbrA,217
 hiddifypanel/__main__.py,sha256=GaHLsnu3y4zNTh6x-9kuZLOYaShltkG96rRAHOuMLak,270
 hiddifypanel/base.py,sha256=5G32pkaMcZVdthTNpD2XBDFpDNHNlEpgP2Puqp23T2U,2740
@@ -30,7 +30,7 @@ hiddifypanel/panel/cli.py,sha256=yiKQ5tLxP8ZkG9o4q-MPwx72BzynVR085UWeiViX3Jk,772
 hiddifypanel/panel/common.py,sha256=lJkCRm78SkDmYmwCy3w5CbMsR6QKafi74uQiUcDnFHg,4778
 hiddifypanel/panel/custom_widgets.py,sha256=GrLc5klxOJhO9bPdl_RHI7RjiG_JK2rG0p-f0k88BJw,2483
 hiddifypanel/panel/database.py,sha256=TpvGFDD0Kx1ADxVJjj20i3aQRtNXmodUGrUqi2zGjqY,296
-hiddifypanel/panel/hiddify.py,sha256=N66eED4m6x15wkb4pmhC_Uvv7DAJO6MUkx2ksmrQqSc,27238
+hiddifypanel/panel/hiddify.py,sha256=9kpraiFp4h97QevGZEEbgwfXp3kyWy2a2ui621yl91k,27376
 hiddifypanel/panel/init_db.py,sha256=euhmlVOnzvhAxgOGzC_fTYThpoqptHab1W7TfoCP5SA,17555
 hiddifypanel/panel/usage.py,sha256=-1EAlxCpLmBXx5Lw1ypceO2yRCNjG7hrfIxL1ZbqXcg,4250
 hiddifypanel/panel/admin/Actions.py,sha256=11LMNHkUuJkWhbS2Q5-p34f-t-W2KSGUuAXrgbxQ06s,11197
@@ -81,7 +81,7 @@ hiddifypanel/panel/commercial/templates/configc.html,sha256=WCQtEXf-Vf1s8mhTlECd
 hiddifypanel/panel/commercial/templates/parent_dash.html,sha256=pMZRHQRxb2blYe0fv0vrbBaHfnBZB_TXln_QavoCiog,1917
 hiddifypanel/panel/user/__init__.py,sha256=C1oDWpEwa_bNdrff9I33_m9h2F_ma0_Ruu6T1QfMlMI,1047
 hiddifypanel/panel/user/link_maker.html,sha256=g420NAm_fUI8asYjyfCiXyUOIwEQfDPonZA9xh3p0-8,177
-hiddifypanel/panel/user/link_maker.py,sha256=6ja7BXzRn1tpI6ZaYOd_Jbw4Q-Zlj5ldcBboxOQtOFQ,29505
+hiddifypanel/panel/user/link_maker.py,sha256=Plz6rTNQszje_xmNDB_8W0Dl0BD3B2siBo2pBONjZcg,29840
 hiddifypanel/panel/user/user.py,sha256=w4oMju3WVEklE_X8j0Zt6RYykGrRHEzVfTatqrtY2oQ,14571
 hiddifypanel/panel/user/templates/all_configs copy.txt,sha256=ivn6fiOLnn4R7WLoKiPFbW-oOu-v1hdSqOW-sSeYmXA,510
 hiddifypanel/panel/user/templates/all_configs.txt,sha256=q_Is8KCiiQcowf9-xsPj34YFILgk3cyAGULBfrf7vdg,1126
@@ -685,17 +685,17 @@ hiddifypanel/templates/macros.html,sha256=lvw_I1hYTx5mq5e9j9kwbNp5n_WDdjFgwKzI3J
 hiddifypanel/templates/master.html,sha256=ZA790R5YDPGu-uK6944cl5ejf8NlVb7DeezbuuMq0fI,20874
 hiddifypanel/templates/static.html,sha256=jp6q4wtx-k2A_cjqJoNiMS7Ee30arE45qI3ev4d5ky4,165
 hiddifypanel/templates/hiddify-flask-admin/list.html,sha256=St0TD6-ZIJ24A6Akbh51JNkTEOpimFq2iiRydcUjQlA,13642
-hiddifypanel/translations/en/LC_MESSAGES/messages.mo,sha256=m2uubZ9YLFvOEX0Tfv-PULeVnuewM3W_4SrDvl6aDDo,58358
-hiddifypanel/translations/en/LC_MESSAGES/messages.po,sha256=EK1HKyvVtT8IWTiMXrvlQZJFxa4Zmiga34sC6PClB2E,162965
-hiddifypanel/translations/fa/LC_MESSAGES/messages.mo,sha256=9m1pPFLv098o5Tk4AlQ29R-af6fqUkm2dGl9Gh-bid0,77888
-hiddifypanel/translations/fa/LC_MESSAGES/messages.po,sha256=igPfB1fVDoJlMHuMIiAoEPy3PQ69aL6ZTyp8S0eWYCM,185438
-hiddifypanel/translations/pt/LC_MESSAGES/messages.mo,sha256=3RZIHJCyi2JyZ2xWCxsWHh_C7fijVqai2lM9D9L-K4E,58543
-hiddifypanel/translations/pt/LC_MESSAGES/messages.po,sha256=BMszIfptlOtupoYYBWWYeNggshIhHmg7B4F2-RhJ2y4,159892
-hiddifypanel/translations/zh/LC_MESSAGES/messages.mo,sha256=W49VVBn2oAfKjWUiaq62XrnSx0dQh5o6HjCJfMJ5Pns,48447
-hiddifypanel/translations/zh/LC_MESSAGES/messages.po,sha256=gOGhg2eEmY-GiNpDNRJvJaMAU1culnJcE2_cmqB15n4,155109
-hiddifypanel-8.0.0.dev58.dist-info/LICENSE.md,sha256=oDrt-cUsyiDGnRPjEJh-3dH2ddAuK_bIVBD8ntkOtZw,19807
-hiddifypanel-8.0.0.dev58.dist-info/METADATA,sha256=-1hKppnY6FrjRxUt8NR5J5odZvHQJh0O-v_bVMzdY5Y,2860
-hiddifypanel-8.0.0.dev58.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-hiddifypanel-8.0.0.dev58.dist-info/entry_points.txt,sha256=Xzpqlh3nwBtZhoV9AANJykano056VJvYzaujxPztJaM,60
-hiddifypanel-8.0.0.dev58.dist-info/top_level.txt,sha256=rv-b3qFWUZQTBy0kyBfsr7L6tPpeO7AaQlLHXn-HI5M,13
-hiddifypanel-8.0.0.dev58.dist-info/RECORD,,
+hiddifypanel/translations/en/LC_MESSAGES/messages.mo,sha256=GUrercW1f24fyBMeauXJqzWF0eV9NZDMj7ZGCIIfygc,58358
+hiddifypanel/translations/en/LC_MESSAGES/messages.po,sha256=Z2G9Vh_uQM58jafNepFVdFtf-WDV7pdvq1RKDe0tTAY,162965
+hiddifypanel/translations/fa/LC_MESSAGES/messages.mo,sha256=AJLAj52YitSfPDLFGg8vxcL4e6SdDpRsU7-s6_oKSu4,77888
+hiddifypanel/translations/fa/LC_MESSAGES/messages.po,sha256=qzU6NmZ7jorUgVv05MzjlxTFpI0dq2Yl4fl7Uhpfhc4,185438
+hiddifypanel/translations/pt/LC_MESSAGES/messages.mo,sha256=JhzUlN_5tvMeo9_FGW_a2aDiHjcV5Y7ZkKSvR8g9JWU,58543
+hiddifypanel/translations/pt/LC_MESSAGES/messages.po,sha256=uOC2h5us90Jv5bzbWg7BVqIg_8LXrZOMno38510WOc0,159892
+hiddifypanel/translations/zh/LC_MESSAGES/messages.mo,sha256=U7Z7_alZIWxzFDE_PGjKuj5WjDn2GZZ_D81tBadJ5vY,48447
+hiddifypanel/translations/zh/LC_MESSAGES/messages.po,sha256=vrdpVDWvwEgUd-YBRBC3794yQ-DcltEl9wLY80khVsM,155109
+hiddifypanel-8.0.0.dev60.dist-info/LICENSE.md,sha256=oDrt-cUsyiDGnRPjEJh-3dH2ddAuK_bIVBD8ntkOtZw,19807
+hiddifypanel-8.0.0.dev60.dist-info/METADATA,sha256=KWrM2ZnHBA6LPTYIgNV-Sm2pkWc8oGfTbH2iHHWsC38,2860
+hiddifypanel-8.0.0.dev60.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+hiddifypanel-8.0.0.dev60.dist-info/entry_points.txt,sha256=Xzpqlh3nwBtZhoV9AANJykano056VJvYzaujxPztJaM,60
+hiddifypanel-8.0.0.dev60.dist-info/top_level.txt,sha256=rv-b3qFWUZQTBy0kyBfsr7L6tPpeO7AaQlLHXn-HI5M,13
+hiddifypanel-8.0.0.dev60.dist-info/RECORD,,