hiddifypanel 10.85.0b20__py3-none-any.whl → 10.86.0b1__py3-none-any.whl

hiddifypanel/panel/init_db.py

@@ -16,6 +16,13 @@ from hiddifypanel.database import db, db_execute
 from loguru import logger
 MAX_DB_VERSION = 120
 
+def _v104(child_id):
+    set_hconfig(ConfigEnum.special_port,hconfig(ConfigEnum.reality_port))
+    set_hconfig(ConfigEnum.default_useragent_string,hutils.network.get_random_user_agent())
+    for d in Domain.query.filter(Domain.mode==DomainType.reality,Domain.child_id == child_id).all():
+        d.mode=DomainType.special_reality_tcp
+    set_hconfig(ConfigEnum.h2_enable,False)
+    db.session.bulk_save_objects(get_proxy_rows_v1())
 
 def _v103(child_id):
 
@@ -33,12 +40,8 @@ BEGIN
 
   DECLARE cur CURSOR FOR
     SELECT  jt.uuid, jt.usage FROM JSON_TABLE(
-      usage_data,
-      '$[*]' COLUMNS (
-        uuid CHAR(36) PATH '$.uuid',
-        `usage` BIGINT PATH '$.usage'
-      )
-    ) AS jt;
+      usage_data, '$[*]' COLUMNS (
+        uuid CHAR(36) PATH '$.uuid', `usage` BIGINT PATH '$.usage')) AS jt;
 
   DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
   SET cur_date = DATE(cur_time);
@@ -52,9 +55,7 @@ BEGIN
 
     
     UPDATE `user`
-    SET current_usage = current_usage + u_usage,
-        last_online = cur_time,
-        start_date = CASE WHEN start_date IS NULL THEN cur_date ELSE start_date END
+    SET current_usage = current_usage + u_usage, last_online = cur_time, start_date = CASE WHEN start_date IS NULL THEN cur_date ELSE start_date END
     WHERE uuid = u_uuid;
 
 
@@ -72,7 +73,7 @@ END
 def _v101(child_id):
     add_config_if_not_exist(ConfigEnum.path_xhttp, hutils.random.get_random_string(7, 15))
     add_config_if_not_exist(ConfigEnum.xhttp_enable, False)
-    db.session.bulk_save_objects(get_proxy_rows_v1())
+    
 
 
 def _v97(child_id):
@@ -94,32 +95,17 @@ def _v97(child_id):
 
 def _v96(child_id):
     from sqlalchemy import func
-    result = (db.session.query(DailyUsage.child_id,
-                               DailyUsage.admin_id,
-                               DailyUsage.date,
-                               func.max(DailyUsage.online).label('online'),
-                               func.sum(DailyUsage.usage).label('usage'),
-                               func.count(DailyUsage.usage).label('count'),
-                               )
+    result = (db.session.query(DailyUsage.child_id, DailyUsage.admin_id, DailyUsage.date, func.max(DailyUsage.online).label('online'), func.sum(DailyUsage.usage).label('usage'), func.count(DailyUsage.usage).label('count'), )
               .group_by(DailyUsage.child_id, DailyUsage.admin_id, DailyUsage.date)
-              .all()
-              )
+              .all())
 
     for r in result:
         if r.count > 1:
             # Delete existing records for this group
-            db.session.query(DailyUsage).filter(DailyUsage.child_id == r.child_id,
-                                                DailyUsage.admin_id == r.admin_id,
-                                                DailyUsage.date == r.date
-                                                ).delete()
+            db.session.query(DailyUsage).filter(DailyUsage.child_id == r.child_id, DailyUsage.admin_id == r.admin_id, DailyUsage.date == r.date).delete()
 
             # Add the aggregated record
-            new_record = DailyUsage(child_id=r.child_id,
-                                    admin_id=r.admin_id,
-                                    date=r.date,
-                                    online=r.online,
-                                    usage=r.usage
-                                    )
+            new_record = DailyUsage(child_id=r.child_id, admin_id=r.admin_id, date=r.date, online=r.online, usage=r.usage)
             db.session.add(new_record)
 
     # Commit the changes to the database
@@ -140,8 +126,7 @@ def _v92(child_id):
 
 
 def _v89(child_id):
-    set_hconfig(ConfigEnum.path_xhttp,
-                hutils.random.get_random_string(7, 15))
+    set_hconfig(ConfigEnum.path_xhttp, hutils.random.get_random_string(7, 15))
     set_hconfig(ConfigEnum.xhttp_enable, False)
     pass
 
@@ -163,8 +148,7 @@ def _v85(child_id):
 def _v84(child_id):
     # the 2022-blake3-chacha20-poly1305 encryption method doesn't support multiuser config
     if hconfig(ConfigEnum.shadowsocks2022_method) == '2022-blake3-chacha20-poly1305':
-        set_hconfig(ConfigEnum.shadowsocks2022_method,
-                    '2022-blake3-aes-256-gcm')
+        set_hconfig(ConfigEnum.shadowsocks2022_method, '2022-blake3-aes-256-gcm')
 
 
 def _v83(child_id):
