hiddifypanel 10.70.8__py3-none-any.whl → 10.80.0__py3-none-any.whl

hiddifypanel/panel/admin/templates/index.html

@@ -192,10 +192,12 @@
     }
 
     function update_from_json(data) {
-        usage_history = data['usage_history']
-        onlines = usage_history['m5']['online']
-        total_users = usage_history['total']['users']
-        stats = data['stats']
+        // Use local variables instead of globals
+        const usage_history = data['usage_history'];
+        const onlines = usage_history['m5']['online'];
+        const total_users = usage_history['total']['users'];
+        const stats = data['stats'];
+        
         info_box("today", "fa-solid fa-calendar", "Today Usage",
             ((usage_history['today']['usage'] / Math.pow(1024, 3)).toFixed(1)) + " GB",
             usage_history['today']['online'] / Math.max(1, total_users) * 100,

hiddifypanel/panel/admin/templates/model/user_list.html

@@ -121,9 +121,17 @@
                         $(document).Toasts('create', {
                             class: 'bg-danger',
                             position: "{{'topRight' if get_locale()=='fa' else 'topLeft'}}",
-                            title: status + " " + error,
-                            body: JSON.stringify(jqx)
-                        })
+                            title: $('<div>').text(status + " " + error).html(),
+                            body: $('<div>').text(JSON.stringify(jqx)).html(),
+                            autohide: true,
+                            delay: 5000
+                        });
+                        
+                        console.error('API Error:', {
+                            status: status,
+                            error: error,
+                            details: jqx
+                        });
                     },
                     success: function (data) {
                         // dialog.modal('hide');

hiddifypanel/panel/cli.py

@@ -13,6 +13,7 @@ from hiddifypanel.panel import hiddify, usage
 from hiddifypanel.database import db
 from hiddifypanel.panel.init_db import init_db
 
+from loguru import logger
 
 def drop_db():
     """Cleans database"""
@@ -29,7 +30,12 @@ def downgrade():
         os.rename("/opt/hiddify-manager/hiddify-panel/hiddifypanel.db.old", "/opt/hiddify-manager/hiddify-panel/hiddifypanel.db")
 
 
+from celery import shared_task
 def backup():
+    backup_task()
+
+@shared_task(ignore_result=False)
+def backup_task():
     dbdict = hiddify.dump_db_to_dict()
     os.makedirs('backup', exist_ok=True)
     dst = f'backup/{datetime.datetime.now().strftime("%Y_%m_%d__%H_%M_%S")}.json'
@@ -42,9 +48,12 @@ def backup():
             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():
+            for admin in AdminUser.query.filter(AdminUser.mode == AdminMode.super_admin, AdminUser.telegram_id is not None,AdminUser.telegram_id!=0).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)])
+                try:
+                    bot.send_document(admin.telegram_id, document, visible_file_name=dst.replace("backup/", ""), caption=caption[:1000])
+                except Exception as e:
+                    logger.exception(e)
 
 
 def all_configs():
@@ -131,7 +140,9 @@ def init_app(app):
         hiddify.add_or_update_config(key=key, value=val)
 
         return "success"
-
+    @app.cli.command()
+    def reset_owner_password():
+        AdminUser.get_super_admin().update_password("")
     @ app.cli.command()
     @ click.option("--config", "-c")
     def import_config(config):

hiddifypanel/panel/commercial/restapi/v1/tgbot.py

@@ -2,6 +2,7 @@ import telebot
 from flask import request
 from apiflask import abort
 from flask_restful import Resource
+import time
 
 from hiddifypanel.models import *
 from hiddifypanel import Events
@@ -11,7 +12,24 @@ logger = telebot.logger
 
 class ExceptionHandler(telebot.ExceptionHandler):
     def handle(self, exception):
