fix: Refactor host handling in Node class and add utility functions for URL formatting

Author: ImMohammad20000

PasarGuardNodeBridge/__init__.py

@@ -12,10 +12,10 @@
 - Extensible with custom metadata via the `extra` argument
 
 Author: PasarGuard
-Version: 0.3.3
+Version: 0.3.4
 """
 
-__version__ = "0.3.3"
+__version__ = "0.3.4"
 __author__ = "PasarGuard"
 
 

PasarGuardNodeBridge/grpclib.py

@@ -11,7 +11,7 @@
 from PasarGuardNodeBridge.common import service_grpc
 from PasarGuardNodeBridge.common import service_pb2 as service
 from PasarGuardNodeBridge.controller import Health, NodeAPIError
-from PasarGuardNodeBridge.utils import grpc_to_http_status
+from PasarGuardNodeBridge.utils import format_host_for_url, grpc_to_http_status
 
 
 class Node(PasarGuardNode):
@@ -28,11 +28,18 @@ def __init__(
         default_timeout: int = 10,
         internal_timeout: int = 15,
     ):
-        service_url = f"https://{address.strip('/')}:{api_port}/"
+        host_for_url = format_host_for_url(address)
+        service_url = f"https://{host_for_url}:{api_port}/"
+        print(f"Service URL: {service_url}")
         super().__init__(server_ca, api_key, service_url, name, extra, logger, default_timeout, internal_timeout)
 
         try:
-            self.channel = Channel(host=address, port=port, ssl=self.ctx, config=Configuration(_keepalive_timeout=10))
+            self.channel = Channel(
+                host=address,
+                port=port,
+                ssl=self.ctx,
+                config=Configuration(_keepalive_timeout=10),
+            )
             self._client = service_grpc.NodeServiceStub(self.channel)
             self._metadata = {"x-api-key": api_key}
         except Exception as e:

PasarGuardNodeBridge/rest.py

@@ -9,6 +9,7 @@
 from PasarGuardNodeBridge.abstract_node import PasarGuardNode
 from PasarGuardNodeBridge.common import service_pb2 as service
 from PasarGuardNodeBridge.controller import Health, NodeAPIError
+from PasarGuardNodeBridge.utils import format_host_for_url
 
 
 class Node(PasarGuardNode):
@@ -25,10 +26,11 @@ def __init__(
         default_timeout: int = 10,
         internal_timeout: int = 15,
     ):
-        service_url = f"https://{address.strip('/')}:{api_port}/"
+        host_for_url = format_host_for_url(address)
+        service_url = f"https://{host_for_url}:{api_port}/"
         super().__init__(server_ca, api_key, service_url, name, extra, logger, default_timeout, internal_timeout)
 
-        url = f"https://{address.strip('/')}:{port}/"
+        url = f"https://{host_for_url}:{port}/"
         self._client = httpx.AsyncClient(
             http2=True,
             verify=self.ctx,

PasarGuardNodeBridge/utils.py

@@ -1,5 +1,6 @@
 from grpclib.const import Status
 from http import HTTPStatus
+from ipaddress import ip_address
 
 from PasarGuardNodeBridge.common.service_pb2 import User, Proxy, Vmess, Vless, Trojan, Shadowsocks
 
@@ -46,3 +47,90 @@ def grpc_to_http_status(grpc_status: Status) -> int:
         Status.DATA_LOSS: HTTPStatus.INTERNAL_SERVER_ERROR.value,
     }
     return mapping.get(grpc_status, HTTPStatus.INTERNAL_SERVER_ERROR.value)
+
+
+def normalize_host(address: str) -> str:
+    """
+    Normalize a host/address string for socket connections by stripping
+    whitespace, schemes, paths, surrounding brackets, and ports.
+    """
+    raw = address.strip()
+    if not raw:
+        return ""
+
+    # Drop scheme if provided
+    if "://" in raw:
+        raw = raw.split("://", 1)[1]
+
+    # Normalize slashes and remove path/query/fragment
+    raw = raw.lstrip("/")
+    for sep in ("#", "?"):
+        if sep in raw:
+            raw = raw.split(sep, 1)[0]
+    if "/" in raw:
+        raw = raw.split("/", 1)[0]
+
+    # Drop optional credentials (user:pass@host)
+    if "@" in raw:
+        raw = raw.rsplit("@", 1)[1]
+
+    host = raw
+
+    # Bracketed IPv6 literal
+    if host.startswith("["):
+        end = host.find("]")
+        if end != -1:
+            host = host[1:end]
+        else:
+            host = host[1:]
+
+    # Pure IP literal
+    try:
+        parsed_ip = ip_address(host)
+        return parsed_ip.compressed
+    except ValueError:
+        pass
+
+    # IPv6 literal with inline port but without brackets
+    if host.count(":") >= 2:
+        maybe_host, maybe_port = host.rsplit(":", 1)
+        if maybe_port.isdigit():
+            try:
+                parsed_ip = ip_address(maybe_host)
+                return parsed_ip.compressed
+            except ValueError:
+                pass
+        # Looks IPv6-like; return as-is without trying to strip further
+        return host
+
+    # Hostname/IPv4 with port (single colon)
+    if ":" in host:
+        maybe_host, maybe_port = host.rsplit(":", 1)
+        if maybe_port.isdigit():
+            host = maybe_host
+
+    return host
+
+
+def format_host_for_url(address: str) -> str:
+    """
+    Format a host/address for inclusion in an HTTP URL.
+
+    - IPv6 addresses are wrapped in brackets.
+    - Hosts with multiple colons (IPv6-like) are bracketed to avoid port confusion.
+    - IPv4/hostnames are returned unchanged (after normalization).
+    """
+    host = normalize_host(address)
+    if not host:
+        return ""
+    try:
+        parsed = ip_address(host)
+        if parsed.version == 6:
+            return f"[{parsed.compressed}]"
+        return parsed.compressed
+    except ValueError:
+        # If it looks like an IPv6 literal (multiple colons) but ipaddress failed,
+        # still bracket it so URL parsing won't treat parts as a port.
+        if host.count(":") >= 2:
+            return f"[{host}]"
+        return host

examples/example.py

@@ -4,6 +4,7 @@
 
 address = "172.27.158.135"
 port = 2096
+api_port = 2097
 server_ca_file = "certs/ssl_cert.pem"
 config_file = "config/xray.json"
 api_key = "d04d8680-942d-4365-992f-9f482275691d"
@@ -24,6 +25,7 @@ async def main():
         connection=Bridge.NodeType.grpc,
         address=address,
         port=port,
+        api_port=api_port,
         server_ca=server_ca_content,
         api_key=api_key,
         extra={"id": 1},

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pasarguard-node-bridge"
-version = "0.3.3"
+version = "0.3.4"
 description = "python package to connect your project with PasarGuard node go"
 url = "https://github.com/PasarGuard/node_bridge_py"
 keywords = [