hiddifypanel 9.0.0.dev90__py3-none-any.whl → 10.5.0.dev0__py3-none-any.whl

hiddifypanel/panel/init_db.py

@@ -2,28 +2,63 @@ import datetime
 import json
 import os
 import random
-import string
 import sys
 import uuid
 
-from dateutil import relativedelta
 
 from hiddifypanel import Events, hutils
 from hiddifypanel.models import *
-from hiddifypanel.models import ConfigEnum, User, set_hconfig, ChildMode
 from hiddifypanel.panel import hiddify
-from hiddifypanel.database import db
-import hiddifypanel.models.utils as model_utils
-
+from hiddifypanel.database import db, db_execute
+from hiddifypanel import hutils
+from sqlalchemy import text
 from flask import g
 
-MAX_DB_VERSION = 80
+MAX_DB_VERSION = 90
+
+
+def _v83(child_id):
+    set_hconfig(ConfigEnum.log_level, LogLevel.CRITICAL)
+
+
+def _v82(child_id):
+    set_hconfig(ConfigEnum.vless_enable, True)
+    set_hconfig(ConfigEnum.trojan_enable, True)
+    set_hconfig(ConfigEnum.reality_enable, True)
+    set_hconfig(ConfigEnum.tcp_enable, True)
+    set_hconfig(ConfigEnum.quic_enable, True)
+    set_hconfig(ConfigEnum.xtls_enable, True)
+    set_hconfig(ConfigEnum.h2_enable, True)
+
+
+def _v80(child_id):
+    set_hconfig(ConfigEnum.parent_domain, '')
+    set_hconfig(ConfigEnum.parent_admin_proxy_path, '')
+
+
+def _v79(child_id):
+    set_hconfig(ConfigEnum.panel_mode, PanelMode.standalone)
+
+
+def _v78(child_id):
+    # equalize panel unique id and root child unique id
+    root_child_unique_id = Child.query.filter(Child.name == "Root").first().unique_id
+    set_hconfig(ConfigEnum.unique_id, root_child_unique_id)
+
+
+def _v77(child_id):
+    pass
+
+
+def _v75(child_id):
+    for u in User.query.all():
+        hutils.model.gen_wg_keys(u)
 
 
 def _v74(child_id):
     set_hconfig(ConfigEnum.ws_enable, True)
     set_hconfig(ConfigEnum.grpc_enable, True)
-    set_hconfig(ConfigEnum.httpupgrade_enable, False)
+    set_hconfig(ConfigEnum.httpupgrade_enable, True)
     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)
@@ -66,12 +101,12 @@ def _v69():
     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, _ = hiddify.get_wg_private_public_psk_pair()
+    wg_pk, wg_pub, _ = hutils.crypto.get_wg_private_public_psk_pair()
     add_config_if_not_exist(ConfigEnum.wireguard_private_key, wg_pk)
     add_config_if_not_exist(ConfigEnum.wireguard_public_key, wg_pub)
     add_config_if_not_exist(ConfigEnum.wireguard_noise_trick, "5-10")
     for u in User.query.all():
-        u.wg_pk, u.wg_pub, u.wg_psk = hiddify.get_wg_private_public_psk_pair()
+        u.wg_pk, u.wg_pub, u.wg_psk = hutils.crypto.get_wg_private_public_psk_pair()
 
 
 def _v65():
@@ -86,10 +121,6 @@ def _v65():
     add_config_if_not_exist(ConfigEnum.mux_brutal_down_mbps, '100')
 
 
-def _v64():
-    set_hconfig(ConfigEnum.ssh_server_redis_url, "unix:///opt/hiddify-manager/other/redis/run.sock?db=1")
-
-
 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())
@@ -120,13 +151,13 @@ def _v60():
 def _v59():
     # set user model username and password
     for u in User.query.all():
