hiddifypanel 10.70.0.dev8__py3-none-any.whl → 10.70.2__py3-none-any.whl

hiddifypanel/VERSION

@@ -1 +1 @@
-10.70.0.dev8
+10.70.2

hiddifypanel/VERSION.py

@@ -1,3 +1,3 @@
-__version__='10.70.0.dev8'
+__version__='10.70.2'
 from datetime import datetime
-__release_date__= datetime.strptime('2024-07-29','%Y-%m-%d')
+__release_date__= datetime.strptime('2024-07-30','%Y-%m-%d')

hiddifypanel/drivers/singbox_api.py

@@ -5,6 +5,7 @@ from flask import current_app
 import json
 from collections import defaultdict
 from hiddifypanel.cache import cache
+from loguru import logger
 
 
 class SingboxApi(DriverABS):
@@ -24,7 +25,7 @@ class SingboxApi(DriverABS):
         try:
             xray_client = self.get_singbox_client()
             inbounds = [inb.name.split(">>>")[1] for inb in xray_client.stats_query('inbound')]
-            print(f"Success in get inbound tags {inbounds}")
+            # print(f"Success in get inbound tags {inbounds}")
         except Exception as e:
             print(f"error in get inbound tags {e}")
             inbounds = []
@@ -63,5 +64,5 @@ class SingboxApi(DriverABS):
         else:
             res = d + u
         if res:
-            print(f"singbox {uuid} d={d} u={u} sum={res}")
+            logger.debug(f"singbox {uuid} d={d} u={u} sum={res}")
         return res

hiddifypanel/drivers/ssh_liberty_bridge_api.py

@@ -4,6 +4,7 @@ import redis
 
 USERS_SET = "ssh-server:users"
 USERS_USAGE = "ssh-server:users-usage"
+from loguru import logger
 
 
 class SSHLibertyBridgeApi(DriverABS):
@@ -59,5 +60,5 @@ class SSHLibertyBridgeApi(DriverABS):
             redis_client.hincrby(USERS_USAGE, client_uuid, -value)
             redis_client.save()
         if value:
-            print(f'ssh usage {client_uuid} {value}')
+            logger.debug(f'ssh usage {client_uuid} {value}')
         return value

hiddifypanel/drivers/user_driver.py

@@ -5,6 +5,7 @@ from .wireguard_api import WireguardApi
 from hiddifypanel.models import *
 from hiddifypanel.panel import hiddify
 from collections import defaultdict
+from loguru import logger
 
 drivers = [XrayApi(), SingboxApi(), SSHLibertyBridgeApi(), WireguardApi()]
 
@@ -27,6 +28,7 @@ def get_users_usage(reset=True):
         except Exception as e:
             print(driver)
             hiddify.error(f'ERROR! {driver.__class__.__name__} has error in update usage {e}')
+            logger.exception(f'ERROR! {driver.__class__.__name__} has error in update usage {e}')
     return res
 
 
@@ -45,6 +47,7 @@ def get_enabled_users():
         except Exception as e:
             print(driver)
             hiddify.error(f'ERROR! {driver.__class__.__name__} has error in get_enabled users {e}')
+            logger.exception(f'ERROR! {driver.__class__.__name__} has error in get_enabled users {e}')
     # print(d, total)
     res = defaultdict(bool)
     for u, v in d.items():
@@ -59,6 +62,7 @@ def add_client(user: User):
             driver.add_client(user)
         except Exception as e:
             hiddify.error(f'ERROR! {driver.__class__.__name__} has error {e} in add client for user={user.uuid} {e}')
+            logger.exception(f'ERROR! {driver.__class__.__name__} has error {e} in add client for user={user.uuid} {e}')
 
 
 def remove_client(user: User):
@@ -67,3 +71,4 @@ def remove_client(user: User):
             driver.remove_client(user)
         except Exception as e:
             hiddify.error(f'ERROR! {driver.__class__.__name__} has error {e} in remove client for user={user.uuid}')
+            logger.exception(f'ERROR! {driver.__class__.__name__} has error {e} in remove client for user={user.uuid}')

hiddifypanel/drivers/xray_api.py

@@ -3,6 +3,7 @@ from hiddifypanel.models import *
 from .abstract_driver import DriverABS
 from collections import defaultdict
 from hiddifypanel.cache import cache
