hiddifypanel 10.50.6.dev0__py3-none-any.whl → 10.60.0.dev0__py3-none-any.whl

hiddifypanel/VERSION

@@ -1 +1 @@
-10.50.6.dev0
+10.60.0.dev0

hiddifypanel/VERSION.py

@@ -1,3 +1,3 @@
-__version__='10.50.6.dev0'
+__version__='10.60.0.dev0'
 from datetime import datetime
 __release_date__= datetime.strptime('2024-07-25','%Y-%m-%d')

hiddifypanel/hutils/proxy/singbox.py

@@ -2,6 +2,7 @@ from flask import render_template, request, g
 import json
 
 from hiddifypanel import hutils
+from hiddifypanel.hutils.proxy.xrayjson import to_xray
 from hiddifypanel.models import ProxyProto, ProxyTransport, Domain, ConfigEnum
 
 
@@ -43,6 +44,12 @@ def configs_as_json(domains: list[Domain], **kwargs) -> str:
     return res
 
 
+def is_xray_proxy(proxy: dict):
+    if proxy['transport'] == ProxyTransport.splithttp:
+        return True
+    return False
+
+
 def to_singbox(proxy: dict) -> list[dict] | dict:
     name = proxy['name']
 
@@ -54,6 +61,12 @@ def to_singbox(proxy: dict) -> list[dict] | dict:
     all_base.append(base)
     # vmess ws
     base["tag"] = f"""{proxy['extra_info']} {proxy["name"]} § {proxy['port']} {proxy["dbdomain"].id}"""
+    if is_xray_proxy(proxy):
+        if hutils.flask.is_client_version(hutils.flask.ClientVersion.hiddify_next, 1, 9, 0):
+            base['type'] = "xray"
+            base['xray_outbound_raw'] = to_xray(proxy)
+            return all_base
+        return {'name': name, 'msg': "xray proxy does not support in this client version", 'type': 'debug'}
     base["type"] = str(proxy["proto"])
     base["server"] = proxy["server"]
     base["server_port"] = int(proxy["port"])

hiddifypanel/hutils/proxy/xray.py

@@ -126,11 +126,14 @@ def to_link(proxy: dict) -> str | dict:
         baseurl += "&encryption=none"
     if proxy.get('fingerprint', 'none') != 'none':
         baseurl += "&fp=" + proxy['fingerprint']
+    if proxy.get('transport') in {ProxyTransport.splithttp}:
+        baseurl += "&core=xray"
     if proxy['l3'] != 'quic':
         if proxy.get('l3') != ProxyL3.reality and (proxy.get('transport') in {ProxyTransport.tcp, ProxyTransport.httpupgrade, ProxyTransport.splithttp}) and proxy['proto'] in [ProxyProto.vless, ProxyProto.trojan]:
             baseurl += '&headerType=http'
         else:
             baseurl += '&headerType=None'
+
     if proxy['mode'] == 'Fake' or proxy['allow_insecure']:
         baseurl += "&allowInsecure=true"
     if proxy.get('flow'):

{hiddifypanel-10.50.6.dev0.dist-info → hiddifypanel-10.60.0.dev0.dist-info}/METADATA

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

