hiddifypanel 10.85.0b13__tar.gz → 10.85.0b14__tar.gz

{hiddifypanel-10.85.0b13 → hiddifypanel-10.85.0b14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hiddifypanel
-Version: 10.85.0b13
+Version: 10.85.0b14
 Summary: hiddifypanel multi proxy panel
 Author: hiddify
 License: 

hiddifypanel-10.85.0b14/hiddifypanel/VERSION

@@ -0,0 +1 @@
+10.85.0.b14

{hiddifypanel-10.85.0b13 → hiddifypanel-10.85.0b14}/hiddifypanel/VERSION.py

@@ -1,6 +1,6 @@
 # import importlib.metadata
 from datetime import datetime
 
-__version__ = '10.85.0b13'
-__release_time__= datetime.strptime('2025-04-29T02:17:22','%Y-%m-%dT%H:%M:%S')
+__version__ = '10.85.0.b14'
+__release_time__= datetime.strptime('2025-06-28T13:07:47','%Y-%m-%dT%H:%M:%S')
 is_released_version=True

{hiddifypanel-10.85.0b13 → hiddifypanel-10.85.0b14}/hiddifypanel/database.py

@@ -79,6 +79,7 @@ def init_app(app):
 
 
 def db_execute(query: str, return_val: bool = False, commit: bool = False, **params: dict):
+    # print(params)
     q = db.session.execute(text(query), params)
     if commit:
         db.session.commit()

{hiddifypanel-10.85.0b13 → hiddifypanel-10.85.0b14}/hiddifypanel/drivers/abstract_driver.py

@@ -1,7 +1,7 @@
 
 
 class DriverABS:
-    def get_all_usage(self, users): pass
+    def get_all_usage(self): pass
     def get_enabled_users(self): pass
     def add_client(self, user): pass
     def remove_client(self, user): pass

{hiddifypanel-10.85.0b13 → hiddifypanel-10.85.0b14}/hiddifypanel/drivers/singbox_api.py

@@ -38,17 +38,17 @@ class SingboxApi(DriverABS):
     def remove_client(self, user):
         pass
 
-    def get_all_usage(self, users):
+    def get_all_usage(self):
         xray_client = self.get_singbox_client()
         usages = xray_client.stats_query('user', reset=True)
-        uuid_user_map = {u.uuid: u for u in users}
+        
         res = defaultdict(int)
         for use in usages:
             if "user>>>" not in use.name:
                 continue
             # print(use.name, use.value)
             uuid = use.name.split(">>>")[1].split("@")[0]
-            res[uuid_user_map[uuid]] += use.value  # uplink + downlink
+            res[uuid] += use.value  # uplink + downlink
         return res
         # return {u: self.get_usage_imp(u.uuid) for u in users}
 

{hiddifypanel-10.85.0b13 → hiddifypanel-10.85.0b14}/hiddifypanel/drivers/ssh_liberty_bridge_api.py

@@ -41,12 +41,13 @@ class SSHLibertyBridgeApi(DriverABS):
         redis_client.hdel(USERS_USAGE, f'{user.uuid}')
         redis_client.save()
 
-    def get_all_usage(self, users):
+    def get_all_usage(self):
         redis_client = self.get_ssh_redis_client()
         allusage = redis_client.hgetall(USERS_USAGE)
         redis_client.delete(USERS_USAGE)
-        return {u: int(allusage.get(u.uuid) or 0) for u in users}
-        return {u: self.get_usage_imp(u.uuid) for u in users}
+        return allusage
+        # return {u: int(allusage.get(u.uuid) or 0) for u in users}
+        # return {u: self.get_usage_imp(u.uuid) for u in users}
 
     def get_usage_imp(self, client_uuid: str, reset: bool = True) -> int:
         redis_client = self.get_ssh_redis_client()

{hiddifypanel-10.85.0b13 → hiddifypanel-10.85.0b14}/hiddifypanel/drivers/user_driver.py

@@ -17,16 +17,17 @@ def enabled_drivers():
 def get_users_usage(reset=True):
     res = {}
     from hiddifypanel.database import db
-    
-    users = db.session.query(User).all()
+
+    # users = db.session.query(User).all()
     # users = list(User.query.all())
     res = defaultdict(lambda: {'usage': 0, 'devices': ''})
     for driver in enabled_drivers():
         try:
-            all_usage = driver.get_all_usage(users)
-            for user, usage in all_usage.items():
+            all_usage = driver.get_all_usage()
+            for uuid, usage in all_usage.items():
+                # print(f"{driver.__class__.__name__} {uuid} usage={usage}")
                 if usage:
-                    res[user]['usage'] += usage
+                    res[uuid]['usage'] += usage
                 # res[user]['devices'] +=usage
         except Exception as e:
             print(driver)

{hiddifypanel-10.85.0b13 → hiddifypanel-10.85.0b14}/hiddifypanel/drivers/wireguard_api.py

@@ -22,7 +22,25 @@ class WireguardApi(DriverABS):
 
     def __init__(self) -> None:
         super().__init__()
-
+        self.pub_uuid_map={}
+    def __load_pubkey_uuid_map(self):
+        from hiddifypanel.database import db
+        users = db.session.query(User).all()
+        self.pub_uuid_map={u.wg_pub: u.uuid for u in users}
+
+    def __convert_pub_key_to_uuid(self,pubkeys):
+        res={}
+        can_reload_map=True
+        for key in pubkeys:
+            if uuid:=self.pub_uuid_map.get(key):
+                res[key]=uuid
+            elif can_reload_map:
+                self.__load_pubkey_uuid_map()
+                can_reload_map=False
+                if uuid:=self.pub_uuid_map.get(key):
+                    res[key]=uuid
+        return res
+            
     def __get_wg_usages(self) -> dict:
         raw_output = commander(Command.update_wg_usage, run_in_background=False)
         data = {}
@@ -36,6 +54,7 @@ class WireguardApi(DriverABS):
                 'down': int(sections[1]),
                 'up': int(sections[2]),
             }
