s-librarykit 0.5.1__tar.gz → 0.5.2__tar.gz

{s_librarykit-0.5.1 → s_librarykit-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: s-librarykit
-Version: 0.5.1
+Version: 0.5.2
 Summary: Жирный КОРЕНЬ китов: единая error-иерархия, config/retry/paths-утили, checkpoint/resume, транспорт/auth/sessions — общий код для clikit, adapterkit и доменных пакетов.
 Author: Dmitry
 License: MIT

{s_librarykit-0.5.1 → s_librarykit-0.5.2}/librarykit/browser/capture_tap.py

@@ -206,6 +206,8 @@ class _PlaywrightAdapter(_BaseAdapter):
         self._context = page.context
         # Request-объект → стабильный request_id (для сшивки request/response/failed).
         self._ids: "weakref.WeakKeyDictionary[Any, str]" = weakref.WeakKeyDictionary()
+        self._drain_stop: asyncio.Event | None = None
+        self._drain_task: Any = None
 
     def _id_for(self, request: Any) -> str:
         rid = self._ids.get(request)
@@ -222,6 +224,10 @@ class _PlaywrightAdapter(_BaseAdapter):
                 await ctx.expose_binding(self._binding, self._on_binding)
             with contextlib.suppress(Exception):
                 await ctx.add_init_script(self._init_script)
+            # Дренаж очереди — fallback для движков, где binding не виден из мира init-script
+            # (CamouFox/Firefox гонят его в изолированном мире). На chromium очередь пуста.
+            self._drain_stop = asyncio.Event()
+            self._drain_task = asyncio.ensure_future(self._drain_queue_loop())
         if self._h.on_request is not None:
             ctx.on("request", lambda r: self._spawn(self._handle_request(r)))
         if self._h.on_response is not None:
@@ -307,7 +313,42 @@ class _PlaywrightAdapter(_BaseAdapter):
             return await self._context.storage_state()
         return {"cookies": [], "origins": []}
 
+    async def _drain_queue_loop(self) -> None:
+        """Периодически дренит globalThis.__captureTraceQueue → on_action (fallback CamouFox)."""
+        assert self._drain_stop is not None
+        while not self._drain_stop.is_set():
+            try:
+                await asyncio.wait_for(self._drain_stop.wait(), timeout=0.3)
+                break
+            except asyncio.TimeoutError:
+                pass
+            await self._drain_queue_once()
+
+    async def _drain_queue_once(self) -> None:
+        try:
+            items = await self._page.evaluate(
+                "() => { const q = globalThis.__captureTraceQueue || [];"
+                " globalThis.__captureTraceQueue = []; return q; }"
+            )
+        except Exception:
+            return
+        for s in items or []:
+            try:
+                payload = json.loads(s) if isinstance(s, str) else s
+            except Exception:
+                continue
+            await self._emit(self._h.on_action, NormalizedAction(raw=payload))
+
     async def detach(self) -> None:
+        # Остановить дренаж очереди trace (CamouFox-fallback) + финальный дренаж.
+        if self._drain_stop is not None:
+            self._drain_stop.set()
+            with contextlib.suppress(Exception):
+                await self._drain_queue_once()
+            if self._drain_task is not None:
+                self._drain_task.cancel()
+                with contextlib.suppress(Exception, asyncio.CancelledError):
+                    await self._drain_task
         # Слушатели не снимаем поимённо (Playwright требует ссылку на сам хендлер):
         # контекст всё равно закрывает backend.aclose() сразу после detach. Здесь —
         # только дренаж фоновых задач нормализации, чтобы не потерять последние тела.

{s_librarykit-0.5.1 → s_librarykit-0.5.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "s-librarykit"
-version = "0.5.1"
+version = "0.5.2"
 description = "Жирный КОРЕНЬ китов: единая error-иерархия, config/retry/paths-утили, checkpoint/resume, транспорт/auth/sessions — общий код для clikit, adapterkit и доменных пакетов."
 readme = "README.md"
 license = { text = "MIT" }

{s_librarykit-0.5.1 → s_librarykit-0.5.2}/tests/test_capture_tap.py

@@ -106,10 +106,15 @@ class _MockContext:
 class _MockPage:
     def __init__(self, context):
         self.context = context
+        self.queue_items: list[str] = []
 
     def on(self, *_a):
         pass
 
+    async def evaluate(self, _script):
+        items, self.queue_items = self.queue_items, []
+        return items
+
 
 class _MockBackend:
     def __init__(self, page):
@@ -183,3 +188,22 @@ def test_attach_tap_playwright_flow():
     assert got_resp[0].status == 200 and got_resp[0].body == b'{"ok":true}'
     # request_id сшит между request и response
     assert got_req[0].request_id == got_resp[0].request_id
+
+
+def test_attach_tap_drain_queue_fallback():
+    """CamouFox-fallback: событие из globalThis.__captureTraceQueue дренится page.evaluate → on_action."""
+    ctx = _MockContext()
+    page = _MockPage(ctx)
+    page.queue_items = ['{"kind":"action","type":"click"}', '{"kind":"mutation"}']
+    backend = _MockBackend(page)
+    got: list = []
+
+    async def run():
+        handle = await attach_capture_tap(
+            backend, on_action=got.append, init_script="/*trace*/", action_binding="__t",
+        )
+        await handle.detach()  # финальный дренаж соберёт очередь
+
+    asyncio.run(run())
+    kinds = {a.raw.get("kind") for a in got}
+    assert kinds == {"action", "mutation"}