patchright-core 1.58.2 → 1.59.0

package/lib/server/recorder.js

@@ -41,6 +41,7 @@ var import_recorderUtils = require("./recorder/recorderUtils");
 var import_locatorParser = require("../utils/isomorphic/locatorParser");
 var import_selectorParser = require("../utils/isomorphic/selectorParser");
 var import_progress = require("./progress");
+var import_manualPromise = require("../utils/isomorphic/manualPromise");
 var import_recorderSignalProcessor = require("./recorder/recorderSignalProcessor");
 var rawRecorderSource = __toESM(require("./../generated/pollingRecorderSource"));
 var import_utils2 = require("./../utils");
@@ -144,8 +145,11 @@ class Recorder extends import_events.default {
             }
           }
         }
+        let mode = this._mode;
+        if (this._pickLocatorPage && source.page !== this._pickLocatorPage)
+          mode = "none";
         const uiState = {
-          mode: this._mode,
+          mode,
           actionPoint,
           actionSelector,
           ariaTemplate: this._highlightedElement.ariaTemplate,
@@ -162,7 +166,7 @@ class Recorder extends import_events.default {
       await this._context.exposeBinding(progress, "__pw_recorderSetMode", false, async ({ frame }, mode) => {
         if (frame.parentFrame())
           return;
-        this.setMode(mode);
+        await this.setMode(mode);
       });
       await this._context.exposeBinding(progress, "__pw_recorderSetOverlayState", false, async ({ frame }, state) => {
         if (frame.parentFrame())
@@ -170,7 +174,7 @@ class Recorder extends import_events.default {
         this._overlayState = state;
       });
       await this._context.exposeBinding(progress, "__pw_resume", false, () => {
-        this._debugger.resume(false);
+        this._debugger.resume();
       });
       this._context.on(import_browserContext.BrowserContext.Events.Page, (page) => this._onPage(page));
       for (const page of this._context.pages())
@@ -191,17 +195,16 @@ class Recorder extends import_events.default {
         false,
         (source, action) => this._recordAction(source.frame, action)
       );
-      await this._context.extendInjectedScript(rawRecorderSource.source, { recorderMode: this._recorderMode });
+      await this._context.extendInjectedScript(rawRecorderSource.source, { recorderMode: this._recorderMode, hideToolbar: !!this._params.hideToolbar });
     });
     if (this._debugger.isPaused())
       this._pausedStateChanged();
     this._debugger.on(import_debugger.Debugger.Events.PausedStateChanged, () => this._pausedStateChanged());
   }
   _pausedStateChanged() {
-    for (const { metadata, sdkObject } of this._debugger.pausedDetails()) {
-      if (!this._currentCallsMetadata.has(metadata))
-        this.onBeforeCall(sdkObject, metadata);
-    }
+    const pausedDetails = this._debugger.pausedDetails();
+    if (pausedDetails && !this._currentCallsMetadata.has(pausedDetails.metadata))
+      this.onBeforeCall(pausedDetails.sdkObject, pausedDetails.metadata);
     this.emit(RecorderEvent.PausedStateChanged, this._debugger.isPaused());
     this._updateUserSources();
     this.updateCallLog([...this._currentCallsMetadata.keys()]);
@@ -209,7 +212,7 @@ class Recorder extends import_events.default {
   mode() {
     return this._mode;
   }
-  setMode(mode) {
+  async setMode(mode) {
     if (this._mode === mode)
       return;
     this._highlightedElement = {};
@@ -217,54 +220,91 @@ class Recorder extends import_events.default {
     this.emit(RecorderEvent.ModeChanged, this._mode);
     this._setEnabled(this._isRecording());
     this._debugger.setMuted(this._isRecording());
-    if (this._mode !== "none" && this._mode !== "standby" && this._context.pages().length === 1)
-      this._context.pages()[0].bringToFront().catch(() => {
+    if (this._mode !== "none" && this._mode !== "standby") {
+      let pageToFocus = this._pickLocatorPage;
+      if (!pageToFocus && this._context.pages().length === 1)
+        pageToFocus = this._context.pages()[0];
+      pageToFocus?.bringToFront().catch(() => {
       });
-    this._refreshOverlay();
+    }
+    await this._refreshOverlay();
+  }
+  async pickLocator(progress, page) {
+    if (this._mode !== "none")
+      await this.setMode("none");
+    const selectorPromise = new import_manualPromise.ManualPromise();
+    let recorderChangedState = false;
+    const onElementPicked = (elementInfo) => {
+      selectorPromise.resolve(elementInfo.selector);
+    };
+    const onModeChanged = () => {
+      if (this._mode === "inspecting")
+        return;
+      recorderChangedState = true;
+      selectorPromise.reject(new Error("Locator picking was cancelled"));
+    };
+    const listeners = [
+      import_utils2.eventsHelper.addEventListener(this, RecorderEvent.ElementPicked, onElementPicked),
+      import_utils2.eventsHelper.addEventListener(this, RecorderEvent.ModeChanged, onModeChanged)
+    ];
+    try {
+      const doPickLocator = async () => {
+        selectorPromise.catch(() => {
+        });
+        this._pickLocatorPage = page;
+        await this.setMode("inspecting");
+        return await selectorPromise;
+      };
+      return await progress.race(doPickLocator());
+    } finally {
+      import_utils2.eventsHelper.removeEventListeners(listeners);
+      this._pickLocatorPage = void 0;
+      if (!recorderChangedState)
+        await this.setMode("none");
+    }
   }
   url() {
     const page = this._context.pages()[0];
     return page?.mainFrame().url();
   }
-  setHighlightedSelector(selector) {
+  async setHighlightedSelector(selector) {
     this._highlightedElement = { selector: (0, import_locatorParser.locatorOrSelectorAsSelector)(this._currentLanguage, selector, this._context.selectors().testIdAttributeName()) };
-    this._refreshOverlay();
+    await this._refreshOverlay();
   }
-  setHighlightedAriaTemplate(ariaTemplate) {
+  async setHighlightedAriaTemplate(ariaTemplate) {
     this._highlightedElement = { ariaTemplate };
-    this._refreshOverlay();
+    await this._refreshOverlay();
   }
   step() {
-    this._debugger.resume(true);
+    this._debugger.setPauseAt({ next: true });
+    this._debugger.resume();
   }
-  setLanguage(language) {
+  async setLanguage(language) {
     this._currentLanguage = language;
-    this._refreshOverlay();
+    await this._refreshOverlay();
   }
   resume() {
-    this._debugger.resume(false);
+    this._debugger.resume();
   }
   pause() {
-    this._debugger.pauseOnNextStatement();
+    this._debugger.setPauseAt({ next: true });
   }
   paused() {
     return this._debugger.isPaused();
   }
   close() {
-    this._debugger.resume(false);
+    this._debugger.resume();
   }
-  hideHighlightedSelector() {
+  async hideHighlightedSelector() {
     this._highlightedElement = {};
-    this._refreshOverlay();
+    await this._refreshOverlay();
   }
   pausedSourceId() {
-    for (const { metadata } of this._debugger.pausedDetails()) {
-      if (!metadata.location)
-        continue;
-      const source = this._userSources.get(metadata.location.file);
-      if (!source)
-        continue;
-      return source.id;
+    const pausedDetails = this._debugger.pausedDetails();
+    if (pausedDetails?.metadata.location) {
+      const source = this._userSources.get(pausedDetails.metadata.location.file);
+      if (source)
+        return source.id;
     }
   }
   userSources() {
@@ -290,12 +330,10 @@ class Recorder extends import_events.default {
       return "";
     }
   }
-  _refreshOverlay() {
-    for (const page of this._context.pages()) {
-      for (const frame of page.frames())
-        frame.evaluateExpression("window.__pw_refreshOverlay()").catch(() => {
-        });
-    }
+  async _refreshOverlay() {
+    await Promise.all(this._context.pages().map(
+      (page) => page.safeNonStallingEvaluateInAllFrames("window.__pw_refreshOverlay()", "main")
+    ));
   }
   async onBeforeCall(sdkObject, metadata) {
     if (this._omitCallTracking || this._isRecording())
@@ -338,8 +376,6 @@ class Recorder extends import_events.default {
     }
     this.emit(RecorderEvent.UserSourcesChanged, this.userSources(), this.pausedSourceId());
   }
-  async onBeforeInputAction(sdkObject, metadata) {
-  }
   async onCallLog(sdkObject, metadata, logName, message) {
     this.updateCallLog([metadata]);
   }
@@ -388,7 +424,7 @@ class Recorder extends import_events.default {
       this._filePrimaryURLChanged();
     });
     frame.on(import_frames.Frame.Events.InternalNavigation, (event) => {
-      if (event.isPublic) {
+      if (event.isPublic && !event.error) {
         this._onFrameNavigated(frame, page);
         this._filePrimaryURLChanged();
       }

package/lib/server/registry/index.js

@@ -31,6 +31,8 @@ __export(registry_exports, {
   Registry: () => Registry,
   browserDirectoryToMarkerFilePath: () => browserDirectoryToMarkerFilePath,
   buildPlaywrightCLICommand: () => buildPlaywrightCLICommand,
+  defaultCacheDirectory: () => defaultCacheDirectory,
+  defaultRegistryDirectory: () => defaultRegistryDirectory,
   findChromiumChannelBestEffort: () => findChromiumChannelBestEffort,
   installBrowsersForNpmInstall: () => installBrowsersForNpmInstall,
   registry: () => registry,
@@ -467,25 +469,25 @@ const DOWNLOAD_PATHS = {
     "win64": "builds/android/%s/android.zip"
   }
 };
+const defaultCacheDirectory = (() => {
+  if (process.platform === "linux")
+    return process.env.XDG_CACHE_HOME || import_path.default.join(import_os.default.homedir(), ".cache");
+  if (process.platform === "darwin")
+    return import_path.default.join(import_os.default.homedir(), "Library", "Caches");
+  if (process.platform === "win32")
+    return process.env.LOCALAPPDATA || import_path.default.join(import_os.default.homedir(), "AppData", "Local");
+  throw new Error("Unsupported platform: " + process.platform);
+})();
+const defaultRegistryDirectory = import_path.default.join(defaultCacheDirectory, "ms-playwright");
 const registryDirectory = (() => {
   let result;
   const envDefined = (0, import_utils.getFromENV)("PLAYWRIGHT_BROWSERS_PATH");
-  if (envDefined === "0") {
+  if (envDefined === "0")
     result = import_path.default.join(__dirname, "..", "..", "..", ".local-browsers");
-  } else if (envDefined) {
+  else if (envDefined)
     result = envDefined;
-  } else {
-    let cacheDirectory;
-    if (process.platform === "linux")
-      cacheDirectory = process.env.XDG_CACHE_HOME || import_path.default.join(import_os.default.homedir(), ".cache");
-    else if (process.platform === "darwin")
-      cacheDirectory = import_path.default.join(import_os.default.homedir(), "Library", "Caches");
-    else if (process.platform === "win32")
-      cacheDirectory = process.env.LOCALAPPDATA || import_path.default.join(import_os.default.homedir(), "AppData", "Local");
-    else
-      throw new Error("Unsupported platform: " + process.platform);
-    result = import_path.default.join(cacheDirectory, "ms-playwright");
-  }
+  else
+    result = defaultRegistryDirectory;
   if (!import_path.default.isAbsolute(result)) {
     result = import_path.default.resolve((0, import_utils.getFromENV)("INIT_CWD") || process.cwd(), result);
   }
@@ -524,7 +526,7 @@ function readDescriptors(browsersJSON) {
   });
 }
 const allDownloadableDirectoriesThatEverExisted = ["android", "chromium", "firefox", "webkit", "ffmpeg", "firefox-beta", "chromium-tip-of-tree", "chromium-headless-shell", "chromium-tip-of-tree-headless-shell", "winldd"];
-const chromiumAliases = ["bidi-chromium", "chrome-for-testing"];
+const chromiumAliases = ["chrome-for-testing"];
 class Registry {
   constructor(browsersJSON) {
     const descriptors = readDescriptors(browsersJSON);
@@ -540,21 +542,37 @@ class Registry {
         const currentDockerVersion = (0, import_dependencies.readDockerVersionSync)();
         const preferredDockerVersion = currentDockerVersion ? (0, import_dependencies.dockerVersion)(currentDockerVersion.dockerImageNameTemplate) : null;
         const isOutdatedDockerImage = currentDockerVersion && preferredDockerVersion && currentDockerVersion.dockerImageName !== preferredDockerVersion.dockerImageName;
-        const prettyMessage = isOutdatedDockerImage ? [
-          `Looks like ${sdkLanguage === "javascript" ? "Playwright Test or " : ""}Playwright was just updated to ${preferredDockerVersion.driverVersion}.`,
-          `Please update docker image as well.`,
-          `-  current: ${currentDockerVersion.dockerImageName}`,
-          `- required: ${preferredDockerVersion.dockerImageName}`,
-          ``,
-          `<3 Playwright Team`
-        ].join("\n") : [
-          `Looks like ${sdkLanguage === "javascript" ? "Playwright Test or " : ""}Playwright was just installed or updated.`,
-          `Please run the following command to download new browser${installByDefault ? "s" : ""}:`,
-          ``,
-          `    ${installCommand}`,
-          ``,
-          `<3 Playwright Team`
-        ].join("\n");
+        const isFfmpeg = name === "ffmpeg";
+        let prettyMessage;
+        if (isOutdatedDockerImage) {
+          prettyMessage = [
+            `Looks like Playwright was just updated to ${preferredDockerVersion.driverVersion}.`,
+            `Please update docker image as well.`,
+            `-  current: ${currentDockerVersion.dockerImageName}`,
+            `- required: ${preferredDockerVersion.dockerImageName}`,
+            ``,
+            `<3 Playwright Team`
+          ].join("\n");
+        } else if (isFfmpeg) {
+          prettyMessage = [
+            `Video rendering requires ffmpeg binary.`,
+            `Downloading it will not affect any of the system-wide settings.`,
+            `Please run the following command:`,
+            ``,
+            `    ${buildPlaywrightCLICommand(sdkLanguage, "install ffmpeg")}`,
+            ``,
+            `<3 Playwright Team`
+          ].join("\n");
+        } else {
+          prettyMessage = [
+            `Looks like Playwright was just installed or updated.`,
+            `Please run the following command to download new browser${installByDefault ? "s" : ""}:`,
+            ``,
+            `    ${installCommand}`,
+            ``,
+            `<3 Playwright Team`
+          ].join("\n");
+        }
         throw new Error(`Executable doesn't exist at ${e}
 ${(0, import_ascii.wrapInASCIIBox)(prettyMessage, 1)}`);
       }
@@ -708,16 +726,6 @@ ${(0, import_ascii.wrapInASCIIBox)(prettyMessage, 1)}`);
       "darwin": "/Applications/Firefox Nightly.app/Contents/MacOS/firefox",
       "win32": "\\Mozilla Firefox\\firefox.exe"
     }));
-    this._executables.push(this._createBidiChromiumChannel("bidi-chrome-stable", {
-      "linux": "/opt/google/chrome/chrome",
-      "darwin": "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
-      "win32": `\\Google\\Chrome\\Application\\chrome.exe`
-    }));
-    this._executables.push(this._createBidiChromiumChannel("bidi-chrome-canary", {
-      "linux": "/opt/google/chrome-canary/chrome",
-      "darwin": "/Applications/Google Chrome Canary.app/Contents/MacOS/Google Chrome Canary",
-      "win32": `\\Google\\Chrome SxS\\Application\\chrome.exe`
-    }));
     const firefox = descriptors.find((d) => d.name === "firefox");
     const firefoxExecutable = findExecutablePath(firefox.dir, "firefox");
     this._executables.push({
@@ -891,7 +899,7 @@ Run "${buildPlaywrightCLICommand(sdkLanguage, "install " + name)}"` : "";
       name,
       browserName: "chromium",
       directory: void 0,
-      executablePath: (sdkLanguage) => executablePath(sdkLanguage, false),
+      executablePath: () => executablePath("", false),
       executablePathOrDie: (sdkLanguage) => executablePath(sdkLanguage, true),
       installType: install ? "install-script" : "none",
       _validateHostRequirements: () => Promise.resolve(),
@@ -929,7 +937,7 @@ Run "${buildPlaywrightCLICommand(sdkLanguage, "install " + name)}"` : "";
       name,
       browserName: "firefox",
       directory: void 0,
-      executablePath: (sdkLanguage) => executablePath(sdkLanguage, false),
+      executablePath: () => executablePath("", false),
       executablePathOrDie: (sdkLanguage) => executablePath(sdkLanguage, true),
       installType: "none",
       _validateHostRequirements: () => Promise.resolve(),
@@ -937,43 +945,6 @@ Run "${buildPlaywrightCLICommand(sdkLanguage, "install " + name)}"` : "";
       _install: install
     };
   }
-  _createBidiChromiumChannel(name, lookAt) {
-    const executablePath = (sdkLanguage, shouldThrow) => {
-      const suffix = lookAt[process.platform];
-      if (!suffix) {
-        if (shouldThrow)
-          throw new Error(`Chromium distribution '${name}' is not supported on ${process.platform}`);
-        return void 0;
-      }
-      const prefixes = process.platform === "win32" ? [
-        process.env.LOCALAPPDATA,
-        process.env.PROGRAMFILES,
-        process.env["PROGRAMFILES(X86)"],
-        // In some cases there is no PROGRAMFILES/(86) env var set but HOMEDRIVE is set.
-        process.env.HOMEDRIVE + "\\Program Files",
-        process.env.HOMEDRIVE + "\\Program Files (x86)"
-      ].filter(Boolean) : [""];
-      for (const prefix of prefixes) {
-        const executablePath2 = import_path.default.join(prefix, suffix);
-        if ((0, import_fileUtils.canAccessFile)(executablePath2))
-          return executablePath2;
-      }
-      if (!shouldThrow)
-        return void 0;
-      const location = prefixes.length ? ` at ${import_path.default.join(prefixes[0], suffix)}` : ``;
-      throw new Error(`Chromium distribution '${name}' is not found${location}`);
-    };
-    return {
-      name,
-      browserName: "chromium",
-      directory: void 0,
-      executablePath: (sdkLanguage) => executablePath(sdkLanguage, false),
-      executablePathOrDie: (sdkLanguage) => executablePath(sdkLanguage, true),
-      installType: "none",
-      _validateHostRequirements: () => Promise.resolve(),
-      _isHermeticInstallation: false
-    };
-  }
   executables() {
     return this._executables;
   }
@@ -1032,8 +1003,8 @@ Run "${buildPlaywrightCLICommand(sdkLanguage, "install " + name)}"` : "";
       for (const executable of executables) {
         if (!executable._install)
           throw new Error(`ERROR: Playwright does not support installing ${executable.name}`);
-        const { embedderName } = (0, import_userAgent.getEmbedderName)();
-        if (!(0, import_utils.getAsBooleanFromENV)("CI") && !executable._isHermeticInstallation && !options?.force && executable.executablePath(embedderName)) {
+        if (!(0, import_utils.getAsBooleanFromENV)("CI") && !executable._isHermeticInstallation && !options?.force && executable.executablePath()) {
+          const { embedderName } = (0, import_userAgent.getEmbedderName)();
           const command = buildPlaywrightCLICommand(embedderName, "install --force " + executable.name);
           process.stderr.write("\n" + (0, import_ascii.wrapInASCIIBox)([
             `ATTENTION: "${executable.name}" is already installed on the system!`,
@@ -1354,7 +1325,7 @@ function buildPlaywrightCLICommand(sdkLanguage, parameters) {
       return `pwsh bin/Debug/netX/playwright.ps1 ${parameters}`;
     default: {
       const packageManagerCommand = (0, import_utils.getPackageManagerExecCommand)();
-      return `${packageManagerCommand} patchright ${parameters}`;
+      return `${packageManagerCommand} playwright ${parameters}`;
     }
   }
 }
@@ -1414,6 +1385,8 @@ const registry = new Registry(require("../../../browsers.json"));
   Registry,
   browserDirectoryToMarkerFilePath,
   buildPlaywrightCLICommand,
+  defaultCacheDirectory,
+  defaultRegistryDirectory,
   findChromiumChannelBestEffort,
   installBrowsersForNpmInstall,
   registry,

package/lib/server/registry/nativeDeps.js

@@ -496,6 +496,7 @@ const deps = {
     firefox: [
       "libasound2t64",
       "libatk1.0-0t64",
+      "libavcodec60",
       "libcairo-gobject2",
       "libcairo2",
       "libdbus-1-3",