+from loguru import logger
 
 
 class XrayApi(DriverABS):
@@ -65,7 +66,7 @@ class XrayApi(DriverABS):
         try:
             xray_client = self.get_xray_client()
             inbounds = {inb.name.split(">>>")[1] for inb in xray_client.stats_query('inbound')}
-            print(f"Success in get inbound tags {inbounds}")
+            # print(f"Success in get inbound tags {inbounds}")
         except Exception as e:
             print(f"error in get inbound tags {e}")
             inbounds = {}
@@ -130,10 +131,10 @@ class XrayApi(DriverABS):
             try:
                 xray_client.remove_client(t, f'{uuid}@hiddify.com')
                 if dolog:
-                    print(f"Success remove  {uuid} {t}")
+                    logger.info(f"Success remove  {uuid} {t}")
             except Exception as e:
                 if dolog:
-                    print(f"error in remove  {uuid} {t} {e}")
+                    logger.info(f"error in remove  {uuid} {t} {e}")
                 pass
 
     def get_all_usage(self, users):
@@ -164,5 +165,5 @@ class XrayApi(DriverABS):
         else:
             res = d + u
         if res:
-            print(f"Xray usage {uuid} d={d} u={u} sum={res}")
+            logger.debug(f"Xray usage {uuid} d={d} u={u} sum={res}")
         return res

hiddifypanel/hutils/github_issue.py

@@ -137,12 +137,13 @@ def __github_issue_details() -> dict:
 def __remove_sensetive_data_from_github_issue_link(issue_link: str):
     from hiddifypanel.auth import current_account
     if current_account.uuid:
-        issue_link.replace(f'{current_account.uuid}', '*******************')
+        issue_link = issue_link.replace(f'{current_account.uuid}', '*******************')
 
-    issue_link.replace(request.host, '**********')
-    issue_link.replace(hconfig(ConfigEnum.proxy_path), '**********')
-    issue_link.replace(hconfig(ConfigEnum.proxy_path_admin), '**********')
-    issue_link.replace(hconfig(ConfigEnum.proxy_path_client), '**********')
+    issue_link = issue_link.replace(request.host, '**********')
+    issue_link = issue_link.replace(hconfig(ConfigEnum.proxy_path), '**********')
+    issue_link = issue_link.replace(hconfig(ConfigEnum.proxy_path_admin), '**********')
+    issue_link = issue_link.replace(hconfig(ConfigEnum.proxy_path_client), '**********')
+    return issue_link
 
 
 def __remove_unrelated_traceback_details(stacktrace: str) -> str:
