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

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

@@ -15,6 +15,52 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
+## [0.1.4] - 2025-09-08
+
+### Added
+- Request timeout handling (3 seconds) in Chrome extension for better error detection
+- Comprehensive `cleanup()` method for proper resource management on exit
+- `atexit` registration to ensure cleanup happens even on unexpected termination
+
+### Changed
+- **API Consolidation**: Merged `/pages` and `/instance` endpoints into single `/info` endpoint
+- Enhanced `/status` endpoint to include fetch details inline (eliminates separate API call)
+- Improved error messages in extension to distinguish between timeout, server not running, and other failures
+- API server shutdown now uses `asyncio.run()` for proper task cleanup
+
+### Fixed
+- Graceful shutdown issue that left zombie tasks with "Task was destroyed but it is pending" error
+- API server cleanup on application exit now properly cancels all async tasks
+- Extension error handling now provides specific feedback for different failure modes
+
+### Removed
+- `/instance` endpoint (functionality merged into `/info`)
+- `/fetch/paused` endpoint (data now included in `/status` response)
+
+## [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.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webtap-tool
-Version: 0.1.2
+Version: 0.1.4
 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.4}/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.4}/extension/popup.js

@@ -1,14 +1,28 @@
 // API helper - communicate with WebTap service
 async function api(endpoint, method = "GET", body = null) {
   try {
-    const opts = { method };
+    const opts = { 
+      method,
+      // Add timeout to detect unresponsive server faster
+      signal: AbortSignal.timeout(3000)
+    };
     if (body) {
       opts.headers = { "Content-Type": "application/json" };
       opts.body = JSON.stringify(body);
     }
     const resp = await fetch(`http://localhost:8765${endpoint}`, opts);
+    if (!resp.ok) {
+      return { error: `HTTP ${resp.status}: ${resp.statusText}` };
+    }
     return await resp.json();
   } catch (e) {
+    // Better error messages
+    if (e.name === 'AbortError') {
+      return { error: "WebTap not responding (timeout)" };
+    }
+    if (e.message.includes('Failed to fetch')) {
+      return { error: "WebTap not running" };
+    }
     return { error: e.message };
   }
 }