@@ -209,12 +193,10 @@ def _v74(child_id):
     set_hconfig(ConfigEnum.ws_enable, False)
     set_hconfig(ConfigEnum.grpc_enable, True)
     set_hconfig(ConfigEnum.httpupgrade_enable, True)
-    set_hconfig(ConfigEnum.shadowsocks2022_port,
-                hutils.random.get_random_unused_port())
+    set_hconfig(ConfigEnum.shadowsocks2022_port, hutils.random.get_random_unused_port())
     set_hconfig(ConfigEnum.shadowsocks2022_method, "2022-blake3-aes-256-gcm")
     set_hconfig(ConfigEnum.shadowsocks2022_enable, False)
-    set_hconfig(ConfigEnum.path_httpupgrade,
-                hutils.random.get_random_string(7, 15))
+    set_hconfig(ConfigEnum.path_httpupgrade, hutils.random.get_random_string(7, 15))
     db.session.bulk_save_objects(get_proxy_rows_v1())
 
     for i in range(1, 10):
@@ -226,14 +208,10 @@ def _v74(child_id):
 
 
 def _v71(child_id):
-    add_config_if_not_exist(ConfigEnum.tuic_port,
-                            hutils.random.get_random_unused_port())
-    add_config_if_not_exist(ConfigEnum.hysteria_port,
-                            hutils.random.get_random_unused_port())
-    add_config_if_not_exist(ConfigEnum.ssh_server_port,
-                            hutils.random.get_random_unused_port())
-    add_config_if_not_exist(ConfigEnum.wireguard_port,
-                            hutils.random.get_random_unused_port())
+    add_config_if_not_exist(ConfigEnum.tuic_port, hutils.random.get_random_unused_port())
+    add_config_if_not_exist(ConfigEnum.hysteria_port, hutils.random.get_random_unused_port())
+    add_config_if_not_exist(ConfigEnum.ssh_server_port, hutils.random.get_random_unused_port())
+    add_config_if_not_exist(ConfigEnum.wireguard_port, hutils.random.get_random_unused_port())
 
 
 def _v70(child_id):
@@ -254,8 +232,7 @@ def _v70(child_id):
 def _v69():
     db.session.bulk_save_objects(get_proxy_rows_v1())
     add_config_if_not_exist(ConfigEnum.wireguard_enable, True)
-    add_config_if_not_exist(ConfigEnum.wireguard_port,
-                            hutils.random.get_random_unused_port())
+    add_config_if_not_exist(ConfigEnum.wireguard_port, hutils.random.get_random_unused_port())
     add_config_if_not_exist(ConfigEnum.wireguard_ipv4, "10.90.0.1")
     add_config_if_not_exist(ConfigEnum.wireguard_ipv6, "fd42:42:90::1")
     wg_pk, wg_pub, _ = hutils.crypto.get_wg_private_public_psk_pair()
@@ -279,8 +256,7 @@ def _v65():
 
 def _v63():
     add_config_if_not_exist(ConfigEnum.hysteria_enable, True)
-    add_config_if_not_exist(ConfigEnum.hysteria_port,
-                            hutils.random.get_random_unused_port())
+    add_config_if_not_exist(ConfigEnum.hysteria_port, hutils.random.get_random_unused_port())
     add_config_if_not_exist(ConfigEnum.hysteria_obfs_enable, True)
     add_config_if_not_exist(ConfigEnum.hysteria_up_mbps, "150")
     add_config_if_not_exist(ConfigEnum.hysteria_down_mbps, "300")
@@ -301,10 +277,8 @@ def _v61():
 
 
 def _v60():
-    add_config_if_not_exist(ConfigEnum.proxy_path_admin,
-                            hutils.random.get_random_string())
-    add_config_if_not_exist(ConfigEnum.proxy_path_client,
-                            hutils.random.get_random_string())
+    add_config_if_not_exist(ConfigEnum.proxy_path_admin, hutils.random.get_random_string())
+    add_config_if_not_exist(ConfigEnum.proxy_path_client, hutils.random.get_random_string())
 
 
 def _v59():
@@ -324,8 +298,7 @@ def _v57():
 
 
 def _v56():
-    set_hconfig(ConfigEnum.reality_port,
-                hutils.random.get_random_unused_port())
+    set_hconfig(ConfigEnum.reality_port, hutils.random.get_random_unused_port())
 
 
 def _v55():
@@ -336,10 +309,8 @@ def _v55():
     set_hconfig(ConfigEnum.tuic_enable, True)
     set_hconfig(ConfigEnum.hysteria_enable, True)
     Proxy.query.filter(Proxy.proto.in_(["tuic", "hysteria2", "hysteria"])).delete()
