@liiift-studio/sanity-font-manager 2.5.4 → 2.5.6

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@liiift-studio/sanity-font-manager",
-	"version": "2.5.4",
+	"version": "2.5.6",
 	"description": "Sanity Studio plugin — full font management suite with batch upload, format conversion, metadata extraction, CSS generation, collection/pair generation, and script variant support. Supports Sanity v3, v4, and v5.",
 	"license": "MIT",
 	"author": "Liiift Studio",

package/src/utils/parseFont.js

@@ -1,12 +1,14 @@
-// Async font parser — wraps lib-font event model in a Promise.
-// Decompressor globals (pako, unbrotli) are set by setupDecompressors.js
-// which is imported at the top of index.js before this module loads.
+// Async font parser — decompressor globals must be set before lib-font is imported
 
+import './setupDecompressors.js';
 import { Font } from 'lib-font';
 
 /** Maximum font file size accepted for parsing (50 MB) */
 const MAX_FONT_FILE_SIZE = 50 * 1024 * 1024;
 
+/** Parse timeout — prevents hanging if lib-font silently fails (30 seconds) */
+const PARSE_TIMEOUT_MS = 30000;
+
 /**
  * Parse a font file from an ArrayBuffer.
  * Returns a lib-font Font object with all tables accessible via font.opentype.tables.*.
@@ -14,7 +16,7 @@ const MAX_FONT_FILE_SIZE = 50 * 1024 * 1024;
  * @param {ArrayBuffer} buffer - Raw font file bytes
  * @param {string} filename - Original filename (used for format detection by lib-font)
  * @returns {Promise<import('lib-font').Font>} Parsed lib-font Font object
- * @throws {Error} If the file exceeds MAX_FONT_FILE_SIZE or parsing fails
+ * @throws {Error} If the file exceeds MAX_FONT_FILE_SIZE, parsing fails, or times out
  */
 export async function parseFont(buffer, filename) {
 	if (buffer.byteLength > MAX_FONT_FILE_SIZE) {
@@ -22,9 +24,33 @@ export async function parseFont(buffer, filename) {
 	}
 
 	return new Promise((resolve, reject) => {
+		let settled = false;
+
+		const settle = (fn) => (...args) => {
+			if (!settled) {
+				settled = true;
+				clearTimeout(timer);
+				fn(...args);
+			}
+		};
+
+		// Timeout guard — prevents infinite hang if lib-font fails silently
+		const timer = setTimeout(() => {
+			settle(reject)(new Error(`Parsing timed out for ${filename} (${PARSE_TIMEOUT_MS / 1000}s). The file may be corrupted or in an unsupported format.`));
+		}, PARSE_TIMEOUT_MS);
+
 		const font = new Font('font', { skipStyleSheet: true });
-		font.onload = (evt) => resolve(evt.detail.font);
-		font.onerror = (evt) => reject(new Error(evt.detail?.message || `Failed to parse ${filename}`));
-		font.fromDataBuffer(buffer, filename);
+		font.onload = settle((evt) => resolve(evt.detail.font));
+		font.onerror = settle((evt) => {
+			const msg = evt.detail?.message || `Failed to parse ${filename}`;
+			reject(new Error(msg));
+		});
+
+		try {
+			font.fromDataBuffer(buffer, filename);
+		} catch (err) {
+			// Catches synchronous throws from WOFF2 constructor when brotli is missing
+			settle(reject)(new Error(`${filename}: ${err.message}`));
+		}
 	});
 }

package/src/utils/setupDecompressors.js

@@ -1,10 +1,27 @@
 // Sets up globalThis.pako and globalThis.unbrotli for lib-font WOFF/WOFF2 decompression.
-// This module MUST be imported before lib-font is ever evaluated.
-// It runs synchronously at module evaluation time to set the globals.
+// Must be imported before lib-font.
 
 import pako from 'pako';
-import '../vendor/unbrotli.js';
 
+// Set pako for WOFF (zlib) decompression
 globalThis.pako = pako;
-// unbrotli.js is a UMD that sets globalThis.unbrotli as a side effect on evaluation.
-// The import above triggers that side effect.
+
+// Set unbrotli for WOFF2 (brotli) decompression
+// The vendor unbrotli.js UMD sets globalThis.unbrotli in browser contexts.
+// In Node/bundler contexts it exports via module.exports instead.
+// We use a side-effect import and then check if the global was set.
+import '../vendor/unbrotli.js';
+
+// If the UMD didn't set the global (CJS path in Node/bundler), try to require it
+if (!globalThis.unbrotli) {
+	try {
+		// In bundler context, the UMD file's module.exports is available
+		// tsup will resolve this at build time
+		const brotli = require('../vendor/unbrotli.js');
+		if (typeof brotli === 'function') {
+			globalThis.unbrotli = brotli;
+		}
+	} catch {
+		// Silently fail — WOFF2 parsing will error gracefully
+	}
+}