@@ -181,10 +182,11 @@ def generate_github_issue_link_for_500_error(error, traceback: str, remove_sense
     issue_body = render_template('github_issue_body.j2', issue_details=issue_details, error=error, traceback=traceback)
 
     # Create github issue link
-    issue_link = __generate_github_issue_link(f"Internal server error: {error.name if hasattr(error,'name') and error.name != None and error.name else 'Unknown'}", issue_body)
+    issue_link = __generate_github_issue_link(
+        f"Internal server error: {error.name if hasattr(error,'name') and error.name != None and error.name else 'Unknown'}", issue_body)
 
     if remove_sensetive_data:
-        __remove_sensetive_data_from_github_issue_link(issue_link)
+        issue_link = __remove_sensetive_data_from_github_issue_link(issue_link)
 
     return issue_link
 

hiddifypanel/hutils/proxy/clash.py

@@ -1,6 +1,7 @@
 import yaml
 from hiddifypanel.models import ProxyCDN, ProxyL3, ProxyProto, ProxyTransport, Domain
 from hiddifypanel import hutils
+# https://wiki.metacubex.one/en/
 
 
 def get_clash_config_names(meta_or_normal, domains: list[Domain]):
@@ -32,11 +33,15 @@ def to_clash(proxy, meta_or_normal):
 
     if proxy['l3'] in ["kcp", ProxyL3.h3_quic]:
         return {'name': name, 'msg': f"clash does not support {proxy['l3']}", 'type': 'debug'}
-    if proxy['proto'] in ["ssh", "wireguard", "tuic", "hysteria"]:
-        return {'name': name, 'msg': f"clash does not support {proxy['proto']}", 'type': 'debug'}
-    if proxy.get('flow'):
-        return {'name': name, 'msg': "xtls not supported in clash", 'type': 'debug'}
+    if proxy['transport'] in [ProxyTransport.splithttp, ProxyTransport.httpupgrade]:
+        return {'name': name, 'msg': f"clash does not support {proxy['transport']}", 'type': 'debug'}
+    # if proxy['proto'] in [Proxy.shado]:
+
     if meta_or_normal == "normal":
+        if proxy.get('flow'):
+            return {'name': name, 'msg': "xtls not supported in clash", 'type': 'debug'}
+        if proxy['proto'] in [ProxyProto.ssh, ProxyProto.wireguard, ProxyProto.tuic, ProxyProto.hysteria2]:
+            return {'name': name, 'msg': f"clash does not support {proxy['proto']}", 'type': 'debug'}
         if proxy['proto'] in ["vless", 'tuic', 'hysteria2']:
             return {'name': name, 'msg': f"{proxy['proto']} not supported in clash", 'type': 'debug'}
         if proxy['transport'] in ["shadowtls", "splithttp"]:
@@ -49,7 +54,31 @@ def to_clash(proxy, meta_or_normal):
     base["type"] = str(proxy["proto"])
     base["server"] = proxy["server"]
     base["port"] = proxy["port"]
-    base['alpn'] = proxy['alpn'].split(',')
+    if proxy["proto"] == "ssh":
+        base["username"] = proxy["uuid"]
+        base["private-key"] = proxy['private_key']
+        base["host-key"] = proxy.get('host_key', [])
+        return base
+    base["udp"] = True
+    if proxy["proto"] == ProxyProto.wireguard:
+        base["private-key"] = proxy["wg_pk"]
+        base["ip"] = f'{proxy["wg_ipv4"]}/32'
+        # base["ipv6"]
+        base["public-key"] = proxy["wg_server_pub"]
+        base["pre-shared-key"] = proxy["wg_psk"]
+        # base["allowed-ips"]
+        return base
+    if proxy["proto"] == ProxyProto.tuic:
+        # base['congestion_control'] = "cubic"
+        base['udp-relay-mode'] = 'native'
+        base['reduce-rtt'] = True
+        base["skip-cert-verify"] = proxy['allow_insecure']
+        base['sni'] = proxy['sni']
+        # base['heartbeat'] = "10s"
+        base['password'] = proxy['uuid']
+        base['uuid'] = proxy['uuid']
+        return base
+
     if proxy["proto"] == "ssr":
         base["cipher"] = proxy["cipher"]
         base["password"] = proxy["uuid"]
@@ -58,16 +87,6 @@ def to_clash(proxy, meta_or_normal):
         base["protocol"] = proxy["ssr-protocol"]
         base["obfs-param"] = proxy["fakedomain"]
         return base
-    elif proxy["proto"] == "tuic":
-        base["uuid"] = proxy["uuid"]
-        base["password"] = proxy["uuid"]
-        base["disable-sni"] = proxy['allow_insecure']
-        base["reduce-rtt"] = True
-        base["request-timeout"] = 8000
-        base["udp-relay-mode"] = 'native'
-        base["congestion-controller"] = 'cubic'
-        base['sni'] = proxy['sni']
-        return base
     elif proxy["proto"] in ["ss", "v2ray"]:
         base["cipher"] = proxy["cipher"]
         base["password"] = proxy["password"]
@@ -82,7 +101,7 @@ def to_clash(proxy, meta_or_normal):
             base["plugin"] = "shadow-tls"
             base["plugin-opts"] = {
                 "host": proxy["fakedomain"],
-                "password": proxy["proxy_path"],
+                "password": proxy["shared_secret"],
                 "version": 3  # support 1/2/3
 
             }
@@ -98,16 +117,26 @@ def to_clash(proxy, meta_or_normal):
                 "path": proxy["path"]
             }
         return base
-    elif proxy["proto"] == "trojan":
+    base['alpn'] = proxy['alpn'].split(',')
+    base["skip-cert-verify"] = proxy["mode"] == "Fake"
+    if meta_or_normal == "meta" and proxy.get('fingerprint'):
+        base['client-fingerprint'] = proxy['fingerprint']
+
+    if proxy["proto"] == "trojan":
         base["password"] = proxy["uuid"]
         base["sni"] = proxy["sni"]
