webtap-tool 0.1.2__tar.gz → 0.1.3__tar.gz

{webtap_tool-0.1.2 → webtap_tool-0.1.3}/CHANGELOG.md

@@ -15,6 +15,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
+## [0.1.3] - 2025-09-05
+
+### Added
+- Multi-instance WebTap support with first-come-first-serve port management
+- `/instance` endpoint to show WebTap instance information (PID, connected page, events)
+- `/release` endpoint for graceful API port handoff between instances
+- Chrome extension "Switch WebTap Instance" button for managing multiple instances
+- Instance status display in extension popup showing PID and event count
+- Automatic reconnection in extension after instance switching
+
+### Changed
+- API server now checks port availability before starting (port 8765)
+- Chrome profile launch strategy uses bindfs mounting instead of symlinks
+- Service docstrings simplified (removed redundant "Internal service for" prefixes)
+- Added `api_thread` tracking to WebTapState for proper thread lifecycle management
+
+### Fixed
+- SQL numeric comparisons in query builder now use string comparison instead of CAST
+- Type annotations improved with proper union types (`threading.Thread | None`)
+- Network service HTTP status filtering uses string comparison to prevent SQL errors
+- Extension connection handling during instance transitions
+
+### Removed
+
 ## [0.1.2] - 2025-09-05
 
 ### Added

