hiddifypanel 10.16.0.dev3__py3-none-any.whl → 10.20.0__py3-none-any.whl

hiddifypanel/VERSION

@@ -1 +1 @@
-10.16.0.dev3
+10.20.0

hiddifypanel/VERSION.py

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

hiddifypanel/hutils/flask.py

@@ -17,7 +17,8 @@ from hiddifypanel import hutils
 
 
 def flash(message: str, category: str = "message"):
-    # if isinstance(message, LazyString)
+    if not isinstance(message,str):
+        message = str(message)
     return flask_flash(message, category)
 
 
@@ -48,7 +49,7 @@ def hurl_for(endpoint, **values):
 def get_user_agent() -> dict:
     ua = __parse_user_agent(request.user_agent.string)
 
-    if ua.get('v', 1) < 5:
+    if ua.get('v', 1) < 6:
         __parse_user_agent.invalidate_all()  # type:ignore
         ua = __parse_user_agent(request.user_agent.string)
     return ua
@@ -68,7 +69,7 @@ def __parse_user_agent(ua: str) -> dict:
     match = re.search(ua_version_pattern, request.user_agent.string)
     generic_version = list(map(int, match.group(1).split('.'))) if match else [0, 0, 0]
     res = {}
-    res['v'] = 5
+    res['v'] = 6
     res["is_bot"] = uaa.is_bot
     res["is_browser"] = re.match('^Mozilla', ua, re.IGNORECASE) and True
     res['os'] = uaa.os.family
@@ -79,6 +80,7 @@ def __parse_user_agent(ua: str) -> dict:
     res['is_hiddify'] = re.match('^(HiddifyNext)', ua, re.IGNORECASE) and True
     res['is_streisand'] = re.match('^(Streisand)', ua, re.IGNORECASE) and True
     res['is_shadowrocket'] = re.match('^(Shadowrocket)', ua, re.IGNORECASE) and True
+    res['is_v2rayng'] = re.match('^(v2rayNG)', ua, re.IGNORECASE) and True
 
     if res['is_singbox']:
         res['singbox_version'] = generic_version

hiddifypanel/hutils/proxy/shared.py

@@ -107,10 +107,15 @@ def is_tls(l3) -> bool:
 def get_proxies(child_id: int = 0, only_enabled=False) -> list['Proxy']:
     proxies = Proxy.query.filter(Proxy.child_id == child_id).all()
     proxies = [c for c in proxies if 'restls' not in c.transport]
-    # if not hconfig(ConfigEnum.tuic_enable, child_id):
-    #     proxies = [c for c in proxies if c.proto != ProxyProto.tuic]
-    # if not hconfig(ConfigEnum.hysteria_enable, child_id):
-    #     proxies = [c for c in proxies if c.proto != ProxyProto.hysteria2]
+
+    if not hconfig(ConfigEnum.tuic_enable, child_id):
+        proxies = [c for c in proxies if c.proto != ProxyProto.tuic]
+    if not hconfig(ConfigEnum.wireguard_enable, child_id):
+        proxies = [c for c in proxies if c.proto != ProxyProto.wireguard]
+    if not hconfig(ConfigEnum.ssh_server_enable, child_id):
+        proxies = [c for c in proxies if c.proto != ProxyProto.ssh]
+    if not hconfig(ConfigEnum.hysteria_enable, child_id):
+        proxies = [c for c in proxies if c.proto != ProxyProto.hysteria2]
     if not hconfig(ConfigEnum.shadowsocks2022_enable, child_id):
         proxies = [c for c in proxies if 'shadowsocks' != c.transport]
 

hiddifypanel/hutils/proxy/xrayjson.py

@@ -11,7 +11,16 @@ OUTBOUND_LEVEL = 8
 def configs_as_json(domains: list[Domain], 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)

hiddifypanel/models/config_enum.py

