fix: merge

Author: hiddify-com

HISTORY.md

@@ -586,29 +586,29 @@
   _enhancements for xray, sing-box, clash configs_
 
 * Enhancements for xray, sing-box, clash configs. 
-  _clash config:
-replace zh to cn for correct create config
-add geoip&geosite rule-sets for ir,cn,ru with DIRECT route
-GEOIP,IR & DOMAIN-SUFFIX,.ir replace to rule-sets
-
-sing-box:
-replace zh to cn for correct create config
-replace .srs links to .srs from hiddify-geo
-fix rule-set sing-box 1.8+ for .cn
-
-xray config:
+  _clash config:
+replace zh to cn for correct create config
+add geoip&geosite rule-sets for ir,cn,ru with DIRECT route
+GEOIP,IR & DOMAIN-SUFFIX,.ir replace to rule-sets
+
+sing-box:
+replace zh to cn for correct create config
+replace .srs links to .srs from hiddify-geo
+fix rule-set sing-box 1.8+ for .cn
+
+xray config:
 add geoip:ru & geosite:category-ru for DIRECT_
 
 * Merge pull request #5 from legiz-ru/mihomo. 
   _add mihomo and fix sb_
 
 * Add mihomo and fix sb. 
-  _fix subname for sing-box app
-add clash meta for android
+  _fix subname for sing-box app
+add clash meta for android
 add clash verge rev_
 
 * Add clash icons. 
-  _add clash meta for android
+  _add clash meta for android
 add clash verge rev_
 
 * Update translations. 
@@ -2480,8 +2480,8 @@ add clash verge rev_
   _Update base_singbox_config.json.j2_
 
 * Update base_singbox_config.json.j2. 
-  _Correctly bypass geoip and geosite download url.
-
+  _Correctly bypass geoip and geosite download url.
+
 The default bypass list only includes `githubusercontent.com` but it should also contain `raw.githubusercontent.com`. Note that this problem only manifests in clients which have just recently installed singbox. For those who already had singbox with a working hiddify installation, they already have the cache files and the file updates flawlessly._
 
 * Fink 🐦: update translations. 
@@ -4565,9 +4565,9 @@ with A2_
   _Update UserAdmin.py_
 
 * Update UserAdmin.py. 
-  _Shows Telegram icons for all users in the admin panel, if Telegram is enabled.
-
-Users which are not registered for Telegram are shown with greyed out disabled buttons, registered users with blue buttons.
+  _Shows Telegram icons for all users in the admin panel, if Telegram is enabled.
+
+Users which are not registered for Telegram are shown with greyed out disabled buttons, registered users with blue buttons.
 It is a visual improvement to have all users aligned in the table._
 
 * Merge branch 'main' of github.com:Iam54r1n4/HiddifyPanel. 
@@ -5519,8 +5519,8 @@ It is a visual improvement to have all users aligned in the table._
   _fixing IPv6 issue for resolving IPv6's behind domain in auto cdn_
 
 * Fixing IPv6 issue for resolving IPv6's behind domain in auto cdn. 
-  _adding brackets to avoid errors when converting domains to ipv6.
-
+  _adding brackets to avoid errors when converting domains to ipv6.
+
 aaaa:bbbb:cccc:dddd -> [aaaa:bbbb:cccc:dddd]_
 
 * Fix; v2ray bug. 

hiddifypanel/hutils/network/net.py

@@ -439,3 +439,45 @@ def get_ech_info(domain):
         pass
 
     return None
+
+
+def all_public_ports():
+        tcp_ports={80:"http",443:"tls"}
+        udp_ports={443:"quic",}
+        log=[]
+        if hconfig(ConfigEnum.wireguard_enable):
+            udp_ports[hconfig(ConfigEnum.wireguard_port)]="wireguard"
+            
+            
+        if hconfig(ConfigEnum.shadowsocks2022_enable) and (p:=hconfig(ConfigEnum.shadowsocks2022_port)):
+            udp_ports[p]="shadowsocks_2022"
+            tcp_ports[p]="shadowsocks_2022"
+        if hconfig(ConfigEnum.mieru_enable):
+            for p in hconfig(ConfigEnum.mieru_tcp_ports).split(","):
+                tcp_ports[p]="mieru"
+            for p in hconfig(ConfigEnum.mieru_udp_ports).split(","):
+                udp_ports[p]="mieru"
+        if hconfig(ConfigEnum.ssh_server_enable):
+            tcp_ports[hconfig(ConfigEnum.ssh_server_port)]="ssh"
+        
+        for p in (hconfig(ConfigEnum.tls_ports)).split(','):
+            tcp_ports[p]="tls"
+            udp_ports[p]="quic"
+        for p in hconfig(ConfigEnum.http_ports).split(','):
+            tcp_ports[p]="http"
+
+        for d in Domain.query.all():
+            udp_ports[d.internal_port_tuic]="tuic"
+            udp_ports[d.internal_port_naive]="naive"
+            udp_ports[d.internal_port_hysteria2]="hysteria"
+
+        def to_int(ports):
+            r={}
+            for p,v in ports.items():
+                try:
+                    if ip:=int(p):
+                        r[ip]=v
+                except:
+                    pass
+            return {k:v for k,v in sorted(r.items())}
+        return {"tcp":to_int(tcp_ports),"udp":to_int(udp_ports)}

