webtap-tool 0.1.3__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,12 +46,15 @@ def main():
 
 
 def _start_api_server_safely():
-    """Start API server with error handling."""
+    """Start API server with error handling and cleanup registration."""
     try:
         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:

webtap/api.py

@@ -50,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()}
+
+    # 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 app_state.service.list_pages()
+    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")
@@ -108,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."""
@@ -186,19 +199,6 @@ async def disable_all_filters() -> Dict[str, Any]:
     return {"enabled": [], "total": 0}
 
 
-@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."""
@@ -237,8 +237,9 @@ def start_api_server(state, host: str = "127.0.0.1", port: int = 8765) -> thread
         logger.info(f"Port {port} already in use")
         return None
 
-    global app_state
+    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()
@@ -249,7 +250,10 @@ def start_api_server(state, host: str = "127.0.0.1", port: int = 8765) -> thread
 
 def run_server(host: str, port: int):
     """Run the FastAPI server in a thread."""
-    try:
+    import asyncio
+
+    async def run():
+        """Run server with proper shutdown handling."""
         config = uvicorn.Config(
             api,
             host=host,
@@ -259,30 +263,33 @@ def run_server(host: str, port: int):
         )
         server = uvicorn.Server(config)
 
-        # Run with checking for shutdown flag
-        import asyncio
-
-        loop = asyncio.new_event_loop()
-        asyncio.set_event_loop(loop)
+        # Start server in background task
+        serve_task = asyncio.create_task(server.serve())
 
-        async def serve():
-            await server.serve()
-
-        # Start serving
-        task = loop.create_task(serve())
-
-        # Check for shutdown flag
+        # Wait for shutdown signal
         while not _shutdown_requested:
-            loop.run_until_complete(asyncio.sleep(0.1))
-            if task.done():
+            await asyncio.sleep(0.1)
+            if serve_task.done():
                 break
 
-        # Shutdown if requested
-        if _shutdown_requested:
+        # Trigger shutdown
+        if not serve_task.done():
             logger.info("API server shutting down")
             server.should_exit = True
-            loop.run_until_complete(server.shutdown())
+            # 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

@@ -36,6 +36,21 @@ class WebTapState:
         """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.3.dist-info → webtap_tool-0.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webtap-tool
-Version: 0.1.3
+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.3.dist-info → webtap_tool-0.1.4.dist-info}/RECORD

@@ -1,7 +1,7 @@
 webtap/VISION.md,sha256=kfoJfEPVc4chOrD9tNMDmYBY9rX9KB-286oZj70ALCE,7681
-webtap/__init__.py,sha256=4MD5ir_kyfHcI3kND_As9jF-UUqGEzWKV5Cg6PKzef4,1787
-webtap/api.py,sha256=1VV_YPwvGuYanDm5M_NuWUYiGIQbPd3IKicK5Jplq44,7987
-webtap/app.py,sha256=ISPSmwqCZ2R_kVDmFEsBLltzfbHGUkzcczTGCs2KcDI,2738
+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
@@ -37,7 +37,7 @@ webtap/services/fetch.py,sha256=nl6bpU2Vnf40kau4-mqAnIkhC-7Lx2vbTJKUglz9KnE,1360
 webtap/services/main.py,sha256=HcXdPuI7hzsxsNvfN0npGhj_M7HObc83Lr3fuy7BMeE,5673
 webtap/services/network.py,sha256=0o_--F6YvmXqqFqrcjL1gc6Vr9V1Ytb_U7r_DSUWupA,3444
 webtap/services/setup.py,sha256=dXzqlXR37-chZO2qCsuiVq9N7fELXtND5jH_9QQwsws,7932
-webtap_tool-0.1.3.dist-info/METADATA,sha256=8fezx8WvoSf5sTT5-2ibcGwLDvVldjPLpGndETihBIw,17457
-webtap_tool-0.1.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-webtap_tool-0.1.3.dist-info/entry_points.txt,sha256=iFe575I0CIb1MbfPt0oX2VYyY5gSU_dA551PKVR83TU,39
-webtap_tool-0.1.3.dist-info/RECORD,,
+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,,