Move add_listener to remote.network

Author: jman-sketch

py/selenium/webdriver/common/bidi/network.py

@@ -214,13 +214,6 @@ async def add_intercept(self, event, params: AddInterceptParameters):
         result = await self.conn.execute(AddIntercept(params).cmd())
         return result
 
-    async def add_listener(self, event, callback):
-        listener = self.conn.listen(event)
-
-        async for event in listener:
-            request_data = BeforeRequestSentParameters.from_json(event.to_json()["params"])
-            await callback(request_data)
-
     async def continue_request(self, params: ContinueRequestParameters):
         result = await self.conn.execute(ContinueRequest(params).cmd())
         return result

py/selenium/webdriver/remote/network.py

@@ -35,8 +35,11 @@ def __init__(self, driver):
         self.driver = driver
         self.intercept = None
         self.scope = None
+        self.conn = None
 
     async def add_request_handler(self, request_filter=lambda _: True, handler=default_request_handler, conn=None):
+        if not self.conn:
+            self.conn = conn
         with trio.CancelScope() as scope:
             self.scope = scope
             self.network = network.Network(conn)
@@ -45,9 +48,17 @@ async def add_request_handler(self, request_filter=lambda _: True, handler=defau
             result = await self.network.add_intercept(event=BeforeRequestSent, params=params)
             intercept = result["intercept"]
             self.intercept = intercept
-            await self.network.add_listener(event=BeforeRequestSent, callback=callback)
+            await self.add_listener(event=BeforeRequestSent, callback=callback)
             return intercept
 
+    async def add_listener(self, event, callback):
+        listener = self.conn.listen(event)
+
+        async for event in listener:
+            request_data = BeforeRequestSentParameters.from_json(event.to_json()["params"])
+            if request_data.isBlocked:
+                await callback(request_data)
+
     async def get(self, url, conn):
         params = NavigateParameters(context=self.driver.current_window_handle, url=url, wait="complete")
         await conn.execute(Navigate(params).cmd())