devlinker 1.4.3__tar.gz → 1.4.4__tar.gz

{devlinker-1.4.3/devlinker.egg-info → devlinker-1.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devlinker
-Version: 1.4.3
+Version: 1.4.4
 Summary: A lightweight proxy that combines your frontend and backend into one link for easy development and sharing.
 Author-email: Mani <mani1028@users.noreply.github.com>
 Requires-Python: >=3.7

{devlinker-1.4.3 → devlinker-1.4.4}/devlinker/detector.py

@@ -15,7 +15,7 @@ DEFAULT_BACKEND_PROBE_PATHS = (
 
 def check_port(
     port: int,
-    timeout: float = 1.0,
+    timeout: float = 0.4,
     probe_paths: Iterable[str] = DEFAULT_BACKEND_PROBE_PATHS,
 ) -> bool:
     """Return True when an HTTP service is reachable on localhost:port.
@@ -53,7 +53,7 @@ def check_port(
     return False
 
 
-def is_vite_port(port: int, timeout: float = 1.0) -> bool:
+def is_vite_port(port: int, timeout: float = 0.4) -> bool:
     """Return True when port looks like a Vite dev server."""
     for host in ("localhost", "127.0.0.1"):
         try:
@@ -95,8 +95,8 @@ def _ordered_unique_ports(*port_groups: Iterable[int]) -> list[int]:
 def detect_ports(
     frontend: Optional[int] = None,
     backend: Optional[int] = None,
-    retries: int = 12,
-    delay_seconds: float = 1.0,
+    retries: int = 16,
+    delay_seconds: float = 0.5,
 ) -> Tuple[Optional[int], Optional[int]]:
     """Detect frontend and backend ports with retry support for slow startups."""
     frontend_ports = _ordered_unique_ports(

{devlinker-1.4.3 → devlinker-1.4.4}/devlinker/main.py

@@ -409,8 +409,8 @@ def _wait_for_readiness(
     label: str,
     port: int,
     checker,
-    retries: int = 15,
-    delay_seconds: float = 1.0,
+    retries: int = 20,
+    delay_seconds: float = 0.5,
 ) -> bool:
     _ui_status("⏳", f"Waiting for {label} ({port})...", style="cyan")
     for attempt in range(1, retries + 1):
@@ -428,8 +428,8 @@ def _wait_for_readiness_live(
     port: int,
     checker,
     live_status: _LiveStatus,
-    retries: int = 15,
-    delay_seconds: float = 1.0,
+    retries: int = 20,
+    delay_seconds: float = 0.5,
 ) -> bool:
     live_status.update(label, f"⏳ Waiting ({port})...", style="cyan")
     for attempt in range(1, retries + 1):

{devlinker-1.4.3 → devlinker-1.4.4}/devlinker/proxy.py

@@ -2,9 +2,10 @@ from __future__ import annotations
 
 import asyncio
 import os
+import sys
 import time
 from typing import Dict, Optional
-from urllib.parse import urlencode
+from urllib.parse import parse_qsl, urlencode, urlsplit
 
 import httpx
 import uvicorn
@@ -67,6 +68,19 @@ def _extract_presented_token(headers: Dict[str, str], query_params) -> str | Non
     query_token = query_params.get("dl_token")
     if query_token:
         return query_token
+
+    # WebSocket handshakes may not include dl_token in the WS URL, but the
+    # browser Referer usually contains the original page URL query string.
+    referer = headers.get("referer", "").strip()
+    if referer:
+        try:
+            referer_query = dict(parse_qsl(urlsplit(referer).query, keep_blank_values=True))
+            referer_token = (referer_query.get("dl_token") or "").strip()
+            if referer_token:
+                return referer_token
+        except ValueError:
+            pass
+
     direct_header = headers.get("x-devlinker-token", "").strip()
     if direct_header:
         return direct_header
@@ -213,6 +227,7 @@ def _filter_websocket_headers(incoming: Dict[str, str]) -> Dict[str, str]:
     connection_tokens = _connection_header_tokens(incoming)
     excluded = HOP_BY_HOP_HEADERS | connection_tokens | {
         "host",
+        "origin",
         "sec-websocket-key",
         "sec-websocket-version",
         "sec-websocket-extensions",
@@ -725,10 +740,12 @@ def start_proxy(
     _printed_live_header = False
     PROXY_READY_EVENT.clear()
 
-    thread = threading.Thread(
-        target=lambda: uvicorn.run(app, host="0.0.0.0", port=proxy_port, log_level="warning"),
-        daemon=True,
-    )
+    def _run_server() -> None:
+        if sys.platform.startswith("win") and hasattr(asyncio, "WindowsSelectorEventLoopPolicy"):
+            asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
+        uvicorn.run(app, host="0.0.0.0", port=proxy_port, log_level="warning")
+
+    thread = threading.Thread(target=_run_server, daemon=True)
     thread.start()
 
 

{devlinker-1.4.3 → devlinker-1.4.4}/devlinker/tunnel.py

@@ -20,8 +20,11 @@ def stop_tunnel():
     _CLOUDFLARED_PROCESSES.clear()
 
 import re
+import queue
 import shutil
 import subprocess
+import threading
+import time
 from subprocess import TimeoutExpired
 
 from pyngrok import ngrok
@@ -56,33 +59,53 @@ def _try_cloudflare(proxy_port: int, startup_timeout: float = 12.0) -> str | Non
         text=True,
     )
 
-    output = ""
-    try:
-        stdout, _ = process.communicate(timeout=startup_timeout)
-        output = stdout or ""
-    except TimeoutExpired as exc:
-        # exc.stdout and exc.stderr may be str, bytes, bytearray, or memoryview; convert to str
-        def to_str(val):
-            if isinstance(val, str):
-                return val
-            if isinstance(val, (bytes, bytearray)):
-                return val.decode(errors="replace")
-            if isinstance(val, memoryview):
-                return val.tobytes().decode(errors="replace")
-            return str(val) if val is not None else ""
-        exc_stdout = to_str(exc.stdout)
-        exc_stderr = to_str(exc.stderr)
-        output = exc_stdout + exc_stderr
-
-    if not isinstance(output, str):
-        output = str(output)
+    # Read cloudflared logs incrementally so we can return as soon as the URL appears.
+    output_queue: queue.Queue[str | None] = queue.Queue()
+
+    def _reader() -> None:
+        stream = process.stdout
+        if stream is None:
+            output_queue.put(None)
+            return
+        try:
+            for line in stream:
+                output_queue.put(line)
+        finally:
+            output_queue.put(None)
 
+    threading.Thread(target=_reader, daemon=True).start()
+
+    output = ""
+    deadline = time.monotonic() + max(startup_timeout, 0.1)
+    stream_closed = False
+    while time.monotonic() < deadline:
+        try:
+            chunk = output_queue.get(timeout=0.1)
+        except queue.Empty:
+            chunk = ""
+
+        if chunk is None:
+            stream_closed = True
+            break
+        if chunk:
+            output += chunk
+            url = _extract_trycloudflare_url(output)
+            if url:
+                _CLOUDFLARED_PROCESSES.append(process)
+                return url
+
+        if process.poll() is not None and output_queue.empty():
+            break
+
+    # One final parse pass before treating startup as failed.
     url = _extract_trycloudflare_url(output)
     if url:
         _CLOUDFLARED_PROCESSES.append(process)
         return url
 
-    process.terminate()
+    if not stream_closed and process.poll() is None:
+        process.terminate()
+
     return None
 
 

{devlinker-1.4.3 → devlinker-1.4.4/devlinker.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devlinker
-Version: 1.4.3
+Version: 1.4.4
 Summary: A lightweight proxy that combines your frontend and backend into one link for easy development and sharing.
 Author-email: Mani <mani1028@users.noreply.github.com>
 Requires-Python: >=3.7

{devlinker-1.4.3 → devlinker-1.4.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "devlinker"
-version = "1.4.3"
+version = "1.4.4"
 description = "A lightweight proxy that combines your frontend and backend into one link for easy development and sharing."
 authors = [
     { name = "Mani", email = "mani1028@users.noreply.github.com" }