@@ -17,15 +31,20 @@ async function api(endpoint, method = "GET", body = null) {
 
 // Load available pages from WebTap
 async function loadPages() {
-  const result = await api("/pages");
-
-  if (result.error) {
+  // Use combined /info endpoint for single round trip
+  const info = await api("/info");
+  
+  if (info.error) {
     document.getElementById("pageList").innerHTML =
-      "<option disabled>WebTap not running</option>";
+      `<option disabled>${info.error === "WebTap not initialized" ? "WebTap not running" : "Error loading pages"}</option>`;
     return;
   }
 
-  const pages = result.pages || [];
+  // Update instance info tooltip
+  document.getElementById("switchInstance").title =
+    `PID: ${info.pid} | Events: ${info.events}`;
+
+  const pages = info.pages || [];
   const select = document.getElementById("pageList");
 
   select.innerHTML = "";
@@ -247,6 +266,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");
@@ -268,13 +308,12 @@ async function updateStatus() {
       document.getElementById("status").innerHTML =
         `<span class="connected">Connected</span> - Events: ${status.events}`;
 
-      // Get fetch details if enabled
-      if (status.fetch_enabled) {
-        const fetchDetails = await api("/fetch/paused");
+      // Use fetch details from enhanced status (no extra API call needed)
+      if (status.fetch_enabled && status.fetch_details) {
         updateFetchStatus(
           true,
-          status.paused_requests || 0,
-          fetchDetails.response_stage || false,
+          status.fetch_details.paused_count || 0,
+          status.fetch_details.response_stage || false,
         );
       } else {
         updateFetchStatus(false);

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

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

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

@@ -9,6 +9,7 @@ PUBLIC API:
   - main: Entry point function for CLI
 """
 
+import atexit
 import sys
 import logging
 
@@ -45,10 +46,17 @@ def main():
 
 
 def _start_api_server_safely():
-    """Start API server with error handling."""
+    """Start API server with error handling and cleanup registration."""
     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")
+
+            # Register cleanup to shut down API server on exit
+            atexit.register(lambda: app.state.cleanup() if app.state else None)
+        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.4}/src/webtap/api.py

@@ -5,6 +5,8 @@ PUBLIC API:
 """
 
 import logging
+import os
+import socket
 import threading
 from typing import Any, Dict
 
@@ -48,22 +50,54 @@ api.add_middleware(
 app_state = None
 
 
-@api.get("/pages")
-async def list_pages() -> Dict[str, Any]:
-    """List available Chrome pages for extension selection."""
+@api.get("/health")
+async def health_check() -> Dict[str, Any]:
+    """Quick health check endpoint for extension."""
+    return {"status": "ok", "pid": os.getpid()}
+
+
+@api.get("/info")
+async def get_info() -> Dict[str, Any]:
+    """Combined endpoint for pages and instance info - reduces round trips."""
     if not app_state:
-        return {"error": "WebTap not initialized", "pages": []}
+        return {"error": "WebTap not initialized", "pages": [], "pid": os.getpid()}
 
-    return app_state.service.list_pages()
+    # Get pages
+    pages_data = app_state.service.list_pages()
+
+    # Get instance info
+    connected_to = None
+    if app_state.cdp.is_connected and app_state.cdp.page_info:
+        connected_to = app_state.cdp.page_info.get("title", "Untitled")
+
+    return {
+        "pid": os.getpid(),
+        "connected_to": connected_to,
+        "events": app_state.service.event_count,
+        "pages": pages_data.get("pages", []),
+        "error": pages_data.get("error"),
+    }
 
 
 @api.get("/status")
 async def get_status() -> Dict[str, Any]:
-    """Get current connection status and event count."""
+    """Get comprehensive status including connection, events, and fetch details."""
     if not app_state:
         return {"connected": False, "error": "WebTap not initialized", "events": 0}
 
-    return app_state.service.get_status()
+    status = app_state.service.get_status()
+
+    # Add fetch details if fetch is enabled
+    if status.get("fetch_enabled"):
+        fetch_service = app_state.service.fetch
+        paused_list = fetch_service.get_paused_list()
+        status["fetch_details"] = {
+            "paused_requests": paused_list,
+            "paused_count": len(paused_list),
+            "response_stage": fetch_service.enable_response_stage,
+        }
+
+    return status
 
 
 @api.post("/connect")
@@ -106,25 +140,6 @@ async def set_fetch_interception(request: FetchRequest) -> Dict[str, Any]:
     return result
 
 
-@api.get("/fetch/paused")
-async def get_paused_requests() -> Dict[str, Any]:
-    """Get list of currently paused fetch requests."""
-    if not app_state:
-        return {"error": "WebTap not initialized", "requests": []}
-
-    fetch_service = app_state.service.fetch
-    if not fetch_service.enabled:
-        return {"enabled": False, "requests": []}
-
-    paused_list = fetch_service.get_paused_list()
-    return {
-        "enabled": True,
-        "requests": paused_list,
-        "count": len(paused_list),
-        "response_stage": fetch_service.enable_response_stage,
-    }
-
-
 @api.get("/filters/status")
 async def get_filter_status() -> Dict[str, Any]:
     """Get current filter configuration and enabled categories."""
@@ -184,7 +199,26 @@ 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.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,10 +227,19 @@ 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.
     """
-    global app_state
+    # 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, _shutdown_requested
     app_state = state
+    _shutdown_requested = False  # Reset flag for new instance
 
     thread = threading.Thread(target=run_server, args=(host, port), daemon=True)
     thread.start()
@@ -207,14 +250,46 @@ 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(
+    import asyncio
+
+    async def run():
+        """Run server with proper shutdown handling."""
+        config = uvicorn.Config(
             api,
             host=host,
             port=port,
             log_level="error",
             access_log=False,
         )
+        server = uvicorn.Server(config)
+
+        # Start server in background task
+        serve_task = asyncio.create_task(server.serve())
+
+        # Wait for shutdown signal
+        while not _shutdown_requested:
+            await asyncio.sleep(0.1)
+            if serve_task.done():
+                break
+
+        # Trigger shutdown
+        if not serve_task.done():
+            logger.info("API server shutting down")
+            server.should_exit = True
+            # Wait a bit for graceful shutdown
+            try:
+                await asyncio.wait_for(serve_task, timeout=1.0)
+            except asyncio.TimeoutError:
+                logger.debug("Server task timeout - cancelling")
+                serve_task.cancel()
+                try:
+                    await serve_task
+                except asyncio.CancelledError:
+                    pass
+
+    try:
+        # Use asyncio.run() which properly cleans up
+        asyncio.run(run())
     except Exception as e:
         logger.error(f"API server failed: {e}")
 

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

@@ -6,6 +6,7 @@ PUBLIC API:
 """
 
 import sys
+import threading
 from dataclasses import dataclass, field
 
 from replkit2 import App
@@ -24,15 +25,32 @@ 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."""
         self.service = WebTapService(self)
 
+    def cleanup(self):
+        """Cleanup resources on exit."""
+        # Disconnect CDP if connected
+        if self.cdp.is_connected:
+            self.cdp.disconnect()
+
+        # Stop API server if we own it
+        if self.api_thread and self.api_thread.is_alive():
+            # Import here to avoid circular dependency
+            import webtap.api
+
+            webtap.api._shutdown_requested = True
+            # Wait up to 1 second for graceful shutdown
+            self.api_thread.join(timeout=1.0)
+
 
 # Must be created before command imports for decorator registration
 app = App(

{webtap_tool-0.1.2 → webtap_tool-0.1.4}/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.4}/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.4}/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.4}/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.4}/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.4}/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.4}/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" \\
     "$@"
 """