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

hiddifypanel/panel/admin/DomainAdmin.py

@@ -3,7 +3,9 @@ from hiddifypanel.auth import login_required, current_account
 
 from hiddifypanel.models import *
 import re
-from flask import Markup, g  # type: ignore
+from flask import g  # type: ignore
+from markupsafe import Markup
+
 from flask_babel import gettext as __
 from flask_babel import lazy_gettext as _
 from hiddifypanel.panel.run_commander import Command, commander
@@ -229,7 +231,7 @@ class DomainAdmin(AdminLTEModelView):
                     if not d:
                         continue
                     if not hutils.network.is_domain_reality_friendly(d):
-                        raise ValidationError(_("Domain is not REALITY friendly!")+f' {d}')
+                        raise ValidationError(_("Domain is not REALITY friendly!") + f' {d}')
 
                     if not hutils.network.is_in_same_asn(d, ipv4_list[0]):
                         server_asn = hutils.network.get_ip_asn_name(ipv4_list[0])
@@ -240,7 +242,7 @@ class DomainAdmin(AdminLTEModelView):
 
             for d in model.servernames.split(","):
                 if not hutils.network.fallback_domain_compatible_with_servernames(model.domain, d):
-                    raise ValidationError(_("REALITY Fallback domain is not compaitble with server names!")+f' {d} != {model.domain}')
+                    raise ValidationError(_("REALITY Fallback domain is not compaitble with server names!") + f' {d} != {model.domain}')
 
         if (model.cdn_ip):
             try:
@@ -266,19 +268,18 @@ class DomainAdmin(AdminLTEModelView):
         hutils.flask.flash_config_success(restart_mode=ApplyMode.apply, domain_changed=True)
 
     def after_model_delete(self, model):
-        # if hconfig(ConfigEnum.parent_panel):
-        #     hiddify_api.sync_child_to_parent()
-        pass
+        if hutils.node.is_child():
+            if not hutils.node.child.sync_with_parent():
+                hutils.flask.flash(_('child.sync-failed'), 'danger')  # type: ignore
 
     def after_model_change(self, form, model, is_created):
         if hconfig(ConfigEnum.first_setup):
             set_hconfig(ConfigEnum.first_setup, False)
-        # if hconfig(ConfigEnum.parent_panel):
-        #     hiddify_api.sync_child_to_parent()
         if model.need_valid_ssl:
-            # hiddify.exec_command(f"sudo /opt/hiddify-manager/acme.sh/get_cert.sh {model.domain}")
-            # run get_cert.sh
             commander(Command.get_cert, domain=model.domain)
+        if hutils.node.is_child():
+            if not hutils.node.child.sync_with_parent():
+                hutils.flask.flash(_('child.sync-failed'), 'danger')  # type: ignore
 
     def is_accessible(self):
         if login_required(roles={Role.super_admin, Role.admin})(lambda: True)() != True:
@@ -296,4 +297,4 @@ class DomainAdmin(AdminLTEModelView):
 
     def get_query(self):
         query = super().get_query()
-        return query.filter(Domain.child_id == Child.current.id)
+        return query.filter(Domain.child_id == Child.current().id)

hiddifypanel/panel/admin/NodeAdmin.py

@@ -4,7 +4,9 @@ from wtforms.validators import Regexp, ValidationError
 from flask_babel import lazy_gettext as _
 from .adminlte import AdminLTEModelView
 from flask_babel import gettext as __
-from flask import Markup, g, request
+from flask import g, request
+from markupsafe import Markup
+
 
 from hiddifypanel.auth import login_required
 from hiddifypanel.panel import hiddify
@@ -40,7 +42,7 @@ class NodeAdmin(AdminLTEModelView):
     def is_accessible(self):
         if login_required(roles={Role.super_admin})(lambda: True)() != True:
             return False
-        if Child.current.id != 0:
+        if Child.current().id != 0:
             return False
         return True
 
@@ -49,7 +51,9 @@ class NodeAdmin(AdminLTEModelView):
             raise ValidationError(_("Remote nodes are not supported yet!"))
 
     def after_model_change(self, form, model, is_created):
+        # deprecated
         set_hconfig(ConfigEnum.is_parent, True)
+        set_hconfig(ConfigEnum.panel_mode, PanelMode.parent)
         if is_created and model.mode == ChildMode.virtual:
             # for k, v in get_hconfigs().items():
             #     set_hconfig(k, v, model.id)

hiddifypanel/panel/admin/ProxyAdmin.py

@@ -56,9 +56,10 @@ class ProxyAdmin(FlaskView):
                 # print(cat,vs)
             db.session.commit()
             hutils.proxy.get_proxies.invalidate_all()
+            if hutils.node.is_child():
+                if not hutils.node.child.sync_with_parent():
+                    hutils.flask.flash(_('child.sync-failed'), 'danger')  # type: ignore
             hutils.flask.flash_config_success(restart_mode=ApplyMode.apply, domain_changed=False)
