@turntrout/subfont 1.6.0 → 1.7.1

package/README.md

@@ -55,27 +55,27 @@ subfont path/to/index.html -i --cache
 
 ## Options
 
-|               Flag | Default | Description                                                  |
-| -----------------: | :-----: | :----------------------------------------------------------- |
-|   `-i, --in-place` |   off   | Modify files in-place                                        |
-|     `-o, --output` |         | Output directory                                             |
-|           `--root` |         | Path to web root (deduced from input files if not specified) |
-| `--canonical-root` |         | URI root where the site will be deployed                     |
-|  `-r, --recursive` |   off   | Crawl linked pages                                           |
-|        `--dynamic` |   off   | Trace with headless browser                                  |
-|        `--dry-run` |   off   | Preview without writing                                      |
-|      `--fallbacks` |   on    | Load the full original font for characters not in the subset |
-|   `--font-display` | `swap`  | `auto`/`block`/`swap`/`fallback`/`optional`                  |
-|           `--text` |         | Extra characters for every subset                            |
-|    `--cache [dir]` |   off   | Cache subset results to disk between runs                    |
-|  `--concurrency N` |         | Max worker threads (capped by available memory, ~50 MB each) |
-|   `--chrome-flags` |         | Custom Chrome flags for `--dynamic`                          |
-|    `--source-maps` |   off   | Preserve CSS source maps (slower)                            |
-|         `--strict` |   off   | Exit non-zero if any warnings are emitted                    |
-|     `-s, --silent` |   off   | Suppress all console output                                  |
-|      `-d, --debug` |   off   | Verbose timing and font glyph detection info                 |
-|  `--relative-urls` |   off   | Emit relative URLs instead of root-relative                  |
-|     `--inline-css` |   off   | Inline the subset @font-face CSS into HTML                   |
+|               Flag | Default | Description                                                                           |
+| -----------------: | :-----: | :------------------------------------------------------------------------------------ |
+|   `-i, --in-place` |   off   | Modify files in-place                                                                 |
+|     `-o, --output` |         | Output directory                                                                      |
+|           `--root` |         | Path to web root (deduced from input files if not specified)                          |
+| `--canonical-root` |         | URI root where the site will be deployed                                              |
+|  `-r, --recursive` |   off   | Crawl linked pages                                                                    |
+|        `--dynamic` |   off   | Trace with headless browser                                                           |
+|        `--dry-run` |   off   | Preview without writing                                                               |
+|      `--fallbacks` |   on    | Async-load the full original font as a fallback for dynamic content                   |
+|   `--font-display` | `swap`  | `auto`/`block`/`swap`/`fallback`/`optional`                                           |
+|           `--text` |         | Extra characters for every subset                                                     |
+|    `--cache [dir]` |   off   | Cache subset results to disk between runs                                             |
+|  `--concurrency N` |  auto   | Max worker threads (defaults to CPU count, capped by available memory at ~50 MB each) |
+|   `--chrome-flags` |         | Custom Chrome flags for `--dynamic` (comma-separated)                                 |
+|    `--source-maps` |   off   | Preserve CSS source maps (slower)                                                     |
+|         `--strict` |   off   | Exit non-zero if any warnings are emitted                                             |
+|     `-s, --silent` |   off   | Suppress all console output                                                           |
+|      `-d, --debug` |   off   | Verbose timing and font glyph detection info                                          |
+|  `--relative-urls` |   off   | Emit relative URLs instead of root-relative                                           |
+|     `--inline-css` |   off   | Inline the subset @font-face CSS into HTML                                            |
 
 Run `subfont --help` for the full list.
 
@@ -113,28 +113,28 @@ with `log`, `warn`, and `error` methods — e.g. the global `console`). Pass
 
 The `options` object accepts the following keys:
 
