patchright-core 1.50.0 → 1.51.0

package/lib/server/chromium/crBrowser.js

@@ -5,20 +5,21 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.CRBrowserContext = exports.CRBrowser = void 0;
 var _path = _interopRequireDefault(require("path"));
+var _assert = require("../../utils/isomorphic/assert");
+var _crypto = require("../utils/crypto");
+var _artifact = require("../artifact");
 var _browser = require("../browser");
 var _browserContext = require("../browserContext");
-var _utils = require("../../utils");
+var _frames = require("../frames");
 var network = _interopRequireWildcard(require("../network"));
 var _page = require("../page");
-var _frames = require("../frames");
 var _crConnection = require("./crConnection");
 var _crPage = require("./crPage");
 var _crProtocolHelper = require("./crProtocolHelper");
 var _crServiceWorker = require("./crServiceWorker");
-var _artifact = require("../artifact");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright 2017 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.
@@ -143,7 +144,7 @@ class CRBrowser extends _browser.Browser {
   }) {
     if (targetInfo.type === 'browser') return;
     const session = this._session.createChildSession(sessionId);
-    (0, _utils.assert)(targetInfo.browserContextId, 'targetInfo: ' + JSON.stringify(targetInfo, null, 2));
+    (0, _assert.assert)(targetInfo.browserContextId, 'targetInfo: ' + JSON.stringify(targetInfo, null, 2));
     let context = this._contexts.get(targetInfo.browserContextId) || null;
     if (!context) {
       // TODO: auto attach only to pages from our contexts.
@@ -159,9 +160,9 @@ class CRBrowser extends _browser.Browser {
       session.detach().catch(() => {});
       return;
     }
-    (0, _utils.assert)(!this._crPages.has(targetInfo.targetId), 'Duplicate target ' + targetInfo.targetId);
-    (0, _utils.assert)(!this._backgroundPages.has(targetInfo.targetId), 'Duplicate target ' + targetInfo.targetId);
-    (0, _utils.assert)(!this._serviceWorkers.has(targetInfo.targetId), 'Duplicate target ' + targetInfo.targetId);
+    (0, _assert.assert)(!this._crPages.has(targetInfo.targetId), 'Duplicate target ' + targetInfo.targetId);
+    (0, _assert.assert)(!this._backgroundPages.has(targetInfo.targetId), 'Duplicate target ' + targetInfo.targetId);
+    (0, _assert.assert)(!this._serviceWorkers.has(targetInfo.targetId), 'Duplicate target ' + targetInfo.targetId);
     if (targetInfo.type === 'background_page') {
       const backgroundPage = new _crPage.CRPage(session, targetInfo.targetId, context, null, {
         hasUIWindow: false,
@@ -258,7 +259,7 @@ class CRBrowser extends _browser.Browser {
     return await this._connection.createBrowserSession();
   }
   async startTracing(page, options = {}) {
-    (0, _utils.assert)(!this._tracingRecording, 'Cannot start recording trace while already recording trace.');
+    (0, _assert.assert)(!this._tracingRecording, 'Cannot start recording trace while already recording trace.');
     this._tracingClient = page ? page._delegate._mainFrameSession._client : this._session;
     const defaultCategories = ['-*', 'devtools.timeline', 'v8.execute', 'disabled-by-default-devtools.timeline', 'disabled-by-default-devtools.timeline.frame', 'toplevel', 'blink.console', 'blink.user_timing', 'latencyInfo', 'disabled-by-default-devtools.timeline.stack', 'disabled-by-default-v8.cpu_profiler', 'disabled-by-default-v8.cpu_profiler.hires'];
     const {
@@ -273,9 +274,9 @@ class CRBrowser extends _browser.Browser {
     });
   }
   async stopTracing() {
-    (0, _utils.assert)(this._tracingClient, 'Tracing was not started.');
+    (0, _assert.assert)(this._tracingClient, 'Tracing was not started.');
     const [event] = await Promise.all([new Promise(f => this._tracingClient.once('Tracing.tracingComplete', f)), this._tracingClient.send('Tracing.end')]);
-    const tracingPath = _path.default.join(this.options.artifactsDir, (0, _utils.createGuid)() + '.crtrace');
+    const tracingPath = _path.default.join(this.options.artifactsDir, (0, _crypto.createGuid)() + '.crtrace');
     await (0, _crProtocolHelper.saveProtocolStream)(this._tracingClient, event.stream, tracingPath);
     this._tracingRecording = false;
     const artifact = new _artifact.Artifact(this, tracingPath);
@@ -297,7 +298,7 @@ class CRBrowserContext extends _browserContext.BrowserContext {
     this._authenticateProxyViaCredentials();
   }
   async _initialize() {
-    (0, _utils.assert)(!Array.from(this._browser._crPages.values()).some(page => page._browserContext === this));
+    (0, _assert.assert)(!Array.from(this._browser._crPages.values()).some(page => page._browserContext === this));
     const promises = [super._initialize()];
     if (this._browser.options.name !== 'clank' && this._options.acceptDownloads !== 'internal-browser-default') {
       promises.push(this._browser._session.send('Browser.setDownloadBehavior', {
@@ -335,7 +336,7 @@ class CRBrowserContext extends _browserContext.BrowserContext {
         const page = this._browser._crPages.get(key);
         if (page._opener) newKeys.delete(key);
       }
-      (0, _utils.assert)(newKeys.size === 1);
+      (0, _assert.assert)(newKeys.size === 1);
       [targetId] = [...newKeys];
     }
     return this._browser._crPages.get(targetId)._page;

package/lib/server/chromium/crConnection.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.kBrowserCloseMessageId = exports.ConnectionEvents = exports.CRSession = exports.CRConnection = exports.CDPSession = void 0;
-var _utils = require("../../utils");
 var _events = require("events");
-var _debugLogger = require("../../utils/debugLogger");
+var _utils = require("../../utils");
+var _debugLogger = require("../utils/debugLogger");
 var _helper = require("../helper");
 var _protocolError = require("../protocolError");
 /**

package/lib/server/chromium/crCoverage.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.CRCoverage = void 0;
-var _eventsHelper = require("../../utils/eventsHelper");
 var _utils = require("../../utils");
+var _eventsHelper = require("../utils/eventsHelper");
 /**
  * Copyright 2017 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.

package/lib/server/chromium/crDevTools.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.CRDevTools = void 0;
 var _fs = _interopRequireDefault(require("fs"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright (c) Microsoft Corporation.
  *

package/lib/server/chromium/crDragDrop.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DragManager = void 0;
-var _utils = require("../../utils");
 var _crProtocolHelper = require("./crProtocolHelper");
+var _utils = require("../../utils");
 /**
  * Copyright (c) Microsoft Corporation.
  *

package/lib/server/chromium/crExecutionContext.js

@@ -4,13 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.CRExecutionContext = void 0;
+exports.createHandle = createHandle;
+var _assert = require("../../utils/isomorphic/assert");
 var _crProtocolHelper = require("./crProtocolHelper");
-var js = _interopRequireWildcard(require("../javascript"));
-var _stackTrace = require("../../utils/stackTrace");
+var _stackTrace = require("../../utils/isomorphic/stackTrace");
 var _utilityScriptSerializers = require("../isomorphic/utilityScriptSerializers");
+var js = _interopRequireWildcard(require("../javascript"));
+var dom = _interopRequireWildcard(require("../dom"));
 var _protocolError = require("../protocolError");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /**
  * Copyright 2017 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.
@@ -47,7 +50,7 @@ class CRExecutionContext {
     if (exceptionDetails) throw new js.JavaScriptErrorInEvaluate((0, _crProtocolHelper.getExceptionMessage)(exceptionDetails));
     return remoteObject.value;
   }
-  async rawEvaluateHandle(expression) {
+  async rawEvaluateHandle(context, expression) {
     const {
       exceptionDetails,
       result: remoteObject
@@ -56,9 +59,9 @@ class CRExecutionContext {
       contextId: this._contextId
     }).catch(rewriteError);
     if (exceptionDetails) throw new js.JavaScriptErrorInEvaluate((0, _crProtocolHelper.getExceptionMessage)(exceptionDetails));
-    return remoteObject.objectId;
+    return createHandle(context, remoteObject);
   }
-  async evaluateWithArguments(expression, returnByValue, utilityScript, values, objectIds) {
+  async evaluateWithArguments(expression, returnByValue, utilityScript, values, handles) {
     const {
       exceptionDetails,
       result: remoteObject
@@ -69,33 +72,31 @@ class CRExecutionContext {
         objectId: utilityScript._objectId
       }, ...values.map(value => ({
         value
-      })), ...objectIds.map(objectId => ({
-        objectId
+      })), ...handles.map(handle => ({
+        objectId: handle._objectId
       }))],
       returnByValue,
       awaitPromise: true,
       userGesture: true
     }).catch(rewriteError);
     if (exceptionDetails) throw new js.JavaScriptErrorInEvaluate((0, _crProtocolHelper.getExceptionMessage)(exceptionDetails));
-    return returnByValue ? (0, _utilityScriptSerializers.parseEvaluationResultValue)(remoteObject.value) : utilityScript._context.createHandle(remoteObject);
+    return returnByValue ? (0, _utilityScriptSerializers.parseEvaluationResultValue)(remoteObject.value) : createHandle(utilityScript._context, remoteObject);
   }
-  async getProperties(context, objectId) {
+  async getProperties(object) {
     const response = await this._client.send('Runtime.getProperties', {
-      objectId,
+      objectId: object._objectId,
       ownProperties: true
     });
     const result = new Map();
     for (const property of response.result) {
       if (!property.enumerable || !property.value) continue;
-      result.set(property.name, context.createHandle(property.value));
+      result.set(property.name, createHandle(object._context, property.value));
     }
     return result;
   }
-  createHandle(context, remoteObject) {
-    return new js.JSHandle(context, remoteObject.subtype || remoteObject.type, renderPreview(remoteObject), remoteObject.objectId, potentiallyUnserializableValue(remoteObject));
-  }
-  async releaseHandle(objectId) {
-    await (0, _crProtocolHelper.releaseObject)(this._client, objectId);
+  async releaseHandle(handle) {
+    if (!handle._objectId) return;
+    await (0, _crProtocolHelper.releaseObject)(this._client, handle._objectId);
   }
 }
 exports.CRExecutionContext = CRExecutionContext;
@@ -129,4 +130,11 @@ function renderPreview(object) {
   }
   if (object.subtype === 'array' && object.preview) return js.sparseArrayToString(object.preview.properties);
   return object.description;
+}
+function createHandle(context, remoteObject) {
+  if (remoteObject.subtype === 'node') {
+    (0, _assert.assert)(context instanceof dom.FrameExecutionContext);
+    return new dom.ElementHandle(context, remoteObject.objectId);
+  }
+  return new js.JSHandle(context, remoteObject.subtype || remoteObject.type, renderPreview(remoteObject), remoteObject.objectId, potentiallyUnserializableValue(remoteObject));
 }

package/lib/server/chromium/crInput.js

@@ -4,12 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.RawTouchscreenImpl = exports.RawMouseImpl = exports.RawKeyboardImpl = void 0;
+var _utils = require("../../utils");
 var input = _interopRequireWildcard(require("../input"));
 var _macEditingCommands = require("../macEditingCommands");
-var _utils = require("../../utils");
 var _crProtocolHelper = require("./crProtocolHelper");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /**
  * Copyright 2017 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.

package/lib/server/chromium/crNetworkManager.js

@@ -5,14 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.CRNetworkManager = void 0;
 var _crypto = _interopRequireDefault(require("crypto"));
+var _utils = require("../../utils");
+var _eventsHelper = require("../utils/eventsHelper");
 var _helper = require("../helper");
-var _eventsHelper = require("../../utils/eventsHelper");
 var network = _interopRequireWildcard(require("../network"));
-var _utils = require("../../utils");
 var _protocolError = require("../protocolError");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // undetected-undetected_playwright-patch - custom imports
 
 /**
@@ -47,6 +47,7 @@ class CRNetworkManager {
     this._requestIdToRequestPausedEvent = new Map();
     this._responseExtraInfoTracker = new ResponseExtraInfoTracker();
     this._sessions = new Map();
+    this._alreadyTrackedNetworkIds = new Set();
     this._page = page;
     this._serviceWorker = serviceWorker;
   }
@@ -205,6 +206,7 @@ class CRNetworkManager {
     return !this._credentials.origin || new URL(url).origin.toLowerCase() === this._credentials.origin.toLowerCase();
   }
   _onRequestPaused(sessionInfo, event) {
+    if (this._alreadyTrackedNetworkIds.has(event.networkId)) return;
     if (!event.networkId) {
       // Fetch without networkId means that request was not recognized by inspector, and
       // it will never receive Network.requestWillBeSent. Continue the request to not affect it.
@@ -247,6 +249,7 @@ class CRNetworkManager {
   }
   _onRequest(requestWillBeSentSessionInfo, requestWillBeSentEvent, requestPausedSessionInfo, requestPausedEvent) {
     var _this$_page, _this$_page2, _this$_page3;
+    if (this._alreadyTrackedNetworkIds.has(requestWillBeSentEvent.initiator.requestId)) return;
     if (requestWillBeSentEvent.request.url.startsWith('data:')) return;
     let redirectedFrom = null;
     if (requestWillBeSentEvent.redirectResponse) {
@@ -322,7 +325,7 @@ class CRNetworkManager {
           headers: headersOverride
         });
       } else {
-        route = new RouteImpl(requestPausedSessionInfo.session, requestPausedEvent.requestId, this._page);
+        route = new RouteImpl(requestPausedSessionInfo.session, requestPausedEvent.requestId, this._page, requestPausedEvent.networkId, this);
       }
     }
     const isNavigationRequest = requestWillBeSentEvent.requestId === requestWillBeSentEvent.loaderId && requestWillBeSentEvent.type === 'Document';
@@ -436,20 +439,13 @@ class CRNetworkManager {
     if (request._interceptionId) this._attemptedAuthentications.delete(request._interceptionId);
   }
   _handleRequestRedirect(request, responsePayload, timestamp, hasExtraInfo) {
-    var _this$_page4, _this$_page5;
-    const response = this._createResponse(request, responsePayload, hasExtraInfo);
-    response.setTransferSize(null);
-    response.setEncodedBodySize(null);
-    response._requestFinished((timestamp - request._timestamp) * 1000);
-    this._deleteRequest(request);
-    (((_this$_page4 = this._page) === null || _this$_page4 === void 0 ? void 0 : _this$_page4._frameManager) || this._serviceWorker).requestReceivedResponse(response);
-    (((_this$_page5 = this._page) === null || _this$_page5 === void 0 ? void 0 : _this$_page5._frameManager) || this._serviceWorker).reportRequestFinished(request.request, response);
+    return;
   }
   _onResponseReceivedExtraInfo(event) {
     this._responseExtraInfoTracker.responseReceivedExtraInfo(event);
   }
   _onResponseReceived(sessionInfo, event) {
-    var _this$_page6;
+    var _this$_page4;
     let request = this._requestIdToRequest.get(event.requestId);
     // For frame-level Requests that are handled by a Service Worker's fetch handler, we'll never get a requestPaused event, so we need to
     // manually create the request. In an ideal world, crNetworkManager would be able to know this on Network.requestWillBeSent, but there
@@ -465,10 +461,10 @@ class CRNetworkManager {
     // FileUpload sends a response without a matching request.
     if (!request) return;
     const response = this._createResponse(request, event.response, event.hasExtraInfo);
-    (((_this$_page6 = this._page) === null || _this$_page6 === void 0 ? void 0 : _this$_page6._frameManager) || this._serviceWorker).requestReceivedResponse(response);
+    (((_this$_page4 = this._page) === null || _this$_page4 === void 0 ? void 0 : _this$_page4._frameManager) || this._serviceWorker).requestReceivedResponse(response);
   }
   _onLoadingFinished(sessionInfo, event) {
-    var _this$_page7;
+    var _this$_page5;
     this._responseExtraInfoTracker.loadingFinished(event);
     const request = this._requestIdToRequest.get(event.requestId);
     // For certain requestIds we never receive requestWillBeSent event.
@@ -485,10 +481,10 @@ class CRNetworkManager {
       response._requestFinished(_helper.helper.secondsToRoundishMillis(event.timestamp - request._timestamp));
     }
     this._deleteRequest(request);
-    (((_this$_page7 = this._page) === null || _this$_page7 === void 0 ? void 0 : _this$_page7._frameManager) || this._serviceWorker).reportRequestFinished(request.request, response);
+    (((_this$_page5 = this._page) === null || _this$_page5 === void 0 ? void 0 : _this$_page5._frameManager) || this._serviceWorker).reportRequestFinished(request.request, response);
   }
   _onLoadingFailed(sessionInfo, event) {
-    var _this$_page8;
+    var _this$_page6;
     this._responseExtraInfoTracker.loadingFailed(event);
     let request = this._requestIdToRequest.get(event.requestId);
     if (!request) {
@@ -518,7 +514,7 @@ class CRNetworkManager {
     }
     this._deleteRequest(request);
     request.request._setFailureText(event.errorText || event.blockedReason || '');
-    (((_this$_page8 = this._page) === null || _this$_page8 === void 0 ? void 0 : _this$_page8._frameManager) || this._serviceWorker).requestFailed(request.request, !!event.canceled);
+    (((_this$_page6 = this._page) === null || _this$_page6 === void 0 ? void 0 : _this$_page6._frameManager) || this._serviceWorker).requestFailed(request.request, !!event.canceled);
   }
   _maybeUpdateOOPIFMainRequest(sessionInfo, request) {
     // OOPIF has a main request that starts in the parent session but finishes in the child session.
@@ -575,15 +571,20 @@ class InterceptableRequest {
   }
 }
 class RouteImpl {
-  constructor(session, interceptionId, page) {
+  constructor(session, interceptionId, page, networkId, sessionManager) {
     this._session = void 0;
     this._interceptionId = void 0;
     this._alreadyContinuedParams = void 0;
     this._fulfilled = false;
+    this._sessionManager = void 0;
+    this._networkId = void 0;
     this._page = void 0;
     this._session = session;
     this._interceptionId = interceptionId;
     this._page = page;
+    this._networkId = networkId;
+    this._sessionManager = sessionManager;
+    _eventsHelper.eventsHelper.addEventListener(this._session, 'Fetch.requestPaused', async e => await this._networkRequestIntercepted(e));
   }
   async continue(overrides) {
     this._alreadyContinuedParams = {
@@ -593,12 +594,22 @@ class RouteImpl {
       method: overrides.method,
       postData: overrides.postData ? overrides.postData.toString('base64') : undefined
     };
-    await catchDisallowedErrors(async () => {
-      await this._session.send('Fetch.continueRequest', this._alreadyContinuedParams);
-    });
+    if (overrides.url && (overrides.url === 'http://patchright-init-script-inject.internal/' || overrides.url === 'https://patchright-init-script-inject.internal/')) {
+      await catchDisallowedErrors(async () => {
+        this._sessionManager._alreadyTrackedNetworkIds.add(this._networkId);
+        this._session.send('Fetch.continueRequest', {
+          requestId: this._interceptionId,
+          interceptResponse: true
+        });
+      });
+    } else {
+      await catchDisallowedErrors(async () => {
+        await this._session.send('Fetch.continueRequest', this._alreadyContinuedParams);
+      });
+    }
   }
   async fulfill(response) {
-    const isTextHtml = response.headers.some(header => header.name === 'content-type' && header.value.includes('text/html'));
+    const isTextHtml = response.resourceType === 'Document' || response.headers.some(header => header.name === 'content-type' && header.value.includes('text/html'));
     var allInjections = [...this._page._delegate._mainFrameSession._evaluateOnNewDocumentScripts];
     for (const binding of this._page._delegate._browserContext._pageBindings.values()) {
       if (!allInjections.includes(binding)) allInjections.push(binding);
@@ -625,7 +636,8 @@ class RouteImpl {
       }
       let injectionHTML = "";
       allInjections.forEach(script => {
-        injectionHTML += `<script class="${this._page._delegate.initScriptTag}" nonce="${scriptNonce}" type="text/javascript">${script.source}</script>`;
+        let scriptId = _crypto.default.randomBytes(22).toString('hex');
+        injectionHTML += `<script class="${this._page._delegate.initScriptTag}" nonce="${scriptNonce}" type="text/javascript">document.getElementById("${scriptId}")?.remove();${script.source}</script>`;
       });
       if (response.isBase64) {
         response.isBase64 = false;
@@ -639,7 +651,7 @@ class RouteImpl {
     const responseHeaders = splitSetCookieHeader(response.headers);
     await catchDisallowedErrors(async () => {
       await this._session.send('Fetch.fulfillRequest', {
-        requestId: this._interceptionId,
+        requestId: response.interceptionId ? response.interceptionId : this._interceptionId,
         responseCode: response.status,
         responsePhrase: network.statusText(response.status),
         responseHeaders,
@@ -657,6 +669,41 @@ class RouteImpl {
       });
     });
   }
+  async _networkRequestIntercepted(event) {
+    if (event.resourceType !== 'Document') {
+      await catchDisallowedErrors(async () => {
+        await this._session.send('Fetch.continueRequest', {
+          requestId: event.requestId
+        });
+      });
+      return;
+    }
+    if (this._networkId != event.networkId || !this._sessionManager._alreadyTrackedNetworkIds.has(event.networkId)) return;
+    try {
+      if (event.responseStatusCode >= 301 && event.responseStatusCode <= 308 || event.redirectedRequestId && !event.responseStatusCode) {
+        await this._session.send('Fetch.continueRequest', {
+          requestId: event.requestId,
+          interceptResponse: true
+        });
+      } else {
+        const responseBody = await this._session.send('Fetch.getResponseBody', {
+          requestId: event.requestId
+        });
+        await this.fulfill({
+          headers: event.responseHeaders,
+          isBase64: true,
+          body: responseBody.body,
+          status: event.responseStatusCode,
+          interceptionId: event.requestId,
+          resourceType: event.resourceType
+        });
+      }
+    } catch (error) {
+      await this._session._sendMayFail('Fetch.continueRequest', {
+        requestId: event.requestId
+      });
+    }
+  }
 }
 
 // In certain cases, protocol will return error if the request was already canceled

package/lib/server/chromium/crPage.js

@@ -6,16 +6,17 @@ Object.defineProperty(exports, "__esModule", {
 exports.CRPage = void 0;
 var _crypto = _interopRequireDefault(require("crypto"));
 var _path = _interopRequireDefault(require("path"));
-var _eventsHelper = require("../../utils/eventsHelper");
-var _registry = require("../registry");
-var _stackTrace = require("../../utils/stackTrace");
-var _utils = require("../../utils");
+var _assert = require("../../utils/isomorphic/assert");
+var _crypto2 = require("../utils/crypto");
+var _eventsHelper = require("../utils/eventsHelper");
+var _stackTrace = require("../../utils/isomorphic/stackTrace");
 var dialog = _interopRequireWildcard(require("../dialog"));
 var dom = _interopRequireWildcard(require("../dom"));
 var frames = _interopRequireWildcard(require("../frames"));
 var _helper = require("../helper");
 var network = _interopRequireWildcard(require("../network"));
 var _page = require("../page");
+var _registry = require("../registry");
 var _crAccessibility = require("./crAccessibility");
 var _crBrowser = require("./crBrowser");
 var _crCoverage = require("./crCoverage");
@@ -31,8 +32,8 @@ var _browserContext = require("../browserContext");
 var _errors = require("../errors");
 var _protocolError = require("../protocolError");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // undetected-undetected_playwright-patch - custom imports
 
 /**
@@ -96,7 +97,7 @@ class CRPage {
     this.updateExtraHTTPHeaders();
     this.updateHttpCredentials();
     this._networkManager.setRequestInterception(true);
-    this.initScriptTag = "injected-playwright-init-script-" + _crypto.default.randomBytes(20).toString('hex');
+    this.initScriptTag = _crypto.default.randomBytes(20).toString('hex');
     this._mainFrameSession = new FrameSession(this, client, targetId, null);
     this._sessions.set(targetId, this._mainFrameSession);
     if (opener && !browserContext._options.noDefaultViewport) {
@@ -256,9 +257,6 @@ class CRPage {
   async getOwnerFrame(handle) {
     return this._sessionForHandle(handle)._getOwnerFrame(handle);
   }
-  isElementHandle(remoteObject) {
-    return remoteObject.subtype === 'node';
-  }
   async getBoundingBox(handle) {
     return this._sessionForHandle(handle)._getBoundingBox(handle);
   }
@@ -283,9 +281,6 @@ class CRPage {
   async getContentQuads(handle) {
     return this._sessionForHandle(handle)._getContentQuads(handle);
   }
-  async setInputFiles(handle, files) {
-    await handle.evaluateInUtility(([injected, node, files]) => injected.setInputFiles(node, files), files);
-  }
   async setInputFilePaths(handle, files) {
     const frame = await handle.ownerFrame();
     if (!frame) throw new Error('Cannot set input files to detached input element');
@@ -402,7 +397,7 @@ class FrameSession {
     }
     let screencastOptions;
     if (!isSettingStorageState && this._isMainFrame() && this._crPage._browserContext._options.recordVideo && hasUIWindow) {
-      const screencastId = (0, _utils.createGuid)();
+      const screencastId = (0, _crypto2.createGuid)();
       const outputFile = _path.default.join(this._crPage._browserContext._options.recordVideo.dir, screencastId + '.webm');
       screencastOptions = {
         // validateBrowserContextOptions ensures correct video size.
@@ -515,6 +510,7 @@ class FrameSession {
   async _onLifecycleEvent(event) {
     if (this._eventBelongsToStaleFrame(event.frameId)) return;
     if (event.name === 'load') this._page._frameManager.frameLifecycleEvent(event.frameId, 'load');else if (event.name === 'DOMContentLoaded') this._page._frameManager.frameLifecycleEvent(event.frameId, 'domcontentloaded');
+    await this._client._sendMayFail('Runtime.runIfWaitingForDebugger');
     var document = await this._client._sendMayFail("DOM.getDocument");
     if (!document) return;
     var query = await this._client._sendMayFail("DOM.querySelectorAll", {
@@ -572,6 +568,7 @@ class FrameSession {
     if (this._eventBelongsToStaleFrame(framePayload.id)) return;
     this._page._frameManager.frameCommittedNewDocumentNavigation(framePayload.id, framePayload.url + (framePayload.urlFragment || ''), framePayload.name || '', framePayload.loaderId, initial);
     if (!initial) this._firstNonInitialNavigationCommittedFulfill();
+    await this._client._sendMayFail('Runtime.runIfWaitingForDebugger');
     var document = await this._client._sendMayFail("DOM.getDocument");
     if (!document) return;
     var query = await this._client._sendMayFail("DOM.querySelectorAll", {
@@ -626,7 +623,6 @@ class FrameSession {
     const delegate = new _crExecutionContext.CRExecutionContext(this._client, contextPayload);
     let worldName = contextPayload.name;
     const context = new dom.FrameExecutionContext(delegate, frame, worldName);
-    context[contextDelegateSymbol] = delegate;
     if (worldName) frame._contextCreated(worldName, context);
     this._contextIdToContext.set(contextPayload.id, context);
     for (const source of this._exposedBindingScripts) {
@@ -699,7 +695,7 @@ class FrameSession {
     session.on('Target.attachedToTarget', event => this._onAttachedToTarget(event));
     session.on('Target.detachedFromTarget', event => this._onDetachedFromTarget(event));
     session.on('Runtime.consoleAPICalled', event => {
-      const args = event.args.map(o => worker._existingExecutionContext.createHandle(o));
+      const args = event.args.map(o => (0, _crExecutionContext.createHandle)(worker._existingExecutionContext, o));
       this._page._addConsoleMessage(event.type, args, (0, _crProtocolHelper.toConsoleMessageLocation)(event.stackTrace));
     });
     session.on('Runtime.exceptionThrown', exception => this._page.emitOnContextOnceInitialized(_browserContext.BrowserContext.Events.PageError, (0, _crProtocolHelper.exceptionToError)(exception.exceptionDetails), this._page));
@@ -756,7 +752,7 @@ class FrameSession {
     }
     const context = this._contextIdToContext.get(event.executionContextId);
     if (!context) return;
-    const values = event.args.map(arg => context.createHandle(arg));
+    const values = event.args.map(arg => (0, _crExecutionContext.createHandle)(context, arg));
     this._page._addConsoleMessage(event.type, values, (0, _crProtocolHelper.toConsoleMessageLocation)(event.stackTrace));
   }
   async _onBindingCalled(event) {
@@ -839,14 +835,14 @@ class FrameSession {
     });
   }
   async _createVideoRecorder(screencastId, options) {
-    (0, _utils.assert)(!this._screencastId);
+    (0, _assert.assert)(!this._screencastId);
     const ffmpegPath = _registry.registry.findExecutable('ffmpeg').executablePathOrDie(this._page.attribution.playwright.options.sdkLanguage);
     this._videoRecorder = await _videoRecorder.VideoRecorder.launch(this._crPage._page, ffmpegPath, options);
     this._screencastId = screencastId;
   }
   async _startVideoRecording(options) {
     const screencastId = this._screencastId;
-    (0, _utils.assert)(screencastId);
+    (0, _assert.assert)(screencastId);
     this._page.once(_page.Page.Events.Close, () => this._stopVideoRecording().catch(() => {}));
     const gotFirstFrame = new Promise(f => this._client.once('Page.screencastFrame', f));
     await this._startScreencast(this._videoRecorder, {
@@ -887,7 +883,7 @@ class FrameSession {
   }
   async _updateViewport(preserveWindowBoundaries) {
     if (this._crPage._browserContext._browser.isClank()) return;
-    (0, _utils.assert)(this._isMainFrame());
+    (0, _assert.assert)(this._isMainFrame());
     const options = this._crPage._browserContext._options;
     const emulatedSize = this._page.emulatedSize();
     if (emulatedSize === null) return;
@@ -972,6 +968,7 @@ class FrameSession {
     const colorScheme = emulatedMedia.colorScheme === 'no-override' ? '' : emulatedMedia.colorScheme;
     const reducedMotion = emulatedMedia.reducedMotion === 'no-override' ? '' : emulatedMedia.reducedMotion;
     const forcedColors = emulatedMedia.forcedColors === 'no-override' ? '' : emulatedMedia.forcedColors;
+    const contrast = emulatedMedia.contrast === 'no-override' ? '' : emulatedMedia.contrast;
     const features = [{
       name: 'prefers-color-scheme',
       value: colorScheme
@@ -981,6 +978,9 @@ class FrameSession {
     }, {
       name: 'forced-colors',
       value: forcedColors
+    }, {
+      name: 'prefers-contrast',
+      value: contrast
     }];
     await this._client.send('Emulation.setEmulatedMedia', {
       media,
@@ -1105,10 +1105,10 @@ class FrameSession {
   async _adoptBackendNodeId(backendNodeId, to) {
     const result = await this._client._sendMayFail('DOM.resolveNode', {
       backendNodeId,
-      executionContextId: to._delegate._contextId
+      executionContextId: to.delegate._contextId
     });
     if (!result || result.object.subtype === 'null') throw new Error(dom.kUnableToAdoptErrorMessage);
-    return to.createHandle(result.object).asElement();
+    return (0, _crExecutionContext.createHandle)(to, result.object).asElement();
   }
   async _initBinding(binding = _page.PageBinding) {
     var result = await this._client._sendMayFail('Page.createIsolatedWorld', {
@@ -1177,7 +1177,6 @@ async function emulateTimezone(session, timezoneId) {
     throw exception;
   }
 }
-const contextDelegateSymbol = Symbol('delegate');
 
 // Chromium reference: https://source.chromium.org/chromium/chromium/src/+/main:components/embedder_support/user_agent_utils.cc;l=434;drc=70a6711e08e9f9e0d8e4c48e9ba5cab62eb010c2
 function calculateUserAgentMetadata(options) {