-    db.session.add(Proxy(l3='tls', transport='custom',
-                   cdn='direct', proto='tuic', enable=True, name="TUIC"))
-    db.session.add(Proxy(l3='tls', transport='custom', cdn='direct',
-                   proto='hysteria2', enable=True, name="Hysteria2"))
+    db.session.add(Proxy(l3='tls', transport='custom', cdn='direct', proto='tuic', enable=True, name="TUIC"))
+    db.session.add(Proxy(l3='tls', transport='custom', cdn='direct', proto='hysteria2', enable=True, name="Hysteria2"))
 
 
 def _v52():
@@ -374,11 +345,9 @@ def _v47():
 def _v45():
 
     if not Proxy.query.filter(Proxy.name == "SSH").first():
-        db.session.add(Proxy(l3='ssh', transport='ssh',
-                       cdn='direct', proto='ssh', enable=True, name="SSH"))
+        db.session.add(Proxy(l3='ssh', transport='ssh', cdn='direct', proto='ssh', enable=True, name="SSH"))
 
-    add_config_if_not_exist(ConfigEnum.ssh_server_port,
-                            hutils.random.get_random_unused_port())
+    add_config_if_not_exist(ConfigEnum.ssh_server_port, hutils.random.get_random_unused_port())
     add_config_if_not_exist(ConfigEnum.ssh_server_enable, False)
 # def _v43():
 #     if not (Domain.query.filter(Domain.domain==hconfig(ConfigEnum.domain_fronting_domain)).first()):
@@ -398,8 +367,7 @@ def _v42():
 def _v41():
     add_config_if_not_exist(ConfigEnum.core_type, "xray")
     if not (Domain.query.filter(Domain.domain == hconfig(ConfigEnum.reality_fallback_domain)).first()):
-        db.session.add(Domain(domain=hconfig(ConfigEnum.reality_fallback_domain),
-                       servernames=hconfig(ConfigEnum.reality_server_names), mode=DomainType.reality))
+        db.session.add(Domain(domain=hconfig(ConfigEnum.reality_fallback_domain), servernames=hconfig(ConfigEnum.reality_server_names), mode=DomainType.reality))
 
 
 def _v38():
@@ -418,8 +386,7 @@ def _v33():
 
 
 def _v31():
-    add_config_if_not_exist(ConfigEnum.reality_short_ids,
-                            uuid.uuid4().hex[0:random.randint(1, 8) * 2])
+    add_config_if_not_exist(ConfigEnum.reality_short_ids, uuid.uuid4().hex[0:random.randint(1, 8) * 2])
     key_pair = hutils.crypto.generate_x25519_keys()
     add_config_if_not_exist(ConfigEnum.reality_private_key, key_pair['private_key'])
     add_config_if_not_exist(ConfigEnum.reality_public_key, key_pair['public_key'])
