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

hiddifypanel/panel/node/test_pb2.pyi

@@ -0,0 +1,17 @@
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from typing import ClassVar as _ClassVar, Optional as _Optional
+
+DESCRIPTOR: _descriptor.FileDescriptor
+
+class HelloRequest(_message.Message):
+    __slots__ = ("req",)
+    REQ_FIELD_NUMBER: _ClassVar[int]
+    req: str
+    def __init__(self, req: _Optional[str] = ...) -> None: ...
+
+class HelloResponse(_message.Message):
+    __slots__ = ("res",)
+    RES_FIELD_NUMBER: _ClassVar[int]
+    res: str
+    def __init__(self, res: _Optional[str] = ...) -> None: ...

hiddifypanel/panel/node/test_pb2_grpc.py

@@ -0,0 +1,97 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
+"""Client and server classes corresponding to protobuf-defined services."""
+import grpc
+import warnings
+
+from hiddifypanel.panel.node import test_pb2 as hiddifypanel_dot_panel_dot_node_dot_test__pb2
+
+GRPC_GENERATED_VERSION = '1.67.1'
+GRPC_VERSION = grpc.__version__
+_version_not_supported = False
+
+try:
+    from grpc._utilities import first_version_is_lower
+    _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
+except ImportError:
+    _version_not_supported = True
+
+if _version_not_supported:
+    raise RuntimeError(
+        f'The grpc package installed is at version {GRPC_VERSION},'
+        + f' but the generated code in hiddifypanel/panel/node/test_pb2_grpc.py depends on'
+        + f' grpcio>={GRPC_GENERATED_VERSION}.'
+        + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
+        + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
+    )
+
+
+class HelloStub(object):
+    """Missing associated documentation comment in .proto file."""
+
+    def __init__(self, channel):
+        """Constructor.
+
+        Args:
+            channel: A grpc.Channel.
+        """
+        self.SayHello = channel.unary_unary(
+                '/Hello/SayHello',
+                request_serializer=hiddifypanel_dot_panel_dot_node_dot_test__pb2.HelloRequest.SerializeToString,
+                response_deserializer=hiddifypanel_dot_panel_dot_node_dot_test__pb2.HelloResponse.FromString,
+                )
+
+
+class HelloServicer(object):
+    """Missing associated documentation comment in .proto file."""
+
+    def SayHello(self, request, context):
+        """Missing associated documentation comment in .proto file."""
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+
+def add_HelloServicer_to_server(servicer, server):
+    rpc_method_handlers = {
+            'SayHello': grpc.unary_unary_rpc_method_handler(
+                    servicer.SayHello,
+                    request_deserializer=hiddifypanel_dot_panel_dot_node_dot_test__pb2.HelloRequest.FromString,
+                    response_serializer=hiddifypanel_dot_panel_dot_node_dot_test__pb2.HelloResponse.SerializeToString,
+            ),
+    }
+    generic_handler = grpc.method_handlers_generic_handler(
+            'Hello', rpc_method_handlers)
+    server.add_generic_rpc_handlers((generic_handler,))
+    server.add_registered_method_handlers('Hello', rpc_method_handlers)
+
+
+ # This class is part of an EXPERIMENTAL API.
+class Hello(object):
+    """Missing associated documentation comment in .proto file."""
+
+    @staticmethod
+    def SayHello(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/Hello/SayHello',
+            hiddifypanel_dot_panel_dot_node_dot_test__pb2.HelloRequest.SerializeToString,
+            hiddifypanel_dot_panel_dot_node_dot_test__pb2.HelloResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            )

hiddifypanel/panel/usage.py

@@ -11,16 +11,18 @@ from hiddifypanel import cache, hutils
 from loguru import logger
 to_gig_d = 1024**3
 
+from celery import shared_task
 
+@shared_task(ignore_result=False)
 def update_local_usage():
     lock_key = "lock-update-local-usage"
     if not cache.redis_client.set(lock_key, "locked", nx=True, ex=600):
         return {"msg": "last update task is not finished yet."}
     try:
-        res = user_driver.get_users_usage(reset=True)
-        # cache.redis_client.delete(lock_key)
+        res=update_local_usage_not_lock()
         cache.redis_client.set(lock_key, "locked", nx=False, ex=60)
