devlinker 1.4.2__tar.gz → 1.4.4__tar.gz

{devlinker-1.4.2 → devlinker-1.4.4}/MANIFEST.in

@@ -1,3 +1,2 @@
 include devlinker/devlinker_loader_instant.html
-include devlinker/devlinker_loader_minimal.html
 include devlinker/devlinker_loader_snippet.html

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devlinker
-Version: 1.4.2
+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
@@ -130,6 +130,7 @@ If DevLinker helps you ship faster, consider supporting the project:
 - `devlinker support` — Show UPI support QR code in terminal
 - `devlinker --url` — Start with public tunnel (Cloudflare/ngrok)
 - `devlinker share` — Enable public tunnel at runtime (no restart)
+- `devlinker share --proxy-port 18000` — Enable public tunnel for a custom proxy port
 - `devlinker unshare` — Disable public tunnel at runtime
 - `devlinker doctor` — Diagnose issues, see categorized problems and fixes
 - `devlinker fix` — Auto-fix common issues (env, API paths, config)
@@ -278,14 +279,16 @@ devlinker --docker
 
 ## Tunnel and Sharing Modes
 
-By default, DevLinker starts **fast local proxy only** (no tunnel). To enable a public tunnel, use the `--url` flag:
+By default, DevLinker starts **fast local proxy only** (no tunnel). It prints a LAN URL when it can detect a local network interface, and you can share that link with devices on the same Wi-Fi/LAN.
+
+For access from another network, start with a public tunnel using the `--url` flag:
 
 
 ```bash
 devlinker --url
 ```
 
-This will start the proxy and open a public tunnel (Cloudflare or ngrok). The output will show:
+This starts the proxy and opens a public tunnel (Cloudflare or ngrok). The output will show:
 
 ```text
 🌍 Enabling public tunnel...
@@ -296,6 +299,20 @@ This will start the proxy and open a public tunnel (Cloudflare or ngrok). The ou
 ℹ Share this link with collaborators.
 ```
 
+If you already started DevLinker and want to turn on sharing without restarting, use:
+
+```bash
+devlinker share
+```
+
+If you use a custom proxy port, pass it explicitly:
+
+```bash
+devlinker share --proxy-port 18000
+```
+
+If your friend is on the same Wi-Fi/LAN, use the printed LAN URL like `http://192.168.x.x:<proxy-port>`. If they are outside your network, use the public tunnel URL instead.
+
 To force tunnel off (even if --url is passed):
 
 ```bash

{devlinker-1.4.2 → devlinker-1.4.4}/README.md

@@ -110,6 +110,7 @@ If DevLinker helps you ship faster, consider supporting the project:
 - `devlinker support` — Show UPI support QR code in terminal
 - `devlinker --url` — Start with public tunnel (Cloudflare/ngrok)
 - `devlinker share` — Enable public tunnel at runtime (no restart)
+- `devlinker share --proxy-port 18000` — Enable public tunnel for a custom proxy port
 - `devlinker unshare` — Disable public tunnel at runtime
 - `devlinker doctor` — Diagnose issues, see categorized problems and fixes
 - `devlinker fix` — Auto-fix common issues (env, API paths, config)
@@ -258,14 +259,16 @@ devlinker --docker
 
 ## Tunnel and Sharing Modes
 
-By default, DevLinker starts **fast local proxy only** (no tunnel). To enable a public tunnel, use the `--url` flag:
+By default, DevLinker starts **fast local proxy only** (no tunnel). It prints a LAN URL when it can detect a local network interface, and you can share that link with devices on the same Wi-Fi/LAN.
+
+For access from another network, start with a public tunnel using the `--url` flag:
 
 
 ```bash
 devlinker --url
 ```
 
-This will start the proxy and open a public tunnel (Cloudflare or ngrok). The output will show:
+This starts the proxy and opens a public tunnel (Cloudflare or ngrok). The output will show:
 
 ```text
 🌍 Enabling public tunnel...
