hiddifypanel 10.10.12__tar.gz → 10.10.14__tar.gz

{hiddifypanel-10.10.12 → hiddifypanel-10.10.14}/HISTORY.md

@@ -1,6 +1,30 @@
 # Changelog
 
 
+## v10.10.14 (2024-03-07)
+
+#### Fix
+
+* Incompatible types. 
+
+* Buggy database. 
+
+* Bug. 
+
+#### Other
+
+* Force add adimn user. 
+
+
+
+## v10.10.13 (2024-03-07)
+
+#### Fix
+
+* Some bugs. 
+
+
+
 ## v10.10.10 (2024-03-07)
 
 #### New

{hiddifypanel-10.10.12 → hiddifypanel-10.10.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hiddifypanel
-Version: 10.10.12
+Version: 10.10.14
 Summary: hiddifypanel multi proxy panel
 Home-page: https://github.com/hiddify/hiddify-manager/
 Author: hiddify

hiddifypanel-10.10.14/hiddifypanel/VERSION

@@ -0,0 +1 @@
+10.10.14

{hiddifypanel-10.10.12 → hiddifypanel-10.10.14}/hiddifypanel/VERSION.py

@@ -1,3 +1,3 @@
-__version__='10.10.12'
+__version__='10.10.14'
 from datetime import datetime
 __release_date__= datetime.strptime('2024-03-07','%Y-%m-%d')

{hiddifypanel-10.10.12 → hiddifypanel-10.10.14}/hiddifypanel/hutils/flask.py

@@ -220,7 +220,8 @@ def proxy_path_validator(proxy_path: str) -> None:
 
 
 def list_dir_files(dir_path: str) -> List[str]:
-    return [f for f in os.listdir(dir_path) if os.path.isfile(os.path.join(dir_path, f))]
+    return sorted([f for f in os.listdir(dir_path) if os.path.isfile(os.path.join(dir_path, f))])
+
 
 def validate_domain_exist(form, field):
     domain = field.data
@@ -229,8 +230,7 @@ def validate_domain_exist(form, field):
     dip = hutils.network.get_domain_ip(domain)
     if dip is None:
         raise ValidationError(
-            _("Domain can not be resolved! there is a problem in your domain")) # type: ignore
-
+            _("Domain can not be resolved! there is a problem in your domain"))  # type: ignore
 
 
 # region not used

{hiddifypanel-10.10.12 → hiddifypanel-10.10.14}/hiddifypanel/hutils/utils.py

@@ -31,7 +31,10 @@ def get_latest_release_version(repo_name):
         if location_header:
             version = re.search(r"/([^/]+)/?$", location_header)
             if version:
-                return version.group(1).replace('v', '')
+                ver = version.group(1).replace('v', '')
+                if ver == "latest":
+                    return get_latest_release_version(repo_name.replace("-", ""))
+                return ver
     except Exception as e:
         return f'{e}'
 

{hiddifypanel-10.10.12 → hiddifypanel-10.10.14}/hiddifypanel/models/admin.py

@@ -87,7 +87,7 @@ class AdminUser(BaseAccount):
             dbuser.parent_admin_id = parent_admin.id  # type: ignore
 
         dbuser.mode = data.get('mode', AdminMode.agent)
-        dbuser.can_add_admin = data.get('can_add_admin')
+        dbuser.can_add_admin = data.get('can_add_admin') or False
         if commit:
             db.session.commit()
         return dbuser

{hiddifypanel-10.10.12 → hiddifypanel-10.10.14}/hiddifypanel/models/proxy.py

@@ -39,7 +39,7 @@ class ProxyProto(StrEnum):
     ssr = auto()
     ssh = auto()
     tuic = auto()
-    # hysteria = auto()
+    hysteria = auto()
     hysteria2 = auto()
     wireguard = auto()
 

{hiddifypanel-10.10.12 → hiddifypanel-10.10.14}/hiddifypanel/panel/admin/UserAdmin.py

@@ -26,7 +26,7 @@ class UserAdmin(AdminLTEModelView):
     column_sortable_list = ["is_active", "name", "current_usage", 'mode', "remaining_days", "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"]
