parsek-cdp-server 0.1.1__tar.gz → 0.1.2__tar.gz

{parsek_cdp_server-0.1.1 → parsek_cdp_server-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: parsek-cdp-server
-Version: 0.1.1
+Version: 0.1.2
 Summary: Parsek CDP server — launch, supervise and proxy a browser; server-side feature producers.
 Author: xa1era
 License-Expression: Apache-2.0
@@ -8,7 +8,7 @@ Project-URL: Repository, https://github.com/xa1era/parsek-cdp
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: parsek-cdp~=0.1.1
+Requires-Dist: parsek-cdp~=0.1.2
 Requires-Dist: aiohttp>=3.9
 Requires-Dist: psutil>=5
 Requires-Dist: prometheus-client>=0.19

{parsek_cdp_server-0.1.1 → parsek_cdp_server-0.1.2}/parsek_cdp_server/launcher.py

@@ -18,11 +18,11 @@ import shutil
 import tempfile
 import urllib.error
 import urllib.request
-from dataclasses import dataclass, field
 from pathlib import Path
 from typing import List, Optional
 
 import psutil
+from parsek_cdp.core.browser import LaunchOptions
 
 #: Env var naming *directories* to search for browser binaries,
 #: ``os.pathsep``-separated (like ``PATH``), e.g. ``/opt/browsers/chrome:/opt/browsers/brave``.
@@ -102,27 +102,26 @@ def _is_browser(filename: str) -> bool:
 
 
 def _find_in_dirs(dirs: List[str]) -> List[str]:
-    """Recursively collect browser executables found under ``dirs``."""
+    """Collect browser executables directly under ``dirs`` (non-recursive)."""
     found: List[str] = []
     for directory in dirs:
         directory = directory.strip()
         if not directory or not os.path.isdir(directory):
             continue
-        for root, _subdirs, files in os.walk(directory):
-            for filename in files:
-                if not _is_browser(filename):
-                    continue
-                full = os.path.join(root, filename)
-                if os.path.isfile(full) and os.access(full, os.X_OK):
-                    found.append(full)
+        for filename in os.listdir(directory):
+            if not _is_browser(filename):
+                continue
+            full = os.path.join(directory, filename)
+            if os.path.isfile(full) and os.access(full, os.X_OK):
+                found.append(full)
     return found
 
 
 def _detect_executable() -> str:
     """Pick a Chromium-based binary, or raise if none is available.
 
-    Precedence: a random browser executable found by recursively searching the
-    directories in :data:`CHROMES_PATH_ENV` (defaulting to :data:`_KNOWN_PATHS`),
+    Precedence: a random browser executable found directly in the directories
+    listed in :data:`CHROMES_PATH_ENV` (defaulting to :data:`_KNOWN_PATHS`),
     else the first :data:`_CANDIDATES` name resolvable on ``PATH``.
     """
     raw = os.environ.get(CHROMES_PATH_ENV)
@@ -140,18 +139,6 @@ def _detect_executable() -> str:
     )
 
 