@@ -276,6 +279,20 @@ This will start the proxy and open a public tunnel (Cloudflare or ngrok). The ou
 ℹ Share this link with collaborators.
 ```
 
+If you already started DevLinker and want to turn on sharing without restarting, use:
+
+```bash
+devlinker share
+```
+
+If you use a custom proxy port, pass it explicitly:
+
+```bash
+devlinker share --proxy-port 18000
+```
+
+If your friend is on the same Wi-Fi/LAN, use the printed LAN URL like `http://192.168.x.x:<proxy-port>`. If they are outside your network, use the public tunnel URL instead.
+
 To force tunnel off (even if --url is passed):
 
 ```bash

{devlinker-1.4.2 → 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.2 → devlinker-1.4.4}/devlinker/main.py

@@ -33,7 +33,7 @@ except ImportError:  # pragma: no cover - fallback when rich is unavailable
 
 from . import __version__
 from .detector import check_port, detect_ports, is_vite_port
-from .proxy import start_proxy
+from .proxy import start_proxy, wait_for_proxy_startup
 from .runner import detect_backend_port, start_servers
 from .tunnel import start_tunnel
 from .doctor import doctor
@@ -43,6 +43,7 @@ from .share import share, unshare
 from .config import load_config
 from .inspect import inspect
 from .monitor import monitor
+from .global_state import STATE
 
 SUPPORT_UPI_ID = "devlinker@upi"
 SUPPORT_UPI_LINK = "upi://pay?pa=devlinker@upi&pn=DevLinker&cu=INR&tn=Support%20DevLinker%20Project%20🚀"
@@ -408,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):
@@ -427,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):
@@ -602,6 +603,7 @@ def _run_proxy(
         )
 
     proxy_port = _select_proxy_port(proxy_port)
+    STATE["proxy_port"] = proxy_port
     _write_frontend_api_env(proxy_port)
 
     if not live_status:
@@ -619,8 +621,10 @@ def _run_proxy(
         enable_debug_logs=debug,
     )
 
-    # Allow proxy thread to bind before opening tunnel.
-    time.sleep(1)
+    if not wait_for_proxy_startup(timeout=5.0):
+        raise click.ClickException(
+            f"Proxy failed to start on port {proxy_port}. Check whether the port is already in use."
+        )
 
     if live_status:
         live_status.update("Proxy", f"✔ Active ({proxy_port})", style="green")

{devlinker-1.4.2 → 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
@@ -26,6 +27,7 @@ _printed_fixes = set()
 _printed_live_header = False
 LIVE_REQUEST_LOGGING_ENABLED = False
 MAX_RECENT_REQUESTS = 200
+PROXY_READY_EVENT = threading.Event()
 
 
 def _format_request_context(path: str, method: str | None, status: int, target: str) -> str:
@@ -66,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
@@ -175,6 +190,7 @@ def _apply_cors_headers(headers: Dict[str, str], request: Request) -> Dict[str,
 async def _on_startup() -> None:
     global HTTP_CLIENT
     HTTP_CLIENT = httpx.AsyncClient(timeout=15.0, follow_redirects=False)
+    PROXY_READY_EVENT.set()
 
 
 @app.on_event("shutdown")
@@ -183,6 +199,7 @@ async def _on_shutdown() -> None:
     if HTTP_CLIENT is not None:
         await HTTP_CLIENT.aclose()
         HTTP_CLIENT = None
+    PROXY_READY_EVENT.clear()
 
 
 def _connection_header_tokens(headers: Dict[str, str]) -> set[str]:
@@ -210,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",
@@ -720,9 +738,16 @@ def start_proxy(
     BACKEND = backend_port
     LIVE_REQUEST_LOGGING_ENABLED = enable_debug_logs
     _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()
+
+
+def wait_for_proxy_startup(timeout: float = 5.0) -> bool:
+    return PROXY_READY_EVENT.wait(timeout)

devlinker-1.4.4/devlinker/share.py

@@ -0,0 +1,64 @@
+import click
+import requests
+
+from devlinker.global_state import STATE
+from devlinker.tunnel import start_tunnel
+
+
+_COMMON_PROXY_PORTS = (8000, 8001, 8002, 8003, 8004, 8005, 8006, 8007, 8008, 8009, 8010, 18000)
+
+
+def _is_devlinker_proxy(port: int) -> bool:
+    try:
+        response = requests.get(f"http://127.0.0.1:{port}/__devlinker/dashboard", timeout=0.5)
+    except requests.RequestException:
+        return False
+    return response.status_code == 200 and "API Logs Dashboard" in response.text
+
+
+def _resolve_proxy_port(requested_port: int | None) -> int:
+    if requested_port is not None:
+        if _is_devlinker_proxy(requested_port):
+            return requested_port
+        raise click.ClickException(
+            f"No DevLinker proxy is running on port {requested_port}. Start devlinker first, or pass the correct --proxy-port."
+        )
+
+    for candidate in _COMMON_PROXY_PORTS:
+        if _is_devlinker_proxy(candidate):
+            return candidate
+
+    raise click.ClickException(
+        "No running DevLinker proxy was found. Start devlinker first, or pass --proxy-port <port>."
+    )
+
+@click.command()
+@click.option("--proxy-port", type=int, default=None, help="Proxy port to tunnel. Auto-detect when omitted.")
+def share(proxy_port: int | None):
+    """Enable public tunnel at runtime (no restart)."""
+    if STATE["tunnel"]:
+        click.secho("⚠️ Already shared", fg="yellow")
+        return
+    try:
+        resolved_proxy_port = _resolve_proxy_port(proxy_port)
+        STATE["proxy_port"] = resolved_proxy_port
+        provider, url = start_tunnel(resolved_proxy_port)
+        STATE["tunnel"] = url
+        click.secho("\n🌍 Public Sharing Enabled\n" + ("─" * 24), fg="green", bold=True)
+        click.secho("✔ Tunnel connected", fg="green")
+        click.secho(f"\nPublic URL:\n{url}\n", fg="cyan", bold=True)
+        click.secho("📤 Share this link with your team", fg="magenta")
+    except Exception as exc:
+        click.secho(f"[WARN] Tunnel failed: {exc}", fg="red")
+        click.secho("[INFO] Next step: install cloudflared or configure ngrok auth.", fg="yellow")
+
+@click.command()
+def unshare():
+    """Disable public tunnel at runtime (no restart)."""
+    if not STATE["tunnel"]:
+        click.secho("⚠️ No active tunnel", fg="yellow")
+        return
+    from devlinker.tunnel import stop_tunnel
+    stop_tunnel()
+    STATE["tunnel"] = None
+    click.secho("🛑 Sharing stopped", fg="red", bold=True)

{devlinker-1.4.2 → 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.2 → devlinker-1.4.4/devlinker.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devlinker
-Version: 1.4.2
+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
@@ -130,6 +130,7 @@ If DevLinker helps you ship faster, consider supporting the project:
 - `devlinker support` — Show UPI support QR code in terminal
 - `devlinker --url` — Start with public tunnel (Cloudflare/ngrok)
 - `devlinker share` — Enable public tunnel at runtime (no restart)
+- `devlinker share --proxy-port 18000` — Enable public tunnel for a custom proxy port
 - `devlinker unshare` — Disable public tunnel at runtime
 - `devlinker doctor` — Diagnose issues, see categorized problems and fixes
 - `devlinker fix` — Auto-fix common issues (env, API paths, config)
@@ -278,14 +279,16 @@ devlinker --docker
 
 ## Tunnel and Sharing Modes
 
-By default, DevLinker starts **fast local proxy only** (no tunnel). To enable a public tunnel, use the `--url` flag:
+By default, DevLinker starts **fast local proxy only** (no tunnel). It prints a LAN URL when it can detect a local network interface, and you can share that link with devices on the same Wi-Fi/LAN.
+
+For access from another network, start with a public tunnel using the `--url` flag:
 
 
 ```bash
 devlinker --url
 ```
 
-This will start the proxy and open a public tunnel (Cloudflare or ngrok). The output will show:
+This starts the proxy and opens a public tunnel (Cloudflare or ngrok). The output will show:
 
 ```text
 🌍 Enabling public tunnel...
