feat(roll): roll to 1617404897000 aka opener & tracing (#611)

Author: pavelfeldman

README.md

@@ -8,7 +8,7 @@ Playwright is a Python library to automate [Chromium](https://www.chromium.org/H
 |   :---   | :---: | :---: | :---:   |
 | Chromium <!-- GEN:chromium-version -->91.0.4455.0<!-- GEN:stop --> | ✅ | ✅ | ✅ |
 | WebKit <!-- GEN:webkit-version -->14.2<!-- GEN:stop --> | ✅ | ✅ | ✅ |
-| Firefox <!-- GEN:firefox-version -->87.0b10<!-- GEN:stop --> | ✅ | ✅ | ✅ |
+| Firefox <!-- GEN:firefox-version -->88.0b6<!-- GEN:stop --> | ✅ | ✅ | ✅ |
 
 Headless execution is supported for all browsers on all platforms.
 

playwright/_impl/_browser.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import base64
 import json
 from pathlib import Path
 from types import SimpleNamespace
@@ -25,6 +26,7 @@
     ViewportSize,
 )
 from playwright._impl._browser_context import BrowserContext
+from playwright._impl._cdp_session import CDPSession
 from playwright._impl._connection import ChannelOwner, from_channel
 from playwright._impl._helper import ColorScheme, is_safe_close_error, locals_to_params
 from playwright._impl._network import serialize_headers
@@ -156,6 +158,27 @@ async def close(self) -> None:
     def version(self) -> str:
         return self._initializer["version"]
 
+    async def new_browser_cdp_session(self) -> CDPSession:
+        return from_channel(await self._channel.send("newBrowserCDPSession"))
+
+    async def start_tracing(
+        self,
+        page: Page = None,
+        path: Union[str, Path] = None,
+        screenshots: bool = None,
+        categories: List[str] = None,
+    ) -> None:
+        params = locals_to_params(locals())
+        if page:
+            params["page"] = page._channel
+        if path:
+            params["path"] = str(path)
+        await self._channel.send("startTracing", params)
+
+    async def stop_tracing(self) -> bytes:
+        encoded_binary = await self._channel.send("stopTracing")
+        return base64.b64decode(encoded_binary)
+
 
 def normalize_context_params(is_sync: bool, params: Dict) -> None:
     params["sdkLanguage"] = "python" if is_sync else "python-async"

playwright/_impl/_browser_context.py

@@ -17,10 +17,11 @@
 import json
 from pathlib import Path
 from types import SimpleNamespace
-from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Union, cast
+from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Set, Union, cast
 
 from playwright._impl._api_structures import Cookie, Geolocation, StorageState
 from playwright._impl._api_types import Error
+from playwright._impl._cdp_session import CDPSession
 from playwright._impl._connection import ChannelOwner, from_channel
 from playwright._impl._event_context_manager import EventContextManagerImpl
 from playwright._impl._helper import (
@@ -33,7 +34,7 @@
     locals_to_params,
 )
 from playwright._impl._network import Request, Route, serialize_headers
-from playwright._impl._page import BindingCall, Page
+from playwright._impl._page import BindingCall, Page, Worker
 from playwright._impl._wait_helper import WaitHelper
 
 if TYPE_CHECKING:  # pragma: no cover
@@ -43,8 +44,10 @@
 class BrowserContext(ChannelOwner):
 
     Events = SimpleNamespace(
+        BackgroundPage="backgroundpage",
         Close="close",
         Page="page",
+        ServiceWorker="serviceworker",
     )
 
     def __init__(
@@ -59,6 +62,8 @@ def __init__(
         self._owner_page: Optional[Page] = None
         self._is_closed_or_closing = False
         self._options: Dict[str, Any] = {}
+        self._background_pages: Set[Page] = set()
+        self._service_workers: Set[Worker] = set()
 
         self._channel.on(
             "bindingCall",
@@ -75,14 +80,25 @@ def __init__(
             ),
         )
 
+        self._channel.on(
+            "backgroundPage",
+            lambda params: self._on_background_page(from_channel(params["page"])),
+        )
+
+        self._channel.on(
+            "serviceWorker",
+            lambda params: self._on_service_worker(from_channel(params["worker"])),
+        )
+
     def __repr__(self) -> str:
         return f"<BrowserContext browser={self.browser}>"
 
     def _on_page(self, page: Page) -> None:
-        print("ON PAGE ARRIVED")
         page._set_browser_context(self)
         self._pages.append(page)
         self.emit(BrowserContext.Events.Page, page)
+        if page._opener and not page._opener.is_closed():
+            page._opener.emit(Page.Events.Popup, page)
 
     def _on_route(self, route: Route, request: Request) -> None:
         for handler_entry in self._routes:
@@ -262,3 +278,25 @@ def expect_page(
         timeout: float = None,
     ) -> EventContextManagerImpl[Page]:
         return self.expect_event(BrowserContext.Events.Page, predicate, timeout)
+
+    def _on_background_page(self, page: Page) -> None:
+        self._background_pages.add(page)
+        self.emit(BrowserContext.Events.BackgroundPage, page)
+
+    def _on_service_worker(self, worker: Worker) -> None:
+        worker._context = self
+        self._service_workers.add(worker)
+        self.emit(BrowserContext.Events.ServiceWorker, worker)
+
+    @property
+    def background_pages(self) -> List[Page]:
+        return list(self._background_pages)
+
+    @property
+    def service_workers(self) -> List[Worker]:
+        return list(self._service_workers)
+
+    async def new_cdp_session(self, page: Page) -> CDPSession:
+        return from_channel(
+            await self._channel.send("newCDPSession", {"page": page._channel})
+        )

playwright/_impl/_chromium_browser_context.py

@@ -19,7 +19,6 @@
 from playwright._impl._browser_context import BrowserContext
 from playwright._impl._browser_type import BrowserType
 from playwright._impl._cdp_session import CDPSession
-from playwright._impl._chromium_browser_context import ChromiumBrowserContext
 from playwright._impl._connection import ChannelOwner
 from playwright._impl._console_message import ConsoleMessage
 from playwright._impl._dialog import Dialog
@@ -52,13 +51,6 @@ def create_remote_object(
     if type == "BrowserType":
         return BrowserType(parent, type, guid, initializer)
     if type == "BrowserContext":
-        browser_name: str = ""
-        if isinstance(parent, Browser):
-            browser_name = parent._browser_type.name
-        if isinstance(parent, BrowserType):
-            browser_name = parent.name
-        if browser_name == "chromium":
-            return ChromiumBrowserContext(parent, type, guid, initializer)
         return BrowserContext(parent, type, guid, initializer)
     if type == "CDPSession":
         return CDPSession(parent, type, guid, initializer)

playwright/_impl/_object_factory.py

@@ -126,6 +126,7 @@ def __init__(
         self._owned_context: Optional["BrowserContext"] = None
         self._timeout_settings: TimeoutSettings = TimeoutSettings(None)
         self._video: Optional[Video] = None
+        self._opener = cast("Page", from_nullable_channel(initializer.get("opener")))
 
         self._channel.on(
             "bindingCall",
@@ -168,10 +169,6 @@ def __init__(
                 Page.Events.PageError, parse_error(params["error"]["error"])
             ),
         )
-        self._channel.on(
-            "popup",
-            lambda params: self.emit(Page.Events.Popup, from_channel(params["page"])),
-        )
         self._channel.on(
             "request",
             lambda params: self.emit(
@@ -316,7 +313,9 @@ def context(self) -> "BrowserContext":
         return self._browser_context
 
     async def opener(self) -> Optional["Page"]:
-        return from_nullable_channel(await self._channel.send("opener"))
+        if self._opener and self._opener.is_closed():
+            return None
+        return self._opener
 
     @property
     def main_frame(self) -> Frame:

playwright/_impl/_page.py

@@ -28,7 +28,6 @@
     BrowserContext,
     BrowserType,
     CDPSession,
-    ChromiumBrowserContext,
     ConsoleMessage,
     Dialog,
     Download,
@@ -50,6 +49,8 @@
     Worker,
 )
 
+ChromiumBrowserContext = BrowserContext
+
 Cookie = playwright._impl._api_structures.Cookie
 FilePayload = playwright._impl._api_structures.FilePayload
 FloatRect = playwright._impl._api_structures.FloatRect