-        logger.error(exception)
+        """Improved error handling for Telegram bot exceptions"""
+        error_msg = str(exception)
+        logger.error(f"Telegram bot error: {error_msg}")
+        
+        try:
+            # Attempt recovery based on error type
+            if "webhook" in error_msg.lower():
+                if hasattr(bot, 'remove_webhook'):
+                    bot.remove_webhook()
+                    logger.info("Removed webhook due to error")
+            elif "connection" in error_msg.lower():
+                # Wait and retry for connection issues
+                time.sleep(5)
+                return True  # Indicates retry
+        except Exception as e:
+            logger.error(f"Error during recovery attempt: {str(e)}")
+        
+        return False  # Don't retry for unknown errors
 
 
 bot = telebot.TeleBot("1:2", parse_mode="HTML", threaded=False, exception_handler=ExceptionHandler())

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

@@ -1,3 +1,5 @@
+import asyncio
+import time
 from flask import current_app as app, request
 from flask import g
 from flask.views import MethodView
@@ -16,7 +18,9 @@ class UpdateUserUsageApi(MethodView):
 
     def get(self):
         """System: Update User Usage"""
-        return json.dumps(usage.update_local_usage(), indent=2)
+        # time.sleep(5)
+        
+        return json.dumps(usage.update_local_usage_not_lock(), indent=2)
 
 
 class AllConfigsApi(MethodView):

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

@@ -6,7 +6,8 @@ from hiddifypanel.auth import login_required
 from hiddifypanel.models import *
 from hiddifypanel.panel import hiddify
 from hiddifypanel.drivers import user_driver
-from hiddifypanel.panel import hiddify
+
+
 
 from . import has_permission
 from .schema import UserSchema, PostUserSchema, PatchUserSchema, SuccessfulSchema

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

@@ -108,31 +108,35 @@ class AppAPI(MethodView):
                 apps_data = self.__get_all_apps_dto()
             case Platform.android:
                 hiddify_next_dto = self.__get_hiddify_next_app_dto()
+                singbox_dto = self.__get_singbox_app_dto()
                 hiddifyng_dto = self.__get_hiddifyng_app_dto()
                 v2rayng_dto = self.__get_v2rayng_app_dto()
                 hiddify_clash_android_dto = self.__get_hiddify_clash_android_app_dto()
                 nekobox_dto = self.__get_nekobox_app_dto()
-                apps_data += ([hiddify_next_dto, hiddifyng_dto, v2rayng_dto, hiddify_clash_android_dto, nekobox_dto])
+                apps_data += ([hiddify_next_dto, singbox_dto, v2rayng_dto, nekobox_dto, hiddifyng_dto, hiddify_clash_android_dto])
             case Platform.windows:
                 hiddify_next_dto = self.__get_hiddify_next_app_dto()
                 hiddify_clash_dto = self.__get_hiddify_clash_desktop_app_dto()
                 hiddifyn_dto = self.__get_hiddifyn_app_dto()
                 apps_data += ([hiddify_next_dto, hiddify_clash_dto, hiddifyn_dto])
             case Platform.ios:
+                hiddify_next_dto = self.__get_hiddify_next_app_dto()
+                singbox_dto = self.__get_singbox_app_dto()
                 stash_dto = self.__get_stash_app_dto()
                 shadowrocket_dto = self.__get_shadowrocket_app_dto()
                 foxray_dto = self.__get_foxray_app_dto()
                 streisand_dto = self.__get_streisand_app_dto()
                 loon_dto = self.__get_loon_app_dto()
-                apps_data += ([streisand_dto, stash_dto, shadowrocket_dto, foxray_dto, loon_dto])
+                apps_data += ([hiddify_next_dto, singbox_dto, streisand_dto, stash_dto, shadowrocket_dto, foxray_dto, loon_dto])
             case Platform.linux:
                 hiddify_next_dto = self.__get_hiddify_next_app_dto()
                 hiddify_clash_dto = self.__get_hiddify_clash_desktop_app_dto()
                 apps_data += ([hiddify_next_dto, hiddify_clash_dto,])
             case Platform.mac:
+                singbox_dto = self.__get_singbox_app_dto()
                 hiddify_clash_dto = self.__get_hiddify_clash_desktop_app_dto()
                 hiddify_next_dto = self.__get_hiddify_next_app_dto()
-                apps_data += ([hiddify_next_dto, hiddify_clash_dto])
+                apps_data += ([hiddify_next_dto, singbox_dto, hiddify_clash_dto])
 
         return apps_data
 
