sitespeed.io 38.6.0 → 39.0.0

package/CHANGELOG.md

@@ -1,6 +1,15 @@
 
 # CHANGELOG - sitespeed.io  (we use [semantic versioning](https://semver.org))
 
+## 39.0.0 - 2025-12-15
+
+### 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 `--browsertime.screenshotParams.png.compressionLevel`  [#4570](https://github.com/sitespeedio/sitespeed.io/pull/4570).
+
+
 ## 38.6.0 - 2025-11-02
 ### Added
 * Browsertime 25.4.0 [#4566](https://github.com/sitespeedio/sitespeed.io/pull/4566).

package/Dockerfile

@@ -1,4 +1,4 @@
-FROM sitespeedio/webbrowsers:chrome-142.0-firefox-144.0-edge-141.0
+FROM sitespeedio/webbrowsers:chrome-142.0-firefox-144.0-edge-142.0-b
 
 ARG TARGETPLATFORM=linux/amd64
 

package/Dockerfile-slim

@@ -1,4 +1,4 @@
-FROM node:22.13.0-bookworm-slim
+FROM node:24.11.0-bookworm-slim
 
 ARG TARGETPLATFORM=linux/amd64
 
@@ -15,7 +15,7 @@ RUN echo "deb http://deb.debian.org/debian/ unstable main contrib non-free" >> /
     apt-get install -y --no-install-recommends firefox tcpdump iproute2 ca-certificates sudo --no-install-recommends --no-install-suggests && \
     # Cleanup
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
-    && rm -rf /var/lib/apt/lists/* /tmp/* 
+    && rm -rf /var/lib/apt/lists/* /tmp/*
 
 # Install sitespeed.io
 RUN mkdir -p /usr/src/app

package/lib/cli/cli.js

@@ -1436,12 +1436,6 @@ export async function parseCommandLine() {
       default: browsertimeConfig.screenshotParams.type,
       group: 'Screenshot'
     })
-    .option('browsertime.screenshotParams.png.compressionLevel', {
-      alias: 'screenshot.png.compressionLevel',
-      describe: 'zlib compression level',
-      default: browsertimeConfig.screenshotParams.png.compressionLevel,
-      group: 'Screenshot'
-    })
     .option('browsertime.screenshotParams.jpg.quality', {
       alias: 'screenshot.jpg.quality',
       describe: 'Quality of the JPEG screenshot. 1-100',
@@ -2195,7 +2189,9 @@ export async function parseCommandLine() {
     );
   }
 
-  let urlsMetaData = getAliases(argv._, argv.urlAlias, argv.groupAlias);
+  let urlsMetaData = argv.multi
+    ? {}
+    : getAliases(argv._, argv.urlAlias, argv.groupAlias);
   // Copy the alias so it is also used by Browsertime
   if (argv.urlAlias) {
     // Browsertime has it own way of handling alias

package/lib/core/resultsStorage/index.js

@@ -1,15 +1,15 @@
-import { parse, format } from 'node:url';
 import path from 'node:path';
 
 import { resultUrls } from './resultUrls.js';
 import { storageManager } from './storageManager.js';
 
 function getDomainOrFileName(input) {
-  let domainOrFile = input;
-  domainOrFile = domainOrFile.startsWith('http')
-    ? parse(domainOrFile).hostname
-    : path.basename(domainOrFile).replaceAll('.', '_');
-  return domainOrFile;
+  if (input.startsWith('http')) {
+    const url = new URL(input);
+    return url.hostname;
+  }
+
+  return path.basename(input).replaceAll('.', '_');
 }
 
 export function resultsStorage(input, timestamp, options) {
@@ -34,10 +34,19 @@ export function resultsStorage(input, timestamp, options) {
   storagePathPrefix = path.join(...resultsSubFolders);
 
   if (resultBaseURL) {
-    const url = parse(resultBaseURL);
-    resultsSubFolders.unshift(url.pathname.slice(1));
-    url.pathname = resultsSubFolders.join('/');
-    resultUrl = format(url);
+    const url = new URL(resultBaseURL);
+
+    const basePath = url.pathname.slice(1); // drop leading '/'
+    if (basePath) {
+      resultsSubFolders.unshift(basePath);
+    }
+
+    const newPath = resultsSubFolders.join('/');
+
+    // Ensure leading slash for pathname
+    url.pathname = newPath.startsWith('/') ? newPath : `/${newPath}`;
+
+    resultUrl = url.toString();
   }
 
   return {

package/lib/core/resultsStorage/pathToFolder.js

@@ -1,56 +1,75 @@
-import { parse } from 'node:url';
 import { createHash } from 'node:crypto';
-
+import path from 'node:path';
 import { getLogger } from '@sitespeed.io/log';
-
 import { isEmpty } from '../../support/util.js';
+
 const log = getLogger('sitespeedio.file');
 
+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, alias) {
-  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 = [];
+function normalizeFsPath(input) {
+  let n = path.normalize(input);
+  if (n.startsWith(`.${path.sep}`)) n = n.slice(2);
+  return n;
+}
 
-  // If a measurements fail and we use a script file and no URL
-  // has been tested, we don't have a hostname
-  if (parsedUrl.hostname) {
-    pathSegments.push('pages', parsedUrl.hostname.split('.').join('_'));
-  }
+export function pathToFolder(input, options) {
+  if (options.useSameDir) return '';
 
-  if (options.urlMetaData && options.urlMetaData[url]) {
-    pathSegments.push(options.urlMetaData[url]);
-  } else if (alias) {
-    pathSegments.push(alias);
+  let hostname = '';
+  let pathname = '';
+  let search = '';
+  let hash = '';
+
+  const isUrl = isHttpLikeUrl(input);
+
+  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 {
-    if (!isEmpty(parsedUrl.pathname)) {
-      urlSegments.push(...parsedUrl.pathname.split('/').filter(Boolean));
-    }
+    hostname = 'file';
+    const fsNormalized = normalizeFsPath(input);
+    pathname = `${path.sep}${fsNormalized}`;
+  }
 
-    if (useHash && !isEmpty(parsedUrl.hash)) {
-      const md5 = createHash('md5'),
-        hash = md5.update(parsedUrl.hash).digest('hex').slice(0, 8);
-      urlSegments.push('hash-' + hash);
-    }
+  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);
 
-    if (!isEmpty(parsedUrl.search)) {
-      const md5 = createHash('md5'),
-        hash = md5.update(parsedUrl.search).digest('hex').slice(0, 8);
-      urlSegments.push('query-' + hash);
+    if (isUrl) {
+      if (options.useHash && !isEmpty(hash))
+        urlSegments.push(`hash-${md5Hex8(hash)}`);
+      if (!isEmpty(search)) urlSegments.push(`query-${md5Hex8(search)}`);
     }
 
-    // This is used from sitespeed.io to match URLs on Graphite
     if (options.storeURLsAsFlatPageOnDisk) {
-      const folder = toSafeKey(urlSegments.join('_').concat('_'));
+      const folder = toSafeKey(`${urlSegments.join('_')}_`);
       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.`
+          `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 {
@@ -63,11 +82,9 @@ export function pathToFolder(url, options, alias) {
 
   // pathSegments.push('data');
 
-  for (const [index, segment] of pathSegments.entries()) {
-    if (segment) {
-      pathSegments[index] = segment.replaceAll(/[^\w.\u0621-\u064A-]/gi, '-');
-    }
+  for (const [i, seg] of pathSegments.entries()) {
+    if (seg) pathSegments[i] = seg.replaceAll(/[^\w.\u0621-\u064A-]/giu, '-');
   }
 
-  return pathSegments.join('/').concat('/');
+  return `${path.join(...pathSegments)}${path.sep}`;
 }

package/lib/core/url-source.js

@@ -1,4 +1,3 @@
-import { parse } from 'node:url';
 import { messageMaker } from '../support/messageMaker.js';
 const make = messageMaker('url-reader').make;
 
@@ -15,7 +14,7 @@ export function findUrls(queue, options) {
             options.urlsMetaData[url] &&
             options.urlsMetaData[url].groupAlias
               ? options.urlsMetaData[url].groupAlias
-              : parse(url).hostname
+              : new URL(url).hostname
         }
       )
     );

package/lib/plugins/browsertime/index.js

@@ -1,5 +1,3 @@
-import { parse } from 'node:url';
-
 // eslint-disable-next-line unicorn/no-named-default
 import { default as _merge } from 'lodash.merge';
 
@@ -107,7 +105,7 @@ export default class BrowsertimePlugin extends SitespeedioPlugin {
         if (this.options.urlMetaData) {
           for (let url of Object.keys(this.options.urlMetaData)) {
             const alias = this.options.urlMetaData[url];
-            const group = parse(url).hostname;
+            const group = new URL(url).hostname;
             this.allAlias[alias] = url;
             super.sendMessage('browsertime.alias', alias, {
               url,
@@ -190,7 +188,7 @@ export default class BrowsertimePlugin extends SitespeedioPlugin {
             if (alias) {
               if (this.scriptOrMultiple) {
                 url = element.info.url;
-                group = parse(url).hostname;
+                group = new URL(url).hostname;
               }
               this.allAlias[url] = alias;
               super.sendMessage('browsertime.alias', alias, {
@@ -232,7 +230,7 @@ export default class BrowsertimePlugin extends SitespeedioPlugin {
             if (this.scriptOrMultiple) {
               url = result[resultIndex].info?.url;
               if (url) {
-                group = parse(url).hostname;
+                group = new URL(url).hostname;
               }
             }
             let runIndex = 0;

package/lib/plugins/domains/aggregator.js

@@ -1,5 +1,3 @@
-import { parse } from 'node:url';
-
 import { Stats } from 'fast-stats';
 import { getLogger } from '@sitespeed.io/log';
 
@@ -18,7 +16,7 @@ const timingNames = [
 ];
 
 function parseDomainName(url) {
-  return parse(url).hostname;
+  return new URL(url).hostname;
 }
 
 function getDomain(domainName) {

package/lib/plugins/pagexray/index.js

@@ -1,4 +1,3 @@
-import { parse } from 'node:url';
 import { getLogger } from '@sitespeed.io/log';
 import coach from 'coach-core';
 import { SitespeedioPlugin } from '@sitespeed.io/plugin';
@@ -102,7 +101,7 @@ export default class PageXrayPlugin extends SitespeedioPlugin {
             const sentURL = {};
             for (let summary of pageSummary) {
               // The group can be different so take it per url
-              const myGroup = parse(summary.url).hostname;
+              const myGroup = new URL(summary.url).hostname;
               if (sentURL[summary.url]) {
                 sentURL[summary.url] += 1;
               } else {

package/lib/plugins/thirdparty/index.js

@@ -1,5 +1,3 @@
-import { parse } from 'node:url';
-
 import coach from 'coach-core';
 import { SitespeedioPlugin } from '@sitespeed.io/plugin';
 
@@ -133,7 +131,7 @@ export default class ThirdPartyPlugin extends SitespeedioPlugin {
             // fallback to domain
             if (!entity) {
               const hostname = ent.url.startsWith('http')
-                ? parse(ent.url).hostname
+                ? new URL(ent.url).hostname
                 : ent.url;
               entity = {
                 name: hostname

package/lib/support/flattenMessage.js

@@ -1,5 +1,5 @@
-import { parse } from 'node:url';
 import { getLogger } from '@sitespeed.io/log';
+
 const log = getLogger('sitespeedio');
 
 function joinNonEmpty(strings, delimeter) {
@@ -11,7 +11,12 @@ function toSafeKey(key) {
   return key.replaceAll(/[ %&()+,./:?|~–]|%7C/g, '_');
 }
 
-export function keypathFromUrl(url, includeQueryParameters, useHash, group) {
+export function keypathFromUrl(
+  urlString,
+  includeQueryParameters,
+  useHash,
+  group
+) {
   function flattenQueryParameters(parameters) {
     return Object.keys(parameters).reduce(
       (result, key) => joinNonEmpty([result, key, parameters[key]], '_'),
@@ -19,16 +24,22 @@ export function keypathFromUrl(url, includeQueryParameters, useHash, group) {
     );
   }
 
-  url = parse(url, !!includeQueryParameters);
+  const url = new URL(urlString);
 
   let path = toSafeKey(url.pathname);
 
   if (includeQueryParameters) {
+    const parameters = {};
+    for (const [key, value] of url.searchParams) {
+      parameters[key] = value;
+    }
+
     path = joinNonEmpty(
-      [path, toSafeKey(flattenQueryParameters(url.query))],
+      [path, toSafeKey(flattenQueryParameters(parameters))],
       '_'
     );
   }
+
   if (useHash && url.hash) {
     path = joinNonEmpty([path, toSafeKey(url.hash)], '_');
   }