@@ -296,6 +299,20 @@ This will start the proxy and open a public tunnel (Cloudflare or ngrok). The ou
 ℹ Share this link with collaborators.
 ```
 
+If you already started DevLinker and want to turn on sharing without restarting, use:
+
+```bash
+devlinker share
+```
+
+If you use a custom proxy port, pass it explicitly:
+
+```bash
+devlinker share --proxy-port 18000
+```
+
+If your friend is on the same Wi-Fi/LAN, use the printed LAN URL like `http://192.168.x.x:<proxy-port>`. If they are outside your network, use the public tunnel URL instead.
+
 To force tunnel off (even if --url is passed):
 
 ```bash

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "devlinker"
-version = "1.4.2"
+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" }

devlinker-1.4.2/devlinker/share.py

@@ -1,32 +0,0 @@
-
-import click
-from devlinker.global_state import STATE
-from devlinker.tunnel import start_tunnel
-
-@click.command()
-def share():
-    """Enable public tunnel at runtime (no restart)."""
-    if STATE["tunnel"]:
-        click.secho("⚠️ Already shared", fg="yellow")
-        return
-    try:
-        provider, url = start_tunnel(STATE["proxy_port"])
-        STATE["tunnel"] = url
-        click.secho("\n🌍 Public Sharing Enabled\n" + ("─" * 24), fg="green", bold=True)
-        click.secho("✔ Tunnel connected", fg="green")
-        click.secho(f"\nPublic URL:\n{url}\n", fg="cyan", bold=True)
-        click.secho("📤 Share this link with your team", fg="magenta")
-    except Exception as exc:
-        click.secho(f"[WARN] Tunnel failed: {exc}", fg="red")
-        click.secho("[INFO] Next step: install cloudflared or configure ngrok auth.", fg="yellow")
-
-@click.command()
-def unshare():
-    """Disable public tunnel at runtime (no restart)."""
-    if not STATE["tunnel"]:
-        click.secho("⚠️ No active tunnel", fg="yellow")
-        return
-    from devlinker.tunnel import stop_tunnel
-    stop_tunnel()
-    STATE["tunnel"] = None
-    click.secho("🛑 Sharing stopped", fg="red", bold=True)