-        model_utils.fill_username(u)
-        model_utils.fill_password(u)
+        hutils.model.gen_username(u)
+        hutils.model.gen_password(u)
 
     # set admin model username and password
     for a in AdminUser.query.all():
-        model_utils.fill_username(a)
-        model_utils.fill_password(a)
+        hutils.model.gen_username(a)
+        hutils.model.gen_password(a)
 
 
 def _v57():
@@ -164,7 +195,7 @@ def _v50():
 def _v49():
 
     for u in User.query.all():
-        priv, publ = hiddify.get_ed25519_private_public_pair()
+        priv, publ = hutils.crypto.get_ed25519_private_public_pair()
         u.ed25519_private_key = priv
         u.ed25519_public_key = publ
 
@@ -182,7 +213,7 @@ 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"))
-    add_config_if_not_exist(ConfigEnum.ssh_server_redis_url, "unix:///opt/hiddify-manager/other/redis/run.sock?db=1")
+
     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():
@@ -224,7 +255,7 @@ def _v33():
 
 def _v31():
     add_config_if_not_exist(ConfigEnum.reality_short_ids, uuid.uuid4().hex[0:random.randint(1, 8) * 2])
-    key_pair = hiddify.generate_x25519_keys()
+    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'])
     db.session.bulk_save_objects(get_proxy_rows_v1())
@@ -370,7 +401,7 @@ def _v7():
         Proxy.query.filter(Proxy.name == 'tls XTLSVision direct trojan').delete()
     except BaseException:
         pass
-    add_config_if_not_exist(ConfigEnum.telegram_lib, "python")
+    add_config_if_not_exist(ConfigEnum.telegram_lib, "erlang")
     add_config_if_not_exist(ConfigEnum.admin_lang, hconfig(ConfigEnum.lang))
     add_config_if_not_exist(ConfigEnum.branding_title, "")
     add_config_if_not_exist(ConfigEnum.branding_site, "")
@@ -506,7 +537,7 @@ def make_proxy_rows(cfgs):
 
 def add_config_if_not_exist(key: ConfigEnum, val: str | int, child_id: int | None = None):
     if child_id is None:
-        child_id = Child.current.id
+        child_id = Child.current().id
 
     old_val = hconfig(key, child_id)
     print(key, val, child_id, old_val)
