hiddifypanel 10.30.7.dev0__py3-none-any.whl → 10.30.8.dev0__py3-none-any.whl

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

@@ -1,8 +1,10 @@
 import uuid
-from apiflask.fields import String, Float, Enum, Date, Integer, Boolean
+from apiflask.fields import String, Float, Enum, Date, Integer, Boolean, DateTime
 from apiflask import Schema, fields
 from typing import Any, Mapping
 
+from marshmallow import ValidationError
+
 from hiddifypanel.models import UserMode, Lang, AdminMode
 from hiddifypanel import hutils
 
@@ -18,19 +20,24 @@ class FriendlyDateTime(fields.Field):
 
 
 class FriendlyUUID(fields.Field):
+
     def _serialize(self, value: Any, attr: str | None, obj: Any, **kwargs):
-        if value is None:
+        if value is None or not hutils.auth.is_uuid_valid(value):
             return None
         return str(value)
 
     def _deserialize(self, value: Any, attr: str | None, data: Mapping[str, Any] | None, **kwargs):
-        if value is None:
+        if value is None or not hutils.auth.is_uuid_valid(value):
             return None
         try:
             return str(uuid.UUID(value))
         except ValueError:
             self.fail('Invalid uuid')
 
+    def _validated(self, value):
+        if not hutils.auth.is_uuid_valid(value):
+            raise ValidationError('Invalid UUID')
+
 
 class UserSchema(Schema):
     uuid = FriendlyUUID(required=True, description="Unique identifier for the user")
@@ -66,8 +73,8 @@ class UserSchema(Schema):
         allow_none=True,
         description="The current data usage of the user in gigabytes"
     )