@@ -505,55 +472,11 @@ def _v1():
     rnd_domains = hutils.network.get_random_domains(5)
 
     data = [
-        StrConfig(key=ConfigEnum.db_version, value=1),
-        User(name="default", usage_limit_GB=3000,
-             package_days=3650, mode=UserMode.weekly),
-        Domain(domain=external_ip + ".sslip.io", mode=DomainType.direct),
-        StrConfig(key=ConfigEnum.admin_secret, value=uuid.uuid4()),
-        StrConfig(key=ConfigEnum.http_ports, value="80"),
-        StrConfig(key=ConfigEnum.tls_ports, value="443"),
-        BoolConfig(key=ConfigEnum.first_setup, value=True),
-        StrConfig(key=ConfigEnum.decoy_domain,
-                  value=hutils.network.get_random_decoy_domain()),
-        StrConfig(key=ConfigEnum.proxy_path,
-                  value=hutils.random.get_random_string()),
-        BoolConfig(key=ConfigEnum.firewall, value=False),
-        BoolConfig(key=ConfigEnum.netdata, value=True),
-        StrConfig(key=ConfigEnum.lang, value='en'),
-        BoolConfig(key=ConfigEnum.block_iran_sites, value=True),
-        BoolConfig(key=ConfigEnum.allow_invalid_sni, value=True),
-        BoolConfig(key=ConfigEnum.kcp_enable, value=False),
-        StrConfig(key=ConfigEnum.kcp_ports, value="88"),
-        BoolConfig(key=ConfigEnum.auto_update, value=os.environ.get('HIDDIFY_DISABLE_UPDATE',"").lower() not in {'1','true'}),
-        BoolConfig(key=ConfigEnum.speed_test, value=True),
-        BoolConfig(key=ConfigEnum.only_ipv4, value=False),
-        BoolConfig(key=ConfigEnum.vmess_enable, value=True),
-        BoolConfig(key=ConfigEnum.http_proxy_enable, value=True),
-        StrConfig(key=ConfigEnum.shared_secret, value=str(uuid.uuid4())),
-        BoolConfig(key=ConfigEnum.telegram_enable, value=False),
-        # StrConfig(key=ConfigEnum.telegram_secret,value=uuid.uuid4().hex),
-        StrConfig(key=ConfigEnum.telegram_adtag, value=""),
-        StrConfig(key=ConfigEnum.telegram_fakedomain, value=rnd_domains[1]),
-        BoolConfig(key=ConfigEnum.ssfaketls_enable, value=False),
-        # StrConfig(key=ConfigEnum.ssfaketls_secret,value=str(uuid.uuid4())),
-        StrConfig(key=ConfigEnum.ssfaketls_fakedomain, value=rnd_domains[2]),
-        BoolConfig(key=ConfigEnum.shadowtls_enable, value=False),
-        # StrConfig(key=ConfigEnum.shadowtls_secret,value=str(uuid.uuid4())),
-        StrConfig(key=ConfigEnum.shadowtls_fakedomain, value=rnd_domains[3]),
-
-        BoolConfig(key=ConfigEnum.ssr_enable, value=False),
-        # StrConfig(key=ConfigEnum.ssr_secret,value=str(uuid.uuid4())),
-        StrConfig(key=ConfigEnum.ssr_fakedomain, value=rnd_domains[4]),
-
-        # BoolConfig(key=ConfigEnum.tuic_enable, value=False),
-        # StrConfig(key=ConfigEnum.tuic_port, value=3048),
-
-        BoolConfig(key=ConfigEnum.domain_fronting_tls_enable, value=False),
-        BoolConfig(key=ConfigEnum.domain_fronting_http_enable, value=False),
-        StrConfig(key=ConfigEnum.domain_fronting_domain, value=""),
-
-        # BoolConfig(key=ConfigEnum.torrent_block,value=False),
-
+        StrConfig(key=ConfigEnum.db_version, value=1), User(name="default", usage_limit_GB=3000, package_days=3650, mode=UserMode.weekly), Domain(domain=external_ip + ".sslip.io", mode=DomainType.direct), StrConfig(key=ConfigEnum.admin_secret, value=uuid.uuid4()), StrConfig(key=ConfigEnum.http_ports, value="80"), StrConfig(key=ConfigEnum.tls_ports, value="443"), BoolConfig(key=ConfigEnum.first_setup, value=True), StrConfig(key=ConfigEnum.decoy_domain, value=hutils.network.get_random_decoy_domain()), StrConfig(key=ConfigEnum.proxy_path, value=hutils.random.get_random_string()), BoolConfig(key=ConfigEnum.firewall, value=False), BoolConfig(key=ConfigEnum.netdata, value=True), StrConfig(key=ConfigEnum.lang, value='en'), BoolConfig(key=ConfigEnum.block_iran_sites, value=True), BoolConfig(key=ConfigEnum.allow_invalid_sni, value=True), BoolConfig(key=ConfigEnum.kcp_enable, value=False), StrConfig(key=ConfigEnum.kcp_ports, value="88"), BoolConfig(key=ConfigEnum.auto_update, value=os.environ.get('HIDDIFY_DISABLE_UPDATE',"").lower() not in {'1','true'}), BoolConfig(key=ConfigEnum.speed_test, value=True), BoolConfig(key=ConfigEnum.only_ipv4, value=False), BoolConfig(key=ConfigEnum.vmess_enable, value=True), BoolConfig(key=ConfigEnum.http_proxy_enable, value=True), StrConfig(key=ConfigEnum.shared_secret, value=str(uuid.uuid4())), BoolConfig(key=ConfigEnum.telegram_enable, value=False), # StrConfig(key=ConfigEnum.telegram_secret,value=uuid.uuid4().hex), StrConfig(key=ConfigEnum.telegram_adtag, value=""), StrConfig(key=ConfigEnum.telegram_fakedomain, value=rnd_domains[1]), BoolConfig(key=ConfigEnum.ssfaketls_enable, value=False), # StrConfig(key=ConfigEnum.ssfaketls_secret,value=str(uuid.uuid4())), StrConfig(key=ConfigEnum.ssfaketls_fakedomain, value=rnd_domains[2]), BoolConfig(key=ConfigEnum.shadowtls_enable, value=False), # StrConfig(key=ConfigEnum.shadowtls_secret,value=str(uuid.uuid4())), StrConfig(key=ConfigEnum.shadowtls_fakedomain, value=rnd_domains[3]), 
+        BoolConfig(key=ConfigEnum.ssr_enable, value=False), # StrConfig(key=ConfigEnum.ssr_secret,value=str(uuid.uuid4())), StrConfig(key=ConfigEnum.ssr_fakedomain, value=rnd_domains[4]), 
+        # BoolConfig(key=ConfigEnum.tuic_enable, value=False), # StrConfig(key=ConfigEnum.tuic_port, value=3048), 
+        BoolConfig(key=ConfigEnum.domain_fronting_tls_enable, value=False), BoolConfig(key=ConfigEnum.domain_fronting_http_enable, value=False), StrConfig(key=ConfigEnum.domain_fronting_domain, value=""), 
+        # BoolConfig(key=ConfigEnum.torrent_block,value=False), 
         *get_proxy_rows_v1()
     ]
     # fake_domains=['speedtest.net']