@@ -517,15 +548,18 @@ def add_config_if_not_exist(key: ConfigEnum, val: str | int, child_id: int | Non
 def add_column(column):
     try:
         column_type = column.type.compile(db.engine.dialect)
-        db.engine.execute(f'ALTER TABLE {column.table.name} ADD COLUMN {column.name} {column_type}')
+
+        db_execute(f'ALTER TABLE {column.table.name} ADD COLUMN {column.name} {column_type}')
     except BaseException:
         pass
 
 
-def execute(query):
+def execute(query: str):
     try:
-        db.engine.execute(query)
-    except BaseException:
+
+        db_execute(query)
+    except BaseException as e:
+        print(e)
         pass
 
 
@@ -545,7 +579,8 @@ def add_new_enum_values():
         # Get the values in the enum column in the database
         # result = db.engine.execute(f"SELECT DISTINCT `{column_name}` FROM {table_name}")
         # db_values = {row[0] for row in result}
-        result = db.engine.execute(f"SHOW COLUMNS FROM {table_name} LIKE '{column_name}';")
+
+        result = db_execute(f"SHOW COLUMNS FROM {table_name} LIKE '{column_name}';")
         db_values = []
 
         for row in result:
@@ -564,7 +599,7 @@ def add_new_enum_values():
         # Add the new value to the enum column in the database
         enumstr = ','.join([f"'{a}'" for a in [*existing_values, *old_values]])
 
-        db.engine.execute(f"ALTER TABLE {table_name} MODIFY COLUMN `{column_name}` ENUM({enumstr});")
+        db_execute(text(f"ALTER TABLE {table_name} MODIFY COLUMN `{column_name}` ENUM({enumstr});"))
 
         db.session.commit()
 
@@ -618,8 +653,8 @@ def init_db():
     get_hconfigs.invalidate_all()
     # set_hconfig(ConfigEnum.db_version, 71)
     # temporary fix
-    # add_column(Child.mode)
-    # add_column(Child.name)
+    add_column(Child.mode)
+    add_column(Child.name)
     db_version = int(hconfig(ConfigEnum.db_version) or 0)
     if db_version == latest_db_version():
         return
@@ -664,32 +699,44 @@ def init_db():
 
 
 def migrate(db_version):
-    execute('CREATE INDEX date ON daily_usage (date);')
-    execute('CREATE INDEX username ON user (username);')
-    execute('CREATE INDEX username ON admin_user (username);')
-    execute('CREATE INDEX telegram_id ON user (telegram_id);')
-    execute('CREATE INDEX telegram_id ON admin_user (telegram_id);')
-
-    execute('ALTER TABLE proxy DROP INDEX `name`;')
-
-    execute("alter table user alter column telegram_id bigint;")
-    execute("alter table admin_user alter column telegram_id bigint;")
+    for table_name, table_obj in db.metadata.tables.items():
+        for column in table_obj.columns:
+            add_column(column)
+    Events.db_prehook.notify()
+    if db_version < 82:
+        execute('ALTER TABLE child DROP INDEX `name`;')
+    if db_version < 77:
+        execute('ALTER TABLE user_detail DROP COLUMN connected_ips;')
+        execute('update user_detail set connected_devices="" where connected_devices IS NULL')
+
+    if db_version < 70:
+        execute('CREATE INDEX date ON daily_usage (date);')
+        execute('CREATE INDEX username ON user (username);')
+        execute('CREATE INDEX username ON admin_user (username);')
+        execute('CREATE INDEX telegram_id ON user (telegram_id);')
+        execute('CREATE INDEX telegram_id ON admin_user (telegram_id);')
+
+        execute('ALTER TABLE proxy DROP INDEX `name`;')
+
+        execute("ALTER TABLE user MODIFY COLUMN telegram_id BIGINT;")
+        execute("ALTER TABLE admin_user MODIFY COLUMN telegram_id BIGINT;")
+
+        # aaa
+        # # add_column(UserDetail.connected_devices)
+        # add_column(Child.mode)
+        # add_column(Child.name)
+        # add_column(User.lang)
+        # add_column(AdminUser.lang)
+        # add_column(User.username)
+        # add_column(User.password)
+        # add_column(AdminUser.username)
+        # add_column(AdminUser.password)
+        # add_column(User.wg_pk)
+        # add_column(User.wg_pub)
+        # add_column(User.wg_psk)
 
-    add_column(Child.mode)
-    add_column(Child.name)
-    add_column(User.lang)
-    add_column(AdminUser.lang)
-    add_column(User.username)
-    add_column(User.password)
-    add_column(AdminUser.username)
-    add_column(AdminUser.password)
-    add_column(User.wg_pk)
-    add_column(User.wg_pub)
-    add_column(User.wg_psk)
-
-    add_column(Domain.extra_params)
+        # add_column(Domain.extra_params)
 
-    Events.db_prehook.notify()
     if db_version < 52:
         execute(f'update domain set mode="sub_link_only", sub_link_only=false where sub_link_only = true or mode=1  or mode="1"')
         execute(f'update domain set mode="direct", sub_link_only=false where mode=0  or mode="0"')

hiddifypanel/panel/usage.py

@@ -1,34 +1,36 @@
 from flask_babel import lazy_gettext as _
 from sqlalchemy import func
+from typing import Dict
 import datetime
 
 from hiddifypanel.drivers import user_driver
 from hiddifypanel.models import *
 from hiddifypanel.panel import hiddify
 from hiddifypanel.database import db
+from hiddifypanel import hutils
 
 to_gig_d = 1024**3
 
 
 def update_local_usage():
     res = user_driver.get_users_usage(reset=True)
-    return add_users_usage(res, child_id=0)
+    return _add_users_usage(res, child_id=0)
 
     # return {"status": 'success', "comments":res}
 
 
-def add_users_usage_uuid(uuids_bytes, child_id):
-    users = User.query.filter(User.uuid.in_(keys(uuids_bytes)))
+def add_users_usage_uuid(uuids_bytes: Dict[str, Dict], child_id, sync=False):
+    uuids_bytes = {u: v for u, v in uuids_bytes.items() if v}
+    uuids = uuids_bytes.keys()
+    users = User.query.filter(User.uuid.in_(uuids))
     dbusers_bytes = {u: uuids_bytes.get(u.uuid, 0) for u in users}
-    add_users_usage(dbusers_bytes, child_id)
+    _add_users_usage(dbusers_bytes, child_id, sync)  # type: ignore
 
 
-def add_users_usage(dbusers_bytes, child_id):
-    print(dbusers_bytes)
-    if not hconfig(ConfigEnum.is_parent) and hconfig(ConfigEnum.parent_panel):
-        from hiddifypanel.panel import hiddify_api
-        hiddify_api.add_user_usage_to_parent(dbusers_bytes)
-
+def _add_users_usage(users_usage_data: Dict[User, Dict], child_id, sync=False):
+    '''
+    sync: when enabled, it means we have received usages from the parent panel
+    '''
     res = {}
     have_change = False
     before_enabled_users = user_driver.get_enabled_users()
@@ -42,16 +44,16 @@ def add_users_usage(dbusers_bytes, child_id):
         daily_usage[adm.id].online = User.query.filter(User.added_by == adm.id).filter(func.DATE(User.last_online) == today).count()
     # db.session.commit()
     userDetails = {p.user_id: p for p in UserDetail.query.filter(UserDetail.child_id == child_id).all()}
-    for user, uinfo in dbusers_bytes.items():
+    for user, uinfo in users_usage_data.items():
         usage_bytes = uinfo['usage']
-        ips = uinfo['ips']
+        devices = uinfo['devices']
         # user_active_before=user.is_active
         detail = userDetails.get(user.id)
         if not detail:
             detail = UserDetail(user_id=user.id, child_id=child_id)
             detail.current_usage_GB = detail.current_usage_GB or 0
             db.session.add(detail)
-        detail.connected_ips = ips
+        detail.connected_devices = devices
         detail.current_usage_GB = detail.current_usage_GB or 0
         if not user.last_reset_time or user.user_should_reset():
             user.last_reset_time = datetime.date.today()
@@ -66,11 +68,20 @@ def add_users_usage(dbusers_bytes, child_id):
         if not isinstance(usage_bytes, int) or usage_bytes == 0:
             res[user.uuid] = "No usage"
         else:
-            daily_usage.get(user.added_by, daily_usage[1]).usage += usage_bytes
+            if sync:
+                if daily_usage.get(user.added_by, daily_usage[1]).usage != usage_bytes:
+                    daily_usage.get(user.added_by, daily_usage[1]).usage = usage_bytes
+            else:
+                daily_usage.get(user.added_by, daily_usage[1]).usage += usage_bytes
             in_gig = (usage_bytes) / to_gig_d
             res[user.uuid] = in_gig
-            user.current_usage_GB += in_gig
-            detail.current_usage_GB += in_gig
+            if sync:
+                if user.current_usage_GB != in_gig:
+                    user.current_usage_GB = in_gig
+                # detail.current_usage_GB = in_gig
+            else:
+                user.current_usage_GB += in_gig
+                detail.current_usage_GB += in_gig
             user.last_online = datetime.datetime.now()
             detail.last_online = datetime.datetime.now()
 
@@ -83,15 +94,19 @@ def add_users_usage(dbusers_bytes, child_id):
             have_change = True
             res[user.uuid] = f"{res[user.uuid]} !OUT of USAGE! Client Removed"
 
-    db.session.commit()
+    db.session.commit()  # type: ignore
     if have_change:
         hiddify.quick_apply_users()
 
+    # sync with the parent
+    if not sync:
+        if hutils.node.is_child():
+            hutils.node.child.sync_users_usage_with_parent()
     return {"status": 'success', "comments": res}
 
 
 def send_bot_message(user):
-    if not (hconfig(ConfigEnum.telegram_bot_token) and not hconfig(ConfigEnum.parent_panel)):
+    if not (hconfig(ConfigEnum.telegram_bot_token) or not hutils.node.is_parent()):
         return
     if not user.telegram_id:
         return

hiddifypanel/panel/user/__init__.py

@@ -1,6 +1,5 @@
 from .user import UserView
 from flask import send_from_directory
-from . import link_maker
 from flask import Blueprint
 from hiddifypanel.database import db
 

hiddifypanel/panel/user/templates/all_configs copy.txt

@@ -1,4 +1,4 @@
-{% for type in link_maker.all_proxies(d.child_id) %}
+{% for type in link_maker.get_all_proxies(d.child_id,only_enabled=True) %}
 {% set pinfo=link_maker.proxy_info(type) %}
 # {{type}} {{domain}}
 {{pinfo['url']}}
@@ -16,7 +16,7 @@
 # HTTP Not Secure
 # HTTP Not Secure
 
-{% for type in link_maker.all_proxies(d.child_id) %}
+{% for type in link_maker.get_all_proxies(d.child_id,only_enabled=True) %}
 {% set pinfo=link_maker.proxy_info(type,port=80,security="http") %}
 {% if pinfo!=None %}
 # HTTP {{type}} {{domain}}

hiddifypanel/panel/user/templates/all_configs.txt

@@ -14,10 +14,10 @@ trojan://1@{{fake_ip_for_sub_link}}?sni=fake_ip_for_sub_link&security=tls#{{user
 ####################################
 ## {% if d.has_auto_ip  %}Auto {%endif%} {{d.mode}}  {{d.alias or d.domain}}  {{t}}:{{port}}
 ####################################
-{% for type in link_maker.all_proxies(d.child_id) %}
+{% for type in link_maker.get_all_proxies(d.child_id, only_enabled=True) %}
 {% set pinfo=link_maker.make_proxy(type,d,phttp=phttp,ptls=ptls) %}
 {% if 'msg' not in pinfo %}
-{% set link=link_maker.to_link(pinfo) %}
+{% set link=link_maker.xray.to_link(pinfo) %}
 {% if 'msg' not in link %}
 {{''}}
 # {{pinfo["name"]}} {{d.alias or d.domain}} 

hiddifypanel/panel/user/templates/base_singbox_config.json.j2

@@ -170,6 +170,7 @@
                 "domain": [
                     "github.com",
                     "githubusercontent.com",
+                    "raw.githubusercontent.com",
                     "1.1.1.1"
                 ],
                 "server": "dns-local"
@@ -225,4 +226,4 @@
             "type": "mixed"
         }
     ]