{webtap_tool-0.1.2 → webtap_tool-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webtap-tool
-Version: 0.1.2
+Version: 0.1.3
 Summary: Terminal-based web page inspector for AI debugging sessions
 Author-email: Fredrik Angelsen <fredrikangelsen@gmail.com>
 Classifier: Development Status :: 3 - Alpha

{webtap_tool-0.1.2 → webtap_tool-0.1.3}/extension/popup.html

@@ -150,6 +150,15 @@
 
     <div class="divider"></div>
 
+    <button
+      id="switchInstance"
+      style="width: 100%; font-size: 11px; margin-bottom: 8px"
+    >
+      Switch WebTap Instance
+    </button>
+
+    <div class="divider"></div>
+
     <div class="filter-section">
       <div
         style="

{webtap_tool-0.1.2 → webtap_tool-0.1.3}/extension/popup.js

@@ -25,6 +25,13 @@ async function loadPages() {
     return;
   }
 
+  // Also fetch instance info if available
+  const instanceInfo = await api("/instance");
+  if (instanceInfo && !instanceInfo.error) {
+    document.getElementById("switchInstance").title =
+      `PID: ${instanceInfo.pid} | Events: ${instanceInfo.events}`;
+  }
+
   const pages = result.pages || [];
   const select = document.getElementById("pageList");
 
@@ -247,6 +254,27 @@ document.getElementById("disableAllFilters").onclick = async () => {
   setTimeout(updateFilters, 100);
 };
 
+// Switch to a different WebTap instance
+document.getElementById("switchInstance").onclick = async () => {
+  const result = await api("/release", "POST");
+  if (!result.error) {
+    document.getElementById("status").innerHTML =
+      '<span style="color: #666">Port released. Start new WebTap.</span>';
+    // Disable controls until reconnected
+    document.getElementById("connect").disabled = true;
+    document.getElementById("disconnect").disabled = true;
+    document.getElementById("fetchToggle").disabled = true;
+    // Try to reconnect after delay
+    setTimeout(() => {
+      loadPages();
+      updateStatus();
+    }, 2000);
+  } else {
+    document.getElementById("status").innerHTML =
+      `<span class="error">Error: ${result.error}</span>`;
+  }
+};
+
 // Update all status from server - single source of truth
 async function updateStatus() {
   const status = await api("/status");

{webtap_tool-0.1.2 → webtap_tool-0.1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "webtap-tool"
-version = "0.1.2"
+version = "0.1.3"
 description = "Terminal-based web page inspector for AI debugging sessions"
 readme = "README.md"
 authors = [

{webtap_tool-0.1.2 → webtap_tool-0.1.3}/src/webtap/__init__.py

@@ -47,8 +47,12 @@ def main():
 def _start_api_server_safely():
     """Start API server with error handling."""
     try:
-        start_api_server(app.state)
-        logger.info("API server started on http://localhost:8765")
+        thread = start_api_server(app.state)
+        if thread and app.state:
+            app.state.api_thread = thread
+            logger.info("API server started on port 8765")
+        else:
+            logger.info("Port 8765 in use by another instance")
     except Exception as e:
         logger.warning(f"Failed to start API server: {e}")
 

{webtap_tool-0.1.2 → webtap_tool-0.1.3}/src/webtap/api.py

@@ -5,6 +5,8 @@ PUBLIC API:
 """
 
 import logging
+import os
+import socket
 import threading
 from typing import Any, Dict
 
@@ -184,7 +186,39 @@ async def disable_all_filters() -> Dict[str, Any]:
     return {"enabled": [], "total": 0}
 
 
-def start_api_server(state, host: str = "127.0.0.1", port: int = 8765):
+@api.get("/instance")
+async def get_instance_info() -> Dict[str, Any]:
+    """Get info about this WebTap instance."""
+    if not app_state:
+        return {"error": "WebTap not initialized"}
+
+    return {
+        "pid": os.getpid(),
+        "connected_to": app_state.cdp.current_page_title if app_state.cdp.is_connected else None,
+        "events": app_state.cdp.event_count,
+    }
+
+
+@api.post("/release")
+async def release_port() -> Dict[str, Any]:
+    """Release API port for another WebTap instance."""
+    logger.info("Releasing API port for another instance")
+
+    # Schedule graceful shutdown after response
+    def shutdown():
+        # Just set the flag to stop uvicorn, don't kill the whole process
+        global _shutdown_requested
+        _shutdown_requested = True
+
+    threading.Timer(0.5, shutdown).start()
+    return {"message": "Releasing port 8765"}
+
+
+# Flag to signal shutdown
+_shutdown_requested = False
+
+
+def start_api_server(state, host: str = "127.0.0.1", port: int = 8765) -> threading.Thread | None:
     """Start the API server in a background thread.
 
     Args:
@@ -193,8 +227,16 @@ def start_api_server(state, host: str = "127.0.0.1", port: int = 8765):
         port: Port to bind to. Defaults to 8765.
 
     Returns:
-        Thread instance running the server.
+        Thread instance running the server, or None if port is in use.
     """
+    # Check port availability first
+    try:
+        with socket.socket() as s:
+            s.bind((host, port))
+    except OSError:
+        logger.info(f"Port {port} already in use")
+        return None
+
     global app_state
     app_state = state
 
@@ -208,13 +250,39 @@ def start_api_server(state, host: str = "127.0.0.1", port: int = 8765):
 def run_server(host: str, port: int):
     """Run the FastAPI server in a thread."""
     try:
-        uvicorn.run(
+        config = uvicorn.Config(
             api,
             host=host,
             port=port,
             log_level="error",
             access_log=False,
         )
+        server = uvicorn.Server(config)
+
+        # Run with checking for shutdown flag
+        import asyncio
+
+        loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(loop)
+
+        async def serve():
+            await server.serve()
+
+        # Start serving
+        task = loop.create_task(serve())
+
+        # Check for shutdown flag
+        while not _shutdown_requested:
+            loop.run_until_complete(asyncio.sleep(0.1))
+            if task.done():
+                break
+
+        # Shutdown if requested
+        if _shutdown_requested:
+            logger.info("API server shutting down")
+            server.should_exit = True
+            loop.run_until_complete(server.shutdown())
+
     except Exception as e:
         logger.error(f"API server failed: {e}")
 

{webtap_tool-0.1.2 → webtap_tool-0.1.3}/src/webtap/app.py

@@ -6,6 +6,7 @@ PUBLIC API:
 """
 
 import sys
+import threading
 from dataclasses import dataclass, field
 
 from replkit2 import App
@@ -24,10 +25,12 @@ class WebTapState:
     Attributes:
         cdp: Chrome DevTools Protocol session instance.
         service: WebTapService orchestrating all domain services.
+        api_thread: Thread running the FastAPI server (if this instance owns the port).
     """
 
     cdp: CDPSession = field(default_factory=CDPSession)
     service: WebTapService = field(init=False)
+    api_thread: threading.Thread | None = None
 
     def __post_init__(self):
         """Initialize service with self reference after dataclass init."""

{webtap_tool-0.1.2 → webtap_tool-0.1.3}/src/webtap/cdp/query.py

@@ -74,7 +74,8 @@ def build_query(
                     pattern = value
                 path_conditions.append(f"json_extract_string(event, '{json_path}') LIKE '{pattern}'")
             elif isinstance(value, (int, float)):
-                path_conditions.append(f"CAST(json_extract_string(event, '{json_path}') AS NUMERIC) = {value}")
+                # Use string comparison for numeric values to avoid type conversion errors
+                path_conditions.append(f"json_extract_string(event, '{json_path}') = '{value}'")
             elif isinstance(value, bool):
                 path_conditions.append(f"json_extract_string(event, '{json_path}') = '{str(value).lower()}'")
             elif value is None:

{webtap_tool-0.1.2 → webtap_tool-0.1.3}/src/webtap/commands/launch.py

@@ -46,23 +46,9 @@ def run_chrome(state, detach: bool = True, port: int = 9222) -> dict:
             ],
         )
 
-    # Setup temp profile with symlinks to real profile
+    # Simple: use clean temp profile for debugging
     temp_config = Path("/tmp/webtap-chrome-debug")
-    real_config = Path.home() / ".config" / "google-chrome"
-
-    if not temp_config.exists():
-        temp_config.mkdir(parents=True)
-
-        # Symlink Default profile
-        default_profile = real_config / "Default"
-        if default_profile.exists():
-            (temp_config / "Default").symlink_to(default_profile)
-
-        # Copy essential files
-        for file in ["Local State", "First Run"]:
-            src = real_config / file
-            if src.exists():
-                (temp_config / file).write_text(src.read_text())
+    temp_config.mkdir(parents=True, exist_ok=True)
 
     # Launch Chrome
     cmd = [chrome_exe, f"--remote-debugging-port={port}", "--remote-allow-origins=*", f"--user-data-dir={temp_config}"]
@@ -74,7 +60,7 @@ def run_chrome(state, detach: bool = True, port: int = 9222) -> dict:
             details={
                 "Port": str(port),
                 "Mode": "Background (detached)",
-                "Profile": str(temp_config),
+                "Profile": "Temporary (clean)",
                 "Next step": "Run connect() to attach WebTap",
             },
         )

{webtap_tool-0.1.2 → webtap_tool-0.1.3}/src/webtap/services/body.py

@@ -12,7 +12,7 @@ logger = logging.getLogger(__name__)
 
 
 class BodyService:
-    """Internal service for response body fetching and caching."""
+    """Response body fetching and caching."""
 
     def __init__(self):
         """Initialize body service."""

{webtap_tool-0.1.2 → webtap_tool-0.1.3}/src/webtap/services/console.py

@@ -10,7 +10,7 @@ logger = logging.getLogger(__name__)
 
 
 class ConsoleService:
-    """Internal service for console event queries and monitoring."""
+    """Console event queries and monitoring."""
 
     def __init__(self):
         """Initialize console service."""

{webtap_tool-0.1.2 → webtap_tool-0.1.3}/src/webtap/services/fetch.py

@@ -13,7 +13,7 @@ logger = logging.getLogger(__name__)
 
 
 class FetchService:
-    """Internal service for fetch interception with explicit actions."""
+    """Fetch interception with explicit actions."""
 
     def __init__(self):
         """Initialize fetch service."""

{webtap_tool-0.1.2 → webtap_tool-0.1.3}/src/webtap/services/network.py

@@ -10,7 +10,7 @@ logger = logging.getLogger(__name__)
 
 
 class NetworkService:
-    """Internal service for network event queries and monitoring."""
+    """Network event queries and monitoring."""
 
     def __init__(self):
         """Initialize network service."""
@@ -81,7 +81,7 @@ class NetworkService:
             json_extract_string(event, '$.params.response.statusText') as StatusText
         FROM events 
         WHERE json_extract_string(event, '$.method') = 'Network.responseReceived'
-        AND CAST(json_extract_string(event, '$.params.response.status') AS INTEGER) >= 400
+        AND json_extract_string(event, '$.params.response.status') >= '400'
         ORDER BY rowid DESC LIMIT {limit}
         """
 

{webtap_tool-0.1.2 → webtap_tool-0.1.3}/src/webtap/services/setup.py

@@ -177,22 +177,32 @@ class SetupService:
             }
 
         wrapper_script = """#!/bin/bash
-# Chrome wrapper to always enable debugging
+# Chrome wrapper using bindfs for perfect state sync with debug port
 
-REAL_CONFIG="$HOME/.config/google-chrome"
-DEBUG_CONFIG="/tmp/chrome-debug-profile"
+DEBUG_DIR="$HOME/.config/google-chrome-debug"
+REAL_DIR="$HOME/.config/google-chrome"
 
-if [ ! -d "$DEBUG_CONFIG" ]; then
-    mkdir -p "$DEBUG_CONFIG"
-    ln -sf "$REAL_CONFIG/Default" "$DEBUG_CONFIG/Default"
-    cp "$REAL_CONFIG/Local State" "$DEBUG_CONFIG/" 2>/dev/null || true
-    cp "$REAL_CONFIG/First Run" "$DEBUG_CONFIG/" 2>/dev/null || true
+# Check if bindfs is installed
+if ! command -v bindfs &>/dev/null; then
+    echo "Error: bindfs not installed. Install with: yay -S bindfs" >&2
+    exit 1
 fi
 
+# Mount real profile via bindfs if not already mounted
+if ! mountpoint -q "$DEBUG_DIR" 2>/dev/null; then
+    mkdir -p "$DEBUG_DIR"
+    if ! bindfs --no-allow-other "$REAL_DIR" "$DEBUG_DIR"; then
+        echo "Error: Failed to mount Chrome profile via bindfs" >&2
+        exit 1
+    fi
+    echo "Chrome debug profile mounted. To unmount: fusermount -u $DEBUG_DIR" >&2
+fi
+
+# Launch Chrome with debugging on bindfs mount
 exec /usr/bin/google-chrome-stable \\
     --remote-debugging-port=9222 \\
-    --remote-allow-origins=* \\
-    --user-data-dir="$DEBUG_CONFIG" \\
+    --remote-allow-origins='*' \\
+    --user-data-dir="$DEBUG_DIR" \\
     "$@"
 """