@@ -162,11 +166,12 @@ class AppAPI(MethodView):
         loon_app_dto = self.__get_loon_app_dto()
         stash_app_dto = self.__get_stash_app_dto()
         hiddify_clash_app_dto = self.__get_hiddify_clash_desktop_app_dto()
+        singbox_app_dto = self.__get_singbox_app_dto()
         hiddify_next_app_dto = self.__get_hiddify_next_app_dto()
         return [
             hiddifyn_app_dto, v2rayng_app_dto, hiddifyng_app_dto, hiddify_android_app_dto,
             foxray_app_dto, shadowrocket_app_dto, streisand_app_dto,
-            loon_app_dto, stash_app_dto, hiddify_clash_app_dto, hiddify_next_app_dto
+            loon_app_dto, stash_app_dto, hiddify_clash_app_dto, singbox_app_dto, hiddify_next_app_dto
         ]
 
     def __get_app_icon_url(self, app_name):
@@ -174,6 +179,8 @@ class AppAPI(MethodView):
         url = ''
         if app_name == _('app.hiddify.next.title'):
             url = base + static_url_for(filename='apps-icon/hiddify_next.ico')
+        elif app_name == _('app.singbox.title'):
+            url = base + static_url_for(filename='apps-icon/singbox.ico')
         elif app_name == _('app.hiddifyn.title'):
             url = base + static_url_for(filename='apps-icon/hiddifyn.ico')
         elif app_name == _('app.v2rayng.title'):
@@ -241,7 +248,7 @@ class AppAPI(MethodView):
 
         # make v2rayng latest version url download
         latest_url, version = get_latest_release_url(f'https://github.com/2dust/v2rayNG/')
-        github_ins_url = latest_url.split('releases/')[0] + f'releases/download/{version}/v2rayNG_{version}.apk'
+        github_ins_url = latest_url.split('releases/')[0] + f'releases/download/{version}/v2rayNG_{version}_universal.apk'
         google_play_ins_url = 'https://play.google.com/store/apps/details?id=com.v2ray.ang'
         dto.install = [self.__get_app_install_dto(AppInstallType.apk, github_ins_url), self.__get_app_install_dto(AppInstallType.google_play, google_play_ins_url)]
         return dto
@@ -367,6 +374,65 @@ class AppAPI(MethodView):
 
         return dto
 
+    def __get_singbox_app_dto(self):
+        dto = AppSchema()
+        dto.title = _('app.singbox.title')
+        dto.description = _('app.singbox.description')
+        dto.icon_url = self.__get_app_icon_url(_('app.singbox.title'))
+        dto.guide_url = ''
+        dto.deeplink = f'sing-box://import-remote-profile/?url={self.user_panel_url}'
+
+        # availabe installatoin types
+        installation_types = []
+        if self.platform == Platform.all:
+            installation_types = [AppInstallType.apk, AppInstallType.google_play, AppInstallType.dmg, AppInstallType.app_store]
+        else:
+            match self.platform:
+                case Platform.android:
+                    installation_types = [AppInstallType.apk, AppInstallType.google_play]
+                case Platform.mac:
+                    installation_types = [AppInstallType.dmg]
+                case Platform.ios:
+                    installation_types = [AppInstallType.app_store]
+
+        install_dtos = []
+        for install_type in installation_types:
+            install_dto = AppInstall()
+            ins_url = ''
+            match install_type:
+                case AppInstallType.apk:
+                    latest_url, version = get_latest_release_url(f'https://github.com/SagerNet/sing-box')
+                    ins_url = latest_url.split('releases/')[0] + f'releases/download/{version}/SFA-{version}-universal.apk'
+                    def remove_v_from_filename(url):
+                        parts = url.split('/')
+                        filename = parts[-1]
+                        new_filename = filename.replace('SFA-v', 'SFA-')
+                        parts[-1] = new_filename
+                        new_url = '/'.join(parts)
+                        return new_url
+                    ins_url = remove_v_from_filename(ins_url)
+                case AppInstallType.google_play:
+                    ins_url = 'https://play.google.com/store/apps/details?id=io.nekohasekai.sfa'
+                case AppInstallType.dmg:
+                    latest_url, version = get_latest_release_url(f'https://github.com/SagerNet/sing-box')
+                    ins_url = latest_url.split('releases/')[0] + f'releases/download/{version}/SFM-{version}-universal.dmg'
+                    def remove_v_from_filename(url):
+                        parts = url.split('/')
+                        filename = parts[-1]
+                        new_filename = filename.replace('SFM-v', 'SFM-')
+                        parts[-1] = new_filename
+                        new_url = '/'.join(parts)
+                        return new_url
+                    ins_url = remove_v_from_filename(ins_url)
+                case AppInstallType.app_store:
+                    ins_url = 'https://apps.apple.com/us/app/sing-box-vt/id6673731168'
+
+            install_dto = self.__get_app_install_dto(install_type, ins_url)
+            install_dtos.append(install_dto)
+
+        dto.install = install_dtos
+        return dto
+
     def __get_hiddify_next_app_dto(self):
         dto = AppSchema()
         dto.title = _('app.hiddify.next.title')
