brave-real-playwright-core 1.55.1-patch.1 → 1.56.0

package/lib/server/webkit/wkPage.js

@@ -39,7 +39,6 @@ var import_eventsHelper = require("../utils/eventsHelper");
 var import_hostPlatform = require("../utils/hostPlatform");
 var import_stackTrace = require("../../utils/isomorphic/stackTrace");
 var import_utilsBundle = require("../../utilsBundle");
-var import_browserContext = require("../browserContext");
 var dialog = __toESM(require("../dialog"));
 var dom = __toESM(require("../dom"));
 var import_errors = require("../errors");
@@ -54,6 +53,7 @@ var import_wkInterceptableRequest = require("./wkInterceptableRequest");
 var import_wkProvisionalPage = require("./wkProvisionalPage");
 var import_wkWorkers = require("./wkWorkers");
 var import_debugLogger = require("../utils/debugLogger");
+var import_webkit = require("./webkit");
 const UTILITY_WORLD_NAME = "__playwright_utility_world__";
 class WKPage {
   constructor(browserContext, pageProxySession, opener) {
@@ -289,6 +289,8 @@ class WKPage {
         session.dispatchMessage({ id: message.id, error: { message: e.message } });
       });
     });
+    if (targetInfo.type === "frame")
+      return;
     (0, import_utils.assert)(targetInfo.type === "page", "Only page targets are expected in WebKit, received: " + targetInfo.type);
     if (!targetInfo.isProvisional) {
       (0, import_utils.assert)(!this._page.initializedOrUndefined());
@@ -341,7 +343,6 @@ class WKPage {
       import_eventsHelper.eventsHelper.addEventListener(this._session, "Page.frameDetached", (event) => this._onFrameDetached(event.frameId)),
       import_eventsHelper.eventsHelper.addEventListener(this._session, "Page.willCheckNavigationPolicy", (event) => this._onWillCheckNavigationPolicy(event.frameId)),
       import_eventsHelper.eventsHelper.addEventListener(this._session, "Page.didCheckNavigationPolicy", (event) => this._onDidCheckNavigationPolicy(event.frameId, event.cancel)),
-      import_eventsHelper.eventsHelper.addEventListener(this._session, "Page.frameScheduledNavigation", (event) => this._onFrameScheduledNavigation(event.frameId, event.delay, event.targetIsCurrentFrame)),
       import_eventsHelper.eventsHelper.addEventListener(this._session, "Page.loadEventFired", (event) => this._page.frameManager.frameLifecycleEvent(event.frameId, "load")),
       import_eventsHelper.eventsHelper.addEventListener(this._session, "Page.domContentEventFired", (event) => this._page.frameManager.frameLifecycleEvent(event.frameId, "domcontentloaded")),
       import_eventsHelper.eventsHelper.addEventListener(this._session, "Runtime.executionContextCreated", (event) => this._onExecutionContextCreated(event.context)),
@@ -388,10 +389,6 @@ class WKPage {
       return;
     this._page.frameManager.frameAbortedNavigation(frameId, "Navigation canceled by policy check");
   }
-  _onFrameScheduledNavigation(frameId, delay, targetIsCurrentFrame) {
-    if (targetIsCurrentFrame)
-      this._page.frameManager.frameRequestedNavigation(frameId);
-  }
   _handleFrameTree(frameTree) {
     this._onFrameAttached(frameTree.frame.id, frameTree.frame.parentId || null);
     this._onFrameNavigated(frameTree.frame, true);
@@ -478,7 +475,7 @@ class WKPage {
       const error = new Error(message);
       error.stack = stack;
       error.name = name;
-      this._page.emitOnContextOnceInitialized(import_browserContext.BrowserContext.Events.PageError, error, this._page);
+      this._page.addPageError(error);
       return;
     }
     let derivedType = type || "";
@@ -769,7 +766,7 @@ class WKPage {
   async _startVideo(options) {
     (0, import_utils.assert)(!this._recordingVideoFile);
     const { screencastId } = await this._pageProxySession.send("Screencast.startVideo", {
-      file: options.outputFile,
+      file: this._browserContext._browser.options.channel === "webkit-wsl" ? await (0, import_webkit.translatePathToWSL)(options.outputFile) : options.outputFile,
       width: options.width,
       height: options.height,
       toolbarHeight: this._toolbarHeight()
@@ -889,6 +886,8 @@ class WKPage {
   async setInputFilePaths(handle, paths) {
     const pageProxyId = this._pageProxySession.sessionId;
     const objectId = handle._objectId;
+    if (this._browserContext._browser?.options.channel === "webkit-wsl")
+      paths = await Promise.all(paths.map((path2) => (0, import_webkit.translatePathToWSL)(path2)));
     await Promise.all([
       this._pageProxySession.connection.browserSession.send("Playwright.grantFileReadAccess", { pageProxyId, paths }),
       this._session.send("DOM.setInputFiles", { objectId, paths })

package/lib/server/webkit/wsl/webkit-wsl-transport-client.js

@@ -0,0 +1,74 @@
+"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 __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  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 import_net = __toESM(require("net"));
+var import_fs = __toESM(require("fs"));
+var import_child_process = require("child_process");
+(async () => {
+  const { PW_WSL_BRIDGE_PORT: socketPort, ...childEnv } = process.env;
+  if (!socketPort)
+    throw new Error("PW_WSL_BRIDGE_PORT env var is not set");
+  const [executable, ...args] = process.argv.slice(2);
+  if (!(await import_fs.default.promises.stat(executable)).isFile())
+    throw new Error(`Executable does not exist. Did you update Playwright recently? Make sure to run npx playwright install webkit-wsl`);
+  const address = (() => {
+    const res = (0, import_child_process.spawnSync)("/usr/bin/wslinfo", ["--networking-mode"], { encoding: "utf8" });
+    if (res.error || res.status !== 0)
+      throw new Error(`Failed to run /usr/bin/wslinfo --networking-mode: ${res.error?.message || res.stderr || res.status}`);
+    if (res.stdout.trim() === "nat") {
+      const ipRes = (0, import_child_process.spawnSync)("/usr/sbin/ip", ["route", "show"], { encoding: "utf8" });
+      if (ipRes.error || ipRes.status !== 0)
+        throw new Error(`Failed to run ip route show: ${ipRes.error?.message || ipRes.stderr || ipRes.status}`);
+      const ip = ipRes.stdout.trim().split("\n").find((line) => line.includes("default"))?.split(" ")[2];
+      if (!ip)
+        throw new Error("Could not determine WSL IP address (NAT mode).");
+      return ip;
+    }
+    return "127.0.0.1";
+  })();
+  const socket = import_net.default.createConnection(parseInt(socketPort, 10), address);
+  socket.setNoDelay(true);
+  await new Promise((resolve, reject) => {
+    socket.on("connect", resolve);
+    socket.on("error", reject);
+  });
+  const child = (0, import_child_process.spawn)(executable, args, {
+    stdio: ["inherit", "inherit", "inherit", "pipe", "pipe"],
+    env: childEnv
+  });
+  const [childOutput, childInput] = [child.stdio[3], child.stdio[4]];
+  socket.pipe(childOutput);
+  childInput.pipe(socket);
+  socket.on("end", () => child.kill());
+  child.on("exit", (exitCode) => {
+    socket.end();
+    process.exit(exitCode || 0);
+  });
+  await new Promise((resolve, reject) => {
+    child.on("exit", resolve);
+    child.on("error", reject);
+  });
+})().catch((error) => {
+  console.error("Error occurred:", error);
+  process.exit(1);
+});

package/lib/server/webkit/wsl/webkit-wsl-transport-server.js

@@ -0,0 +1,113 @@
+"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 __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  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 import_net = __toESM(require("net"));
+var import_path = __toESM(require("path"));
+var import_child_process = require("child_process");
+(async () => {
+  const argv = process.argv.slice(2);
+  if (!argv.length) {
+    console.error(`Usage: node ${import_path.default.basename(__filename)} <executable> [args...]`);
+    process.exit(1);
+  }
+  const parentIn = new import_net.default.Socket({ fd: 3, readable: true, writable: false });
+  const parentOut = new import_net.default.Socket({ fd: 4, readable: false, writable: true });
+  const server = import_net.default.createServer();
+  let socket = null;
+  server.on("connection", (s) => {
+    if (socket) {
+      log("Extra connection received, destroying.");
+      socket.destroy();
+      return;
+    }
+    socket = s;
+    socket.setNoDelay(true);
+    log("Client connected, wiring pipes.");
+    socket.pipe(parentOut);
+    parentIn.pipe(socket);
+    socket.on("close", () => {
+      log("Socket closed");
+      socket = null;
+    });
+  });
+  await new Promise((resolve, reject) => {
+    server.once("error", reject);
+    server.listen(0, () => resolve(null));
+  });
+  const address = server.address();
+  if (!address || typeof address === "string") {
+    console.error("Failed to obtain listening address");
+    process.exit(1);
+  }
+  const port = address.port;
+  log("Server listening on", port);
+  const env = {
+    ...process.env,
+    // WSLENV is a colon-delimited list of environment variables that should be included when launching WSL processes from Win32 or Win32 processes from WSL
+    WSLENV: "PW_WSL_BRIDGE_PORT",
+    PW_WSL_BRIDGE_PORT: String(port)
+  };
+  let shuttingDown = false;
+  const child = (0, import_child_process.spawn)("wsl.exe", [
+    "-d",
+    "playwright",
+    "--cd",
+    "/home/pwuser",
+    "/home/pwuser/node/bin/node",
+    "/home/pwuser/webkit-wsl-transport-client.js",
+    process.env.WEBKIT_EXECUTABLE || "",
+    ...argv
+  ], {
+    env,
+    stdio: ["inherit", "inherit", "inherit"]
+    // no fd3/fd4 here; they stay only in this wrapper
+  });
+  log("Spawned child pid", child.pid);
+  child.on("close", (code, signal) => {
+    log("Child exit", { code, signal });
+    const exitCode = code ?? (signal ? 128 : 0);
+    shutdown(exitCode);
+  });
+  child.on("error", (err) => {
+    console.error("Child process failed to start:", err);
+    shutdown(1);
+  });
+  await new Promise((resolve) => child.once("close", resolve));
+  async function shutdown(code = 0) {
+    if (shuttingDown)
+      return;
+    shuttingDown = true;
+    server.close();
+    parentIn.destroy();
+    parentOut.destroy();
+    socket?.destroy();
+    await new Promise((resolve) => server.once("close", resolve));
+    process.exit(code);
+  }
+  function log(...args) {
+    console.error(/* @__PURE__ */ new Date(), `[${import_path.default.basename(__filename)}]`, ...args);
+  }
+})().catch((error) => {
+  console.error("Error occurred:", error);
+  process.exit(1);
+});

package/lib/utils/isomorphic/ariaSnapshot.js

@@ -22,7 +22,7 @@ __export(ariaSnapshot_exports, {
   ParserError: () => ParserError,
   parseAriaSnapshot: () => parseAriaSnapshot,
   parseAriaSnapshotUnsafe: () => parseAriaSnapshotUnsafe,
-  valueOrRegex: () => valueOrRegex
+  textValue: () => textValue
 });
 module.exports = __toCommonJS(ariaSnapshot_exports);
 function parseAriaSnapshotUnsafe(yaml, text, options = {}) {
@@ -95,7 +95,7 @@ function parseAriaSnapshot(yaml, text, options = {}) {
         }
         container.children.push({
           kind: "text",
-          text: valueOrRegex(value.value)
+          text: textValue(value.value)
         });
         continue;
       }
@@ -121,7 +121,7 @@ function parseAriaSnapshot(yaml, text, options = {}) {
           continue;
         }
         container.props = container.props ?? {};
-        container.props[key.value.slice(1)] = valueOrRegex(value.value);
+        container.props[key.value.slice(1)] = textValue(value.value);
         continue;
       }
       const childNode = KeyParser.parse(key, parseOptions, errors);
@@ -141,7 +141,7 @@ function parseAriaSnapshot(yaml, text, options = {}) {
           ...childNode,
           children: [{
             kind: "text",
-            text: valueOrRegex(String(value.value))
+            text: textValue(String(value.value))
           }]
         });
         continue;
@@ -181,13 +181,16 @@ const emptyFragment = { kind: "role", role: "fragment" };
 function normalizeWhitespace(text) {
   return text.replace(/[\u200b\u00ad]/g, "").replace(/[\r\n\s\t]+/g, " ").trim();
 }
-function valueOrRegex(value) {
-  return value.startsWith("/") && value.endsWith("/") && value.length > 1 ? { pattern: value.slice(1, -1) } : normalizeWhitespace(value);
+function textValue(value) {
+  return {
+    raw: value,
+    normalized: normalizeWhitespace(value)
+  };
 }
 class KeyParser {
   static parse(text, options, errors) {
     try {
-      return new KeyParser(text.value, options)._parse();
+      return new KeyParser(text.value)._parse();
     } catch (e) {
       if (e instanceof ParserError) {
         const message = options.prettyErrors === false ? e.message : e.message + ":\n\n" + text.value + "\n" + " ".repeat(e.pos) + "^\n";
@@ -200,11 +203,10 @@ class KeyParser {
       throw e;
     }
   }
-  constructor(input, options) {
+  constructor(input) {
     this._input = input;
     this._pos = 0;
     this._length = input.length;
-    this._options = options;
   }
   _peek() {
     return this._input[this._pos] || "";
@@ -386,5 +388,5 @@ class ParserError extends Error {
   ParserError,
   parseAriaSnapshot,
   parseAriaSnapshotUnsafe,
-  valueOrRegex
+  textValue
 });

package/lib/utils/isomorphic/protocolMetainfo.js

@@ -105,6 +105,7 @@ const methodMetainfo = /* @__PURE__ */ new Map([
   ["BrowserContext.clockSetSystemTime", { title: 'Set system time "{timeNumber|timeString}"' }],
   ["Page.addInitScript", { title: "Add init script", group: "configuration" }],
   ["Page.close", { title: "Close page", pausesBeforeAction: true }],
+  ["Page.consoleMessages", { title: "Get console messages", group: "getter" }],
   ["Page.emulateMedia", { title: "Emulate media", snapshot: true, pausesBeforeAction: true }],
   ["Page.exposeBinding", { title: "Expose binding", group: "configuration" }],
   ["Page.goBack", { title: "Go back", slowMo: true, snapshot: true, pausesBeforeAction: true }],
@@ -132,7 +133,9 @@ const methodMetainfo = /* @__PURE__ */ new Map([
   ["Page.mouseWheel", { title: "Mouse wheel", slowMo: true, snapshot: true, pausesBeforeAction: true }],
   ["Page.touchscreenTap", { title: "Tap", slowMo: true, snapshot: true, pausesBeforeAction: true }],
   ["Page.accessibilitySnapshot", { title: "Accessibility snapshot", group: "getter" }],
+  ["Page.pageErrors", { title: "Get page errors", group: "getter" }],
   ["Page.pdf", { title: "PDF" }],
+  ["Page.requests", { title: "Get network requests", group: "getter" }],
   ["Page.snapshotForAI", { internal: true }],
   ["Page.startJSCoverage", { title: "Start JS coverage", group: "configuration" }],
   ["Page.stopJSCoverage", { title: "Stop JS coverage", group: "configuration" }],

package/lib/utils/isomorphic/urlMatch.js

@@ -38,20 +38,15 @@ function globToRegexPattern(glob) {
       continue;
     }
     if (c === "*") {
-      const beforeDeep = glob[i - 1];
       let starCount = 1;
       while (glob[i + 1] === "*") {
         starCount++;
         i++;
       }
-      const afterDeep = glob[i + 1];
-      const isDeep = starCount > 1 && (beforeDeep === "/" || beforeDeep === void 0) && (afterDeep === "/" || afterDeep === void 0);
-      if (isDeep) {
-        tokens.push("((?:[^/]*(?:/|$))*)");
-        i++;
-      } else {
+      if (starCount > 1)
+        tokens.push("(.*)");
+      else
         tokens.push("([^/]*)");
-      }
       continue;
     }
     switch (c) {

package/lib/utilsBundle.js

@@ -20,6 +20,7 @@ var utilsBundle_exports = {};
 __export(utilsBundle_exports, {
   HttpsProxyAgent: () => HttpsProxyAgent,
   PNG: () => PNG,
+  ProgramOption: () => ProgramOption,
   SocksProxyAgent: () => SocksProxyAgent,
   colors: () => colors,
   debug: () => debug,
@@ -54,6 +55,7 @@ const minimatch = require("./utilsBundleImpl").minimatch;
 const open = require("./utilsBundleImpl").open;
 const PNG = require("./utilsBundleImpl").PNG;
 const program = require("./utilsBundleImpl").program;
+const ProgramOption = require("./utilsBundleImpl").ProgramOption;
 const progress = require("./utilsBundleImpl").progress;
 const SocksProxyAgent = require("./utilsBundleImpl").SocksProxyAgent;
 const yaml = require("./utilsBundleImpl").yaml;
@@ -84,6 +86,7 @@ function ms(ms2) {
 0 && (module.exports = {
   HttpsProxyAgent,
   PNG,
+  ProgramOption,
   SocksProxyAgent,
   colors,
   debug,