fontmin-rs 0.2.0 → 0.3.0

package/bin/cache-lock.mjs

@@ -1,5 +1,5 @@
 import { randomUUID } from 'node:crypto'
-import { mkdir, open, readFile, rm, stat } from 'node:fs/promises'
+import { mkdir, open, readFile, readdir, rm, stat } from 'node:fs/promises'
 import { join } from 'node:path'
 
 const CACHE_LOCK_RETRY_COUNT = 200
@@ -8,6 +8,7 @@ const CACHE_LOCK_STALE_MS = 5 * 60_000
 export async function withCacheLock(cacheRoot, operation) {
   const lockPath = join(cacheRoot, '.write.lock')
   const owner = `${process.pid}:${randomUUID()}`
+  let recoveredLock = false
 
   await mkdir(cacheRoot, { recursive: true })
 
@@ -24,7 +25,8 @@ export async function withCacheLock(cacheRoot, operation) {
       const staleOwner = await readStaleLockOwner(lockPath)
 
       if (staleOwner !== undefined) {
-        await removeLockIfOwned(lockPath, staleOwner)
+        recoveredLock =
+          (await removeLockIfOwned(lockPath, staleOwner)) || recoveredLock
         continue
       }
 
@@ -40,6 +42,16 @@ export async function withCacheLock(cacheRoot, operation) {
       throw error
     }
 
+    if (recoveredLock) {
+      try {
+        await cleanupCacheTemporaryFiles(cacheRoot)
+      } catch (error) {
+        await lock.close()
+        await removeLockIfOwned(lockPath, owner)
+        throw error
+      }
+    }
+
     try {
       return await operation()
     } finally {
@@ -58,7 +70,10 @@ async function readStaleLockOwner(path) {
       stat(path),
     ])
 
-    return Date.now() - lockStat.mtimeMs > CACHE_LOCK_STALE_MS
+    const ownerPid = parseOwnerPid(owner)
+
+    return (ownerPid !== undefined && !isProcessAlive(ownerPid)) ||
+      Date.now() - lockStat.mtimeMs > CACHE_LOCK_STALE_MS
       ? owner
       : undefined
   } catch (error) {
@@ -70,6 +85,53 @@ async function readStaleLockOwner(path) {
   }
 }
 
+async function cleanupCacheTemporaryFiles(cacheRoot) {
+  await cleanupTemporaryFilesInTree(cacheRoot)
+}
+
+async function cleanupTemporaryFilesInTree(path) {
+  let entries
+
+  try {
+    entries = await readdir(path, { withFileTypes: true })
+  } catch (error) {
+    if (hasErrorCode(error, 'ENOENT')) {
+      return
+    }
+
+    throw error
+  }
+
+  await Promise.all(
+    entries.map(entry => {
+      const entryPath = join(path, entry.name)
+
+      if (entry.isDirectory()) {
+        return cleanupTemporaryFilesInTree(entryPath)
+      }
+
+      return entry.isFile() && entry.name.endsWith('.tmp')
+        ? rm(entryPath, { force: true })
+        : Promise.resolve()
+    }),
+  )
+}
+
+function parseOwnerPid(owner) {
+  const pid = Math.trunc(Number(owner.split(':', 1)[0] ?? ''))
+
+  return Number.isSafeInteger(pid) && pid > 0 ? pid : undefined
+}
+
+function isProcessAlive(pid) {
+  try {
+    process.kill(pid, 0)
+    return true
+  } catch (error) {
+    return !hasErrorCode(error, 'ESRCH')
+  }
+}
+
 async function removeLockIfOwned(path, owner) {
   try {
     if ((await readFile(path, 'utf8')) !== owner) {

package/dist/cli.mjs

@@ -1,11 +1,11 @@
-import { _ as woffToTtf, a as inspect, b as findConfig, d as ttfToSvg, f as ttfToWoff, g as woff2ToTtf, n as analyzeCoverage, o as otfToTtf, p as ttfToWoff2, r as eotToTtf, s as subsetTtf, t as optimize, u as ttfToEot, x as loadConfig } from "./optimize-pipeline-4Thm4vQb.mjs";
+import { _ as woffToTtf, a as inspect, b as findConfig, d as ttfToSvg, f as ttfToWoff, g as woff2ToTtf, n as analyzeCoverage, o as otfToTtf, p as ttfToWoff2, r as eotToTtf, s as subsetTtf, t as optimize, u as ttfToEot, x as loadConfig } from "./optimize-pipeline-DuJ2ilJf.mjs";
 import { deliverySlices, glyph, svgs2ttf } from "./plugins.mjs";
 import { mkdir, readFile, realpath, rm, writeFile } from "node:fs/promises";
 import { basename, dirname, extname, isAbsolute, parse, relative, resolve, sep } from "node:path";
 import { glob } from "tinyglobby";
 //#region src/cli.mjs
 const INIT_CONFIG_FILE = "fontmin.config.jsonc";
-const FONTMIN_VERSION = "0.2.0";
+const FONTMIN_VERSION = "0.3.0";
 const DEFAULT_CACHE_DIR = "node_modules/.cache/fontmin-rs";
 let emitWarnings = true;
 const DEFAULT_INIT_CONFIG = `{

package/dist/compat.mjs

@@ -1,4 +1,4 @@
-import { t as optimize, y as defineConfig } from "./optimize-pipeline-4Thm4vQb.mjs";
+import { t as optimize, y as defineConfig } from "./optimize-pipeline-DuJ2ilJf.mjs";
 import { css, deliverySlices, glyph, otf2ttf, svg2ttf, svgs2ttf, ttf2eot, ttf2svg, ttf2woff, ttf2woff2 } from "./plugins.mjs";
 //#region src/compat.ts
 var FontminCompat = class {

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { _ as woffToTtf, a as inspect, c as svgFontToTtf, d as ttfToSvg, f as ttfToWoff, g as woff2ToTtf, h as validateWoff2, i as generateFontFaceCss, l as svgsToTtf, m as ttfToWoff2Async, n as analyzeCoverage, o as otfToTtf, p as ttfToWoff2, r as eotToTtf, s as subsetTtf, t as optimize, u as ttfToEot, v as FontminDiagnosticError, x as loadConfig, y as defineConfig } from "./optimize-pipeline-4Thm4vQb.mjs";
+import { _ as woffToTtf, a as inspect, c as svgFontToTtf, d as ttfToSvg, f as ttfToWoff, g as woff2ToTtf, h as validateWoff2, i as generateFontFaceCss, l as svgsToTtf, m as ttfToWoff2Async, n as analyzeCoverage, o as otfToTtf, p as ttfToWoff2, r as eotToTtf, s as subsetTtf, t as optimize, u as ttfToEot, v as FontminDiagnosticError, x as loadConfig, y as defineConfig } from "./optimize-pipeline-DuJ2ilJf.mjs";
 import { css, definePlugin, deliverySlices, glyph, modernWeb, otf2ttf, svg2ttf, svgs2ttf, ttf2eot, ttf2svg, ttf2woff, ttf2woff2 } from "./plugins.mjs";
 import FontminCompat from "./compat.mjs";
 import { fontminCompatPreset } from "./presets.mjs";

package/dist/{optimize-pipeline-4Thm4vQb.mjs → optimize-pipeline-DuJ2ilJf.mjs}

@@ -1,5 +1,5 @@
 import { createRequire } from "node:module";
-import { lstat, mkdir, open, readFile, realpath, rename, rm, stat, writeFile } from "node:fs/promises";
+import { lstat, mkdir, open, readFile, readdir, realpath, rename, rm, stat, writeFile } from "node:fs/promises";
 import { basename, dirname, extname, isAbsolute, join, parse, relative, resolve, sep } from "node:path";
 import { pathToFileURL } from "node:url";
 import { parse as parse$1 } from "jsonc-parser";
@@ -462,6 +462,7 @@ const CACHE_LOCK_STALE_MS = 5 * 6e4;
 async function withCacheLock(cacheRoot, operation) {
 	const lockPath = join(cacheRoot, ".write.lock");
 	const owner = `${process.pid}:${randomUUID()}`;
+	let recoveredLock = false;
 	await mkdir(cacheRoot, { recursive: true });
 	for (let attempt = 0; attempt < CACHE_LOCK_RETRY_COUNT; attempt += 1) {
 		let lock;
@@ -471,7 +472,7 @@ async function withCacheLock(cacheRoot, operation) {
 			if (!isNodeErrorWithCode$1(error, "EEXIST")) throw error;
 			const staleOwner = await readStaleLockOwner(lockPath);
 			if (staleOwner !== void 0) {
-				await removeLockIfOwned(lockPath, staleOwner);
+				recoveredLock = await removeLockIfOwned(lockPath, staleOwner) || recoveredLock;
 				continue;
 			}
 			await delay(CACHE_LOCK_RETRY_MS);
@@ -484,6 +485,13 @@ async function withCacheLock(cacheRoot, operation) {
 			await rm(lockPath, { force: true });
 			throw error;
 		}
+		if (recoveredLock) try {
+			await cleanupCacheTemporaryFiles(cacheRoot);
+		} catch (error) {
+			await lock.close();
+			await removeLockIfOwned(lockPath, owner);
+			throw error;
+		}
 		try {
 			return await operation();
 		} finally {
@@ -496,12 +504,42 @@ async function withCacheLock(cacheRoot, operation) {
 async function readStaleLockOwner(path) {
 	try {
 		const [owner, lockStat] = await Promise.all([readFile(path, "utf8"), stat(path)]);
-		return Date.now() - lockStat.mtimeMs > CACHE_LOCK_STALE_MS ? owner : void 0;
+		const ownerPid = parseOwnerPid(owner);
+		return ownerPid !== void 0 && !isProcessAlive(ownerPid) || Date.now() - lockStat.mtimeMs > CACHE_LOCK_STALE_MS ? owner : void 0;
 	} catch (error) {
 		if (isNodeErrorWithCode$1(error, "ENOENT")) return;
 		throw error;
 	}
 }
+async function cleanupCacheTemporaryFiles(cacheRoot) {
+	await cleanupTemporaryFilesInTree(cacheRoot);
+}
+async function cleanupTemporaryFilesInTree(path) {
+	let entries;
+	try {
+		entries = await readdir(path, { withFileTypes: true });
+	} catch (error) {
+		if (isNodeErrorWithCode$1(error, "ENOENT")) return;
+		throw error;
+	}
+	await Promise.all(entries.map((entry) => {
+		const entryPath = join(path, entry.name);
+		if (entry.isDirectory()) return cleanupTemporaryFilesInTree(entryPath);
+		return entry.isFile() && entry.name.endsWith(".tmp") ? rm(entryPath, { force: true }) : Promise.resolve();
+	}));
+}
+function parseOwnerPid(owner) {
+	const pid = Math.trunc(Number(owner.split(":", 1)[0] ?? ""));
+	return Number.isSafeInteger(pid) && pid > 0 ? pid : void 0;
+}
+function isProcessAlive(pid) {
+	try {
+		process.kill(pid, 0);
+		return true;
+	} catch (error) {
+		return !isNodeErrorWithCode$1(error, "ESRCH");
+	}
+}
 async function removeLockIfOwned(path, owner) {
 	try {
 		if (await readFile(path, "utf8") !== owner) return false;
@@ -1101,7 +1139,7 @@ function internalCacheKey(plugin) {
 //#endregion
 //#region src/optimize-storage.ts
 const CACHE_SCHEMA_VERSION = "v1";
-const FONTMIN_VERSION = "0.2.0";
+const FONTMIN_VERSION = "0.3.0";
 const DEFAULT_CACHE_DIR = "node_modules/.cache/fontmin-rs";
 let temporaryFileCounter = 0;
 function createPluginContext(cwd, emittedAssets) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fontmin-rs",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Fast font subsetter and converter written in Rust with Node.js bindings.",
   "keywords": [
     "font",
@@ -58,7 +58,7 @@
   "dependencies": {
     "jsonc-parser": "^3.3.1",
     "tinyglobby": "^0.2.17",
-    "@fontmin-rs/wasm": "0.2.0"
+    "@fontmin-rs/wasm": "0.3.0"
   },
   "devDependencies": {
     "@ntnyq/tsconfig": "^3.1.0",
@@ -70,7 +70,7 @@
     "vitest": "^4.1.10"
   },
   "optionalDependencies": {
-    "@fontmin-rs/binding": "0.2.0"
+    "@fontmin-rs/binding": "0.3.0"
   },
   "engines": {
     "node": ">=22.0.0"