hiddifypanel 10.80.0.dev14__py3-none-any.whl → 10.80.0.dev16__py3-none-any.whl

hiddifypanel/VERSION

@@ -1 +1 @@
-10.80.0.dev14
+10.80.0.dev16

hiddifypanel/VERSION.py

@@ -2,5 +2,5 @@ import importlib.metadata
 from datetime import datetime
 
 __version__ = importlib.metadata.version(__package__ or __name__)
-__release_time__= datetime.strptime('2024-11-18T03:24:43','%Y-%m-%dT%H:%M:%S')
+__release_time__= datetime.strptime('2024-12-09T01:13:52','%Y-%m-%dT%H:%M:%S')
 is_released_version=True

hiddifypanel/hutils/proxy/__init__.py

@@ -3,3 +3,4 @@ from . import xray
 from . import xrayjson
 from . import singbox
 from . import clash
+from . import wireguard

hiddifypanel/hutils/proxy/wireguard.py

@@ -0,0 +1,34 @@
+
+def generate_wireguard_config(proxy: dict) -> str:
+    """
+    Generates a WireGuard configuration from a given proxy dictionary.
+
+    Args:
+        proxy (dict): Dictionary containing WireGuard and proxy details.
+
+    Returns:
+        str: A WireGuard configuration string.
+    """
+    name=f'{proxy["extra_info"]} {proxy["name"]}'
+    addrs = f"{proxy['wg_ipv4']}/32"
+    if proxy['wg_ipv6']:
+        addrs += f", {proxy['wg_ipv6']}/128"
+    config = f"""[Interface]
+# Name = {name}
+Address= {addrs}
+PrivateKey = {proxy["wg_pk"]}
+MTU = {proxy.get("mtu", 1380)}
+DNS = {proxy.get("dns", "1.1.1.1")}
+
+[Peer]
+# Name = Public Peer for {name}
+Endpoint = {proxy["server"]}:{proxy["port"]}
+PublicKey = {proxy["wg_server_pub"]}
+PresharedKey = {proxy['wg_psk']}
+#PersistentKeepalive = {proxy.get("keep_alive", 25)}
+"""
+
+#Address = {proxy.get("wg_ipv4", "0.0.0.0/32")}
+#AllowedIPs = {proxy.get("allowed_ips", "0.0.0.0/0")}
+
+    return config

hiddifypanel/models/config.py

@@ -153,7 +153,10 @@ def add_or_update_config(commit: bool = True, child_id: int | None = None, overr
     if child_id is None:
         child_id = Child.current().id
     c = config['key']
-    ckey = ConfigEnum(c)
+    try:
+        ckey = ConfigEnum(c)
+    except:
+        return
     if c == ConfigEnum.unique_id and not override_unique_id:
         return
 

hiddifypanel/panel/admin/DomainAdmin.py

@@ -281,7 +281,8 @@ class DomainAdmin(AdminLTEModelView):
         # Skip validation for wildcard or empty domains
         if model.domain.startswith('*') or not model.domain:
             return True
-        
+        if model.mode in [DomainType.fake, DomainType.reality, DomainType.relay]:
+            return True
         # Resolve domain IPs with timeout
         try:
             dips = hutils.network.get_domain_ips(model.domain, timeout=10)

hiddifypanel/panel/admin/QuickSetup.py

@@ -72,7 +72,7 @@ def get_lang_form(empty=False):
             default=hconfig(ConfigEnum.admin_lang))
         # lang=wtf.SelectField(_("config.lang.label"),choices=[("en",_("lang.en")),("fa",_("lang.fa"))],description=_("config.lang.description"),default=hconfig(ConfigEnum.lang))
         country = wtf.SelectField(
-            _("config.country.label"), choices=[("ir", _("Iran")), ("zh", _("China")), ("other", "Others")],
+            _("config.country.label"), choices=[("ir", _("Iran")), ("zh", _("China")), ("ru", _("Russia")),  ("other", "Others")],
             description=_("config.country.description"),
             default=hconfig(ConfigEnum.country))
         lang_submit = wtf.SubmitField(_('Submit'))

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/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()