Skip to content

chore: cleanup route handling #973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 27, 2021
Merged

chore: cleanup route handling #973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d8fa469
chore: cleanup route handling
mxschmitt Oct 22, 2021
dbbfec4
Update playwright/_impl/_helper.py
mxschmitt Oct 27, 2021
635d55e
Update playwright/_impl/_helper.py
mxschmitt Oct 27, 2021
2e75f3a
Update _helper.py
mxschmitt Oct 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 9 additions & 15 deletions playwright/_impl/_browser_context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# limitations under the License.

import asyncio
import inspect
import json
from pathlib import Path
from types import SimpleNamespace
Expand Down Expand Up @@ -154,20 +153,14 @@ def _on_page(self, page: Page) -> None:
page._opener.emit(Page.Events.Popup, page)

def _on_route(self, route: Route, request: Request) -> None:
handled = False
for handler_entry in self._routes:
if handler_entry.matches(request.url):
result = handler_entry.handle(route, request)
if inspect.iscoroutine(result):
asyncio.create_task(result)
handled = True
if handler_entry.handle(route, request):
self._routes.remove(handler_entry)
if not len(self._routes) == 0:
asyncio.create_task(self._disable_interception())
break
if not handled:
asyncio.create_task(route.continue_())
else:
self._routes = list(
filter(lambda route: route.expired() is False, self._routes)
)
route._internal_continue()

def _on_binding(self, binding_call: BindingCall) -> None:
func = self._bindings.get(binding_call._initializer["name"])
Expand Down Expand Up @@ -279,9 +272,10 @@ async def unroute(
)
)
if len(self._routes) == 0:
await self._channel.send(
"setNetworkInterceptionEnabled", dict(enabled=False)
)
await self._disable_interception()

async def _disable_interception(self) -> None:
await self._channel.send("setNetworkInterceptionEnabled", dict(enabled=False))

def expect_event(
self,
Expand Down
22 changes: 12 additions & 10 deletions playwright/_impl/_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# limitations under the License.
import asyncio
import fnmatch
import inspect
import math
import os
import re
Expand Down Expand Up @@ -206,25 +207,26 @@ def __init__(
self,
matcher: URLMatcher,
handler: RouteHandlerCallback,
times: Optional[int],
times: Optional[int] = None,
):
self.matcher = matcher
self.handler = handler
self._times = times
self._times = times if times else 2 ** 32
self._handled_count = 0

def expired(self) -> bool:
return self._times is not None and self._handled_count >= self._times

def matches(self, request_url: str) -> bool:
return self.matcher.matches(request_url)

def handle(self, route: "Route", request: "Request") -> Union[Coroutine, Any]:
if self._times:
def handle(self, route: "Route", request: "Request") -> bool:
try:
result = cast(
Callable[["Route", "Request"], Union[Coroutine, Any]], self.handler
)(route, request)
if inspect.iscoroutine(result):
asyncio.create_task(result)
finally:
self._handled_count += 1
return cast(
Callable[["Route", "Request"], Union[Coroutine, Any]], self.handler
)(route, request)
return self._handled_count >= self._times


def is_safe_close_error(error: Exception) -> bool:
Expand Down
9 changes: 9 additions & 0 deletions playwright/_impl/_network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,15 @@ async def continue_(
overrides["postData"] = base64.b64encode(postData).decode()
await self._channel.send("continue", cast(Any, overrides))

def _internal_continue(self) -> None:
async def continue_route() -> None:
try:
await self.continue_()
except Exception:
pass

asyncio.create_task(continue_route())


class Response(ChannelOwner):
def __init__(
Expand Down
25 changes: 10 additions & 15 deletions playwright/_impl/_page.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,20 +212,14 @@ def _on_frame_detached(self, frame: Frame) -> None:
self.emit(Page.Events.FrameDetached, frame)

def _on_route(self, route: Route, request: Request) -> None:
handled = False
for handler_entry in self._routes:
if handler_entry.matches(request.url):
result = handler_entry.handle(route, request)
if inspect.iscoroutine(result):
asyncio.create_task(result)
handled = True
break
if not handled:
self._browser_context._on_route(route, request)
else:
self._routes = list(
filter(lambda route: route.expired() is False, self._routes)
)
if handler_entry.handle(route, request):
self._routes.remove(handler_entry)
if len(self._routes) == 0:
asyncio.create_task(self._disable_interception())
return
self._browser_context._on_route(route, request)

def _on_binding(self, binding_call: "BindingCall") -> None:
func = self._bindings.get(binding_call._initializer["name"])
Expand Down Expand Up @@ -575,9 +569,10 @@ async def unroute(
)
)
if len(self._routes) == 0:
await self._channel.send(
"setNetworkInterceptionEnabled", dict(enabled=False)
)
await self._disable_interception()

async def _disable_interception(self) -> None:
await self._channel.send("setNetworkInterceptionEnabled", dict(enabled=False))

async def screenshot(
self,
Expand Down