-| Option          | Type                | Default  | Description                                                                                                  |
-| --------------- | ------------------- | -------- | ------------------------------------------------------------------------------------------------------------ |
-| `inputFiles`    | `string[]`          | `[]`     | HTML entry points (file paths or URLs). At least one is required unless `root` is given.                     |
-| `root`          | `string`            | deduced  | Path or URL to the web root. Deduced from `inputFiles` if omitted.                                           |
-| `canonicalRoot` | `string`            | —        | URI root where the site will be deployed (used to rewrite absolute URLs).                                    |
-| `output`        | `string`            | —        | Output directory. Mutually exclusive with `inPlace`.                                                         |
-| `inPlace`       | `boolean`           | `false`  | Modify input files in place.                                                                                 |
-| `dryRun`        | `boolean`           | `false`  | Trace and compute subsets but do not write any files.                                                        |
-| `recursive`     | `boolean`           | `false`  | Crawl linked pages starting from `inputFiles`.                                                               |
-| `dynamic`       | `boolean`           | `false`  | Trace JS-rendered content in headless Chrome (via puppeteer).                                                |
-| `fallbacks`     | `boolean`           | `true`   | Keep the full original font for characters outside the subset.                                               |
-| `fontDisplay`   | `string`            | `'swap'` | `font-display` CSS value: `auto`, `block`, `swap`, `fallback`, or `optional`.                                |
-| `text`          | `string`            | —        | Extra characters to include in every subset.                                                                 |
-| `inlineCss`     | `boolean`           | `false`  | Inline the subset `@font-face` CSS into the HTML document.                                                   |
-| `relativeUrls`  | `boolean`           | `false`  | Emit relative URLs instead of root-relative URLs.                                                            |
-| `sourceMaps`    | `boolean`           | `false`  | Preserve CSS source maps (slower).                                                                           |
-| `concurrency`   | `number`            | auto     | Max parallel tracing workers. Capped by available memory (~50 MB per worker).                                |
-| `chromeFlags`   | `string[]`          | `[]`     | Extra Chrome flags forwarded to puppeteer when `dynamic` is set.                                             |
-| `cache`         | `boolean \| string` | `false`  | Cache subset results between runs. Pass a path to customize the cache directory; `true` uses the OS tmp dir. |
-| `strict`        | `boolean`           | `false`  | Resolve with a non-zero exit (via the CLI) if any warnings are emitted.                                      |
-| `silent`        | `boolean`           | `false`  | Suppress all log output to `console`.                                                                        |
-| `debug`         | `boolean`           | `false`  | Emit verbose timing and glyph-detection info.                                                                |
+| Option          | Type                | Default  | Description                                                                                                                                |
+| --------------- | ------------------- | -------- | ------------------------------------------------------------------------------------------------------------------------------------------ |
+| `inputFiles`    | `string[]`          | `[]`     | HTML entry points (file paths or URLs). At least one is required unless `root` is given.                                                   |
+| `root`          | `string`            | deduced  | Path or URL to the web root. Deduced from `inputFiles` if omitted.                                                                         |
+| `canonicalRoot` | `string`            | —        | URI root where the site will be deployed (used to rewrite absolute URLs).                                                                  |
+| `output`        | `string`            | —        | Output directory. Mutually exclusive with `inPlace`.                                                                                       |
+| `inPlace`       | `boolean`           | `false`  | Modify input files in place.                                                                                                               |
+| `dryRun`        | `boolean`           | `false`  | Trace and compute subsets but do not write any files.                                                                                      |
+| `recursive`     | `boolean`           | `false`  | Crawl linked pages starting from `inputFiles`.                                                                                             |
+| `dynamic`       | `boolean`           | `false`  | Trace JS-rendered content in headless Chrome (via puppeteer).                                                                              |
+| `fallbacks`     | `boolean`           | `true`   | Async-load the full original font as a fallback for dynamic content.                                                                       |
+| `fontDisplay`   | `string`            | `'swap'` | `font-display` CSS value: `auto`, `block`, `swap`, `fallback`, or `optional`.                                                              |
+| `text`          | `string`            | —        | Extra characters to include in every subset.                                                                                               |
+| `inlineCss`     | `boolean`           | `false`  | Inline the subset `@font-face` CSS into the HTML document.                                                                                 |
+| `relativeUrls`  | `boolean`           | `false`  | Emit relative URLs instead of root-relative URLs.                                                                                          |
+| `sourceMaps`    | `boolean`           | `false`  | Preserve CSS source maps (slower).                                                                                                         |
+| `concurrency`   | `number`            | auto     | Max parallel tracing workers. Defaults to CPU count, capped by available memory (~50 MB per worker).                                       |
+| `chromeFlags`   | `string[]`          | `[]`     | Extra Chrome flags forwarded to puppeteer when `dynamic` is set.                                                                           |
+| `cache`         | `boolean \| string` | `false`  | Cache subset results between runs. Pass a path to customize the cache directory; `true` uses `.subfont-cache` inside the `root` directory. |
+| `strict`        | `boolean`           | `false`  | Resolve with a non-zero exit (via the CLI) if any warnings are emitted.                                                                    |
+| `silent`        | `boolean`           | `false`  | Suppress all log output to `console`.                                                                                                      |
+| `debug`         | `boolean`           | `false`  | Emit verbose timing and glyph-detection info.                                                                                              |
 
 ## License
 

