website-agent-server 0.1.2__tar.gz → 0.1.4__tar.gz

{website_agent_server-0.1.2/website_agent_server.egg-info → website_agent_server-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: website-agent-server
-Version: 0.1.2
+Version: 0.1.4
 Summary: A server-side browser proxy that lets clients operate websites without direct remote connections.
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -80,6 +80,7 @@ venv\Scripts\python.exe -m website_agent_server --pin 123456
 | `--accept-language` | `zh-CN,zh;q=0.9,en;q=0.8` | `Accept-Language` header sent by browser contexts. |
 | `--user-agent` | auto | Desktop browser User-Agent. By default the server derives a normal Chrome UA from the bundled Chromium version instead of exposing `HeadlessChrome`. |
 | `--session-ttl-seconds` | `600` | Disconnected client session and client browser context lifetime. A client can reconnect to its cached browser session during this window. |
+| `--shutdown-timeout-seconds` | `3.0` | Maximum graceful shutdown wait for active HTTP/WebSocket connections after Ctrl+C. |
 | `--navigation-timeout-ms` | `30000` | Navigation timeout. |
 | `--frame-interval-seconds` | `0.18` | Screenshot streaming interval. |
 | `--screenshot-quality` | `95` | Frame quality from 1 to 100. Values below 100 use JPEG; 100 uses PNG. |

{website_agent_server-0.1.2 → website_agent_server-0.1.4}/README.md

@@ -67,7 +67,8 @@ venv\Scripts\python.exe -m website_agent_server --pin 123456
 | `--accept-language` | `zh-CN,zh;q=0.9,en;q=0.8` | `Accept-Language` header sent by browser contexts. |
 | `--user-agent` | auto | Desktop browser User-Agent. By default the server derives a normal Chrome UA from the bundled Chromium version instead of exposing `HeadlessChrome`. |
 | `--session-ttl-seconds` | `600` | Disconnected client session and client browser context lifetime. A client can reconnect to its cached browser session during this window. |
-| `--navigation-timeout-ms` | `30000` | Navigation timeout. |
+| `--shutdown-timeout-seconds` | `3.0` | Maximum graceful shutdown wait for active HTTP/WebSocket connections after Ctrl+C. |
+| `--navigation-timeout-ms` | `30000` | Navigation timeout. |
 | `--frame-interval-seconds` | `0.18` | Screenshot streaming interval. |
 | `--screenshot-quality` | `95` | Frame quality from 1 to 100. Values below 100 use JPEG; 100 uses PNG. |
 | `--media-frame-interval-seconds` | `0.35` | Screenshot streaming interval while remote media is playing. |

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "website-agent-server"
-version = "0.1.2"
+version = "0.1.4"
 description = "A server-side browser proxy that lets clients operate websites without direct remote connections."
 readme = "README.md"
 requires-python = ">=3.11"

{website_agent_server-0.1.2 → website_agent_server-0.1.4}/website_agent_server/__init__.py

@@ -1,3 +1,3 @@
 """Website Agent Server package."""
 
-__version__ = "0.1.2"
+__version__ = "0.1.4"

{website_agent_server-0.1.2 → website_agent_server-0.1.4}/website_agent_server/__main__.py

@@ -1,13 +1,41 @@
 from __future__ import annotations
 
-import argparse
-import asyncio
-from pathlib import Path
-
-import uvicorn
-
-from .config import settings
-from .url_policy import HostAccessPolicy
+import argparse
+import asyncio
+import contextlib
+import signal
+import threading
+from pathlib import Path
+from types import FrameType
+from collections.abc import Callable, Generator
+
+import uvicorn
+from uvicorn.server import HANDLED_SIGNALS
+
+from .config import settings
+from .url_policy import HostAccessPolicy
+
+
+class WebsiteAgentServer(uvicorn.Server):
+    def __init__(self, config: uvicorn.Config, request_stop: Callable[[], None]) -> None:
+        super().__init__(config)
+        self._request_stop = request_stop
+
+    def handle_exit(self, sig: int, frame: FrameType | None) -> None:
+        self._request_stop()
+        super().handle_exit(sig, frame)
+
+    @contextlib.contextmanager
+    def capture_signals(self) -> Generator[None]:
+        if threading.current_thread() is not threading.main_thread():
+            yield
+            return
+        original_handlers = {sig: signal.signal(sig, self.handle_exit) for sig in HANDLED_SIGNALS}
+        try:
+            yield
+        finally:
+            for sig, handler in original_handlers.items():
+                signal.signal(sig, handler)
 
 
 def build_parser() -> argparse.ArgumentParser:
@@ -60,11 +88,17 @@ def build_parser() -> argparse.ArgumentParser:
         "--session-ttl-seconds",
         type=int,
         default=settings.session_ttl_seconds,
-        help="Idle session lifetime in seconds.",
-    )
-    parser.add_argument(
-        "--navigation-timeout-ms",
-        type=int,
+        help="Idle session lifetime in seconds.",
+    )
+    parser.add_argument(
+        "--shutdown-timeout-seconds",
+        type=float,
+        default=settings.shutdown_timeout_seconds,
+        help="Maximum graceful shutdown wait for active HTTP/WebSocket connections.",
+    )
+    parser.add_argument(
+        "--navigation-timeout-ms",
+        type=int,
         default=settings.navigation_timeout_ms,
         help="Navigation timeout in milliseconds.",
     )
@@ -146,7 +180,8 @@ async def apply_args(args: argparse.Namespace) -> None:
     settings.accept_language = args.accept_language
     settings.user_agent = args.user_agent
     settings.session_ttl_seconds = args.session_ttl_seconds
-    settings.navigation_timeout_ms = args.navigation_timeout_ms
+    settings.shutdown_timeout_seconds = max(0.1, args.shutdown_timeout_seconds)
+    settings.navigation_timeout_ms = args.navigation_timeout_ms
     settings.frame_interval_seconds = args.frame_interval_seconds
     settings.screenshot_quality = max(1, min(100, args.screenshot_quality))
     settings.media_frame_interval_seconds = max(0.05, args.media_frame_interval_seconds)
@@ -167,20 +202,25 @@ async def apply_args(args: argparse.Namespace) -> None:
         settings.lock_url = None
 
 
-def main() -> None:
-    parser = build_parser()
-    args = parser.parse_args()
+def main() -> None:
+    parser = build_parser()
+    args = parser.parse_args()
     try:
         asyncio.run(apply_args(args))
-    except ValueError as exc:
-        parser.error(str(exc))
-    uvicorn.run(
-        "website_agent_server.main:app",
-        host=settings.host,
-        port=settings.port,
-        reload=False,
-        ws_ping_interval=None,
-    )
+    except ValueError as exc:
+        parser.error(str(exc))
+    from .main import app, manager
+
+    config = uvicorn.Config(
+        app,
+        host=settings.host,
+        port=settings.port,
+        reload=False,
+        ws_ping_interval=None,
+        timeout_graceful_shutdown=settings.shutdown_timeout_seconds,
+    )
+    server = WebsiteAgentServer(config, manager.request_stop)
+    server.run()
 
 
 if __name__ == "__main__":