hiddifypanel/hutils/proxy/shared.py

@@ -35,6 +35,8 @@ def is_proxy_valid(proxy: Proxy, domain_db: Domain, port: int) -> dict | None:
 
     if proxy.proto not in {ProxyProto.mieru,ProxyProto.dnstt} and not port:
         return {'name': name, 'msg': "port not defined", 'type': 'error', 'proto': proxy.proto}
+    if proxy.proto==ProxyProto.naive and not domain_db.need_valid_ssl:
+        return {'name': name, 'msg': "naive only supports valid cert", 'type': 'error', 'proto': proxy.proto}    
     if "reality" not in l3 and 'reality' in domain_db.mode:
         return {'name': name, 'msg': "1reality proxy not in reality domain", 'type': 'debug', 'proto': proxy.proto}
 
@@ -410,9 +412,6 @@ def make_proxy(hconfigs: dict, proxy: Proxy, domain_db: Domain, phttp=80, ptls=4
         'params': proxy.params or {},
     }
 
-    if hconfigs.get(ConfigEnum.tls_ech_enable) and not proxy.l3 in {ProxyL3.reality}:
-        if ech:=hutils.network.get_ech_info(base.get('sni')):
-            base['ech'] = ech
 
     if base["proto"]==ProxyProto.dnstt:
         base["public_key"]=get_dnstt_public_key()
@@ -428,6 +427,10 @@ def make_proxy(hconfigs: dict, proxy: Proxy, domain_db: Domain, phttp=80, ptls=4
         base['password']="h"
         return base
 
+    if hconfigs.get(ConfigEnum.tls_ech_enable) and not proxy.l3 in {ProxyL3.reality}:
+        if ech:=hutils.network.get_ech_info(base.get('sni')):
+            base['ech'] = ech
+
     if base['proto'] in {ProxyProto.mieru}:
         base["password"]="h"
 

hiddifypanel/hutils/proxy/singbox.py

@@ -6,7 +6,7 @@
 from hiddifypanel.models import ProxyProto, ProxyTransport, Domain, ConfigEnum
 
 
-def configs_as_json(domains: list[Domain], **kwargs) -> str:
+def configs_as_json(domains: list[Domain], **kwargs) -> dict:
     ua = hutils.flask.get_user_agent()
     base_config = json.loads(render_template('base_singbox_config.json.j2'))
     allphttp = [p for p in request.args.get("phttp", "").split(',') if p]
@@ -43,10 +43,10 @@ def configs_as_json(domains: list[Domain], **kwargs) -> str:
         "tolerance": 200
     }
     base_config['outbounds'].insert(1, smart)
-    res = json.dumps(base_config, indent=4, cls=hutils.proxy.ProxyJsonEncoder)
+    
     # if ua['is_hiddify']:
     #     res = res[:-1]+',"experimental": {}}'
-    return res
+    return base_config
 
 
 def is_xray_proxy(proxy: dict):

hiddifypanel/hutils/proxy/xrayjson.py

@@ -8,7 +8,7 @@
 from .xray import is_muxable_agent, OUTBOUND_LEVEL
 
 
-def configs_as_json(domains: list[Domain], user: User, expire_days: int, remarks: str) -> str:
+def configs_as_json(domains: list[Domain], user: User, expire_days: int, remarks: str) -> list:
     '''Returns xray configs as json'''
     all_configs = []
 