{hiddifypanel-10.50.6.dev0.dist-info → hiddifypanel-10.60.0.dev0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 hiddifypanel/Events.py,sha256=AlnRdjVul0jP-NCT4-zoaQgowoOo-JhdQB4ytetAFKA,723
-hiddifypanel/VERSION,sha256=XNN7iMbPlgUgkjoGYACcYEKtYQO4pgKSUfb_Mu-3eeY,13
-hiddifypanel/VERSION.py,sha256=K4YNnaSAIQ68LiRwb3XYy_r7YEWmtuKH3TAJ1GVKfRA,118
+hiddifypanel/VERSION,sha256=VCrHC0wil_AmxhacgnHPQ-opC9U_UgW1gYef9nhSbSU,13
+hiddifypanel/VERSION.py,sha256=XFis0VtVAPuxkI3PFLDQCgCU5qtjcMsUiv5X-ytKXRM,118
 hiddifypanel/__init__.py,sha256=aLukp3ORszdcH4G9J-MlxhjHN6yFlOuOE6mm-L3aG_g,266
 hiddifypanel/__main__.py,sha256=IVchnXpK6bm8T3N--mN17HBQNLMeLAjyP7iwzULexB4,218
 hiddifypanel/auth.py,sha256=Xq0UwiFTRFmQpxnOehQGwPDlJqoelwGhPQbYZ0Xn5c0,7850
@@ -38,8 +38,8 @@ hiddifypanel/hutils/node/shared.py,sha256=FDSj3e-i3pb3mEv5vcUeX0Km1nxYg1CeAruIq7
 hiddifypanel/hutils/proxy/__init__.py,sha256=xXBa83kjYT_b-BNseEykfQYyJBQHTq1ZosfR8ZrQHkI,106
 hiddifypanel/hutils/proxy/clash.py,sha256=t57ywMo2TPpnAIuOn9v5gMD2os7zqS9b4NQtFX-Do5s,5813
 hiddifypanel/hutils/proxy/shared.py,sha256=cQ49Vi23MKtvY9hpjb_1HTo2zc0C-TlSabY6uMfFPtc,22175
-hiddifypanel/hutils/proxy/singbox.py,sha256=WBSsGF7QeNvDPg0SbfWitV2_CP6UQ0gcV5-Gpy4AlkY,10786
-hiddifypanel/hutils/proxy/xray.py,sha256=TqGTU4JxBkqbhhx2r6dYp8GBrnkWGULO17Kd19ZCJDA,10694
+hiddifypanel/hutils/proxy/singbox.py,sha256=vBVSJ0r4TRri1ErtVo7qm-yS3xXTSYoTdUGF2rczkm8,11314
+hiddifypanel/hutils/proxy/xray.py,sha256=sw_g1xhIBAyCQ4cymorrHJSw2u4LOAJ41slmvxwsz5c,10788
 hiddifypanel/hutils/proxy/xrayjson.py,sha256=TsnOHM5IUAn5AVEsboVVTLzDLS93EU67SqasHm1y6BA,14796
 hiddifypanel/models/__init__.py,sha256=PngFjQL9WvQP4EioNHRz1tTeyIgLoNvZ7WpmAhwKHnU,677
 hiddifypanel/models/admin.py,sha256=qZ-BRJ_Gn6hJNWz35SQQSds1CoeDslU9B0MDBRhjPSM,7596
@@ -822,24 +822,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=3CO5KOXutAFng0o2DDlOFvDHq0K5o0fyXF0ZgNBfWk8,76130
+hiddifypanel/translations/en/LC_MESSAGES/messages.mo,sha256=jN9uYK-lVyJbrf6jROTVsSNOf-hpEbPC-9FRZyuXVQ0,76130
 hiddifypanel/translations/en/LC_MESSAGES/messages.po,sha256=Y8Y9o8Zn_GvhCt9Zdzb2blxmAQ-Y9h_y5uQsJipHWJc,79318
-hiddifypanel/translations/fa/LC_MESSAGES/messages.mo,sha256=txjF-Od7YLfDP_8Db2u5uhD-otiqW2WnYuy3yG9zqhE,96032
+hiddifypanel/translations/fa/LC_MESSAGES/messages.mo,sha256=HHOUGfvLrMD0T2Eg_dJbEkne9Ti695umdItH8f6PHxg,96032
 hiddifypanel/translations/fa/LC_MESSAGES/messages.po,sha256=Y96y6EONrEJ_BoBuItNlfZzQeF2i8klKGpqTmYIPM5k,101692
-hiddifypanel/translations/pt/LC_MESSAGES/messages.mo,sha256=igUrKrHbVkZxh8f9zjYk3KG5bZvlyDTdt4qcCvzBa_Y,58587
+hiddifypanel/translations/pt/LC_MESSAGES/messages.mo,sha256=vLDlPZEYaTR0sFZUnrIl6OBOsVQ1oJYPuHmoBtuXmY0,58587
 hiddifypanel/translations/pt/LC_MESSAGES/messages.po,sha256=00MqGOmJzYUArU68jKqQWwkxdR0-jno43nJw141tXyM,69622
-hiddifypanel/translations/ru/LC_MESSAGES/messages.mo,sha256=I1TMtlhT8LjcZ9aGnTFe3POl1a8hTOzs8vzWLls5HX0,97554
+hiddifypanel/translations/ru/LC_MESSAGES/messages.mo,sha256=nXXdXsX_jTHtECFeebkyvcKIziPMjrkLXnHYt0OcK7k,97554
 hiddifypanel/translations/ru/LC_MESSAGES/messages.po,sha256=M7sHePHrlQQb7UHEomO0qk4c_XLL_X0Fn9ikUQRW3PQ,104841
-hiddifypanel/translations/zh/LC_MESSAGES/messages.mo,sha256=hrN5rE6o2vFm9P7GSu96AL7JK_fzAht84GZ1kTE9KC0,58920
+hiddifypanel/translations/zh/LC_MESSAGES/messages.mo,sha256=6IK55CKd8uPTti6wc1h7-CtsDWzHW89cwMbhdmCIj6w,58920
 hiddifypanel/translations/zh/LC_MESSAGES/messages.po,sha256=8J-vgc8C1ORaL2kyHPPynEZHpHy2cFAcYyiGAL2ZIcU,68866
 hiddifypanel/translations.i18n/en.json,sha256=dozE6mTry3rC-Byvp4dH85lctEB_Yjz2WBZSDzfgIf8,68885
 hiddifypanel/translations.i18n/fa.json,sha256=TD8Tsyq6ieJv4RGw6jWtRHstQHGNB-zJfTfug-9i_KA,91256
 hiddifypanel/translations.i18n/pt.json,sha256=UiG2f9A8q320T7Ku_3HlASOVVk9pCaUZlgYwUDlFKXA,59558
 hiddifypanel/translations.i18n/ru.json,sha256=QRoRoF_RiIvpMD31T14Y9QgFtNuFqj_Hl5-hjOBQIpI,94378
 hiddifypanel/translations.i18n/zh.json,sha256=q2kenW7YBiqaZLFb5o_23yrAhbAMSSpgqfDuV8qwUCA,59042
-hiddifypanel-10.50.6.dev0.dist-info/LICENSE.md,sha256=oDrt-cUsyiDGnRPjEJh-3dH2ddAuK_bIVBD8ntkOtZw,19807
-hiddifypanel-10.50.6.dev0.dist-info/METADATA,sha256=j7KNA6GxR1l-jw4vZJuYa6eATKZ3MvhR0FLzESKBnHk,4044
-hiddifypanel-10.50.6.dev0.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-hiddifypanel-10.50.6.dev0.dist-info/entry_points.txt,sha256=Xzpqlh3nwBtZhoV9AANJykano056VJvYzaujxPztJaM,60
-hiddifypanel-10.50.6.dev0.dist-info/top_level.txt,sha256=rv-b3qFWUZQTBy0kyBfsr7L6tPpeO7AaQlLHXn-HI5M,13
-hiddifypanel-10.50.6.dev0.dist-info/RECORD,,
+hiddifypanel-10.60.0.dev0.dist-info/LICENSE.md,sha256=oDrt-cUsyiDGnRPjEJh-3dH2ddAuK_bIVBD8ntkOtZw,19807
+hiddifypanel-10.60.0.dev0.dist-info/METADATA,sha256=WOx1hSl6xojX8Q3X1LKEVCP1rWNpEVbbt6mE8zGsDPM,4044
+hiddifypanel-10.60.0.dev0.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+hiddifypanel-10.60.0.dev0.dist-info/entry_points.txt,sha256=Xzpqlh3nwBtZhoV9AANJykano056VJvYzaujxPztJaM,60
+hiddifypanel-10.60.0.dev0.dist-info/top_level.txt,sha256=rv-b3qFWUZQTBy0kyBfsr7L6tPpeO7AaQlLHXn-HI5M,13
+hiddifypanel-10.60.0.dev0.dist-info/RECORD,,