@@ -208,11 +208,11 @@ class ConfigEnum(metaclass=FastEnum):
     v2ray_enable = _BoolConfigDscr(ConfigCategory.hidden, ApplyMode.apply)
     torrent_block = _BoolConfigDscr(ConfigCategory.general, ApplyMode.apply)
 
-    tuic_enable = _BoolConfigDscr(ConfigCategory.hidden, ApplyMode.apply)
-    tuic_port = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply, hide_in_virtual_child=True)
+    tuic_enable = _BoolConfigDscr(ConfigCategory.tuic, ApplyMode.apply)
+    tuic_port = _StrConfigDscr(ConfigCategory.tuic, ApplyMode.apply, hide_in_virtual_child=True)
 
     # the hysteria is refereing to hysteria2
-    hysteria_enable = _BoolConfigDscr(ConfigCategory.hidden, ApplyMode.apply)
+    hysteria_enable = _BoolConfigDscr(ConfigCategory.hysteria, ApplyMode.apply)
     hysteria_port = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply, hide_in_virtual_child=True)
     # if be enable hysteria2 will be use salamander as obfs
     hysteria_obfs_enable = _BoolConfigDscr(ConfigCategory.hysteria, ApplyMode.apply)

hiddifypanel/panel/commercial/ProxyDetailsAdmin.py

@@ -1,18 +1,13 @@
 from hiddifypanel.models import *
-from hiddifypanel.panel import hiddify
 from hiddifypanel.panel.admin.adminlte import AdminLTEModelView
 from flask_babel import gettext as __
 from flask_babel import lazy_gettext as _
 from flask import g, redirect
 from markupsafe import Markup
-
-from hiddifypanel.hutils.flask import hurl_for, flash
 from hiddifypanel.auth import login_required
-from flask_admin.model.template import EndpointLinkRowAction
 from flask_admin.actions import action
 from flask_admin.contrib.sqla import form, filters as sqla_filters, tools
 # Define a custom field type for the related domains
-from flask import current_app
 from hiddifypanel import hutils
 
 
@@ -31,7 +26,7 @@ class ProxyDetailsAdmin(AdminLTEModelView):
         count = query.update({'enable': False})
 
         self.session.commit()
-        flash(_('%(count)s records were successfully disabled.', count=count), 'success')
+        hutils.flask.flash(_('%(count)s records were successfully disabled.', count=count), 'success')
         hutils.proxy.get_proxies.invalidate_all()
 
     @action('enable', 'Enable', 'Are you sure you want to enable selected proxies?')
@@ -40,7 +35,7 @@ class ProxyDetailsAdmin(AdminLTEModelView):
         count = query.update({'enable': True})
 
         self.session.commit()
-        flash(_('%(count)s records were successfully enabled.', count=count), 'success')
+        hutils.flask.flash(_('%(count)s records were successfully enabled.', count=count), 'success')
         hutils.proxy.get_proxies.invalidate_all()
 
     # list_template = 'model/domain_list.html'

hiddifypanel/panel/user/user.py

@@ -111,6 +111,9 @@ class UserView(FlaskView):
         if re.match('^(Clash|Stash)', ua, re.IGNORECASE):
             return self.clash_config(meta_or_normal="normal")
 
+        if g.user_agent.get('is_v2rayng'):
+            return self.xray()
+
         # if 'HiddifyNext' in ua or 'Dart' in ua:
         #     return self.clash_config(meta_or_normal="meta")
 

{hiddifypanel-10.16.0.dev3.dist-info → hiddifypanel-10.20.0.dist-info}/METADATA

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