+        
         return data
 
     def __get_local_usage(self) -> dict:
@@ -45,22 +64,25 @@ class WireguardApi(DriverABS):
 
         return {}
 
-    def __sync_local_usages(self, users) -> dict:
+    def __sync_local_usages(self) -> dict:
         local_usage = self.__get_local_usage()
         wg_usage = self.__get_wg_usages()
+        
         res = {}
         # remove local usage that is removed from wg usage
         for local_wg_pub in local_usage.copy().keys():
             if local_wg_pub not in wg_usage:
                 del local_usage[local_wg_pub]
-        uuid_map = {u.wg_pub: u for u in users}
+
+        
+        uuid_map = self.__convert_pub_key_to_uuid(wg_usage.keys())
         for wg_pub, wg_usage in wg_usage.items():
-            user = uuid_map.get(wg_pub)
-            uuid = user.uuid if user else None
+            uuid = uuid_map.get(wg_pub)
+            
             if not local_usage.get(wg_pub):
                 local_usage[wg_pub] = {"uuid": uuid, "usage": wg_usage}
                 continue
-            res[wg_pub] = self.calculate_reset(local_usage[wg_pub]['usage'], wg_usage)
+            res[uuid] = self.calculate_reset(local_usage[wg_pub]['usage'], wg_usage)
             local_usage[wg_pub] = {"uuid": uuid, "usage": wg_usage}
 
         self.get_redis_client().set(USERS_USAGE, json.dumps(local_usage))
@@ -101,14 +123,14 @@ class WireguardApi(DriverABS):
     def remove_client(self, user):
         pass
 
-    def get_all_usage(self, users, reset=True):
+    def get_all_usage(self, reset=True):
         if not hconfig(ConfigEnum.wireguard_enable):
             return {}
-        all_usages = self.__sync_local_usages(users)
+        all_usages = self.__sync_local_usages()
         res = {}
-        for u in users:
-            if use := all_usages.get(u.wg_pub):
-                res[u] = use['up'] + use['down']
-            else:
-                res[u] = 0
+        for uuid,use in all_usages.items():
+            # if use := all_usages.get(u.wg_pub):
+                res[uuid] = use['up'] + use['down']
+            # else:
+            #     res[u] = 0
         return res

{hiddifypanel-10.85.0b13 → hiddifypanel-10.85.0b14}/hiddifypanel/drivers/xray_api.py

@@ -16,36 +16,41 @@ class XrayApi(DriverABS):
         return self.xray_client
 
     def get_enabled_users(self):