-@dataclass
-class LaunchOptions:
-    """How to start the browser."""
-
-    executable: Optional[str] = None  # autodetect if None
-    headless: bool = True
-    port: int = 0
-    user_data_dir: Optional[str] = None
-    extra_args: List[str] = field(default_factory=list)
-    default_args: bool = True
-
-
 class ChromeLauncher:
     """Spawn a browser process and expose its browser-level websocket url.
 
@@ -173,8 +160,6 @@ class ChromeLauncher:
         #: Temp profile dir we created (and must clean up); None if caller supplied one.
         self._owned_user_data_dir: Optional[str] = None
 
-    # -- argv -------------------------------------------------------------- #
-
     def _resolve_user_data_dir(self) -> str:
         if self.options.user_data_dir is not None:
             return self.options.user_data_dir
@@ -185,7 +170,7 @@ class ChromeLauncher:
     def _build_argv(self, user_data_dir: str) -> List[str]:
         executable = self.options.executable or _detect_executable()
         argv = [executable, f"--remote-debugging-port={self.options.port}"]
-        if self.options.default_args:
+        if self.options.use_default_args:
             argv += [
                 f"--user-data-dir={user_data_dir}",
                 "--no-first-run",
@@ -286,7 +271,9 @@ class ChromeLauncher:
             with _suppress_lookup():
                 p.terminate()  # SIGTERM
         # psutil.wait_procs is blocking, so run it off the event loop.
-        _gone, alive = await asyncio.to_thread(psutil.wait_procs, procs, timeout=timeout)
+        _gone, alive = await asyncio.to_thread(
+            psutil.wait_procs, procs, timeout=timeout
+        )
         for p in alive:
             with _suppress_lookup():
                 p.kill()  # SIGKILL

{parsek_cdp_server-0.1.1 → parsek_cdp_server-0.1.2}/parsek_cdp_server/proxy.py

@@ -35,12 +35,12 @@ from typing import Awaitable, Callable, Dict, List, Optional, Set, Tuple, Type
 import websockets
 from aiohttp import web
 from parsek_cdp._logging import get_logger
+from parsek_cdp.core.browser import LaunchOptions
 from parsek_cdp.core.feature import Feature
 from parsek_cdp.core.target import ProtocolError
 from parsek_cdp.parsek import BrowserState
 from parsek_cdp.parsek.events import BrowserStateChanged
 
-from .launcher import LaunchOptions
 from .metrics import ServerMetrics
 from .reaper import spawn_reaper
 from .supervisor import BrowserSupervisor
@@ -333,17 +333,8 @@ class ParsekServer:
             body = await request.json() if request.can_read_body else {}
         except Exception:
             body = {}
-        allowed = {
-            "executable",
-            "headless",
-            "port",
-            "user_data_dir",
-            "extra_args",
-            "default_args",
-        }
-        kwargs = {k: body[k] for k in allowed if k in body}
-        if kwargs:
-            return LaunchOptions(**kwargs)
+        if body:
+            return LaunchOptions.from_json(body)
         return self.launch_options
 
     async def _idle_timeout(self, request: web.Request) -> Optional[float]:
@@ -389,7 +380,9 @@ class ParsekServer:
         )
         try:
             await self._pipe(
-                ws, supervisor.ws_url, on_client_frame=self._on_control_frame(browser_uuid)
+                ws,
+                supervisor.ws_url,
+                on_client_frame=self._on_control_frame(browser_uuid),
             )
         finally:
             clients.discard(ws)
@@ -404,6 +397,7 @@ class ParsekServer:
         process exit is recorded as an intentional ``CLOSED`` rather than a crash
         to be relaunched.
         """
+
         async def handle(data: str) -> None:
             # Cheap substring gate first -- only bother parsing the frame that
             # could actually be the close request, not every control message.
@@ -440,8 +434,10 @@ class ParsekServer:
         feats = self._browser_features.get(browser_uuid, self.features)
         on_event = None
         if self.metrics is not None:
+
             def on_event(domain: str) -> None:
                 self.metrics.record_event(browser_uuid, target_id, domain)
+
         bridge = PageBridge(
             ws,
             supervisor.target_ws_url(target_id),
@@ -510,6 +506,7 @@ class ParsekServer:
         supervisor needing a back-reference to the server.  Idempotent, so a
         ``CLOSED`` also driven by :meth:`_graceful_close`/:meth:`stop` is harmless.
         """
+
         def callback(state, reason=None) -> None:
             if state is BrowserState.CLOSED:
                 self.supervisors.pop(browser_uuid, None)

{parsek_cdp_server-0.1.1 → parsek_cdp_server-0.1.2}/parsek_cdp_server.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: parsek-cdp-server
-Version: 0.1.1
+Version: 0.1.2
 Summary: Parsek CDP server — launch, supervise and proxy a browser; server-side feature producers.
 Author: xa1era
 License-Expression: Apache-2.0
@@ -8,7 +8,7 @@ Project-URL: Repository, https://github.com/xa1era/parsek-cdp
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: parsek-cdp~=0.1.1
+Requires-Dist: parsek-cdp~=0.1.2
 Requires-Dist: aiohttp>=3.9
 Requires-Dist: psutil>=5
 Requires-Dist: prometheus-client>=0.19

{parsek_cdp_server-0.1.1 → parsek_cdp_server-0.1.2}/parsek_cdp_server.egg-info/requires.txt

@@ -1,4 +1,4 @@
-parsek-cdp~=0.1.1
+parsek-cdp~=0.1.2
 aiohttp>=3.9
 psutil>=5
 prometheus-client>=0.19

{parsek_cdp_server-0.1.1 → parsek_cdp_server-0.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "parsek-cdp-server"
-version = "0.1.1"
+version = "0.1.2"
 description = "Parsek CDP server — launch, supervise and proxy a browser; server-side feature producers."
 readme = "README.md"
 requires-python = ">=3.13"
@@ -13,7 +13,7 @@ license = "Apache-2.0"
 dependencies = [
   # Reuses the shared layers (cdp/, core/, parsek/) from the client distribution,
   # including internal modules -- so track the client's patch line (>=0.1.0,<0.2.0).
-  "parsek-cdp~=0.1.1",
+  "parsek-cdp~=0.1.2",
   "aiohttp>=3.9",          # ws + HTTP endpoints (/cdp/{browser}/control, /cdp/{browser}/page/{target}, /browsers)
   "psutil>=5",             # watchdog over the Chrome process + zombie reaper
   "prometheus-client>=0.19",  # /metrics exposition