@@ -607,17 +530,17 @@ def _v10():
 
 def get_proxy_rows_v1():
     rows = list(make_proxy_rows([
-        "h2 direct vless",
-        "XTLS direct vless",
-        "WS direct vless",
-        "WS direct trojan",
-        "WS direct vmess",
-        "httpupgrade direct vless",
-        # "httpupgrade direct trojan",
-        "httpupgrade direct vmess",
-        "xhttp direct vless",
-        "xhttp direct trojan",
-        "xhttp direct vmess",
+        "h2 direct vless", 
+        # "XTLS direct vless",
+        "WS direct vless", 
+        "WS direct trojan", 
+        "WS direct vmess", 
+        "httpupgrade direct vless", 
+        # "httpupgrade direct trojan", 
+        "httpupgrade direct vmess", 
+        "xhttp direct vless", 
+        # "xhttp direct trojan", 
+        "xhttp direct vmess", 
         "tcp direct vless",
         "tcp direct trojan",
         "tcp direct vmess",
@@ -627,18 +550,18 @@ def get_proxy_rows_v1():
         "faketls direct ss",
         "WS direct v2ray",
         "h2 relay vless",
-        "XTLS relay vless",
+        # "XTLS relay vless",
         "WS relay vless",
         "WS relay trojan",
         "WS relay vmess",
         "httpupgrade relay vless",
         # "httpupgrade relay trojan",
         "httpupgrade relay vmess",
-
+        
         "xhttp relay vless",
-        "xhttp relay trojan",
+        # "xhttp relay trojan",
         "xhttp relay vmess",
-
+        
         "tcp relay vless",
         "tcp relay trojan",
         "tcp relay vmess",
@@ -647,7 +570,7 @@ def get_proxy_rows_v1():
         "grpc relay vmess",
         "faketls relay ss",
         "WS relay v2ray",
-
+        
         # "restls1_2 direct ss",
         # "restls1_3 direct ss",
         # "tcp direct ssr",
@@ -658,43 +581,31 @@ def get_proxy_rows_v1():
         "httpupgrade CDN vless",
         # "httpupgrade CDN trojan",
         "httpupgrade CDN vmess",
-
+        
         "xhttp CDN vless",
-        "xhttp CDN trojan",
+        # "xhttp CDN trojan",
         "xhttp CDN vmess",
-
+        
+        
         "grpc CDN vless",
         "grpc CDN trojan",
         "grpc CDN vmess",
-
-    ]
-    ))
-    rows.append(Proxy(l3=ProxyL3.custom, transport=ProxyTransport.shadowsocks,
-                cdn='direct', proto='ss', enable=True, name="ShadowSocks2022"))
-    rows.append(Proxy(l3=ProxyL3.custom, transport=ProxyTransport.shadowsocks,
-                cdn='relay', proto='ss', enable=True, name="ShadowSocks2022 Relay"))
-
-    rows.append(Proxy(l3=ProxyL3.tls, transport=ProxyTransport.shadowtls,
-                cdn='direct', proto='ss', enable=True, name="ShadowTLS"))
-    rows.append(Proxy(l3=ProxyL3.tls, transport=ProxyTransport.shadowtls,
-                cdn='relay', proto='ss', enable=True, name="ShadowTLS Relay"))
-    rows.append(Proxy(l3='ssh', transport='ssh', cdn='direct',
-                proto='ssh', enable=True, name="SSH"))
-    rows.append(Proxy(l3='ssh', transport=ProxyTransport.ssh,
-                cdn=ProxyCDN.relay, proto=ProxyProto.ssh, enable=True, name="SSH Relay"))
-
-    rows.append(Proxy(l3='tls', transport='custom', cdn='direct',
-                proto='tuic', enable=True, name="TUIC"))
-    rows.append(Proxy(l3='tls', transport='custom', cdn='relay',
-                proto='tuic', enable=True, name="TUIC Relay"))
-    rows.append(Proxy(l3='tls', transport='custom', cdn='direct',
-                proto='hysteria2', enable=True, name="Hysteria2"))
-    rows.append(Proxy(l3='tls', transport='custom', cdn='relay',
-                proto='hysteria2', enable=True, name="Hysteria2 Relay"))
-    rows.append(Proxy(l3=ProxyL3.udp, transport=ProxyTransport.custom,
-                cdn=ProxyCDN.direct, proto=ProxyProto.wireguard, enable=True, name="WireGuard"))
-    rows.append(Proxy(l3=ProxyL3.udp, transport=ProxyTransport.custom, cdn=ProxyCDN.relay,
-                proto=ProxyProto.wireguard, enable=True, name="WireGuard Relay"))
+        
+    ]))
+    rows.append(Proxy(l3=ProxyL3.custom, transport=ProxyTransport.shadowsocks, cdn='direct', proto='ss', enable=True, name="ShadowSocks2022"))
+    rows.append(Proxy(l3=ProxyL3.custom, transport=ProxyTransport.shadowsocks, cdn='relay', proto='ss', enable=True, name="ShadowSocks2022 Relay"))
+
+    rows.append(Proxy(l3=ProxyL3.tls, transport=ProxyTransport.shadowtls, cdn='direct', proto='ss', enable=True, name="ShadowTLS"))
+    rows.append(Proxy(l3=ProxyL3.tls, transport=ProxyTransport.shadowtls, cdn='relay', proto='ss', enable=True, name="ShadowTLS Relay"))
+    rows.append(Proxy(l3='ssh', transport='ssh', cdn='direct', proto='ssh', enable=True, name="SSH"))
+    rows.append(Proxy(l3='ssh', transport=ProxyTransport.ssh, cdn=ProxyCDN.relay, proto=ProxyProto.ssh, enable=True, name="SSH Relay"))
+
+    rows.append(Proxy(l3='tls', transport='custom', cdn='direct', proto='tuic', enable=True, name="TUIC"))
+    rows.append(Proxy(l3='tls', transport='custom', cdn='relay', proto='tuic', enable=True, name="TUIC Relay"))
+    rows.append(Proxy(l3='tls', transport='custom', cdn='direct', proto='hysteria2', enable=True, name="Hysteria2"))
+    rows.append(Proxy(l3='tls', transport='custom', cdn='relay', proto='hysteria2', enable=True, name="Hysteria2 Relay"))
+    rows.append(Proxy(l3=ProxyL3.udp, transport=ProxyTransport.custom, cdn=ProxyCDN.direct, proto=ProxyProto.wireguard, enable=True, name="WireGuard"))
+    rows.append(Proxy(l3=ProxyL3.udp, transport=ProxyTransport.custom, cdn=ProxyCDN.relay, proto=ProxyProto.wireguard, enable=True, name="WireGuard Relay"))
     for p in rows:
         is_exist = Proxy.query.filter(Proxy.name == p.name).first() or Proxy.query.filter(
             Proxy.l3 == p.l3, Proxy.transport == p.transport, Proxy.cdn == p.cdn, Proxy.proto == p.proto).first()