-}
+}

hiddifypanel/panel/user/templates/base_xray_config.json.j2

@@ -0,0 +1,125 @@
+{
+  "remarks": "{{remarks}}",
+  "log": {
+    "access": "",
+    "error": "",
+    "loglevel": "warning"
+  },
+  "inbounds": [
+    {
+      "tag": "socks",
+      "port": 10808,
+      "listen": "127.0.0.1",
+      "protocol": "socks",
+      "sniffing": {
+        "enabled": true,
+        "destOverride": [
+          "http",
+          "tls"
+        ],
+        "routeOnly": false
+      },
+      "settings": {
+        "auth": "noauth",
+        "udp": true,
+        "allowTransparent": false
+      }
+    },
+    {
+      "tag": "http",
+      "port": 10809,
+      "listen": "127.0.0.1",
+      "protocol": "http",
+      "sniffing": {
+        "enabled": true,
+        "destOverride": [
+          "http",
+          "tls"
+        ],
+        "routeOnly": false
+      },
+      "settings": {
+        "auth": "noauth",
+        "udp": true,
+        "allowTransparent": false
+      }
+    }
+  ],
+  "outbounds": [
+    {
+      "tag": "fragment",
+      "protocol": "freedom",
+      "settings": {
+        "domainStrategy": "AsIs"
+        {% if hconfig(ConfigEnum.tls_fragment_enable) %}
+        ,"fragment": {
+          "packets": "tlshello",
+          "length": "{{ hconfig(ConfigEnum.tls_fragment_size) }}",
+          "interval": "{{ hconfig(ConfigEnum.tls_fragment_sleep) }}"
+        }
+        {% endif %}
+      },
+      "streamSettings": {
+        "sockopt": {
+          "tcpNoDelay": true,
+          "tcpKeepAliveIdle": 100
+        }
+      }
+    },
+    {
+      "tag": "direct",
+      "protocol": "freedom",
+      "settings": {}
+    },
+    {
+      "tag": "block",
+      "protocol": "blackhole",
+      "settings": {
+        "response": {
+          "type": "http"
+        }
+      }
+    }
+  ],
+  "routing": {
+    "domainStrategy": "AsIs",
+    "rules": [
+      {
+        "type": "field",
+        "inboundTag": [
+          "api"
+        ],
+        "outboundTag": "api",
+        "enabled": true
+      },
+      {
+        "id": "5465425548310166497",
+        "type": "field",
+        "outboundTag": "direct",
+        "domain": [
+          "domain:ir",
+          "geosite:cn"
+        ],
+        "enabled": true
+      },
+      {
+        "id": "5425034033205580637",
+        "type": "field",
+        "outboundTag": "direct",
+        "ip": [
+          "geoip:private",
+          "geoip:cn",
+          "geoip:ir"
+        ],
+        "enabled": true
+      },
+      {
+        "id": "5627785659655799759",
+        "type": "field",
+        "port": "0-65535",
+        "outboundTag": "proxy",
+        "enabled": true
+      }
+    ]
+  }
+}