-            # if hconfig(ConfigEnum.parent_panel):
-            #     hiddify_api.sync_child_to_parent()
             global_config_form = get_global_config_form(True)
         else:
             hutils.flask.flash((_('config.validation-error')), 'danger')
@@ -94,7 +95,7 @@ def get_global_config_form(empty=False):
 
 
 def get_all_proxy_form(empty=False):
-    proxies = hutils.proxy.get_proxies(Child.current.id)
+    proxies = hutils.proxy.get_proxies(Child.current().id)
     categories1 = sorted([c for c in {c.cdn: 1 for c in proxies}])
 
     class DynamicForm(FlaskForm):

hiddifypanel/panel/admin/SettingAdmin.py

@@ -3,7 +3,9 @@ import flask_babel
 import flask_babel
 from flask_babel import lazy_gettext as _
 # from flask_babelex import gettext as _
-from flask import render_template, Markup, g  # type: ignore
+from flask import render_template, g  # type: ignore
+from markupsafe import Markup
+
 from hiddifypanel.hutils.flask import hurl_for
 from flask import current_app as app
 from hiddifypanel import hutils
@@ -20,6 +22,7 @@ from hiddifypanel.models import BoolConfig, StrConfig, ConfigEnum, hconfig, Conf
 from hiddifypanel.models import *
 from hiddifypanel.database import db
 from hiddifypanel.panel import hiddify, custom_widgets
+from hiddifypanel import __version__
 
 
 class SettingAdmin(FlaskView):
@@ -36,26 +39,26 @@ class SettingAdmin(FlaskView):
         reset_action = None
         if form.validate_on_submit():
 
-            boolconfigs = BoolConfig.query.filter(BoolConfig.child_id == Child.current.id).all()
+            boolconfigs = BoolConfig.query.filter(BoolConfig.child_id == Child.current().id).all()
             bool_types = {c.key: 'bool' for c in boolconfigs}
 
             old_configs = get_hconfigs()
             changed_configs = {}
 
-            for cat, vs in form.data.items():  # [c for c in ConfigEnum]:
+            for category, c_items in form.data.items():  # [c for c in ConfigEnum]:
 
-                if isinstance(vs, dict):
+                if isinstance(c_items, dict):
                     for k in ConfigEnum:
-                        if k.name not in vs:
+                        if k.name not in c_items:
                             continue
-                        v = vs[k.name]
+                        v = c_items[k.name]
                         if k.type == str:
                             if "_domain" in k or "_fakedomain" in k:
                                 v = v.lower()
 
                             if "port" in k:
                                 for p in v.split(","):
-                                    for k2, v2 in vs.items():
+                                    for k2, v2 in c_items.items():
                                         if "port" in k2 and k.name != k2 and p in v2:
                                             hutils.flask.flash(_("Port is already used! in") + f" {k2} {k}", 'error')
                                             return render_template('config.html', form=form)
@@ -73,32 +76,63 @@ class SettingAdmin(FlaskView):
                 hutils.flask.flash(_("ProxyPath is already used! use different proxy path"), 'error')  # type: ignore
                 return render_template('config.html', form=form)
 
+            # validate parent_panel value
+            parent_apikey = ''
+            if p_p := changed_configs.get(ConfigEnum.parent_panel):
+                domain, proxy_path, uuid = hutils.flask.extract_parent_info_from_url(p_p)
+                if not domain or not proxy_path or not uuid or not hutils.node.is_panel_active(domain, proxy_path, uuid):
+                    hutils.flask.flash(_('parent.invalid-parent-url'), 'danger')  # type: ignore
+                    return render_template('config.html', form=form)
+                else:
+                    set_hconfig(ConfigEnum.parent_domain, domain)
+                    set_hconfig(ConfigEnum.parent_admin_proxy_path, proxy_path)
+                    parent_apikey = uuid
+
             for k, v in changed_configs.items():
                 set_hconfig(k, v, commit=False)
 
             db.session.commit()
             flask_babel.refresh()
 
+            # set panel mode
+            p_mode = hconfig(ConfigEnum.panel_mode)
+            if p_mode != PanelMode.parent:
+                if hconfig(ConfigEnum.parent_panel):
+                    if p_mode == PanelMode.standalone:
+                        set_hconfig(ConfigEnum.panel_mode, PanelMode.child)
+                else:
+                    if p_mode != PanelMode.standalone:
+                        set_hconfig(ConfigEnum.panel_mode, PanelMode.standalone)
+
             from hiddifypanel.panel.commercial.telegrambot import register_bot
             register_bot(set_hook=True)
