@meonode/canvas 2.0.5 → 3.0.1

package/dist/esm/util/disk.cache.js

@@ -2,12 +2,20 @@ import { createHash } from 'crypto';
 import { promises } from 'fs';
 import { join } from 'path';
 
-const CACHE_DIR = join(process.cwd(), '.cache', 'files');
+let _cacheDir = join(process.cwd(), '.cache', 'files');
 let _dirEnsured = false;
+/**
+ * Override the default disk cache directory.
+ * Must be called before any cache read/write operations.
+ */
+function setDiskCacheDir(dir) {
+    _cacheDir = dir;
+    _dirEnsured = false;
+}
 async function ensureDir() {
     if (_dirEnsured)
         return;
-    await promises.mkdir(CACHE_DIR, { recursive: true });
+    await promises.mkdir(_cacheDir, { recursive: true });
     _dirEnsured = true;
 }
 function hashBuffer(buf) {
@@ -16,7 +24,7 @@ function hashBuffer(buf) {
 async function readDiskCache(key) {
     try {
         await ensureDir();
-        return await promises.readFile(join(CACHE_DIR, key));
+        return await promises.readFile(join(_cacheDir, key));
     }
     catch {
         return null;
@@ -25,7 +33,7 @@ async function readDiskCache(key) {
 async function writeDiskCache(key, data) {
     try {
         await ensureDir();
-        await promises.writeFile(join(CACHE_DIR, key), data);
+        await promises.writeFile(join(_cacheDir, key), data);
     }
     catch {
         // best-effort — cache write failures are non-fatal
@@ -33,10 +41,13 @@ async function writeDiskCache(key, data) {
 }
 async function deleteDiskCache(key) {
     try {
-        await promises.unlink(join(CACHE_DIR, key));
+        await promises.unlink(join(_cacheDir, key));
     }
-    catch {
+    catch (err) {
         // non-fatal — file may not exist if write failed earlier
+        if (err.code !== 'ENOENT') {
+            console.warn(`[disk.cache] Failed to delete cache entry "${key}":`, err.message);
+        }
     }
 }
 /**
@@ -46,27 +57,42 @@ async function deleteDiskCache(key) {
 async function clearDiskCache() {
     _dirEnsured = false;
     try {
-        await promises.rm(CACHE_DIR, { recursive: true, force: true });
+        await promises.rm(_cacheDir, { recursive: true, force: true });
     }
-    catch {
+    catch (err) {
         // non-fatal — directory may not exist
+        if (err.code !== 'ENOENT') {
+            console.warn('[disk.cache] Failed to clear cache directory:', err.message);
+        }
     }
 }
-// Clean up disk cache on process exit to handle crashes mid-render.
-// Guard prevents re-entry: clearDiskCache() is async, so without this the
-// beforeExit → schedule I/O → idle → beforeExit cycle loops forever.
-let _exitCleanupStarted = false;
-process.on('beforeExit', () => {
-    if (_exitCleanupStarted)
-        return;
-    _exitCleanupStarted = true;
-    void clearDiskCache();
-});
-// Also clean up on SIGINT/SIGTERM for graceful shutdowns
-const cleanupOnExit = () => {
-    clearDiskCache().finally(() => process.exit(0));
-};
-process.on('SIGINT', cleanupOnExit);
-process.on('SIGTERM', cleanupOnExit);
+const globalForExit = globalThis;
+function registerExitListeners() {
+    const prev = globalForExit.__diskCacheExit;
+    const lifecycle = prev?.lifecycle ?? { cleanupStarted: false };
+    if (prev) {
+        process.removeListener('beforeExit', prev.onBeforeExit);
+        process.removeListener('SIGINT', prev.onSignals);
+        process.removeListener('SIGTERM', prev.onSignals);
+    }
+    const onBeforeExit = () => {
+        if (lifecycle.cleanupStarted)
+            return;
+        lifecycle.cleanupStarted = true;
+        void clearDiskCache();
+    };
+    const onSignals = () => {
+        clearDiskCache().finally(() => process.exit(0));
+    };
+    globalForExit.__diskCacheExit = {
+        lifecycle,
+        onBeforeExit,
+        onSignals,
+    };
+    process.on('beforeExit', onBeforeExit);
+    process.on('SIGINT', onSignals);
+    process.on('SIGTERM', onSignals);
+}
+registerExitListeners();
 
-export { clearDiskCache, deleteDiskCache, hashBuffer, readDiskCache, writeDiskCache };
+export { clearDiskCache, deleteDiskCache, hashBuffer, readDiskCache, setDiskCacheDir, writeDiskCache };

package/dist/esm/worker/canvas-handlers.d.ts

@@ -0,0 +1,14 @@
+import type { RootProps } from '../canvas/canvas.type.js';
+import type { Canvas } from 'skia-canvas';
+import type { RenderResult } from './worker.types.js';
+export interface CanvasHandlerDeps {
+    canvases: Map<number, Canvas>;
+    getNextCanvasId: () => number;
+    renderRoot: (props: RootProps) => Promise<Canvas>;
+}
+export declare function createCanvasHandlers(deps: CanvasHandlerDeps): {
+    render(props: RootProps): Promise<RenderResult>;
+    callOnCanvas(canvasId: number, method: string, args: unknown[]): Promise<Buffer | string | void>;
+    releaseCanvas(canvasId: number): void;
+};
+//# sourceMappingURL=canvas-handlers.d.ts.map

package/dist/esm/worker/canvas-handlers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"canvas-handlers.d.ts","sourceRoot":"","sources":["../../../src/worker/canvas-handlers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAE5D,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC7B,eAAe,EAAE,MAAM,MAAM,CAAA;IAC7B,UAAU,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;CAClD;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,iBAAiB;kBAEpC,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC;2BAYxB,MAAM,UAAU,MAAM,QAAQ,OAAO,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;4BAoB9E,MAAM,GAAG,IAAI;EAIxC"}

package/dist/esm/worker/canvas-handlers.js

@@ -0,0 +1,39 @@
+function createCanvasHandlers(deps) {
+    return {
+        async render(props) {
+            const canvas = await deps.renderRoot(props);
+            const canvasId = deps.getNextCanvasId();
+            deps.canvases.set(canvasId, canvas);
+            return {
+                canvasId,
+                buffer: canvas.toBufferSync('png'),
+                width: canvas.width,
+                height: canvas.height,
+            };
+        },
+        async callOnCanvas(canvasId, method, args) {
+            const canvas = deps.canvases.get(canvasId);
+            if (!canvas) {
+                throw new Error(`[render.worker] Canvas ${canvasId} not found`);
+            }
+            switch (method) {
+                case 'toBuffer':
+                    return canvas.toBuffer(...args);
+                case 'toURL':
+                    return canvas.toURL(...args);
+                case 'toFile':
+                    await canvas.toFile(...args);
+                    return;
+                case 'toSharp':
+                    return await canvas.toSharp(...args).toBuffer();
+                default:
+                    throw new Error(`[render.worker] Unknown method: ${method}`);
+            }
+        },
+        releaseCanvas(canvasId) {
+            deps.canvases.delete(canvasId);
+        },
+    };
+}
+
+export { createCanvasHandlers };

package/dist/esm/worker/comlink.pool.d.ts

@@ -1,4 +1,4 @@
-import type { RenderResult } from '../worker/worker.types.js';
+import type { RenderResult } from './worker.types.js';
 import type { RootProps } from '../canvas/canvas.type.js';
 export interface PoolRenderResult extends RenderResult {
     workerIdx: number;

package/dist/esm/worker/comlink.pool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"comlink.pool.d.ts","sourceRoot":"","sources":["../../../src/worker/comlink.pool.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAa,YAAY,EAAU,MAAM,0BAA0B,CAAA;AAC/E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD,MAAM,WAAW,gBAAiB,SAAQ,YAAY;IACpD,SAAS,EAAE,MAAM,CAAA;CAClB;AASD,oFAAoF;AACpF,eAAO,MAAM,SAAS,kBAAkB,CAAA;AAExC;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,EAAE,MAAM,EAAE;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,CAAC,CAuB7H;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAuB3G;AAED;;;GAGG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,OAAO,CAAe;IAC9B,OAAO,CAAC,SAAS,CAA0B;IAC3C,OAAO,CAAC,IAAI,CAAe;IAC3B,OAAO,CAAC,KAAK,CAAmB;gBAEpB,IAAI,EAAE,MAAM;IAYxB,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,OAAO;IAKf,OAAO,CAAC,KAAK;YAQC,aAAa;IAiBrB,MAAM,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAuDzD,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAInH,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAIxD,SAAS;CAOV"}
+{"version":3,"file":"comlink.pool.d.ts","sourceRoot":"","sources":["../../../src/worker/comlink.pool.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAa,YAAY,EAAU,MAAM,0BAA0B,CAAA;AAC/E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD,MAAM,WAAW,gBAAiB,SAAQ,YAAY;IACpD,SAAS,EAAE,MAAM,CAAA;CAClB;AASD,oFAAoF;AACpF,eAAO,MAAM,SAAS,kBAAkB,CAAA;AAExC;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,EAAE,MAAM,EAAE;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,CAAC,CAuB7H;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAuB3G;AAED;;;GAGG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,OAAO,CAAe;IAC9B,OAAO,CAAC,SAAS,CAA0B;IAC3C,OAAO,CAAC,IAAI,CAAe;IAC3B,OAAO,CAAC,KAAK,CAAmB;gBAEpB,IAAI,EAAE,MAAM;IAYxB,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,OAAO;IAKf,OAAO,CAAC,KAAK;YAQC,aAAa;IAiBrB,MAAM,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA2DzD,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAInH,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAIxD,SAAS;CAOV"}

package/dist/esm/worker/comlink.pool.js

@@ -114,6 +114,9 @@ class ComlinkPool {
         }
     }
     async render(props) {
+        if (this.endpoints.length === 0) {
+            throw new Error('[ComlinkPool] Pool has been terminated');
+        }
         // Extract functions from props, replacing them with serializable sentinels.
         // A single Comlink.proxy() callback is created at the top level so Comlink
         // can correctly transfer it via its proxy transfer handler.

package/dist/esm/worker/comlink.setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"comlink.setup.d.ts","sourceRoot":"","sources":["../../../src/worker/comlink.setup.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAKlC,OAAO,YAAY,MAAM,mCAAmC,CAAA;AA4B5D,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,CAAA"}
+{"version":3,"file":"comlink.setup.d.ts","sourceRoot":"","sources":["../../../src/worker/comlink.setup.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAIlC,OAAO,YAAY,MAAM,mCAAmC,CAAA;AA4B5D,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,CAAA"}

package/dist/esm/worker/comlink.setup.js

@@ -21,7 +21,7 @@ function installNodeProxyHandler() {
             return [port2, [port2]];
         },
         deserialize: (port) => {
-            port.start?.();
+            port.start();
             return Comlink.wrap(nodeEndpoint(port));
         },
     });

package/dist/esm/worker/render.worker.js

@@ -1,6 +1,7 @@
 import { parentPort } from 'node:worker_threads';
 import './comlink.setup.js';
 import { restoreFunctions } from './comlink.pool.js';
+import { createCanvasHandlers } from './canvas-handlers.js';
 import { RootNode } from '../canvas/root.canvas.js';
 import * as Comlink from 'comlink';
 import nodeEndpoint from 'comlink/dist/esm/node-adapter.mjs';
@@ -10,41 +11,17 @@ if (!parentPort) {
 }
 const canvases = new Map();
 let nextCanvasId = 0;
+const handlers = createCanvasHandlers({
+    canvases,
+    getNextCanvasId: () => nextCanvasId++,
+    renderRoot: async (props) => new RootNode(props).render(),
+});
 const api = {
     async render(props, callFn) {
         const resolved = callFn ? restoreFunctions(props, callFn) : props;
-        const canvas = await new RootNode(resolved).render();
-        const canvasId = nextCanvasId++;
-        canvases.set(canvasId, canvas);
-        const result = {
-            canvasId,
-            buffer: canvas.toBufferSync('png'),
-            width: canvas.width,
-            height: canvas.height,
-        };
-        return result;
-    },
-    async callOnCanvas(canvasId, method, args) {
-        const canvas = canvases.get(canvasId);
-        if (!canvas) {
-            throw new Error(`[render.worker] Canvas ${canvasId} not found`);
-        }
-        switch (method) {
-            case 'toBuffer':
-                return canvas.toBuffer(...args);
-            case 'toURL':
-                return canvas.toURL(...args);
-            case 'toFile':
-                await canvas.toFile(...args);
-                return;
-            case 'toSharp':
-                return await canvas.toSharp(...args).toBuffer();
-            default:
-                throw new Error(`[render.worker] Unknown method: ${method}`);
-        }
-    },
-    releaseCanvas(canvasId) {
-        canvases.delete(canvasId);
+        return handlers.render(resolved);
     },
+    callOnCanvas: handlers.callOnCanvas.bind(handlers),
+    releaseCanvas: handlers.releaseCanvas.bind(handlers),
 };
 Comlink.expose(api, nodeEndpoint(parentPort));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meonode/canvas",
-  "version": "2.0.5",
+  "version": "3.0.1",
   "description": "A declarative, component-based library for server-side canvas image generation. Write complex visuals with simple functions, similar to the composition style of @meonode/ui.",
   "keywords": [
     "canvas",
@@ -37,17 +37,19 @@
     }
   },
   "scripts": {
-    "build": "rm -rf ./dist && rollup -c --bundleConfigAsCjs && tsc-alias -p tsconfig.esm.json && tsc-alias -p tsconfig.cjs.json",
-    "test": "node --no-experimental-webstorage --experimental-vm-modules $(yarn bin jest)",
-    "lint": "eslint . --ext .ts,.tsx,.js,.jsx,.mjs --fix",
+    "build": "bun -e \"fs.rmSync('./dist', {recursive:true, force:true})\" && rollup -c --bundleConfigAsCjs && bun scripts/rewrite-dts-aliases.ts",
+    "test": "vitest run --coverage",
+    "test:ci": "node ./node_modules/vitest/vitest.mjs run --coverage",
+    "test:integration": "vitest run --config vitest.integration.config.ts",
+    "typecheck": "tsc --noEmit",
+    "lint": "eslint . --ext .ts,.tsx,.js,.jsx,.mjs --fix && bun run typecheck",
     "format": "prettier --write .",
     "generate:samples": "npx tsx scripts/generate_sample_charts.ts && npx tsx scripts/generate_sample_grids.ts && npx tsx scripts/generate_sample_nested_grids.ts",
     "check:memory": "npx tsx --expose-gc scripts/check_memory.ts",
     "prepare": "husky"
   },
   "devDependencies": {
-    "@eslint/js": "^9.39.4",
-    "@jest/globals": "^30.3.0",
+    "@eslint/js": "^10.0.1",
     "@rollup/plugin-commonjs": "^29.0.2",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-typescript": "^12.3.0",
@@ -56,37 +58,31 @@
     "@semantic-release/gitlab": "^13.3.2",
     "@semantic-release/npm": "^13.1.5",
     "@semantic-release/release-notes-generator": "^14.1.0",
-    "@types/jest": "^30.0.0",
-    "@types/lodash-es": "^4.17.12",
     "@types/node": "^25.5.0",
-    "@types/sharp": "^0.32.0",
-    "@types/tinycolor2": "^1.4.6",
+    "@types/pngjs": "^6.0.5",
     "@typescript-eslint/eslint-plugin": "^8.57.2",
     "@typescript-eslint/parser": "^8.57.2",
-    "eslint": "^9.39.4",
+    "@vitest/coverage-v8": "^4.1.7",
+    "eslint": "^10.4.0",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-jsdoc": "^62.8.1",
+    "eslint-plugin-jsdoc": "^63.0.0",
     "eslint-plugin-prettier": "^5.5.5",
     "eslint-plugin-unused-imports": "^4.4.1",
     "husky": "^9.1.7",
-    "jest": "^30.3.0",
+    "pixelmatch": "^7.2.0",
+    "pngjs": "^7.0.0",
     "prettier": "^3.8.1",
     "rollup": "^4.60.0",
     "rollup-plugin-tsconfig-paths": "^1.5.2",
-    "semantic-release": "^25.0.3",
-    "ts-jest": "^29.4.6",
-    "tsc-alias": "^1.8.16",
+    "semantic-release": "25.0.3",
     "typescript": "^6.0.2",
-    "typescript-eslint": "^8.57.2"
+    "typescript-eslint": "^8.57.2",
+    "vitest": "^4.1.7"
   },
-  "packageManager": "yarn@4.11.0",
   "dependencies": {
     "comlink": "^4.4.2",
     "file-type": "^22.0.0",
-    "lodash-es": "^4.17.23",
-    "sharp": "^0.34.5",
     "skia-canvas": "^3.0.8",
-    "tinycolor2": "^1.6.0",
     "tslib": "^2.8.1",
     "yoga-layout": "^3.2.1"
   },