hiddifypanel 10.12.1__py3-none-any.whl → 10.15.0.dev0__py3-none-any.whl

hiddifypanel/panel/init_db.py

@@ -2,22 +2,52 @@ 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
+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):
@@ -225,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())
@@ -507,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)
@@ -518,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
 
 
@@ -546,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:
@@ -565,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()
 
@@ -665,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/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 %}

hiddifypanel/panel/user/templates/new.html

@@ -13,8 +13,8 @@
     <link rel="manifest" href="{{ url_for('common_bp.LoginView:create_pwa_manifest',secret_uuid=g.account.uuid or '')}}">
     
     <title>Hiddify | Panel</title>
-    <script type="module" crossorigin src="../static/new/assets/index-4510b616.js"></script>
-    <link rel="stylesheet" href="../static/new/assets/index-669b32c8.css">
+    <script type="module" crossorigin src="../static/new/assets/index-ccb9873c.js"></script>
+    <link rel="stylesheet" href="../static/new/assets/index-fa00de9a.css">
   </head>
   <body>
     <div id="root"></div>

hiddifypanel/static/css/custom.css

@@ -555,4 +555,17 @@ td.col-uuid a {
 
 .select2-container {
   display: none;
+}
+
+
+#main-sidebar .nav-sidebar>.nav-item>.nav-link {
+  color: white;
+}
+
+#main-sidebar .nav-sidebar>.nav-item>.nav-link:hover {
+  background: #007bff;
+}
+
+.dark-mode #main-sidebar .nav-sidebar>.nav-item>.nav-link:hover {
+  background: #3f6791;
 }