-            # if hconfig(ConfigEnum.parent_panel):
-            #     hiddify_api.sync_child_to_parent()
+
+            # sync with parent if needed
+            if hutils.node.is_child():
+                if hutils.node.child.is_registered():
+                    if not hutils.node.child.sync_with_parent():
+                        hutils.flask.flash(_('child.sync-failed'), 'danger')  # type: ignore
+                    else:  # TODO: it's just for debuging
+                        hutils.flask.flash(_('child.sync-success'))  # type: ignore
+                else:
+                    name = hconfig(ConfigEnum.unique_id)
+                    parent_info = hutils.node.get_panel_info(hconfig(ConfigEnum.parent_domain), hconfig(ConfigEnum.parent_admin_proxy_path), parent_apikey)
+                    if parent_info.get('version') != __version__:
+                        hutils.flask.flash(_('node.diff-version'), 'danger')  # type: ignore
+                    if not hutils.node.child.register_to_parent(name, parent_apikey, mode=ChildMode.remote):
+                        hutils.flask.flash(_('child.register-failed'), 'danger')  # type: ignore
+                    else:  # TODO: it's just for debuging
+                        hutils.flask.flash(_('child.register-success'))  # type: ignore
+
             reset_action = hiddify.check_need_reset(old_configs)
 
             if old_configs[ConfigEnum.admin_lang] != hconfig(ConfigEnum.admin_lang):
-
                 form = get_config_form()
         else:
             hutils.flask.flash(_('config.validation-error'), 'danger')  # type: ignore
 
         return reset_action or render_template('config.html', form=form)
 
-        # # form=HelloForm()
-        # # # return render('config.html',form=form)
-        # # return render_template('config.html',form=HelloForm())
-        # form=get_config_form()
-        # return render_template('config.html',form=form)
-
     def get_babel_string(self):
         res = ""
         strconfigs = StrConfig.query.all()
@@ -122,8 +156,8 @@ class SettingAdmin(FlaskView):
 
 
 def get_config_form():
-    strconfigs = StrConfig.query.filter(StrConfig.child_id == Child.current.id).all()
-    boolconfigs = BoolConfig.query.filter(BoolConfig.child_id == Child.current.id).all()
+    strconfigs = StrConfig.query.filter(StrConfig.child_id == Child.current().id).all()
+    boolconfigs = BoolConfig.query.filter(BoolConfig.child_id == Child.current().id).all()
     bool_types = {c.key: 'bool' for c in boolconfigs}
 
     configs = [*boolconfigs, *strconfigs]
@@ -133,7 +167,7 @@ def get_config_form():
 
     class DynamicForm(FlaskForm):
         pass
-    is_parent = hconfig(ConfigEnum.is_parent)
+    is_parent = hutils.node.is_parent()
 
     for cat in ConfigCategory:
         if cat == 'hidden':
@@ -149,6 +183,9 @@ def get_config_form():
             if not (c2 in configs_key):
                 continue
             c = configs_key[c2]
+            if hutils.node.is_parent():
+                if c.key == ConfigEnum.parent_panel:
+                    continue
             extra_info = ''
             if c.key in bool_types:
                 field = SwitchField(_(f'config.{c.key}.label'), default=c.value, description=_(f'config.{c.key}.description'))
@@ -207,7 +244,9 @@ def get_config_form():
                 field = wtf.SelectField(_(f"config.{c.key}.label"), choices=choices, description=_(f"config.{c.key}.description"), default=hconfig(c.key))
 
             elif c.key == ConfigEnum.warp_sites:
-                validators = [wtf.validators.Length(max=2048)]
+                validators = [wtf.validators.Length(max=2048),
+                              wtf.validators.Regexp(r'^([\w.-]+)?(?:\n[\w.-]+)*$', re.IGNORECASE, _("config.invalid-pattern-for-warp-sites") + f' {c.key}')
+                              ]
                 render_kw = {'class': "ltr", 'maxlength': 2048}
                 field = wtf.TextAreaField(_(f'config.{c.key}.label'), validators, default=c.value,
                                           description=_(f'config.{c.key}.description'), render_kw=render_kw)
@@ -229,7 +268,7 @@ def get_config_form():
                     if c.key != ConfigEnum.decoy_domain:
                         validators.append(wtf.validators.NoneOf([d.domain.lower() for d in Domain.query.all()], _("config.Domain already used")))
                         validators.append(wtf.validators.NoneOf(
-                            [cc.value.lower() for cc in StrConfig.query.filter(StrConfig.child_id == Child.current.id).all() if cc.key != c.key and "fakedomain" in cc.key and cc.key != ConfigEnum.decoy_domain], _("config.Domain already used")))
+                            [cc.value.lower() for cc in StrConfig.query.filter(StrConfig.child_id == Child.current().id).all() if cc.key != c.key and "fakedomain" in cc.key and cc.key != ConfigEnum.decoy_domain], _("config.Domain already used")))
 
                     render_kw['required'] = ""
                     if len(c.value) < 3:

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'}