@turntrout/subfont 1.10.7 → 1.10.8

package/lib/FontTracerPool.d.ts

@@ -1,3 +1,6 @@
+interface FontTracerPoolOptions {
+    taskTimeoutMs?: number;
+}
 interface StylesheetWithPredicates {
     text?: string;
     asset?: {
@@ -5,39 +8,31 @@ interface StylesheetWithPredicates {
     };
     predicates?: Record<string, unknown>;
 }
-interface FontTracerPoolOptions {
-    taskTimeoutMs?: number;
-    respawnOnExit?: boolean;
+interface TextByPropsEntry {
+    text: string;
+    props: Record<string, unknown>;
+}
+interface TraceOptions {
+    signal?: AbortSignal;
 }
 declare class FontTracerPool {
-    private _workerPath;
-    private _numWorkers;
+    private _pool;
     private _taskTimeoutMs;
-    private _respawnOnExit;
-    private _workers;
-    private _idle;
-    private _pendingTasks;
-    private _taskCallbacks;
-    private _taskTimers;
-    private _taskByWorker;
-    private _nextTaskId;
-    private _destroying;
-    private _spawning;
-    constructor(numWorkers: number, { taskTimeoutMs, respawnOnExit, }?: FontTracerPoolOptions);
-    private _spawnOne;
+    constructor(numWorkers: number, { taskTimeoutMs }?: FontTracerPoolOptions);
     init(): Promise<void>;
-    private _onWorkerError;
-    private _clearTaskTimer;
-    private _onWorkerMessage;
-    private _onWorkerExit;
-    private _drainPendingWith;
-    private _startTaskTimer;
-    private _dispatchPending;
+    trace(htmlText: string, stylesheetsWithPredicates: StylesheetWithPredicates[], { signal }?: TraceOptions): Promise<TextByPropsEntry[]>;
+    /**
+     * Number of worker threads in the underlying piscina pool. Piscina
+     * spawns up to minThreads === maxThreads at construction time, though
+     * individual workers may still be loading their module when this is
+     * read. Exposed primarily for tests.
+     */
+    get threadCount(): number;
     /**
-     * Run fontTracer on the given HTML text + stylesheets in a worker.
-     * Returns a promise that resolves to textByProps.
+     * Number of trace tasks waiting in the piscina queue (not yet dispatched
+     * to a worker).
      */
-    trace(htmlText: string, stylesheetsWithPredicates: StylesheetWithPredicates[]): Promise<unknown>;
+    get queueSize(): number;
     destroy(): Promise<void>;
 }
 export = FontTracerPool;

package/lib/FontTracerPool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FontTracerPool.d.ts","sourceRoot":"","sources":["../src/FontTracerPool.ts"],"names":[],"mappings":"AAsBA,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;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,cAAM,cAAc;IAClB,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,cAAc,CAAU;IAChC,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;IAC5B,OAAO,CAAC,WAAW,CAAU;IAC7B,OAAO,CAAC,SAAS,CAAS;gBAGxB,UAAU,EAAE,MAAM,EAClB,EACE,aAAuC,EACvC,aAAoB,GACrB,GAAE,qBAA0B;IAiB/B,OAAO,CAAC,SAAS;IAyDX,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ3B,OAAO,CAAC,cAAc;IAgBtB,OAAO,CAAC,eAAe;IAQvB,OAAO,CAAC,gBAAgB;IAmBxB,OAAO,CAAC,aAAa;IA+CrB,OAAO,CAAC,iBAAiB;IAWzB,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;CA6C/B;AAED,SAAS,cAAc,CAAC"}
+{"version":3,"file":"FontTracerPool.d.ts","sourceRoot":"","sources":["../src/FontTracerPool.ts"],"names":[],"mappings":"AAmBA,UAAU,qBAAqB;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,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;AAaD,UAAU,gBAAgB;IACxB,IAAI,EAAE,MAAM,CAAC;IAGb,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChC;AAED,UAAU,YAAY;IACpB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,cAAM,cAAc;IAClB,OAAO,CAAC,KAAK,CAAU;IACvB,OAAO,CAAC,cAAc,CAAS;gBAG7B,UAAU,EAAE,MAAM,EAClB,EAAE,aAAuC,EAAE,GAAE,qBAA0B;IAgBnE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAmB3B,KAAK,CACH,QAAQ,EAAE,MAAM,EAChB,yBAAyB,EAAE,wBAAwB,EAAE,EACrD,EAAE,MAAM,EAAE,GAAE,YAAiB,GAC5B,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAuB9B;;;;;OAKG;IACH,IAAI,WAAW,IAAI,MAAM,CAExB;IAED;;;OAGG;IACH,IAAI,SAAS,IAAI,MAAM,CAEtB;IAEK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAG/B;AAED,SAAS,cAAc,CAAC"}

package/lib/FontTracerPool.js

@@ -1,9 +1,14 @@
 "use strict";
 const pathModule = require("path");
-const worker_threads_1 = require("worker_threads");
+const piscina_1 = require("piscina");
+const piscinaRunWithTimeout_1 = require("./piscinaRunWithTimeout");
 /**
  * Worker pool for running fontTracer in parallel across pages.
  * Each worker re-parses HTML with jsdom and runs fontTracer independently.
+ *
+ * Wraps `piscina` to preserve the existing FontTracerPool surface (init,
+ * trace, destroy) while delegating worker lifecycle, queueing, and
+ * structured-clone handling to a battle-tested dependency.
  */
 // Heavy pages (large blog posts with elaborate CSS) under CPU contention on
 // CI runners can comfortably exceed a minute in jsdom + font-tracer. The
@@ -11,298 +16,67 @@ const worker_threads_1 = require("worker_threads");
 // errs generous.
 const DEFAULT_TASK_TIMEOUT_MS = 600_000;
 class FontTracerPool {
-    _workerPath;
-    _numWorkers;
+    _pool;
     _taskTimeoutMs;
-    _respawnOnExit;
-    _workers;
-    _idle;
-    _pendingTasks;
-    _taskCallbacks;
-    _taskTimers;
-    _taskByWorker;
-    _nextTaskId;
-    _destroying;
-    _spawning;
-    constructor(numWorkers, { taskTimeoutMs = DEFAULT_TASK_TIMEOUT_MS, respawnOnExit = true, } = {}) {
-        this._workerPath = pathModule.join(__dirname, 'fontTracerWorker.js');
-        this._numWorkers = numWorkers;
+    constructor(numWorkers, { taskTimeoutMs = DEFAULT_TASK_TIMEOUT_MS } = {}) {
         this._taskTimeoutMs = taskTimeoutMs;
-        this._respawnOnExit = respawnOnExit;
-        this._workers = [];
-        this._idle = [];
-        this._pendingTasks = [];
-        this._taskCallbacks = new Map();
-        this._taskTimers = new Map();
-        this._taskByWorker = new Map();
-        this._nextTaskId = 0;
-        this._destroying = false;
-        this._spawning = 0;
-    }
-    _spawnOne() {
-        this._spawning++;
-        return new Promise((resolve, reject) => {
-            let worker;
-            try {
-                worker = new worker_threads_1.Worker(this._workerPath);
-            }
-            catch (err) {
-                this._spawning--;
-                reject(err instanceof Error ? err : new Error(String(err)));
-                return;
-            }
-            this._workers.push(worker);
-            const detachInitHandlers = () => {
-                worker.off('message', onMessage);
-                worker.off('error', failOnInit);
-                worker.off('exit', exitDuringInit);
-            };
-            const failOnInit = (err) => {
-                detachInitHandlers();
-                const idx = this._workers.indexOf(worker);
-                if (idx !== -1)
-                    this._workers.splice(idx, 1);
-                this._spawning--;
-                worker.terminate();
-                reject(err);
-            };
-            const exitDuringInit = (code) => {
-                // Worker exited before sending 'ready' (e.g. terminated by destroy()
-                // mid-spawn, or crashed during init without emitting 'error'). Settle
-                // the spawn promise so the .catch() upstream can run.
-                detachInitHandlers();
-                const idx = this._workers.indexOf(worker);
-                if (idx !== -1)
-                    this._workers.splice(idx, 1);
-                this._spawning--;
-                reject(new Error(`Worker exited during init with code ${code}`));
-            };
-            const onMessage = (msg) => {
-                if (msg.type === 'ready') {
-                    detachInitHandlers();
-                    worker.on('message', (m) => this._onWorkerMessage(worker, m));
-                    worker.on('error', (e) => this._onWorkerError(worker, e));
-                    worker.on('exit', (code) => this._onWorkerExit(worker, code));
-                    this._idle.push(worker);
-                    this._spawning--;
-                    resolve();
-                    this._dispatchPending();
-                }
-            };
-            worker.on('message', onMessage);
-            worker.on('error', failOnInit);
-            worker.on('exit', exitDuringInit);
-            worker.postMessage({ type: 'init' });
+        this._pool = new piscina_1.Piscina({
+            filename: pathModule.join(__dirname, 'fontTracerWorker.js'),
+            // Pin pool size so concurrency is bounded by the caller-supplied
+            // worker count (memory and CPU contention both scale with this).
+            minThreads: numWorkers,
+            maxThreads: numWorkers,
+            concurrentTasksPerWorker: 1,
+            // Workers stay warm for the lifetime of the pool — pages on the
+            // same site share stylesheet parses through per-worker memoization.
+            idleTimeout: Infinity,
         });
     }
     async init() {
-        const initPromises = [];
-        for (let i = 0; i < this._numWorkers; i++) {
-            initPromises.push(this._spawnOne());
-        }
-        await Promise.all(initPromises);
-    }
-    _onWorkerError(worker, err) {
-        // A post-init worker emitted an error. Reject the in-flight task so
-        // callers don't hang. The worker is about to exit; _onWorkerExit will
-        // remove it from _workers/_idle.
-        const taskId = this._taskByWorker.get(worker);
-        if (taskId !== undefined) {
-            this._taskByWorker.delete(worker);
-            this._clearTaskTimer(taskId);
-            const cb = this._taskCallbacks.get(taskId);
-            if (cb) {
-                this._taskCallbacks.delete(taskId);
-                cb.reject(err);
-            }
-        }
-    }
-    _clearTaskTimer(taskId) {
-        const timer = this._taskTimers.get(taskId);
-        if (timer) {
-            clearTimeout(timer);
-            this._taskTimers.delete(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(msg.taskId);
-            if (msg.type === 'result') {
-                cb.resolve(msg.textByProps);
-            }
-            else if (msg.type === 'error') {
-                const detail = msg.stack ? `${msg.error}\n${msg.stack}` : msg.error;
-                cb.reject(new Error(`Worker error: ${detail}`));
-            }
-        }
-        // Worker is now idle, check for pending tasks
-        this._idle.push(worker);
-        this._dispatchPending();
-    }
-    _onWorkerExit(worker, code) {
-        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);
-        }
-        // Reject any task that was in-flight on this worker. A graceful exit
-        // (code 0) mid-task still leaves the caller waiting, so don't gate on
-        // code !== 0.
-        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 (this._destroying)
-            return;
-        if (this._respawnOnExit) {
-            this._spawnOne().catch((err) => {
-                // Respawn failed — fall back to draining if the pool is now empty.
-                if (this._workers.length === 0 &&
-                    this._spawning === 0 &&
-                    this._pendingTasks.length > 0) {
-                    this._drainPendingWith(`All workers have crashed and respawn failed: ${err.message}`);
-                }
-            });
-            return;
-        }
-        if (code !== 0 && this._workers.length === 0) {
-            this._drainPendingWith('All workers have crashed, no workers available');
-        }
-    }
-    _drainPendingWith(message) {
-        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(message));
-            }
+        // Piscina spawns workers eagerly when minThreads === maxThreads, but
+        // each worker still pays a one-time `require('jsdom')` + `postcss` cost
+        // on its first message — hundreds of ms cold. Fire one warmup trace
+        // per worker so that cost lands in init() (where the phase tracker
+        // expects it) instead of in the first real `trace()` batch.
+        //
+        // Empty HTML produces an empty result quickly and exercises the full
+        // require chain. Tasks load-balance across all idle workers.
+        const minThreads = this._pool.options.minThreads;
+        if (minThreads > 0) {
+            await Promise.all(Array.from({ length: minThreads }, () => this._pool.run({ htmlText: '', stylesheetsWithPredicates: [] })));
         }
-        this._pendingTasks = [];
     }
-    _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.
-     */
-    // 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++;
+    trace(htmlText, stylesheetsWithPredicates, { signal } = {}) {
         // Serialize stylesheets to plain data — asset objects contain DOM/PostCSS
         // trees that cannot be transferred via structured clone.
-        const serializedStylesheets = stylesheetsWithPredicates.map((entry) => ({
+        const serialized = stylesheetsWithPredicates.map((entry) => ({
             text: entry.text || (entry.asset && entry.asset.text) || '',
             predicates: entry.predicates || {},
         }));
-        const message = {
-            type: 'trace',
-            taskId,
+        const task = {
             htmlText,
-            stylesheetsWithPredicates: serializedStylesheets,
+            stylesheetsWithPredicates: serialized,
         };
-        return new Promise((resolve, reject) => {
-            this._taskCallbacks.set(taskId, { resolve, reject });
-            this._pendingTasks.push({ message });
-            this._dispatchPending();
-        });
+        return (0, piscinaRunWithTimeout_1.runWithTimeoutAndSignal)(this._pool, task, signal, this._taskTimeoutMs, (ms) => `Font tracing task timed out after ${ms}ms`);
+    }
+    /**
+     * Number of worker threads in the underlying piscina pool. Piscina
+     * spawns up to minThreads === maxThreads at construction time, though
+     * individual workers may still be loading their module when this is
+     * read. Exposed primarily for tests.
+     */
+    get threadCount() {
+        return this._pool.threads.length;
+    }
+    /**
+     * Number of trace tasks waiting in the piscina queue (not yet dispatched
+     * to a worker).
+     */
+    get queueSize() {
+        return this._pool.queueSize;
     }
     async destroy() {
-        this._destroying = true;
-        // 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 = [];
+        await this._pool.destroy();
     }
 }
 module.exports = FontTracerPool;

package/lib/FontTracerPool.js.map

@@ -1 +1 @@
-{"version":3,"file":"FontTracerPool.js","sourceRoot":"","sources":["../src/FontTracerPool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FontTracerPool.js","sourceRoot":"","sources":["../src/FontTracerPool.ts"],"names":[],"mappings":";AAAA,mCAAoC;AACpC,qCAAkC;AAClC,mEAAkE;AAElE;;;;;;;GAOG;AAEH,4EAA4E;AAC5E,yEAAyE;AACzE,2EAA2E;AAC3E,iBAAiB;AACjB,MAAM,uBAAuB,GAAG,OAAO,CAAC;AAqCxC,MAAM,cAAc;IACV,KAAK,CAAU;IACf,cAAc,CAAS;IAE/B,YACE,UAAkB,EAClB,EAAE,aAAa,GAAG,uBAAuB,KAA4B,EAAE;QAEvE,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;QACpC,IAAI,CAAC,KAAK,GAAG,IAAI,iBAAO,CAAC;YACvB,QAAQ,EAAE,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,qBAAqB,CAAC;YAC3D,iEAAiE;YACjE,iEAAiE;YACjE,UAAU,EAAE,UAAU;YACtB,UAAU,EAAE,UAAU;YACtB,wBAAwB,EAAE,CAAC;YAC3B,gEAAgE;YAChE,oEAAoE;YACpE,WAAW,EAAE,QAAQ;SACtB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,IAAI;QACR,qEAAqE;QACrE,wEAAwE;QACxE,oEAAoE;QACpE,mEAAmE;QACnE,4DAA4D;QAC5D,EAAE;QACF,qEAAqE;QACrE,6DAA6D;QAC7D,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;QACjD,IAAI,UAAU,GAAG,CAAC,EAAE,CAAC;YACnB,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,GAAG,EAAE,CACtC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,yBAAyB,EAAE,EAAE,EAAE,CAAC,CAChE,CACF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,KAAK,CACH,QAAgB,EAChB,yBAAqD,EACrD,EAAE,MAAM,KAAmB,EAAE;QAE7B,0EAA0E;QAC1E,yDAAyD;QACzD,MAAM,UAAU,GAA2B,yBAAyB,CAAC,GAAG,CACtE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACV,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,CACH,CAAC;QACF,MAAM,IAAI,GAAc;YACtB,QAAQ;YACR,yBAAyB,EAAE,UAAU;SACtC,CAAC;QAEF,OAAO,IAAA,+CAAuB,EAC5B,IAAI,CAAC,KAAK,EACV,IAAI,EACJ,MAAM,EACN,IAAI,CAAC,cAAc,EACnB,CAAC,EAAE,EAAE,EAAE,CAAC,qCAAqC,EAAE,IAAI,CACpD,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;IACnC,CAAC;IAED;;;OAGG;IACH,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;CACF;AAED,iBAAS,cAAc,CAAC"}

package/lib/collectTextsByPage.d.ts

@@ -22,12 +22,13 @@ interface CollectTextsByPageOptions {
     debug?: boolean;
     concurrency?: number;
     chromeArgs?: string[];
+    signal?: AbortSignal;
 }
 interface CollectTextsByPageResult {
     htmlOrSvgAssetTextsWithProps: AssetTextWithPropsEntry[];
     fontFaceDeclarationsByHtmlOrSvgAsset: Map<Asset, FontFaceDeclaration[]>;
     subTimings: Record<string, number | undefined>;
 }
-declare function collectTextsByPage(assetGraph: AssetGraph, htmlOrSvgAssets: Asset[], { text, console, dynamic, debug, concurrency, chromeArgs, }?: CollectTextsByPageOptions): Promise<CollectTextsByPageResult>;
+declare function collectTextsByPage(assetGraph: AssetGraph, htmlOrSvgAssets: Asset[], { text, console, dynamic, debug, concurrency, chromeArgs, signal, }?: CollectTextsByPageOptions): Promise<CollectTextsByPageResult>;
 export = collectTextsByPage;
 //# sourceMappingURL=collectTextsByPage.d.ts.map

package/lib/collectTextsByPage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collectTextsByPage.d.ts","sourceRoot":"","sources":["../src/collectTextsByPage.ts"],"names":[],"mappings":"AA2BA,OAAO,EACL,mCAAmC,EAEpC,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAE,KAAK,EAAE,UAAU,EAAyB,MAAM,YAAY,CAAC;AAC3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAwCtD,UAAU,gBAAgB;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAE9B,cAAc,CAAC,EAAE,KAAK,CAAC;CACxB;AAu5BD,UAAU,uBAAuB;IAC/B,cAAc,EAAE,KAAK,CAAC;IACtB,WAAW,EAAE,gBAAgB,EAAE,CAAC;IAChC,+BAA+B,EAAE,mBAAmB,EAAE,CAAC;IACvD,+BAA+B,EAAE,UAAU,CACzC,OAAO,mCAAmC,CAC3C,CAAC;IACF,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAK9C,UAAU,EAAE,eAAe,EAAE,CAAC;CAC/B;AA2MD,UAAU,yBAAyB;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,UAAU,wBAAwB;IAChC,4BAA4B,EAAE,uBAAuB,EAAE,CAAC;IACxD,oCAAoC,EAAE,GAAG,CAAC,KAAK,EAAE,mBAAmB,EAAE,CAAC,CAAC;IACxE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;CAChD;AAED,iBAAe,kBAAkB,CAC/B,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,KAAK,EAAE,EACxB,EACE,IAAI,EACJ,OAAO,EACP,OAAe,EACf,KAAa,EACb,WAAW,EACX,UAAe,GAChB,GAAE,yBAA8B,GAChC,OAAO,CAAC,wBAAwB,CAAC,CA8InC;AAED,SAAS,kBAAkB,CAAC"}
+{"version":3,"file":"collectTextsByPage.d.ts","sourceRoot":"","sources":["../src/collectTextsByPage.ts"],"names":[],"mappings":"AA2BA,OAAO,EACL,mCAAmC,EAEpC,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAE,KAAK,EAAE,UAAU,EAAyB,MAAM,YAAY,CAAC;AAC3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAwCtD,UAAU,gBAAgB;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAE9B,cAAc,CAAC,EAAE,KAAK,CAAC;CACxB;AA+5BD,UAAU,uBAAuB;IAC/B,cAAc,EAAE,KAAK,CAAC;IACtB,WAAW,EAAE,gBAAgB,EAAE,CAAC;IAChC,+BAA+B,EAAE,mBAAmB,EAAE,CAAC;IACvD,+BAA+B,EAAE,UAAU,CACzC,OAAO,mCAAmC,CAC3C,CAAC;IACF,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAK9C,UAAU,EAAE,eAAe,EAAE,CAAC;CAC/B;AA2MD,UAAU,yBAAyB;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IAItB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,UAAU,wBAAwB;IAChC,4BAA4B,EAAE,uBAAuB,EAAE,CAAC;IACxD,oCAAoC,EAAE,GAAG,CAAC,KAAK,EAAE,mBAAmB,EAAE,CAAC,CAAC;IACxE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;CAChD;AAED,iBAAe,kBAAkB,CAC/B,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,KAAK,EAAE,EACxB,EACE,IAAI,EACJ,OAAO,EACP,OAAe,EACf,KAAa,EACb,WAAW,EACX,UAAe,EACf,MAAM,GACP,GAAE,yBAA8B,GAChC,OAAO,CAAC,wBAAwB,CAAC,CAgJnC;AAED,SAAS,kBAAkB,CAAC"}

package/lib/collectTextsByPage.js

@@ -285,7 +285,7 @@ function populateGlobalFontUsages(cached, accumulatedFontFaceDeclarations, text)
 // Trace fonts across the given pages. Uses a worker pool when the workload
 // justifies the thread-startup overhead; otherwise falls back to sequential
 // in-process tracing (required when a HeadlessBrowser is driving things).
-async function tracePages(pagesNeedingFullTrace, { headlessBrowser, concurrency, console, memoizedGetCssRulesByProperty, debug = false, }) {
+async function tracePages(pagesNeedingFullTrace, { headlessBrowser, concurrency, console, memoizedGetCssRulesByProperty, debug = false, signal, }) {
     const totalPages = pagesNeedingFullTrace.length;
     if (totalPages === 0)
         return;
@@ -310,10 +310,15 @@ async function tracePages(pagesNeedingFullTrace, { headlessBrowser, concurrency,
             await Promise.all(pagesNeedingFullTrace.map(async (pd) => {
                 const pageStart = debug ? Date.now() : 0;
                 try {
-                    pd.textByProps = (await pool.trace(pd.htmlOrSvgAsset.text || '', pd.stylesheetsWithPredicates));
+                    pd.textByProps = (await pool.trace(pd.htmlOrSvgAsset.text || '', pd.stylesheetsWithPredicates, { signal }));
                 }
                 catch (rawErr) {
                     const workerErr = rawErr;
+                    // If the caller cancelled, surface the abort instead of running
+                    // another (uncancellable) trace on the main thread.
+                    if (signal?.aborted) {
+                        throw workerErr;
+                    }
                     fallbackCount++;
                     if (console) {
                         console.warn(`Worker fontTracer failed for ${pd.htmlOrSvgAsset.url}, falling back to main thread: ${workerErr.message}`);
@@ -793,7 +798,7 @@ function flattenTracedPagesIntoGlobal(pageData, htmlOrSvgAssetTextsWithProps, gl
         });
     }
 }
-async function collectTextsByPage(assetGraph, htmlOrSvgAssets, { text, console, dynamic = false, debug = false, concurrency, chromeArgs = [], } = {}) {
+async function collectTextsByPage(assetGraph, htmlOrSvgAssets, { text, console, dynamic = false, debug = false, concurrency, chromeArgs = [], signal, } = {}) {
     const htmlOrSvgAssetTextsWithProps = [];
     const memoizedGetCssRulesByProperty = memoizeSync(getCssRulesByProperty);
     const fontFaceDeclarationsByHtmlOrSvgAsset = new Map();
@@ -837,6 +842,7 @@ async function collectTextsByPage(assetGraph, htmlOrSvgAssets, { text, console,
             console,
             memoizedGetCssRulesByProperty,
             debug,
+            signal,
         });
         subTimings['Full tracing'] = fullTracing.end();
         const planPhase = trackPhase('Fast-path planning');
@@ -850,6 +856,7 @@ async function collectTextsByPage(assetGraph, htmlOrSvgAssets, { text, console,
                 console,
                 memoizedGetCssRulesByProperty,
                 debug,
+                signal,
             });
             subTimings['Fallback tracing'] = fallbackTracing.end();
         }