Merge pull request #136 from autoscrape-labs/fix/private-proxy

fix: private proxy not working

Author: thalissonvs

pydoll/browser/chromium/base.py

@@ -24,9 +24,10 @@
     DownloadBehavior,
     NetworkErrorReason,
     PermissionType,
+    ResourceType,
 )
 from pydoll.exceptions import BrowserNotRunning, FailedToStartBrowser, NoValidTabFound
-from pydoll.protocol.base import Command
+from pydoll.protocol.base import Command, Response
 from pydoll.protocol.browser.responses import (
     GetVersionResponse,
     GetVersionResultDict,
@@ -367,7 +368,9 @@ async def callback_wrapper(event):
         )
 
     async def enable_fetch_events(
-        self, handle_auth_requests: bool = False, resource_type: str = ''
+        self,
+        handle_auth_requests: bool = False,
+        resource_type: Optional[ResourceType] = None,
     ):
         """
         Enable network request interception via Fetch domain.
@@ -383,7 +386,10 @@ async def enable_fetch_events(
             Paused requests must be continued or they will timeout.
         """
         return await self._connection_handler.execute_command(
-            FetchCommands.enable(handle_auth_requests, resource_type)
+            FetchCommands.enable(
+                handle_auth_requests=handle_auth_requests,
+                resource_type=resource_type,
+            )
         )
 
     async def disable_fetch_events(self):
@@ -444,15 +450,16 @@ async def _continue_request_with_auth_callback(
     ):
         """Internal callback for proxy authentication."""
         request_id = event['params']['requestId']
-        await self.disable_fetch_events()
-        return await self._execute_command(
+        response: Response = await self._execute_command(
             FetchCommands.continue_request_with_auth(
                 request_id,
                 auth_challenge_response=AuthChallengeResponseValues.PROVIDE_CREDENTIALS,
                 proxy_username=proxy_username,
                 proxy_password=proxy_password,
             )
         )
+        await self.disable_fetch_events()
+        return response
 
     async def _verify_browser_running(self):
         """

tests/test_browser/test_browser_base.py

@@ -118,7 +118,7 @@ async def test_proxy_configuration(mock_browser):
     await mock_browser.start()
 
     mock_browser._connection_handler.execute_command.assert_any_call(
-        FetchCommands.enable(True, '')
+        FetchCommands.enable(handle_auth_requests=True, resource_type=None)
     )
     mock_browser._connection_handler.register_callback.assert_any_call(
         FetchEvent.REQUEST_PAUSED, ANY, True
@@ -257,7 +257,7 @@ async def test_enable_events(mock_browser):
         handle_auth_requests=True, resource_type='XHR'
     )
     mock_browser._connection_handler.execute_command.assert_called_with(
-        FetchCommands.enable(True, 'XHR')
+        FetchCommands.enable(handle_auth_requests=True, resource_type='XHR')
     )