hiddifypanel 10.16.0.dev0__tar.gz → 10.16.0.dev3__tar.gz

{hiddifypanel-10.16.0.dev0 → hiddifypanel-10.16.0.dev3}/HISTORY.md

@@ -89,6 +89,10 @@
 
 #### Fix
 
+* Typo. 
+
+* Shadowsocks config & update usage bug. 
+
 * Xray update usage bugs. 
 
 * Icon. 
@@ -219,6 +223,55 @@
 
 #### Other
 
+* Refactor. 
+
+* Fix bug? 
+
+* Update. 
+
+* Update translations. 
+
+* Revert SerializerMixin. 
+
+* Merge pull request #191 from Iam54r1n4/devp10-patch-2. 
+  _Fix shadowsocks bug_
+
+* Add: xray subscription to UI. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
 * Update translations. 
 
 * Update translations. 

{hiddifypanel-10.16.0.dev0 → hiddifypanel-10.16.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hiddifypanel
-Version: 10.16.0.dev0
+Version: 10.16.0.dev3
 Summary: hiddifypanel multi proxy panel
 Home-page: https://github.com/hiddify/hiddify-manager/
 Author: hiddify
@@ -24,7 +24,7 @@ Requires-Dist: MarkupSafe==2.1.5
 Requires-Dist: PyMySQL==1.1.0
 Requires-Dist: PyYAML==6.0.1
 Requires-Dist: SQLAlchemy-Utils==0.41.2
-Requires-Dist: SQLAlchemy-serializer==1.4.6
+Requires-Dist: SQLAlchemy-serializer==1.4.12
 Requires-Dist: SQLAlchemy==2.0.29
 Requires-Dist: StrEnum==0.4.15
 Requires-Dist: WTForms==3.1.2

hiddifypanel-10.16.0.dev3/hiddifypanel/VERSION

@@ -0,0 +1 @@
+10.16.0.dev3

hiddifypanel-10.16.0.dev3/hiddifypanel/VERSION.py

@@ -0,0 +1,3 @@
+__version__='10.16.0.dev3'
+from datetime import datetime
+__release_date__= datetime.strptime('2024-04-11','%Y-%m-%d')

{hiddifypanel-10.16.0.dev0 → hiddifypanel-10.16.0.dev3}/hiddifypanel/cache.py

@@ -11,11 +11,11 @@ class CustomRedisCache(RedisCache):
 
     def invalidate_all_cached_functions(self):
         try:
-            logger.info("Invalidating all cached functions")
+            logger.trace("Invalidating all cached functions")
             chunks_gen = chunks(f'{self.prefix}*', 500)
             for keys in chunks_gen:
                 self.client.delete(*keys)
-            logger.success("Successfully invalidated all cached functions")
+            logger.trace("Successfully invalidated all cached functions")
             return True
         except Exception as err:
             with logger.contextualize(error=err):

hiddifypanel-10.16.0.dev3/hiddifypanel/database.py

@@ -0,0 +1,28 @@
+from typing import Optional
+from flask_sqlalchemy import SQLAlchemy
+from sqlalchemy_utils import UUIDType
+import re
+import os
+from sqlalchemy import Row, text, Sequence
+
+
+db: SQLAlchemy = SQLAlchemy()
+db.UUID = UUIDType  # type: ignore
+
+
+def init_app(app):
+    app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = True
+    db.init_app(app)
+
+
+def db_execute(query: str, return_val: bool = False, commit: bool = False, **params: dict):
+    q = db.session.execute(text(query), params)
+    if commit:
+        db.session.commit()
+    if return_val:
+        return q.fetchall()
+
+    # with db.engine.connect() as connection:
+    #     res = connection.execute(text(query), params)
+    #     connection.commit()s
+    # return res

{hiddifypanel-10.16.0.dev0 → hiddifypanel-10.16.0.dev3}/hiddifypanel/hutils/importer/xui.py

@@ -11,13 +11,12 @@ import os
 from sqlalchemy import text
 
 
-def __query_fetch_json(db, query: str, args: Tuple = ()) -> List[Dict[str, Any]]:
+def __query_fetch_json(db, query: str, **kwargs) -> List[Dict[str, Any]]:
     try:
 
-        db_execute(query, args)
+        db_execute(query, commit=True, return_val=False, **kwargs)
         r = [dict((db.description[i][0], value)
                   for i, value in enumerate(row)) for row in db.fetchall()]
-        connection.close()
         return r
     except Exception as err:
         raise err

{hiddifypanel-10.16.0.dev0 → hiddifypanel-10.16.0.dev3}/hiddifypanel/hutils/proxy/xrayjson.py

@@ -1,9 +1,8 @@
-import datetime
 import json
 import copy
-from flask import render_template, request, g
+from flask import render_template, g
 from hiddifypanel import hutils
-from hiddifypanel.models import Proxy, ProxyTransport, ProxyL3, ProxyCDN, ProxyProto, Domain, ConfigEnum, DomainType
+from hiddifypanel.models import ProxyTransport, ProxyL3, ProxyProto, Domain
 from flask_babel import gettext as _
 from .xray import is_muxable_agent
 OUTBOUND_LEVEL = 8

{hiddifypanel-10.16.0.dev0 → hiddifypanel-10.16.0.dev3}/hiddifypanel/models/admin.py

@@ -10,6 +10,7 @@ from flask_babel import lazy_gettext as _
 from hiddifypanel.database import db, db_execute
 from hiddifypanel.models.role import Role
 from hiddifypanel.models.base_account import BaseAccount
+from sqlalchemy_serializer import SerializerMixin
 
 
 class AdminMode(StrEnum):
@@ -24,7 +25,7 @@ class AdminMode(StrEnum):
     agent = auto()
 
 
-class AdminUser(BaseAccount):
+class AdminUser(BaseAccount, SerializerMixin):
     """
     This is a model class for a user in a database that includes columns for their ID, UUID, name, online status,
     account expiration date, usage limit, package days, mode, start date, current usage, last reset time, and comment.
@@ -156,7 +157,7 @@ class AdminUser(BaseAccount):
             db.session.add(AdminUser(id=1, uuid=str(uuid.uuid4()), name="Owner", mode=AdminMode.super_admin, comment=""))
             db.session.commit()
 
-            db_execute("update admin_user set id=1 where name='Owner'")
+            db_execute("update admin_user set id=1 where name='Owner'", commit=True)
             admin = AdminUser.by_id(1)
 
         return admin

{hiddifypanel-10.16.0.dev0 → hiddifypanel-10.16.0.dev3}/hiddifypanel/models/base_account.py

@@ -6,9 +6,10 @@ from sqlalchemy import Column, String, BigInteger, Enum
 from flask_login import UserMixin as FlaskLoginUserMixin
 from hiddifypanel.models import Lang
 from hiddifypanel.database import db
+from sqlalchemy_serializer import SerializerMixin
 
 
-class BaseAccount(db.Model, FlaskLoginUserMixin):  # type: ignore
+class BaseAccount(db.Model, SerializerMixin, FlaskLoginUserMixin):  # type: ignore
     __abstract__ = True
     uuid = Column(String(36), default=lambda: str(uuid.uuid4()), nullable=False, unique=True, index=True)
     name = Column(String(512), nullable=False, default='')

{hiddifypanel-10.16.0.dev0 → hiddifypanel-10.16.0.dev3}/hiddifypanel/models/child.py

@@ -8,6 +8,7 @@ from flask import g, has_app_context
 
 
 from hiddifypanel.database import db, db_execute
+from sqlalchemy_serializer import SerializerMixin
 
 
 class ChildMode(StrEnum):
@@ -18,7 +19,7 @@ class ChildMode(StrEnum):
 # the child model is node
 
 
-class Child(db.Model):  # type: ignore
+class Child(db.Model, SerializerMixin):  # type: ignore
     id = Column(Integer, primary_key=True, autoincrement=True)
     name = Column(String(200), nullable=False, unique=False)
     mode = Column(Enum(ChildMode), nullable=False, default=ChildMode.virtual)
@@ -75,9 +76,9 @@ class Child(db.Model):  # type: ignore
             tmp_uuid = str(uuid.uuid4())
             db.session.add(Child(id=0, unique_id=tmp_uuid, name="Root"))
             db.session.commit()
-            db_execute(f"update child set id=0 where unique_id='{tmp_uuid}'")
+            db_execute(f"update child set id=0 where unique_id='{tmp_uuid}'", commit=True)
             child = Child.by_id(0)
-            print("child-=======", child)
+
         return child
 
     @classmethod

{hiddifypanel-10.16.0.dev0 → hiddifypanel-10.16.0.dev3}/hiddifypanel/models/config.py

@@ -8,6 +8,7 @@ from hiddifypanel.cache import cache
 from hiddifypanel.models.child import Child, ChildMode
 from sqlalchemy import Column, String, Boolean, Enum, ForeignKey, Integer
 from strenum import StrEnum
+from sqlalchemy_serializer import SerializerMixin
 
 
 def error(st):
@@ -15,7 +16,7 @@ def error(st):
     err(st)
 
 
-class BoolConfig(db.Model):
+class BoolConfig(db.Model, SerializerMixin):
     child_id = Column(Integer, ForeignKey('child.id'), primary_key=True, default=0)
     # category = db.Column(db.String(128), primary_key=True)
     key = Column(Enum(ConfigEnum), primary_key=True)
@@ -38,7 +39,7 @@ class BoolConfig(db.Model):
         return HConfigSchema().load(conf_dict)
 
 
-class StrConfig(db.Model):
+class StrConfig(db.Model, SerializerMixin):
     child_id = Column(Integer, ForeignKey('child.id'), primary_key=True, default=0)
     # category = db.Column(db.String(128), primary_key=True)
     key = Column(Enum(ConfigEnum), primary_key=True, default=ConfigEnum.admin_secret)

{hiddifypanel-10.16.0.dev0 → hiddifypanel-10.16.0.dev3}/hiddifypanel/models/config_enum.py

@@ -220,7 +220,7 @@ class ConfigEnum(metaclass=FastEnum):
     hysteria_down_mbps = _StrConfigDscr(ConfigCategory.hysteria, ApplyMode.apply)
 
     shadowsocks2022_enable = _BoolConfigDscr(ConfigCategory.shadowsocks, ApplyMode.apply)
-    shadowsocks2022_method = _StrConfigDscr(ConfigCategory.shadowsocks, ApplyMode.apply)
+    shadowsocks2022_method = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply)
     shadowsocks2022_port = _StrConfigDscr(ConfigCategory.shadowsocks, ApplyMode.apply)
     ssfaketls_enable = _BoolConfigDscr(ConfigCategory.shadowsocks, ApplyMode.apply)
     ssfaketls_fakedomain = _StrConfigDscr(ConfigCategory.shadowsocks, ApplyMode.apply, hide_in_virtual_child=True)

{hiddifypanel-10.16.0.dev0 → hiddifypanel-10.16.0.dev3}/hiddifypanel/models/domain.py

@@ -16,6 +16,7 @@ from hiddifypanel.models.config import hconfig
 from .child import Child
 from hiddifypanel.models.config_enum import ConfigEnum
 from sqlalchemy.orm import backref
+from sqlalchemy_serializer import SerializerMixin
 
 
 class DomainType(StrEnum):
@@ -40,7 +41,7 @@ ShowDomain = db.Table('show_domain',
                       )
 
 
-class Domain(db.Model):
+class Domain(db.Model, SerializerMixin):
     id = db.Column(db.Integer, primary_key=True, autoincrement=True)
     child_id = db.Column(db.Integer, db.ForeignKey('child.id'), default=0)
     domain = db.Column(db.String(200), nullable=False, unique=False)

{hiddifypanel-10.16.0.dev0 → hiddifypanel-10.16.0.dev3}/hiddifypanel/models/proxy.py

@@ -4,6 +4,7 @@ from enum import auto
 from sqlalchemy import Column, String, Integer, Boolean, Enum, ForeignKey
 
 from hiddifypanel.database import db
+from sqlalchemy_serializer import SerializerMixin
 
 
 class ProxyTransport(StrEnum):
@@ -57,7 +58,7 @@ class ProxyL3(StrEnum):
     custom = auto()
 
 
-class Proxy(db.Model):  # type: ignore
+class Proxy(db.Model, SerializerMixin):  # type: ignore
     id = Column(Integer, primary_key=True, autoincrement=True)
     child_id = Column(Integer, ForeignKey('child.id'), default=0)
     name = Column(String(200), nullable=False, unique=False)

{hiddifypanel-10.16.0.dev0 → hiddifypanel-10.16.0.dev3}/hiddifypanel/models/report.py

@@ -2,9 +2,10 @@ import datetime
 
 
 from hiddifypanel.database import db
+from sqlalchemy_serializer import SerializerMixin
 
 
-class Report(db.Model):
+class Report(db.Model, SerializerMixin):
     id = db.Column(db.Integer, primary_key=True, autoincrement=True)
     user_id = db.Column(db.Integer, db.ForeignKey('user.id'), default=0, nullable=False)
     asn_id = db.Column(db.String(200), nullable=False, unique=False)
@@ -18,7 +19,7 @@ class Report(db.Model):
     details = db.relationship('ReportDetail', cascade="all,delete", backref='report', lazy='dynamic',)
 
 
-class ReportDetail(db.Model):
+class ReportDetail(db.Model, SerializerMixin):
     report_id = db.Column(db.Integer, db.ForeignKey('report.id'), primary_key=True, )
     proxy_id = db.Column(db.Integer, db.ForeignKey('proxy.id'), primary_key=True, )
     ping = db.Column(db.Integer, default=-1)

{hiddifypanel-10.16.0.dev0 → hiddifypanel-10.16.0.dev3}/hiddifypanel/models/usage.py

@@ -6,9 +6,10 @@ from sqlalchemy import func
 
 
 from hiddifypanel.database import db
+from sqlalchemy_serializer import SerializerMixin
 
 
-class DailyUsage(db.Model):
+class DailyUsage(db.Model, SerializerMixin):
     id = db.Column(db.Integer, primary_key=True, autoincrement=True)
     date = db.Column(db.Date, default=datetime.date.today(), index=True)
     usage = db.Column(db.BigInteger, default=0, nullable=False)

{hiddifypanel-10.16.0.dev0 → hiddifypanel-10.16.0.dev3}/hiddifypanel/models/user.py

@@ -10,6 +10,7 @@ from hiddifypanel.database import db
 from hiddifypanel.models import Lang
 from hiddifypanel.models.base_account import BaseAccount
 from hiddifypanel.models.admin import AdminUser
+from sqlalchemy_serializer import SerializerMixin
 
 ONE_GIG = 1024 * 1024 * 1024
 
@@ -35,7 +36,7 @@ package_mode_dic = {
 }
 
 
-class UserDetail(db.Model):
+class UserDetail(db.Model, SerializerMixin):
     id = db.Column(db.Integer, primary_key=True, autoincrement=True)
     user_id = db.Column(db.Integer, db.ForeignKey('user.id'), default=0, nullable=False)
     child_id = db.Column(db.Integer, db.ForeignKey('child.id'), default=0, nullable=False)
@@ -56,7 +57,7 @@ class UserDetail(db.Model):
         return [] if not self.connected_devices else self.connected_devices.split(",")
 
 
-class User(BaseAccount):
+class User(BaseAccount, SerializerMixin):
     """
     This is a model class for a user in a database that includes columns for their ID, UUID, name, online status,
     account expiration date, usage limit, package days, mode, start date, current usage, last reset time, and comment.

{hiddifypanel-10.16.0.dev0 → hiddifypanel-10.16.0.dev3}/hiddifypanel/panel/admin/SettingAdmin.py

@@ -213,11 +213,15 @@ def get_config_form():
                     package_modes.append(("develop", _("Develop")))
                 field = wtf.SelectField(_(f"config.{c.key}.label"), choices=package_modes, description=_(f"config.{c.key}.description"), default=hconfig(c.key))
 
-            elif c.key == ConfigEnum.shadowsocks2022_method:
-                field = wtf.SelectField(
-                    _(f"config.{c.key}.label"),
-                    choices=[("2022-blake3-aes-256-gcm", "2022-blake3-aes-256-gcm"), ("2022-blake3-chacha20-poly1305", "2022-blake3-chacha20-poly1305"),],
-                    description=_(f"config.{c.key}.description"), default=hconfig(c.key))
+            # the shadowsocks2022_method is hidden now, because it only has one option to choose
+            # elif c.key == ConfigEnum.shadowsocks2022_method:
+            #     field = wtf.SelectField(
+            #         _(f"config.{c.key}.label"),
+            #         choices=[
+            #             ("2022-blake3-aes-256-gcm", "2022-blake3-aes-256-gcm"),
+            #             # ("2022-blake3-chacha20-poly1305", "2022-blake3-chacha20-poly1305"),
+            #         ],
+            #         description=_(f"config.{c.key}.description"), default=hconfig(c.key))
 
             elif c.key == ConfigEnum.utls:
                 field = wtf.SelectField(

{hiddifypanel-10.16.0.dev0 → hiddifypanel-10.16.0.dev3}/hiddifypanel/panel/commercial/restapi/v2/user/configs_api.py

@@ -44,7 +44,7 @@ class AllConfigsAPI(MethodView):
         # Add Auto
         items.append(
             create_item(
-                "Auto", "ALL", "ALL", "", "", "",
+                "Auto", "ALL", "", "", "", "",
                 # f"{base_url}sub/?asn={c['asn']}"
                 f"{base_url}auto/?asn={c['asn']}#{config_name}"
             )
@@ -53,16 +53,24 @@ class AllConfigsAPI(MethodView):
         # Add Full Singbox
         items.append(
             create_item(
-                "Full Singbox", "ALL", "ALL", "", "", "",
+                "Full Singbox", "ALL", "", "", "", "",
                 # f"{base_url}full-singbox.json?asn={c['asn']}"
                 f"{base_url}singbox/?asn={c['asn']}#{config_name}"
             )
         )
 
+        # Add Full Xray
+        items.append(
+            create_item(
+                "Full Xray", "ALL", "", "", "", "",
+                f"{base_url}xray/#{config_name}"
+            )
+        )
+
         # Add Subscription link
         items.append(
             create_item(
-                "Subscription link", "ALL", "ALL", "", "", "",
+                "Subscription link", "ALL", "", "", "", "",
                 # f"{base_url}all.txt?name={c['db_domain'].alias or c['db_domain'].domain}-{c['asn']}&asn={c['asn']}&mode={c['mode']}"
                 f"{base_url}sub/?asn={c['asn']}#{config_name}"
             )
@@ -71,16 +79,15 @@ class AllConfigsAPI(MethodView):
         # Add Subscription link base64
         items.append(
             create_item(
-                "Subscription link b64", "ALL", "ALL", "", "", "",
+                "Subscription link b64", "ALL", "", "", "", "",
                 # f"{base_url}all.txt?name=new_link_{c['db_domain'].alias or c['db_domain'].domain}-{c['asn']}-{c['mode']}&asn={c['asn']}&mode={c['mode']}&base64=True"
                 f"{base_url}sub64/?asn={c['asn']}#{config_name}"
             )
         )
-
         # Add Clash Meta
         items.append(
             create_item(
-                "Clash Meta", "ALL", "ALL", "", "", "",
+                "Clash Meta", "ALL", "", "", "", "",
                 # f"clashmeta://install-config?url={base_url}clash/meta/all.yml&name=mnormal_{c['db_domain'].alias or c['db_domain'].domain}-{c['asn']}-{c['mode']}&asn={c['asn']}&mode={c['mode']}"
                 f"clash://install-config?url={base_url}clashmeta/?asn={c['asn']}#{config_name}"
             )
@@ -99,7 +106,7 @@ class AllConfigsAPI(MethodView):
         if hconfig(ConfigEnum.ssh_server_enable):
             items.append(
                 create_item(
-                    "Singbox: SSH", "SSH", "SSH", "", "", "",
+                    "Singbox: SSH", "SSH", "", "", "", "",
                     # f"{base_url}singbox.json?name={c['db_domain'].alias or c['db_domain'].domain}-{c['asn']}&asn={c['asn']}&mode={c['mode']}"
                     f"{base_url}singbox-ssh/?asn={c['asn']}#{config_name}"
                 )

{hiddifypanel-10.16.0.dev0 → hiddifypanel-10.16.0.dev3}/hiddifypanel/panel/init_db.py

@@ -7,14 +7,22 @@ import uuid
 
 
 from hiddifypanel import Events, hutils
+from hiddifypanel.cache import cache
 from hiddifypanel.models import *
 from hiddifypanel.panel import hiddify
 from hiddifypanel.database import db, db_execute
 from flask import g
+from sqlalchemy import text
 
 MAX_DB_VERSION = 90
 
 
+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')
+
+
 def _v83(child_id):
     set_hconfig(ConfigEnum.log_level, LogLevel.CRITICAL)
 
@@ -547,7 +555,7 @@ def add_column(column):
     try:
         column_type = column.type.compile(db.engine.dialect)
 
-        db_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}', commit=True)
     except BaseException:
         pass
 
@@ -578,7 +586,7 @@ def add_new_enum_values():
         # result = db.engine.execute(f"SELECT DISTINCT `{column_name}` FROM {table_name}")
         # db_values = {row[0] for row in result}
 
-        result = db_execute(f"SHOW COLUMNS FROM {table_name} LIKE '{column_name}';")
+        result = db.session.execute(text(f"SHOW COLUMNS FROM {table_name} LIKE '{column_name}';")).fetchall()
         db_values = []
 
         for row in result:
@@ -597,9 +605,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_execute(f"ALTER TABLE {table_name} MODIFY COLUMN `{column_name}` ENUM({enumstr});")
-
-        db.session.commit()
+        db_execute(f"ALTER TABLE {table_name} MODIFY COLUMN `{column_name}` ENUM({enumstr});", commit=True)
 
 
 def latest_db_version():
@@ -648,8 +654,8 @@ def upgrade_database():
 
 def init_db():
     db.create_all()
-    hconfig.invalidate_all()
-    get_hconfigs.invalidate_all()
+    cache.invalidate_all_cached_functions()
+
     # set_hconfig(ConfigEnum.db_version, 71)
     # temporary fix
     add_column(Child.mode)
@@ -800,3 +806,4 @@ def migrate(db_version):
     AdminUser.get_super_admin()  # to create super admin if not exist
 
     upgrade_database()
+    db.session.commit()

{hiddifypanel-10.16.0.dev0 → hiddifypanel-10.16.0.dev3}/hiddifypanel/panel/user/user.py

@@ -6,7 +6,6 @@ import re
 from flask import render_template, request, Response, g
 from apiflask import abort
 from flask_classful import FlaskView, route
-from urllib.parse import urlparse
 from flask_babel import gettext as _