rebrowser-playwright-core 1.47.100 → 1.49.0

package/lib/server/registry/nativeDeps.js

@@ -129,8 +129,9 @@ const deps = exports.deps = {
     tools: ['xvfb', 'fonts-noto-color-emoji', 'fonts-unifont', 'libfontconfig1', 'libfreetype6', 'xfonts-cyrillic', 'xfonts-scalable', 'fonts-liberation', 'fonts-ipafont-gothic', 'fonts-wqy-zenhei', 'fonts-tlwg-loma-otf', 'fonts-freefont-ttf'],
     chromium: ['libasound2', 'libatk-bridge2.0-0', 'libatk1.0-0', 'libatspi2.0-0', 'libcairo2', 'libcups2', 'libdbus-1-3', 'libdrm2', 'libgbm1', 'libglib2.0-0', 'libnspr4', 'libnss3', 'libpango-1.0-0', 'libwayland-client0', 'libx11-6', 'libxcb1', 'libxcomposite1', 'libxdamage1', 'libxext6', 'libxfixes3', 'libxkbcommon0', 'libxrandr2'],
     firefox: ['ffmpeg', 'libasound2', 'libatk1.0-0', 'libcairo-gobject2', 'libcairo2', 'libdbus-1-3', 'libdbus-glib-1-2', 'libfontconfig1', 'libfreetype6', 'libgdk-pixbuf-2.0-0', 'libglib2.0-0', 'libgtk-3-0', 'libpango-1.0-0', 'libpangocairo-1.0-0', 'libx11-6', 'libx11-xcb1', 'libxcb-shm0', 'libxcb1', 'libxcomposite1', 'libxcursor1', 'libxdamage1', 'libxext6', 'libxfixes3', 'libxi6', 'libxrandr2', 'libxrender1', 'libxtst6'],
-    webkit: ['libsoup-3.0-0', 'libenchant-2-2', 'gstreamer1.0-libav', 'gstreamer1.0-plugins-bad', 'gstreamer1.0-plugins-base', 'gstreamer1.0-plugins-good', 'libicu70', 'libatk-bridge2.0-0', 'libatk1.0-0', 'libcairo2', 'libdbus-1-3', 'libdrm2', 'libegl1', 'libepoxy0', 'libevdev2', 'libffi7', 'libfontconfig1', 'libfreetype6', 'libgbm1', 'libgdk-pixbuf-2.0-0', 'libgles2', 'libglib2.0-0', 'libglx0', 'libgstreamer-gl1.0-0', 'libgstreamer-plugins-base1.0-0', 'libgstreamer1.0-0', 'libgtk-3-0', 'libgudev-1.0-0', 'libharfbuzz-icu0', 'libharfbuzz0b', 'libhyphen0', 'libjpeg-turbo8', 'liblcms2-2', 'libmanette-0.2-0', 'libnotify4', 'libopengl0', 'libopenjp2-7', 'libopus0', 'libpango-1.0-0', 'libpng16-16', 'libproxy1v5', 'libsecret-1-0', 'libwayland-client0', 'libwayland-egl1', 'libwayland-server0', 'libwebpdemux2', 'libwoff1', 'libx11-6', 'libxcomposite1', 'libxdamage1', 'libxkbcommon0', 'libxml2', 'libxslt1.1', 'libx264-163', 'libatomic1', 'libevent-2.1-7'],
+    webkit: ['libsoup-3.0-0', 'libenchant-2-2', 'gstreamer1.0-libav', 'gstreamer1.0-plugins-bad', 'gstreamer1.0-plugins-base', 'gstreamer1.0-plugins-good', 'libicu70', 'libatk-bridge2.0-0', 'libatk1.0-0', 'libcairo2', 'libdbus-1-3', 'libdrm2', 'libegl1', 'libepoxy0', 'libevdev2', 'libffi7', 'libfontconfig1', 'libfreetype6', 'libgbm1', 'libgdk-pixbuf-2.0-0', 'libgles2', 'libglib2.0-0', 'libglx0', 'libgstreamer-gl1.0-0', 'libgstreamer-plugins-base1.0-0', 'libgstreamer1.0-0', 'libgtk-3-0', 'libgudev-1.0-0', 'libharfbuzz-icu0', 'libharfbuzz0b', 'libhyphen0', 'libjpeg-turbo8', 'liblcms2-2', 'libmanette-0.2-0', 'libnotify4', 'libopengl0', 'libopenjp2-7', 'libopus0', 'libpango-1.0-0', 'libpng16-16', 'libproxy1v5', 'libsecret-1-0', 'libwayland-client0', 'libwayland-egl1', 'libwayland-server0', 'libwebpdemux2', 'libwoff1', 'libx11-6', 'libxcomposite1', 'libxdamage1', 'libxkbcommon0', 'libxml2', 'libxslt1.1', 'libx264-163', 'libatomic1', 'libevent-2.1-7', 'libavif13'],
     lib2package: {
+      'libavif.so.13': 'libavif13',
       'libsoup-3.0.so.0': 'libsoup-3.0-0',
       'libasound.so.2': 'libasound2',
       'libatk-1.0.so.0': 'libatk1.0-0',
@@ -224,8 +225,9 @@ const deps = exports.deps = {
     tools: ['xvfb', 'fonts-noto-color-emoji', 'fonts-unifont', 'libfontconfig1', 'libfreetype6', 'xfonts-cyrillic', 'xfonts-scalable', 'fonts-liberation', 'fonts-ipafont-gothic', 'fonts-wqy-zenhei', 'fonts-tlwg-loma-otf', 'fonts-freefont-ttf'],
     chromium: ['libasound2t64', 'libatk-bridge2.0-0t64', 'libatk1.0-0t64', 'libatspi2.0-0t64', 'libcairo2', 'libcups2t64', 'libdbus-1-3', 'libdrm2', 'libgbm1', 'libglib2.0-0t64', 'libnspr4', 'libnss3', 'libpango-1.0-0', 'libx11-6', 'libxcb1', 'libxcomposite1', 'libxdamage1', 'libxext6', 'libxfixes3', 'libxkbcommon0', 'libxrandr2'],
     firefox: ['libasound2t64', 'libatk1.0-0t64', 'libcairo-gobject2', 'libcairo2', 'libdbus-1-3', 'libfontconfig1', 'libfreetype6', 'libgdk-pixbuf-2.0-0', 'libglib2.0-0t64', 'libgtk-3-0t64', 'libpango-1.0-0', 'libpangocairo-1.0-0', 'libx11-6', 'libx11-xcb1', 'libxcb-shm0', 'libxcb1', 'libxcomposite1', 'libxcursor1', 'libxdamage1', 'libxext6', 'libxfixes3', 'libxi6', 'libxrandr2', 'libxrender1'],
-    webkit: ['gstreamer1.0-libav', 'gstreamer1.0-plugins-bad', 'gstreamer1.0-plugins-base', 'gstreamer1.0-plugins-good', 'libicu74', 'libatomic1', 'libatk-bridge2.0-0t64', 'libatk1.0-0t64', 'libcairo-gobject2', 'libcairo2', 'libdbus-1-3', 'libdrm2', 'libenchant-2-2', 'libepoxy0', 'libevent-2.1-7t64', 'libflite1', 'libfontconfig1', 'libfreetype6', 'libgbm1', 'libgdk-pixbuf-2.0-0', 'libgles2', 'libglib2.0-0t64', 'libgstreamer-gl1.0-0', 'libgstreamer-plugins-bad1.0-0', 'libgstreamer-plugins-base1.0-0', 'libgstreamer1.0-0', 'libgtk-3-0t64', 'libharfbuzz-icu0', 'libharfbuzz0b', 'libhyphen0', 'libicu74', 'libjpeg-turbo8', 'liblcms2-2', 'libmanette-0.2-0', 'libopus0', 'libpango-1.0-0', 'libpangocairo-1.0-0', 'libpng16-16t64', 'libsecret-1-0', 'libvpx9', 'libwayland-client0', 'libwayland-egl1', 'libwayland-server0', 'libwebp7', 'libwebpdemux2', 'libwoff1', 'libx11-6', 'libxkbcommon0', 'libxml2', 'libxslt1.1', 'libx264-164'],
+    webkit: ['gstreamer1.0-libav', 'gstreamer1.0-plugins-bad', 'gstreamer1.0-plugins-base', 'gstreamer1.0-plugins-good', 'libicu74', 'libatomic1', 'libatk-bridge2.0-0t64', 'libatk1.0-0t64', 'libcairo-gobject2', 'libcairo2', 'libdbus-1-3', 'libdrm2', 'libenchant-2-2', 'libepoxy0', 'libevent-2.1-7t64', 'libflite1', 'libfontconfig1', 'libfreetype6', 'libgbm1', 'libgdk-pixbuf-2.0-0', 'libgles2', 'libglib2.0-0t64', 'libgstreamer-gl1.0-0', 'libgstreamer-plugins-bad1.0-0', 'libgstreamer-plugins-base1.0-0', 'libgstreamer1.0-0', 'libgtk-3-0t64', 'libharfbuzz-icu0', 'libharfbuzz0b', 'libhyphen0', 'libicu74', 'libjpeg-turbo8', 'liblcms2-2', 'libmanette-0.2-0', 'libopus0', 'libpango-1.0-0', 'libpangocairo-1.0-0', 'libpng16-16t64', 'libsecret-1-0', 'libvpx9', 'libwayland-client0', 'libwayland-egl1', 'libwayland-server0', 'libwebp7', 'libwebpdemux2', 'libwoff1', 'libx11-6', 'libxkbcommon0', 'libxml2', 'libxslt1.1', 'libx264-164', 'libavif16'],
     lib2package: {
+      'libavif.so.16': 'libavif16',
       'libasound.so.2': 'libasound2t64',
       'libatk-1.0.so.0': 'libatk1.0-0t64',
       'libatk-bridge-2.0.so.0': 'libatk-bridge2.0-0t64',
@@ -412,8 +414,9 @@ const deps = exports.deps = {
     tools: ['xvfb', 'fonts-noto-color-emoji', 'fonts-unifont', 'libfontconfig1', 'libfreetype6', 'xfonts-scalable', 'fonts-liberation', 'fonts-ipafont-gothic', 'fonts-wqy-zenhei', 'fonts-tlwg-loma-otf', 'fonts-freefont-ttf'],
     chromium: ['libasound2', 'libatk-bridge2.0-0', 'libatk1.0-0', 'libatspi2.0-0', 'libcairo2', 'libcups2', 'libdbus-1-3', 'libdrm2', 'libgbm1', 'libglib2.0-0', 'libnspr4', 'libnss3', 'libpango-1.0-0', 'libx11-6', 'libxcb1', 'libxcomposite1', 'libxdamage1', 'libxext6', 'libxfixes3', 'libxkbcommon0', 'libxrandr2'],
     firefox: ['libasound2', 'libatk1.0-0', 'libcairo-gobject2', 'libcairo2', 'libdbus-1-3', 'libdbus-glib-1-2', 'libfontconfig1', 'libfreetype6', 'libgdk-pixbuf-2.0-0', 'libglib2.0-0', 'libgtk-3-0', 'libharfbuzz0b', 'libpango-1.0-0', 'libpangocairo-1.0-0', 'libx11-6', 'libx11-xcb1', 'libxcb-shm0', 'libxcb1', 'libxcomposite1', 'libxcursor1', 'libxdamage1', 'libxext6', 'libxfixes3', 'libxi6', 'libxrandr2', 'libxrender1', 'libxtst6'],
-    webkit: ['libsoup-3.0-0', 'gstreamer1.0-libav', 'gstreamer1.0-plugins-bad', 'gstreamer1.0-plugins-base', 'gstreamer1.0-plugins-good', 'libatk-bridge2.0-0', 'libatk1.0-0', 'libcairo2', 'libdbus-1-3', 'libdrm2', 'libegl1', 'libenchant-2-2', 'libepoxy0', 'libevdev2', 'libfontconfig1', 'libfreetype6', 'libgbm1', 'libgdk-pixbuf-2.0-0', 'libgles2', 'libglib2.0-0', 'libglx0', 'libgstreamer-gl1.0-0', 'libgstreamer-plugins-base1.0-0', 'libgstreamer1.0-0', 'libgtk-3-0', 'libgudev-1.0-0', 'libharfbuzz-icu0', 'libharfbuzz0b', 'libhyphen0', 'libicu72', 'libjpeg62-turbo', 'liblcms2-2', 'libmanette-0.2-0', 'libnotify4', 'libopengl0', 'libopenjp2-7', 'libopus0', 'libpango-1.0-0', 'libpng16-16', 'libproxy1v5', 'libsecret-1-0', 'libwayland-client0', 'libwayland-egl1', 'libwayland-server0', 'libwebp7', 'libwebpdemux2', 'libwoff1', 'libx11-6', 'libxcomposite1', 'libxdamage1', 'libxkbcommon0', 'libxml2', 'libxslt1.1', 'libatomic1', 'libevent-2.1-7'],
+    webkit: ['libsoup-3.0-0', 'gstreamer1.0-libav', 'gstreamer1.0-plugins-bad', 'gstreamer1.0-plugins-base', 'gstreamer1.0-plugins-good', 'libatk-bridge2.0-0', 'libatk1.0-0', 'libcairo2', 'libdbus-1-3', 'libdrm2', 'libegl1', 'libenchant-2-2', 'libepoxy0', 'libevdev2', 'libfontconfig1', 'libfreetype6', 'libgbm1', 'libgdk-pixbuf-2.0-0', 'libgles2', 'libglib2.0-0', 'libglx0', 'libgstreamer-gl1.0-0', 'libgstreamer-plugins-base1.0-0', 'libgstreamer1.0-0', 'libgtk-3-0', 'libgudev-1.0-0', 'libharfbuzz-icu0', 'libharfbuzz0b', 'libhyphen0', 'libicu72', 'libjpeg62-turbo', 'liblcms2-2', 'libmanette-0.2-0', 'libnotify4', 'libopengl0', 'libopenjp2-7', 'libopus0', 'libpango-1.0-0', 'libpng16-16', 'libproxy1v5', 'libsecret-1-0', 'libwayland-client0', 'libwayland-egl1', 'libwayland-server0', 'libwebp7', 'libwebpdemux2', 'libwoff1', 'libx11-6', 'libxcomposite1', 'libxdamage1', 'libxkbcommon0', 'libxml2', 'libxslt1.1', 'libatomic1', 'libevent-2.1-7', 'libavif15'],
     lib2package: {
+      'libavif.so.15': 'libavif15',
       'libsoup-3.0.so.0': 'libsoup-3.0-0',
       'libasound.so.2': 'libasound2',
       'libatk-1.0.so.0': 'libatk1.0-0',

package/lib/server/socksClientCertificatesInterceptor.js

@@ -14,6 +14,9 @@ var _happyEyeballs = require("../utils/happy-eyeballs");
 var _utils = require("../utils");
 var _socksProxy = require("../common/socksProxy");
 var _debugLogger = require("../utils/debugLogger");
+var _fetch = require("./fetch");
+var _events = require("events");
+var _browserContext = require("./browserContext");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * Copyright (c) Microsoft Corporation.
@@ -104,7 +107,11 @@ class SocksProxyConnection {
     };
   }
   async connect() {
-    this.target = await (0, _happyEyeballs.createSocket)(rewriteToLocalhostIfNeeded(this.host), this.port);
+    if (this.socksProxy.proxyAgentFromOptions) this.target = await this.socksProxy.proxyAgentFromOptions.connect(new _events.EventEmitter(), {
+      host: rewriteToLocalhostIfNeeded(this.host),
+      port: this.port,
+      secureEndpoint: false
+    });else this.target = await (0, _happyEyeballs.createSocket)(rewriteToLocalhostIfNeeded(this.host), this.port);
     this.target.once('close', this._targetCloseEventListener);
     this.target.once('error', error => this.socksProxy._socksProxy.sendSocketError({
       uid: this.uid,
@@ -231,8 +238,11 @@ class ClientCertificatesProxy {
     this.ignoreHTTPSErrors = void 0;
     this.secureContextMap = new Map();
     this.alpnCache = void 0;
+    this.proxyAgentFromOptions = void 0;
+    (0, _browserContext.verifyClientCertificates)(contextOptions.clientCertificates);
     this.alpnCache = new ALPNCache();
     this.ignoreHTTPSErrors = contextOptions.ignoreHTTPSErrors;
+    this.proxyAgentFromOptions = contextOptions.proxy ? (0, _fetch.createProxyAgent)(contextOptions.proxy) : undefined;
     this._initSecureContexts(contextOptions.clientCertificates);
     this._socksProxy = new _socksProxy.SocksProxy();
     this._socksProxy.setPattern('*');
@@ -281,7 +291,9 @@ class ClientCertificatesProxy {
   }
   async listen() {
     const port = await this._socksProxy.listen(0, '127.0.0.1');
-    return `socks5://127.0.0.1:${port}`;
+    return {
+      server: `socks5://127.0.0.1:${port}`
+    };
   }
   async close() {
     await this._socksProxy.close();
@@ -323,6 +335,6 @@ function rewriteToLocalhostIfNeeded(host) {
   return host === 'local.playwright' ? 'localhost' : host;
 }
 function rewriteOpenSSLErrorIfNeeded(error) {
-  if (error.message !== 'unsupported') return error;
+  if (error.message !== 'unsupported' && error.code !== 'ERR_CRYPTO_UNSUPPORTED_OPERATION') return error;
   return (0, _utils.rewriteErrorMessage)(error, ['Unsupported TLS certificate.', 'Most likely, the security algorithm of the given certificate was deprecated by OpenSSL.', 'For more details, see https://github.com/openssl/openssl/blob/master/README-PROVIDERS.md#the-legacy-provider', 'You could probably modernize the certificate by following the steps at https://github.com/nodejs/node/issues/40672#issuecomment-1243648223'].join('\n'));
 }

package/lib/server/trace/recorder/snapshotter.js

@@ -81,21 +81,10 @@ class Snapshotter {
   dispose() {
     _eventsHelper.eventsHelper.removeEventListeners(this._eventListeners);
   }
-  async captureSnapshot(page, callId, snapshotName, element) {
+  async captureSnapshot(page, callId, snapshotName) {
     // Prepare expression synchronously.
     const expression = `window["${this._snapshotStreamer}"].captureSnapshot(${JSON.stringify(snapshotName)})`;
 
-    // In a best-effort manner, without waiting for it, mark target element.
-    element === null || element === void 0 || element.callFunctionNoReply((element, callId) => {
-      const customEvent = new CustomEvent('__playwright_target__', {
-        bubbles: true,
-        cancelable: true,
-        detail: callId,
-        composed: true
-      });
-      element.dispatchEvent(customEvent);
-    }, callId);
-
     // In each frame, in a non-stalling manner, capture the snapshots.
     const snapshots = page.frames().map(async frame => {
       const data = await frame.nonStallingRawEvaluateInExistingMainContext(expression).catch(e => _debugLogger.debugLogger.log('error', e));
@@ -111,6 +100,7 @@ class Snapshotter {
         html: data.html,
         viewport: data.viewport,
         timestamp: (0, _utils.monotonicTime)(),
+        wallTime: data.wallTime,
         collectionTime: data.collectionTime,
         resourceOverrides: [],
         isMainFrame: page.mainFrame() === frame

package/lib/server/trace/recorder/snapshotterInjected.js

@@ -35,6 +35,7 @@ function frameSnapshotStreamer(snapshotStreamer, removeNoScript) {
   const kTargetAttribute = '__playwright_target__';
   const kCustomElementsAttribute = '__playwright_custom_elements__';
   const kCurrentSrcAttribute = '__playwright_current_src__';
+  const kBoundingRectAttribute = '__playwright_bounding_rect__';
 
   // Symbols for our own info on Nodes/StyleSheets.
   const kSnapshotFrameId = Symbol('__playwright_snapshot_frameid_');
@@ -112,11 +113,16 @@ function frameSnapshotStreamer(snapshotStreamer, removeNoScript) {
       });
     }
     _refreshListeners() {
-      document.addEventListener('__playwright_target__', event => {
+      document.addEventListener('__playwright_mark_target__', event => {
         if (!event.detail) return;
         const callId = event.detail;
         event.composedPath()[0].__playwright_target__ = callId;
       });
+      document.addEventListener('__playwright_unmark_target__', event => {
+        if (!event.detail) return;
+        const callId = event.detail;
+        if (event.composedPath()[0].__playwright_target__ === callId) delete event.composedPath()[0].__playwright_target__;
+      });
     }
     _interceptNativeMethod(obj, method, cb) {
       const native = obj[method];
@@ -348,6 +354,18 @@ function frameSnapshotStreamer(snapshotStreamer, removeNoScript) {
             expectValue(value);
             attrs[kSelectedAttribute] = value;
           }
+          if (nodeName === 'CANVAS') {
+            const boundingRect = element.getBoundingClientRect();
+            const value = JSON.stringify({
+              left: boundingRect.left / window.innerWidth,
+              top: boundingRect.top / window.innerHeight,
+              right: boundingRect.right / window.innerWidth,
+              bottom: boundingRect.bottom / window.innerHeight
+            });
+            expectValue(kBoundingRectAttribute);
+            expectValue(value);
+            attrs[kBoundingRectAttribute] = value;
+          }
           if (element.scrollTop) {
             expectValue(kScrollTopAttribute);
             expectValue(element.scrollTop);
@@ -467,7 +485,7 @@ function frameSnapshotStreamer(snapshotStreamer, removeNoScript) {
           height: window.innerHeight
         },
         url: location.href,
-        timestamp,
+        wallTime: Date.now(),
         collectionTime: 0
       };
       for (const sheet of this._staleStyleSheets) {
@@ -485,7 +503,7 @@ function frameSnapshotStreamer(snapshotStreamer, removeNoScript) {
           contentType: 'text/css'
         });
       }
-      result.collectionTime = performance.now() - result.timestamp;
+      result.collectionTime = performance.now() - timestamp;
       return result;
     }
   }

package/lib/server/trace/recorder/tracing.js

@@ -120,7 +120,8 @@ class Tracing extends _instrumentation.SdkObject {
       traceSha1s: new Set(),
       networkSha1s: new Set(),
       recording: false,
-      callIds: new Set()
+      callIds: new Set(),
+      groupStack: []
     };
     this._fs.mkdir(this._state.resourcesDir);
     this._fs.writeFile(this._state.networkFile, '');
@@ -146,7 +147,7 @@ class Tracing extends _instrumentation.SdkObject {
       wallTime: Date.now(),
       monotonicTime: (0, _utils.monotonicTime)()
     };
-    this._fs.appendFile(this._state.traceFile, JSON.stringify(event) + '\n');
+    this._appendTraceEvent(event);
     this._context.instrumentation.addListener(this, this._context);
     this._eventListeners.push(_utils.eventsHelper.addEventListener(this._context, _browserContext.BrowserContext.Events.Console, this._onConsoleMessage.bind(this)), _utils.eventsHelper.addEventListener(this._context, _browserContext.BrowserContext.Events.PageError, this._onPageError.bind(this)));
     if (this._state.options.screenshots) this._startScreencast();
@@ -155,6 +156,52 @@ class Tracing extends _instrumentation.SdkObject {
       traceName: this._state.traceName
     };
   }
+  _currentGroupId() {
+    var _this$_state;
+    return (_this$_state = this._state) !== null && _this$_state !== void 0 && _this$_state.groupStack.length ? this._state.groupStack[this._state.groupStack.length - 1] : undefined;
+  }
+  async group(name, location, metadata) {
+    var _ref;
+    if (!this._state) return;
+    const stackFrames = [];
+    const {
+      file,
+      line,
+      column
+    } = (_ref = location !== null && location !== void 0 ? location : metadata.location) !== null && _ref !== void 0 ? _ref : {};
+    if (file) {
+      stackFrames.push({
+        file,
+        line: line !== null && line !== void 0 ? line : 0,
+        column: column !== null && column !== void 0 ? column : 0
+      });
+    }
+    const event = {
+      type: 'before',
+      callId: metadata.id,
+      startTime: metadata.startTime,
+      apiName: name,
+      class: 'Tracing',
+      method: 'tracingGroup',
+      params: {},
+      stepId: metadata.stepId,
+      stack: stackFrames
+    };
+    if (this._currentGroupId()) event.parentId = this._currentGroupId();
+    this._state.groupStack.push(event.callId);
+    this._appendTraceEvent(event);
+  }
+  groupEnd() {
+    if (!this._state) return;
+    const callId = this._state.groupStack.pop();
+    if (!callId) return;
+    const event = {
+      type: 'after',
+      callId,
+      endTime: (0, _utils.monotonicTime)()
+    };
+    this._appendTraceEvent(event);
+  }
   _startScreencast() {
     if (!(this._context instanceof _browserContext.BrowserContext)) return;
     for (const page of this._context.pages()) this._startScreencastInPage(page);
@@ -184,6 +231,7 @@ class Tracing extends _instrumentation.SdkObject {
     if (!this._state) return;
     if (this._isStopping) throw new Error(`Tracing is already stopping`);
     if (this._state.recording) throw new Error(`Must stop trace file before stopping tracing`);
+    this._closeAllGroups();
     this._harTracer.stop();
     this.flushHarEntries();
     await this._fs.syncAndGetError();
@@ -206,6 +254,9 @@ class Tracing extends _instrumentation.SdkObject {
     this.abort();
     await this._fs.syncAndGetError();
   }
+  _closeAllGroups() {
+    while (this._currentGroupId()) this.groupEnd();
+  }
   async stopChunk(params) {
     var _this$_snapshotter4;
     if (this._isStopping) throw new Error(`Tracing is already stopping`);
@@ -215,6 +266,7 @@ class Tracing extends _instrumentation.SdkObject {
       if (params.mode !== 'discard') throw new Error(`Must start tracing before stopping`);
       return {};
     }
+    this._closeAllGroups();
     this._context.instrumentation.removeListener(this);
     _utils.eventsHelper.removeEventListeners(this._eventListeners);
     if (this._state.options.screenshots) this._stopScreencast();
@@ -275,34 +327,34 @@ class Tracing extends _instrumentation.SdkObject {
       artifact
     };
   }
-  async _captureSnapshot(snapshotName, sdkObject, metadata, element) {
+  async _captureSnapshot(snapshotName, sdkObject, metadata) {
     if (!this._snapshotter) return;
     if (!sdkObject.attribution.page) return;
     if (!this._snapshotter.started()) return;
     if (!shouldCaptureSnapshot(metadata)) return;
-    await this._snapshotter.captureSnapshot(sdkObject.attribution.page, metadata.id, snapshotName, element).catch(() => {});
+    await this._snapshotter.captureSnapshot(sdkObject.attribution.page, metadata.id, snapshotName).catch(() => {});
   }
   onBeforeCall(sdkObject, metadata) {
-    var _sdkObject$attributio, _this$_state;
+    var _sdkObject$attributio, _this$_state2;
     // IMPORTANT: no awaits before this._appendTraceEvent in this method.
-    const event = createBeforeActionTraceEvent(metadata);
+    const event = createBeforeActionTraceEvent(metadata, this._currentGroupId());
     if (!event) return Promise.resolve();
     (_sdkObject$attributio = sdkObject.attribution.page) === null || _sdkObject$attributio === void 0 || _sdkObject$attributio.temporarilyDisableTracingScreencastThrottling();
     event.beforeSnapshot = `before@${metadata.id}`;
-    (_this$_state = this._state) === null || _this$_state === void 0 || _this$_state.callIds.add(metadata.id);
+    (_this$_state2 = this._state) === null || _this$_state2 === void 0 || _this$_state2.callIds.add(metadata.id);
     this._appendTraceEvent(event);
     return this._captureSnapshot(event.beforeSnapshot, sdkObject, metadata);
   }
-  onBeforeInputAction(sdkObject, metadata, element) {
-    var _this$_state2, _sdkObject$attributio2;
-    if (!((_this$_state2 = this._state) !== null && _this$_state2 !== void 0 && _this$_state2.callIds.has(metadata.id))) return Promise.resolve();
+  onBeforeInputAction(sdkObject, metadata) {
+    var _this$_state3, _sdkObject$attributio2;
+    if (!((_this$_state3 = this._state) !== null && _this$_state3 !== void 0 && _this$_state3.callIds.has(metadata.id))) return Promise.resolve();
     // IMPORTANT: no awaits before this._appendTraceEvent in this method.
     const event = createInputActionTraceEvent(metadata);
     if (!event) return Promise.resolve();
     (_sdkObject$attributio2 = sdkObject.attribution.page) === null || _sdkObject$attributio2 === void 0 || _sdkObject$attributio2.temporarilyDisableTracingScreencastThrottling();
     event.inputSnapshot = `input@${metadata.id}`;
     this._appendTraceEvent(event);
-    return this._captureSnapshot(event.inputSnapshot, sdkObject, metadata, element);
+    return this._captureSnapshot(event.inputSnapshot, sdkObject, metadata);
   }
   onCallLog(sdkObject, metadata, logName, message) {
     if (metadata.isServerSide || metadata.internal) return;
@@ -311,9 +363,9 @@ class Tracing extends _instrumentation.SdkObject {
     if (event) this._appendTraceEvent(event);
   }
   async onAfterCall(sdkObject, metadata) {
-    var _this$_state3, _this$_state4, _sdkObject$attributio3;
-    if (!((_this$_state3 = this._state) !== null && _this$_state3 !== void 0 && _this$_state3.callIds.has(metadata.id))) return;
-    (_this$_state4 = this._state) === null || _this$_state4 === void 0 || _this$_state4.callIds.delete(metadata.id);
+    var _this$_state4, _this$_state5, _sdkObject$attributio3;
+    if (!((_this$_state4 = this._state) !== null && _this$_state4 !== void 0 && _this$_state4.callIds.has(metadata.id))) return;
+    (_this$_state5 = this._state) === null || _this$_state5 === void 0 || _this$_state5.callIds.delete(metadata.id);
     const event = createAfterActionTraceEvent(metadata);
     if (!event) return;
     (_sdkObject$attributio3 = sdkObject.attribution.page) === null || _sdkObject$attributio3 === void 0 || _sdkObject$attributio3.temporarilyDisableTracingScreencastThrottling();
@@ -374,6 +426,61 @@ class Tracing extends _instrumentation.SdkObject {
     };
     this._appendTraceEvent(event);
   }
+  onDialog(dialog) {
+    const event = {
+      type: 'event',
+      time: (0, _utils.monotonicTime)(),
+      class: 'BrowserContext',
+      method: 'dialog',
+      params: {
+        pageId: dialog.page().guid,
+        type: dialog.type(),
+        message: dialog.message(),
+        defaultValue: dialog.defaultValue()
+      }
+    };
+    this._appendTraceEvent(event);
+  }
+  onDownload(page, download) {
+    const event = {
+      type: 'event',
+      time: (0, _utils.monotonicTime)(),
+      class: 'BrowserContext',
+      method: 'download',
+      params: {
+        pageId: page.guid,
+        url: download.url,
+        suggestedFilename: download.suggestedFilename()
+      }
+    };
+    this._appendTraceEvent(event);
+  }
+  onPageOpen(page) {
+    var _page$opener;
+    const event = {
+      type: 'event',
+      time: (0, _utils.monotonicTime)(),
+      class: 'BrowserContext',
+      method: 'page',
+      params: {
+        pageId: page.guid,
+        openerPageId: (_page$opener = page.opener()) === null || _page$opener === void 0 ? void 0 : _page$opener.guid
+      }
+    };
+    this._appendTraceEvent(event);
+  }
+  onPageClose(page) {
+    const event = {
+      type: 'event',
+      time: (0, _utils.monotonicTime)(),
+      class: 'BrowserContext',
+      method: 'pageClosed',
+      params: {
+        pageId: page.guid
+      }
+    };
+    this._appendTraceEvent(event);
+  }
   _onPageError(error, page) {
     const event = {
       type: 'event',
@@ -399,7 +506,8 @@ class Tracing extends _instrumentation.SdkObject {
         sha1,
         width: params.width,
         height: params.height,
-        timestamp: (0, _utils.monotonicTime)()
+        timestamp: (0, _utils.monotonicTime)(),
+        frameSwapWallTime: params.frameSwapWallTime
       };
       // Make sure to write the screencast frame before adding a reference to it.
       this._appendResource(sha1, params.buffer);
@@ -441,9 +549,9 @@ function visitTraceEvent(object, sha1s) {
 function shouldCaptureSnapshot(metadata) {
   return _debug.commandsWithTracingSnapshots.has(metadata.type + '.' + metadata.method);
 }
-function createBeforeActionTraceEvent(metadata) {
+function createBeforeActionTraceEvent(metadata, parentId) {
   if (metadata.internal || metadata.method.startsWith('tracing')) return null;
-  return {
+  const event = {
     type: 'before',
     callId: metadata.id,
     startTime: metadata.startTime,
@@ -454,6 +562,8 @@ function createBeforeActionTraceEvent(metadata) {
     stepId: metadata.stepId,
     pageId: metadata.pageId
   };
+  if (parentId) event.parentId = parentId;
+  return event;
 }
 function createInputActionTraceEvent(metadata) {
   if (metadata.internal || metadata.method.startsWith('tracing')) return null;

package/lib/server/trace/test/inMemorySnapshotter.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.InMemorySnapshotter = void 0;
-var _snapshotStorage = require("../../../../../trace-viewer/src/snapshotStorage");
+var _snapshotStorage = require("../../../../../trace-viewer/src/sw/snapshotStorage");
 var _snapshotter = require("../recorder/snapshotter");
 var _harTracer = require("../../har/harTracer");
 var _utils = require("../../../utils");
@@ -60,9 +60,9 @@ class InMemorySnapshotter {
     await this._harTracer.flush();
     this._harTracer.stop();
   }
-  async captureSnapshot(page, callId, snapshotName, element) {
+  async captureSnapshot(page, callId, snapshotName) {
     if (this._snapshotReadyPromises.has(snapshotName)) throw new Error('Duplicate snapshot name: ' + snapshotName);
-    this._snapshotter.captureSnapshot(page, callId, snapshotName, element).catch(() => {});
+    this._snapshotter.captureSnapshot(page, callId, snapshotName).catch(() => {});
     const promise = new _utils.ManualPromise();
     this._snapshotReadyPromises.set(snapshotName, promise);
     return promise;
@@ -80,7 +80,7 @@ class InMemorySnapshotter {
   onFrameSnapshot(snapshot) {
     var _this$_snapshotReadyP;
     ++this._snapshotCount;
-    const renderer = this._storage.addFrameSnapshot(snapshot);
+    const renderer = this._storage.addFrameSnapshot(snapshot, []);
     (_this$_snapshotReadyP = this._snapshotReadyPromises.get(snapshot.snapshotName || '')) === null || _this$_snapshotReadyP === void 0 || _this$_snapshotReadyP.resolve(renderer);
   }
   async resourceContentForTest(sha1) {

package/lib/server/trace/viewer/traceViewer.js

@@ -84,6 +84,7 @@ async function startTraceViewerServer(options) {
 }
 async function installRootRedirect(server, traceUrls, options) {
   const params = new URLSearchParams();
+  if (_path.default.sep !== _path.default.posix.sep) params.set('pathSeparator', _path.default.sep);
   for (const traceUrl of traceUrls) params.append('trace', traceUrl);
   if (server.wsGuid()) params.append('ws', server.wsGuid());
   if (options !== null && options !== void 0 && options.isServer) params.append('isServer', '');
@@ -92,11 +93,6 @@ async function installRootRedirect(server, traceUrls, options) {
   if (options.grep) params.append('grep', options.grep);
   if (options.grepInvert) params.append('grepInvert', options.grepInvert);
   for (const project of options.project || []) params.append('project', project);
-  if (options.workers) params.append('workers', String(options.workers));
-  if (options.timeout) params.append('timeout', String(options.timeout));
-  if (options.headed) params.append('headed', '');
-  if (options.outputDir) params.append('outputDir', options.outputDir);
-  if (options.updateSnapshots) params.append('updateSnapshots', options.updateSnapshots);
   for (const reporter of options.reporter || []) params.append('reporter', reporter);
   const urlPath = `./trace/${options.webApp || 'index.html'}?${params.toString()}`;
   server.routePath('/', (_, response) => {
@@ -139,7 +135,8 @@ async function openTraceViewerApp(url, browserName, options) {
     persistentContextOptions: {
       ...(options === null || options === void 0 ? void 0 : options.persistentContextOptions),
       useWebSocket: (0, _utils.isUnderTest)(),
-      headless: !!(options !== null && options !== void 0 && options.headless)
+      headless: !!(options !== null && options !== void 0 && options.headless),
+      colorScheme: (0, _utils.isUnderTest)() ? 'light' : undefined
     }
   });
   const controller = new _progress.ProgressController((0, _instrumentation.serverSideCallMetadata)(), context._browser);
@@ -172,6 +169,7 @@ class StdinServer {
     });
     process.stdin.on('close', () => (0, _utils.gracefullyProcessExitDoNotHang)(0));
   }
+  onconnect() {}
   async dispatch(method, params) {
     if (method === 'initialize') {
       if (this._traceUrl) this._loadTrace(this._traceUrl);

package/lib/server/webkit/webkit.js

@@ -55,7 +55,6 @@ class WebKit extends _browserType.BrowserType {
   defaultArgs(options, isPersistent, userDataDir) {
     const {
       args = [],
-      proxy,
       headless
     } = options;
     const userDataDirArg = args.find(arg => arg.startsWith('--user-data-dir'));
@@ -65,6 +64,7 @@ class WebKit extends _browserType.BrowserType {
     if (process.platform === 'win32') webkitArguments.push('--disable-accelerated-compositing');
     if (headless) webkitArguments.push('--headless');
     if (isPersistent) webkitArguments.push(`--user-data-dir=${userDataDir}`);else webkitArguments.push(`--no-startup-window`);
+    const proxy = options.proxyOverride || options.proxy;
     if (proxy) {
       if (process.platform === 'darwin') {
         webkitArguments.push(`--proxy=${proxy.server}`);

package/lib/server/webkit/wkBrowser.js

@@ -30,8 +30,8 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
  * limitations under the License.
  */
 
-const DEFAULT_USER_AGENT = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Safari/605.1.15';
-const BROWSER_VERSION = '18.0';
+const DEFAULT_USER_AGENT = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.2 Safari/605.1.15';
+const BROWSER_VERSION = '18.2';
 class WKBrowser extends _browser.Browser {
   static async connect(parent, transport, options) {
     const browser = new WKBrowser(parent, transport, options);
@@ -72,11 +72,12 @@ class WKBrowser extends _browser.Browser {
     this._didClose();
   }
   async doCreateNewContext(options) {
-    const createOptions = options.proxy ? {
-      // Enable socks5 hostname resolution on Windows. Workaround can be removed once fixed upstream.
+    const proxy = options.proxyOverride || options.proxy;
+    const createOptions = proxy ? {
+      // Enable socks5 hostname resolution on Windows.
       // See https://github.com/microsoft/playwright/issues/20451
-      proxyServer: process.platform === 'win32' ? options.proxy.server.replace(/^socks5:\/\//, 'socks5h://') : options.proxy.server,
-      proxyBypassList: options.proxy.bypass
+      proxyServer: process.platform === 'win32' ? proxy.server.replace(/^socks5:\/\//, 'socks5h://') : proxy.server,
+      proxyBypassList: proxy.bypass
     } : undefined;
     const {
       browserContextId
@@ -192,7 +193,7 @@ class WKBrowserContext extends _browserContext.BrowserContext {
       downloadPath: this._browser.options.downloadsPath,
       browserContextId
     }));
-    if (this._options.ignoreHTTPSErrors) promises.push(this._browser._browserSession.send('Playwright.setIgnoreCertificateErrors', {
+    if (this._options.ignoreHTTPSErrors || this._options.internalIgnoreHTTPSErrors) promises.push(this._browser._browserSession.send('Playwright.setIgnoreCertificateErrors', {
       browserContextId,
       ignore: true
     }));

package/lib/server/webkit/wkExecutionContext.js

@@ -59,19 +59,6 @@ class WKExecutionContext {
       throw rewriteError(error);
     }
   }
-  rawCallFunctionNoReply(func, ...args) {
-    this._session.send('Runtime.callFunctionOn', {
-      functionDeclaration: func.toString(),
-      objectId: args.find(a => a instanceof js.JSHandle)._objectId,
-      arguments: args.map(a => a instanceof js.JSHandle ? {
-        objectId: a._objectId
-      } : {
-        value: a
-      }),
-      returnByValue: true,
-      emulateUserGesture: true
-    }).catch(() => {});
-  }
   async evaluateWithArguments(expression, returnByValue, utilityScript, values, objectIds) {
     try {
       const response = await this._session.send('Runtime.callFunctionOn', {
@@ -116,9 +103,6 @@ class WKExecutionContext {
       objectId
     });
   }
-  objectCount(objectId) {
-    throw new Error('Method not implemented in WebKit.');
-  }
 }
 exports.WKExecutionContext = WKExecutionContext;
 function potentiallyUnserializableValue(remoteObject) {

package/lib/server/webkit/wkPage.js

@@ -247,6 +247,10 @@ class WKPage {
       setting: 'InputTypeWeekEnabled',
       value: contextOptions.isMobile
     }));
+    promises.push(session.send('Page.overrideSetting', {
+      setting: 'FixedBackgroundsPaintRelativeToDocument',
+      value: contextOptions.isMobile
+    }));
     await Promise.all(promises);
   }
   _onDidCommitProvisionalTarget(event) {
@@ -461,11 +465,11 @@ class WKPage {
     const frame = this._page._frameManager.frame(contextPayload.frameId);
     if (!frame) return;
     const delegate = new _wkExecutionContext.WKExecutionContext(this._session, contextPayload.id);
-    let worldName;
-    if (contextPayload.type === 'normal') worldName = 'main';else if (contextPayload.type === 'user' && contextPayload.name === UTILITY_WORLD_NAME) worldName = 'utility';else return;
+    let worldName = null;
+    if (contextPayload.type === 'normal') worldName = 'main';else if (contextPayload.type === 'user' && contextPayload.name === UTILITY_WORLD_NAME) worldName = 'utility';
     const context = new dom.FrameExecutionContext(delegate, frame, worldName);
     context[contextDelegateSymbol] = delegate;
-    frame._contextCreated(worldName, context);
+    if (worldName) frame._contextCreated(worldName, context);
     this._contextIdToContext.set(contextPayload.id, context);
   }
   async _onBindingCalled(contextId, argument) {
@@ -746,6 +750,9 @@ class WKPage {
       throw error;
     });
   }
+  async requestGC() {
+    await this._session.send('Heap.gc');
+  }
   async addInitScript(initScript) {
     await this._updateBootstrapScript();
   }
@@ -1070,7 +1077,7 @@ class WKPage {
     this._requestIdToResponseReceivedPayloadEvent.set(event.requestId, event);
     const response = request.createResponse(event.response);
     this._page._frameManager.requestReceivedResponse(response);
-    if (response.status() === 204) {
+    if (response.status() === 204 && request.request.isNavigationRequest()) {
       this._onLoadingFailed(session, {
         requestId: event.requestId,
         errorText: 'Aborted: 204 No Content',