hiddifypanel 10.70.9__py3-none-any.whl → 10.80.0.dev1__py3-none-any.whl

hiddifypanel/panel/admin/UserAdmin.py

@@ -27,7 +27,7 @@ from hiddifypanel import hutils
 class UserAdmin(AdminLTEModelView):
     column_default_sort = ('id', False)  # Sort by username in ascending order
 
-    column_sortable_list = ["is_active", "name", "current_usage", 'mode', "remaining_days", "comment", 'last_online', "uuid", 'remaining_days']
+    column_sortable_list = ["is_active", "name", "current_usage", 'mode', "remaining_days","max_ips", "comment", 'last_online', "uuid", 'remaining_days']
     column_searchable_list = ["uuid", "name"]
     column_list = ["is_active", "name", "UserLinks", "current_usage", "remaining_days", "comment", 'last_online', 'mode', 'admin', "uuid"]
     column_editable_list = ["comment", "name", "uuid"]
@@ -37,8 +37,8 @@ class UserAdmin(AdminLTEModelView):
         # 'disable_user': SwitchField(_("Disable User"))
     }
     list_template = 'model/user_list.html'
-
-    form_columns = ["name", "comment", "usage_limit", "reset_usage", "package_days", "reset_days", "mode", "uuid", "enable",]
+# "max_ips",
+    form_columns = ["name","comment", "usage_limit", "reset_usage", "package_days", "reset_days", "mode", "uuid", "enable"]
     # form_excluded_columns = ['current_usage', 'monthly', 'telegram_id', 'last_online', 'expiry_time', 'last_reset_time', 'current_usage_GB',
     #  'start_date', 'added_by', 'admin', 'details', 'max_ips', 'ed25519_private_key', 'ed25519_public_key', 'username', 'password']
     page_size = 50
@@ -48,7 +48,6 @@ class UserAdmin(AdminLTEModelView):
     # can_export = True
     # form_overrides = dict(monthly=SwitchField)
     form_overrides = {
-
         'start_date': custom_widgets.DaysLeftField,
         'mode': custom_widgets.EnumSelectField,
         'usage_limit': custom_widgets.UsageField
@@ -71,7 +70,8 @@ class UserAdmin(AdminLTEModelView):
             'validators': [Regexp(r'^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$', message=__("Should be a valid uuid"))]
             #     'label': 'First Name',
             #     'validators': [required()]
-        }
+        },
+        
         # ,
         # 'expiry_time':{
         # "":'%Y-%m-%d'
@@ -225,11 +225,13 @@ class UserAdmin(AdminLTEModelView):
 
     def on_form_prefill(self, form, id=None):
         # print("================",form._obj.start_date)
-        if id is None or form._obj is None or form._obj.start_date is None:
+        if id is None or form._obj is None or form._obj.start_date is None or form._obj.current_usage==0:
             msg = _("Package not started yet.")
             # form.reset['class']="d-none"
-            delattr(form, 'reset_days')
-            delattr(form, 'reset_usage')
+            if form._obj.start_date is None:
+                delattr(form, 'reset_days')
+            if form._obj.current_usage==0:
+                delattr(form, 'reset_usage')
             # delattr(form,'disable_user')
         else:
             remaining = form._obj.remaining_days  # remaining_days(form._obj)

hiddifypanel/panel/admin/adminlte.py

@@ -3,6 +3,7 @@ from hiddifypanel import auth
 from flask_admin.form import SecureForm
 
 
+
 class AdminLTEModelView(ModelView):
     form_base_class = SecureForm
     edit_modal = True
@@ -17,6 +18,5 @@ class AdminLTEModelView(ModelView):
     edit_modal_template = 'flask-admin/model/modals/edit.html'
     details_modal_template = 'flask-admin/model/modals/details.html'
 
-    # form_base_class = SecureForm
     def inaccessible_callback(self, name, **kwargs):
         return auth.redirect_to_login()  # type: ignore

hiddifypanel/panel/cli.py

@@ -131,7 +131,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/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({
@@ -62,7 +65,7 @@ def init_app(app: APIFlask):
                             'version': hiddifypanel.__version__,
                             }), 500
 
-        trace = traceback.format_exc()
+        trace = traceback.format_exc(e)
 
         # Create github issue link
         issue_link = hutils.github_issue.generate_github_issue_link_for_500_error(e, trace)

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": [