@turntrout/subfont 1.0.3 → 1.0.5

package/lib/FontTracerPool.js

@@ -159,7 +159,30 @@ class FontTracerPool {
     }
     this._pendingTasks = [];
 
-    await Promise.all(this._workers.map((w) => w.terminate()));
+    // Reject any in-flight tasks still assigned to workers.
+    // Clear _taskByWorker before terminate() so _onWorkerExit won't double-reject.
+    for (const [, taskId] of this._taskByWorker) {
+      const cb = this._taskCallbacks.get(taskId);
+      if (cb) {
+        this._taskCallbacks.delete(taskId);
+        cb.reject(new Error('Worker pool destroyed'));
+      }
+    }
+    this._taskByWorker.clear();
+
+    // Terminate workers with a 5-second timeout to prevent hanging
+    const TERMINATE_TIMEOUT_MS = 5000;
+    await Promise.all(
+      this._workers.map((w) =>
+        Promise.race([
+          w.terminate(),
+          new Promise((resolve) => {
+            const timer = setTimeout(resolve, TERMINATE_TIMEOUT_MS);
+            timer.unref();
+          }),
+        ])
+      )
+    );
     this._workers = [];
     this._idle = [];
   }

package/lib/HeadlessBrowser.js

@@ -148,10 +148,10 @@ class HeadlessBrowser {
             `${request.method()} ${request.url()} returned ${response.status()}`
           );
         } else {
+          const failure = request.failure();
+          const reason = failure ? failure.errorText : 'unknown error';
           this.console.error(
-            `${request.method()} ${request.url()} failed: ${
-              request.failure().errorText
-            }`
+            `${request.method()} ${request.url()} failed: ${reason}`
           );
         }
       });