{hiddifypanel-10.16.0.dev3.dist-info → hiddifypanel-10.20.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 hiddifypanel/Events.py,sha256=AlnRdjVul0jP-NCT4-zoaQgowoOo-JhdQB4ytetAFKA,723
-hiddifypanel/VERSION,sha256=0-XDvqX6n1Up7He9CQa_5ZtPwjbawrjx4lVhG7poZls,13
-hiddifypanel/VERSION.py,sha256=_RKSdSDIVo3dCpHkpvS2rmqK0lJhJEtiVOrBYobuKbk,118
+hiddifypanel/VERSION,sha256=TNh4uo3TQlUYdAcXYC8v7huTaabCe_jxdyW0xVMYD-Y,8
+hiddifypanel/VERSION.py,sha256=W2I0OxQMKbWdtTQn8EkldJYaVEGdoHF5U8q2Q2FzwcQ,113
 hiddifypanel/__init__.py,sha256=aLukp3ORszdcH4G9J-MlxhjHN6yFlOuOE6mm-L3aG_g,266
 hiddifypanel/__main__.py,sha256=IVchnXpK6bm8T3N--mN17HBQNLMeLAjyP7iwzULexB4,218
 hiddifypanel/auth.py,sha256=5GUwwKCRY90RS0WTKPfqzuOYuLuwGLpNLpnKmubf7DE,7405
@@ -18,7 +18,7 @@ hiddifypanel/hutils/auth.py,sha256=CoT25nrneWaAnRtx7qDE0v4WkdCeV3ra78VqEN48jeE,3
 hiddifypanel/hutils/convert.py,sha256=bxkbphOC9GifVMKwgmo4lpAOyJ5rdSVRnG1eEjh8tIc,2061
 hiddifypanel/hutils/crypto.py,sha256=2MDnzjM_ZJdY1zJ3eCoa2v24FYzzdKKO4viOFnvmBlI,1858
 hiddifypanel/hutils/encode.py,sha256=XUq7NSrV11WeVIZFyfik8sqI82R0lKRm5mqKrxNoLrQ,834
-hiddifypanel/hutils/flask.py,sha256=o9DHfhqZPN1j7s5sVnFAFrJp0zjalVKFPQeL_w6dd9o,10584
+hiddifypanel/hutils/flask.py,sha256=PuklxqM3rh-FSnX-M-F2E-IPpB5dyO78xNhqjsh2ras,10685
 hiddifypanel/hutils/github_issue.py,sha256=oDJU-8BgefDdls9sUzhVpohH9utrD4WZLWrb3oUwV4c,6500
 hiddifypanel/hutils/model.py,sha256=ajlJ-Tx0Mq68S9y5qEj0lwlDbF2xj0niZBQyw7UU670,1320
 hiddifypanel/hutils/random.py,sha256=KrsarmRNL05PYzwMxDaDyv-_QcKS0YsZR2z7BnllAqI,1789
@@ -36,16 +36,16 @@ hiddifypanel/hutils/node/parent.py,sha256=PqrJJairSslgLhn5rBSJnHEUU2lhfcqVm4a-O5
 hiddifypanel/hutils/node/shared.py,sha256=Zra8iC8DwwgcNz4OKzZKT25rTnOHYKQpd6SY6JMylN8,2197
 hiddifypanel/hutils/proxy/__init__.py,sha256=xXBa83kjYT_b-BNseEykfQYyJBQHTq1ZosfR8ZrQHkI,106
 hiddifypanel/hutils/proxy/clash.py,sha256=ERyiuUZibOUYvkyC1HPLCRPNB1lrZpuuafey2St7XtI,5820
-hiddifypanel/hutils/proxy/shared.py,sha256=T2YuC3coTG1iM6p7SQQVCzRjnp3dB25X9rIgA8h2OUc,21547
+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=QaP3byxwQquHKp8t_SPkqjz9qENFGRtqiP0MofcwA80,12950
+hiddifypanel/hutils/proxy/xrayjson.py,sha256=to71KVhsh9scmRyQjgS19QYWKze2GjE4seQJM4_rIVk,13402
 hiddifypanel/models/__init__.py,sha256=W7lWG_7jNNPn-cdXV5wMmuPv1unHUFVlMd9OmwDn2gM,860
 hiddifypanel/models/admin.py,sha256=W1C0R9fhLtwjnIzgPgiVcaNXc6YzzIolAsyy4QaqQKw,6936
 hiddifypanel/models/base_account.py,sha256=T2vllZo1QTGzYos3njgdYtAlnYB77LYrfzpEoO8yRk8,3060
 hiddifypanel/models/child.py,sha256=ZFJaH-GWTKAGD0BGMH0iKEMipi37_cAk59OeJKt2IKA,3039
 hiddifypanel/models/config.py,sha256=AoY3gDjHscIaXNSDXPIFWASo7WS9-UjNyLd-3K2ntIE,6755
-hiddifypanel/models/config_enum.py,sha256=bosh0mWYSUknPZTTaONH8JrVcfOBr2SJ04BNP0miuJU,14633
+hiddifypanel/models/config_enum.py,sha256=3Iox3Hm3g4BOYN263bEmuzZ88jdnlLWEx_MbbL4aqGk,14631
 hiddifypanel/models/domain.py,sha256=9HR7Ch3BniuzDM5TJfQNpTuoOPbkthEDhjF-exUXCuM,8499
 hiddifypanel/models/parent_domain.py,sha256=bs5F1neOAQu9XHEk3QQTBM4p2iuebM4cnAQqwfNjCtg,2291
 hiddifypanel/models/proxy.py,sha256=9cm5Q0ZUEPeRDWdm1lQGom0SM_Q32NCDFTNFh36OzaQ,3304
@@ -127,7 +127,7 @@ hiddifypanel/panel/admin/templates/model/admin_list.html,sha256=lpjiAl7kR5xb0fLp
 hiddifypanel/panel/admin/templates/model/domain_list.html,sha256=rrPYKISPXcwYreMp2MrJb-sEL9-6dCZF_dk6ejObrm8,414
 hiddifypanel/panel/admin/templates/model/user_list.html,sha256=hwKZaHClJogrIVvIKmemdY0rJMwg9yIB7cqHh_nDVqU,5830
 hiddifypanel/panel/commercial/ParentDomainAdmin.py,sha256=n3X7_PuQBr2zlP6K5A0EHmtRdI9Vy49YORim_9L2QFA,4886
-hiddifypanel/panel/commercial/ProxyDetailsAdmin.py,sha256=0FeuJFNAVHy-U12JQPupbuRaAz5H_6A12F-CwDB_3E8,2999
+hiddifypanel/panel/commercial/ProxyDetailsAdmin.py,sha256=s4Ep_hsHttgXM0Zq75W4HaJY0cYEeBjwZ5vtOvcvOxA,2840
 hiddifypanel/panel/commercial/__init__.py,sha256=oanPV36n6MXiVhiq_NYL6K9ENhQXZGQM5r4c9oPO0CQ,2322
 hiddifypanel/panel/commercial/restapi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hiddifypanel/panel/commercial/restapi/v1/__init__.py,sha256=PKpT6Jdh37udexOnOdsvA681nqStGY-jqalEBB9_utU,1208
@@ -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=PC1vCFY2bLOT2ZsdzNJEiLqA6r9HnLFXWZ7Iq4FSYzs,13793
+hiddifypanel/panel/user/user.py,sha256=PU0PWsa4AoS1MKtr-8wvZObfIFg6385q7LD3B8xRHg8,13868
 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=7SONp6cawE1coIigHquY66YZdKItHadyCoPEw3-KGMo,74599
+hiddifypanel/translations/en/LC_MESSAGES/messages.mo,sha256=egWSU8sDPeuYC9r4OTj7hvdQG-6FviQmg-IsEwp-b4E,74599
 hiddifypanel/translations/en/LC_MESSAGES/messages.po,sha256=JYdJWkz8ZjeqzNdbz1kOOAw11YHMpFU447R1SYaD1Sg,77783
-hiddifypanel/translations/fa/LC_MESSAGES/messages.mo,sha256=xBLIZCxMGMhw_koknRxOKvKw9N27H-_i7fu5WJ07dh4,96482
+hiddifypanel/translations/fa/LC_MESSAGES/messages.mo,sha256=AUirkIh7WHL4V6QaPp80qBIdbS12bpfz7P2W_TDq0m0,96482
 hiddifypanel/translations/fa/LC_MESSAGES/messages.po,sha256=c4_SjizFofBr6uNRAlD8j9HRbVv4f4SCGVlFGWxMWA8,101063
-hiddifypanel/translations/pt/LC_MESSAGES/messages.mo,sha256=S5U1hkPKKS6nLxUQJeSJKIOOINf1jDS08eONwDgh9I0,60612
+hiddifypanel/translations/pt/LC_MESSAGES/messages.mo,sha256=7fpbHnQeQtfxx_KALtjKJZt0g-L_vPVSVHmn7ef_0gg,60612
 hiddifypanel/translations/pt/LC_MESSAGES/messages.po,sha256=tUp3Ed-ZBDZeD99yb7o6I76wWUU_QQT2i_cQfNV_7Zk,69869
-hiddifypanel/translations/ru/LC_MESSAGES/messages.mo,sha256=JS2kFQptLzkeg-bDrjGS5z0XIkAoRkFC19MGYuF75rA,95543
+hiddifypanel/translations/ru/LC_MESSAGES/messages.mo,sha256=F1MVMe02CZ0SNyTIVJEbATLPDfwEB9Qoulz1hUiCwOU,95543
 hiddifypanel/translations/ru/LC_MESSAGES/messages.po,sha256=ojNL5z1gvjgiO-5hjccCLhK0Z-CeZKrwE3yiEE4ekeg,102007
-hiddifypanel/translations/zh/LC_MESSAGES/messages.mo,sha256=aCGEYnPvvD0Aya64HNxjdhp0ATDi3c-6ht7z-_CMyvE,60878
+hiddifypanel/translations/zh/LC_MESSAGES/messages.mo,sha256=SMWF7RLppDYIFcJz1jursPzIEPWzWuMUCmALUfQtq40,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.16.0.dev3.dist-info/LICENSE.md,sha256=oDrt-cUsyiDGnRPjEJh-3dH2ddAuK_bIVBD8ntkOtZw,19807
-hiddifypanel-10.16.0.dev3.dist-info/METADATA,sha256=MDm6ytfVYj8Ex1Ujn_5zATVOUPV0cnZYJL7jgP8am_w,4014
-hiddifypanel-10.16.0.dev3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-hiddifypanel-10.16.0.dev3.dist-info/entry_points.txt,sha256=Xzpqlh3nwBtZhoV9AANJykano056VJvYzaujxPztJaM,60
-hiddifypanel-10.16.0.dev3.dist-info/top_level.txt,sha256=rv-b3qFWUZQTBy0kyBfsr7L6tPpeO7AaQlLHXn-HI5M,13
-hiddifypanel-10.16.0.dev3.dist-info/RECORD,,
+hiddifypanel-10.20.0.dist-info/LICENSE.md,sha256=oDrt-cUsyiDGnRPjEJh-3dH2ddAuK_bIVBD8ntkOtZw,19807
+hiddifypanel-10.20.0.dist-info/METADATA,sha256=8rcbubsh0AsuEs4PopEwkwLfdSuS8h96MyYRA792nJs,4009
+hiddifypanel-10.20.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+hiddifypanel-10.20.0.dist-info/entry_points.txt,sha256=Xzpqlh3nwBtZhoV9AANJykano056VJvYzaujxPztJaM,60
+hiddifypanel-10.20.0.dist-info/top_level.txt,sha256=rv-b3qFWUZQTBy0kyBfsr7L6tPpeO7AaQlLHXn-HI5M,13
+hiddifypanel-10.20.0.dist-info/RECORD,,