@@ -703,7 +614,7 @@ def get_proxy_rows_v1():
 
 
 def make_proxy_rows(cfgs):
-    # "h3_quic",
+    # "h3_quic", 
     for l3 in [ProxyL3.h3_quic, "tls_h2", "tls", "http", "reality"]:
         for c in cfgs:
             transport, cdn, proto = c.split(" ")
@@ -731,7 +642,26 @@ def make_proxy_rows(cfgs):
             name = f'{l3} {c}'
             # is_exist = Proxy.query.filter(Proxy.name == name).first() or Proxy.query.filter(            #     Proxy.l3 == l3, Proxy.transport == transport, Proxy.cdn == cdn, Proxy.proto == proto).first()
             # if not is_exist:
-            yield Proxy(l3=l3, transport=transport, cdn=cdn, proto=proto, enable=enable, name=name)
+            params_list=[('',{})]
+            
+            if transport=="xhttp" and l3 != "reality":
+                params_list=[]
+                # for up in ['http/1.1"','h2','h3']:
+                if l3=="http":
+                    alpn=['http/1.1']
+                else:
+                    alpns=['http/1.1','h2','h3']
+                for dl in alpns:
+                    name_postfix=f' dl={dl}'.replace("http/1.1",'h1')
+                    params={
+                            'download':{
+                                'alpn':f'{dl}'
+                            }                    
+                        }
+                    params_list.append((name_postfix,params))
+                        
+            for name_postfix,params in params_list:
+                yield Proxy(l3=l3, transport=transport, cdn=cdn, proto=proto, enable=enable, name=name+name_postfix, params=params)
 
 
 def add_config_if_not_exist(key: "ConfigEnum", val: str | int, child_id: int | None = None):
@@ -762,8 +692,7 @@ def execute(query: str):
 
 def add_new_enum_values():
     columns = [
-        Proxy.l3, Proxy.proto, Proxy.cdn, Proxy.transport,
-        User.mode, Domain.mode, BoolConfig.key, StrConfig.key
+        Proxy.l3, Proxy.proto, Proxy.cdn, Proxy.transport, User.mode, Domain.mode, BoolConfig.key, StrConfig.key
     ]
     from sqlalchemy import text
     for col in columns:
@@ -798,7 +727,8 @@ def add_new_enum_values():
         # enumstr = ','.join([f"'{a}'" for a in [*existing_values, *old_values]])
         enumstr = ','.join([f"'{a}'" for a in [*existing_values]])
         expired_enumstr = ','.join([f"'{a}'" for a in [*old_values]])
-        db_execute(f"delete from {table_name} where `{column_name}` in ({expired_enumstr});", commit=True)
+        if expired_enumstr:
+            db_execute(f"delete from {table_name} where `{column_name}` in ({expired_enumstr});", commit=True)
         db_execute(f"ALTER TABLE {table_name} MODIFY COLUMN `{column_name}` ENUM({enumstr});", commit=True)
 
 