-
+    elif proxy["proto"] == "hysteria2":
+        base["password"] = proxy["uuid"]
+        base["obfs"] = "salamander"
+        base["obfs-password"] = proxy.get('hysteria_obfs_password')
+        return base
     else:
         base["uuid"] = proxy["uuid"]
         base["servername"] = proxy["sni"]
         base["tls"] = "tls" in proxy["l3"] or "reality" in proxy["l3"]
-    if meta_or_normal == "meta":
-        base['client-fingerprint'] = proxy['fingerprint']
+    if proxy["proto"] in ["vless", "vmess"]:
+        base["packet-encoding"] = "xudp"
+
     if proxy.get('flow'):
         base["flow"] = proxy['flow']
         # base["flow-show"] = True
@@ -115,11 +144,8 @@ def to_clash(proxy, meta_or_normal):
     if proxy["proto"] == "vmess":
         base["alterId"] = 0
         base["cipher"] = proxy["cipher"]
-    base["udp"] = True
-
-    base["skip-cert-verify"] = proxy["mode"] == "Fake"
 
-    base["network"] = proxy["transport"]
+    base["network"] = str(proxy["transport"])
 
     if base["network"] == "ws":
         base["ws-opts"] = {

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

@@ -94,7 +94,7 @@ class AllConfigsAPI(MethodView):
                 create_item(
                     "Clash Meta", "ALL", "", "", "", "",
                     # f"clashmeta://install-config?url={base_url}clash/meta/all.yml&name=mnormal_{c['db_domain'].alias or c['db_domain'].domain}-{c['asn']}-{c['mode']}&asn={c['asn']}&mode={c['mode']}"
-                    f"clash://install-config?url={base_url}clashmeta/?asn={c['asn']}#{config_name}"
+                    f"{base_url}clashmeta/?asn={c['asn']}#{config_name}"
                 )
             )
 
@@ -104,7 +104,7 @@ class AllConfigsAPI(MethodView):
                 create_item(
                     "Clash", "ALL", "Except VLess", "", "", "",
                     # f"clash://install-config?url={base_url}clash/all.yml&name=new_normal_{c['db_domain'].alias or c['db_domain'].domain}-{c['asn']}-{c['mode']}&asn={c['asn']}&mode={c['mode']}"
-                    f"clash://install-config?url={base_url}clash/?asn={c['asn']}#{config_name}"
+                    f"{base_url}clash/?asn={c['asn']}#{config_name}"
                 )
             )
 

hiddifypanel/panel/common.py

@@ -148,6 +148,8 @@ def init_app(app: APIFlask):
 
     @app.before_request
     def base_middleware():
+        if "generate_204" in request.path:
+            return "", 204
         if request.endpoint == 'static' or request.endpoint == "videos":
             return
 

hiddifypanel/panel/init_db.py

@@ -17,20 +17,7 @@ from loguru import logger
 MAX_DB_VERSION = 100
 
 