-    last_reset_time = Date(
-        format='%Y-%m-%d',
+    last_reset_time = FriendlyDateTime(
+        format='%Y-%m-%d %H:%M:%S',
         description="The last time the user's data usage was reset, in a JSON-friendly format",
         allow_none=True
     )
@@ -121,20 +128,25 @@ class UserSchema(Schema):
 
     lang = Enum(Lang, required=False, allow_none=True, description="The language of the user")
     enable = Boolean(required=False, description="Whether the user is enabled or not")
+    is_active = Boolean(required=False, description="Whether the user is active for using hiddify")
 
 
-class PutUserSchema(UserSchema):
+class PostUserSchema(UserSchema):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         # the uuid is sent in the url path
         self.fields['uuid'].required = False
+        self.fields['uuid'].allow_none = True
 
 
 class PatchUserSchema(UserSchema):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields['uuid'].required = False
+        self.fields['uuid'].allow_none = True,
         self.fields['name'].required = False
+        self.fields['name'].allow_none = True,
+
 
 # endregion
 
@@ -144,7 +156,7 @@ class PatchUserSchema(UserSchema):
 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')
+    uuid = FriendlyUUID(required=False, allow_none=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(required=False, description='The unique identifier for the parent admin', allow_none=True,
@@ -156,13 +168,6 @@ class AdminSchema(Schema):
     max_active_users = Integer(required=False, description='The maximum number of active users allowed', allow_none=True)
 
 
-class PutAdminSchema(AdminSchema):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        # the uuid is sent in the url path
-        self.fields['uuid'].required = False
-
-
 class PatchAdminSchema(AdminSchema):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)

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

@@ -20,6 +20,7 @@ class AdminServerStatusApi(MethodView):
 
     @app.output(ServerStatusOutputSchema)  # type: ignore
     def get(self):
+        """System: ServerStatus"""
         dto = ServerStatusOutputSchema()
         dto.stats = {  # type: ignore
             'system': hutils.system.system_stats(),

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

@@ -0,0 +1,27 @@
+from flask import current_app as app, request
+from flask import g
+from flask.views import MethodView
+from apiflask.fields import Dict
+from apiflask import Schema
+from hiddifypanel.models.usage import DailyUsage
+from hiddifypanel.auth import login_required
+from hiddifypanel.models import Role, DailyUsage
+from hiddifypanel.panel import hiddify, usage
+from hiddifypanel import hutils
+import json
+
+
+class UpdateUserUsageApi(MethodView):
+    decorators = [login_required({Role.super_admin})]
+
+    def get(self):
+        """System: Update User Usage"""
+        return json.dumps(usage.update_local_usage(), indent=2)
+
+
+class AllConfigsApi(MethodView):
+    decorators = [login_required({Role.super_admin})]
+
+    def get(self):
+        """System: All Configs for configuration"""
+        return json.dumps(hiddify.all_configs_for_cli(), indent=2)

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

@@ -9,7 +9,7 @@ from hiddifypanel.drivers import user_driver
 from hiddifypanel.panel import hiddify
 
 from . import has_permission
-from .schema import UserSchema, PutUserSchema, PatchUserSchema, SuccessfulSchema
+from .schema import UserSchema, PostUserSchema, PatchUserSchema, SuccessfulSchema
 
 
 class UserApi(MethodView):
@@ -17,30 +17,17 @@ class UserApi(MethodView):
 
     @app.output(UserSchema)  # type: ignore
     def get(self, uuid):
+        """User: Get details of a user"""
         user = User.by_uuid(uuid) or abort(404, "User not found")
         if not has_permission(user):
             abort(403, "You don't have permission to access this user")
 
         return user.to_schema()  # type: ignore
 
-    @app.input(PutUserSchema, arg_name="data")  # type: ignore
-    @app.output(SuccessfulSchema)  # type: ignore
-    def put(self, uuid, data):
-        if User.by_uuid(uuid):
-            abort(400, 'The user exists')
-        data['uuid'] = uuid
-
-        if not data.get('added_by_uuid'):
-            data['added_by_uuid'] = g.account.uuid
-
-        dbuser = User.add_or_update(**data) or abort(502, "Unknown issue: User is not added")
-        user_driver.add_client(dbuser)
-        hiddify.quick_apply_users()
-        return {'status': 200, 'msg': 'ok'}
-
     @app.input(PatchUserSchema, arg_name="data")  # type: ignore
-    @app.output(SuccessfulSchema)  # type: ignore
+    @app.output(UserSchema)  # type: ignore
     def patch(self, uuid, data):
+        """User: Update a user"""
         user = User.by_uuid(uuid) or abort(404, "user not found")
         if not has_permission(user):
             abort(403, "You don't have permission to access this user")
@@ -50,17 +37,20 @@ class UserApi(MethodView):
                 continue
             if field not in data:
                 data[field] = getattr(user, field)
-
+        data['old_uuid'] = uuid
+        user_driver.remove_client(user)
         dbuser = User.add_or_update(**data) or abort(502, "Unknown issue! User is not patched")
-        user_driver.add_client(dbuser)
+        if dbuser.is_active:
+            user_driver.add_client(dbuser)
         # the add_or_update doesn't update the uuid of User, so for now just delete old user after adding new
-        if user.uuid != data['uuid']:
-            user.remove()
+        # if user.uuid != data['uuid']:
+        #     user.remove()
         hiddify.quick_apply_users()
-        return {'status': 200, 'msg': 'ok'}
+        return dbuser.to_schema()
 
     @app.output(SuccessfulSchema)  # type: ignore
     def delete(self, uuid):
+        """User: Delete a User"""
         user = User.by_uuid(uuid) or abort(404, "user not found")
         if not has_permission(user):
             abort(403, "You don't have permission to access this user")

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

@@ -6,7 +6,7 @@ from hiddifypanel.models.role import Role
 from hiddifypanel.panel import hiddify
 from hiddifypanel.drivers import user_driver
 from hiddifypanel.models import User
-from .user_api import UserSchema
+from .user_api import UserSchema, PostUserSchema
 from . import has_permission
 
 
@@ -15,5 +15,23 @@ class UsersApi(MethodView):
 
     @app.output(UserSchema(many=True))  # type: ignore
     def get(self):
+        """User: List users of current admin"""
+
         users = User.query.filter(User.added_by.in_(g.account.recursive_sub_admins_ids())).all() or abort(404, "You have no user")
         return [user.to_schema() for user in users]  # type: ignore
+
+    @app.input(PostUserSchema, arg_name="data")  # type: ignore
+    @app.output(UserSchema)  # type: ignore
+    def post(self, data):
+        """User: Create a user"""
+
+        if data.get("uuid") and User.by_uuid(data['uuid']):
+            abort(400, 'The user exists')
+
+        if not data.get('added_by_uuid'):
+            data['added_by_uuid'] = g.account.uuid
+
+        dbuser = User.add_or_update(**data) or abort(502, "Unknown issue: User is not added")
+        user_driver.add_client(dbuser)
+        hiddify.quick_apply_users()
+        return dbuser.to_schema()

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

@@ -1,6 +1,6 @@
 from apiflask import APIBlueprint
 
-bp = APIBlueprint("api_child", __name__, url_prefix="/<proxy_path>/api/v2/child/", enable_openapi=True)
+bp = APIBlueprint("api_child", __name__, url_prefix="/<proxy_path>/api/v2/child/", enable_openapi=False)
 
 
 def init_app(app):

hiddifypanel/panel/commercial/restapi/v2/panel/ping_pong.py

@@ -2,22 +2,34 @@ from flask.views import MethodView
 
 from hiddifypanel.auth import login_required
 from hiddifypanel.models import Role
+from .schema import PongOutputSchema
+from flask import current_app as app
 
 
 class PingPongApi(MethodView):
     decorators = [login_required(roles={Role.super_admin, Role.admin, Role.agent}, node_auth=True)]
 
+    @app.output(PongOutputSchema)  # type: ignore
     def get(self):
+        """Ping Pong: Get"""
         return {'msg': 'GET: PONG'}
 
+    @app.output(PongOutputSchema)  # type: ignore
     def post(self):
+        """Ping Pong: Post"""
         return {'msg': 'POST: PONG'}
 
+    @app.output(PongOutputSchema)  # type: ignore
     def patch(self):
+        """Ping Pong: Patch"""
         return {'msg': 'PATCH: PONG'}
 
+    @app.output(PongOutputSchema)  # type: ignore
     def delete(self):
+        """Ping Pong: Delete"""
         return {'msg': 'DELETE: PONG'}
 
+    @app.output(PongOutputSchema)  # type: ignore
     def put(self):
+        """Ping Pong: Put"""
         return {'msg': 'PUT: PONG'}

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

@@ -5,3 +5,8 @@ from apiflask import Schema, fields
 class PanelInfoOutputSchema(Schema):
     version = fields.String(description="The panel version")
 # endregion
+
+
+class PongOutputSchema(Schema):
+    msg = fields.String(description="Pong Response")
+# endregion

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

@@ -1,6 +1,6 @@
 from apiflask import APIBlueprint
 
-bp = APIBlueprint("api_parent", __name__, url_prefix="/<proxy_path>/api/v2/parent/", enable_openapi=True)
+bp = APIBlueprint("api_parent", __name__, url_prefix="/<proxy_path>/api/v2/parent/", enable_openapi=False)
 
 
 def init_app(app):

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

@@ -2,7 +2,7 @@ from apiflask import APIBlueprint
 
 bp = APIBlueprint("api_user", __name__, url_prefix="/<proxy_path>/api/v2/user/", enable_openapi=True)
 
-bp_uuid = APIBlueprint("api_user_uuid", __name__, url_prefix="/<proxy_path>/<uuid:secret_uuid>/api/v2/user/", enable_openapi=True)
+bp_uuid = APIBlueprint("api_user_by_uuid", __name__, url_prefix="/<proxy_path>/<uuid:secret_uuid>/api/v2/user/", enable_openapi=True)
 
 
 def init_app(app):

hiddifypanel/panel/hiddify.py

@@ -336,3 +336,34 @@ def get_backup_child_unique_id(backupdata: dict) -> str:
     if len(backupdata.get('childs', [])) == 0:
         return "self"
     return backupdata['childs'][0]['unique_id']
+
+
+def all_configs_for_cli():
+    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 = {
+        "users": valid_users,
+        "domains": [u.to_dict(dump_ports=True, dump_child_id=True) for u in Domain.query.filter(Domain.child_id.in_(host_child_ids)).all() if "*" not in u.domain],
+        # "hconfigs": get_hconfigs(json=True),
+        "chconfigs": get_hconfigs_childs(host_child_ids, json=True)
+    }
+
+    def_user = None if len(User.query.all()) > 1 else User.query.filter(User.name == 'default').first()
+    domains = Domain.query.all()
+    sslip_domains = [d.domain for d in domains if "sslip.io" in d.domain]
+
+    configs['chconfigs'][0]['first_setup'] = def_user is not None and len(sslip_domains) > 0
+    server_ip = hutils.network.get_ip_str(4)
+    owner = AdminUser.get_super_admin()
+    configs['api_key'] = owner.uuid
+    configs['api_path'] = hconfig(ConfigEnum.proxy_path_admin)
+    configs['admin_path'] = get_account_panel_link(owner, server_ip, is_https=False, prefere_path_only=True)
+    configs['panel_links'] = []
+    configs['panel_links'].append(get_account_panel_link(owner, server_ip, is_https=False))
+    configs['panel_links'].append(get_account_panel_link(owner, server_ip))
+    domains = Domain.get_domains()
+
+    for d in domains:
+        configs['panel_links'].append(get_account_panel_link(owner, d.domain))
+
+    return configs

hiddifypanel/panel/init_db.py

@@ -671,7 +671,6 @@ def upgrade_database():
 
 def init_db():
     db.create_all()
-    cache.invalidate_all_cached_functions()
 
     # set_hconfig(ConfigEnum.db_version, 71)
     # temporary fix
@@ -680,6 +679,7 @@ def init_db():
     db_version = int(hconfig(ConfigEnum.db_version) or 0)
     if db_version == latest_db_version():
         return
+    cache.invalidate_all_cached_functions()
     migrate(db_version)
     Child.query.filter(Child.id == 0).first().mode = ChildMode.virtual
     # if db_version < 69: