npm - @turntrout/subfont - Versions diffs - 1.10.7 → 1.11.0 - Mend

@turntrout/subfont 1.10.7 → 1.11.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (74) hide show

package/CHANGELOG.md +1 -1
package/README.md +21 -21
package/lib/FontTracerPool.d.ts +22 -27
package/lib/FontTracerPool.d.ts.map +1 -1
package/lib/FontTracerPool.js +51 -277
package/lib/FontTracerPool.js.map +1 -1
package/lib/HeadlessBrowser.d.ts.map +1 -1
package/lib/HeadlessBrowser.js +44 -28
package/lib/HeadlessBrowser.js.map +1 -1
package/lib/cli.js +14 -10
package/lib/cli.js.map +1 -1
package/lib/codepointMaps.d.ts.map +1 -1
package/lib/codepointMaps.js +0 -3
package/lib/codepointMaps.js.map +1 -1
package/lib/collectTextsByPage.d.ts +2 -1
package/lib/collectTextsByPage.d.ts.map +1 -1
package/lib/collectTextsByPage.js +15 -4
package/lib/collectTextsByPage.js.map +1 -1
package/lib/escapeJsStringLiteral.d.ts.map +1 -1
package/lib/escapeJsStringLiteral.js +12 -5
package/lib/escapeJsStringLiteral.js.map +1 -1
package/lib/extractVisibleText.d.ts.map +1 -1
package/lib/extractVisibleText.js +68 -147
package/lib/extractVisibleText.js.map +1 -1
package/lib/fontConverter.d.ts +5 -1
package/lib/fontConverter.d.ts.map +1 -1
package/lib/fontConverter.js +47 -122
package/lib/fontConverter.js.map +1 -1
package/lib/fontConverterWorker.d.ts +14 -1
package/lib/fontConverterWorker.d.ts.map +1 -1
package/lib/fontConverterWorker.js +16 -16
package/lib/fontConverterWorker.js.map +1 -1
package/lib/fontFaceHelpers.d.ts +3 -2
package/lib/fontFaceHelpers.d.ts.map +1 -1
package/lib/fontFaceHelpers.js +18 -17
package/lib/fontFaceHelpers.js.map +1 -1
package/lib/fontFeatureHelpers.d.ts.map +1 -1
package/lib/fontFeatureHelpers.js +5 -1
package/lib/fontFeatureHelpers.js.map +1 -1
package/lib/fontTracerWorker.d.ts +17 -4
package/lib/fontTracerWorker.d.ts.map +1 -1
package/lib/fontTracerWorker.js +31 -60
package/lib/fontTracerWorker.js.map +1 -1
package/lib/getCssRulesByProperty.d.ts.map +1 -1
package/lib/getCssRulesByProperty.js +11 -2
package/lib/getCssRulesByProperty.js.map +1 -1
package/lib/parseCommandLineOptions.d.ts.map +1 -1
package/lib/parseCommandLineOptions.js +12 -7
package/lib/parseCommandLineOptions.js.map +1 -1
package/lib/piscinaRunWithTimeout.d.ts +18 -0
package/lib/piscinaRunWithTimeout.d.ts.map +1 -0
package/lib/piscinaRunWithTimeout.js +78 -0
package/lib/piscinaRunWithTimeout.js.map +1 -0
package/lib/subfont.js.map +1 -1
package/lib/subsetFontWithGlyphs.d.ts +1 -0
package/lib/subsetFontWithGlyphs.d.ts.map +1 -1
package/lib/subsetFontWithGlyphs.js +4 -2
package/lib/subsetFontWithGlyphs.js.map +1 -1
package/lib/subsetFonts.d.ts +4 -3
package/lib/subsetFonts.d.ts.map +1 -1
package/lib/subsetFonts.js +19 -11
package/lib/subsetFonts.js.map +1 -1
package/lib/subsetGeneration.d.ts +1 -1
package/lib/subsetGeneration.d.ts.map +1 -1
package/lib/subsetGeneration.js +7 -7
package/lib/subsetGeneration.js.map +1 -1
package/lib/types/shared.d.ts +1 -0
package/lib/types/shared.d.ts.map +1 -1
package/lib/types/shared.js.map +1 -1
package/lib/unquote.d.ts +17 -0
package/lib/unquote.d.ts.map +1 -1
package/lib/unquote.js +63 -9
package/lib/unquote.js.map +1 -1
package/package.json +2 -2

package/lib/extractVisibleText.js CHANGED Viewed

@@ -1,179 +1,100 @@
 "use strict";
+const parse5_1 = require("parse5");
+// Tags whose textual contents (and attribute text) must NOT contribute to
+// the rendered character set we trace for font subsetting. `title` lives in
+// `<head>` for valid documents and is already skipped via the head subtree,
+// but parse5 auto-promotes a stray top-level `<title>` from fragment input
+// into the synthetic head — listing it explicitly makes the intent
+// (browser tab titles aren't rendered with web fonts) match either parse
+// outcome.
 const INVISIBLE_ELEMENTS = new Set([
     'script',
     'style',
     'svg',
     'template',
     'head',
+    'title',
     'noscript',
     'iframe',
     'object',
     'embed',
     'datalist',
 ]);
-// Build a regex that strips invisible element blocks (greedy, case-insensitive).
-// For void elements like <embed> there is no closing tag — just the opening
-// tag is stripped (which the tag-stripping regex below handles).
-const invisibleBlockTags = [...INVISIBLE_ELEMENTS].filter((t) => t !== 'embed');
-const invisibleBlockRe = new RegExp(`<(${invisibleBlockTags.join('|')})\\b[^>]*>[\\s\\S]*?<\\/\\1\\s*>`, 'gi');
-const commentRe = /<!--[\s\S]*?-->/g;
-// Match text-bearing attributes: alt="...", title='...', placeholder=..., etc.
-// Captures the attribute name (group 1) and the value (groups 2, 3, or 4 for
-// double-quoted, single-quoted, and unquoted respectively).
-// Negative lookbehind prevents matching data- prefixed attributes (e.g. data-alt).
-const attrRe = /(?<![-\w])(alt|title|placeholder|value|aria-label)\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s>]*))/gi;
-// Match <input ... type="hidden" ...> or <input ... type=hidden ...>
-// \b only after the unquoted alternative — quotes already delimit the value.
-const hiddenInputRe = /<input\b[^>]*?\btype\s*=\s*(?:"hidden"|'hidden'|hidden\b)[^>]*/gi;
-const tagRe = /<[^>]+>/g;
-// Named and numeric HTML entity decoder.  Covers the XML built-ins plus
-// typographic entities commonly found in blog/article content.  Rare
-// entities are left as-is (their literal characters still enter the
-// subset, so glyphs are never lost — just slightly overcounted).
-const namedEntities = {
-    amp: '&',
-    lt: '<',
-    gt: '>',
-    quot: '"',
-    apos: "'",
-    nbsp: ' ',
-    // Typographic quotes & dashes
-    ldquo: '“',
-    rdquo: '”',
-    lsquo: '‘',
-    rsquo: '’',
-    mdash: '—',
-    ndash: '–',
-    hellip: '…',
-    laquo: '«',
-    raquo: '»',
-    // Common symbols
-    bull: '•',
-    middot: '·',
-    copy: '©',
-    reg: '®',
-    trade: '™',
-    times: '×',
-    divide: '÷',
-    minus: '−',
-    plusmn: '±',
-    deg: '°',
-    micro: 'µ',
-    para: '¶',
-    sect: '§',
-    // Currency
-    euro: '€',
-    pound: '£',
-    yen: '¥',
-    cent: '¢',
-    // Arrows
-    larr: '←',
-    rarr: '→',
-    uarr: '↑',
-    darr: '↓',
-};
-const entityRe = /&(?:#x([0-9a-fA-F]+)|#(\d+)|([a-zA-Z]+));/g;
-// Numeric character references may name surrogate halves (U+D800–U+DFFF) or
-// values past U+10FFFF; both produce invalid scalar values that break
-// downstream iterators (harfbuzz, unicode-range emitter). Skip them.
-function codePointToScalar(cp, match) {
-    if (cp > 0x10ffff || (cp >= 0xd800 && cp <= 0xdfff)) {
-        return match;
-    }
-    return String.fromCodePoint(cp);
-}
-function decodeEntities(str) {
-    return str.replace(entityRe, (match, hex, dec, name) => {
-        if (hex) {
-            const cp = parseInt(hex, 16);
-            return Number.isNaN(cp) ? match : codePointToScalar(cp, match);
-        }
-        if (dec) {
-            const cp = parseInt(dec, 10);
-            return Number.isNaN(cp) ? match : codePointToScalar(cp, match);
-        }
-        if (name && namedEntities[name.toLowerCase()] !== undefined) {
-            return namedEntities[name.toLowerCase()];
+// Attributes whose values render as visible text in the page (typically
+// surfaced as tooltips, alternative text, or input value labels).
+const EXTRACTABLE_ATTRS = new Set([
+    'alt',
+    'title',
+    'placeholder',
+    'value',
+    'aria-label',
+]);
+function isHiddenInput(node) {
+    if (node.tagName !== 'input' || !node.attrs)
+        return false;
+    for (const attr of node.attrs) {
+        if (attr.name === 'type') {
+            return attr.value.toLowerCase() === 'hidden';
         }
-        return match;
-    });
+    }
+    return false;
 }
-// --- Pipeline stages ---
-// Each stage takes an HTML string and returns a transformed string or
-// extracted data. Ordering is enforced by the pipeline structure: stages
-// that must run on "clean" HTML (invisible blocks removed) receive the
-// output of stripInvisible, not the original HTML.
-function resetGlobalRegexes() {
-    invisibleBlockRe.lastIndex = 0;
-    hiddenInputRe.lastIndex = 0;
-    attrRe.lastIndex = 0;
+// parse5 maps invalid numeric character references to U+FFFD per spec, so
+// lone surrogates should never appear. This is a belt-and-suspenders pass:
+// downstream code (harfbuzz, unicode-range emitter) breaks on lone surrogates,
+// so any that slip through here must not propagate.
+const LONE_SURROGATE_RE = /[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g;
+function stripLoneSurrogates(text) {
+    return text.replace(LONE_SURROGATE_RE, '');
 }
-function collectHiddenInputValues(html) {
-    hiddenInputRe.lastIndex = 0;
-    const values = new Set();
-    let match;
-    while ((match = hiddenInputRe.exec(html)) !== null) {
-        const fragment = match[0];
-        let m;
-        const localAttrRe = /\bvalue\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s>]*))/gi;
-        while ((m = localAttrRe.exec(fragment)) !== null) {
-            const val = m[1] ?? m[2] ?? m[3];
-            if (val)
-                values.add(val);
+function walk(node, parts) {
+    if (node.nodeName === '#text') {
+        if (node.value)
+            parts.push(node.value);
+        return;
+    }
+    if (node.nodeName === '#comment' || node.nodeName === '#documentType') {
+        return;
+    }
+    if (node.tagName && INVISIBLE_ELEMENTS.has(node.tagName)) {
+        return;
+    }
+    if (node.attrs && node.attrs.length > 0) {
+        const hidden = isHiddenInput(node);
+        for (const attr of node.attrs) {
+            if (!EXTRACTABLE_ATTRS.has(attr.name))
+                continue;
+            if (hidden && attr.name === 'value')
+                continue;
+            if (attr.value)
+                parts.push(attr.value);
         }
     }
-    return values;
-}
-function stripInvisible(html) {
-    invisibleBlockRe.lastIndex = 0;
-    let text = html.replace(invisibleBlockRe, ' ');
-    text = text.replace(commentRe, ' ');
-    return text;
-}
-function extractAttributes(cleanedHtml, hiddenInputValues) {
-    attrRe.lastIndex = 0;
-    const parts = [];
-    let match;
-    while ((match = attrRe.exec(cleanedHtml)) !== null) {
-        const attrName = match[1].toLowerCase();
-        const val = match[2] ?? match[3] ?? match[4];
-        if (!val)
-            continue;
-        if (attrName === 'value' && hiddenInputValues.has(val))
-            continue;
-        parts.push(decodeEntities(val));
+    if (node.childNodes) {
+        for (const child of node.childNodes) {
+            walk(child, parts);
+        }
     }
-    return parts;
-}
-function stripTagsAndDecode(cleanedHtml) {
-    const text = cleanedHtml.replace(tagRe, ' ');
-    return decodeEntities(text);
 }
 /**
  * Fast extraction of visible text content from HTML source.
  * Used as a lightweight alternative to full font-tracer for pages
  * that share the same CSS configuration as an already-traced page.
  *
- * Pipeline:
- *   1. Collect hidden-input values (for exclusion)
- *   2. Strip invisible blocks + comments
- *   3. Extract text-bearing attributes from cleaned HTML
- *   4. Strip remaining tags and decode entities
+ * Uses parse5 (the WHATWG-spec HTML parser used by jsdom) to:
+ *   - skip invisible subtrees (script, style, svg, etc.) regardless of
+ *     attribute contents or nesting peculiarities
+ *   - decode every named or numeric HTML entity (~2200 entities incl.
+ *     accented Latin like &eacute; / &ouml; that hand-rolled tables miss)
+ *   - lowercase tag/attribute names so case variations don't leak text
  */
 function extractVisibleText(html) {
     if (!html)
         return '';
-    resetGlobalRegexes();
-    // Stage 1: identify hidden-input values (on original HTML, since
-    // hidden inputs are visible elements whose values we want to exclude)
-    const hiddenInputValues = collectHiddenInputValues(html);
-    // Stage 2: remove invisible content
-    const cleaned = stripInvisible(html);
-    // Stage 3: extract attributes from cleaned HTML (not original!)
-    const attrTexts = extractAttributes(cleaned, hiddenInputValues);
-    // Stage 4: strip tags and decode remaining text content
-    const bodyText = stripTagsAndDecode(cleaned);
-    return [...attrTexts, bodyText].join(' ');
+    const doc = (0, parse5_1.parse)(html);
+    const parts = [];
+    walk(doc, parts);
+    return stripLoneSurrogates(parts.join(' '));
 }
 extractVisibleText.INVISIBLE_ELEMENTS =
     INVISIBLE_ELEMENTS;

package/lib/extractVisibleText.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"extractVisibleText.js","sourceRoot":"","sources":["../src/extractVisibleText.ts"],"names":[],"mappings":";AAAA,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAS;IACzC,QAAQ;IACR,OAAO;IACP,KAAK;IACL,UAAU;IACV,MAAM;IACN,UAAU;IACV,QAAQ;IACR,QAAQ;IACR,OAAO;IACP,UAAU;CACX,CAAC,CAAC;~~AACH~~,~~iFAAiF~~;~~AACjF~~,~~4EAA4E~~;~~AAC5E~~,~~iEAAiE;AACjE,~~MAAM,~~kBAAkB~~,GAAG,~~CAAC~~,GAAG,~~kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC~~;~~AAChF~~,~~MAAM,gBAAgB,GAAG,IAAI,MAAM,CACjC,~~KAAK~~,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,kCAAkC,EACnE,IAAI,CACL,CAAC~~;~~AACF~~,~~MAAM,SAAS,GAAG,kBAAkB,CAAC~~;~~AAErC,+EAA+E;AAC/E~~,~~6EAA6E~~;~~AAC7E~~,~~4DAA4D~~;~~AAC5D~~,~~mFAAmF~~;~~AACnF~~,~~MAAM~~,~~MAAM,GACV,8FAA8F,~~CAAC;~~AACjG~~,~~qEAAqE;AACrE~~,~~6EAA6E;AAC7E,MAAM,~~aAAa,~~GACjB,kEAAkE,~~CAAC~~;AACrE~~,~~MAAM,KAAK,GAAG,UAAU,CAAC~~;~~AAEzB~~,~~wEAAwE;AACxE,qEAAqE;AACrE,oEAAoE;AACpE,iEAAiE;AACjE,MAAM,aAAa,GAA2B;IAC5C,GAAG,EAAE,GAAG;IACR,EAAE,EAAE,GAAG;IACP,EAAE,EAAE,GAAG;IACP,~~IAAI,~~EAAE,GAAG;IACT,~~IAAI,~~EAAE~~,~~GAAG;IACT~~,~~IAAI,EAAE,GAAG;IACT,8BAA8B;IAC9B,~~KAAK,~~EAAE~~,~~GAAG;IACV~~,~~KAAK~~,~~EAAE~~,~~GAAG;IACV~~,KAAK~~,EAAE,GAAG~~;~~IACV~~,~~KAAK~~,~~EAAE,GAAG;IACV,~~KAAK,~~EAAE,GAAG~~;~~IACV~~,KAAK,~~EAAE,GAAG;IACV,~~MAAM,~~EAAE~~,~~GAAG;IACX~~,~~KAAK~~,~~EAAE~~,~~GAAG;IACV,~~KAAK,EAAE,~~GAAG~~;~~IACV~~,~~iBAAiB;IACjB~~,IAAI,~~EAAE~~,~~GAAG;IACT,MAAM,EAAE,GAAG;IACX,~~IAAI,~~EAAE,GAAG;IACT,GAAG,EAAE,GAAG;IACR,~~KAAK,~~EAAE~~,~~GAAG;IACV,KAAK,~~EAAE,~~GAAG~~;~~IACV~~,~~MAAM~~,~~EAAE~~,~~GAAG;IACX~~,KAAK,~~EAAE~~,~~GAAG;IACV~~,~~MAAM,~~EAAE,~~GAAG;IACX,GAAG,EAAE,GAAG;IACR,~~KAAK,~~EAAE~~,~~GAAG~~;~~IACV~~,~~IAAI,EAAE,GAAG~~;~~IACT~~,~~IAAI,EAAE,GAAG~~;~~IACT~~,~~WAAW;IACX~~,~~IAAI,EAAE,GAAG;IACT,~~KAAK,~~EAAE,GAAG~~;~~IACV~~,~~GAAG,EAAE,GAAG~~;~~IACR~~,~~IAAI,EAAE,GAAG~~;~~IACT~~,~~SAAS~~;~~IACT,IAAI,EAAE,GAAG~~;~~IACT~~,~~IAAI,EAAE,GAAG~~;~~IACT~~,~~IAAI,EAAE,GAAG;IACT,IAAI,EAAE,GAAG;CACV,CAAC;AACF,~~MAAM,~~QAAQ~~,~~GAAG~~,~~4CAA4C~~,CAAC;~~AAC9D,4EAA4E;~~AAC5E,~~sEAAsE;AACtE,qEAAqE;AACrE,~~SAAS,~~iBAAiB~~,CAAC,~~EAAU,EAAE,KAAa~~;~~IAClD~~,~~IAAI~~,~~EAAE,GAAG,QAAQ,~~IAAI,CAAC,~~EAAE,IAAI,MAAM,IAAI,EAAE,IAAI,MAAM,CAAC,EAAE,CAAC;QACpD,~~OAAO,~~KAAK,~~CAAC~~;IACf~~,~~CAAC;IACD~~,~~OAAO~~,~~MAAM,CAAC,aAAa,CAAC,~~EAAE,CAAC,CAAC;~~AAClC~~,CAAC;~~AACD~~,SAAS,~~cAAc~~,CAAC,~~GAAW;IACjC~~,~~OAAO,GAAG,CAAC,OAAO,CAAC,QAAQ,~~EAAE,~~CAAC~~,~~KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,~~IAAI,~~EAAE,EAAE;QACrD,~~IAAI,~~GAAG,EAAE,~~CAAC~~;YACR~~,~~MAAM,EAAE,GAAG,~~QAAQ,~~CAAC~~,~~GAAG~~,EAAE,~~EAAE,~~CAAC~~,CAAC~~;~~YAC7B~~,~~OAAO~~,~~MAAM~~,CAAC,KAAK,~~CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,~~KAAK,CAAC,~~CAAC~~,CAAC,~~iBAAiB~~,CAAC,~~EAAE,EAAE,~~KAAK,CAAC,CAAC;~~QACjE~~,CAAC;~~QACD~~,IAAI,~~GAAG~~,~~EAAE,~~CAAC~~;YACR~~,~~MAAM,EAAE,GAAG,~~QAAQ,~~CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAC7B,OAAO,MAAM,CAAC,~~KAAK,~~CAAC~~,~~EAAE~~,~~CAAC~~,CAAC,~~CAAC~~,~~CAAC,~~KAAK,~~CAAC~~,~~CAAC,CAAC,iBAAiB,CAAC,~~EAAE,~~EAAE,KAAK,~~CAAC,~~CAAC~~;~~QACjE~~,CAAC;~~QACD~~,IAAI,IAAI,~~IAAI,aAAa,~~CAAC,~~IAAI,CAAC,WAAW,EAAE,CAAC,KAAK,SAAS,EAAE,CAAC;YAC5D,~~OAAO,~~aAAa,CAAC,~~IAAI,~~CAAC,WAAW,EAAE,CAAC,CAAC;QAC3C,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;AACL,CAAC;AAED,0BAA0B;AAC1B,sEAAsE;AACtE,yEAAyE;AACzE,uEAAuE;AACvE,mDAAmD;AAEnD,SAAS,~~kBAAkB~~;IACzB~~,~~gBAAgB,~~CAAC,~~SAAS,~~GAAG,CAAC,~~CAAC;IAC/B~~,~~aAAa,~~CAAC,~~SAAS~~,~~GAAG,~~CAAC,~~CAAC;IAC5B~~,~~MAAM,~~CAAC~~,SAAS,GAAG,CAAC,CAAC~~;~~AACvB~~,~~CAAC~~;~~AAED~~,~~SAAS,wBAAwB,~~CAAC~~,IAAY~~;~~IAC5C~~,~~aAAa,CAAC,SAAS,GAAG,CAAC,CAAC;IAC5B,MAAM,MAAM,GAAG,~~IAAI,~~GAAG,EAAU,CAAC;IACjC,~~IAAI,~~KAA6B,~~CAAC~~;IAClC~~,~~OAAO,CAAC,~~KAAK,~~GAAG,aAAa,CAAC,~~IAAI,~~CAAC,~~IAAI,CAAC,~~CAAC,~~KAAK,~~IAAI,EAAE,~~CAAC~~;QACnD~~,MAAM,~~QAAQ,~~GAAG,~~KAAK,~~CAAC,~~CAAC~~,CAAC~~,CAAC~~;~~QAC1B~~,~~IAAI~~,~~CAAyB,CAAC;QAC9B,~~MAAM,~~WAAW,~~GAAG,~~mDAAmD~~,CAAC~~;QACxE~~,~~OAAO,CAAC,CAAC,GAAG,WAAW,CAAC,~~IAAI,CAAC,~~QAAQ,~~CAAC,~~CAAC,~~KAAK,~~IAAI,EAAE,CAAC;YACjD,~~MAAM,~~GAAG~~,~~GAAG,CAAC,CAAC,CAAC,CAAC,~~IAAI,~~CAAC,CAAC,CAAC,CAAC,~~IAAI,CAAC,~~CAAC~~,~~CAAC~~,CAAC~~,CAAC~~;~~YACjC~~,IAAI,~~GAAG;gBAAE,MAAM,~~CAAC,~~GAAG~~,CAAC,GAAG,CAAC,~~CAAC;QAC3B~~,CAAC~~;IACH~~,~~CAAC;IACD~~,~~OAAO,MAAM,~~CAAC;~~AAChB~~,~~CAAC;AAED,~~SAAS~~,cAAc,CAAC,IAAY~~;~~IAClC~~,~~gBAAgB~~,~~CAAC~~,~~SAAS,GAAG,CAAC,CAAC;IAC/B,~~IAAI,IAAI,~~GAAG~~,IAAI,~~CAAC~~,OAAO~~,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC~~;~~IAC/C~~,~~IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,~~SAAS~~,EAAE,GAAG,CAAC,CAAC~~;~~IACpC~~,~~OAAO~~,IAAI,CAAC~~;AACd~~,~~CAAC;AAED,SAAS,iBAAiB,CACxB,WAAmB,EACnB,iBAA8B;IAE9B,MAAM,CAAC,SAAS,GAAG,CAAC,CAAC;IACrB,MAAM,~~KAAK~~,GAAa,EAAE,CAAC~~;~~IAC3B~~,~~IAAI,KAA6B,CAAC;IAClC,OAAO,CAAC,~~KAAK,~~GAAG,MAAM,~~CAAC,IAAI,CAAC,~~WAAW,CAAC,CAAC,KAAK,~~IAAI,~~EAAE,~~CAAC~~;QACnD~~,~~MAAM,QAAQ,GAAG,~~KAAK,CAAC,CAAC,CAAC,CAAC~~,WAAW,EAAE,CAAC~~;~~QACxC~~,~~MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,~~IAAI,~~KAAK,CAAC,CAAC,CAAC,~~IAAI,~~KAAK,~~CAAC,~~CAAC~~,~~CAAC~~,CAAC;~~QAC7C~~,~~IAAI~~,~~CAAC~~,~~GAAG;YAAE,SAAS;QACnB,IAAI,QAAQ,~~KAAK,~~OAAO,~~IAAI,~~iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,SAAS;QACjE,KAAK,CAAC,~~IAAI,CAAC,~~cAAc~~,~~CAAC~~,~~GAAG,~~CAAC~~,CAAC,CAAC~~;~~IAClC~~,~~CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,kBAAkB,CAAC,WAAmB;IAC7C,MAAM,~~IAAI,~~GAAG,WAAW,~~CAAC,~~OAAO,CAAC,~~KAAK,EAAE,~~GAAG~~,CAAC,CAAC;~~IAC7C~~,~~OAAO,cAAc,~~CAAC,~~IAAI,~~CAAC~~,CAAC~~;~~AAC9B~~,CAAC;AAED~~;;;;;;;;;;GAUG~~;AACH,SAAS,kBAAkB,CAAC,IAAY;IACtC,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,CAAC;IACrB,~~kBAAkB,EAAE,CAAC;IAErB,iEAAiE;IACjE,sEAAsE;IACtE,~~MAAM,~~iBAAiB~~,GAAG,~~wBAAwB~~,~~CAAC~~,IAAI,CAAC,CAAC;~~IAEzD~~,~~oCAAoC;IACpC,~~MAAM,~~OAAO~~,~~GAAG~~,~~cAAc~~,CAAC,IAAI,CAAC,~~CAAC;IAErC~~,~~gEAAgE;IAChE,MAAM,SAAS,GAAG,iBAAiB,CAAC,OAAO,~~EAAE,~~iBAAiB~~,CAAC,CAAC;~~IAEhE~~,~~wDAAwD;IACxD~~,~~MAAM~~,~~QAAQ,GAAG,kBAAkB,~~CAAC,~~OAAO~~,CAAC,~~CAAC;IAE7C~~,~~OAAO,~~CAAC,GAAG,~~SAAS,EAAE,QAAQ,~~CAAC,CAAC,~~IAAI,~~CAAC~~,GAAG,CAAC,CAAC~~;~~AAC5C~~,CAAC;AAOA,kBAAyC,CAAC,kBAAkB;IAC3D,kBAAkB,CAAC;AAErB,iBAAS,kBAAwC,CAAC"}
1	+ {"version":3,"file":"extractVisibleText.js","sourceRoot":"","sources":["../src/extractVisibleText.ts"],"names":[],"mappings":"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"}

package/lib/fontConverter.d.ts CHANGED Viewed

@@ -1,3 +1,7 @@
-export declare function convert(buffer: Buffer | Uint8Array, targetFormat: string, sourceFormat?: string): Promise<Buffer>;
+interface ConvertOptions {
+    signal?: AbortSignal;
+}
+export declare function convert(buffer: Buffer | Uint8Array, targetFormat: string, sourceFormat?: string, { signal }?: ConvertOptions): Promise<Buffer>;
 export declare function destroy(): Promise<void>;
+export {};
 //# sourceMappingURL=fontConverter.d.ts.map

package/lib/fontConverter.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"fontConverter.d.ts","sourceRoot":"","sources":["../src/fontConverter.ts"],"names":[],"mappings":"~~AA+IA~~,wBAAsB,OAAO,CAC3B,MAAM,EAAE,MAAM,GAAG,UAAU,EAC3B,YAAY,EAAE,MAAM,EACpB,YAAY,CAAC,EAAE,MAAM,~~GACpB~~,OAAO,CAAC,MAAM,CAAC,~~CAQjB~~;AAED,wBAAsB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,~~CAM7C~~"}
1	+ {"version":3,"file":"fontConverter.d.ts","sourceRoot":"","sources":["../src/fontConverter.ts"],"names":[],"mappings":"AAiBA,UAAU,cAAc;IACtB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAiCD,wBAAsB,OAAO,CAC3B,MAAM,EAAE,MAAM,GAAG,UAAU,EAC3B,YAAY,EAAE,MAAM,EACpB,YAAY,CAAC,EAAE,MAAM,EACrB,EAAE,MAAM,EAAE,GAAE,cAAmB,GAC9B,OAAO,CAAC,MAAM,CAAC,CAiBjB;AAED,wBAAsB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAQ7C"}

package/lib/fontConverter.js CHANGED Viewed

@@ -4,136 +4,61 @@ exports.convert = convert;
 exports.destroy = destroy;
 const pathModule = require("path");
 const os = require("os");
-const worker_threads_1 = require("worker_threads");
+const piscina_1 = require("piscina");
 const concurrencyLimit_1 = require("./concurrencyLimit");
+const piscinaRunWithTimeout_1 = require("./piscinaRunWithTimeout");
+/**
+ * Font format conversion routed through a piscina worker pool. Each
+ * worker thread loads its own wawoff2 WASM instance, enabling safe
+ * parallel woff2 compression — wawoff2's shared WASM instance corrupts
+ * memory under concurrent main-thread calls.
+ */
 const workerPath = pathModule.join(__dirname, 'fontConverterWorker.js');
 const CONVERT_TIMEOUT_MS = 120_000;
 const POOL_SIZE = Math.max(1, Math.min(os.cpus().length, concurrencyLimit_1.MAX_POOL_SIZE));
-// Worker lifecycle: Created → Idle → Busy → Idle | Discarded
-// Only Idle workers may be handed to callers. Discarded workers are
-// terminated and never reused. This structure makes it impossible
-// to accidentally reuse a worker that encountered an error.
-const _idle = [];
-const _alive = new Set();
-let _activeCount = 0;
-const _queue = [];
-function acquireSlot() {
-    if (_activeCount < POOL_SIZE) {
-        _activeCount++;
-        return Promise.resolve();
-    }
-    return new Promise((resolve) => {
-        _queue.push(() => {
-            _activeCount++;
-            resolve();
+let _pool = null;
+// Held while `destroy()` is awaiting the underlying piscina teardown.
+// Concurrent `convert()` calls await this before constructing a fresh
+// pool — otherwise a `convert()` that lands between `_pool = null` and
+// `pool.destroy()` would spin up a second pool alongside the dying one.
+let _destroyPromise = null;
+function getPool() {
+    if (_pool === null) {
+        _pool = new piscina_1.Piscina({
+            filename: workerPath,
+            // Cap concurrency at MAX_POOL_SIZE (shared with the tracer pool).
+            // Spin workers up lazily so a process that never converts woff2 pays
+            // nothing.
+            minThreads: 0,
+            maxThreads: POOL_SIZE,
+            concurrentTasksPerWorker: 1,
+            // Reclaim WASM-bearing workers after a short idle period; long-lived
+            // wawoff2 instances accrete memory over the run.
+            idleTimeout: 30_000,
         });
-    });
-}
-function releaseSlot() {
-    _activeCount--;
-    const next = _queue.shift();
-    if (next)
-        next();
-}
-function createWorker() {
-    const worker = new worker_threads_1.Worker(workerPath);
-    worker.unref();
-    _alive.add(worker);
-    worker.on('exit', () => {
-        _alive.delete(worker);
-        const idx = _idle.indexOf(worker);
-        if (idx !== -1)
-            _idle.splice(idx, 1);
-    });
-    return worker;
-}
-function returnToIdle(worker) {
-    _idle.push(worker);
-}
-function discard(worker) {
-    _alive.delete(worker);
-    const idx = _idle.indexOf(worker);
-    if (idx !== -1)
-        _idle.splice(idx, 1);
-    worker.terminate().catch(() => { });
-}
-function doConvert(worker, buffer, targetFormat, sourceFormat) {
-    return new Promise((resolve, reject) => {
-        let settled = false;
-        const timer = setTimeout(() => {
-            if (settled)
-                return;
-            settled = true;
-            cleanup();
-            discard(worker);
-            reject(new Error(`Font conversion to ${targetFormat} timed out after ${CONVERT_TIMEOUT_MS}ms`));
-        }, CONVERT_TIMEOUT_MS);
-        timer.unref();
-        const cleanup = () => {
-            clearTimeout(timer);
-            worker.off('message', onMessage);
-            worker.off('error', onError);
-            worker.off('exit', onExit);
-        };
-        const onMessage = (msg) => {
-            if (settled)
-                return;
-            settled = true;
-            cleanup();
-            if (msg.type === 'result' && msg.buffer) {
-                returnToIdle(worker);
-                resolve(Buffer.from(msg.buffer));
-            }
-            else {
-                discard(worker);
-                reject(new Error(msg.error || `Font conversion to ${targetFormat} failed`));
-            }
-        };
-        const onError = (err) => {
-            if (settled)
-                return;
-            settled = true;
-            cleanup();
-            discard(worker);
-            reject(err);
-        };
-        const onExit = (code) => {
-            if (settled)
-                return;
-            settled = true;
-            cleanup();
-            discard(worker);
-            reject(new Error(`Font converter worker exited unexpectedly with code ${code}`));
-        };
-        worker.on('message', onMessage);
-        worker.on('error', onError);
-        worker.on('exit', onExit);
-        try {
-            worker.postMessage({ buffer, targetFormat, sourceFormat });
-        }
-        catch (err) {
-            settled = true;
-            cleanup();
-            discard(worker);
-            reject(err);
-        }
-    });
-}
-async function convert(buffer, targetFormat, sourceFormat) {
-    await acquireSlot();
-    try {
-        const worker = _idle.pop() ?? createWorker();
-        return await doConvert(worker, buffer, targetFormat, sourceFormat);
     }
-    finally {
-        releaseSlot();
+    return _pool;
+}
+async function convert(buffer, targetFormat, sourceFormat, { signal } = {}) {
+    // If a destroy is in flight, wait it out so we don't spawn a new pool
+    // alongside the dying one.
+    if (_destroyPromise) {
+        await _destroyPromise;
     }
+    const task = { buffer, targetFormat, sourceFormat };
+    const result = await (0, piscinaRunWithTimeout_1.runWithTimeoutAndSignal)(getPool(), task, signal, CONVERT_TIMEOUT_MS, (ms) => `Font conversion to ${targetFormat} timed out after ${ms}ms`);
+    // Structured clone strips the Buffer prototype on its way back; wrap so
+    // callers (subsetFonts, sfntCache) receive a Buffer as advertised.
+    return Buffer.from(result);
 }
 async function destroy() {
-    _queue.length = 0;
-    _idle.length = 0;
-    const workers = Array.from(_alive);
-    _alive.clear();
-    await Promise.all(workers.map((w) => w.terminate()));
+    if (_pool === null)
+        return;
+    const pool = _pool;
+    _pool = null;
+    _destroyPromise = pool.destroy().finally(() => {
+        _destroyPromise = null;
+    });
+    await _destroyPromise;
 }
 //# sourceMappingURL=fontConverter.js.map

package/lib/fontConverter.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"fontConverter.js","sourceRoot":"","sources":["../src/fontConverter.ts"],"names":[],"mappings":";;~~AA+IA~~,~~0BAYC~~;AAED,~~0BAMC~~;~~AAnKD~~,mCAAoC;AACpC,yBAA0B;AAC1B,~~mDAAwC~~;~~AACxC~~,yDAAmD;~~AAEnD~~,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,wBAAwB,CAAC,CAAC;AACxE,MAAM,kBAAkB,GAAG,OAAO,CAAC;AACnC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,gCAAa,CAAC,CAAC,CAAC;~~AAQzE~~,~~6DAA6D;AAC7D~~,~~oEAAoE;AACpE,kEAAkE;AAClE,4DAA4D;AAC5D,MAAM,~~KAAK,~~GAAa~~,~~EAAE,CAAC;AAC3B,MAAM,MAAM,GAAG,~~IAAI,~~GAAG,EAAU,~~CAAC;~~AAEjC~~,~~IAAI,YAAY,GAAG,CAAC,CAAC~~;~~AACrB~~,~~MAAM,MAAM,GAAsB,EAAE,CAAC~~;~~AAErC~~,~~SAAS,WAAW~~;~~IAClB~~,~~IAAI,YAAY,GAAG,SAAS,EAAE,CAAC~~;~~QAC7B~~,~~YAAY,EAAE,CAAC;QACf,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IACD,OAAO,~~IAAI,~~OAAO~~,~~CAAO~~,~~CAAC,OAAO,EAAE,EAAE;QACnC,MAAM,CAAC,~~IAAI,CAAC~~,GAAG,EAAE~~;~~YACf~~,~~YAAY~~,~~EAAE,CAAC;YACf,~~OAAO~~,EAAE,CAAC~~;~~QACZ~~,~~CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,WAAW;IAClB,YAAY,EAAE,CAAC;IACf,MAAM,~~IAAI,~~GAAG~~,~~MAAM,CAAC,~~KAAK,~~EAAE,CAAC;IAC5B,~~IAAI,~~IAAI;QAAE,IAAI,~~EAAE,CAAC;~~AACnB~~,~~CAAC;AAED~~,~~SAAS,YAAY;IACnB,MAAM,MAAM,~~GAAG,IAAI,~~uBAAM~~,CAAC~~,UAAU,CAAC,CAAC~~;~~IACtC~~,~~MAAM~~,~~CAAC,KAAK,~~EAAE,~~CAAC~~;~~IACf~~,~~MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC~~;~~IACnB~~,~~MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE~~;~~QACrB~~,~~MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC~~;~~QACtB~~,~~MAAM~~,~~GAAG~~,~~GAAG,KAAK,~~CAAC~~,OAAO,CAAC,MAAM,CAAC,CAAC~~;~~QAClC~~,~~IAAI~~,~~GAAG~~,~~KAAK,CAAC,CAAC~~;~~YAAE~~,~~KAAK~~,~~CAAC,MAAM,CAAC,GAAG,~~EAAE,CAAC~~,CAAC,CAAC~~;~~IACvC~~,~~CAAC,CAAC,CAAC~~;~~IACH~~,~~OAAO,MAAM,CAAC~~;~~AAChB~~,~~CAAC;AAED~~,~~SAAS~~,~~YAAY,CAAC,MAAc;IAClC,KAAK,CAAC,IAAI,CAAC,~~MAAM~~,CAAC,CAAC~~;~~AACrB~~,CAAC~~;AAED~~,~~SAAS,OAAO,~~CAAC~~,MAAc~~;~~IAC7B~~,~~MAAM,~~CAAC~~,MAAM,CAAC,MAAM,CAAC,CAAC~~;~~IACtB~~,~~MAAM,GAAG,GAAG,KAAK,CAAC,~~OAAO,~~CAAC,MAAM,CAAC,CAAC;IAClC,IAAI,GAAG,~~KAAK,CAAC~~,CAAC~~;~~QAAE~~,~~KAAK,~~CAAC~~,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC~~;~~IACrC~~,~~MAAM,CAAC,SAAS,EAAE,CAAC,~~KAAK,~~CAAC~~,~~GAAG~~,~~EAAE~~,~~GAAE,CAAC,CAAC,CAAC;AACrC,CAAC;AAED,SAAS,SAAS,CAChB,MAAc,EACd,~~MAA2B,EAC3B,YAAoB,EACpB,~~YAAgC;IAEhC~~,~~OAAO~~,~~IAAI,OAAO,CAAS,CAAC,OAAO,~~EAAE,MAAM,~~EAAE~~,EAAE;~~QAC7C~~,~~IAAI,OAAO,GAAG,KAAK,CAAC~~;~~QAEpB~~,~~MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE~~;~~YAC5B~~,IAAI,~~OAAO;gBAAE~~,~~OAAO;YACpB,OAAO,GAAG,IAAI,CAAC;YACf,OAAO,~~EAAE,CAAC;~~YACV~~,~~OAAO,CAAC,~~MAAM,~~CAAC~~,CAAC;~~YAChB~~,~~MAAM,CACJ,IAAI,KAAK,CACP,sBAAsB,YAAY,oBAAoB,kBAAkB,IAAI,CAC7E,CACF,~~CAAC;~~QACJ~~,~~CAAC,EAAE,kBAAkB,CAAC,CAAC;QACvB,KAAK,CAAC,KAAK,EAAE,CAAC;QAEd,~~MAAM,OAAO,GAAG,GAAG,EAAE;YACnB,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;YACjC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC7B,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC7B,CAAC,CAAC;QAEF,MAAM,SAAS,GAAG,CAAC,GAAkB,EAAE,EAAE;YACvC,IAAI,~~OAAO;gBAAE~~,~~OAAO;YACpB,OAAO,GAAG,IAAI,CAAC;YACf,OAAO,~~EAAE,~~CAAC;YACV,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,~~MAAM,EAAE,~~CAAC;gBACxC,~~YAAY,~~CAAC~~,~~MAAM,CAAC,CAAC;gBACrB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;YACnC,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,MAAM,CAAC,CAAC;gBAChB,MAAM,CACJ,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,IAAI,sBAAsB,~~YAAY,~~SAAS,CAAC,CACpE,CAAC;YACJ,CAAC;QACH,CAAC,CAAC;QAEF,MAAM,OAAO,GAAG,CAAC,GAAU,~~EAAE,~~EAAE;YAC7B,IAAI,OAAO;gBAAE,OAAO;YACpB,OAAO,GAAG,IAAI,~~CAAC;~~YACf~~,~~OAAO,EAAE,CAAC;YACV,OAAO,CAAC,~~MAAM,~~CAAC,CAAC;YAChB,~~MAAM,~~CAAC,~~GAAG,~~CAAC,CAAC;QACd,CAAC,CAAC;QAEF,~~MAAM,~~MAAM~~,~~GAAG~~,~~CAAC,IAAY,EAAE,EAAE;YAC9B,IAAI,~~OAAO~~;gBAAE~~,~~OAAO;YACpB,OAAO,GAAG,IAAI,CAAC;YACf,OAAO,~~EAAE,~~CAAC;YACV~~,~~OAAO,CAAC,MAAM,CAAC,CAAC;YAChB,MAAM,CACJ,~~IAAI,~~KAAK~~,~~CAAC,uDAAuD,IAAI,EAAE,CAAC,CACzE,CAAC;QACJ,CAAC,CAAC;QAEF,~~MAAM,~~CAAC~~,~~EAAE~~,~~CAAC~~,~~SAAS,EAAE,SAAS,~~CAAC,~~CAAC;QAChC,MAAM,CAAC,~~EAAE,~~CAAC,OAAO,~~EAAE,~~OAAO,CAAC,CAAC;QAC5B,MAAM,CAAC,~~EAAE,CAAC,~~MAAM~~,~~EAAE,MAAM,CAAC,CAAC;QAC1B,IAAI,CAAC;YACH,MAAM,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,~~YAAY,~~EAAE~~,~~YAAY,~~EAAE,~~CAAC~~,~~CAAC;QAC7D~~,CAAC;~~QAAC~~,~~OAAO,GAAG,EAAE,CAAC~~;~~YACb~~,~~OAAO,GAAG,IAAI,CAAC~~;~~YACf~~,OAAO,~~EAAE~~,CAAC~~;YACV~~,~~OAAO~~,CAAC,MAAM,CAAC,CAAC;~~YAChB~~,~~MAAM,~~CAAC~~,GAAG,CAAC,CAAC~~;~~QACd,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;~~AAEM,KAAK,UAAU,OAAO~~,CAC3B,MAA2B,EAC3B,YAAoB,EACpB,YAAqB~~;~~IAErB~~,~~MAAM,WAAW,EAAE,CAAC;IACpB,~~IAAI,~~CAAC;QACH~~,~~MAAM,MAAM,GAAG,~~KAAK,~~CAAC,GAAG,EAAE,~~IAAI~~,YAAY,EAAE,CAAC~~;~~QAC7C~~,OAAO~~,MAAM,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC~~;~~IACrE,CAAC;YAAS,CAAC;QACT,WAAW,EAAE,CAAC;IAChB,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,OAAO;~~IAC3B,MAAM,~~CAAC~~,~~MAAM,~~GAAG,~~CAAC~~,CAAC;~~IAClB~~,KAAK,~~CAAC,MAAM,~~GAAG,~~CAAC~~,CAAC;~~IACjB~~,~~MAAM~~,~~OAAO,~~GAAG,~~KAAK,CAAC,~~IAAI,CAAC,~~MAAM~~,~~CAAC,CAAC;IACnC,MAAM,CAAC,KAAK,~~EAAE,CAAC~~;IACf~~,~~MAAM,~~OAAO,CAAC,GAAG,~~CAAC~~,~~OAAO~~,~~CAAC,~~GAAG,~~CAAC~~,CAAC,CAAC,~~EAAE,EAAE,~~CAAC,CAAC,~~CAAC~~,~~SAAS~~,~~EAAE,~~CAAC~~,CAAC,CAAC~~;~~AACvD~~,CAAC"}
1	+ {"version":3,"file":"fontConverter.js","sourceRoot":"","sources":["../src/fontConverter.ts"],"names":[],"mappings":";;AAoDA,0BAsBC;AAED,0BAQC;AApFD,mCAAoC;AACpC,yBAA0B;AAC1B,qCAAkC;AAClC,yDAAmD;AACnD,mEAAkE;AAElE;;;;;GAKG;AAEH,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,wBAAwB,CAAC,CAAC;AACxE,MAAM,kBAAkB,GAAG,OAAO,CAAC;AACnC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,gCAAa,CAAC,CAAC,CAAC;AAYzE,IAAI,KAAK,GAAmB,IAAI,CAAC;AACjC,sEAAsE;AACtE,sEAAsE;AACtE,uEAAuE;AACvE,wEAAwE;AACxE,IAAI,eAAe,GAAyB,IAAI,CAAC;AAEjD,SAAS,OAAO;IACd,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACnB,KAAK,GAAG,IAAI,iBAAO,CAAC;YAClB,QAAQ,EAAE,UAAU;YACpB,kEAAkE;YAClE,qEAAqE;YACrE,WAAW;YACX,UAAU,EAAE,CAAC;YACb,UAAU,EAAE,SAAS;YACrB,wBAAwB,EAAE,CAAC;YAC3B,qEAAqE;YACrE,iDAAiD;YACjD,WAAW,EAAE,MAAM;SACpB,CAAC,CAAC;IACL,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAEM,KAAK,UAAU,OAAO,CAC3B,MAA2B,EAC3B,YAAoB,EACpB,YAAqB,EACrB,EAAE,MAAM,KAAqB,EAAE;IAE/B,sEAAsE;IACtE,2BAA2B;IAC3B,IAAI,eAAe,EAAE,CAAC;QACpB,MAAM,eAAe,CAAC;IACxB,CAAC;IACD,MAAM,IAAI,GAAgB,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC;IACjE,MAAM,MAAM,GAAG,MAAM,IAAA,+CAAuB,EAC1C,OAAO,EAAE,EACT,IAAI,EACJ,MAAM,EACN,kBAAkB,EAClB,CAAC,EAAE,EAAE,EAAE,CAAC,sBAAsB,YAAY,oBAAoB,EAAE,IAAI,CACrE,CAAC;IACF,wEAAwE;IACxE,mEAAmE;IACnE,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC7B,CAAC;AAEM,KAAK,UAAU,OAAO;IAC3B,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO;IAC3B,MAAM,IAAI,GAAG,KAAK,CAAC;IACnB,KAAK,GAAG,IAAI,CAAC;IACb,eAAe,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE;QAC5C,eAAe,GAAG,IAAI,CAAC;IACzB,CAAC,CAAC,CAAC;IACH,MAAM,eAAe,CAAC;AACxB,CAAC"}

package/lib/fontConverterWorker.d.ts CHANGED Viewed

@@ -1,2 +1,15 @@
-export {};
+/**
+ * Piscina worker handler for font format conversion.
+ *
+ * Each worker thread loads its own wawoff2 WASM instance via fontverter,
+ * enabling safe parallel woff2 compression — wawoff2's shared WASM
+ * instance corrupts memory under concurrent use within a single thread.
+ */
+interface ConvertTask {
+    buffer: Uint8Array | Buffer;
+    targetFormat: string;
+    sourceFormat?: string;
+}
+declare function convertTask(task: ConvertTask): Promise<Uint8Array>;
+export = convertTask;
 //# sourceMappingURL=fontConverterWorker.d.ts.map

package/lib/fontConverterWorker.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"fontConverterWorker.d.ts","sourceRoot":"","sources":["../src/fontConverterWorker.ts"],"names":[],"mappings":""}
1	+ {"version":3,"file":"fontConverterWorker.d.ts","sourceRoot":"","sources":["../src/fontConverterWorker.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,UAAU,WAAW;IACnB,MAAM,EAAE,UAAU,GAAG,MAAM,CAAC;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,iBAAe,WAAW,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,CAQjE;AAED,SAAS,WAAW,CAAC"}

package/lib/fontConverterWorker.js CHANGED Viewed

@@ -1,4 +1,11 @@
 "use strict";
+/**
+ * Piscina worker handler for font format conversion.
+ *
+ * Each worker thread loads its own wawoff2 WASM instance via fontverter,
+ * enabling safe parallel woff2 compression — wawoff2's shared WASM
+ * instance corrupts memory under concurrent use within a single thread.
+ */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -32,22 +39,15 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-Object.defineProperty(exports, "__esModule", { value: true });
-const worker_threads_1 = require("worker_threads");
 const fontverter = __importStar(require("fontverter"));
-if (!worker_threads_1.parentPort) {
-    throw new Error('fontConverterWorker must be run as a worker thread');
+async function convertTask(task) {
+    // Structured clone delivers Uint8Array on the worker side; wrap so
+    // fontverter sees the Buffer it expects. The host wraps the response
+    // in Buffer.from on its end — wrapping here would duplicate work
+    // since structured clone copies bytes and strips the Buffer prototype
+    // on every transfer.
+    const buffer = Buffer.from(task.buffer);
+    return await fontverter.convert(buffer, task.targetFormat, task.sourceFormat);
 }
-const port = worker_threads_1.parentPort;
-port.on('message', async (msg) => {
-    try {
-        const buffer = Buffer.from(msg.buffer);
-        const result = await fontverter.convert(buffer, msg.targetFormat, msg.sourceFormat);
-        port.postMessage({ type: 'result', buffer: result });
-    }
-    catch (rawErr) {
-        const err = rawErr;
-        port.postMessage({ type: 'error', error: err.message });
-    }
-});
+module.exports = convertTask;
 //# sourceMappingURL=fontConverterWorker.js.map

package/lib/fontConverterWorker.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"fontConverterWorker.js","sourceRoot":"","sources":["../src/fontConverterWorker.ts"],"names":[],"mappings":"~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;~~AAAA,~~mDAA4C;AAC5C,~~uDAAyC;AAQzC,~~IAAI,CAAC,2BAAU,EAAE,CAAC;IAChB,MAAM,IAAI,~~KAAK,~~CAAC~~,~~oDAAoD~~,CAAC,~~CAAC~~;~~AACxE~~,~~CAAC~~;~~AAED~~,~~MAAM~~,~~IAAI,GAAG,2BAAU,CAAC~~;~~AAExB~~,~~IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,GAAmB,EAAE,EAAE~~;~~IAC/C~~,~~IAAI,CAAC~~;~~QACH~~,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,~~GAAG~~,CAAC,MAAM,CAAC,CAAC;~~QACvC~~,~~MAAM~~,MAAM,~~GAAG,MAAM,~~UAAU,CAAC,OAAO,~~CACrC,MAAM,EACN,GAAG,~~CAAC,~~YAAY,EAChB,GAAG,CAAC,YAAY,CACjB,CAAC;QACF,IAAI,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,~~MAAM,EAAE,~~MAAM,EAAE,CAAC,CAAC;IACvD,CAAC;IAAC,OAAO,MAAM,EAAE,CAAC;QAChB,MAAM,GAAG,GAAG,MAAe,CAAC;QAC5B,~~IAAI,CAAC,~~WAAW~~,~~CAAC,~~EAAE,IAAI,~~EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,~~CAAC,~~OAAO~~,~~EAAE,~~CAAC,CAAC;~~IAC1D~~,CAAC;~~AACH~~,~~CAAC~~,~~CAAC~~,CAAC"}
1	+ {"version":3,"file":"fontConverterWorker.js","sourceRoot":"","sources":["../src/fontConverterWorker.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uDAAyC;AAQzC,KAAK,UAAU,WAAW,CAAC,IAAiB;IAC1C,mEAAmE;IACnE,qEAAqE;IACrE,iEAAiE;IACjE,sEAAsE;IACtE,qBAAqB;IACrB,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACxC,OAAO,MAAM,UAAU,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;AAChF,CAAC;AAED,iBAAS,WAAW,CAAC"}

package/lib/fontFaceHelpers.d.ts CHANGED Viewed

@@ -56,8 +56,9 @@ export declare function cssAssetIsEmpty(cssAsset: {
         }>;
     };
 }): boolean;
-export declare function parseFontWeightRange(str: string | undefined): [number, number];
-export declare function parseFontStretchRange(str: string | undefined): [number, number];
+export type RangeWarnFn = (err: Error) => void;
+export declare function parseFontWeightRange(str: string | undefined, warn?: RangeWarnFn): [number, number];
+export declare function parseFontStretchRange(str: string | undefined, warn?: RangeWarnFn): [number, number];
 export declare function uniqueChars(text: string): string;
 export declare function uniqueCharsFromArray(texts: string[]): string;
 export declare function hashHexPrefix(stringOrBuffer: string | Buffer | Uint8Array): string;

package/lib/fontFaceHelpers.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"fontFaceHelpers.d.ts","sourceRoot":"","sources":["../src/fontFaceHelpers.ts"],"names":[],"mappings":"AAaA,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,GAAG,GAAG,GAAG,GACf,MAAM,CAKR;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAMxD;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAQnD;AAED,UAAU,mBAAmB;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,EAAE,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;CACpC;AAED,wBAAgB,mBAAmB,CACjC,uBAAuB,GAAE,mBAAmB,EAAO,GAClD,MAAM,GAAG,SAAS,CAkCpB;AAED,UAAU,oBAAoB;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,eAAe;IACvB,QAAQ,IAAI,MAAM,CAAC;CACpB;AAID,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,eAAe,EACrB,SAAS,EAAE,oBAAoB,EAAE,GAChC,MAAM,CAoBR;AAiCD,UAAU,aAAa;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IACvC,UAAU,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IACpD,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC3B;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,aAAa,GAAG,MAAM,CAgDxE;AAED,UAAU,iBAAiB;IAIzB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,KAAK,CAAC;QACf,EAAE,EAAE;YAAE,GAAG,EAAE,MAAM,CAAA;SAAE,CAAC;QACpB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAI7B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,wBAAgB,2BAA2B,CACzC,UAAU,EAAE,aAAa,EAAE,EAC3B,+BAA+B,EAAE,iBAAiB,EAAE,GACnD,MAAM,CAmDR;AAED,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,aAAa,EAAE,GAAG,MAAM,CAK1E;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAapD;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE;IACxC,SAAS,EAAE;QAAE,KAAK,CAAC,EAAE,KAAK,CAAC;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,IAAI,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;KAAE,CAAC;CAC/D,GAAG,OAAO,CAMV;AAED,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,MAAM,GAAG,SAAS,~~GACtB~~,CAAC,MAAM,EAAE,MAAM,CAAC,~~CAiBlB~~;AAED,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,MAAM,GAAG,SAAS,~~GACtB~~,CAAC,MAAM,EAAE,MAAM,CAAC,~~CAoBlB~~;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAQ5D;AAED,wBAAgB,aAAa,CAC3B,cAAc,EAAE,MAAM,GAAG,MAAM,GAAG,UAAU,GAC3C,MAAM,CAMR"}
1	+ {"version":3,"file":"fontFaceHelpers.d.ts","sourceRoot":"","sources":["../src/fontFaceHelpers.ts"],"names":[],"mappings":"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"}