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

hiddifypanel/panel/admin/UserAdmin.py

@@ -8,7 +8,9 @@ from flask_babel import gettext as __
 from .adminlte import AdminLTEModelView
 from wtforms.validators import NumberRange
 from flask_babel import lazy_gettext as _
-from flask import Markup, g, request  # type: ignore
+from flask import g, request  # type: ignore
+from markupsafe import Markup
+
 from hiddifypanel.hutils.flask import hurl_for
 from wtforms.validators import Regexp, ValidationError
 from flask import current_app
@@ -126,7 +128,7 @@ class UserAdmin(AdminLTEModelView):
     def _enable_formatter(view, context, model, name):
         if model.is_active:
             link = '<i class="fa-solid fa-circle-check text-success"></i> '
-        elif len(model.ips):
+        elif len(model.devices):
             link = '<i class="fa-solid fa-users-slash text-danger" title="{_("Too many Connected IPs")}"></i>'
         else:
             link = '<i class="fa-solid fa-circle-xmark text-danger"></i> '
@@ -297,10 +299,16 @@ class UserAdmin(AdminLTEModelView):
             user_driver.remove_client(model)
         hiddify.quick_apply_users()
 
+        if hutils.node.is_parent():
+            hutils.node.parent.request_childs_to_sync()
+
     def after_model_delete(self, model):
         user_driver.remove_client(model)
         hiddify.quick_apply_users()
 
+        if hutils.node.is_parent():
+            hutils.node.parent.request_childs_to_sync()
+
     def get_list(self, page, sort_column, sort_desc, search, filters, page_size=50, *args, **kwargs):
         res = None
         # print('aaa',args, kwargs)

hiddifypanel/panel/admin/templates/index.html

@@ -148,7 +148,7 @@
 </div>
 
 </div>
-{% if hconfig(ConfigEnum.is_parent) %}
+{% if hutils.node.is_parent() %}
 {% include 'parent_dash.html' %}
 {% endif %}
 {% endblock %}

hiddifypanel/panel/admin/templates/parent_dash.html

@@ -1,6 +1,6 @@
 {% macro admin_btn(child,domain) -%}
 <div class="btn-group">
-    <a href="{hiddify.get_account_panel_link(g.account,domain,child_id=child.id)}" class="btn btn-xs btn-{{" success" if child.is_active else "warning" }} orig-link ltr" target="_blank">{{domain}}</a>
+    <a href="{{hiddify.get_account_panel_link(g.account,domain,child_id=child.id)}}" class="btn btn-xs btn-{{" success" if child.is_active else "warning" }} orig-link ltr" target="_blank">{{domain}}</a>
 </div>
 {%- endmacro -%}
 
@@ -28,7 +28,6 @@
                 <td>
                     {% if not child.is_active %}
                     <form method="post" action="remove_child">
-                        <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
                         <input type="hidden" name="child_id" value="{{child.id}}" />
                         <button type="submit" class="btn btn-xs btn-danger"><i class="fa fa-trash"></i></a>
                     </form>
@@ -37,9 +36,8 @@
                 <td class="text-center"><span class="btn btn-xs badge-{{" success" if child.is_active else "warning" }}">&nbsp{{icon('solid','check') if child.is_active else icon('solid','triangle-exclamation')}}</span>
                 </td>
                 <td>
-
                     {% for d in child.domains %}
-                    {% if d.mode !="fake" %}
+                    {% if d.mode !="fake" and d.mode != "reality"%}
                     {{admin_btn(child,d)}}
                     {% endif %}
                     {% endfor %}

hiddifypanel/panel/cli.py

@@ -1,15 +1,17 @@
 import datetime
 import uuid
-
+import json
+import os
 import click
 from dateutil import relativedelta
+
+
 from hiddifypanel import hutils
 
 from hiddifypanel.models import *
 from hiddifypanel.panel import hiddify, usage
 from hiddifypanel.database import db
 from hiddifypanel.panel.init_db import init_db