@@ -180,7 +180,8 @@ class HeadlessBrowser {
         urlTools.resolveUrl(
           baseUrl,
           urlTools.buildRelativeUrl(assetGraph.root, htmlAsset.url)
-        )
+        ),
+        { timeout: 30000 }
       );
 
       await page.addScriptTag({

package/lib/cli.js

@@ -5,7 +5,7 @@ const { yargs, help, ...options } = require('./parseCommandLineOptions')();
 require('@gustavnikolaj/async-main-wrap')(require('./subfont'), {
   processError(err) {
     yargs.showHelp();
-    if (err.constructor === SyntaxError) {
+    if (err.name === 'UsageError') {
       // Avoid rendering a stack trace for the wrong usage errors
       err.customOutput = err.message;
     }

package/lib/collectTextsByPage.js

@@ -397,10 +397,8 @@ async function tracePages(
         }
       });
       await Promise.all(tracePromises);
+    } finally {
       await pool.destroy();
-    } catch (err) {
-      await pool.destroy();
-      throw err;
     }
   } else if (pagesNeedingFullTrace.length > 0) {
     const totalPages = pagesNeedingFullTrace.length;

package/lib/extractVisibleText.js

@@ -1,6 +1,17 @@
 const parse5 = require('parse5');
 
-const INVISIBLE_ELEMENTS = new Set(['script', 'style', 'svg', 'template']);
+const INVISIBLE_ELEMENTS = new Set([
+  'script',
+  'style',
+  'svg',
+  'template',
+  'head',
+  'noscript',
+  'iframe',
+  'object',
+  'embed',
+  'datalist',
+]);
 const TEXT_ATTRIBUTES = new Set([
   'alt',
   'title',
@@ -62,3 +73,4 @@ function extractVisibleText(html) {
 }
 
 module.exports = extractVisibleText;
+module.exports.INVISIBLE_ELEMENTS = INVISIBLE_ELEMENTS;

package/lib/fontFaceHelpers.js

@@ -18,7 +18,9 @@ function stringifyFontFamily(name) {
 }
 
 function maybeCssQuote(value) {
-  if (/^\w+$/.test(value)) {
+  // CSS identifiers must start with a letter or underscore (or hyphen
+  // followed by a letter/underscore), not a digit or bare hyphen.
+  if (/^[a-zA-Z_][a-zA-Z0-9_-]*$|^-[a-zA-Z_][a-zA-Z0-9_-]*$/.test(value)) {
     return value;
   } else {
     return `'${value.replace(/'/g, "\\'")}'`;
@@ -26,31 +28,29 @@ function maybeCssQuote(value) {
 }
 
 function getPreferredFontUrl(cssFontFaceSrcRelations = []) {
-  const formatOrder = ['woff2', 'woff', 'truetype', 'opentype'];
-
-  const typeOrder = ['Woff2', 'Woff', 'Ttf', 'Otf'];
-
-  for (const format of formatOrder) {
-    const relation = cssFontFaceSrcRelations.find(
-      (r) => r.format && r.format.toLowerCase() === format
-    );
-
-    if (relation) {
-      return relation.to.url;
+  // Priority: woff2 > woff > truetype > opentype, preferring explicit
+  // format() declarations over asset-type guesses.
+  const formatPriority = { woff2: 0, woff: 1, truetype: 2, opentype: 3 };
+  const typePriority = { Woff2: 4, Woff: 5, Ttf: 6, Otf: 7 };
+
+  let bestUrl;
+  let bestPriority = Infinity;
+
+  for (const r of cssFontFaceSrcRelations) {
+    let priority;
+    if (r.format) {
+      priority = formatPriority[r.format.toLowerCase()];
     }
-  }
-
-  for (const assetType of typeOrder) {
-    const relation = cssFontFaceSrcRelations.find(
-      (r) => r.to.type === assetType
-    );
-
-    if (relation) {
-      return relation.to.url;
+    if (priority === undefined) {
+      priority = typePriority[r.to.type];
+    }
+    if (priority !== undefined && priority < bestPriority) {
+      bestPriority = priority;
+      bestUrl = r.to.url;
     }
   }
 
-  return undefined;
+  return bestUrl;
 }
 
 // Temporarily switch all relation hrefs to absolute so that

package/lib/subfont.js

@@ -6,6 +6,13 @@ const urlTools = require('urltools');
 const util = require('util');
 const subsetFonts = require('./subsetFonts');
 
+class UsageError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = 'UsageError';
+  }
+}
+
 module.exports = async function subfont(
   {
     root,
@@ -30,6 +37,13 @@ module.exports = async function subfont(
   },
   console
 ) {
+  if (
+    concurrency !== undefined &&
+    (!Number.isInteger(concurrency) || concurrency < 1)
+  ) {
+    throw new UsageError('--concurrency must be a positive integer');
+  }
+
   const formats = ['woff2'];
 
   function logToConsole(severity, ...args) {
@@ -51,7 +65,7 @@ module.exports = async function subfont(
     try {
       await fsPromises.access(rootPath);
     } catch {
-      throw new SyntaxError(`The --root path does not exist: ${rootPath}`);
+      throw new UsageError(`The --root path does not exist: ${rootPath}`);
     }
   }
   const outRoot = output && urlTools.urlOrFsPathToUrl(output, true);
@@ -75,19 +89,19 @@ module.exports = async function subfont(
     inputUrls = [`${rootUrl}**/*.html`];
     warn(`No input files specified, defaulting to ${inputUrls[0]}`);
   } else {
-    throw new SyntaxError(
+    throw new UsageError(
       "No input files and no --root specified (or it isn't file:), cannot proceed.\n"
     );
   }
 
   if (!inputUrls[0].startsWith('file:') && !outRoot && !dryRun) {
-    throw new SyntaxError(
+    throw new UsageError(
       '--output has to be specified when using non-file input urls'
     );
   }
 
   if (!inPlace && !outRoot && !dryRun) {
-    throw new SyntaxError(
+    throw new UsageError(
       'Either --output, --in-place, or --dry-run has to be specified'
     );
   }
@@ -202,14 +216,15 @@ module.exports = async function subfont(
     }
   }
 
-  let sumSizesBefore = 0;
-  for (const asset of assetGraph.findAssets({
+  const sizeableAssetQuery = {
     isInline: false,
     isLoaded: true,
     type: {
       $in: ['Html', 'Svg', 'Css', 'JavaScript'],
     },
-  })) {
+  };
+  let sumSizesBefore = 0;
+  for (const asset of assetGraph.findAssets(sizeableAssetQuery)) {
     sumSizesBefore += asset.rawSrc.length;
   }
 
@@ -255,13 +270,7 @@ module.exports = async function subfont(
 
   phaseStart = Date.now();
   let sumSizesAfter = 0;
-  for (const asset of assetGraph.findAssets({
-    isInline: false,
-    isLoaded: true,
-    type: {
-      $in: ['Html', 'Svg', 'Css', 'JavaScript'],
-    },
-  })) {
+  for (const asset of assetGraph.findAssets(sizeableAssetQuery)) {
     sumSizesAfter += asset.rawSrc.length;
   }
 
@@ -575,3 +584,5 @@ module.exports = async function subfont(
   }
   return assetGraph;
 };
+
+module.exports.UsageError = UsageError;

package/lib/subsetGeneration.js

@@ -63,6 +63,16 @@ class SubsetDiskCache {
     try {
       await fs.writeFile(filePath, buffer);
     } catch (err) {
+      // If the directory was removed after init, retry once
+      if (err.code === 'ENOENT') {
+        try {
+          await fs.mkdir(this._cacheDir, { recursive: true });
+          await fs.writeFile(filePath, buffer);
+          return;
+        } catch {
+          // Fall through to warning below
+        }
+      }
       if (this._warnedWrite) return;
       this._warnedWrite = true;
       if (this._console) {

package/lib/unicodeRange.js

@@ -14,7 +14,7 @@ const getUnicodeRanges = (codePoints) => {
   const ranges = [];
   let start, end;
 
-  codePoints.sort((a, b) => a - b);
+  codePoints = [...codePoints].sort((a, b) => a - b);
 
   for (let i = 0; i < codePoints.length; i++) {
     start = codePoints[i];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@turntrout/subfont",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Automatically subset web fonts to only the characters used on your pages. Fork of Munter/subfont with modern defaults.",
   "engines": {
     "node": ">=18.0.0"