@eyeo/get-browser-binary 0.18.0 → 0.19.0

package/RELEASE_NOTES.md

@@ -1,4 +1,13 @@
-# Unreleased 
+# Unreleased
+
+# 0.19.0
+
+- Fixes an issue starting with Firefox version 135 which prevented the binary to be downloaded (#82)
+- `getInstalledVersion` now returns only the version number (#81)
+
+## Testing
+
+- Test extensions internal pages can now load normally. The development version of Chromium 133 got the `driver.getAllWindowHandles()` issue fixed, therefore the workaround is no longer needed. (!121)
 
 # 0.18.0
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eyeo/get-browser-binary",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "description": "Install browser binaries and matching webdrivers",
   "repository": {
     "type": "git",

package/src/browser.js

@@ -48,7 +48,8 @@ export class Browser {
   }
 
   /**
-   * Gets the installed version returned by the browser binary.
+   * Gets the installed version returned by the browser binary. Subclasses add
+   *   specific parsing to this function.
    * @param {string} binary The path to the browser binary.
    * @return {string} Installed browser version.
    * @throws {Error} Browser is not installed.

package/src/chromium.js

@@ -110,11 +110,18 @@ export class Chromium extends Browser {
     return parseInt(chromiumBase, 10);
   }
 
-  static async #getInstalledBrowserInfo(binary) {
-    let installedVersion = await Chromium.getInstalledVersion(binary);
+  /** @see Browser.getInstalledVersion */
+  static async getInstalledVersion(binary) {
+    const installedVersion = await super.getInstalledVersion(binary);
+
     // Linux example: "Chromium 112.0.5615.49 built on Debian 11.6"
     // Windows example: "114.0.5735.0"
-    let versionNumber = installedVersion.split(" ")[1] || installedVersion;
+    return installedVersion.split(" ")[1] || installedVersion;
+  }
+
+  static async #getInstalledBrowserInfo(binary) {
+    const versionNumber = await Chromium.getInstalledVersion(binary);
+
     return {binary, versionNumber};
   }
 

package/src/edge.js

@@ -135,7 +135,7 @@ export class Edge extends Browser {
     let archive = path.join(snapshotsDir, "cache", filename);
     let binary = Edge.#getBinaryPath(channel);
     try {
-      if (await Edge.#getInstalledVersionNumber(binary) == versionNumber)
+      if (await Edge.getInstalledVersion(binary) == versionNumber)
         return {binary, versionNumber};
     }
     catch (e) {}
@@ -171,8 +171,9 @@ export class Edge extends Browser {
     return {binary, versionNumber};
   }
 
-  static async #getInstalledVersionNumber(binary) {
-    let installedVersion = await Edge.getInstalledVersion(binary);
+  /** @see Browser.getInstalledVersion */
+  static async getInstalledVersion(binary) {
+    let installedVersion = await super.getInstalledVersion(binary);
     for (let word of ["beta", "dev", "Beta", "Dev"])
       installedVersion = installedVersion.replace(word, "");
     return installedVersion.trim().replace(/.*\s/, "");
@@ -194,7 +195,7 @@ export class Edge extends Browser {
     else {
       binary = customBrowserBinary || Edge.#getBinaryPath();
       versionNumber =
-        await Edge.#getInstalledVersionNumber(binary);
+        await Edge.getInstalledVersion(binary);
     }
 
     let options = new edge.Options().addArguments("no-sandbox", ...extraArgs);

package/src/firefox.js

@@ -106,11 +106,12 @@ export class Firefox extends Browser {
     }
   }
 
-  static async #getInstalledBrowserInfo(binary) {
-    let installedVersion = await Firefox.getInstalledVersion(binary);
+  /** @see Browser.getInstalledVersion */
+  static async getInstalledVersion(binary) {
+    const installedVersion = await super.getInstalledVersion(binary);
+
     // Linux example: "Mozilla Firefox 102.15.0esr"
-    let versionNumber = installedVersion.split(" ")[2] || installedVersion;
-    return {binary, versionNumber};
+    return installedVersion.split(" ")[2] || installedVersion;
   }
 
   /**
@@ -130,10 +131,15 @@ export class Firefox extends Browser {
     checkVersion(version, MIN_VERSION, Firefox.#CHANNELS);
     let versionNumber = await Firefox.#getVersionForChannel(version);
 
+    const majorVersion = getMajorVersion(versionNumber);
+    // Starting from Firefox 135 on Linux, the binary file extension
+    // was changed from .bz2 to .xz
+    const linuxExtension = majorVersion <= 134 ? "tar.bz2" : "tar.xz";
+
     let [buildPlatform, fileName] = {
       "win32-ia32": ["win32", `Firefox Setup ${versionNumber}.exe`],
       "win32-x64": ["win64", `Firefox Setup ${versionNumber}.exe`],
-      "linux-x64": ["linux-x86_64", `firefox-${versionNumber}.tar.bz2`],
+      "linux-x64": ["linux-x86_64", `firefox-${versionNumber}.${linuxExtension}`],
       "darwin-x64": ["mac", `Firefox ${versionNumber}.dmg`],
       "darwin-arm64": ["mac", `Firefox ${versionNumber}.dmg`]
     }[platformArch];

package/src/utils.js

@@ -91,7 +91,15 @@ export async function download(url, destFile, timeout = 0) {
 
 export async function extractTar(archive, dir) {
   await fs.promises.mkdir(dir);
-  await promisify(exec)(`tar -jxf ${archive} -C ${dir}`);
+
+  let command;
+
+  if (archive.endsWith(".xz"))
+    command = `tar -xf ${archive} -C ${dir}`;
+  else
+    command = `tar -jxf ${archive} -C ${dir}`;
+
+  await promisify(exec)(command);
 }
 
 export async function extractDmg(archive, dir) {

package/test/browsers.js

@@ -111,7 +111,7 @@ async function getInstallFileCTime(browser) {
                             process.platform == "darwin"))
     return null;
 
-  const installTypes = [".zip", ".dmg", ".bz2", ".deb", ".exe"];
+  const installTypes = [".zip", ".dmg", ".bz2", ".xz", ".deb", ".exe"];
 
   let cacheDir = path.join(snapshotsBaseDir, browser, "cache");
   let cacheFiles = await fs.promises.readdir(cacheDir);

package/test/extension/mv3/background.js

@@ -1,16 +1,3 @@
 "use strict";
 
-// There's an issue with Chrome +133 and selenium webdriver where
-// getAllWindowHandles() can't see tabs opened by an extension if the url option
-// opens an extension page. Example: chrome.tabs.create({url: "index.html"});
-//
-// Workaround: Create the tab with empty options, which allows
-// getAllWindowHandles() to see it, and afterwards update the tab with the
-// intended url.
-
-// This timeout must be higher than driver.geAllWindowHandles() polling interval
-const timeout = 1000;
-
-chrome.tabs.create({}, ({tabId}) => {
-  setTimeout(() => chrome.tabs.update(tabId, {url: "index.html"}), timeout);
-});
+chrome.tabs.create({url: "index.html"});