patchright-core 1.58.2 → 1.59.1

package/lib/server/bidi/bidiNetworkManager.js

@@ -36,6 +36,7 @@ var import_eventsHelper = require("../utils/eventsHelper");
 var import_cookieStore = require("../cookieStore");
 var network = __toESM(require("../network"));
 var bidi = __toESM(require("./third_party/bidiProtocol"));
+const REQUEST_BODY_HEADERS = /* @__PURE__ */ new Set(["content-encoding", "content-language", "content-location", "content-type"]);
 class BidiNetworkManager {
   constructor(bidiSession, page) {
     this._userRequestInterceptionEnabled = false;
@@ -64,12 +65,38 @@ class BidiNetworkManager {
       return;
     if (redirectedFrom)
       this._deleteRequest(redirectedFrom._id);
+    if (param.request.method === "OPTIONS") {
+      const requestHeaders = Object.fromEntries(param.request.headers.map((h) => [h.name.toLowerCase(), bidiBytesValueToString(h.value)]));
+      if (param.initiator?.type === "preflight" || requestHeaders["access-control-request-method"]) {
+        if (param.intercepts) {
+          const responseHeaders = [
+            { name: "Access-Control-Allow-Origin", value: requestHeaders["origin"] || "*" },
+            { name: "Access-Control-Allow-Methods", value: requestHeaders["access-control-request-method"] },
+            { name: "Access-Control-Allow-Credentials", value: "true" }
+          ];
+          if (requestHeaders["access-control-request-headers"])
+            responseHeaders.push({ name: "Access-Control-Allow-Headers", value: requestHeaders["access-control-request-headers"] });
+          this._session.sendMayFail("network.provideResponse", {
+            request: param.request.request,
+            statusCode: 204,
+            headers: toBidiHeaders(responseHeaders)
+          });
+        }
+        return;
+      }
+    }
     let route;
+    let headersOverride;
     if (param.intercepts) {
       if (redirectedFrom) {
         let params = {};
-        if (redirectedFrom._originalRequestRoute?._alreadyContinuedHeaders)
-          params = toBidiRequestHeaders(redirectedFrom._originalRequestRoute._alreadyContinuedHeaders ?? []);
+        if (redirectedFrom._originalRequestRoute?._alreadyContinuedHeaders) {
+          const originalHeaders = fromBidiHeaders(param.request.headers);
+          headersOverride = network.applyHeadersOverrides(originalHeaders, redirectedFrom._originalRequestRoute._alreadyContinuedHeaders);
+          if (redirectedFrom.request.method() === "POST" && param.request.method === "GET")
+            headersOverride = headersOverride.filter(({ name }) => !REQUEST_BODY_HEADERS.has(name.toLowerCase()));
+          params = toBidiRequestHeaders(headersOverride);
+        }
         this._session.sendMayFail("network.continueRequest", {
           request: param.request.request,
           ...params
@@ -78,7 +105,7 @@ class BidiNetworkManager {
         route = new BidiRouteImpl(this._session, param.request.request);
       }
     }
-    const request = new BidiRequest(frame, redirectedFrom, param, route);
+    const request = new BidiRequest(frame, redirectedFrom, param, route, headersOverride);
     this._requests.set(request._id, request);
     this._page.frameManager.requestStarted(request.request, route);
   }
@@ -111,6 +138,7 @@ class BidiNetworkManager {
     const response = new network.Response(request.request, params.response.status, params.response.statusText, fromBidiHeaders(params.response.headers), timing, getResponseBody, false);
     response._serverAddrFinished();
     response._securityDetailsFinished();
+    response._setHttpVersion(params.response.protocol);
     response.setRawResponseHeaders(null);
     response.setResponseHeadersSize(params.response.headersSize);
     this._page.frameManager.requestReceivedResponse(response);
@@ -130,7 +158,6 @@ class BidiNetworkManager {
       this._deleteRequest(request._id);
       response._requestFinished(responseEndTime);
     }
-    response._setHttpVersion(params.response.protocol);
     this._page.frameManager.reportRequestFinished(request.request, response);
   }
   _onFetchError(params) {
@@ -194,13 +221,13 @@ class BidiNetworkManager {
     this._protocolRequestInterceptionEnabled = enabled;
     if (initial && !enabled)
       return;
-    const cachePromise = this._session.send("network.setCacheBehavior", { cacheBehavior: enabled ? "bypass" : "default" });
+    const contexts = [this._page.delegate._session.sessionId];
+    const cachePromise = this._session.send("network.setCacheBehavior", { cacheBehavior: enabled ? "bypass" : "default", contexts });
     let interceptPromise = Promise.resolve(void 0);
     if (enabled) {
       interceptPromise = this._session.send("network.addIntercept", {
-        phases: [bidi.Network.InterceptPhase.AuthRequired, bidi.Network.InterceptPhase.BeforeRequestSent],
-        urlPatterns: [{ type: "pattern" }]
-        // urlPatterns: [{ type: 'string', pattern: '*' }],
+        phases: [bidi.Network.InterceptPhase.BeforeRequestSent],
+        contexts
       }).then((r) => {
         this._intercepId = r.intercept;
       });
@@ -212,7 +239,7 @@ class BidiNetworkManager {
   }
 }
 class BidiRequest {
-  constructor(frame, redirectedFrom, payload, route) {
+  constructor(frame, redirectedFrom, payload, route, headersOverride) {
     this._id = payload.request.request;
     if (redirectedFrom)
       redirectedFrom._redirectedTo = this;
@@ -227,7 +254,7 @@ class BidiRequest {
       resourceTypeFromBidi(payload.request.destination, payload.request.initiatorType, payload.initiator?.type),
       payload.request.method,
       postDataBuffer,
-      fromBidiHeaders(payload.request.headers)
+      headersOverride || fromBidiHeaders(payload.request.headers)
     );
     this.request.setRawRequestHeaders(null);
     this.request._setBodySize(payload.request.bodySize || 0);
@@ -269,11 +296,12 @@ class BidiRouteImpl {
   }
   async fulfill(response) {
     const base64body = response.isBase64 ? response.body : Buffer.from(response.body).toString("base64");
+    const headers = response.headers.filter((h) => h.name.toLowerCase() !== "content-encoding");
     await this._session.sendMayFail("network.provideResponse", {
       request: this._requestId,
       statusCode: response.status,
       reasonPhrase: network.statusText(response.status),
-      ...toBidiResponseHeaders(response.headers),
+      ...toBidiResponseHeaders(headers),
       body: { type: "base64", value: base64body }
     });
   }

package/lib/server/bidi/bidiPage.js

@@ -51,12 +51,13 @@ class BidiPage {
     this._realmToWorkerContext = /* @__PURE__ */ new Map();
     this._sessionListeners = [];
     this._initScriptIds = /* @__PURE__ */ new Map();
+    this._fragmentNavigations = /* @__PURE__ */ new Set();
     this._session = bidiSession;
     this._opener = opener;
     this.rawKeyboard = new import_bidiInput.RawKeyboardImpl(bidiSession);
     this.rawMouse = new import_bidiInput.RawMouseImpl(bidiSession);
     this.rawTouchscreen = new import_bidiInput.RawTouchscreenImpl(bidiSession);
-    this._realmToContext = /* @__PURE__ */ new Map();
+    this._contextIdToContext = /* @__PURE__ */ new Map();
     this._page = new import_page.Page(this, browserContext);
     this._browserContext = browserContext;
     this._networkManager = new import_bidiNetworkManager.BidiNetworkManager(this._session, this._page);
@@ -102,9 +103,9 @@ class BidiPage {
     return this._page.frameManager.frameAttached(frameId, parentFrameId);
   }
   _removeContextsForFrame(frame, notifyFrame) {
-    for (const [contextId, context] of this._realmToContext) {
+    for (const [contextId, context] of this._contextIdToContext) {
       if (context.frame === frame) {
-        this._realmToContext.delete(contextId);
+        this._contextIdToContext.delete(contextId);
         if (notifyFrame)
           frame._contextDestroyed(context);
       }
@@ -119,7 +120,7 @@ class BidiPage {
       this._page.addWorker(realmInfo.realm, worker);
       return;
     }
-    if (this._realmToContext.has(realmInfo.realm))
+    if (this._contextIdToContext.has(realmInfo.realm))
       return;
     if (realmInfo.type !== "window")
       return;
@@ -138,7 +139,7 @@ class BidiPage {
     const delegate = new import_bidiExecutionContext.BidiExecutionContext(this._session, realmInfo);
     const context = new dom.FrameExecutionContext(delegate, frame, worldName);
     frame._contextCreated(worldName, context);
-    this._realmToContext.set(realmInfo.realm, context);
+    this._contextIdToContext.set(realmInfo.realm, context);
   }
   async _touchUtilityWorld(context) {
     await this._session.sendMayFail("script.evaluate", {
@@ -156,9 +157,9 @@ class BidiPage {
     });
   }
   _onRealmDestroyed(params) {
-    const context = this._realmToContext.get(params.realm);
+    const context = this._contextIdToContext.get(params.realm);
     if (context) {
-      this._realmToContext.delete(params.realm);
+      this._contextIdToContext.delete(params.realm);
       context.frame._contextDestroyed(context);
       return true;
     }
@@ -204,6 +205,8 @@ class BidiPage {
     this._page.frameManager.frameAbortedNavigation(params.context, "Navigation failed", params.navigation || void 0);
   }
   _onFragmentNavigated(params) {
+    if (params.navigation)
+      this._fragmentNavigations.add(params.navigation);
     this._page.frameManager.frameCommittedSameDocumentNavigation(params.context, params.url);
   }
   _onHistoryUpdated(params) {
@@ -229,7 +232,7 @@ class BidiPage {
       originPage = this._opener._page.initializedOrUndefined();
     if (!originPage)
       return;
-    this._browserContext._browser._downloadCreated(originPage, event.navigation, event.url, event.suggestedFilename);
+    this._browserContext._browser._downloadCreated(originPage, event.navigation, event.url, event.suggestedFilename, event.suggestedFilename);
   }
   _onDownloadEnded(event) {
     if (!event.navigation)
@@ -260,12 +263,13 @@ ${params.stackTrace?.callFrames.map((f) => {
     if (params.type !== "console")
       return;
     const entry = params;
-    const context = this._realmToContext.get(params.source.realm) ?? this._realmToWorkerContext.get(params.source.realm);
+    const context = this._contextIdToContext.get(params.source.realm) ?? this._realmToWorkerContext.get(params.source.realm);
     if (!context)
       return;
     const callFrame = params.stackTrace?.callFrames[0];
     const location = callFrame ?? { url: "", lineNumber: 1, columnNumber: 1 };
-    this._page.addConsoleMessage(null, entry.method, entry.args.map((arg) => (0, import_bidiExecutionContext.createHandle)(context, arg)), location);
+    const type = entry.method === "warn" ? "warning" : entry.method;
+    this._page.addConsoleMessage(null, type, entry.args.map((arg) => (0, import_bidiExecutionContext.createHandle)(context, arg)), location, void 0, params.timestamp);
   }
   async _onFileDialogOpened(params) {
     if (!params.element)
@@ -285,6 +289,10 @@ ${params.stackTrace?.callFrames.map((f) => {
       context: frame._id,
       url
     });
+    if (navigation && this._fragmentNavigations.has(navigation)) {
+      this._fragmentNavigations.delete(navigation);
+      return {};
+    }
     return { newDocumentId: navigation || void 0 };
   }
   async updateExtraHTTPHeaders() {
@@ -365,7 +373,13 @@ ${params.stackTrace?.callFrames.map((f) => {
     }).then(() => true).catch(() => false);
   }
   async requestGC() {
-    throw new Error("Method not implemented.");
+    const result = await this._session.send("script.evaluate", {
+      expression: "TestUtils.gc()",
+      target: { context: this._session.sessionId },
+      awaitPromise: true
+    });
+    if (result.type === "exception")
+      throw new Error("Method not implemented.");
   }
   async _onScriptMessage(event) {
     if (event.channel !== kPlaywrightBindingChannel)
@@ -373,7 +387,7 @@ ${params.stackTrace?.callFrames.map((f) => {
     const pageOrError = await this._page.waitForInitializedOrError();
     if (pageOrError instanceof Error)
       return;
-    const context = this._realmToContext.get(event.source.realm);
+    const context = this._contextIdToContext.get(event.source.realm);
     if (!context)
       return;
     if (event.data.type !== "string")
@@ -422,7 +436,7 @@ ${params.stackTrace?.callFrames.map((f) => {
       context: this._session.sessionId,
       format: {
         type: `image/${format === "png" ? "png" : "jpeg"}`,
-        quality: quality ? quality / 100 : 0.8
+        quality: quality !== void 0 ? quality / 100 : void 0
       },
       origin: documentRect ? "document" : "viewport",
       clip: {
@@ -495,9 +509,9 @@ ${params.stackTrace?.callFrames.map((f) => {
       throw e;
     });
   }
-  async startScreencast(options) {
+  startScreencast(options) {
   }
-  async stopScreencast() {
+  stopScreencast() {
   }
   rafCountForStablePosition() {
     return 1;
@@ -572,6 +586,8 @@ ${params.stackTrace?.callFrames.map((f) => {
   shouldToggleStyleSheetToSyncAnimations() {
     return true;
   }
+  async setDockTile(image) {
+  }
 }
 function toBidiExecutionContext(executionContext) {
   return executionContext.delegate;

package/lib/server/bidi/third_party/firefoxPrefs.js

@@ -223,7 +223,9 @@ function defaultProfilePreferences(extraPrefs) {
     // Disable browser animations (tabs, fullscreen, sliding alerts)
     "toolkit.cosmeticAnimations.enabled": false,
     // Prevent starting into safe mode after application crashes
-    "toolkit.startup.max_resumed_crashes": -1
+    "toolkit.startup.max_resumed_crashes": -1,
+    // Enable TestUtils
+    "dom.testing.testutils.enabled": true
   };
   return Object.assign(defaultPrefs, extraPrefs);
 }

package/lib/server/browser.js

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,29 +17,42 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var browser_exports = {};
 __export(browser_exports, {
-  Browser: () => Browser
+  Browser: () => Browser,
+  BrowserServer: () => BrowserServer
 });
 module.exports = __toCommonJS(browser_exports);
-var import_artifact = require("./artifact");
+var import_fs = __toESM(require("fs"));
 var import_browserContext = require("./browserContext");
 var import_download = require("./download");
 var import_instrumentation = require("./instrumentation");
-var import_page = require("./page");
 var import_socksClientCertificatesInterceptor = require("./socksClientCertificatesInterceptor");
+var import_playwrightPipeServer = require("../remote/playwrightPipeServer");
+var import_playwrightWebSocketServer = require("../remote/playwrightWebSocketServer");
+var import_serverRegistry = require("../serverRegistry");
+var import_fileUtils = require("./utils/fileUtils");
+var import_utils = require("../utils");
 class Browser extends import_instrumentation.SdkObject {
   constructor(parent, options) {
     super(parent, "browser");
     this._downloads = /* @__PURE__ */ new Map();
     this._defaultContext = null;
     this._startedClosing = false;
-    this._idToVideo = /* @__PURE__ */ new Map();
     this._isCollocatedWithServer = true;
     this.attribution.browser = this;
     this.options = options;
     this.instrumentation.onBrowserOpen(this);
+    this._server = new BrowserServer(this);
   }
   static {
     this.Events = {
@@ -88,8 +103,8 @@ class Browser extends import_instrumentation.SdkObject {
   contextForReuse() {
     return this._contextForReuse?.context;
   }
-  _downloadCreated(page, uuid, url, suggestedFilename) {
-    const download = new import_download.Download(page, this.options.downloadsPath || "", uuid, url, suggestedFilename);
+  _downloadCreated(page, uuid, url, suggestedFilename, downloadFilename) {
+    const download = new import_download.Download(page, this.options.downloadsPath || "", uuid, url, suggestedFilename, downloadFilename);
     this._downloads.set(uuid, download);
   }
   _downloadFilenameSuggested(uuid, suggestedFilename) {
@@ -105,27 +120,19 @@ class Browser extends import_instrumentation.SdkObject {
     download.artifact.reportFinished(error ? new Error(error) : void 0);
     this._downloads.delete(uuid);
   }
-  _videoStarted(context, videoId, path, pageOrError) {
-    const artifact = new import_artifact.Artifact(context, path);
-    this._idToVideo.set(videoId, { context, artifact });
-    pageOrError.then((page) => {
-      if (page instanceof import_page.Page) {
-        page.video = artifact;
-        page.emitOnContext(import_browserContext.BrowserContext.Events.VideoStarted, artifact);
-        page.emit(import_page.Page.Events.Video, artifact);
-      }
-    });
+  async startServer(title, options) {
+    return await this._server.start(title, options);
   }
-  _takeVideo(videoId) {
-    const video = this._idToVideo.get(videoId);
-    this._idToVideo.delete(videoId);
-    return video?.artifact;
+  async stopServer() {
+    await this._server.stop();
   }
   _didClose() {
     for (const context of this.contexts())
       context._browserClosed();
     if (this._defaultContext)
       this._defaultContext._browserClosed();
+    this.stopServer().catch(() => {
+    });
     this.emit(Browser.Events.Disconnected);
     this.instrumentation.onBrowserClose(this);
   }
@@ -143,7 +150,63 @@ class Browser extends import_instrumentation.SdkObject {
     await this.options.browserProcess.kill();
   }
 }
+class BrowserServer {
+  constructor(browser) {
+    this._isStarted = false;
+    this._browser = browser;
+  }
+  async start(title, options) {
+    if (this._isStarted)
+      throw new Error(`Server is already started.`);
+    this._isStarted = true;
+    let endpoint;
+    if (options.host !== void 0 || options.port !== void 0) {
+      this._wsServer = new import_playwrightWebSocketServer.PlaywrightWebSocketServer(this._browser, "/");
+      endpoint = await this._wsServer.listen(options.port ?? 0, options.host, (0, import_utils.createGuid)());
+    } else {
+      this._pipeServer = new import_playwrightPipeServer.PlaywrightPipeServer(this._browser);
+      this._pipeSocketPath = await this._socketPath();
+      await this._pipeServer.listen(this._pipeSocketPath);
+      endpoint = this._pipeSocketPath;
+    }
+    const browserInfo = {
+      guid: this._browser.guid,
+      browserName: this._browser.options.browserType,
+      launchOptions: asClientLaunchOptions(this._browser.options.originalLaunchOptions),
+      userDataDir: this._browser.options.userDataDir
+    };
+    await import_serverRegistry.serverRegistry.create(browserInfo, {
+      title,
+      endpoint,
+      workspaceDir: options.workspaceDir,
+      metadata: options.metadata
+    });
+    return { endpoint };
+  }
+  async stop() {
+    if (!this._browser.options.userDataDir)
+      await import_serverRegistry.serverRegistry.delete(this._browser.guid);
+    if (this._pipeSocketPath && process.platform !== "win32")
+      await import_fs.default.promises.unlink(this._pipeSocketPath).catch(() => {
+      });
+    await this._pipeServer?.close();
+    await this._wsServer?.close();
+    this._pipeServer = void 0;
+    this._wsServer = void 0;
+    this._isStarted = false;
+  }
+  async _socketPath() {
+    return (0, import_fileUtils.makeSocketPath)("browser", this._browser.guid.slice(0, 14));
+  }
+}
+function asClientLaunchOptions(serverOptions) {
+  return {
+    ...serverOptions,
+    env: serverOptions.env ? Object.fromEntries(serverOptions.env.map(({ name, value }) => [name, value])) : void 0
+  };
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  Browser
+  Browser,
+  BrowserServer
 });