@@ -839,18 +769,7 @@ def upgrade_database():
             logger.info(f"importing configs from {newest_file}")
             json_data = json.load(f)
             from hiddifypanel.panel import hiddify
-            hiddify.set_db_from_json(json_data,
-                                     set_users=True,
-                                     set_domains=True,
-                                     remove_domains=True,
-                                     remove_users=True,
-                                     set_settings=True,
-                                     override_unique_id=True,
-                                     set_admins=True,
-                                     override_root_admin=True,
-                                     override_child_unique_id=0,
-                                     replace_owner_admin=True
-                                     )
+            hiddify.set_db_from_json(json_data, set_users=True, set_domains=True, remove_domains=True, remove_users=True, set_settings=True, override_unique_id=True, set_admins=True, override_root_admin=True, override_child_unique_id=0, replace_owner_admin=True)
             db_version = int([d['value'] for d in json_data['hconfigs'] if d['key'] == "db_version"][0])
             os.rename(sqlite_db, sqlite_db + ".old")
             set_hconfig(ConfigEnum.db_version, db_version, commit=True)
@@ -860,7 +779,7 @@ def upgrade_database():
 
 def init_db():
     # set_hconfig(ConfigEnum.db_version, 71)
-    # set_hconfig(ConfigEnum.db_version,101)
+    # set_hconfig(ConfigEnum.db_version,103)
     db_version = current_db_version()
     if db_version == latest_db_version():
         return
@@ -915,8 +834,7 @@ def init_db():
 
             db_version = ver
             db.session.commit()
-            set_hconfig(ConfigEnum.db_version, db_version,
-                        child_id=child.id, commit=False)
+            set_hconfig(ConfigEnum.db_version, db_version, child_id=child.id, commit=False)
 
         db.session.commit()
     g.child = Child.by_id(0)

hiddifypanel/panel/user/user.py

