webtap-tool 0.1.2__py3-none-any.whl → 0.1.4__py3-none-any.whl

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/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/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/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/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/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/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/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/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/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" \\
     "$@"
 """
 

{webtap_tool-0.1.2.dist-info → webtap_tool-0.1.4.dist-info}/METADATA

@@ -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.dist-info → webtap_tool-0.1.4.dist-info}/RECORD

@@ -1,11 +1,11 @@
 webtap/VISION.md,sha256=kfoJfEPVc4chOrD9tNMDmYBY9rX9KB-286oZj70ALCE,7681
-webtap/__init__.py,sha256=iMD7Y3DMnmd-psxLdG9uLeo9qXfCDDzUQ52lVo5LWOU,1633
-webtap/api.py,sha256=I4CyOlgJW_peDn94DIeq5945G9BAbCzOqMmf_7YUm_g,6060
-webtap/app.py,sha256=RgLGWUc39o1AOnXxpXg7WVbNk3X8If3Q7nbGeqPaHMw,2586
+webtap/__init__.py,sha256=6sTctXhLKByd8TnKJ99Y4o6xv7AbbPJ37S6YMNsQGBM,1970
+webtap/api.py,sha256=mfAqxQfu2lF91jiI6kHQnpmwtwq0Hh9UtuV8ApENXe0,8504
+webtap/app.py,sha256=M6-tCT6uvR5aMMYYUymYrXhq4PaUlHVYTv7MDN_svdQ,3246
 webtap/filters.py,sha256=nphF2bFRbFtS2ue-CbV1uzKpuK3IYBbwjLeLhMDdLEk,11034
 webtap/cdp/README.md,sha256=0TS0V_dRgRAzBqhddpXWD4S0YVi5wI4JgFJSll_KUBE,5660
 webtap/cdp/__init__.py,sha256=c6NFG0XJnAa5GTe9MLr9mDZcLZqoTQN7A1cvvOfLcgY,453
-webtap/cdp/query.py,sha256=ULfc8ddHnX_uHezaVLblPOzV6tTyu3ohOc6XlE3wPa0,4153
+webtap/cdp/query.py,sha256=x2Cy7KMolYkTelpROGezOfMFgYnbSlCvHkvvW1v_gLI,4229
 webtap/cdp/session.py,sha256=BTajmDH6nel2dvia7IX9k6C-RinkN2NxY4rxtUJAJE0,12362
 webtap/cdp/schema/README.md,sha256=hnWCzbXYcYtWaZb_SgjVaFBiG81S9b9Y3x-euQFwQDo,1222
 webtap/cdp/schema/cdp_protocol.json,sha256=dp9_OLYLuVsQb1oV5r6MZfMzURscBLyAXUckdaPWyv4,1488452
@@ -25,19 +25,19 @@ webtap/commands/fetch.py,sha256=_TzOvJfVzPaw4ZmyI95Qb7rS3iKx2nmp_IL3jaQO_6g,7772
 webtap/commands/filters.py,sha256=trZvcbHTaF0FZC8dyMAmhmS2dlBoA82VXe5_DDS3eU8,8986
 webtap/commands/inspect.py,sha256=6PGN7iDT1oLzQJboNeYozLILrW2VsAzmtMpF3_XhD30,5746
 webtap/commands/javascript.py,sha256=QpQdqqoQwwTyz1lpibZ92XKOL89scu_ndgSjkhaYuDk,3195
-webtap/commands/launch.py,sha256=-DonCgu7LakyTIN5ksGjY-8CiQzQiQ2SAamBCOvLWrw,2687
+webtap/commands/launch.py,sha256=iZDLundKlxKRLKf3Vz5at42-tp2f-Uj5wZf7fbhBfA0,2202
 webtap/commands/navigation.py,sha256=Mapawp2AZTJQaws2uwlTgMUhqz7HlVTLxiZ06n_MQc0,6071
 webtap/commands/network.py,sha256=hwZshGGdVsJ_9MFjOKJXT07I990JjZInw2LLnKXLQ5Y,2910
 webtap/commands/setup.py,sha256=ewoOTvgCAzMPcFm6cbk-93nY_BI2IXqPZGGGpc1rJiw,4459
 webtap/services/README.md,sha256=rala_jtnNgSiQ1lFLM7x_UQ4SJZDceAm7dpkQMRTYaI,2346
 webtap/services/__init__.py,sha256=IjFqu0Ak6D-r18aokcQMtenDV3fbelvfjTCejGv6CZ0,570
-webtap/services/body.py,sha256=tU60N-efOvTMndDGLcz0rf921VHiRmczDEs-qtECMng,3934
-webtap/services/console.py,sha256=W1FGSuLl1bgZzpD9bVu98wlHGupe12vA7YqDLXFszYs,3789
-webtap/services/fetch.py,sha256=hKrhFda1x65GmLHO0XMkxbclMtkWt0uEv7Rp9Ui2na0,13623
+webtap/services/body.py,sha256=XQPa19y5eUc3XJ2TuwVK6kffO1VQoKqNs33MBBz7hzU,3913
+webtap/services/console.py,sha256=XVfSKTvEHyyOdujsg85S3wtj1CdZhzKtWwlx25MvSv8,3768
+webtap/services/fetch.py,sha256=nl6bpU2Vnf40kau4-mqAnIkhC-7Lx2vbTJKUglz9KnE,13602
 webtap/services/main.py,sha256=HcXdPuI7hzsxsNvfN0npGhj_M7HObc83Lr3fuy7BMeE,5673
-webtap/services/network.py,sha256=EJZIlaE98v113xypPIiiTE-LiG-eCXGNXoJjzDYebhU,3480
-webtap/services/setup.py,sha256=DF2471WsY5pJ5gEn64EMGRW5t9mUyuTQoCTejOJeQxg,7594
-webtap_tool-0.1.2.dist-info/METADATA,sha256=IZzOzUP2iPmmNVcjgBNLkAqy3lmF0aEpMLVb5DaV-pE,17457
-webtap_tool-0.1.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-webtap_tool-0.1.2.dist-info/entry_points.txt,sha256=iFe575I0CIb1MbfPt0oX2VYyY5gSU_dA551PKVR83TU,39
-webtap_tool-0.1.2.dist-info/RECORD,,
+webtap/services/network.py,sha256=0o_--F6YvmXqqFqrcjL1gc6Vr9V1Ytb_U7r_DSUWupA,3444
+webtap/services/setup.py,sha256=dXzqlXR37-chZO2qCsuiVq9N7fELXtND5jH_9QQwsws,7932
+webtap_tool-0.1.4.dist-info/METADATA,sha256=xX7oPMbWWVeiFFRYbCB7V87iEMDoqh9JXfog5AY0gXM,17457
+webtap_tool-0.1.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+webtap_tool-0.1.4.dist-info/entry_points.txt,sha256=iFe575I0CIb1MbfPt0oX2VYyY5gSU_dA551PKVR83TU,39
+webtap_tool-0.1.4.dist-info/RECORD,,