hiddifypanel 10.80.0.dev13__py3-none-any.whl → 10.80.0.dev15__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","max_ips", "comment", 'last_online', "uuid", 'remaining_days']
+    column_sortable_list = ["is_active", "name", "current_usage", 'mode', "remaining_days", "max_ips", "comment", 'last_online', "uuid"]
     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"]
@@ -131,7 +131,7 @@ class UserAdmin(AdminLTEModelView):
         if model.is_active:
             link = '<i class="fa-solid fa-circle-check text-success"></i> '
         elif len(model.devices):
-            link = '<i class="fa-solid fa-users-slash text-danger" title="{_("Too many Connected IPs")}"></i>'
+            link = f'<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> '
 
@@ -161,8 +161,8 @@ class UserAdmin(AdminLTEModelView):
 
     def _usage_formatter(view, context, model, name):
         u = round(model.current_usage_GB, 3)
-        t = round(model.usage_limit_GB, 3)
-        rate = round(u * 100 / (t + 0.000001))
+        t = max(round(model.usage_limit_GB, 3), 0.001)  # Prevent division by zero
+        rate = min(round(u * 100 / t), 100)  # Cap at 100%
         state = "danger" if u >= t else ('warning' if rate > 80 else 'success')
         color = "#ff7e7e" if u >= t else ('#ffc107' if rate > 80 else '#9ee150')
         return Markup(f"""
@@ -225,38 +225,45 @@ 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 or form._obj.current_usage==0:
+        if form._obj is None:
+            return
+
+        if id 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"
-            if form._obj.start_date is None:
+        if form._obj.start_date is None:
+            if hasattr(form, 'reset_days'):
                 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)
+            remaining = form._obj.remaining_days
             relative_remaining = hutils.convert.format_timedelta(datetime.timedelta(days=remaining))
             msg = _("Remaining about %(relative)s, exactly %(days)s days", relative=relative_remaining, days=remaining)
             form.reset_days.label.text += f" ({msg})"
-            usr_usage = f" ({_('user.home.usage.title')} {round(form._obj.current_usage_GB,3)}GB)"
-            form.reset_usage.label.text += usr_usage
-            form.reset_usage.data = False
             form.reset_days.data = False
 
-            form.usage_limit.label.text += usr_usage
-
-            # if form._obj.mode==UserMode.disable:
-            #     delattr(form,'disable_user')
-            # form.disable_user.data=form._obj.mode==UserMode.disable
-            if form._obj.start_date:
-                started = form._obj.start_date - datetime.date.today()
-                msg = _("Started from %(relative)s", relative=hutils.convert.format_timedelta(started))
-                form.package_days.label.text += f" ({msg})"
-                if started.days <= 0:
-                    exact_start = _("Started %(days)s days ago", days=-started.days)
-                else:
-                    exact_start = _("Will Start in %(days)s days", days=started.days)
-                form.package_days.description += f" ({exact_start})"
+        # Handle reset_usage field
+        if form._obj.current_usage == 0:
+            if hasattr(form, 'reset_usage'):
+                delattr(form, 'reset_usage')
+        else:
+            usr_usage = f" ({_('user.home.usage.title')} {round(form._obj.current_usage_GB,3)}GB)"
+            if hasattr(form, 'reset_usage'):
+                form.reset_usage.label.text += usr_usage
+                form.reset_usage.data = False
+            
+            if hasattr(form, 'usage_limit'):
+                form.usage_limit.label.text += usr_usage
+
+        # Handle package days info
+        if form._obj.start_date and hasattr(form, 'package_days'):
+            started = form._obj.start_date - datetime.date.today()
+            msg = _("Started from %(relative)s", relative=hutils.convert.format_timedelta(started))
+            form.package_days.label.text += f" ({msg})"
+            if started.days <= 0:
+                exact_start = _("Started %(days)s days ago", days=-started.days)
+            else:
+                exact_start = _("Will Start in %(days)s days", days=started.days)
+            form.package_days.description += f" ({exact_start})"
 
     def get_edit_form(self):
         form = super().get_edit_form()
@@ -267,26 +274,44 @@ class UserAdmin(AdminLTEModelView):
         return form
 
     def on_model_change(self, form, model, is_created):
-        model.max_ips = max(3, model.max_ips or 10000)
+        # Validate max_ips
+        try:
+            model.max_ips = max(3, min(int(model.max_ips or 10000), 10000))
+        except (ValueError, TypeError):
+            model.max_ips = 1000
+            
+        # Show donation message
         if len(User.query.all()) % 4 == 0:
             hutils.flask.flash(('<div id="show-modal-donation"></div>'), ' d-none')
+            
+        # Validate UUID
         if not re.match("^[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}$", model.uuid):
             raise ValidationError('Invalid UUID e.g.,' + str(uuid.uuid4()))
+            
+        # Handle reset flags
         if hasattr(form, 'reset_usage') and form.reset_usage.data:
             model.current_usage_GB = 0
-        # if model.telegram_id and model.telegram_id != '0' and not re.match(r"^[1-9]\d*$", model.telegram_id):
-        #     raise ValidationError('Invalid Telegram ID')
-        # if form.disable_user.data:
-        #     model.mode=UserMode.disable
+            
         if hasattr(form, 'reset_days') and form.reset_days.data:
             model.start_date = None
-        model.package_days = min(model.package_days, 10000)
+            
+        # Validate package days
+        try:
+            model.package_days = min(int(model.package_days), 10000)
+        except (ValueError, TypeError):
+            model.package_days = 10000
+            
+        # Handle user ownership
         old_user = User.by_id(model.id)
         if not model.added_by or model.added_by == 1:
             model.added_by = g.account.id
+            
+        # Validate user limits
         if not g.account.can_have_more_users():
             raise ValidationError(_('You have too much users! You can have only %(active)s active users and %(total)s users',
                                   active=g.account.max_active_users, total=g.account.max_users))
+                                  
+        # Handle UUID changes
         if old_user and old_user.uuid != model.uuid:
             user_driver.remove_client(old_user)
 

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/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/common.py

@@ -65,7 +65,7 @@ def init_app(app: APIFlask):
                             'version': hiddifypanel.__version__,
                             }), 500
 
-        trace = traceback.format_exc(e)
+        trace = traceback.format_exc()
 
         # Create github issue link
         issue_link = hutils.github_issue.generate_github_issue_link_for_500_error(e, trace)

hiddifypanel/panel/init_db.py

@@ -77,7 +77,7 @@ def _v94(child_id):
 
 def _v93(child_id):
     set_hconfig(ConfigEnum.quic_enable, True)
-    set_hconfig(ConfigEnum.splithttp_enable, True)
+    set_hconfig(ConfigEnum.xhttp_enable, True)
 
 
 def _v92(child_id):
@@ -85,9 +85,9 @@ def _v92(child_id):
 
 
 def _v89(child_id):
-    set_hconfig(ConfigEnum.path_splithttp,
+    set_hconfig(ConfigEnum.path_xhttp,
                 hutils.random.get_random_string(7, 15))
-    set_hconfig(ConfigEnum.splithttp_enable, False)
+    set_hconfig(ConfigEnum.xhttp_enable, False)
     pass
 
 
@@ -218,7 +218,7 @@ def _v65():
     add_config_if_not_exist(ConfigEnum.mux_min_streams, '4')
     add_config_if_not_exist(ConfigEnum.mux_max_streams, '0')
     add_config_if_not_exist(ConfigEnum.mux_padding_enable, False)
-    add_config_if_not_exist(ConfigEnum.mux_brutal_enable, True)
+    add_config_if_not_exist(ConfigEnum.mux_brutal_enable, False)
     add_config_if_not_exist(ConfigEnum.mux_brutal_up_mbps, '100')
     add_config_if_not_exist(ConfigEnum.mux_brutal_down_mbps, '100')
 
@@ -571,9 +571,9 @@ def get_proxy_rows_v1():
         "httpupgrade direct vless",
         # "httpupgrade direct trojan",
         "httpupgrade direct vmess",
-        "splithttp direct vless",
-        "splithttp direct trojan",
-        "splithttp direct vmess",
+        "xhttp direct vless",
+        "xhttp direct trojan",
+        "xhttp direct vmess",
         "tcp direct vless",
         "tcp direct trojan",
         "tcp direct vmess",
@@ -591,9 +591,9 @@ def get_proxy_rows_v1():
         # "httpupgrade relay trojan",
         "httpupgrade relay vmess",
 
-        "splithttp relay vless",
-        "splithttp relay trojan",
-        "splithttp relay vmess",
+        "xhttp relay vless",
+        "xhttp relay trojan",
+        "xhttp relay vmess",
 
         "tcp relay vless",
         "tcp relay trojan",
@@ -615,9 +615,9 @@ def get_proxy_rows_v1():
         # "httpupgrade CDN trojan",
         "httpupgrade CDN vmess",
 
-        "splithttp CDN vless",
-        "splithttp CDN trojan",
-        "splithttp CDN vmess",
+        "xhttp CDN vless",
+        "xhttp CDN trojan",
+        "xhttp CDN vmess",
 
         "grpc CDN vless",
         "grpc CDN trojan",
@@ -663,7 +663,7 @@ def make_proxy_rows(cfgs):
     for l3 in [ProxyL3.h3_quic, "tls_h2", "tls", "http", "reality"]:
         for c in cfgs:
             transport, cdn, proto = c.split(" ")
-            if transport != ProxyTransport.splithttp and l3 == ProxyL3.h3_quic:
+            if transport != ProxyTransport.xhttp and l3 == ProxyL3.h3_quic:
                 continue
             if l3 in ["kcp", 'reality'] and cdn != "direct":
                 continue
@@ -750,8 +750,11 @@ def add_new_enum_values():
             continue
 
         # Add the new value to the enum column in the database
-        enumstr = ','.join([f"'{a}'" for a in [*existing_values, *old_values]])
-
+        # enumstr = ','.join([f"'{a}'" for a in [*existing_values, *old_values]])
+        enumstr = ','.join([f"'{a}'" for a in [*existing_values]])
+        expired_enumstr = ','.join([f"'{a}'" for a in [*old_values]])
+        db_execute(
+            f"delete from {table_name} where `{column_name}` in ({expired_enumstr});", commit=True)
         db_execute(
             f"ALTER TABLE {table_name} MODIFY COLUMN `{column_name}` ENUM({enumstr});", commit=True)
 

hiddifypanel/panel/user/user.py

@@ -86,27 +86,15 @@ class UserView(FlaskView):
                 continue
             wireguards.append(pinfo)
 
-            servers.add(pinfo['server'])
+            
 
         if not len(wireguards):
             abort(404)
-        wg = wireguards[0]
-        addrs = f"{wg['wg_ipv4']}/32"
-        if wg['wg_ipv6']:
-            addrs += f", {wg['wg_ipv6']}/128"
-        resp = f"""
-[Interface]
-PrivateKey = {wg['wg_pk']}
-Address = {addrs}
-DNS = 1.1.1.1
-MTU = 1390
-
-[Peer]
-PublicKey = {wg['wg_pub']}
-PresharedKey = {wg['wg_psk']}
-AllowedIPs = 0.0.0.0/1, 128.0.0.0/1, ::/1, 8000::/1
-Endpoint = {next(iter(servers))}:61339 #{servers}
-"""
+        resp =""
+        for wg in wireguards:
+            resp +=f'#========={wg["extra_info"]} {wg["name"]}================\n'
+            resp+=hutils.proxy.wireguard.generate_wireguard_config(wg)
+            resp+="\n\n"
         return add_headers(resp, c)
 
         # return self.singbox_ssh_imp()