-        xray_client = self.get_xray_client()
-        usages = xray_client.stats_query('user', reset=True)
-        res = defaultdict(int)
-        tags = set(self.get_inbound_tags())
-        for use in usages:
-            if "user>>>" not in use.name:
-                continue
-            uuid = use.name.split(">>>")[1].split("@")[0]
-
-            for t in tags.copy():
-                try:
-                    self.__add_uuid_to_tag(uuid, t)
-                    self._remove_client(uuid, [t], False)
-                    # print(f"Success add  {uuid} {t}")
-                    res[uuid] = 0
-                except ValueError:
-                    # tag invalid
-                    tags.remove(t)
-                    pass
-                except xtlsapi.xtlsapi.exceptions.EmailAlreadyExists as e:
-                    res[uuid] = 1
-                except Exception as e:
-                    print(f"error {e}")
-                    res[uuid] = 0
-
-        return res
+        return {u:1 for u in self.get_enabled_users_terminal()}
+        # xray_client = self.get_xray_client()
+        # usages = xray_client.stats_query('user', reset=True)
+        # res = defaultdict(int)
+        # tags = set(self.get_inbound_tags())
+        # for use in usages:
+        #     if "user>>>" not in use.name:
+        #         continue
+        #     uuid = use.name.split(">>>")[1].split("@")[0]
+        #     res[uuid]=1
+
+        #     #TODO use xtls api
+        #     for t in tags.copy():
+        #         try:
+        #             self.__add_uuid_to_tag(uuid, t)
+        #             self._remove_client(uuid, [t], False)
+        #             # print(f"Success add  {uuid} {t}")
+        #             res[uuid] = 0
+        #             break
+        #         except ValueError:
+        #             # tag invalid
+        #             tags.remove(t)
+        #             pass
+        #         except xtlsapi.xtlsapi.exceptions.EmailAlreadyExists as e:
+        #             res[uuid] = 1
+        #             break
+        #         except Exception as e:
+        #             print(f"error {e}")
+        #             # res[uuid] = 1
+        #             break
+
+        # return res
 
         # xray_client = self.get_xray_client()
-        # users = User.query.all()
-        # t = "xtls"
+        # users = User.query.all() # t = "xtls"
         # protocol = "vless"
         # enabled = {}
         # for u in users:
@@ -101,8 +106,7 @@ class XrayApi(DriverABS):
         if (protocol == "vless" and p != "xtls" and p != "realityin") or "realityingrpc" in t:
             xray_client.add_client(t, f'{uuid}', f'{uuid}@hiddify.com', protocol=protocol, flow='\0',)
         else:
-            xray_client.add_client(t, f'{uuid}', f'{uuid}@hiddify.com', protocol=protocol,
-                                   flow='xtls-rprx-vision', alter_id=0, cipher='chacha20_poly1305')
+            xray_client.add_client(t, f'{uuid}', f'{uuid}@hiddify.com', protocol=protocol, flow='xtls-rprx-vision', alter_id=0, cipher='chacha20_poly1305')
 
     def add_client(self, user):
         uuid = user.uuid
@@ -130,26 +134,26 @@ class XrayApi(DriverABS):
         for t in tags:
             try:
                 xray_client.remove_client(t, f'{uuid}@hiddify.com')
-                if dolog:
-                    logger.info(f"Success remove  {uuid} {t}")
+                # if dolog:
+                #     logger.info(f"Success remove  {uuid} {t}")
             except Exception as e:
                 if dolog:
                     logger.info(f"error in remove  {uuid} {t} {e}")
                 pass
 
-    def get_all_usage(self, users):
+    def get_all_usage(self)->dict:
         xray_client = self.get_xray_client()
         usages = xray_client.stats_query('user', reset=True)
-        uuid_user_map = {u.uuid: u for u in users}
+        # uuid_user_map = {u.uuid: u for u in users}
         res = defaultdict(int)
         for use in usages:
             if "user>>>" not in use.name:
                 continue
             uuid = use.name.split(">>>")[1].split("@")[0]
-            if u := uuid_user_map.get(uuid):
-                res[u] += use.value
-            else:
-                self._remove_client(uuid)
+            # if u := uuid_user_map.get(uuid):
+            res[uuid] += use.value
+            # else:
+            #     self._remove_client(uuid)
         return res
 
     def get_usage_imp(self, uuid):
@@ -167,3 +171,36 @@ class XrayApi(DriverABS):
         if res:
             logger.debug(f"Xray usage {uuid} d={d} u={u} sum={res}")
         return res
+
+
+
+
+    def get_enabled_users_terminal(self):
+        import subprocess
+        import json
+        tags=self.get_inbound_tags()
+        for t in tags:
+        # Command to execute
+            cmd = [
+                'xray',
+                'api',
+                'inbounduser',
+                '--server=127.0.0.1:10085',
+                f'-tag={t}'
+            ]
+
+            try:
+                result = subprocess.run(cmd, capture_output=True, text=True, check=True)
+
+                # Parse JSON output
+                data = json.loads(result.stdout)
+                users= [splt[0] for splt in [u.get('email','').split("@") for u in data.get('users',[])] if len(splt)==2 and splt[1]=="hiddify.com"]
+                if len(data)>0:
+                    return users
+
+            except subprocess.CalledProcessError as e:
+                print("Command failed:", e)
+                print("Error output:", e.stderr)
+            except json.JSONDecodeError as e:
+                print("Failed to parse JSON:", e)
+        return []

{hiddifypanel-10.85.0b13 → hiddifypanel-10.85.0b14}/hiddifypanel/hutils/flask.py

@@ -244,7 +244,7 @@ def validate_domain_exist(form, field):
 
 
 def get_proxy_stats_url():