-def _v94(child_id):
-    set_hconfig(ConfigEnum.wireguard_noise_trick, "0-0")
-
-
-def _v93(child_id):
-    set_hconfig(ConfigEnum.quic_enable, True)
-    set_hconfig(ConfigEnum.splithttp_enable, True)
-
-
-def _v92(child_id):
-    db.session.bulk_save_objects(get_proxy_rows_v1())
-
-
-def _v90(child_id):
+def _v95(child_id):
     result = (
         db.session.query(
             DailyUsage.child_id,
@@ -67,6 +54,19 @@ def _v90(child_id):
     db.session.commit()
 
 
+def _v94(child_id):
+    set_hconfig(ConfigEnum.wireguard_noise_trick, "0-0")
+
+
+def _v93(child_id):
+    set_hconfig(ConfigEnum.quic_enable, True)
+    set_hconfig(ConfigEnum.splithttp_enable, True)
+
+
+def _v92(child_id):
+    db.session.bulk_save_objects(get_proxy_rows_v1())
+
+
 def _v89(child_id):
     set_hconfig(ConfigEnum.path_splithttp, hutils.random.get_random_string(7, 15))
     set_hconfig(ConfigEnum.splithttp_enable, False)

hiddifypanel/panel/usage.py

@@ -8,7 +8,7 @@ from hiddifypanel.models import *
 from hiddifypanel.panel import hiddify
 from hiddifypanel.database import db
 from hiddifypanel import cache, hutils
-
+from loguru import logger
 to_gig_d = 1024**3
 
 
@@ -23,6 +23,7 @@ def update_local_usage():
         return _add_users_usage(res, child_id=0)
     except Exception as e:
         cache.redis_client.set(lock_key, "locked", nx=False, ex=60)
+        logger.exception("Exception in update usage")
         raise
         return {"msg": f"Exception in update usage: {e}"}
 
@@ -46,9 +47,10 @@ def _reset_priodic_usage():
     # reset as soon as possible in the day
     if datetime.datetime.now().hour > 5 and current_time - last_usage_check < 60 * 60 * 24:
         return
-
+    logger.debug("reseting user usage if needed")
     for user in User.query.filter(User.mode != UserMode.no_reset).all():
         if user.user_should_reset():
+            logger.info(f"reseting user usage for {user.uuid}")
             user.reset_usage(commit=False)
     set_hconfig(ConfigEnum.last_priodic_usage_check, current_time)
 
@@ -67,6 +69,7 @@ def _add_users_usage(users_usage_data: Dict[User, Dict], child_id, sync=False):
     for adm in AdminUser.query.all():
         daily_usage[adm.id] = DailyUsage.query.filter(DailyUsage.date == today, DailyUsage.admin_id == adm.id, DailyUsage.child_id == child_id).first()
         if daily_usage[adm.id] is None:
+            logger.info(f"creating a new daily usage {today} admin={adm.id} child={child_id}")
             daily_usage[adm.id] = DailyUsage(admin_id=adm.id, child_id=child_id)
             db.session.add(daily_usage[adm.id])
             changes = True
@@ -90,7 +93,7 @@ def _add_users_usage(users_usage_data: Dict[User, Dict], child_id, sync=False):
 
         # Enable the user if isn't already
         if not before_enabled_users[user.uuid] and user.is_active:
-            print(f"Enabling disabled client {user.uuid} ")
+            logger.info(f"Enabling disabled client {user.uuid} ")
             user_driver.add_client(user)
             send_bot_message(user)
             have_change = True
@@ -129,7 +132,8 @@ def _add_users_usage(users_usage_data: Dict[User, Dict], child_id, sync=False):
         # Remove user from drivers(singbox, xray, wireguard etc.) if they're inactive
         # print(before_enabled_users[user.uuid], user.is_active)
         if before_enabled_users[user.uuid] and not user.is_active:
-            print(f"Removing enabled client {user.uuid} ")
+            logger.info(f"Removing enabled client {user.uuid} ")
+
             user_driver.remove_client(user)
             have_change = True
             res[user.uuid] = f"{res[user.uuid]} !OUT of USAGE! Client Removed"

hiddifypanel/panel/user/user.py

@@ -425,6 +425,9 @@ def add_headers(res, c, mimetype="text/plain"):
     resp.mimetype = mimetype
     resp.headers['Subscription-Userinfo'] = f"upload=0;download={c['usage_current_b']};total={c['usage_limit_b']};expire={c['expire_s']}"
     resp.headers['profile-web-page-url'] = request.base_url.rsplit('/', 1)[0].replace("http://", "https://") + "/"
+    # resp.headers['test-url'] = f"http://127.0.0.1:90/{hconfig(ConfigEnum.proxy_path_client)}/generate_204"
+    # resp.headers['test-url'] = f"http://{request.host}/{hconfig(ConfigEnum.proxy_path_client)}/generate_204"
+    # resp.headers['test-url'] = "http://connectivitycheck.gstatic.com/generate_204"
 
     if hconfig(ConfigEnum.branding_site):
         resp.headers['support-url'] = hconfig(ConfigEnum.branding_site)

hiddifypanel/translations/en/LC_MESSAGES/messages.po

@@ -1000,7 +1000,9 @@ msgstr ""
 "this time, please copy and save your Proxy links which are:"
 
 msgid "adminuser.force_update_usage"
-msgstr "adminuser.force_update_usage"
+msgstr ""
+"Every 6 minutes the usage is being updated. For updating it now <a "
+"href=\"%(link)s\" class=\"btn btn-info\">press here</a>"
 
 msgid "all"
 msgstr "All"
@@ -1015,13 +1017,17 @@ msgid "app.foxray.title"
 msgstr "FoXray"
 
 msgid "app.hiddify-clash-android.description"
-msgstr "app.hiddify-clash-android.description"
+msgstr ""
+"Hiddify Clash Android is one of our client apps which is not being updated "
+"any more. "
 
 msgid "app.hiddify-clash-android.title"
 msgstr "Hiddify Clash"
 
 msgid "app.hiddify-clash-desktop.description"
-msgstr "app.hiddify-clash-desktop.description"
+msgstr ""
+"Hiddify Clash Desktop is one of our client apps which is not being updated "
+"any more. "
 
 msgid "app.hiddify-clash-desktop.title"
 msgstr "Hiddify Clash"
@@ -1051,7 +1057,7 @@ msgid "app.loon.title"
 msgstr "Loon"
 
 msgid "app.nekobox.description"
-msgstr "app.nekobox.description"
+msgstr " Nekobox is a Sing-box based clients "
 
 msgid "app.nekobox.title"
 msgstr "NekoBox"
@@ -1875,7 +1881,7 @@ msgid "config.splithttp_enable.description"
 msgstr "This Protocol send and receive information in individual channels "
 
 msgid "config.splithttp_enable.label"
-msgstr "Split HTTP"
+msgstr "🈁 Split HTTP"
 
 msgid "config.ssfaketls.description"
 msgstr ""
@@ -1992,7 +1998,7 @@ msgstr ""
 "control over XRay proxy setup."
 
 msgid "config.sub_full_xray_json_enable.label"
-msgstr "XRay Full Config Link"
+msgstr "⚙️ XRay Full Config Link"
 
 msgid "config.sub_singbox_ssh_enable.description"
 msgstr "config.sub_singbox_ssh_enable.description"

hiddifypanel/translations/fa/LC_MESSAGES/messages.po

@@ -6,6 +6,8 @@ msgid ""
 " Search\n"
 "            Settings"
 msgstr ""
+" جستجو کردن\n"
+"تنظیمات"
 
 msgid "%(count)s records were successfully disabled."
 msgstr "%(count)s رکورد با موفقیت غیرفعال شد."
@@ -657,7 +659,7 @@ msgid "Root"
 msgstr "ریشه"
 
 msgid "Russia"
-msgstr ""
+msgstr "روسیه"
 
 msgid "Save"
 msgstr "ذخیره"
@@ -1004,12 +1006,16 @@ msgstr "FoXray"
 
 msgid "app.hiddify-clash-android.description"
 msgstr ""
+"Hiddify Clash Android یکی از برنامه های کلاینت ما است که دیگر به روز نمی "
+"شود. "
 
 msgid "app.hiddify-clash-android.title"
 msgstr "Hiddify Clash"
 
 msgid "app.hiddify-clash-desktop.description"
 msgstr ""
+"Hiddify Clash Desktop یکی از برنامه های کلاینت ما است که دیگر به روز نمی "
+"شود. "
 
 msgid "app.hiddify-clash-desktop.title"
 msgstr "Hiddify Clash"
@@ -1039,7 +1045,7 @@ msgid "app.loon.title"
 msgstr "Loon"
 
 msgid "app.nekobox.description"
-msgstr ""
+msgstr " Nekobox یک کلاینت مبتنی بر Sing-box است "
 
 msgid "app.nekobox.title"
 msgstr "NekoBox"
@@ -1874,7 +1880,7 @@ msgid "config.splithttp_enable.description"
 msgstr "این پروتکل اطلاعات را در کانال های جداگانه ارسال و دریافت می کند "
 
 msgid "config.splithttp_enable.label"
-msgstr "Split HTTP"
+msgstr "🈁 Split HTTP"
 
 msgid "config.ssfaketls.description"
 msgstr ""
@@ -1993,7 +1999,7 @@ msgstr ""
 " می کند."
 
 msgid "config.sub_full_xray_json_enable.label"
-msgstr "لینک پیکربندی کامل XRay"
+msgstr "⚙️ لینک پیکربندی کامل XRay"
 
 msgid "config.sub_singbox_ssh_enable.description"
 msgstr ""