-        return _add_users_usage(res, child_id=0)
+        
+        return res
     except Exception as e:
         cache.redis_client.set(lock_key, "locked", nx=False, ex=60)
         logger.exception("Exception in update usage")
@@ -28,6 +30,14 @@ def update_local_usage():
         return {"msg": f"Exception in update usage: {e}"}
 
     # return {"status": 'success', "comments":res}
+def update_local_usage_not_lock():
+    
+    try:
+        res = user_driver.get_users_usage(reset=True)
+        return _add_users_usage(res, child_id=0)
+    except Exception as e:
+        raise
+        
 
 
 def add_users_usage_uuid(uuids_bytes: Dict[str, Dict], child_id, sync=False):

hiddifypanel/panel/user/templates/base_singbox_config.json.j2

@@ -49,6 +49,22 @@
             "download_detour": "bypass"
             }
             {%endif%}
+            {%if hconfig(ConfigEnum.country)=="ru"%}
+            {
+                "tag": "geosite-ru",
+                "type": "remote",
+                "format": "binary",
+                "url": "https:\/\/github.com\/SagerNet\/sing-geosite\/raw\/rule-set\/geosite-category-ru.srs",
+                "download_detour": "bypass" 
+            },
+            {
+            "tag": "geoip-ru",
+            "type": "remote",
+            "format": "binary",
+            "url": "https:\/\/github.com\/SagerNet\/sing-geoip\/raw\/rule-set\/geoip-ru.srs",
+            "download_detour": "bypass"
+            }
+            {%endif%}
             {# {
                 "tag": "geosite-category-ads-all",
                 "type": "remote",

hiddifypanel/panel/user/templates/home/home.html

@@ -404,8 +404,7 @@
     {{_("Check again")}}
 </button>
 {%- endmacro -%}
-{{modal("country-alarm-modal",_("Turn of VPN"),_("You should visit this page without VPN. Your country=%(your_country)s
-expected=%(expected_country)s",your_country=country,expected_country=hconfig(ConfigEnum.country)),footer=reload(),show=True)}}
+{{modal("country-alarm-modal",_("Turn of VPN"),_("vpn.notallowed",your_country=country,expected_country=hconfig(ConfigEnum.country)),footer=reload(),show=True)}}
 {% endif %}
 
 

hiddifypanel/panel/user/templates/home/multi.html

@@ -404,8 +404,7 @@
     {{_("Check again")}}
 </button>
 {%- endmacro -%}
-{{modal("country-alarm-modal",_("Turn of VPN"),_("You should visit this page without VPN. Your country=%(your_country)s
-expected=%(expected_country)s",your_country=country,expected_country=hconfig(ConfigEnum.country)),footer=reload(),show=True)}}
+{{modal("country-alarm-modal",_("Turn of VPN"),_("vpn.notallowed,your_country=country,expected_country=hconfig(ConfigEnum.country)),footer=reload(),show=True)}}
 {% endif %}
 
 

hiddifypanel/panel/user/user.py

@@ -21,6 +21,12 @@ class UserView(FlaskView):
     def index(self):
         return self.auto_sub()
 
+    @route('/ua')
+    def user_agent(self):
+        ua= str(g.user_agent)+"\n"+str(request.user_agent)
+        print(ua)
+        return ua
+
     def auto_sub(self):
         if g.user_agent['is_browser']:
             return self.new()
@@ -86,27 +92,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()
@@ -266,7 +260,7 @@ Endpoint = {next(iter(servers))}:61339 #{servers}
         if request.method == 'HEAD':
             resp = ""
         else:
-            resp = render_template('singbox_config.json', **c, host_keys=hutils.proxy.get_ssh_hostkeys(True),
+            resp = render_template('singbox_config.json', **c, host_keys=hutils.proxy.get_ssh_hostkeys(get_hconfigs(),True),
                                    ssh_client_version=hiddify.get_ssh_client_version(user), ssh_ip=hutils.network.get_direct_host_or_ip(4), base64=False)
 
         return add_headers(resp, c)

hiddifypanel/translations/en/LC_MESSAGES/messages.po

@@ -219,6 +219,9 @@ msgstr ""
 "Domain can not be resolved! There is a problem in your domain. Please check "
 "your Domain configurations."
 
+msgid "Domain cannot be resolved! Please check DNS settings"
+msgstr "Domain cannot be resolved! Please check DNS settings"
+
 msgid "Domain is not REALITY friendly!"
 msgstr "Domain is Not REALITY Friendly!"
 
@@ -425,7 +428,7 @@ msgstr ""
 
 msgid "It will override the root admin to the current user"
 msgstr ""
-"It will override the owner admin of the backup file to the current user"
+"It will override the owner admin of the backup file to the current admin."
 
 msgid ""
 "Join our Hiddify Telegram channel to get the latest updates on Hiddify."
@@ -445,7 +448,7 @@ msgid "Max Active Users"
 msgstr "Max Active Users"
 
 msgid "Max IPs"
-msgstr "Max IPs"
+msgstr "Max IPs (xray only)"
 
 msgid "Max Users"
 msgstr "Max Users"
@@ -535,13 +538,6 @@ msgstr ""
 "Please connect your Telegram account to the panel to be informed about "
 "latest news"
 
-msgid ""
-"Please connect your telegram accout to the panel to be informed about latest"
-" news."
-msgstr ""
-"Please connect your Telegram account to the panel to know the latest Status "
-"of your Subscription"
-
 msgid "Please create an issue on Github."
 msgstr "Please create an issue on Github"
 
@@ -614,6 +610,9 @@ msgstr "RAM"
 msgid "REALITY Fallback domain is not compaitble with server names!"
 msgstr "REALITY Fallback Domain is not compaitble with Server names!"
 
+msgid "REALITY Fallback domain is not compatible with server names!"
+msgstr "REALITY Fallback domain is not compatible with server names!"
+
 msgid "Release"
 msgstr "✅ Release"
 
@@ -719,6 +718,9 @@ msgstr "📦 SingBox"
 msgid "Sort by %(name)s"
 msgstr "Sort by %(name)s"
 
+msgid "Specifying CDN IP is only valid for CDN mode"
+msgstr "Specifying CDN IP is only valid for CDN mode"
+
 msgid "Start Date"
 msgstr "Start Date"
 
@@ -784,7 +786,7 @@ msgid "Upload File"
 msgstr "Upload File"
 
 msgid "Use HiddifyNext:"
-msgstr "Use HiddifyNext:"
+msgstr "Use Hiddify:"
 
 msgid "User activated!"
 msgstr "User Activated"
@@ -860,13 +862,6 @@ msgstr ""
 msgid "You have used this domain in: "
 msgstr "You have already used this Domain in: "
 
-msgid ""
-"You should visit this page without VPN. Your country=%(your_country)s\n"
-"expected=%(expected_country)s"
-msgstr ""
-"You should visit this page without VPN Your Country =%(your_country)s\n"
-"Expected=%(expected_country)s"
-
 msgid ""
 "Your hiddify instance information \n"
 "Domain: {} \n"
@@ -1001,7 +996,7 @@ msgstr ""
 
 msgid "adminuser.force_update_usage"
 msgstr ""
-"Every 6 minutes the usage is being updated. For updating it now <a "
+"ℹ️ 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"
@@ -1068,6 +1063,12 @@ msgstr "Shadowrocket Description"
 msgid "app.shadowrocket.title"
 msgstr "Shadowrocket"
 
+msgid "app.singbox.description"
+msgstr "Sing-box app is the official app for Sing-box protocol."
+
+msgid "app.singbox.title"
+msgstr "Sing-box app"
+
 msgid "app.stash.description"
 msgstr "Stash Description"
 
@@ -1407,7 +1408,7 @@ msgstr "☑️ Allow HTTP Connection"
 msgid "config.httpupgrade_enable.description"
 msgstr ""
 "<p>HTTPUpgrade complete a HTTP 1.1 Upgrade request and response before using the connection directly. It is similar to WebSocket in the way it create an direction channel that can be forwarded by many reverse proxies and CDNs, without the need to deal with all the issue around WebSocket Protocol itself.<br />\n"
-"⚠️ <strong>Not Available in Xray based Clients. Only HiddifyNext, Singbox, and V2fly clients are supported.</strong>&nbsp;<a href=\"https://hiddify.com/manager/basic-concepts-and-troubleshooting/Basic-Concepts/#http-upgrade\" target=\"_blank\"><strong>(Read More)</strong></a></p>"
+"⚠️ <strong>Not Available in Xray based Clients. Only <p><a href=\"https://app.hiddify.com\" target=\"_blank\">Hiddify</a></p>, Singbox, and V2fly clients are supported.</strong>&nbsp;<a href=\"https://hiddify.com/manager/basic-concepts-and-troubleshooting/Basic-Concepts/#http-upgrade\" target=\"_blank\"><strong>(Read More)</strong></a></p>"
 
 msgid "config.httpupgrade_enable.label"
 msgstr "🆙 HTTPUpgrade Method"
@@ -1486,7 +1487,9 @@ msgid "config.kcp_ports.label"
 msgstr "KCP Ports"
 
 msgid "config.lang.description"
-msgstr "Choose Language For Users Area"
+msgstr ""
+"Select the language for the user interface to personalize your experience in"
+" the user area."
 
 msgid "config.lang.label"
 msgstr "🗺️ User Area Language"
@@ -1541,10 +1544,11 @@ msgstr "⬆️ MUX Brutal Upload (mbps)"
 
 msgid "config.mux_enable.description"
 msgstr ""
-"<p>Mux needs compatible clients. Mux in Hiddify Next and Singbox are not "
-"compatible with XRay.&nbsp;<a href=\"https://hiddify.com/manager/basic-"
-"concepts-and-troubleshooting/How-MUX-works-and-its-usage/\" "
-"target=\"_blank\">(Read More)</a></p>"
+"<p>Mux needs compatible clients. Mux in <p><a "
+"href=\"https://app.hiddify.com\" target=\"_blank\">Hiddify</a></p> and "
+"Singbox are not compatible with XRay.&nbsp;<a "
+"href=\"https://hiddify.com/manager/basic-concepts-and-troubleshooting/How-"
+"MUX-works-and-its-usage/\" target=\"_blank\">(Read More)</a></p>"
 
 msgid "config.mux_enable.label"
 msgstr "Ⓜ️ MUX (⚠️ Incompatible With Some Clients)"
@@ -1652,10 +1656,10 @@ msgid "config.path_httpupgrade.label"
 msgstr "ℹ️ HTTP Upgrade Path"
 
 msgid "config.path_splithttp.description"
-msgstr "This option defines the Path for Split HTTP"
+msgstr "config.path_splithttp.description"
 
 msgid "config.path_splithttp.label"
-msgstr "ℹ️ Path for Split HTTP"
+msgstr "config.path_splithttp.label"
 
 msgid "config.path_ss.description"
 msgstr "Shadowsocks Path in the Links"
@@ -1699,6 +1703,12 @@ msgstr "Specify the Websocket Path"
 msgid "config.path_ws.label"
 msgstr "ℹ️ Path of Websocket Requests"
 
+msgid "config.path_xhttp.description"
+msgstr "This option defines the Path for Split HTTP"
+
+msgid "config.path_xhttp.label"
+msgstr "ℹ️ Path for Split HTTP"
+
 msgid "config.proxies.description"
 msgstr "Define specific proxy settings"
 
@@ -1878,10 +1888,10 @@ msgid "config.speed_test.label"
 msgstr "🚀 Speed Test"
 
 msgid "config.splithttp_enable.description"
-msgstr "This Protocol send and receive information in individual channels "
+msgstr "config.splithttp_enable.description"
 
 msgid "config.splithttp_enable.label"
-msgstr "🈁 Split HTTP"
+msgstr "config.splithttp_enable.label"
 
 msgid "config.ssfaketls.description"
 msgstr ""
@@ -1915,6 +1925,54 @@ msgstr ""
 msgid "config.ssh.label"
 msgstr "SSH Proxy"
 
+msgid "config.ssh_host_dsa_pk.description"
+msgstr "config.ssh_host_dsa_pk.description"
+
+msgid "config.ssh_host_dsa_pk.label"
+msgstr "config.ssh_host_dsa_pk.label"
+
+msgid "config.ssh_host_dsa_pub.description"
+msgstr "config.ssh_host_dsa_pub.description"
+
+msgid "config.ssh_host_dsa_pub.label"
+msgstr "config.ssh_host_dsa_pub.label"
+
+msgid "config.ssh_host_ecdsa_pk.description"
+msgstr "config.ssh_host_ecdsa_pk.description"
+
+msgid "config.ssh_host_ecdsa_pk.label"
+msgstr "config.ssh_host_ecdsa_pk.label"
+
+msgid "config.ssh_host_ecdsa_pub.description"
+msgstr "config.ssh_host_ecdsa_pub.description"
+
+msgid "config.ssh_host_ecdsa_pub.label"
+msgstr "config.ssh_host_ecdsa_pub.label"
+
+msgid "config.ssh_host_ed25519_pk.description"
+msgstr "config.ssh_host_ed25519_pk.description"
+
+msgid "config.ssh_host_ed25519_pk.label"
+msgstr "config.ssh_host_ed25519_pk.label"
+
+msgid "config.ssh_host_ed25519_pub.description"
+msgstr "config.ssh_host_ed25519_pub.description"
+
+msgid "config.ssh_host_ed25519_pub.label"
+msgstr "config.ssh_host_ed25519_pub.label"
+
+msgid "config.ssh_host_rsa_pk.description"
+msgstr "config.ssh_host_rsa_pk.description"
+
+msgid "config.ssh_host_rsa_pk.label"
+msgstr "config.ssh_host_rsa_pk.label"
+
+msgid "config.ssh_host_rsa_pub.description"
+msgstr "config.ssh_host_rsa_pub.description"
+
+msgid "config.ssh_host_rsa_pub.label"
+msgstr "config.ssh_host_rsa_pub.label"
+
 msgid "config.ssh_server_enable.description"
 msgstr "SSH Proxy is completely different than original SSH Server"
 
@@ -2268,8 +2326,7 @@ msgstr "WireGuard"
 msgid "config.wireguard_enable.description"
 msgstr ""
 "<p>WireGuard is UDP based protocol. (⚠️ It is Working In <a "
-"href=\"https://github.com/hiddify/hiddify-next\" target=\"_blank\">Hiddify "
-"Next</a>)</p>"
+"href=\"https://app.hiddify.com/\" target=\"_blank\">Hiddify</a>)</p>"
 
 msgid "config.wireguard_enable.label"
 msgstr "🐉 WireGuard"
@@ -2318,6 +2375,14 @@ msgstr "Websocket creates a tunnel over HTTP that is useful to be used in CDN"
 msgid "config.ws_enable.label"
 msgstr "🔰 Websocket"
 
+msgid "config.xhttp_enable.description"
+msgstr ""
+"<p>This Protocol send and receive information in individual channels.<br />\n"
+"⚠️ <strong>Not Supported in SignBox based Clients. Only <p><a href=\"https://app.hiddify.com\" target=\"_blank\">Hiddify</a></p> App, and XRay base Clients are supported.</strong></p>"
+
+msgid "config.xhttp_enable.label"
+msgstr "🈁 Split HTTP"
+
 msgid "config.xtls_enable.description"
 msgstr "Enables XTLS Protocol"
 
@@ -2444,6 +2509,15 @@ msgstr "☑️ Python : Low Performance"
 msgid "log"
 msgstr "📄 Log"
 
+msgid "login.button"
+msgstr "Login"
+
+msgid "login.password.description"
+msgstr "For extra security, you need to enter your password."
+
+msgid "login.password.label"
+msgstr "Password"
+
 msgid "login.secret.description"
 msgstr "For getting access to this page, please enter your secret code (UUID)"
 
@@ -2889,12 +2963,33 @@ msgstr "Last Usage Date Reset"
 msgid "user.name"
 msgstr "Name"
 
+msgid "user.password.description"
+msgstr ""
+"The password will be used for extra secutiry. You can only login to the "
+"HiddifyManager after entering your password."
+
+msgid "user.password.title"
+msgstr "Password"
+
+msgid "user.password.validation-lenght"
+msgstr ""
+"Your password must be at least 8 characters long for enhanced security."
+
+msgid "user.password.validation-required"
+msgstr "Password is required. Please enter your password to continue."
+
 msgid "user.usage_limit_GB"
 msgstr "⌛️ Usage Limit (GB)"
 
 msgid "user.user_links"
 msgstr "User Links"
 
+msgid "vpn.notallowed"
+msgstr ""
+"Please visit this page without using a VPN. You need to access it from the "
+"country %(expected_country)s, but you're currently accessing it from "
+"%(your_country)s."
+
 msgid "weekly"
 msgstr "📅 Weekly"