@@ -332,22 +332,22 @@ def get_domain_information(no_domain=False, filter_domain=None, alternative=None
         domains = db_domain.show_domains or Domain.query.filter(Domain.sub_link_only != True).all()
 
     has_auto_cdn = False
-    for d in domains:
-        db.session.expunge(d)
-        d.has_auto_ip = False
-        if d.mode == DomainType.auto_cdn_ip or d.cdn_ip:
-            has_auto_cdn = True
-            d.has_auto_ip = d.mode == DomainType.auto_cdn_ip or (
-                d.cdn_ip and "MTN" in d.cdn_ip)
-            d.cdn_ip = hutils.network.auto_ip_selector.get_clean_ip(
-                d.cdn_ip, d.mode == DomainType.auto_cdn_ip, default_asn)
+    # for d in domains:
+        # db.session.expunge(d)
+        # d.has_auto_ip = False
+        # if d.mode == DomainType.auto_cdn_ip or d.cdn_ip:
+        #     has_auto_cdn = True
+        #     d.has_auto_ip = d.mode == DomainType.auto_cdn_ip or (
+        #         d.cdn_ip and "MTN" in d.cdn_ip)
+        #     d.cdn_ip = hutils.network.auto_ip_selector.get_clean_ip(
+        #         d.cdn_ip, d.mode == DomainType.auto_cdn_ip, default_asn)
             # print("autocdn ip mode ", d.cdn_ip)
-        if "*" in d.domain:
-            d.domain = d.domain.replace("*", hutils.random.get_random_string(5, 15))
+        # if "*" in d.domain:
+        #     d.domain = d.domain.replace("*", hutils.random.get_random_string(5, 15))
 
     if len(domains) == 0:
         domains = [Domain(id=0, domain=alternative, mode=DomainType.direct, cdn_ip='', show_domains=[], child_id=0)]
-        domains[0].has_auto_ip = True
+        # domains[0].has_auto_ip = True
 
     return domains, db_domain, has_auto_cdn
 

hiddifypanel/static/js/custom-rtl.js

@@ -13,7 +13,7 @@ function ConvertNumberToPersion(elemnt) {
 
   function traverse(el) {
     //            console.log(el.tagName)
-    if (el.tagName == "PRE" || el.tagName == "STYLE" || el.tagName == "SCRIPT" || el.tagName == "INPUT" || el.tagName == "TEXTAREA") return
+    if (el==undefined||el.tagName == "PRE" || el.tagName == "STYLE" || el.tagName == "SCRIPT" || el.tagName == "INPUT" || el.tagName == "TEXTAREA") return
     if (el.nodeType == 3 && el.data != undefined) {
       for (const key in replace) {
         el.data = el.data.replace(key, replace[key])

hiddifypanel/templates/fake.html

@@ -48,6 +48,8 @@
 {{_("config.reality_public_key.description")}}
 {{_("config.reality_port.label")}}
 {{_("config.reality_port.description")}}
+{{_("config.special_port.label")}}
+{{_("config.special_port.description")}}
 {{_("config.restls1_2_domain.label")}}
 {{_("config.restls1_2_domain.description")}}
 {{_("config.restls1_3_domain.label")}}
@@ -90,6 +92,10 @@
 {{_("config.admin_lang.description")}}
 {{_("config.admin_secret.label")}}
 {{_("config.admin_secret.description")}}
+{{_("config.default_useragent_string.label")}}
+{{_("config.default_useragent_string.description")}}
+{{_("config.use_ip_in_config.label")}}
+{{_("config.use_ip_in_config.description")}}
 {{_("config.tls_ports.label")}}
 {{_("config.tls_ports.description")}}
 {{_("config.tls_fragment_enable.label")}}
@@ -324,10 +330,13 @@
 {{_("cdn")}}
 {{_("auto_cdn_ip")}}
 {{_("relay")}}
-{{_("reality")}}
-{{_("old_xtls_direct")}}
 {{_("worker")}}
 {{_("fake")}}
+{{_("reality")}}
+{{_("special_reality_tcp")}}
+{{_("special_reality_xhttp")}}
+{{_("special_reality_grpc")}}
+{{_("old_xtls_direct")}}
 
 {{_("no_reset")}}
 {{_("monthly")}}

hiddifypanel/templates/flaskadmin-layout.html

@@ -37,12 +37,12 @@
 {% endfor %}
 {% endif %}
 <!-- Include the default stylesheet -->
-<link rel="stylesheet" href="https://unpkg.com/multiple-select@1.5.2/dist/multiple-select.min.css">
+<link rel="stylesheet" href="https://unpkg.com/multiple-select@2.1.1/dist/multiple-select.min.css">
 
 <!-- Latest compiled and minified JavaScript -->
-<script src="https://unpkg.com/multiple-select@1.5.2/dist/multiple-select.min.js"></script>
-<link href="https://unpkg.com/multiple-select@1.5.2/dist/themes/bootstrap.min.css" rel="stylesheet">
-
+<script src="https://unpkg.com/multiple-select@2.1.1/dist/multiple-select.min.js"></script>
+<link href="https://unpkg.com/multiple-select@2.1.1/dist/themes/bootstrap.min.css" rel="stylesheet">
+<!-- <link href="https://cdn.jsdelivr.net/npm/select2@4.0.0/dist/css/select2.min.css" rel="stylesheet" /> -->
 <!-- <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" /> -->
 <!-- <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@ttskch/select2-bootstrap4-theme@x.x.x/dist/select2-bootstrap4.min.css">
     <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>     -->
@@ -54,7 +54,9 @@
     
     function update_hiddify_ui() {
         
-        $("#show_domains").multipleSelect({ width: '100%' });
+        $("#show_domains").multipleSelect({ width: '100%',      filter: true });
+        // $("#download_domain").select2()
+        $("#download_domain").multipleSelect({ width: '100%',      filter: true });
 
         if ($("#domain").length > 0) {
             var selectElement = document.getElementById("mode");
@@ -62,7 +64,7 @@
                 { label: `{{_("Direct")}}`, options: ["direct", "old_xtls_direct"] },
                 { label: `{{_("Panel Link")}}`, options: ["sub_link_only"] },
                 { label: `{{_("Bridge Servers")}}`, options: ["cdn", "auto_cdn_ip", "worker", "relay"] },
-                { label: `{{_("Fake")}}`, options: ["reality", "fake"] }
+                { label: `{{_("Fake")}}`, options: ["special_reality_xhttp","special_reality_tcp","special_reality_grpc", "fake"] }
             ];
 
             var options = Array.from($("#mode option"));
@@ -106,7 +108,7 @@
                 $("#domain").parent().find(".control-label").html(`{{_('domain.domain')}}`)
                 $("#domain").parent().find(".help-block").html(`{{_('domain.description')}}`)
 
-                $("#grpc").parent().parent().hide()
+
             } else {
                 $("#cdn_ip").parent().show();
                 //$("#mode").parent().show();
@@ -119,14 +121,14 @@
                     $("#cdn_ip").parent().show();
                 }
                 {% autoescape false %}
-                if ($("#mode").val() == 'reality') {
+                if (($("#mode").val()?? "").indexOf('reality')>=0) {
 
                     //$("#servernames").parent().hide();
                     $("#servernames").parent().show();
                     $("#servernames").parent().find(".control-label").html(`{{_('config.reality_server_names.label')}}`)
                     $("#servernames").parent().find(".help-block").html(`{{_('config.reality_server_names.description')}}`)
 
-                    $("#grpc").parent().parent().show()
+                    // $("#grpc").parent().parent().show()
                     $("#domain").parent().find(".control-label").html(`{{_('config.reality_fallback_domain.label')}}`)
                     $("#domain").parent().find(".help-block").html(`{{_('config.reality_fallback_domain.description')+("<a target='_blank' href='" +hurl_for('admin.Actions:get_some_random_reality_friendly_domain',test_domain=domain)+"'>"+_('Example Domains')+"</a>")}}`)
                 } else {