fix

x0day · x0day · commit 024ef3928d1b · 2023-05-07T05:19:12.000Z
diff --git a/playwright/_impl/_browser_context.py b/playwright/_impl/_browser_context.py
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import asyncio
-import contextlib
 import json
 import sys
 from pathlib import Path
@@ -121,10 +120,12 @@ def __init__(
         )
         self._channel.on(
             "route",
-            lambda params: self._on_route(
-                from_channel(params.get("route")),
+            lambda params: self._emit_sync(
+                self._on_route(
+                    from_channel(params.get("route")),
+                )
             ),
-        ),
+        )
 
         self._channel.on(
             "backgroundPage",
@@ -201,19 +202,20 @@ async def _on_route(self, route: Route) -> None:
                 handled = await route_handler.handle(route)
             finally:
                 if len(self._routes) == 0:
-                    with contextlib.suppress(Exception):
-                        await self._connection.wrap_api_call(
+                    self._emit_sync(
+                        self._connection.wrap_api_call(
                             lambda: self._update_interception_patterns(), True
                         )
+                    )
             if handled:
                 return
         await route._internal_continue(is_internal=True)
 
-    async def _on_binding(self, binding_call: BindingCall) -> None:
+    def _on_binding(self, binding_call: BindingCall) -> None:
         func = self._bindings.get(binding_call._initializer["name"])
         if func is None:
             return
-        await binding_call.call(func)
+        self._emit_sync(binding_call.call(func))
 
     def set_default_navigation_timeout(self, timeout: float) -> None:
         self._timeout_settings.set_navigation_timeout(timeout)
diff --git a/playwright/_impl/_connection.py b/playwright/_impl/_connection.py
@@ -23,6 +23,7 @@
     TYPE_CHECKING,
     Any,
     Callable,
+    Coroutine,
     Dict,
     List,
     Mapping,
@@ -169,6 +170,19 @@ def _add_event_handler(self, event: str, k: Any, v: Any) -> None:
             self._update_subscription(event, True)
         super()._add_event_handler(event, k, v)
 
+    def _emit_sync(self, coro: Coroutine, ignore_errors: bool = True) -> None:
+        fut = asyncio.ensure_future(coro, loop=self._loop)
+
+        def cb(f: asyncio.Task) -> None:
+            if f.cancelled():
+                return
+
+            exc: Optional[BaseException] = f.exception()
+            if exc and not ignore_errors:
+                self.emit("error", exc)
+
+        fut.add_done_callback(cb)
+
     def remove_listener(self, event: str, f: Any) -> None:
         super().remove_listener(event, f)
         if not self.listeners(event):
diff --git a/playwright/_impl/_page.py b/playwright/_impl/_page.py
@@ -14,7 +14,6 @@
 
 import asyncio
 import base64
-import contextlib
 import inspect
 import re
 import sys
@@ -194,7 +193,9 @@ def __init__(
         )
         self._channel.on(
             "route",
-            lambda params: self._on_route(from_channel(params["route"])),
+            lambda params: self._emit_sync(
+                self._on_route(from_channel(params["route"]))
+            ),
         )
         self._channel.on("video", lambda params: self._on_video(params))
         self._channel.on(
@@ -254,19 +255,20 @@ async def _on_route(self, route: Route) -> None:
                 handled = await route_handler.handle(route)
             finally:
                 if len(self._routes) == 0:
-                    with contextlib.suppress(Exception):
-                        await self._connection.wrap_api_call(
+                    self._emit_sync(
+                        self._connection.wrap_api_call(
                             lambda: self._update_interception_patterns(), True
                         )
+                    )
             if handled:
                 return
         await self._browser_context._on_route(route)
 
-    async def _on_binding(self, binding_call: "BindingCall") -> None:
+    def _on_binding(self, binding_call: "BindingCall") -> None:
         func = self._bindings.get(binding_call._initializer["name"])
         if func:
-            await binding_call.call(func)
-        await self._browser_context._on_binding(binding_call)
+            self._emit_sync(binding_call.call(func))
+        self._browser_context._on_binding(binding_call)
 
     def _on_worker(self, worker: "Worker") -> None:
         self._workers.append(worker)
@@ -284,16 +286,15 @@ def _on_close(self) -> None:
     def _on_crash(self) -> None:
         self.emit(Page.Events.Crash, self)
 
-    async def _on_dialog(self, params: Any) -> None:
+    def _on_dialog(self, params: Any) -> None:
         dialog = cast(Dialog, from_channel(params["dialog"]))
         if self.listeners(Page.Events.Dialog):
             self.emit(Page.Events.Dialog, dialog)
         else:
-            with contextlib.suppress(Exception):
-                if dialog.type == "beforeunload":
-                    await dialog.accept()
-                else:
-                    await dialog.dismiss()
+            if dialog.type == "beforeunload":
+                self._emit_sync(dialog.accept())
+            else:
+                self._emit_sync(dialog.dismiss())
 
     def _on_download(self, params: Any) -> None:
         url = params["url"]
@@ -1268,7 +1269,7 @@ async def call(self, func: Callable) -> None:
             await self._channel.send("resolve", dict(result=serialize_argument(result)))
         except Exception as e:
             tb = sys.exc_info()[2]
-            asyncio.create_task(
+            self._emit_sync(
                 self._channel.send(
                     "reject", dict(error=dict(error=serialize_error(e, tb)))
                 )
