browsertime 25.4.0 → 26.0.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Browsertime changelog (we do [semantic versioning](https://semver.org))
 
+## 26.0.0 - 2025-12-10
+### Breaking
+* We removed support for setting the compression level for png screenshots, see the added section why.
+
+### Added
+* Upgrade to support NodeJS 24 without warnings, include NodeJS 24 in the Docker container, and base the Docker container on Ubuntu 24.04. To make this work I needed to upgrade the Jimp library and then we lost the settings for png screenshots `--screenshotParams.png.compressionLevel`   [#2342](https://github.com/sitespeedio/browsertime/pull/2342).
+
 ## 25.4.0 - 2025-11-02
 ### Added
 * Chrome and Chromedriver 142 [#2335](https://github.com/sitespeedio/browsertime/pull/2335).
@@ -11,7 +18,7 @@
 
 ## 25.3.0 - 2025-10-17
 ### Added
-* Make it possible to strip cookie and auth headers in the HAR file for Firefox [#2329](https://github.com/sitespeedio/browsertime/pull/2329) and Chrome [#2330](https://github.com/sitespeedio/browsertime/pull/2330). Use `--cleanSensitiveHeaders` to remove a [couple of headers](https://github.com/sitespeedio/browsertime/blob/main/lib/support/har/index.js#L11-L24). 
+* Make it possible to strip cookie and auth headers in the HAR file for Firefox [#2329](https://github.com/sitespeedio/browsertime/pull/2329) and Chrome [#2330](https://github.com/sitespeedio/browsertime/pull/2330). Use `--cleanSensitiveHeaders` to remove a [couple of headers](https://github.com/sitespeedio/browsertime/blob/main/lib/support/har/index.js#L11-L24).
 * Firefox 144 [#2331](https://github.com/sitespeedio/browsertime/pull/2331).
 
 ### Fixed

package/lib/firefox/settings/firefoxPreferences.js

@@ -43,6 +43,9 @@ export const defaultFirefoxPreferences = {
   // Prevent network access for recommendations by default. The payload is {'results':[]}.
   'extensions.getAddons.discovery.api_url':
     'data:;base64,eyJyZXN1bHRzIjpbXX0%3D',
+  // Enable form autofill
+  'extensions.formautofill.addresses.enabled': true,
+  'extensions.formautofill.creditCards.enabled': true,
   // Treat WebExtension API/schema warnings as errors.
   'extensions.webextensions.warnings-as-errors': true,
   // Disable useragent updates.

package/lib/screenshot/loadCustomJimp.js

@@ -1,17 +1,13 @@
 export async function loadCustomJimp() {
   try {
-    const { default: configure } = await import('@jimp/custom');
-    const { default: pluginPng } = await import('@jimp/png');
-    const { default: pluginJpeg } = await import('@jimp/jpeg');
-    const { default: pluginScale } = await import('@jimp/plugin-scale');
-    // The scale plugin use resize
-    const { default: pluginResize } = await import('@jimp/plugin-resize');
-    const jimp = configure({
-      types: [pluginPng, pluginJpeg],
-      plugins: [pluginResize, pluginScale]
-    });
-    return jimp;
-  } catch {
-    return;
+    const { Jimp } = await import('jimp');
+
+    return Jimp;
+  } catch (error) {
+    if (error?.code === 'ERR_MODULE_NOT_FOUND') {
+      return;
+    }
+
+    throw error;
   }
 }

package/lib/support/cli.js

@@ -932,11 +932,6 @@ export function parseCommandLine() {
       default: screenshotDefaults.type,
       group: 'Screenshot'
     })
-    .option('screenshotParams.png.compressionLevel', {
-      describe: 'zlib compression level',
-      default: screenshotDefaults.png.compressionLevel,
-      group: 'Screenshot'
-    })
     .option('screenshotParams.jpg.quality', {
       describe: 'Quality of the JPEG screenshot. 1-100',
       default: screenshotDefaults.jpg.quality,

package/lib/support/images/index.js

@@ -32,9 +32,9 @@ export async function savePng(
   if (jimp) {
     const image = await jimp.read(data);
     const buffer = await image
-      .deflateLevel(config.png.compressionLevel)
-      .scaleToFit(config.maxSize, config.maxSize, jimp.RESIZE_HERMITE)
-      .getBufferAsync('image/png');
+      .scaleToFit({ w: config.maxSize, h: config.maxSize })
+      .getBuffer('image/png');
+    console.log('3');
 
     return storageManager.writeData(
       `${name}.png`,
@@ -61,11 +61,12 @@ export async function saveJpg(
 
   if (jimp) {
     const image = await jimp.read(data);
+
     // https://github.com/sitespeedio/sitespeed.io/issues/3922
     const buffer = await image
-      .quality(config.jpg.quality)
-      .scaleToFit(config.maxSize, config.maxSize, jimp.RESIZE_HERMITE)
-      .getBufferAsync('image/jpeg');
+      .scaleToFit({ w: config.maxSize, h: config.maxSize })
+      .getBuffer('image/jpeg', { quality: config.jpg.quality });
+
     return storageManager.writeData(
       `${name}.jpg`,
       buffer,

package/lib/support/pathToFolder.js

@@ -1,68 +1,90 @@
-import { parse } from 'node:url';
 import { createHash } from 'node:crypto';
+import path from 'node:path';
 import { getLogger } from '@sitespeed.io/log';
 import { isEmpty } from './util.js';
+
 const log = getLogger('browsertime');
 
+function isHttpLikeUrl(s) {
+  if (typeof s !== 'string' || s.length === 0) return false;
+  if (s.startsWith('//')) return true;
+  return /^https?:\/\//iu.test(s);
+}
+
 function toSafeKey(key) {
-  // U+2013 : EN DASH – as used on https://en.wikipedia.org/wiki/2019–20_coronavirus_pandemic
-  return key.replaceAll(/[ %&()+,./:?|~–]|%7C/g, '-');
+  return key.replaceAll(/[ %&()+,./:?|~–]|%7C/gu, '-');
 }
 
-export function pathToFolder(url, options) {
-  if (options.useSameDir) {
-    return '';
-  } else {
-    const useHash = options.useHash;
-    const parsedUrl = parse(decodeURIComponent(url));
+function md5Hex8(s) {
+  return createHash('md5').update(s).digest('hex').slice(0, 8);
+}
 
-    const pathSegments = [];
-    const urlSegments = [];
-    pathSegments.push('pages', parsedUrl.hostname.split('.').join('_'));
+function normalizeFsPath(input) {
+  let n = path.normalize(input);
+  if (n.startsWith(`.${path.sep}`)) n = n.slice(2);
+  return n;
+}
 
-    if (options.urlMetaData && options.urlMetaData[url]) {
-      pathSegments.push(options.urlMetaData[url]);
-    } else {
-      if (!isEmpty(parsedUrl.pathname)) {
-        urlSegments.push(...parsedUrl.pathname.split('/').filter(Boolean));
-      }
+export function pathToFolder(input, options) {
+  if (options.useSameDir) return '';
 
-      if (useHash && !isEmpty(parsedUrl.hash)) {
-        const md5 = createHash('md5'),
-          hash = md5.update(parsedUrl.hash).digest('hex').slice(0, 8);
-        urlSegments.push('hash-' + hash);
-      }
+  let hostname = '';
+  let pathname = '';
+  let search = '';
+  let hash = '';
 
-      if (!isEmpty(parsedUrl.search)) {
-        const md5 = createHash('md5'),
-          hash = md5.update(parsedUrl.search).digest('hex').slice(0, 8);
-        urlSegments.push('query-' + hash);
-      }
+  const isUrl = isHttpLikeUrl(input);
 
-      // This is used from sitespeed.io to match URLs on Graphite
-      if (options.storeURLsAsFlatPageOnDisk) {
-        const folder = toSafeKey(urlSegments.join('_').concat('_'));
-        if (folder.length > 255) {
-          log.info(
-            `The URL ${url} hit the 255 character limit used when stored on disk, you may want to give your URL an alias to make sure it will not collide with other URLs.`
-          );
-          pathSegments.push(folder.slice(0, 254));
-        } else {
-          pathSegments.push(folder);
-        }
-      } else {
-        pathSegments.push(...urlSegments);
-      }
-    }
+  if (isUrl) {
+    const raw = input.startsWith('//') ? `http:${input}` : input;
+    const u = new URL(raw);
+    hostname = u.hostname;
+    pathname = u.pathname; // '/'-separated
+    search = u.search; // includes '?'
+    hash = u.hash; // includes '#'
+  } else {
+    hostname = 'file';
+    const fsNormalized = normalizeFsPath(input);
+    pathname = `${path.sep}${fsNormalized}`;
+  }
+
+  const pathSegments = ['pages', hostname.split('.').join('_')];
+  const urlSegments = [];
+
+  if (options.urlMetaData && options.urlMetaData[input]) {
+    pathSegments.push(options.urlMetaData[input]);
+  } else {
+    const parts = isUrl
+      ? pathname.split('/').filter(Boolean)
+      : pathname.split(/[\\/]/u).filter(Boolean);
+    if (!isEmpty(parts)) urlSegments.push(...parts);
 
-    pathSegments.push('data');
+    if (isUrl) {
+      if (options.useHash && !isEmpty(hash))
+        urlSegments.push(`hash-${md5Hex8(hash)}`);
+      if (!isEmpty(search)) urlSegments.push(`query-${md5Hex8(search)}`);
+    }
 
-    for (const [index, segment] of pathSegments.entries()) {
-      if (segment) {
-        pathSegments[index] = segment.replaceAll(/[^\w.\u0621-\u064A-]/gi, '-');
+    if (options.storeURLsAsFlatPageOnDisk) {
+      const folder = toSafeKey(`${urlSegments.join('_')}_`);
+      if (folder.length > 255) {
+        log.info(
+          `The URL ${input} hit the 255 character limit used when stored on disk, you may want to give your URL an alias to make sure it will not collide with other URLs.`
+        );
+        pathSegments.push(folder.slice(0, 254));
+      } else {
+        pathSegments.push(folder);
       }
+    } else {
+      pathSegments.push(...urlSegments);
     }
+  }
+
+  pathSegments.push('data');
 
-    return pathSegments.join('/').concat('/');
+  for (const [i, seg] of pathSegments.entries()) {
+    if (seg) pathSegments[i] = seg.replaceAll(/[^\w.\u0621-\u064A-]/giu, '-');
   }
+
+  return `${path.join(...pathSegments)}${path.sep}`;
 }

package/lib/support/storageManager.js

@@ -1,7 +1,8 @@
+// storage-manager.js
 import path from 'node:path';
 import { createHash } from 'node:crypto';
 import { gunzip as _gunzip, gzip as _gzip, createGzip } from 'node:zlib';
-import { parse } from 'node:url';
+import { URL } from 'node:url';
 import { promisify } from 'node:util';
 import {
   writeFile as _writeFile,
@@ -25,16 +26,35 @@ const log = getLogger('browsertime');
 const defaultDir = 'browsertime-results';
 let timestamp = localTime().replaceAll(':', '');
 
-function pathNameFromUrl(url) {
-  const parsedUrl = parse(url),
-    pathSegments = parsedUrl.pathname.split('/');
+function pathNameFromUrl(input) {
+  // If it's a proper web URL → use WHATWG URL.
+  // Otherwise treat it as a filesystem path and return only the basename.
+  let asUrl;
+  try {
+    asUrl = new URL(input); // succeeds only for absolute URLs like https://..., file://..., etc.
+  } catch {
+    // Filesystem path case (e.g. "test.js", "my/path/to/test.js")
+    // We want exactly "test.js" (no hostname, no parent dirs).
+    let base = path.basename(path.normalize(input));
+    // If someone passed a trailing slash directory, basename returns '' → keep it stable.
+    if (!base)
+      base = input.replaceAll('\\', '/').split('/').findLast(Boolean) ?? '';
+    return base;
+  }
+
+  // URL case: mirror your previous behavior
+  const decodedPathname = decodeURIComponent(asUrl.pathname);
+  const pathSegments = decodedPathname.split('/');
 
-  pathSegments.unshift(parsedUrl.hostname);
+  // Only add hostname for real web URLs (file: URLs typically have empty hostname on POSIX)
+  if (asUrl.hostname) {
+    pathSegments.unshift(asUrl.hostname);
+  }
 
-  if (!isEmpty(parsedUrl.search)) {
-    const md5 = createHash('md5'),
-      hash = md5.update(parsedUrl.search).digest('hex').slice(0, 8);
-    pathSegments.push('query-' + hash);
+  if (!isEmpty(asUrl.search)) {
+    const md5 = createHash('md5');
+    const hash = md5.update(asUrl.search).digest('hex').slice(0, 8);
+    pathSegments.push(`query-${hash}`);
   }
 
   return pathSegments.filter(Boolean).join('-');
@@ -73,8 +93,7 @@ export class StorageManager {
   }
 
   async writeData(filename, data, subdir) {
-    let dirPath;
-    dirPath = await (subdir
+    const dirPath = await (subdir
       ? this.createSubDataDir(subdir)
       : this.createDataDir());
     const fullPath = path.join(dirPath, filename);
@@ -94,8 +113,7 @@ export class StorageManager {
   }
 
   async readData(filename, subdir) {
-    let filepath;
-    filepath = subdir
+    const filepath = subdir
       ? path.join(this.baseDir, subdir, filename)
       : path.join(this.baseDir, filename);
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "browsertime",
   "description": "Get performance metrics from your web page using Browsertime.",
-  "version": "25.4.0",
+  "version": "26.0.0",
   "bin": "./bin/browsertime.js",
   "type": "module",
   "types": "./types/scripting.d.ts",
@@ -23,11 +23,7 @@
     "yargs": "18.0.0"
   },
   "optionalDependencies": {
-    "@jimp/custom": "0.22.12",
-    "@jimp/png": "0.22.12",
-    "@jimp/jpeg": "0.22.12",
-    "@jimp/plugin-resize": "0.22.12",
-    "@jimp/plugin-scale": "0.22.12",
+    "jimp": "1.6.0",
     "usb-power-profiling": "1.6.0"
   },
   "devDependencies": {

package/types/support/filters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filters.d.ts","sourceRoot":"","sources":["../../lib/support/filters.js"],"names":[],"mappings":"AAKA;;GAEG;AACH,8EAEC;AACD,2DAGC;AACD,iEAGC"}
+{"version":3,"file":"filters.d.ts","sourceRoot":"","sources":["../../lib/support/filters.js"],"names":[],"mappings":"AAKA;;GAEG;AACH,oDACS,aAAQ,aAChB;AACD,2DAGC;AACD,iEAGC"}

package/types/support/pathToFolder.d.ts

@@ -1,2 +1,2 @@
-export function pathToFolder(url: any, options: any): string;
+export function pathToFolder(input: any, options: any): string;
 //# sourceMappingURL=pathToFolder.d.ts.map

package/types/support/pathToFolder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pathToFolder.d.ts","sourceRoot":"","sources":["../../lib/support/pathToFolder.js"],"names":[],"mappings":"AAWA,6DAwDC"}
+{"version":3,"file":"pathToFolder.d.ts","sourceRoot":"","sources":["../../lib/support/pathToFolder.js"],"names":[],"mappings":"AA2BA,+DA8DC"}

package/types/support/storageManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"storageManager.d.ts","sourceRoot":"","sources":["../../lib/support/storageManager.js"],"names":[],"mappings":"AAmDA;IACE;;OAKC;IAJC,gBAE6D;IAC7D,wBAA0C;IAG5C,iCAGC;IAED,kDAIC;IAED,iCAEC;IAED,kEASC;IAED,sEAQC;IAED,+DAcC;IAED,sEAmBC;IAED,wBAEC;CACF"}
+{"version":3,"file":"storageManager.d.ts","sourceRoot":"","sources":["../../lib/support/storageManager.js"],"names":[],"mappings":"AAuEA;IACE;;OAKC;IAJC,gBAE6D;IAC7D,wBAA0C;IAG5C,iCAGC;IAED,kDAIC;IAED,iCAEC;IAED,kEAQC;IAED,sEAQC;IAED,+DAaC;IAED,sEAmBC;IAED,wBAEC;CACF"}