patchright-core 1.52.4 → 1.55.0

package/lib/server/chromium/crNetworkManager.js

@@ -69,13 +69,13 @@ class CRNetworkManager {
     ];
     if (this._page) {
       sessionInfo.eventListeners.push(...[
-        import_eventsHelper.eventsHelper.addEventListener(session, "Network.webSocketCreated", (e) => this._page._frameManager.onWebSocketCreated(e.requestId, e.url)),
-        import_eventsHelper.eventsHelper.addEventListener(session, "Network.webSocketWillSendHandshakeRequest", (e) => this._page._frameManager.onWebSocketRequest(e.requestId)),
-        import_eventsHelper.eventsHelper.addEventListener(session, "Network.webSocketHandshakeResponseReceived", (e) => this._page._frameManager.onWebSocketResponse(e.requestId, e.response.status, e.response.statusText)),
-        import_eventsHelper.eventsHelper.addEventListener(session, "Network.webSocketFrameSent", (e) => e.response.payloadData && this._page._frameManager.onWebSocketFrameSent(e.requestId, e.response.opcode, e.response.payloadData)),
-        import_eventsHelper.eventsHelper.addEventListener(session, "Network.webSocketFrameReceived", (e) => e.response.payloadData && this._page._frameManager.webSocketFrameReceived(e.requestId, e.response.opcode, e.response.payloadData)),
-        import_eventsHelper.eventsHelper.addEventListener(session, "Network.webSocketClosed", (e) => this._page._frameManager.webSocketClosed(e.requestId)),
-        import_eventsHelper.eventsHelper.addEventListener(session, "Network.webSocketFrameError", (e) => this._page._frameManager.webSocketError(e.requestId, e.errorMessage))
+        import_eventsHelper.eventsHelper.addEventListener(session, "Network.webSocketCreated", (e) => this._page.frameManager.onWebSocketCreated(e.requestId, e.url)),
+        import_eventsHelper.eventsHelper.addEventListener(session, "Network.webSocketWillSendHandshakeRequest", (e) => this._page.frameManager.onWebSocketRequest(e.requestId)),
+        import_eventsHelper.eventsHelper.addEventListener(session, "Network.webSocketHandshakeResponseReceived", (e) => this._page.frameManager.onWebSocketResponse(e.requestId, e.response.status, e.response.statusText)),
+        import_eventsHelper.eventsHelper.addEventListener(session, "Network.webSocketFrameSent", (e) => e.response.payloadData && this._page.frameManager.onWebSocketFrameSent(e.requestId, e.response.opcode, e.response.payloadData)),
+        import_eventsHelper.eventsHelper.addEventListener(session, "Network.webSocketFrameReceived", (e) => e.response.payloadData && this._page.frameManager.webSocketFrameReceived(e.requestId, e.response.opcode, e.response.payloadData)),
+        import_eventsHelper.eventsHelper.addEventListener(session, "Network.webSocketClosed", (e) => this._page.frameManager.webSocketClosed(e.requestId)),
+        import_eventsHelper.eventsHelper.addEventListener(session, "Network.webSocketFrameError", (e) => this._page.frameManager.webSocketError(e.requestId, e.errorMessage))
       ]);
     }
     this._sessions.set(session, sessionInfo);
@@ -265,11 +265,11 @@ class CRNetworkManager {
         redirectedFrom = request2;
       }
     }
-    let frame = requestWillBeSentEvent.frameId ? this._page?._frameManager.frame(requestWillBeSentEvent.frameId) : requestWillBeSentSessionInfo.workerFrame;
+    let frame = requestWillBeSentEvent.frameId ? this._page?.frameManager.frame(requestWillBeSentEvent.frameId) : requestWillBeSentSessionInfo.workerFrame;
     if (!frame && this._page && requestPausedEvent && requestPausedEvent.frameId)