@@ -47,8 +47,8 @@ def configs_as_json(domains: list[Domain], user: User, expire_days: int, remarks
     else:
         # TODO: seperate codes to small functions
         # TODO: check what are unsupported protocols in other apps
-        unsupported_protos = {}
-        unsupported_transport = {}
+        unsupported_protos:set[ProxyProto] = set()
+        unsupported_transport:set[ProxyTransport] = set()
         if g.user_agent.get('is_v2rayng'):
             # TODO: ensure which protocols are not supported in v2rayng
             unsupported_protos = {ProxyProto.hysteria, ProxyProto.hysteria2,
@@ -83,13 +83,12 @@ def configs_as_json(domains: list[Domain], user: User, expire_days: int, remarks
 
         else:  # single outbound
             base_config['outbounds'].insert(0, outbounds[0])
-            all_configs = base_config
+            all_configs = [base_config]
 
     if not all_configs:
-        return ''
+        return []
 
-    json_configs = json.dumps(all_configs, indent=2, cls=hutils.proxy.ProxyJsonEncoder)
-    return json_configs
+    return all_configs
 
 
 def to_xray(proxy: dict) -> dict:

hiddifypanel/models/config_enum.py

@@ -76,6 +76,7 @@ class ConfigCategory(StrEnum):
     reality = auto()
     wireguard = auto()
     shadowsocks = auto()
+    additional_configs=auto()
 
 
 class ApplyMode(StrEnum):
@@ -154,6 +155,10 @@ def dbvalues(cls):
     utls = _StrConfigDscr(ConfigCategory.advanced)
     telegram_bot_token = _StrConfigDscr(ConfigCategory.telegram, hide_in_virtual_child=True)
 
+    additional_configs_urls =  _StrConfigDscr(ConfigCategory.additional_configs)
+    additional_configs_singbox =  _StrConfigDscr(ConfigCategory.additional_configs)
+    additional_configs_xrayjson =  _StrConfigDscr(ConfigCategory.additional_configs)
+    
     # region child-parent
     # deprecated
     is_parent = _BoolConfigDscr(ConfigCategory.hidden)

hiddifypanel/models/domain.py

@@ -154,7 +154,7 @@ def internal_port_tuic(self):
 
     @property
     def internal_port_naive(self):
-        if self.mode not in [DomainType.direct, DomainType.relay, DomainType.fake]:
+        if self.mode not in [DomainType.direct, DomainType.relay]:
             return 0
         # TODO: check validity of the range of the port
         return int(hconfig(ConfigEnum.naive_port, self.child_id)) + self.port_index

hiddifypanel/panel/admin/Actions.py

@@ -50,6 +50,45 @@ def reset2(self):
 
         return res
 
+    @login_required(roles={Role.admin})
+    def all_public_ports(self):
+        tcp_ports={80,443}
+        udp_ports={443,}
+        if hconfig(ConfigEnum.wireguard_enable):
+            udp_ports.add(hconfig(ConfigEnum.wireguard_port))
+        if hconfig(ConfigEnum.shadowsocks2022_enable) and (p:=hconfig(ConfigEnum.shadowsocks2022_port)):
+            udp_ports.add(p)
+            tcp_ports.add(p)
+        if hconfig(ConfigEnum.mieru_enable):
+            for p in hconfig(ConfigEnum.mieru_tcp_ports).split(","):
+                tcp_ports.add(p)
+            for p in hconfig(ConfigEnum.mieru_udp_ports).split(","):
+                udp_ports.add(p)
+        if hconfig(ConfigEnum.ssh_server_enable):
+            tcp_ports.add(hconfig(ConfigEnum.ssh_server_port))
+        
+        for p in (hconfig(ConfigEnum.tls_ports)).split(','):
+            tcp_ports.add(p)
+            udp_ports.add(p)
+        for p in hconfig(ConfigEnum.http_ports).split(','):
+            tcp_ports.add(p)
+
+        for d in Domain.query.all():
+            udp_ports.add(d.internal_port_tuic)
+            udp_ports.add(d.internal_port_naive)
+            udp_ports.add(d.internal_port_hysteria2)
+
+        def to_int(ports):
+            r={}
+            for p in ports:
+                try:
+                    if ip:=int(p):
+                        r.add(ip)
+                except:
+                    pass
+        return {"tcp":to_int(tcp_ports),"udp":to_int(udp_ports)}
+    
+
     @login_required(roles={Role.super_admin})
     @route('reinstall', methods=['POST'])
     def reinstall(self, complete_install=True, domain_changed=False):

hiddifypanel/panel/admin/ProxyAdmin.py

@@ -106,6 +106,8 @@ class Meta:
             'tuic': 'other',
             'ssh': 'other',
             'hysteria2': 'other',
+            "mieru":"other"
+            
         }
         protos = sorted([c for c in {pgroup.get(c.proto, c.proto): 1 for c in cdn_proxies}])
         for proto in protos:

hiddifypanel/panel/admin/SettingAdmin.py

@@ -273,6 +273,10 @@ class Meta:
                 render_kw = {'class': "ltr", 'maxlength': 2048}
                 field = wtf.TextAreaField(_(f'config.{c.key}.label'), validators, default=c.value,
                                           description=_(f'config.{c.key}.description'), render_kw=render_kw)
+            elif c.key in {ConfigEnum.additional_configs_xrayjson,ConfigEnum.additional_configs_singbox,ConfigEnum.additional_configs_urls}:
+                render_kw = {'class': "ltr", 'maxlength': 20480}
+                field = wtf.TextAreaField(_(f'config.{c.key}.label'), default=c.value,
+                                          description=_(f'config.{c.key}.description'), render_kw=render_kw)
             elif c.key == ConfigEnum.branding_freetext:
                 validators = [wtf.validators.Length(max=2048)]
                 render_kw = {'class': "ltr", 'maxlength': 2048}