@@ -378,7 +444,7 @@ class AppAPI(MethodView):
         # availabe installatoin types
         installation_types = []
         if self.platform == Platform.all:
-            installation_types = [AppInstallType.apk, AppInstallType.google_play, AppInstallType.setup, AppInstallType.portable, AppInstallType.appimage, AppInstallType.dmg]
+            installation_types = [AppInstallType.apk, AppInstallType.google_play, AppInstallType.setup, AppInstallType.portable, AppInstallType.appimage, AppInstallType.dmg, AppInstallType.app_store]
         else:
             match self.platform:
                 case Platform.android:
@@ -389,6 +455,8 @@ class AppAPI(MethodView):
                     installation_types = [AppInstallType.appimage]
                 case Platform.mac:
                     installation_types = [AppInstallType.dmg]
+                case Platform.ios:
+                    installation_types = [AppInstallType.app_store]
 
         install_dtos = []
         for install_type in installation_types:
@@ -407,6 +475,8 @@ class AppAPI(MethodView):
                     ins_url = f'{self.hiddify_github_repo}/hiddify-next/releases/latest/download/Hiddify-Linux-x64.AppImage'
                 case AppInstallType.dmg:
                     ins_url = f'{self.hiddify_github_repo}/hiddify-next/releases/latest/download/Hiddify-MacOS.dmg'
+                case AppInstallType.app_store:
+                    ins_url = 'https://apps.apple.com/us/app/hiddify-proxy-vpn/id6596777532'
 
             install_dto = self.__get_app_install_dto(install_type, ins_url)
             install_dtos.append(install_dto)

hiddifypanel/panel/common.py

@@ -22,6 +22,9 @@ def init_app(app: APIFlask):
     app.jinja_env.globals['hutils'] = hutils
     app.jinja_env.globals['hiddify'] = hiddify
     app.jinja_env.globals['version'] = hiddifypanel.__version__
+    if not hiddifypanel.is_released_version:
+        app.jinja_env.globals['version']= "DEV"
+    
     app.jinja_env.globals['static_url_for'] = hutils.flask.static_url_for
     app.jinja_env.globals['hurl_for'] = hutils.flask.hurl_for
     app.jinja_env.globals['_gettext'] = lambda x: print("==========", x)
@@ -40,9 +43,9 @@ def init_app(app: APIFlask):
         logger.exception(e)
         if isinstance(e, Exception):
             if hutils.flask.is_api_call(request.path):
-                return {
+                return jsonify({
                     'msg': str(e),
-                }, 500
+                }), 500
 
         if hasattr(e, 'code') and e.code == 404:
             return jsonify({

hiddifypanel/panel/common_bp/login.py

@@ -11,6 +11,7 @@ from hiddifypanel.models import *
 
 from flask_wtf import FlaskForm
 import wtforms as wtf
+
 import re
 
 
@@ -22,7 +23,10 @@ class LoginForm(FlaskForm):
         'pattern': "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$",
         'message': _('config.invalid_uuid')
     })
-    submit = wtf.fields.SubmitField(_('Submit'))
+
+    password_textbox = wtf.fields.PasswordField(_(f'login.password.label'), default='',
+        description=_(f'login.password.description'), render_kw={    })
+    submit = wtf.fields.SubmitField(_('login.button'))
 
 
 class LoginView(FlaskView):