package/lib/FontTracerPool.d.ts

@@ -0,0 +1,37 @@
+interface StylesheetWithPredicates {
+    text?: string;
+    asset?: {
+        text?: string;
+    };
+    predicates?: Record<string, unknown>;
+}
+interface FontTracerPoolOptions {
+    taskTimeoutMs?: number;
+}
+declare class FontTracerPool {
+    private _workerPath;
+    private _numWorkers;
+    private _taskTimeoutMs;
+    private _workers;
+    private _idle;
+    private _pendingTasks;
+    private _taskCallbacks;
+    private _taskTimers;
+    private _taskByWorker;
+    private _nextTaskId;
+    constructor(numWorkers: number, { taskTimeoutMs }?: FontTracerPoolOptions);
+    init(): Promise<void>;
+    private _clearTaskTimer;
+    private _onWorkerMessage;
+    private _onWorkerExit;
+    private _startTaskTimer;
+    private _dispatchPending;
+    /**
+     * Run fontTracer on the given HTML text + stylesheets in a worker.
+     * Returns a promise that resolves to textByProps.
+     */
+    trace(htmlText: string, stylesheetsWithPredicates: StylesheetWithPredicates[]): Promise<unknown>;
+    destroy(): Promise<void>;
+}
+export = FontTracerPool;
+//# sourceMappingURL=FontTracerPool.d.ts.map

package/lib/FontTracerPool.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"FontTracerPool.d.ts","sourceRoot":"","sources":["../src/FontTracerPool.ts"],"names":[],"mappings":"AAkBA,UAAU,wBAAwB;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAI1B,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACtC;AAqCD,UAAU,qBAAqB;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,cAAM,cAAc;IAClB,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,KAAK,CAAW;IACxB,OAAO,CAAC,aAAa,CAAmC;IACxD,OAAO,CAAC,cAAc,CAA6B;IACnD,OAAO,CAAC,WAAW,CAA8B;IACjD,OAAO,CAAC,aAAa,CAAsB;IAC3C,OAAO,CAAC,WAAW,CAAS;gBAG1B,UAAU,EAAE,MAAM,EAClB,EAAE,aAAuC,EAAE,GAAE,qBAA0B;IAcnE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAiC3B,OAAO,CAAC,eAAe;IAQvB,OAAO,CAAC,gBAAgB;IAkBxB,OAAO,CAAC,aAAa;IAwCrB,OAAO,CAAC,eAAe;IA2BvB,OAAO,CAAC,gBAAgB;IAsBxB;;;OAGG;IAGH,KAAK,CACH,QAAQ,EAAE,MAAM,EAChB,yBAAyB,EAAE,wBAAwB,EAAE,GAEpD,OAAO,CAAC,OAAO,CAAC;IAsBb,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CA4C/B;AAED,SAAS,cAAc,CAAC"}

package/lib/FontTracerPool.js

@@ -1,191 +1,230 @@
-const pathModule = require('path');
-const { Worker } = require('worker_threads');
-
+"use strict";
+const pathModule = require("path");
+const worker_threads_1 = require("worker_threads");
 /**
  * Worker pool for running fontTracer in parallel across pages.
  * Each worker re-parses HTML with jsdom and runs fontTracer independently.
  */
