hyperbrowser 0.90.2__tar.gz → 0.90.3__tar.gz

{hyperbrowser-0.90.2 → hyperbrowser-0.90.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyperbrowser
-Version: 0.90.2
+Version: 0.90.3
 Summary: Python SDK for hyperbrowser
 License: MIT
 License-File: LICENSE

{hyperbrowser-0.90.2 → hyperbrowser-0.90.3}/hyperbrowser/client/managers/sandboxes/shared.py

@@ -17,6 +17,7 @@ from ....sandbox_common import (
     RUNTIME_SESSION_REFRESH_BUFFER_MS,
     normalize_network_error,
     parse_error_payload,
+    runtime_base_url_session_id,
 )
 
 DEFAULT_WATCH_TIMEOUT_MS = 60_000
@@ -84,13 +85,31 @@ def _normalize_exec_params(
     return _normalize_legacy_process_fields(normalized)
 
 
+def _resolve_sandbox_runtime_session_host(runtime, base_url) -> str:
+    session_id_from_base_path = runtime_base_url_session_id(base_url.path)
+    if session_id_from_base_path and base_url.hostname:
+        return f"{session_id_from_base_path}.{base_url.hostname}"
+
+    runtime_host = str(getattr(runtime, "host", "") or "").strip()
+    if runtime_host:
+        parsed_host = urlsplit(runtime_host)
+        if parsed_host.hostname:
+            session_id_from_host_path = runtime_base_url_session_id(parsed_host.path)
+            if session_id_from_host_path:
+                return f"{session_id_from_host_path}.{parsed_host.hostname}"
+            return parsed_host.hostname
+        return runtime_host
+
+    return base_url.hostname or ""
+
+
 def _build_sandbox_exposed_url(runtime, port: int) -> str:
     parsed = urlsplit(runtime.base_url)
-    hostname = parsed.hostname
-    if not hostname:
+    session_host = _resolve_sandbox_runtime_session_host(runtime, parsed)
+    if not session_host:
         return runtime.base_url
 
-    exposed_host = f"{port}-{hostname}"
+    exposed_host = f"{port}-{session_host}"
     netloc = exposed_host
     if parsed.port:
         netloc = f"{netloc}:{parsed.port}"
@@ -100,9 +119,7 @@ def _build_sandbox_exposed_url(runtime, port: int) -> str:
             credentials = f"{credentials}:{parsed.password}"
         netloc = f"{credentials}@{netloc}"
 
-    path = parsed.path or "/"
-
-    return urlunsplit((parsed.scheme, netloc, path, parsed.query, parsed.fragment))
+    return urlunsplit((parsed.scheme, netloc, "/", "", ""))
 
 
 def _expires_within_buffer(expires_at: Optional[datetime]) -> bool:

{hyperbrowser-0.90.2 → hyperbrowser-0.90.3}/hyperbrowser/sandbox_common.py

@@ -114,13 +114,61 @@ def has_scheme(value: str) -> bool:
     return "://" in value
 
 
+def runtime_base_url_session_id(runtime_base_url: str) -> Optional[str]:
+    parsed_base_url = urlsplit(runtime_base_url.strip())
+    segments = [
+        segment
+        for segment in parsed_base_url.path.strip().strip("/").split("/")
+        if segment
+    ]
+    if len(segments) < 2 or segments[0] != "sandbox" or not segments[1].strip():
+        return None
+    return segments[1].strip()
+
+
+def should_prepend_sandbox_to_runtime_api(runtime_base_url: str) -> bool:
+    return runtime_base_url_session_id(runtime_base_url) is None
+
+
+def normalize_runtime_api_path(pathname: str, prepend_sandbox: bool) -> str:
+    trimmed = pathname.strip()
+    if trimmed == "":
+        return "/sandbox" if prepend_sandbox else "/"
+
+    absolute = trimmed if trimmed.startswith("/") else f"/{trimmed}"
+    if prepend_sandbox:
+        if absolute == "/sandbox" or absolute.startswith("/sandbox/"):
+            return absolute
+        return f"/sandbox{absolute}"
+
+    if absolute == "/sandbox":
+        return "/"
+    if absolute.startswith("/sandbox/"):
+        return f"/{absolute[len('/sandbox/'):]}"
+    return absolute
+
+
+def normalize_runtime_relative_path(base_url: str, path: str) -> str:
+    trimmed = path.strip()
+    if trimmed == "":
+        return ""
+
+    parsed_path = urlsplit(trimmed)
+    prepend_sandbox = should_prepend_sandbox_to_runtime_api(base_url)
+    normalized_path = normalize_runtime_api_path(parsed_path.path, prepend_sandbox)
+    relative_path = normalized_path.lstrip("/")
+    return urlunsplit(
+        ("", "", relative_path, parsed_path.query, parsed_path.fragment)
+    )
+
+
 def resolve_runtime_transport_target(
     base_url: str,
     path: str,
     runtime_proxy_override: Optional[str] = None,
 ) -> RuntimeTransportTarget:
     normalized_base = base_url if base_url.endswith("/") else f"{base_url}/"
-    url = urljoin(normalized_base, path.lstrip("/"))
+    url = urljoin(normalized_base, normalize_runtime_relative_path(base_url, path))
 
     if not runtime_proxy_override:
         return RuntimeTransportTarget(url=url)
@@ -151,7 +199,7 @@ def to_websocket_transport_target(
     runtime_proxy_override: Optional[str] = None,
 ) -> RuntimeTransportTarget:
     normalized_base = base_url if base_url.endswith("/") else f"{base_url}/"
-    url = urljoin(normalized_base, path.lstrip("/"))
+    url = urljoin(normalized_base, normalize_runtime_relative_path(base_url, path))
     parts = urlsplit(url)
     scheme = parts.scheme
     if scheme == "https":

{hyperbrowser-0.90.2 → hyperbrowser-0.90.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "hyperbrowser"
-version = "0.90.2"
+version = "0.90.3"
 description = "Python SDK for hyperbrowser"
 authors = ["Nikhil Shahi <nshahi1998@gmail.com>"]
 license = "MIT"