-      frame = this._page._frameManager.frame(requestPausedEvent.frameId);
-    if (!frame && this._page && requestWillBeSentEvent.frameId === (this._page?._delegate)._targetId) {
-      frame = this._page._frameManager.frameAttached(requestWillBeSentEvent.frameId, null);
+      frame = this._page.frameManager.frame(requestPausedEvent.frameId);
+    if (!frame && this._page && requestWillBeSentEvent.frameId === (this._page?.delegate)._targetId) {
+      frame = this._page.frameManager.frameAttached(requestWillBeSentEvent.frameId, null);
     }
     const isInterceptedOptionsPreflight = !!requestPausedEvent && requestPausedEvent.request.method === "OPTIONS" && requestWillBeSentEvent.initiator.type === "preflight";
     if (isInterceptedOptionsPreflight && (this._page || this._serviceWorker).needsRequestInterception()) {
@@ -309,7 +309,7 @@ class CRNetworkManager {
     const documentId = isNavigationRequest ? requestWillBeSentEvent.loaderId : void 0;
     const request = new InterceptableRequest({
       session: requestWillBeSentSessionInfo.session,
-      context: (this._page || this._serviceWorker)._browserContext,
+      context: (this._page || this._serviceWorker).browserContext,
       frame: frame || null,
       serviceWorker: this._serviceWorker || null,
       documentId,
@@ -323,7 +323,7 @@ class CRNetworkManager {
     if (route) {
       request.request.setRawRequestHeaders((0, import_utils.headersObjectToArray)(requestPausedEvent.request.headers, "\n"));
     }
-    (this._page?._frameManager || this._serviceWorker).requestStarted(request.request, route || void 0);
+    (this._page?.frameManager || this._serviceWorker).requestStarted(request.request, route || void 0);
   }
   _createResponse(request, responsePayload, hasExtraInfo) {
     const getResponseBody = async () => {
@@ -402,8 +402,8 @@ class CRNetworkManager {
     response.setEncodedBodySize(null);
     response._requestFinished((timestamp - request._timestamp) * 1e3);
     this._deleteRequest(request);
-    (this._page?._frameManager || this._serviceWorker).requestReceivedResponse(response);
-    (this._page?._frameManager || this._serviceWorker).reportRequestFinished(request.request, response);
+    (this._page?.frameManager || this._serviceWorker).requestReceivedResponse(response);
+    (this._page?.frameManager || this._serviceWorker).reportRequestFinished(request.request, response);
   }
   _onResponseReceivedExtraInfo(event) {
     this._responseExtraInfoTracker.responseReceivedExtraInfo(event);
@@ -421,14 +421,14 @@ class CRNetworkManager {
     if (!request)
       return;
     const response = this._createResponse(request, event.response, event.hasExtraInfo);
-    (this._page?._frameManager || this._serviceWorker).requestReceivedResponse(response);
+    (this._page?.frameManager || this._serviceWorker).requestReceivedResponse(response);
   }
   _onLoadingFinished(sessionInfo, event) {
     this._responseExtraInfoTracker.loadingFinished(event);
     const request = this._requestIdToRequest.get(event.requestId);
     if (!request)
       return;
-    this._maybeUpdateOOPIFMainRequest(sessionInfo, request);
+    this._maybeUpdateRequestSession(sessionInfo, request);
     const response = request.request._existingResponse();
     if (response) {
       response.setTransferSize(event.encodedDataLength);
@@ -436,7 +436,7 @@ class CRNetworkManager {
       response._requestFinished(import_helper.helper.secondsToRoundishMillis(event.timestamp - request._timestamp));
     }
     this._deleteRequest(request);
-    (this._page?._frameManager || this._serviceWorker).reportRequestFinished(request.request, response);
+    (this._page?.frameManager || this._serviceWorker).reportRequestFinished(request.request, response);
   }
   _onLoadingFailed(sessionInfo, event) {
     this._responseExtraInfoTracker.loadingFailed(event);
@@ -451,7 +451,7 @@ class CRNetworkManager {
     }
     if (!request)
       return;
-    this._maybeUpdateOOPIFMainRequest(sessionInfo, request);
+    this._maybeUpdateRequestSession(sessionInfo, request);
     const response = request.request._existingResponse();
     if (response) {
       response.setTransferSize(null);
@@ -462,10 +462,10 @@ class CRNetworkManager {
     }
     this._deleteRequest(request);
     request.request._setFailureText(event.errorText || event.blockedReason || "");
-    (this._page?._frameManager || this._serviceWorker).requestFailed(request.request, !!event.canceled);
+    (this._page?.frameManager || this._serviceWorker).requestFailed(request.request, !!event.canceled);
   }
-  _maybeUpdateOOPIFMainRequest(sessionInfo, request) {
-    if (request.session !== sessionInfo.session && !sessionInfo.isMain && request._documentId === request._requestId)
+  _maybeUpdateRequestSession(sessionInfo, request) {
+    if (request.session !== sessionInfo.session && !sessionInfo.isMain && (request._documentId === request._requestId || sessionInfo.workerFrame))
       request.session = sessionInfo.session;
   }
 }
@@ -518,33 +518,38 @@ class RouteImpl {
     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 });
+        this._session._sendMayFail("Fetch.continueRequest", { requestId: this._interceptionId, interceptResponse: true });
       });
     } else {
       await catchDisallowedErrors(async () => {
-        await this._session.send("Fetch.continueRequest", this._alreadyContinuedParams);
+        await this._session._sendMayFail("Fetch.continueRequest", this._alreadyContinuedParams);
       });
     }
   }
   async fulfill(response) {
-    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()) {
+    const isTextHtml = response.headers.some((header) => header.name.toLowerCase() === "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);
     }
     if (isTextHtml && allInjections.length) {
       let scriptNonce = import_crypto.default.randomBytes(22).toString("hex");
+      let useNonce = true;
       for (let i = 0; i < response.headers.length; i++) {
-        if (response.headers[i].name === "content-security-policy" || response.headers[i].name === "content-security-policy-report-only") {
+        if (response.headers[i].name.toLowerCase() === "content-security-policy" || response.headers[i].name.toLowerCase() === "content-security-policy-report-only") {
           let cspValue = response.headers[i].value;
           const nonceRegex = /script-src[^;]*'nonce-([\w-]+)'/;
           const nonceMatch = cspValue.match(nonceRegex);
           if (nonceMatch) {
             scriptNonce = nonceMatch[1];
           } else {
-            const scriptSrcRegex = /(script-src[^;]*)(;|$)/;
-            const newCspValue = cspValue.replace(scriptSrcRegex, `$1 'nonce-${scriptNonce}'$2`);
-            response.headers[i].value = newCspValue;
+            if (/script-src[^;]*'unsafe-inline'/.test(cspValue)) {
+              useNonce = false;
+            } else {
+              const scriptSrcRegex = /(script-src[^;]*)(;|$)/;
+              const newCspValue = cspValue.replace(scriptSrcRegex, `$1 'nonce-${scriptNonce}'$2`);
+              response.headers[i].value = newCspValue;
+            }
           }
           break;
         }
@@ -553,11 +558,18 @@ class RouteImpl {
       allInjections.forEach((script) => {
         let scriptId = import_crypto.default.randomBytes(22).toString("hex");
         let scriptSource = script.source || script;
-        injectionHTML += `<script class="${this._page._delegate.initScriptTag}" nonce="${scriptNonce}" type="text/javascript">document.getElementById("${scriptId}")?.remove();${scriptSource}</script>`;
+        if (useNonce) {
+          injectionHTML += `<script class="${this._page.delegate.initScriptTag}" nonce="${scriptNonce}" id="${scriptId}" type="text/javascript">document.getElementById("${scriptId}")?.remove();${scriptSource}</script>`;
+        } else {
+          injectionHTML += `<script class="${this._page.delegate.initScriptTag}" id="${scriptId}" type="text/javascript">document.getElementById("${scriptId}")?.remove();${scriptSource}</script>`;
+        }
       });
       if (response.isBase64) {
         response.isBase64 = false;
-        response.body = injectionHTML + Buffer.from(response.body, "base64").toString("utf-8");
+        response.body = Buffer.from(response.body, "base64").toString("utf-8");
+      }
+      if (/^<!DOCTYPE[sS]*?>/i.test(response.body)) {
+        response.body = response.body.replace(/^<!DOCTYPE[sS]*?>/i, (match) => `${match}${injectionHTML}`);
       } else {
         response.body = injectionHTML + response.body;
       }