patchright-core 1.58.2 → 1.59.1

package/lib/server/chromium/crNetworkManager.js

@@ -31,7 +31,6 @@ __export(crNetworkManager_exports, {
   CRNetworkManager: () => CRNetworkManager
 });
 module.exports = __toCommonJS(crNetworkManager_exports);
-var import_crypto = __toESM(require("crypto"));
 var import_utils = require("../../utils");
 var import_eventsHelper = require("../utils/eventsHelper");
 var import_helper = require("../helper");
@@ -50,7 +49,6 @@ class CRNetworkManager {
     this._requestIdToRequestPausedEvent = /* @__PURE__ */ new Map();
     this._responseExtraInfoTracker = new ResponseExtraInfoTracker();
     this._sessions = /* @__PURE__ */ new Map();
-    this._alreadyTrackedNetworkIds = /* @__PURE__ */ new Set();
     this._page = page;
     this._serviceWorker = serviceWorker;
   }
@@ -141,8 +139,6 @@ class CRNetworkManager {
   async setRequestInterception(value) {
     this._userRequestInterceptionEnabled = value;
     await this._updateProtocolRequestInterception();
-    if (this._page)
-      await this._forEachSession((info) => info.session.send("Network.setCacheDisabled", { cacheDisabled: this._page.needsRequestInterception() }));
   }
   async _updateProtocolRequestInterception() {
     const enabled = this._userRequestInterceptionEnabled || !!this._credentials;
@@ -155,9 +151,7 @@ class CRNetworkManager {
     const enabled = this._protocolRequestInterceptionEnabled;
     if (initial && !enabled)
       return;
-    const hasHarRecorders = !!this._page?.browserContext?._harRecorders?.size;
-    const userInterception = this._page ? this._page.needsRequestInterception() : false;
-    const cachePromise = info.session.send("Network.setCacheDisabled", { cacheDisabled: userInterception || hasHarRecorders });
+    const cachePromise = info.session.send("Network.setCacheDisabled", { cacheDisabled: enabled });
     let fetchPromise = Promise.resolve(void 0);
     if (!info.workerFrame) {
       if (enabled)
@@ -232,7 +226,6 @@ 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) {
       sessionInfo.session._sendMayFail("Fetch.continueRequest", { requestId: event.requestId });
       return;
@@ -246,7 +239,7 @@ class CRNetworkManager {
       this._requestIdToRequestWillBeSentEvent.delete(requestId);
     } else {
       const existingRequest = this._requestIdToRequest.get(requestId);
-      const alreadyContinuedParams = existingRequest?._route?._alreadyContinuedParams;
+      const alreadyContinuedParams = existingRequest?._originalRequestRoute?._alreadyContinuedParams;
       if (alreadyContinuedParams && !event.redirectedRequestId) {
         sessionInfo.session._sendMayFail("Fetch.continueRequest", {
           ...alreadyContinuedParams,
@@ -258,7 +251,6 @@ class CRNetworkManager {
     }
   }
   _onRequest(requestWillBeSentSessionInfo, requestWillBeSentEvent, requestPausedSessionInfo, requestPausedEvent) {
-    if (this._alreadyTrackedNetworkIds.has(requestWillBeSentEvent.initiator.requestId)) return;
     if (requestWillBeSentEvent.request.url.startsWith("data:"))
       return;
     let redirectedFrom = null;
@@ -269,17 +261,13 @@ class CRNetworkManager {
         redirectedFrom = request2;
       }
     }
-    const isInterceptedOptionsPreflight = !!requestPausedEvent && requestPausedEvent.request.method === "OPTIONS" && requestWillBeSentEvent.initiator.type === "preflight";
-    if (isInterceptedOptionsPreflight && !(this._page || this._serviceWorker).needsRequestInterception()) {
-      requestPausedSessionInfo.session._sendMayFail("Fetch.continueRequest", { requestId: requestPausedEvent.requestId });
-      return;
-    }
     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);
     }
+    const isInterceptedOptionsPreflight = !!requestPausedEvent && requestPausedEvent.request.method === "OPTIONS" && requestWillBeSentEvent.initiator.type === "preflight";
     if (isInterceptedOptionsPreflight && (this._page || this._serviceWorker).needsRequestInterception()) {
       const requestHeaders = requestPausedEvent.request.headers;
       const responseHeaders = [
@@ -314,7 +302,7 @@ class CRNetworkManager {
         }
         requestPausedSessionInfo.session._sendMayFail("Fetch.continueRequest", { requestId: requestPausedEvent.requestId, headers: headersOverride });
       } else {
-        route = new RouteImpl(requestPausedSessionInfo.session, requestPausedEvent.requestId, this._page, requestPausedEvent.networkId, this);
+        route = new RouteImpl(requestPausedSessionInfo.session, requestPausedEvent.requestId);
       }
     }
     const isNavigationRequest = requestWillBeSentEvent.requestId === requestWillBeSentEvent.loaderId && requestWillBeSentEvent.type === "Document";
@@ -345,7 +333,7 @@ class CRNetworkManager {
       const response2 = await session.send("Network.getResponseBody", { requestId: request._requestId });
       if (response2.body || !expectedLength)
         return Buffer.from(response2.body, response2.base64Encoded ? "base64" : "utf8");
-      if (request._route?._fulfilled)
+      if (request._originalRequestRoute?._fulfilled)
         return Buffer.from("");
       const resource = await session.send("Network.loadNetworkResource", { url: request.request.url(), frameId: this._serviceWorker ? void 0 : request.request.frame()._id, options: { disableCache: false, includeCredentials: true } });
       const chunks = [];
@@ -384,7 +372,8 @@ class CRNetworkManager {
         responseStart: -1
       };
     }
-    const response = new network.Response(request.request, responsePayload.status, responsePayload.statusText, (0, import_utils.headersObjectToArray)(responsePayload.headers), timing, getResponseBody, !!responsePayload.fromServiceWorker, responsePayload.protocol);
+    const response = new network.Response(request.request, responsePayload.status, responsePayload.statusText, (0, import_utils.headersObjectToArray)(responsePayload.headers), timing, getResponseBody, !!responsePayload.fromServiceWorker);
+    response._setHttpVersion(responsePayload?.protocol ?? null);
     if (responsePayload?.remoteIPAddress && typeof responsePayload?.remotePort === "number") {
       response._serverAddrFinished({
         ipAddress: responsePayload.remoteIPAddress,
@@ -490,7 +479,6 @@ class InterceptableRequest {
     this._requestId = requestWillBeSentEvent.requestId;
     this._interceptionId = requestPausedEvent && requestPausedEvent.requestId;
     this._documentId = documentId;
-    this._route = route;
     this._originalRequestRoute = route ?? redirectedFrom?._originalRequestRoute;
     const {
       headers,
@@ -506,17 +494,10 @@ class InterceptableRequest {
   }
 }
 class RouteImpl {
-  constructor(session, interceptionId, page, networkId, sessionManager) {
+  constructor(session, interceptionId) {
     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;
-    import_eventsHelper.eventsHelper.addEventListener(this._session, "Fetch.requestPaused", async (e) => await this._networkRequestIntercepted(e));
   }
   async continue(overrides) {
     this._alreadyContinuedParams = {
@@ -526,138 +507,17 @@ class RouteImpl {
       method: overrides.method,
       postData: overrides.postData ? overrides.postData.toString("base64") : void 0
     };
-    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._sendMayFail("Fetch.continueRequest", { requestId: this._interceptionId, interceptResponse: true });
-      });
-    } else {
-      await catchDisallowedErrors(async () => {
-        await this._session._sendMayFail("Fetch.continueRequest", this._alreadyContinuedParams);
-      });
-    }
+    await catchDisallowedErrors(async () => {
+      await this._session.send("Fetch.continueRequest", this._alreadyContinuedParams);
+    });
   }
   async fulfill(response) {
-    const isTextHtml = response.headers.some((header) => header.name.toLowerCase() === "content-type" && header.value.includes("text/html"));
-    const pageDelegate = this._page?.delegate || null;
-    const initScriptTag = pageDelegate?.initScriptTag || "";
-    let allInjections = [];
-    if (pageDelegate)
-      allInjections = [...pageDelegate._mainFrameSession._evaluateOnNewDocumentScripts];
-    if (isTextHtml && allInjections.length && initScriptTag) {
-      let useNonce = false;
-      let scriptNonce = null;
-      if (response.isBase64) {
-        response.isBase64 = false;
-        response.body = Buffer.from(response.body, "base64").toString("utf-8");
-      }
-      const cspHeaderNames = ["content-security-policy", "content-security-policy-report-only"];
-      for (let i = 0; i < response.headers.length; i++) {
-        const headerName = response.headers[i].name.toLowerCase();
-        if (cspHeaderNames.includes(headerName)) {
-          const originalCsp = response.headers[i].value || "";
-          if (!useNonce) {
-            const nonceMatch = originalCsp.match(/script-src[^;]*'nonce-([^'"\s;]+)'/i);
-            if (nonceMatch && nonceMatch[1]) {
-              scriptNonce = nonceMatch[1];
-              useNonce = true;
-            }
-          }
-          const fixedCsp = this._fixCSP(originalCsp, scriptNonce);
-          response.headers[i].value = fixedCsp;
-        }
-      }
-      if (typeof response.body === "string" && response.body.length) {
-        response.body = response.body.replace(
-          /<meta[^>]*http-equiv=(?:"|')?Content-Security-Policy(?:"|')?[^>]*>/gi,
-          (match) => {
-            const contentMatch = match.match(/content=(?:"|')([^"']*)(?:"|')/i);
-            if (contentMatch && contentMatch[1]) {
-              let originalCsp = contentMatch[1];
-              originalCsp = originalCsp.replace(/&amp;/g, "&").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"').replace(/&#x27;/g, "'").replace(/&#x22;/g, '"').replace(/&nbsp;/g, " ").replace(/&#(d+);/g, (match2, dec) => String.fromCharCode(dec)).replace(/&#x([0-9a-fA-F]+);/g, (match2, hex) => String.fromCharCode(parseInt(hex, 16)));
-              if (!useNonce) {
-                const nonceMatch = originalCsp.match(/script-src[^;]*'nonce-([^'"\s;]+)'/i);
-                if (nonceMatch && nonceMatch[1]) {
-                  scriptNonce = nonceMatch[1];
-                  useNonce = true;
-                }
-              }
-              const fixedCsp = this._fixCSP(originalCsp, scriptNonce);
-              const encodedCsp = fixedCsp.replace(/'/g, "&#x27;").replace(/"/g, "&#x22;");
-              return match.replace(contentMatch[1], encodedCsp);
-            }
-            return match;
-          }
-        );
-      }
-      let injectionHTML = "";
-      allInjections.forEach((script) => {
-        let scriptId = import_crypto.default.randomBytes(22).toString("hex");
-        let scriptSource = script.source || script;
-        const nonceAttr = useNonce ? `nonce="${scriptNonce}"` : "";
-        injectionHTML += `<script class="${initScriptTag}" ${nonceAttr} id="${scriptId}" type="text/javascript">document.getElementById("${scriptId}")?.remove();${scriptSource}</script>`;
-      });
-      const lower = response.body.toLowerCase();
-      const headStartIndex = lower.indexOf("<head");
-      if (headStartIndex !== -1) {
-        const headEndTagIndex = lower.indexOf("</head>", headStartIndex);
-        if (headEndTagIndex !== -1) {
-          const headOpenEnd = response.body.indexOf(">", headStartIndex) + 1;
-          const headContent = response.body.slice(headOpenEnd, headEndTagIndex);
-          const headContentLower = headContent.toLowerCase();
-          let firstScriptIndex = -1;
-          let searchPos = 0;
-          const endSearchPos = headContentLower.length;
-          while (searchPos < endSearchPos) {
-            const commentStart = headContentLower.indexOf("<!--", searchPos);
-            const scriptStart = headContentLower.indexOf("<script", searchPos);
-            if (scriptStart === -1 || scriptStart >= endSearchPos) {
-              break;
-            }
-            if (commentStart !== -1 && commentStart < scriptStart) {
-              const commentEnd = headContentLower.indexOf("-->", commentStart);
-              if (commentEnd !== -1) {
-                searchPos = commentEnd + 3;
-                continue;
-              } else {
-                break;
-              }
-            }
-            firstScriptIndex = scriptStart;
-            break;
-          }
-          if (firstScriptIndex !== -1) {
-            const insertPosition = headOpenEnd + firstScriptIndex;
-            response.body = response.body.slice(0, insertPosition) + injectionHTML + response.body.slice(insertPosition);
-          } else {
-            response.body = response.body.slice(0, headEndTagIndex) + injectionHTML + response.body.slice(headEndTagIndex);
-          }
-        } else {
-          const headStartTagEnd = response.body.indexOf(">", headStartIndex) + 1;
-          response.body = response.body.slice(0, headStartTagEnd) + injectionHTML + response.body.slice(headStartTagEnd);
-        }
-      } else {
-        const doctypeIndex = lower.indexOf("<!doctype");
-        if (doctypeIndex === 0) {
-          const doctypeEnd = response.body.indexOf(">", doctypeIndex) + 1;
-          response.body = response.body.slice(0, doctypeEnd) + injectionHTML + response.body.slice(doctypeEnd);
-        } else {
-          const htmlIndex = lower.indexOf("<html");
-          if (htmlIndex !== -1) {
-            const htmlTagEnd = response.body.indexOf(">", htmlIndex) + 1;
-            response.body = response.body.slice(0, htmlTagEnd) + `<head>${injectionHTML}</head>` + response.body.slice(htmlTagEnd);
-          } else {
-            response.body = injectionHTML + response.body;
-          }
-        }
-      }
-    }
     this._fulfilled = true;
     const body = response.isBase64 ? response.body : Buffer.from(response.body).toString("base64");
     const responseHeaders = splitSetCookieHeader(response.headers);
     await catchDisallowedErrors(async () => {
       await this._session.send("Fetch.fulfillRequest", {
-        requestId: response.interceptionId ? response.interceptionId : this._interceptionId,
+        requestId: this._interceptionId,
         responseCode: response.status,
         responsePhrase: network.statusText(response.status),
         responseHeaders,
@@ -675,121 +535,6 @@ class RouteImpl {
       });
     });
   }
-  _fixCSP(csp, scriptNonce) {
-    if (!csp || typeof csp !== "string") return csp;
-    const directives = csp.split(";").map((d) => d.trim()).filter((d) => d && d.length > 0);
-    const fixedDirectives = [];
-    let hasScriptSrc = false;
-    for (let directive of directives) {
-      if (!directive.trim()) continue;
-      const directiveMatch = directive.match(/^([a-zA-Z-]+)\s+(.*)$/);
-      if (!directiveMatch) {
-        fixedDirectives.push(directive);
-        continue;
-      }
-      const directiveName = directiveMatch[1].toLowerCase();
-      const directiveValues = directiveMatch[2].split(/\s+/).filter((v) => v.length > 0);
-      switch (directiveName) {
-        case "script-src":
-          hasScriptSrc = true;
-          let values = [...directiveValues];
-          if (scriptNonce && !values.some((v) => v.includes(`nonce-${scriptNonce}`))) {
-            values.push(`'nonce-${scriptNonce}'`);
-          }
-          if (!values.includes("'unsafe-eval'")) {
-            values.push("'unsafe-eval'");
-          }
-          if (!values.includes("'unsafe-inline'") && !scriptNonce) {
-            values.push("'unsafe-inline'");
-          }
-          if (!values.includes("*") && !values.includes("'self'") && !values.some((v) => v.includes("https:"))) {
-            values.push("*");
-          }
-          fixedDirectives.push(`script-src ${values.join(" ")}`);
-          break;
-        case "style-src":
-          let styleValues = [...directiveValues];
-          if (!styleValues.includes("'unsafe-inline'")) {
-            styleValues.push("'unsafe-inline'");
-          }
-          fixedDirectives.push(`style-src ${styleValues.join(" ")}`);
-          break;
-        case "img-src":
-          let imgValues = [...directiveValues];
-          if (!imgValues.includes("data:") && !imgValues.includes("*")) {
-            imgValues.push("data:");
-          }
-          fixedDirectives.push(`img-src ${imgValues.join(" ")}`);
-          break;
-        case "font-src":
-          let fontValues = [...directiveValues];
-          if (!fontValues.includes("data:") && !fontValues.includes("*")) {
-            fontValues.push("data:");
-          }
-          fixedDirectives.push(`font-src ${fontValues.join(" ")}`);
-          break;
-        case "connect-src":
-          let connectValues = [...directiveValues];
-          const hasWs = connectValues.some((v) => v.includes("ws:") || v.includes("wss:") || v === "*");
-          if (!hasWs) {
-            connectValues.push("ws:", "wss:");
-          }
-          fixedDirectives.push(`connect-src ${connectValues.join(" ")}`);
-          break;
-        case "frame-ancestors":
-          let frameAncestorValues = [...directiveValues];
-          if (frameAncestorValues.includes("'none'")) {
-            frameAncestorValues = ["'self'"];
-          }
-          fixedDirectives.push(`frame-ancestors ${frameAncestorValues.join(" ")}`);
-          break;
-        default:
-          fixedDirectives.push(directive);
-          break;
-      }
-    }
-    if (!hasScriptSrc) {
-      if (scriptNonce) {
-        fixedDirectives.push(`script-src 'self' 'unsafe-eval' 'nonce-${scriptNonce}' *`);
-      } else {
-        fixedDirectives.push(`script-src 'self' 'unsafe-eval' 'unsafe-inline' *`);
-      }
-    }
-    return fixedDirectives.join("; ");
-  }
-  async _networkRequestIntercepted(event) {
-    if (event.resourceType !== "Document") {
-      return;
-    }
-    if (this._networkId != event.networkId || !this._sessionManager._alreadyTrackedNetworkIds.has(event.networkId)) return;
-    try {
-      const url = event.request?.url || "";
-      const isPrivilegePage = url.startsWith("https://ntp.msn");
-      if (isPrivilegePage) {
-        await this._session._sendMayFail("Fetch.continueRequest", { requestId: event.requestId });
-        return;
-      }
-      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) {
-      if (error.message.includes("Can only get response body on HeadersReceived pattern matched requests.")) {
-        await this._session.send("Fetch.continueRequest", { requestId: event.requestId, interceptResponse: true });
-      } else {
-        await this._session._sendMayFail("Fetch.continueRequest", { requestId: event.requestId });
-      }
-    }
-  }
 }
 async function catchDisallowedErrors(callback) {
   try {