@turntrout/subfont 1.5.0 → 1.5.1

package/lib/concurrencyLimit.js

@@ -4,7 +4,9 @@ const os = require('os');
 const WORKER_MEMORY_BYTES = 50 * 1024 * 1024; // 50 MB
 
 function getMaxConcurrency() {
-  return Math.max(1, Math.floor(os.totalmem() / WORKER_MEMORY_BYTES));
+  const byMemory = Math.floor(os.freemem() / WORKER_MEMORY_BYTES);
+  const byCpu = os.cpus().length * 4;
+  return Math.max(1, Math.min(byMemory, byCpu));
 }
 
 module.exports = { WORKER_MEMORY_BYTES, getMaxConcurrency };

package/lib/parseCommandLineOptions.js

@@ -111,7 +111,7 @@ module.exports = function parseCommandLineOptions(argv) {
       },
     })
     .options('concurrency', {
-      describe: `Maximum number of worker threads for parallel font tracing. Defaults to the number of CPU cores (max 8). Upper bound: ${maxConcurrency} (based on available memory)`,
+      describe: `Maximum number of worker threads for parallel font tracing. Defaults to the number of CPU cores (max 8). Upper bound: ${maxConcurrency} (based on free memory and CPU count)`,
       type: 'number',
     })
     .check((argv) => {
@@ -121,7 +121,7 @@ module.exports = function parseCommandLineOptions(argv) {
         }
         if (argv.concurrency > maxConcurrency) {
           throw new Error(
-            `--concurrency must not exceed ${maxConcurrency} (each worker uses ~50 MB; system has ${Math.round(os.totalmem() / (1024 * 1024 * 1024))} GB total)`
+            `--concurrency must not exceed ${maxConcurrency} (each worker uses ~50 MB; ${Math.round(os.freemem() / (1024 * 1024 * 1024))} GB free, ${os.cpus().length} CPUs)`
           );
         }
       }

package/lib/subfont.js

@@ -49,7 +49,7 @@ module.exports = async function subfont(
   const maxConcurrency = getMaxConcurrency();
   if (concurrency !== undefined && concurrency > maxConcurrency) {
     throw new UsageError(
-      `--concurrency must not exceed ${maxConcurrency} (each worker uses ~50 MB; system has ${Math.round(os.totalmem() / (1024 * 1024 * 1024))} GB total)`
+      `--concurrency must not exceed ${maxConcurrency} (each worker uses ~50 MB; ${Math.round(os.freemem() / (1024 * 1024 * 1024))} GB free, ${os.cpus().length} CPUs)`
     );
   }
 

package/lib/subsetGeneration.js

@@ -263,6 +263,7 @@ async function getSubsetsForFontUsage(
                 .catch((err) => {
                   err.asset = err.asset || fontAssetsByUrl.get(fontUrl);
                   assetGraph.warn(err);
+                  return null;
                 })
             );
           }

package/lib/wasmQueue.js

@@ -5,7 +5,10 @@
 let queue = Promise.resolve();
 
 function enqueue(fn) {
-  return (queue = queue.then(fn, fn));
+  return (queue = queue.then(
+    () => fn(),
+    () => fn()
+  ));
 }
 
 module.exports = enqueue;

package/package.json

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