-    proxy_stats_url = f'{request.host_url}{g.proxy_path}/proxy-stats/'
+    proxy_stats_url = f'{request.host_url}{g.proxy_path}/proxy-stats/'.replace("http://","https://")
     params = f'hostname={proxy_stats_url}api/&port=443&secret=hiddify'
     return f'{proxy_stats_url}?{params}'
 

{hiddifypanel-10.85.0b13 → hiddifypanel-10.85.0b14}/hiddifypanel/hutils/proxy/shared.py

@@ -361,7 +361,7 @@ def make_proxy(hconfigs: dict, proxy: Proxy, domain_db: Domain, phttp=80, ptls=4
         return base
     elif "shadowsocks" in proxy.transport:
         return base
-    if ProxyTransport.XTLS in proxy.transport:
+    if proxy.l3 in [ProxyL3.reality] and  proxy.transport in [ProxyTransport.XTLS,ProxyTransport.xhttp]:
         base['flow'] = 'xtls-rprx-vision'
         return {**base, 'transport': 'tcp'}
 

{hiddifypanel-10.85.0b13 → hiddifypanel-10.85.0b14}/hiddifypanel/panel/init_db.py

@@ -17,6 +17,63 @@ from loguru import logger
 MAX_DB_VERSION = 120
 
 
+def _v102(child_id):
+
+    add_usage_proc=    """
+DROP PROCEDURE IF EXISTS add_usage_json;
+
+CREATE PROCEDURE add_usage_json(IN usage_data JSON)
+BEGIN
+  DECLARE u_id INT DEFAULT NULL;
+  DECLARE u_uuid CHAR(36) DEFAULT NULL;
+  DECLARE u_usage BIGINT;
+  DECLARE done BOOL DEFAULT FALSE;
+
+  DECLARE cur CURSOR FOR
+    SELECT jt.id, jt.uuid, jt.usage FROM JSON_TABLE(
+      usage_data,
+      '$[*]' COLUMNS (
+        id INT PATH '$.id' NULL ON ERROR,
+        uuid CHAR(36) PATH '$.uuid' NULL ON ERROR,
+        `usage` BIGINT PATH '$.usage'
+      )
+    ) AS jt;
+
+  DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
+
+  OPEN cur;
+
+  read_loop: LOOP
+    FETCH cur INTO u_id, u_uuid, u_usage;
+    IF done THEN
+      LEAVE read_loop;
+    END IF;
+
+    IF u_id IS NOT NULL THEN
+      UPDATE user
+      SET current_usage = current_usage + u_usage,
+          last_online = NOW(),
+          start_date = CASE WHEN start_date IS NULL THEN CURDATE() ELSE start_date END
+      WHERE id = u_id;
+    ELSEIF u_uuid IS NOT NULL THEN
+      UPDATE user
+      SET current_usage = current_usage + u_usage,
+          last_online = NOW(),
+          start_date = CASE WHEN start_date IS NULL THEN CURDATE() ELSE start_date END
+
+      WHERE uuid = u_uuid;
+    END IF;
+
+    COMMIT;
+  END LOOP;
+
+  CLOSE cur;
+END
+
+    """
+
+    db_execute(add_usage_proc,commit=True)
+    
 
 def _v101(child_id):
     add_config_if_not_exist(ConfigEnum.path_xhttp, hutils.random.get_random_string(7, 15))
@@ -660,7 +717,7 @@ def make_proxy_rows(cfgs):
                 continue
             if l3 in ["kcp", 'reality'] and cdn != "direct":
                 continue
-            if l3 == "reality" and ((transport not in ['tcp', 'grpc', 'XTLS']) or proto != 'vless'):
+            if l3 == "reality" and ((transport not in ['tcp', 'grpc', 'XTLS',ProxyTransport.xhttp]) or proto != 'vless'):
                 continue
             if proto == "trojan" and l3 not in ["tls", 'xtls', 'tls_h2', 'h3_quic']:
                 continue
@@ -668,6 +725,11 @@ def make_proxy_rows(cfgs):
                 continue
             if transport in ["h2"] and l3 != "reality":
                 continue
+            if l3 in [ProxyL3.h3_quic,ProxyL3.tls_h2] and transport in [ProxyTransport.httpupgrade, ProxyTransport.WS]:
+                continue
+
+            
+
             # if l3 == "tls_h2" and transport =="grpc":
             #     continue
             enable = l3 != "http" or proto == "vmess"
@@ -805,6 +867,7 @@ def upgrade_database():
 def init_db():
     # set_hconfig(ConfigEnum.db_version, 71)
     db_version = current_db_version()
+    # set_hconfig(ConfigEnum.db_version,101)
     if db_version == latest_db_version():
         return