hiddifypanel/panel/user/templates/clash_config copy.yml

@@ -180,7 +180,7 @@ proxy-groups:
 
          
 
-{#link_maker.get_all_clash_configs(meta_or_normal,domains)#}
+{#link_maker.clash.get_all_clash_configs(meta_or_normal,domains)#}
 
 proxy-providers:
   all_proxies:

hiddifypanel/panel/user/templates/clash_config.yml

@@ -51,7 +51,7 @@ proxy-groups:
     proxies:
       - automatic
       - sequential 
-      {{link_maker.get_clash_config_names(meta_or_normal,domains)|indent(6)}}
+      {{link_maker.clash.get_clash_config_names(meta_or_normal,domains)|indent(6)}}
       
     # use:
     #   %for phttp in hconfigs[ConfigEnum.http_ports].split(',')
@@ -88,7 +88,7 @@ proxy-groups:
     url: "http://cp.cloudflare.com"
     interval: 300
     proxies:
-      {{link_maker.get_clash_config_names(meta_or_normal,domains)|indent(6)}}
+      {{link_maker.clash.get_clash_config_names(meta_or_normal,domains)|indent(6)}}
     # use:
     #   %for phttp in hconfigs[ConfigEnum.http_ports].split(',')
     #   - all_proxies_{{phttp}}
@@ -99,7 +99,7 @@ proxy-groups:
 
   - name: auto
     proxies:
-      {{link_maker.get_clash_config_names(meta_or_normal,domains)|indent(6)}}
+      {{link_maker.clash.get_clash_config_names(meta_or_normal,domains)|indent(6)}}
     # use:
     #   %for phttp in hconfigs[ConfigEnum.http_ports].split(',')
     #   - all_proxies_{{phttp}}
@@ -116,7 +116,7 @@ proxy-groups:
 
 
      
-{{link_maker.get_all_clash_configs(meta_or_normal,domains)}}
+{{link_maker.clash.get_all_clash_configs(meta_or_normal,domains)}}
 
 # proxy-providers:
 #   %for t in (['http','tls'] if hconfigs[ConfigEnum.http_proxy_enable] else ['tls'])

hiddifypanel/panel/user/templates/clash_proxies.yml

@@ -1,5 +1,5 @@
 
-{{link_maker.get_all_clash_configs(meta_or_normal,domains)}}
+{{link_maker.clash.get_all_clash_configs(meta_or_normal,domains)}}
 
 
 {% if False %}

hiddifypanel/panel/user/templates/home/all-configs.html

@@ -108,10 +108,10 @@
         <td><span class="badge badge-success">{{_('all')}}</span></td>
       </tr>
 
-      {% for pinfo in link_maker.get_all_validated_proxies(domains) %}
+      {% for pinfo in link_maker.get_valid_proxies(domains) %}
       <tr>
         <td>
-          <div class="btn-group"><a href='{{link_maker.to_link(pinfo)}}' class="btn btn-light orig-link">{{pinfo["name"].replace("_", " ")}}</a></div>
+          <div class="btn-group"><a href='{{link_maker.xray.to_link(pinfo)}}' class="btn btn-light orig-link">{{pinfo["name"].replace("_", " ")}}</a></div>
         </td>
         <td><span class="badge badge-danger"> {% if pinfo['dbdomain'].has_auto_ip %}Auto {%endif%}{{pinfo["mode"]}}</span></td>
         <td><span class="badge ltr">{{pinfo['server']}}</span></td>

hiddifypanel/panel/user/templates/home/all-configs_old.html

@@ -48,7 +48,7 @@
       <td><span class="badge badge-success">{{_('all')}}</span></td>
     </tr>
 
-    {% for type in link_maker.all_proxies() %}
+    {% for type in link_maker.get_all_proxies(only_enabled=True) %}
     {% for mode in ["tls","http"] %}
     {% set pinfo=link_maker.proxy_info(type,mode=mode) %}
     {% if pinfo!=None %}

hiddifypanel/panel/user/templates/home/ios copy.html

@@ -51,7 +51,7 @@
       سپس کانفیگ مورد نظر را انتخاب و اجرا نمایید.
       <br>
 
-      {% for type in link_maker.all_proxies() %}
+      {% for type in link_maker.get_all_proxies(only_enabled=True) %}
       {% set pinfo=link_maker.proxy_info(type) %}
       {% if pinfo!=None %}
       <div class="btn-group"><a href='{{pinfo["url"]}}' class="btn btn-primary orig-link">{{type}}</a></div>
@@ -107,7 +107,7 @@
       <br />
       سپس کانفیگ مورد نظر خود را اعمال کنید:
       <br />
-      {% for type in link_maker.all_proxies() %}
+      {% for type in link_maker.get_all_proxies(only_enabled=True) %}
       {% set pinfo=link_maker.proxy_info(type) %}
       {% if pinfo!=None %}
       <div class="btn-group"><a href='{{pinfo["url"]}}' class="btn btn-primary orig-link">{{type}}</a></div>

hiddifypanel/panel/user/templates/home/usage.html

@@ -23,7 +23,7 @@
                     {% endif %}
                     {% if not user.is_active %}
                     {{_("User is inactive")}}
-                    {% if (user.ips|length)>user.max_ips: %}
+                    {% if (user.devices|length)>user.max_ips: %}
                     <br>
                     <i class="fa-solid fa-users-slash text-danger"></i> {{_("Too many Connected IPs")}}
                     {% endif %}