-from flask import g
 
 
 def drop_db():
@@ -24,29 +26,28 @@ def downgrade():
                                ConfigEnum.hysteria_port, ConfigEnum.ssh_server_enable, ConfigEnum.ssh_server_port, ConfigEnum.ssh_server_redis_url])).delete()
         Proxy.query.filter(Proxy.l3.in_([ProxyL3.ssh, ProxyL3.h3_quic, ProxyL3.custom])).delete()
         db.session.commit()
-        import os
         os.rename("/opt/hiddify-manager/hiddify-panel/hiddifypanel.db.old", "/opt/hiddify-manager/hiddify-panel/hiddifypanel.db")
 
 
 def backup():
     dbdict = hiddify.dump_db_to_dict()
-    import json
-    import os
     os.makedirs('backup', exist_ok=True)
     dst = f'backup/{datetime.datetime.now().strftime("%Y_%m_%d__%H_%M_%S")}.json'
     with open(dst, 'w') as fp:
         json.dump(dbdict, fp, indent=4, sort_keys=True, default=str)
 
     if hconfig(ConfigEnum.telegram_bot_token):
-        for admin in AdminUser.query.filter(AdminUser.mode == AdminMode.super_admin, AdminUser.telegram_id is not None).all():
-            from hiddifypanel.panel.commercial.telegrambot import bot
-            with open(dst, 'rb') as document:
+        from hiddifypanel.panel.commercial.telegrambot import bot, register_bot
+        if not bot.token:
+            register_bot(True)
+
+        with open(dst, 'rb') as document:
+            for admin in AdminUser.query.filter(AdminUser.mode == AdminMode.super_admin, AdminUser.telegram_id is not None).all():
                 caption = ("Backup \n" + admin_links())
                 bot.send_document(admin.telegram_id, document, visible_file_name=dst.replace("backup/", ""), caption=caption[:min(len(caption), 1000)])
 
 
 def all_configs():