+    column_editable_list = ["comment", "name", "uuid"]
     form_extra_fields = {
         'reset_days': SwitchField(_("Reset package days")),
         'reset_usage': SwitchField(_("Reset package usage")),
@@ -152,8 +152,6 @@ class UserAdmin(AdminLTEModelView):
         domains = [d for d in get_panel_domains() if d.domain != request.host]
         return Markup(link + " ".join([hiddify.get_html_user_link(model, d) for d in domains]))
 
-    def _uuid_formatter(view, context, model, name):
-        return Markup(f"<span>{model.uuid}</span>")
     # def _usage_formatter(view, context, model, name):
     #     return round(model.current_usage_GB,3)
 
@@ -201,7 +199,7 @@ class UserAdmin(AdminLTEModelView):
     column_formatters = {
         # 'name': _name_formatter,
         'UserLinks': _ul_formatter,
-        'uuid': _uuid_formatter,
+        # 'uuid': _uuid_formatter,
         'current_usage': _usage_formatter,
         "remaining_days": _expire_formatter,
         'last_online': _online_formatter,

{hiddifypanel-10.10.12 → hiddifypanel-10.10.14}/hiddifypanel/panel/common.py

@@ -42,7 +42,7 @@ def init_app(app: APIFlask):
             has_update = False
         else:
             has_update = "dev" not in hiddifypanel.__version__ and f'{last_version}' != hiddifypanel.__version__
-
+    
         if not request.accept_mimetypes.accept_html:
             if has_update:
                 return jsonify({

{hiddifypanel-10.10.12 → hiddifypanel-10.10.14}/hiddifypanel/panel/hiddify.py

@@ -285,7 +285,7 @@ def set_db_from_json(json_data, override_child_unique_id=True, set_users=True, s
                 u['added_by_uuid'] = AdminUser.current_admin_or_owner().uuid
 
     if set_admins and 'admin_users' in json_data:
-        AdminUser.bulk_register(json_data['admin_users'], commit=False)
+        AdminUser.bulk_register(json_data['admin_users'], commit=True)
     if set_users and 'users' in json_data:
         User.bulk_register(json_data['users'], commit=False, remove=remove_users)
     if set_domains and 'domains' in json_data:

{hiddifypanel-10.10.12 → hiddifypanel-10.10.14}/hiddifypanel/panel/init_db.py

@@ -86,8 +86,6 @@ def _v65():
     add_config_if_not_exist(ConfigEnum.mux_brutal_down_mbps, '100')
 
 
-
-
 def _v63():
     add_config_if_not_exist(ConfigEnum.hysteria_enable, True)
     add_config_if_not_exist(ConfigEnum.hysteria_port, hutils.random.get_random_unused_port())
@@ -180,7 +178,7 @@ def _v45():
 
     if not Proxy.query.filter(Proxy.name == "SSH").first():
         db.session.add(Proxy(l3='ssh', transport='ssh', cdn='direct', proto='ssh', enable=True, name="SSH"))
-    
+
     add_config_if_not_exist(ConfigEnum.ssh_server_port, hutils.random.get_random_unused_port())
     add_config_if_not_exist(ConfigEnum.ssh_server_enable, False)
 # def _v43():
@@ -616,8 +614,8 @@ def init_db():
     get_hconfigs.invalidate_all()
     # set_hconfig(ConfigEnum.db_version, 71)
     # temporary fix
-    # add_column(Child.mode)
-    # add_column(Child.name)
+    add_column(Child.mode)
+    add_column(Child.name)
     db_version = int(hconfig(ConfigEnum.db_version) or 0)
     if db_version == latest_db_version():
         return

{hiddifypanel-10.10.12 → hiddifypanel-10.10.14}/hiddifypanel/static/css/custom.css

@@ -537,4 +537,14 @@ div#qrcode img {
 
 .global-form .custom-switch {
   width: 100%;
+}
+
+
+td.col-uuid {
+
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  width: 80px;
+  overflow: hidden;
+  display: inline-block;
 }

{hiddifypanel-10.10.12 → hiddifypanel-10.10.14}/hiddifypanel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hiddifypanel
-Version: 10.10.12
+Version: 10.10.14
 Summary: hiddifypanel multi proxy panel
 Home-page: https://github.com/hiddify/hiddify-manager/
 Author: hiddify

hiddifypanel-10.10.12/hiddifypanel/VERSION

@@ -1 +0,0 @@
-10.10.12