+const DEFAULT_TASK_TIMEOUT_MS = 60_000;
 class FontTracerPool {
-  constructor(numWorkers) {
-    this._workerPath = pathModule.join(__dirname, 'fontTracerWorker.js');
-    this._numWorkers = numWorkers;
-    this._workers = [];
-    this._idle = [];
-    this._pendingTasks = [];
-    this._taskCallbacks = new Map();
-    this._taskByWorker = new Map(); // track which taskId each worker is processing
-    this._nextTaskId = 0;
-  }
-
-  async init() {
-    const initPromises = [];
-    for (let i = 0; i < this._numWorkers; i++) {
-      const worker = new Worker(this._workerPath);
-      this._workers.push(worker);
-
-      const initPromise = new Promise((resolve, reject) => {
-        const onError = reject;
-        const onMessage = (msg) => {
-          if (msg.type === 'ready') {
-            worker.off('message', onMessage);
-            worker.off('error', onError);
-            worker.on('message', (msg) => this._onWorkerMessage(worker, msg));
-            worker.on('exit', (code) => this._onWorkerExit(worker, code));
-            this._idle.push(worker);
-            resolve();
-          }
-        };
-        worker.on('message', onMessage);
-        worker.on('error', onError);
-      });
-
-      worker.postMessage({ type: 'init' });
-
-      initPromises.push(initPromise);
-    }
-    await Promise.all(initPromises);
-  }
-
-  _onWorkerMessage(worker, msg) {
-    this._taskByWorker.delete(worker);
-    const cb = this._taskCallbacks.get(msg.taskId);
-    if (cb) {
-      this._taskCallbacks.delete(msg.taskId);
-      if (msg.type === 'result') {
-        cb.resolve(msg.textByProps);
-      } else if (msg.type === 'error') {
-        cb.reject(new Error(`Worker error: ${msg.error}\n${msg.stack}`));
-      }
+    _workerPath;
+    _numWorkers;
+    _taskTimeoutMs;
+    _workers;
+    _idle;
+    _pendingTasks;
+    _taskCallbacks;
+    _taskTimers;
+    _taskByWorker;
+    _nextTaskId;
+    constructor(numWorkers, { taskTimeoutMs = DEFAULT_TASK_TIMEOUT_MS } = {}) {
+        this._workerPath = pathModule.join(__dirname, 'fontTracerWorker.js');
+        this._numWorkers = numWorkers;
+        this._taskTimeoutMs = taskTimeoutMs;
+        this._workers = [];
+        this._idle = [];
+        this._pendingTasks = [];
+        this._taskCallbacks = new Map();
+        this._taskTimers = new Map();
+        this._taskByWorker = new Map();
+        this._nextTaskId = 0;
     }
-    // Worker is now idle, check for pending tasks
-    this._idle.push(worker);
-    this._dispatchPending();
-  }
-
-  _onWorkerExit(worker, code) {
-    // Remove crashed worker from tracking
-    const workerIdx = this._workers.indexOf(worker);
-    if (workerIdx !== -1) {
-      this._workers.splice(workerIdx, 1);
+    async init() {
+        const initPromises = [];
+        for (let i = 0; i < this._numWorkers; i++) {
+            const worker = new worker_threads_1.Worker(this._workerPath);
+            this._workers.push(worker);
+            const initPromise = new Promise((resolve, reject) => {
+                const onError = reject;
+                const onMessage = (msg) => {
+                    if (msg.type === 'ready') {
+                        worker.off('message', onMessage);
+                        worker.off('error', onError);
+                        worker.on('message', (msg) => this._onWorkerMessage(worker, msg));
+                        worker.on('exit', (code) => this._onWorkerExit(worker, code));
+                        this._idle.push(worker);
+                        resolve();
+                    }
+                };
+                worker.on('message', onMessage);
+                worker.on('error', onError);
+            });
+            worker.postMessage({ type: 'init' });
+            initPromises.push(initPromise);
+        }
+        await Promise.all(initPromises);
     }
-    const idleIdx = this._idle.indexOf(worker);
-    if (idleIdx !== -1) {
-      this._idle.splice(idleIdx, 1);
+    _clearTaskTimer(taskId) {
+        const timer = this._taskTimers.get(taskId);
+        if (timer) {
+            clearTimeout(timer);
+            this._taskTimers.delete(taskId);
+        }
     }
-
-    if (code !== 0) {
-      // Reject the task that was in-flight on this worker
-      const taskId = this._taskByWorker.get(worker);
-      this._taskByWorker.delete(worker);
-      if (taskId !== undefined) {
-        const cb = this._taskCallbacks.get(taskId);
+    _onWorkerMessage(worker, msg) {
+        if (msg.type === 'ready')
+            return;
+        this._taskByWorker.delete(worker);
+        this._clearTaskTimer(msg.taskId);
+        const cb = this._taskCallbacks.get(msg.taskId);
         if (cb) {
-          this._taskCallbacks.delete(taskId);
-          cb.reject(new Error(`Worker exited with code ${code}`));
+            this._taskCallbacks.delete(msg.taskId);
+            if (msg.type === 'result') {
+                cb.resolve(msg.textByProps);
+            }
+            else if (msg.type === 'error') {
+                cb.reject(new Error(`Worker error: ${msg.error}\n${msg.stack}`));
+            }
         }
-      }
-
-      // If no workers remain, reject all pending tasks
-      if (this._workers.length === 0) {
-        for (const task of this._pendingTasks) {
-          const cb = this._taskCallbacks.get(task.message.taskId);
-          if (cb) {
-            this._taskCallbacks.delete(task.message.taskId);
-            cb.reject(
-              new Error('All workers have crashed, no workers available')
-            );
-          }
+        // Worker is now idle, check for pending tasks
+        this._idle.push(worker);
+        this._dispatchPending();
+    }
+    _onWorkerExit(worker, code) {
+        // Remove crashed worker from tracking
+        const workerIdx = this._workers.indexOf(worker);
+        if (workerIdx !== -1) {
+            this._workers.splice(workerIdx, 1);
+        }
+        const idleIdx = this._idle.indexOf(worker);
+        if (idleIdx !== -1) {
+            this._idle.splice(idleIdx, 1);
+        }
+        if (code !== 0) {
+            // Reject the task that was in-flight on this worker
+            const taskId = this._taskByWorker.get(worker);
+            this._taskByWorker.delete(worker);
+            if (taskId !== undefined) {
+                this._clearTaskTimer(taskId);
+                const cb = this._taskCallbacks.get(taskId);
+                if (cb) {
+                    this._taskCallbacks.delete(taskId);
+                    cb.reject(new Error(`Worker exited with code ${code}`));
+                }
+            }
+            // If no workers remain, reject all pending tasks
+            if (this._workers.length === 0) {
+                for (const task of this._pendingTasks) {
+                    const cb = this._taskCallbacks.get(task.message.taskId);
+                    if (cb) {
+                        this._taskCallbacks.delete(task.message.taskId);
+                        cb.reject(new Error('All workers have crashed, no workers available'));
+                    }
+                }
+                this._pendingTasks = [];
+            }
         }
-        this._pendingTasks = [];
-      }
     }
-  }
-
-  _dispatchPending() {
-    while (this._idle.length > 0 && this._pendingTasks.length > 0) {
-      const worker = this._idle.pop();
-      const task = this._pendingTasks.shift();
-      this._taskByWorker.set(worker, task.message.taskId);
-      try {
-        worker.postMessage(task.message);
-      } catch (err) {
-        // postMessage can fail synchronously (e.g. structured clone error).
-        // Return the worker to the idle pool and reject the task.
-        this._taskByWorker.delete(worker);
-        this._idle.push(worker);
-        const cb = this._taskCallbacks.get(task.message.taskId);
-        if (cb) {
-          this._taskCallbacks.delete(task.message.taskId);
-          cb.reject(err);
+    _startTaskTimer(taskId) {
+        if (this._taskTimeoutMs <= 0)
+            return;
+        const timer = setTimeout(() => {
+            this._taskTimers.delete(taskId);
+            const cb = this._taskCallbacks.get(taskId);
+            if (cb) {
+                this._taskCallbacks.delete(taskId);
+                cb.reject(new Error(`Font tracing task ${taskId} timed out after ${this._taskTimeoutMs}ms`));
+            }
+            // Terminate the hung worker so it doesn't permanently consume a pool
+            // slot. _onWorkerExit will remove it from _workers and _idle.
+            for (const [worker, tid] of this._taskByWorker) {
+                if (tid === taskId) {
+                    this._taskByWorker.delete(worker);
+                    worker.terminate();
+                    break;
+                }
+            }
+        }, this._taskTimeoutMs);
+        timer.unref();
+        this._taskTimers.set(taskId, timer);
+    }
+    _dispatchPending() {
+        while (this._idle.length > 0 && this._pendingTasks.length > 0) {
+            const worker = this._idle.pop();
+            const task = this._pendingTasks.shift();
+            this._taskByWorker.set(worker, task.message.taskId);
+            try {
+                worker.postMessage(task.message);
+                this._startTaskTimer(task.message.taskId);
+            }
+            catch (err) {
+                // postMessage can fail synchronously (e.g. structured clone error).
+                // Return the worker to the idle pool and reject the task.
+                this._taskByWorker.delete(worker);
+                this._idle.push(worker);
+                const cb = this._taskCallbacks.get(task.message.taskId);
+                if (cb) {
+                    this._taskCallbacks.delete(task.message.taskId);
+                    cb.reject(err);
+                }
+            }
         }
-      }
     }
-  }
-
-  /**
-   * Run fontTracer on the given HTML text + stylesheets in a worker.
-   * Returns a promise that resolves to textByProps.
-   */
-  trace(htmlText, stylesheetsWithPredicates) {
-    const taskId = this._nextTaskId++;
-    // Serialize stylesheets to plain data — asset objects contain DOM/PostCSS
-    // trees that cannot be transferred via structured clone.
-    const serializedStylesheets = stylesheetsWithPredicates.map((entry) => ({
-      text: entry.text || (entry.asset && entry.asset.text) || '',
-      predicates: entry.predicates || {},
-    }));
-    const message = {
-      type: 'trace',
-      taskId,
-      htmlText,
-      stylesheetsWithPredicates: serializedStylesheets,
-    };
-
-    return new Promise((resolve, reject) => {
-      this._taskCallbacks.set(taskId, { resolve, reject });
-      this._pendingTasks.push({ message });
-      this._dispatchPending();
-    });
-  }
-
-  async destroy() {
-    // Reject any tasks still waiting in the queue
-    for (const task of this._pendingTasks) {
-      const cb = this._taskCallbacks.get(task.message.taskId);
-      if (cb) {
-        this._taskCallbacks.delete(task.message.taskId);
-        cb.reject(new Error('Worker pool destroyed'));
-      }
+    /**
+     * Run fontTracer on the given HTML text + stylesheets in a worker.
+     * Returns a promise that resolves to textByProps.
+     */
+    // The pool is payload-agnostic; callers (subsetFonts.ts) interpret the
+    // returned textByProps according to font-tracer's contract.
+    trace(htmlText, stylesheetsWithPredicates
+    // eslint-disable-next-line no-restricted-syntax
+    ) {
+        const taskId = this._nextTaskId++;
+        // Serialize stylesheets to plain data — asset objects contain DOM/PostCSS
+        // trees that cannot be transferred via structured clone.
+        const serializedStylesheets = stylesheetsWithPredicates.map((entry) => ({
+            text: entry.text || (entry.asset && entry.asset.text) || '',
+            predicates: entry.predicates || {},
+        }));
+        const message = {
+            type: 'trace',
+            taskId,
+            htmlText,
+            stylesheetsWithPredicates: serializedStylesheets,
+        };
+        return new Promise((resolve, reject) => {
+            this._taskCallbacks.set(taskId, { resolve, reject });
+            this._pendingTasks.push({ message });
+            this._dispatchPending();
+        });
     }
-    this._pendingTasks = [];
-
-    // 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'));
-      }
+    async destroy() {
+        // Clear all task timers
+        for (const timer of this._taskTimers.values()) {
+            clearTimeout(timer);
+        }
+        this._taskTimers.clear();
+        // Reject any tasks still waiting in the queue
+        for (const task of this._pendingTasks) {
+            const cb = this._taskCallbacks.get(task.message.taskId);
+            if (cb) {
+                this._taskCallbacks.delete(task.message.taskId);
+                cb.reject(new Error('Worker pool destroyed'));
+            }
+        }
+        this._pendingTasks = [];
+        // 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 = [];
     }
-    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 = [];
-  }
 }
-
 module.exports = FontTracerPool;
+//# sourceMappingURL=FontTracerPool.js.map

package/lib/FontTracerPool.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"FontTracerPool.js","sourceRoot":"","sources":["../src/FontTracerPool.ts"],"names":[],"mappings":";AAAA,mCAAoC;AACpC,mDAAwC;AAExC;;;GAGG;AACH,MAAM,uBAAuB,GAAG,MAAM,CAAC;AA2DvC,MAAM,cAAc;IACV,WAAW,CAAS;IACpB,WAAW,CAAS;IACpB,cAAc,CAAS;IACvB,QAAQ,CAAW;IACnB,KAAK,CAAW;IAChB,aAAa,CAAmC;IAChD,cAAc,CAA6B;IAC3C,WAAW,CAA8B;IACzC,aAAa,CAAsB;IACnC,WAAW,CAAS;IAE5B,YACE,UAAkB,EAClB,EAAE,aAAa,GAAG,uBAAuB,KAA4B,EAAE;QAEvE,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,qBAAqB,CAAC,CAAC;QACrE,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAC9B,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;QACpC,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,cAAc,GAAG,IAAI,GAAG,EAAE,CAAC;QAChC,IAAI,CAAC,WAAW,GAAG,IAAI,GAAG,EAAE,CAAC;QAC7B,IAAI,CAAC,aAAa,GAAG,IAAI,GAAG,EAAE,CAAC;QAC/B,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,YAAY,GAAyB,EAAE,CAAC;QAC9C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,EAAE,EAAE,CAAC;YAC1C,MAAM,MAAM,GAAG,IAAI,uBAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC5C,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAE3B,MAAM,WAAW,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACxD,MAAM,OAAO,GAAG,MAAM,CAAC;gBACvB,MAAM,SAAS,GAAG,CAAC,GAAkB,EAAE,EAAE;oBACvC,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;wBACzB,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;wBACjC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;wBAC7B,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,GAAkB,EAAE,EAAE,CAC1C,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,GAAG,CAAC,CACnC,CAAC;wBACF,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE,CACjC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,CACjC,CAAC;wBACF,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;wBACxB,OAAO,EAAE,CAAC;oBACZ,CAAC;gBACH,CAAC,CAAC;gBACF,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;gBAChC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC9B,CAAC,CAAC,CAAC;YAEH,MAAM,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;YAErC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACjC,CAAC;QACD,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAClC,CAAC;IAEO,eAAe,CAAC,MAAc;QACpC,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC3C,IAAI,KAAK,EAAE,CAAC;YACV,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAEO,gBAAgB,CAAC,MAAc,EAAE,GAAkB;QACzD,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO;YAAE,OAAO;QACjC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAClC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACjC,MAAM,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC/C,IAAI,EAAE,EAAE,CAAC;YACP,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACvC,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC1B,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAC9B,CAAC;iBAAM,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBAChC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,iBAAiB,GAAG,CAAC,KAAK,KAAK,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YACnE,CAAC;QACH,CAAC;QACD,8CAA8C;QAC9C,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxB,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC1B,CAAC;IAEO,aAAa,CAAC,MAAc,EAAE,IAAY;QAChD,sCAAsC;QACtC,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAChD,IAAI,SAAS,KAAK,CAAC,CAAC,EAAE,CAAC;YACrB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QACrC,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC3C,IAAI,OAAO,KAAK,CAAC,CAAC,EAAE,CAAC;YACnB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAChC,CAAC;QAED,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;YACf,oDAAoD;YACpD,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAC9C,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAClC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACzB,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;gBAC7B,MAAM,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBAC3C,IAAI,EAAE,EAAE,CAAC;oBACP,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;oBACnC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,2BAA2B,IAAI,EAAE,CAAC,CAAC,CAAC;gBAC1D,CAAC;YACH,CAAC;YAED,iDAAiD;YACjD,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC/B,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;oBACtC,MAAM,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;oBACxD,IAAI,EAAE,EAAE,CAAC;wBACP,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;wBAChD,EAAE,CAAC,MAAM,CACP,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAC5D,CAAC;oBACJ,CAAC;gBACH,CAAC;gBACD,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;YAC1B,CAAC;QACH,CAAC;IACH,CAAC;IAEO,eAAe,CAAC,MAAc;QACpC,IAAI,IAAI,CAAC,cAAc,IAAI,CAAC;YAAE,OAAO;QACrC,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC5B,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAChC,MAAM,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAC3C,IAAI,EAAE,EAAE,CAAC;gBACP,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBACnC,EAAE,CAAC,MAAM,CACP,IAAI,KAAK,CACP,qBAAqB,MAAM,oBAAoB,IAAI,CAAC,cAAc,IAAI,CACvE,CACF,CAAC;YACJ,CAAC;YACD,qEAAqE;YACrE,8DAA8D;YAC9D,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;gBAC/C,IAAI,GAAG,KAAK,MAAM,EAAE,CAAC;oBACnB,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;oBAClC,MAAM,CAAC,SAAS,EAAE,CAAC;oBACnB,MAAM;gBACR,CAAC;YACH,CAAC;QACH,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QACxB,KAAK,CAAC,KAAK,EAAE,CAAC;QACd,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACtC,CAAC;IAEO,gBAAgB;QACtB,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9D,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAY,CAAC;YAC1C,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,EAA+B,CAAC;YACrE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACpD,IAAI,CAAC;gBACH,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACjC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAC5C,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,oEAAoE;gBACpE,0DAA0D;gBAC1D,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAClC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACxB,MAAM,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBACxD,IAAI,EAAE,EAAE,CAAC;oBACP,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;oBAChD,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBACjB,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,uEAAuE;IACvE,4DAA4D;IAC5D,KAAK,CACH,QAAgB,EAChB,yBAAqD;IACrD,gDAAgD;;QAEhD,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAClC,0EAA0E;QAC1E,yDAAyD;QACzD,MAAM,qBAAqB,GAAG,yBAAyB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACtE,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE;YAC3D,UAAU,EAAE,KAAK,CAAC,UAAU,IAAI,EAAE;SACnC,CAAC,CAAC,CAAC;QACJ,MAAM,OAAO,GAAiB;YAC5B,IAAI,EAAE,OAAO;YACb,MAAM;YACN,QAAQ;YACR,yBAAyB,EAAE,qBAAqB;SACjD,CAAC;QAEF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;YACrD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;YACrC,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC1B,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,OAAO;QACX,wBAAwB;QACxB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC;YAC9C,YAAY,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;QACD,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QAEzB,8CAA8C;QAC9C,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACtC,MAAM,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACxD,IAAI,EAAE,EAAE,CAAC;gBACP,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBAChD,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC,CAAC;YAChD,CAAC;QACH,CAAC;QACD,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QAExB,wDAAwD;QACxD,+EAA+E;QAC/E,KAAK,MAAM,CAAC,EAAE,MAAM,CAAC,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YAC5C,MAAM,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAC3C,IAAI,EAAE,EAAE,CAAC;gBACP,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBACnC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC,CAAC;YAChD,CAAC;QACH,CAAC;QACD,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;QAE3B,+DAA+D;QAC/D,MAAM,oBAAoB,GAAG,IAAI,CAAC;QAClC,MAAM,OAAO,CAAC,GAAG,CACf,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACtB,OAAO,CAAC,IAAI,CAAC;YACX,CAAC,CAAC,SAAS,EAAE;YACb,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;gBAC5B,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;gBACxD,KAAK,CAAC,KAAK,EAAE,CAAC;YAChB,CAAC,CAAC;SACH,CAAC,CACH,CACF,CAAC;QACF,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;IAClB,CAAC;CACF;AAED,iBAAS,cAAc,CAAC"}

package/lib/HeadlessBrowser.js

@@ -13,8 +13,12 @@ async function transferResults(jsHandle) {
   const results = await jsHandle.jsonValue();
   for (const [i, result] of results.entries()) {
     const resultHandle = await jsHandle.getProperty(String(i));
-    const elementHandle = await resultHandle.getProperty('node');
-    result.node = elementHandle;
+    try {
+      const elementHandle = await resultHandle.getProperty('node');
+      result.node = elementHandle;
+    } finally {
+      await resultHandle.dispose();
+    }
   }
   return results;
 }
@@ -193,7 +197,11 @@ class HeadlessBrowser {
         /* istanbul ignore next */
         () => fontTracer(document)
       );
-      return await transferResults(jsHandle);
+      try {
+        return await transferResults(jsHandle);
+      } finally {
+        await jsHandle.dispose();
+      }
     } finally {
       await page.close();
     }

package/lib/cli.d.ts

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+export {};
+//# sourceMappingURL=cli.d.ts.map

package/lib/cli.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":""}