-    import json
     valid_users = [u.to_dict(dump_id=True) for u in User.query.filter((User.usage_limit > User.current_usage)).all() if u.is_active]
     host_child_ids = [c.id for c in Child.query.filter(Child.mode == ChildMode.virtual).all()]
     configs = {
@@ -111,8 +112,8 @@ def admin_path():
     print(hiddify.get_account_panel_link(admin, domain, prefere_path_only=True))
 
 
-def get_this_host_domains():
-    current_child_ids
+# def get_this_host_domains():
+#     current_child_ids
 
 
 def hysteria_domain_port():
@@ -142,12 +143,11 @@ def init_app(app):
     @ app.cli.command()
     @ click.option("--domain", "-d")
     def add_domain(domain):
-        table = ParentDomain if hconfig(ConfigEnum.is_parent) else Domain
-
-        if table.query.filter(table.domain == domain).first():
+        # TODO: Fix this
+        if Domain.query.filter(Domain.domain == domain).first():
             return "Domain already exist."
-        d = table(domain=domain)
-        if not hconfig(ConfigEnum.is_parent):
+        d = Domain(domain=domain)
+        if not hutils.node.is_parent():
             d.mode = DomainType.direct
         db.session.add(d)
         db.session.commit()

hiddifypanel/panel/commercial/ProxyDetailsAdmin.py

@@ -1,8 +1,11 @@
 from hiddifypanel.models import *
+from hiddifypanel.panel import hiddify
 from hiddifypanel.panel.admin.adminlte import AdminLTEModelView
 from flask_babel import gettext as __
 from flask_babel import lazy_gettext as _
-from flask import g, redirect, Markup
+from flask import g, redirect
+from markupsafe import Markup
+
 from hiddifypanel.hutils.flask import hurl_for, flash
 from hiddifypanel.auth import login_required
 from flask_admin.model.template import EndpointLinkRowAction
@@ -45,14 +48,16 @@ class ProxyDetailsAdmin(AdminLTEModelView):
     # form_overrides = {'work_with': Select2Field}
 
     def after_model_change(self, form, model, is_created):
-        # if hconfig(ConfigEnum.parent_panel):
-        #     hiddify_api.sync_child_to_parent()
+        if hutils.node.is_child():
+            if not hutils.node.child.sync_with_parent():
+                hutils.flask.flash(_('child.sync-failed'), 'danger')  # type: ignore
         hutils.proxy.get_proxies.invalidate_all()
         pass
 
     def after_model_delete(self, model):
-        # if hconfig(ConfigEnum.parent_panel):
-        #     hiddify_api.sync_child_to_parent()
+        if hutils.node.is_child():
+            if not hutils.node.child.sync_with_parent():
+                hutils.flask.flash(_('child.sync-failed'), 'danger')  # type: ignore
         hutils.proxy.get_proxies.invalidate_all()
         pass
 

hiddifypanel/panel/commercial/__init__.py

@@ -1,6 +1,3 @@
-from .ProxyDetailsAdmin import ProxyDetailsAdmin
-# from .CommercialSettings import CommercialSettings
-from hiddifypanel.panel import hiddify
 from hiddifypanel.models import *
 from hiddifypanel.database import db
 from hiddifypanel import Events, hutils
@@ -13,10 +10,14 @@ def init_app(app):
     restapi_v1.init_app(app)
     from .restapi.v2 import admin as api_v2_admin
     from .restapi.v2 import user as api_v2_user
-    from .restapi.v2 import hello as api_v2_hello
+    from .restapi.v2 import parent as api_v2_parent
+    from .restapi.v2 import child as api_v2_child
+    from .restapi.v2 import panel as api_v2_panel
+    api_v2_parent.init_app(app)
     api_v2_admin.init_app(app)
     api_v2_user.init_app(app)
-    api_v2_hello.init_app(app)
+    api_v2_child.init_app(app)
+    api_v2_panel.init_app(app)
     return
 
 
@@ -53,6 +54,7 @@ Events.config_changed.subscribe(config_changed_event)
 def admin_prehook(flaskadmin, admin_bp):
     # from .ParentDomainAdmin import ParentDomainAdmin
     # flaskadmin.add_view(ParentDomainAdmin(ParentDomain, db.session))
+    from .ProxyDetailsAdmin import ProxyDetailsAdmin
     flaskadmin.add_view(ProxyDetailsAdmin(Proxy, db.session))
     # CommercialSettings.register(admin_bp)
 

hiddifypanel/panel/commercial/restapi/v2/admin/__init__.py

@@ -32,8 +32,3 @@ def has_permission(model) -> bool:
     if not g.account.uuid != AdminUser.get_super_admin_uuid() and model.added_by != g.account.id:  # type: ignore
         return False
     return True
-
-
-class SuccessfulSchema(Schema):
-    status = Integer()
-    msg = String()

hiddifypanel/panel/commercial/restapi/v2/admin/admin_info_api.py

@@ -7,13 +7,13 @@ from hiddifypanel.models.admin import AdminUser
 from hiddifypanel.models.config_enum import ConfigEnum, Lang
 from hiddifypanel.models.config import hconfig
 from hiddifypanel.models.role import Role
-from .admin_user_api import AdminSchema
+from .schema import AdminSchema
 
 
 class AdminInfoApi(MethodView):
     decorators = [login_required({Role.super_admin, Role.admin, Role.agent})]
 
-    @app.output(AdminSchema)
+    @app.output(AdminSchema)  # type: ignore
     def get(self):
         # admin = AdminUser.by_uuid(g.account.uuid) or abort(404, "user not found")
         admin = g.account or abort(404, "user not found")

hiddifypanel/panel/commercial/restapi/v2/admin/admin_log_api.py

@@ -2,7 +2,6 @@ from apiflask import Schema, fields, abort
 from flask.views import MethodView
 from hiddifypanel import hutils
 from hiddifypanel.models.role import Role
-from hiddifypanel.panel import hiddify
 from flask import current_app as app, make_response, g, request
 import os
 from ansi2html import Ansi2HTMLConverter
@@ -10,13 +9,13 @@ from hiddifypanel.auth import login_required
 from hiddifypanel.models import *
 
 
-class AdminLogfileSchema(Schema):
+class AdminInputLogfileSchema(Schema):
     file = fields.String(description="The log file name", required=True)
 
 
 class AdminLogApi(MethodView):
-    @app.input(AdminLogfileSchema, arg_name="data", location='form')
-    @app.output(fields.String(description="The html of the log", many=True))
+    @app.input(AdminInputLogfileSchema, arg_name="data", location='form')  # type: ignore
+    @app.output(fields.String(description="The html of the log", many=True))  # type: ignore
     @login_required({Role.super_admin})
     def post(self, data):
         file_name = data.get('file') or abort(400, "Parameter issue: 'file'")
@@ -40,7 +39,7 @@ class AdminLogApi(MethodView):
         return resp
 
     def options(self):
-        domain = request.args.get("domain")
+        # domain = request.args.get("domain")
         # Domain.query.filter(Domain.domain == domain).first() or abort(404)
         if g.proxy_path != hconfig(ConfigEnum.proxy_path_admin):
             abort(403)

hiddifypanel/panel/commercial/restapi/v2/admin/admin_user_api.py

@@ -1,53 +1,26 @@
-
-from apiflask.fields import Integer, String, UUID, Boolean, Enum
 from flask import current_app as app
 from flask import g
 from flask.views import MethodView
-from apiflask import Schema
 from apiflask import abort
 from hiddifypanel.auth import login_required
 from hiddifypanel.models import *
-from hiddifypanel.panel import hiddify
-from hiddifypanel.models import AdminMode, Lang
-
-from . import SuccessfulSchema, has_permission
-
-
-class AdminSchema(Schema):
-    name = String(required=True, description='The name of the admin')
-    comment = String(required=False, description='A comment related to the admin', allow_none=True)
-    uuid = UUID(required=True, description='The unique identifier for the admin')
-    mode = Enum(AdminMode, required=True, description='The mode for the admin')
-    can_add_admin = Boolean(required=True, description='Whether the admin can add other admins')
-    parent_admin_uuid = UUID(description='The unique identifier for the parent admin', allow_none=True,
-                             # validate=OneOf([p.uuid for p in AdminUser.query.all()])
-                             )
-    telegram_id = Integer(required=False, description='The Telegram ID associated with the admin', allow_none=True)
-    lang = Enum(Lang, required=True)
-
 
-class PatchAdminSchema(AdminSchema):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields['name'].required = False
-        self.fields['mode'].required = False
-        self.fields['lang'].required = False
-        self.fields['can_add_admin'].required = False
-    pass
+from . import has_permission
+from .schema import AdminSchema, PatchAdminSchema, SuccessfulSchema
 
 
 class AdminUserApi(MethodView):
     decorators = [login_required({Role.super_admin, Role.admin})]
 
-    @app.output(AdminSchema)
+    @app.output(AdminSchema)  # type: ignore
     def get(self, uuid):
         admin = AdminUser.by_uuid(uuid) or abort(404, "admin not found")
         if not has_permission(admin):
             abort(403, "You don't have permission to access this admin")
-        return admin.to_dict()
+        return admin.to_dict()  # type: ignore
 
-    @app.input(PatchAdminSchema, arg_name='data')
-    @app.output(SuccessfulSchema)
+    @app.input(PatchAdminSchema, arg_name='data')  # type: ignore
+    @app.output(SuccessfulSchema)  # type: ignore
     def patch(self, uuid, data):
         admin = AdminUser.by_uuid(uuid) or abort(404, "admin not found")
         if not has_permission(admin):
@@ -60,10 +33,10 @@ class AdminUserApi(MethodView):
         AdminUser.add_or_update(**data)
         return {'status': 200, 'msg': 'ok'}
 
-    @app.output(SuccessfulSchema)
+    @app.output(SuccessfulSchema)  # type: ignore
     def delete(self, uuid):
         admin = AdminUser.by_uuid(uuid) or abort(404, "admin not found")
         if not has_permission(admin):
             abort(403, "You don't have permission to access this admin")
-        admin.remove()
+        admin.remove()  # type: ignore
         return {'status': 200, 'msg': 'ok'}

hiddifypanel/panel/commercial/restapi/v2/admin/admin_users_api.py

@@ -11,13 +11,13 @@ from hiddifypanel.models import AdminUser
 class AdminUsersApi(MethodView):
     decorators = [login_required({Role.super_admin, Role.admin})]
 
-    @app.output(AdminSchema(many=True))
+    @app.output(AdminSchema(many=True))  # type: ignore
     def get(self):
         admins = AdminUser.query.filter(AdminUser.id.in_(g.account.recursive_sub_admins_ids())).all() or abort(404, "You have no admin")
         return [admin.to_dict() for admin in admins]  # type: ignore
 
-    @app.input(AdminSchema, arg_name='data')
-    @app.output(AdminSchema)
+    @app.input(AdminSchema, arg_name='data')  # type: ignore
+    @app.output(AdminSchema)  # type: ignore
     def put(self, data):
         uuid = data.get('uuid') or abort(422, "Parameter issue: 'uuid'")
         admin = AdminUser.by_uuid(uuid)  # type: ignore
@@ -31,4 +31,4 @@ class AdminUsersApi(MethodView):
                 abort(403, "You don't have permission to access this admin")
 
         dbadmin = AdminUser.add_or_update(**data) or abort(502, "Unknown issue: Admin is not added")
-        return dbadmin.to_dict()
+        return dbadmin.to_dict()  # type: ignore

hiddifypanel/panel/commercial/restapi/v2/admin/schema.py

@@ -0,0 +1,157 @@
+import uuid
+from apiflask.fields import String, Float, Enum, Date, Integer, Boolean
+from apiflask import Schema, fields
+from typing import Any, Mapping
+
+from hiddifypanel.models import UserMode, Lang, AdminMode
+from hiddifypanel import hutils
+
+# region user api
+
+
+class FriendlyDateTime(fields.Field):
+    def _serialize(self, value: Any, attr: str | None, obj: Any, **kwargs):
+        return hutils.convert.time_to_json(value)
+
+    def _deserialize(self, value: Any, attr: str | None, data: Mapping[str, Any] | None, **kwargs):
+        return hutils.convert.json_to_time(value)
+
+
+class FriendlyUUID(fields.Field):
+    def _serialize(self, value: Any, attr: str | None, obj: Any, **kwargs):
+        if value is None:
+            return None
+        return str(value)
+
+    def _deserialize(self, value: Any, attr: str | None, data: Mapping[str, Any] | None, **kwargs):
+        if value is None:
+            return None
+        try:
+            return uuid.UUID(value)
+        except ValueError:
+            self.fail('Invalid uuid')
+
+
+class UserSchema(Schema):
+    uuid = FriendlyUUID(required=True, description="Unique identifier for the user")
+    name = String(required=True, description="Name of the user")
+
+    usage_limit_GB = Float(
+        required=False,
+        allow_none=True,
+        description="The data usage limit for the user in gigabytes"
+    )
+    package_days = Integer(
+        required=False,
+        allow_none=True,
+        description="The number of days in the user's package"
+    )
+    mode = Enum(UserMode,
+                required=False,
+                allow_none=True,
+                description="The mode of the user's account, which dictates access level or type"
+                )
+    last_online = FriendlyDateTime(
+        format="%Y-%m-%d %H:%M:%S",
+        allow_none=True,
+        description="The last time the user was online, converted to a JSON-friendly format"
+    )
+    start_date = Date(
+        format='%Y-%m-%d',
+        allow_none=True,
+        description="The start date of the user's package, in a JSON-friendly format"
+    )
+    current_usage_GB = Float(
+        required=False,
+        allow_none=True,
+        description="The current data usage of the user in gigabytes"
+    )
+    last_reset_time = Date(
+        format='%Y-%m-%d',
+        description="The last time the user's data usage was reset, in a JSON-friendly format",
+        allow_none=True
+    )
+    comment = String(
+        missing=None,
+        allow_none=True,
+        description="An optional comment about the user"
+    )
+    added_by_uuid = FriendlyUUID(
+        required=False,
+        description="UUID of the admin who added this user",
+        allow_none=True,
+        # validate=OneOf([p.uuid for p in AdminUser.query.all()])
+    )
+    telegram_id = Integer(
+        required=False,
+        description="The Telegram ID associated with the user",
+        allow_none=True
+    )
+    ed25519_private_key = String(
+        required=False,
+        allow_none=True,
+        description="If empty, it will be created automatically, The user's private key using the Ed25519 algorithm"
+    )
+    ed25519_public_key = String(
+        required=False,
+        allow_none=True,
+        description="If empty, it will be created automatically,The user's public key using the Ed25519 algorithm"
+    )
+    wg_pk = String(
+        required=False,
+        allow_none=True,
+        description="If empty, it will be created automatically, The user's WireGuard private key"
+    )
+
+    wg_pub = String(
+        required=False,
+        allow_none=True,
+        description="If empty, it will be created automatically, The user's WireGuard public key"
+    )
+    wg_psk = String(
+        required=False,
+        allow_none=True,
+        description="If empty, it will be created automatically, The user's WireGuard preshared key"
+    )
+
+    lang = Enum(Lang, required=False, allow_none=True, description="The language of the user")
+
+
+class PatchUserSchema(UserSchema):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['name'].required = False
+    pass
+
+# endregion
+
+# region admin api
+
+
+class AdminSchema(Schema):
+    name = String(required=True, description='The name of the admin')
+    comment = String(required=False, description='A comment related to the admin', allow_none=True)
+    uuid = FriendlyUUID(required=True, description='The unique identifier for the admin')
+    mode = Enum(AdminMode, required=True, description='The mode for the admin')
+    can_add_admin = Boolean(required=True, description='Whether the admin can add other admins')
+    parent_admin_uuid = FriendlyUUID(description='The unique identifier for the parent admin', allow_none=True,
+                                     # validate=OneOf([p.uuid for p in AdminUser.query.all()])
+                                     )
+    telegram_id = Integer(required=False, description='The Telegram ID associated with the admin', allow_none=True)
+    lang = Enum(Lang, required=True)
+
+
+class PatchAdminSchema(AdminSchema):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['name'].required = False
+        self.fields['mode'].required = False
+        self.fields['lang'].required = False
+        self.fields['can_add_admin'].required = False
+    pass
+# endregion
+
+
+class SuccessfulSchema(Schema):
+    status = Integer()
+    msg = String()

hiddifypanel/panel/commercial/restapi/v2/admin/server_status_api.py

@@ -10,7 +10,7 @@ from hiddifypanel.panel import hiddify
 from hiddifypanel import hutils
 
 
-class ServerStatus(Schema):
+class ServerStatusOutputSchema(Schema):
     stats = Dict(required=True, description="System stats")
     usage_history = Dict(required=True, description="System usage history")
 
@@ -18,9 +18,9 @@ class ServerStatus(Schema):
 class AdminServerStatusApi(MethodView):
     decorators = [login_required({Role.super_admin, Role.admin, Role.agent})]
 
-    @app.output(ServerStatus)  # type: ignore
+    @app.output(ServerStatusOutputSchema)  # type: ignore
     def get(self):
-        dto = ServerStatus()
+        dto = ServerStatusOutputSchema()
         dto.stats = {  # type: ignore
             'system': hutils.system.system_stats(),
             'top5': hutils.system.top_processes()