@@ -33,8 +37,9 @@ class LoginView(FlaskView):
         redirect_arg = request.args.get('redirect')
         username_arg = request.args.get('user') or ''
         if not current_account:
-
-            return render_template('login.html', form=LoginForm())
+            form=LoginForm()
+            form.secret_textbox.data=form.secret_textbox.data or username_arg
+            return render_template('login.html', form=form)
 
             # abort(401, "Unauthorized1")
 
@@ -52,9 +57,9 @@ class LoginView(FlaskView):
         form = LoginForm()
         if form.validate_on_submit():
             uuid = form.secret_textbox.data.strip()
-            if login_by_uuid(uuid, hutils.flask.is_admin_proxy_path()):
+            if login_by_uuid(uuid,form.password_textbox.data, hutils.flask.is_admin_proxy_path()):
                 return redirect(f'/{g.proxy_path}/')
-        hutils.flask.flash(_('config.validation-error'), 'danger')  # type: ignore
+        hutils.flask.flash(_('config.invalid_uuid'), 'danger')  # type: ignore
         return render_template('login.html', form=LoginForm())
 
     @ route("/l/<path:path>/")
@@ -68,7 +73,7 @@ class LoginView(FlaskView):
             redirect_arg = request.args.get('next')
 
         if not current_account or (not request.headers.get('Authorization')):
-            username = request.authorization.username if request.authorization else ''
+            username = request.authorization.username if request.authorization else g.uuid
 
             loginurl = hurl_for('common_bp.LoginView:index', next=redirect_arg, user=username)
             if g.user_agent['is_browser'] and request.headers.get('Authorization') or (current_account and len(username) > 0 and current_account.username != username):
@@ -128,7 +133,8 @@ class LoginView(FlaskView):
     @ route('/<secret_uuid>/manifest.webmanifest')
     def create_pwa_manifest(self):
         domain = request.host
-        name = (domain if hutils.flask.is_admin_panel_call() else g.account.name)
+        account=AdminUser.by_uuid(g.uuid)
+        name = (domain if hutils.flask.is_admin_panel_call() else account.name)
         return jsonify({
             "name": f"Hiddify {name}",
             "short_name": f"{name}"[:12],
@@ -136,7 +142,7 @@ class LoginView(FlaskView):
             "background_color": "#1a1b21",
             "display": "standalone",
             "scope": f"/",
-            "start_url": hiddify.get_account_panel_link(g.account, domain) + "?pwa=true",
+            "start_url": hiddify.get_account_panel_link(account, domain) + "?pwa=true",
             "description": "Hiddify, for a free Internet",
             "orientation": "any",
             "icons": [

hiddifypanel/panel/hlogger.py

@@ -0,0 +1,32 @@
+import sys
+from loguru import logger
+
+def logger_dynamic_formatter(record) -> str:
+    fmt = '<green>{time:YYYY-MM-DD HH:mm:ss}</green> | <level>{level: <8}</level> | <cyan>{name}</cyan>:<cyan>{function}</cyan>:<cyan>{line}</cyan> - <level>{message}</level>'
+    if record['extra']:
+        fmt += ' | <level>{extra}</level>'
+    return fmt + '\n'
+
+def init_app(app):
+    init_logger(app,False)
+
+def init_cli(app):
+    init_logger(app,True)
+
+
+def init_logger(app, cli):
+    # configure logger
+    
+    logger.remove()
+    logger.add(sys.stderr if cli else sys.stdout, format=logger_dynamic_formatter, level=app.config['STDOUT_LOG_LEVEL'],
+               colorize=True, catch=True, enqueue=True, diagnose=False, backtrace=True)
+    logger.trace('Logger initiated :)')
+
+    with app.app_context():
+        from hiddifypanel.models.config import hconfig,ConfigEnum
+        set_level(app,hconfig(ConfigEnum.log_level))
+
+
+def set_level(app, level):
+    logger.add(app.config['HIDDIFY_CONFIG_PATH'] + "/log/system/panel.log", format=logger_dynamic_formatter, level=level,
+                   colorize=True, catch=True, enqueue=True, diagnose=False, backtrace=True)