@meonode/canvas 2.0.4 → 2.0.5

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

@@ -3,11 +3,22 @@ import type { RootProps } from '../canvas/canvas.type.js';
 export interface PoolRenderResult extends RenderResult {
     workerIdx: number;
 }
+/** Sentinel embedded in serialized props to mark where a function was extracted. */
+export declare const FN_MARKER = "__comlinkFnId";
 /**
- * Deeply walks an object tree, wraps any function values with Comlink.proxy(),
- * and tracks wrapped proxies for deterministic cleanup.
+ * Deeply walks an object tree, replaces function values with `{ [FN_MARKER]: id }` sentinels,
+ * and collects the original functions in a Map keyed by their assigned id.
+ * Returns the cleaned (function-free) tree that is safe for structured clone.
  */
-export declare function wrapFunctions<T>(obj: T, proxies: Set<unknown>): T;
+export declare function extractFunctions<T>(obj: T, fnMap: Map<number, (...args: unknown[]) => unknown>, nextId: {
+    value: number;
+}): T;
+/**
+ * Deeply walks an object tree received on the worker side, replaces
+ * `{ [FN_MARKER]: id }` sentinels with async functions that delegate
+ * to the main-thread callback proxy.
+ */
+export declare function restoreFunctions<T>(obj: T, callFn: (id: number, ...args: unknown[]) => Promise<unknown>): T;
 /**
  * Pool of Comlink-wrapped worker threads.
  * Manages idle/queue scheduling and proxy lifecycle.

package/dist/cjs/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,EAAE,MAAM,0BAA0B,CAAA;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD,MAAM,WAAW,gBAAiB,SAAQ,YAAY;IACpD,SAAS,EAAE,MAAM,CAAA;CAClB;AAQD;;;GAGG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAuBjE;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;IAWrB,MAAM,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA0CzD,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;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"}

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

@@ -28,17 +28,20 @@ function _interopNamespaceDefault(e) {
 var path__namespace = /*#__PURE__*/_interopNamespaceDefault(path);
 var Comlink__namespace = /*#__PURE__*/_interopNamespaceDefault(Comlink);
 
+/** Sentinel embedded in serialized props to mark where a function was extracted. */
+const FN_MARKER = '__comlinkFnId';
 /**
- * Deeply walks an object tree, wraps any function values with Comlink.proxy(),
- * and tracks wrapped proxies for deterministic cleanup.
+ * Deeply walks an object tree, replaces function values with `{ [FN_MARKER]: id }` sentinels,
+ * and collects the original functions in a Map keyed by their assigned id.
+ * Returns the cleaned (function-free) tree that is safe for structured clone.
  */
-function wrapFunctions(obj, proxies) {
+function extractFunctions(obj, fnMap, nextId) {
     if (obj === null || obj === undefined)
         return obj;
     if (typeof obj === 'function') {
-        const wrapped = Comlink__namespace.proxy(obj);
-        proxies.add(wrapped);
-        return wrapped;
+        const id = nextId.value++;
+        fnMap.set(id, obj);
+        return { [FN_MARKER]: id };
     }
     if (typeof obj !== 'object')
         return obj;
@@ -50,11 +53,41 @@ function wrapFunctions(obj, proxies) {
     if (ArrayBuffer.isView(obj))
         return obj;
     if (Array.isArray(obj)) {
-        return obj.map(item => wrapFunctions(item, proxies));
+        return obj.map(item => extractFunctions(item, fnMap, nextId));
     }
     const result = {};
     for (const key of Object.keys(obj)) {
-        result[key] = wrapFunctions(obj[key], proxies);
+        result[key] = extractFunctions(obj[key], fnMap, nextId);
+    }
+    return result;
+}
+/**
+ * Deeply walks an object tree received on the worker side, replaces
+ * `{ [FN_MARKER]: id }` sentinels with async functions that delegate
+ * to the main-thread callback proxy.
+ */
+function restoreFunctions(obj, callFn) {
+    if (obj === null || obj === undefined)
+        return obj;
+    if (typeof obj !== 'object')
+        return obj;
+    if (Buffer.isBuffer(obj))
+        return obj;
+    if (obj instanceof ArrayBuffer)
+        return obj;
+    if (ArrayBuffer.isView(obj))
+        return obj;
+    // Check for sentinel
+    if (FN_MARKER in obj) {
+        const id = obj[FN_MARKER];
+        return ((...args) => callFn(id, ...args));
+    }
+    if (Array.isArray(obj)) {
+        return obj.map(item => restoreFunctions(item, callFn));
+    }
+    const result = {};
+    for (const key of Object.keys(obj)) {
+        result[key] = restoreFunctions(obj[key], callFn);
     }
     return result;
 }
@@ -88,12 +121,12 @@ class ComlinkPool {
         while (this.queue.length > 0 && this.idle.length > 0) {
             const task = this.queue.shift();
             const idx = this.idle.pop();
-            void this.executeRender(idx, task.props, task.resolve, task.reject);
+            void this.executeRender(idx, task.props, task.callFn, task.resolve, task.reject);
         }
     }
-    async executeRender(idx, props, resolve, reject) {
+    async executeRender(idx, props, callFn, resolve, reject) {
         try {
-            const result = await this.endpoints[idx].render(props);
+            const result = await this.endpoints[idx].render(props, callFn);
             resolve({ ...result, workerIdx: idx });
         }
         catch (err) {
@@ -104,13 +137,25 @@ class ComlinkPool {
         }
     }
     async render(props) {
-        const proxies = new Set();
-        const wrapped = wrapFunctions(props, proxies);
+        // 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.
+        const fnMap = new Map();
+        const cleaned = extractFunctions(props, fnMap, { value: 0 });
+        let callFnProxy;
+        if (fnMap.size > 0) {
+            callFnProxy = Comlink__namespace.proxy(async (id, ...args) => {
+                const fn = fnMap.get(id);
+                if (!fn)
+                    throw new Error(`[ComlinkPool] Function #${id} not found`);
+                return fn(...args);
+            });
+        }
         const cleanup = () => {
-            for (const p of proxies) {
+            if (callFnProxy) {
                 try {
                     ;
-                    p[Comlink__namespace.releaseProxy]?.();
+                    callFnProxy[Comlink__namespace.releaseProxy]?.();
                 }
                 catch {
                     // Proxy may already be released
@@ -121,7 +166,7 @@ class ComlinkPool {
         const idx = this.acquire();
         if (idx !== null) {
             try {
-                const result = await this.endpoints[idx].render(wrapped);
+                const result = await this.endpoints[idx].render(cleaned, callFnProxy);
                 return { ...result, workerIdx: idx };
             }
             finally {
@@ -132,7 +177,8 @@ class ComlinkPool {
         // Queued path — cleanup AFTER the queued task completes, not before
         return new Promise((resolve, reject) => {
             this.queue.push({
-                props: wrapped,
+                props: cleaned,
+                callFn: callFnProxy,
                 resolve: result => {
                     cleanup();
                     resolve(result);
@@ -160,5 +206,7 @@ class ComlinkPool {
 }
 
 exports.ComlinkPool = ComlinkPool;
-exports.wrapFunctions = wrapFunctions;
+exports.FN_MARKER = FN_MARKER;
+exports.extractFunctions = extractFunctions;
+exports.restoreFunctions = restoreFunctions;
 //# sourceMappingURL=comlink.pool.js.map

package/dist/cjs/worker/comlink.pool.js.map

@@ -1 +1 @@
-{"version":3,"file":"comlink.pool.js","sources":["../../../../src/worker/comlink.pool.ts"],"sourcesContent":["import { Worker } from 'node:worker_threads'\nimport { fileURLToPath } from 'node:url'\nimport * as path from 'node:path'\nimport { Comlink, nodeEndpoint } from '@/worker/comlink.setup.js'\nimport type { Remote } from 'comlink'\nimport type { WorkerAPI, RenderResult } from '@/worker/worker.types.js'\nimport type { RootProps } from '@/canvas/canvas.type.js'\n\nexport interface PoolRenderResult extends RenderResult {\n  workerIdx: number\n}\n\ninterface QueuedTask {\n  props: RootProps\n  resolve: (result: PoolRenderResult) => void\n  reject: (err: Error) => void\n}\n\n/**\n * Deeply walks an object tree, wraps any function values with Comlink.proxy(),\n * and tracks wrapped proxies for deterministic cleanup.\n */\nexport function wrapFunctions<T>(obj: T, proxies: Set<unknown>): T {\n  if (obj === null || obj === undefined) return obj\n  if (typeof obj === 'function') {\n    const wrapped = Comlink.proxy(obj)\n    proxies.add(wrapped)\n    return wrapped as unknown as T\n  }\n  if (typeof obj !== 'object') return obj\n\n  // Preserve binary data types — don't walk into them\n  if (Buffer.isBuffer(obj)) return obj\n  if (obj instanceof ArrayBuffer) return obj\n  if (ArrayBuffer.isView(obj)) return obj\n\n  if (Array.isArray(obj)) {\n    return obj.map(item => wrapFunctions(item, proxies)) as unknown as T\n  }\n\n  const result: Record<string, unknown> = {}\n  for (const key of Object.keys(obj as Record<string, unknown>)) {\n    result[key] = wrapFunctions((obj as Record<string, unknown>)[key], proxies)\n  }\n  return result as T\n}\n\n/**\n * Pool of Comlink-wrapped worker threads.\n * Manages idle/queue scheduling and proxy lifecycle.\n */\nexport class ComlinkPool {\n  private workers: Worker[] = []\n  private endpoints: Remote<WorkerAPI>[] = []\n  private idle: number[] = []\n  private queue: QueuedTask[] = []\n\n  constructor(size: number) {\n    const workerFile = path.join(path.dirname(fileURLToPath(import.meta.url)), '../worker/render.worker.js')\n\n    for (let i = 0; i < size; i++) {\n      const worker = new Worker(workerFile)\n      const endpoint = Comlink.wrap<WorkerAPI>(nodeEndpoint(worker))\n      this.workers.push(worker)\n      this.endpoints.push(endpoint)\n      this.idle.push(i)\n    }\n  }\n\n  private acquire(): number | null {\n    return this.idle.pop() ?? null\n  }\n\n  private release(idx: number) {\n    this.idle.push(idx)\n    this.drain()\n  }\n\n  private drain() {\n    while (this.queue.length > 0 && this.idle.length > 0) {\n      const task = this.queue.shift()!\n      const idx = this.idle.pop()!\n      void this.executeRender(idx, task.props, task.resolve, task.reject)\n    }\n  }\n\n  private async executeRender(idx: number, props: RootProps, resolve: (result: PoolRenderResult) => void, reject: (err: Error) => void) {\n    try {\n      const result = await this.endpoints[idx].render(props)\n      resolve({ ...result, workerIdx: idx })\n    } catch (err) {\n      reject(err instanceof Error ? err : new Error(String(err)))\n    } finally {\n      this.release(idx)\n    }\n  }\n\n  async render(props: RootProps): Promise<PoolRenderResult> {\n    const proxies = new Set<unknown>()\n    const wrapped = wrapFunctions(props, proxies)\n\n    const cleanup = () => {\n      for (const p of proxies) {\n        try {\n          ;(p as any)[Comlink.releaseProxy]?.()\n        } catch {\n          // Proxy may already be released\n        }\n      }\n    }\n\n    // Direct path — idle worker available\n    const idx = this.acquire()\n    if (idx !== null) {\n      try {\n        const result = await this.endpoints[idx].render(wrapped)\n        return { ...result, workerIdx: idx }\n      } finally {\n        this.release(idx)\n        cleanup()\n      }\n    }\n\n    // Queued path — cleanup AFTER the queued task completes, not before\n    return new Promise<PoolRenderResult>((resolve, reject) => {\n      this.queue.push({\n        props: wrapped,\n        resolve: result => {\n          cleanup()\n          resolve(result)\n        },\n        reject: err => {\n          cleanup()\n          reject(err)\n        },\n      })\n    })\n  }\n\n  callOnCanvas(workerIdx: number, canvasId: number, method: string, args: unknown[]): Promise<Buffer | string | void> {\n    return this.endpoints[workerIdx].callOnCanvas(canvasId, method, args) as Promise<Buffer | string | void>\n  }\n\n  releaseCanvas(workerIdx: number, canvasId: number): void {\n    this.endpoints[workerIdx].releaseCanvas(canvasId)\n  }\n\n  terminate() {\n    this.workers.forEach(w => w.terminate())\n    this.workers = []\n    this.endpoints = []\n    this.idle = []\n    this.queue = []\n  }\n}\n"],"names":["Comlink","path","fileURLToPath","Worker"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAkBA;;;AAGG;AACG,SAAU,aAAa,CAAI,GAAM,EAAE,OAAqB,EAAA;AAC5D,IAAA,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,SAAS;AAAE,QAAA,OAAO,GAAG;AACjD,IAAA,IAAI,OAAO,GAAG,KAAK,UAAU,EAAE;QAC7B,MAAM,OAAO,GAAGA,kBAAO,CAAC,KAAK,CAAC,GAAG,CAAC;AAClC,QAAA,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;AACpB,QAAA,OAAO,OAAuB;IAChC;IACA,IAAI,OAAO,GAAG,KAAK,QAAQ;AAAE,QAAA,OAAO,GAAG;;AAGvC,IAAA,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC;AAAE,QAAA,OAAO,GAAG;IACpC,IAAI,GAAG,YAAY,WAAW;AAAE,QAAA,OAAO,GAAG;AAC1C,IAAA,IAAI,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC;AAAE,QAAA,OAAO,GAAG;AAEvC,IAAA,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;AACtB,QAAA,OAAO,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAiB;IACtE;IAEA,MAAM,MAAM,GAA4B,EAAE;IAC1C,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,GAA8B,CAAC,EAAE;AAC7D,QAAA,MAAM,CAAC,GAAG,CAAC,GAAG,aAAa,CAAE,GAA+B,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC;IAC7E;AACA,IAAA,OAAO,MAAW;AACpB;AAEA;;;AAGG;MACU,WAAW,CAAA;IACd,OAAO,GAAa,EAAE;IACtB,SAAS,GAAwB,EAAE;IACnC,IAAI,GAAa,EAAE;IACnB,KAAK,GAAiB,EAAE;AAEhC,IAAA,WAAA,CAAY,IAAY,EAAA;QACtB,MAAM,UAAU,GAAGC,eAAI,CAAC,IAAI,CAACA,eAAI,CAAC,OAAO,CAACC,sBAAa,CAAC,wQAAe,CAAC,CAAC,EAAE,4BAA4B,CAAC;AAExG,QAAA,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,EAAE;AAC7B,YAAA,MAAM,MAAM,GAAG,IAAIC,0BAAM,CAAC,UAAU,CAAC;YACrC,MAAM,QAAQ,GAAGH,kBAAO,CAAC,IAAI,CAAY,YAAY,CAAC,MAAM,CAAC,CAAC;AAC9D,YAAA,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;AACzB,YAAA,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC;AAC7B,YAAA,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACnB;IACF;IAEQ,OAAO,GAAA;QACb,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI;IAChC;AAEQ,IAAA,OAAO,CAAC,GAAW,EAAA;AACzB,QAAA,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;QACnB,IAAI,CAAC,KAAK,EAAE;IACd;IAEQ,KAAK,GAAA;AACX,QAAA,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YACpD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAG;YAChC,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAG;AAC5B,YAAA,KAAK,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC;QACrE;IACF;IAEQ,MAAM,aAAa,CAAC,GAAW,EAAE,KAAgB,EAAE,OAA2C,EAAE,MAA4B,EAAA;AAClI,QAAA,IAAI;AACF,YAAA,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;YACtD,OAAO,CAAC,EAAE,GAAG,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC;QACxC;QAAE,OAAO,GAAG,EAAE;YACZ,MAAM,CAAC,GAAG,YAAY,KAAK,GAAG,GAAG,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QAC7D;gBAAU;AACR,YAAA,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;QACnB;IACF;IAEA,MAAM,MAAM,CAAC,KAAgB,EAAA;AAC3B,QAAA,MAAM,OAAO,GAAG,IAAI,GAAG,EAAW;QAClC,MAAM,OAAO,GAAG,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC;QAE7C,MAAM,OAAO,GAAG,MAAK;AACnB,YAAA,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;AACvB,gBAAA,IAAI;oBACF;AAAE,oBAAA,CAAS,CAACA,kBAAO,CAAC,YAAY,CAAC,IAAI;gBACvC;AAAE,gBAAA,MAAM;;gBAER;YACF;AACF,QAAA,CAAC;;AAGD,QAAA,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE;AAC1B,QAAA,IAAI,GAAG,KAAK,IAAI,EAAE;AAChB,YAAA,IAAI;AACF,gBAAA,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;gBACxD,OAAO,EAAE,GAAG,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE;YACtC;oBAAU;AACR,gBAAA,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;AACjB,gBAAA,OAAO,EAAE;YACX;QACF;;QAGA,OAAO,IAAI,OAAO,CAAmB,CAAC,OAAO,EAAE,MAAM,KAAI;AACvD,YAAA,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;AACd,gBAAA,KAAK,EAAE,OAAO;gBACd,OAAO,EAAE,MAAM,IAAG;AAChB,oBAAA,OAAO,EAAE;oBACT,OAAO,CAAC,MAAM,CAAC;gBACjB,CAAC;gBACD,MAAM,EAAE,GAAG,IAAG;AACZ,oBAAA,OAAO,EAAE;oBACT,MAAM,CAAC,GAAG,CAAC;gBACb,CAAC;AACF,aAAA,CAAC;AACJ,QAAA,CAAC,CAAC;IACJ;AAEA,IAAA,YAAY,CAAC,SAAiB,EAAE,QAAgB,EAAE,MAAc,EAAE,IAAe,EAAA;AAC/E,QAAA,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAoC;IAC1G;IAEA,aAAa,CAAC,SAAiB,EAAE,QAAgB,EAAA;QAC/C,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC;IACnD;IAEA,SAAS,GAAA;AACP,QAAA,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;AACxC,QAAA,IAAI,CAAC,OAAO,GAAG,EAAE;AACjB,QAAA,IAAI,CAAC,SAAS,GAAG,EAAE;AACnB,QAAA,IAAI,CAAC,IAAI,GAAG,EAAE;AACd,QAAA,IAAI,CAAC,KAAK,GAAG,EAAE;IACjB;AACD;;;;;"}
+{"version":3,"file":"comlink.pool.js","sources":["../../../../src/worker/comlink.pool.ts"],"sourcesContent":["import { Worker } from 'node:worker_threads'\nimport { fileURLToPath } from 'node:url'\nimport * as path from 'node:path'\nimport { Comlink, nodeEndpoint } from '@/worker/comlink.setup.js'\nimport type { Remote } from 'comlink'\nimport type { WorkerAPI, RenderResult, CallFn } from '@/worker/worker.types.js'\nimport type { RootProps } from '@/canvas/canvas.type.js'\n\nexport interface PoolRenderResult extends RenderResult {\n  workerIdx: number\n}\n\ninterface QueuedTask {\n  props: RootProps\n  callFn: CallFn | undefined\n  resolve: (result: PoolRenderResult) => void\n  reject: (err: Error) => void\n}\n\n/** Sentinel embedded in serialized props to mark where a function was extracted. */\nexport const FN_MARKER = '__comlinkFnId'\n\n/**\n * Deeply walks an object tree, replaces function values with `{ [FN_MARKER]: id }` sentinels,\n * and collects the original functions in a Map keyed by their assigned id.\n * Returns the cleaned (function-free) tree that is safe for structured clone.\n */\nexport function extractFunctions<T>(obj: T, fnMap: Map<number, (...args: unknown[]) => unknown>, nextId: { value: number }): T {\n  if (obj === null || obj === undefined) return obj\n  if (typeof obj === 'function') {\n    const id = nextId.value++\n    fnMap.set(id, obj as (...args: unknown[]) => unknown)\n    return { [FN_MARKER]: id } as unknown as T\n  }\n  if (typeof obj !== 'object') return obj\n\n  // Preserve binary data types — don't walk into them\n  if (Buffer.isBuffer(obj)) return obj\n  if (obj instanceof ArrayBuffer) return obj\n  if (ArrayBuffer.isView(obj)) return obj\n\n  if (Array.isArray(obj)) {\n    return obj.map(item => extractFunctions(item, fnMap, nextId)) as unknown as T\n  }\n\n  const result: Record<string, unknown> = {}\n  for (const key of Object.keys(obj as Record<string, unknown>)) {\n    result[key] = extractFunctions((obj as Record<string, unknown>)[key], fnMap, nextId)\n  }\n  return result as T\n}\n\n/**\n * Deeply walks an object tree received on the worker side, replaces\n * `{ [FN_MARKER]: id }` sentinels with async functions that delegate\n * to the main-thread callback proxy.\n */\nexport function restoreFunctions<T>(obj: T, callFn: (id: number, ...args: unknown[]) => Promise<unknown>): T {\n  if (obj === null || obj === undefined) return obj\n  if (typeof obj !== 'object') return obj\n\n  if (Buffer.isBuffer(obj)) return obj\n  if (obj instanceof ArrayBuffer) return obj\n  if (ArrayBuffer.isView(obj)) return obj\n\n  // Check for sentinel\n  if (FN_MARKER in (obj as Record<string, unknown>)) {\n    const id = (obj as Record<string, unknown>)[FN_MARKER] as number\n    return ((...args: unknown[]) => callFn(id, ...args)) as unknown as T\n  }\n\n  if (Array.isArray(obj)) {\n    return obj.map(item => restoreFunctions(item, callFn)) as unknown as T\n  }\n\n  const result: Record<string, unknown> = {}\n  for (const key of Object.keys(obj as Record<string, unknown>)) {\n    result[key] = restoreFunctions((obj as Record<string, unknown>)[key], callFn)\n  }\n  return result as T\n}\n\n/**\n * Pool of Comlink-wrapped worker threads.\n * Manages idle/queue scheduling and proxy lifecycle.\n */\nexport class ComlinkPool {\n  private workers: Worker[] = []\n  private endpoints: Remote<WorkerAPI>[] = []\n  private idle: number[] = []\n  private queue: QueuedTask[] = []\n\n  constructor(size: number) {\n    const workerFile = path.join(path.dirname(fileURLToPath(import.meta.url)), '../worker/render.worker.js')\n\n    for (let i = 0; i < size; i++) {\n      const worker = new Worker(workerFile)\n      const endpoint = Comlink.wrap<WorkerAPI>(nodeEndpoint(worker))\n      this.workers.push(worker)\n      this.endpoints.push(endpoint)\n      this.idle.push(i)\n    }\n  }\n\n  private acquire(): number | null {\n    return this.idle.pop() ?? null\n  }\n\n  private release(idx: number) {\n    this.idle.push(idx)\n    this.drain()\n  }\n\n  private drain() {\n    while (this.queue.length > 0 && this.idle.length > 0) {\n      const task = this.queue.shift()!\n      const idx = this.idle.pop()!\n      void this.executeRender(idx, task.props, task.callFn, task.resolve, task.reject)\n    }\n  }\n\n  private async executeRender(\n    idx: number,\n    props: RootProps,\n    callFn: CallFn | undefined,\n    resolve: (result: PoolRenderResult) => void,\n    reject: (err: Error) => void,\n  ) {\n    try {\n      const result = await this.endpoints[idx].render(props, callFn)\n      resolve({ ...result, workerIdx: idx })\n    } catch (err) {\n      reject(err instanceof Error ? err : new Error(String(err)))\n    } finally {\n      this.release(idx)\n    }\n  }\n\n  async render(props: RootProps): Promise<PoolRenderResult> {\n    // Extract functions from props, replacing them with serializable sentinels.\n    // A single Comlink.proxy() callback is created at the top level so Comlink\n    // can correctly transfer it via its proxy transfer handler.\n    const fnMap = new Map<number, (...args: unknown[]) => unknown>()\n    const cleaned = extractFunctions(props, fnMap, { value: 0 })\n\n    let callFnProxy: CallFn | undefined\n    if (fnMap.size > 0) {\n      callFnProxy = Comlink.proxy(async (id: number, ...args: unknown[]) => {\n        const fn = fnMap.get(id)\n        if (!fn) throw new Error(`[ComlinkPool] Function #${id} not found`)\n        return fn(...args)\n      })\n    }\n\n    const cleanup = () => {\n      if (callFnProxy) {\n        try {\n          ;(callFnProxy as any)[Comlink.releaseProxy]?.()\n        } catch {\n          // Proxy may already be released\n        }\n      }\n    }\n\n    // Direct path — idle worker available\n    const idx = this.acquire()\n    if (idx !== null) {\n      try {\n        const result = await this.endpoints[idx].render(cleaned, callFnProxy)\n        return { ...result, workerIdx: idx }\n      } finally {\n        this.release(idx)\n        cleanup()\n      }\n    }\n\n    // Queued path — cleanup AFTER the queued task completes, not before\n    return new Promise<PoolRenderResult>((resolve, reject) => {\n      this.queue.push({\n        props: cleaned,\n        callFn: callFnProxy,\n        resolve: result => {\n          cleanup()\n          resolve(result)\n        },\n        reject: err => {\n          cleanup()\n          reject(err)\n        },\n      })\n    })\n  }\n\n  callOnCanvas(workerIdx: number, canvasId: number, method: string, args: unknown[]): Promise<Buffer | string | void> {\n    return this.endpoints[workerIdx].callOnCanvas(canvasId, method, args) as Promise<Buffer | string | void>\n  }\n\n  releaseCanvas(workerIdx: number, canvasId: number): void {\n    this.endpoints[workerIdx].releaseCanvas(canvasId)\n  }\n\n  terminate() {\n    this.workers.forEach(w => w.terminate())\n    this.workers = []\n    this.endpoints = []\n    this.idle = []\n    this.queue = []\n  }\n}\n"],"names":["path","fileURLToPath","Worker","Comlink"],"mappings":"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"}

package/dist/cjs/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;AA2B5D,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;AAKlC,OAAO,YAAY,MAAM,mCAAmC,CAAA;AA4B5D,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,CAAA"}

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

@@ -33,7 +33,7 @@ var Comlink__namespace = /*#__PURE__*/_interopNamespaceDefault(Comlink);
  */
 function installNodeProxyHandler() {
     Comlink__namespace.transferHandlers.set('proxy', {
-        canHandle: (obj) => typeof obj === 'object' && obj !== null && Comlink__namespace.proxyMarker in obj,
+        canHandle: (obj) => (typeof obj === 'object' || typeof obj === 'function') && obj !== null && Comlink__namespace.proxyMarker in obj,
         serialize: (obj) => {
             const { port1, port2 } = new node_worker_threads.MessageChannel();
             Comlink__namespace.expose(obj, nodeEndpoint(port1));

package/dist/cjs/worker/comlink.setup.js.map

@@ -1 +1 @@
-{"version":3,"file":"comlink.setup.js","sources":["../../../../src/worker/comlink.setup.ts"],"sourcesContent":["// src/worker/comlink.setup.ts\nimport * as Comlink from 'comlink'\nimport { MessageChannel } from 'node:worker_threads'\n\n// Use deep import path — Comlink has no `exports` field (issue #508)\n// @ts-expect-error — Comlink's node-adapter has no type declarations at this path\nimport nodeEndpoint from 'comlink/dist/esm/node-adapter.mjs'\n\n/**\n * Fix Comlink.proxy() for Node.js worker_threads (issue #313).\n * The built-in proxy transfer handler uses browser MessageChannel.\n * This override uses Node's MessageChannel instead.\n *\n * Must be called on BOTH main thread and worker before any Comlink usage.\n */\nfunction installNodeProxyHandler() {\n  Comlink.transferHandlers.set('proxy', {\n    canHandle: (obj: unknown): obj is { [Comlink.proxyMarker]: true } => typeof obj === 'object' && obj !== null && Comlink.proxyMarker in obj,\n    serialize: (obj: unknown) => {\n      const { port1, port2 } = new MessageChannel()\n      Comlink.expose(obj, nodeEndpoint(port1))\n      return [port2, [port2]]\n    },\n    deserialize: (port: MessagePort) => {\n      ;(port as any).start?.()\n      return Comlink.wrap(nodeEndpoint(port))\n    },\n  })\n}\n\n// Install immediately on import\ninstallNodeProxyHandler()\n\nexport { Comlink, nodeEndpoint }\n"],"names":["Comlink","MessageChannel"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAQA;;;;;;AAMG;AACH,SAAS,uBAAuB,GAAA;AAC9B,IAAAA,kBAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE;AACpC,QAAA,SAAS,EAAE,CAAC,GAAY,KAA6C,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,IAAIA,kBAAO,CAAC,WAAW,IAAI,GAAG;AAC1I,QAAA,SAAS,EAAE,CAAC,GAAY,KAAI;YAC1B,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,IAAIC,kCAAc,EAAE;YAC7CD,kBAAO,CAAC,MAAM,CAAC,GAAG,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC;AACxC,YAAA,OAAO,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC;AACD,QAAA,WAAW,EAAE,CAAC,IAAiB,KAAI;AAC/B,YAAA,IAAY,CAAC,KAAK,IAAI;YACxB,OAAOA,kBAAO,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACzC,CAAC;AACF,KAAA,CAAC;AACJ;AAEA;AACA,uBAAuB,EAAE;;;;;"}
+{"version":3,"file":"comlink.setup.js","sources":["../../../../src/worker/comlink.setup.ts"],"sourcesContent":["// src/worker/comlink.setup.ts\nimport * as Comlink from 'comlink'\nimport { MessageChannel } from 'node:worker_threads'\n\n// Use deep import path — Comlink has no `exports` field (issue #508)\n// @ts-expect-error — Comlink's node-adapter has no type declarations at this path\nimport nodeEndpoint from 'comlink/dist/esm/node-adapter.mjs'\n\n/**\n * Fix Comlink.proxy() for Node.js worker_threads (issue #313).\n * The built-in proxy transfer handler uses browser MessageChannel.\n * This override uses Node's MessageChannel instead.\n *\n * Must be called on BOTH main thread and worker before any Comlink usage.\n */\nfunction installNodeProxyHandler() {\n  Comlink.transferHandlers.set('proxy', {\n    canHandle: (obj: unknown): obj is { [Comlink.proxyMarker]: true } =>\n      (typeof obj === 'object' || typeof obj === 'function') && obj !== null && Comlink.proxyMarker in obj,\n    serialize: (obj: unknown) => {\n      const { port1, port2 } = new MessageChannel()\n      Comlink.expose(obj, nodeEndpoint(port1))\n      return [port2, [port2]]\n    },\n    deserialize: (port: MessagePort) => {\n      ;(port as any).start?.()\n      return Comlink.wrap(nodeEndpoint(port))\n    },\n  })\n}\n\n// Install immediately on import\ninstallNodeProxyHandler()\n\nexport { Comlink, nodeEndpoint }\n"],"names":["Comlink","MessageChannel"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAQA;;;;;;AAMG;AACH,SAAS,uBAAuB,GAAA;AAC9B,IAAAA,kBAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE;QACpC,SAAS,EAAE,CAAC,GAAY,KACtB,CAAC,OAAO,GAAG,KAAK,QAAQ,IAAI,OAAO,GAAG,KAAK,UAAU,KAAK,GAAG,KAAK,IAAI,IAAIA,kBAAO,CAAC,WAAW,IAAI,GAAG;AACtG,QAAA,SAAS,EAAE,CAAC,GAAY,KAAI;YAC1B,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,IAAIC,kCAAc,EAAE;YAC7CD,kBAAO,CAAC,MAAM,CAAC,GAAG,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC;AACxC,YAAA,OAAO,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC;AACD,QAAA,WAAW,EAAE,CAAC,IAAiB,KAAI;AAC/B,YAAA,IAAY,CAAC,KAAK,IAAI;YACxB,OAAOA,kBAAO,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACzC,CAAC;AACF,KAAA,CAAC;AACJ;AAEA;AACA,uBAAuB,EAAE;;;;;"}

package/dist/cjs/worker/render.worker.js

@@ -2,6 +2,7 @@
 
 var node_worker_threads = require('node:worker_threads');
 require('./comlink.setup.js');
+var comlink_pool = require('./comlink.pool.js');
 var root_canvas = require('../canvas/root.canvas.js');
 var Comlink = require('comlink');
 var nodeEndpoint = require('comlink/dist/esm/node-adapter.mjs');
@@ -31,8 +32,9 @@ if (!node_worker_threads.parentPort) {
 const canvases = new Map();
 let nextCanvasId = 0;
 const api = {
-    async render(props) {
-        const canvas = await new root_canvas.RootNode(props).render();
+    async render(props, callFn) {
+        const resolved = callFn ? comlink_pool.restoreFunctions(props, callFn) : props;
+        const canvas = await new root_canvas.RootNode(resolved).render();
         const canvasId = nextCanvasId++;
         canvases.set(canvasId, canvas);
         const result = {

package/dist/cjs/worker/render.worker.js.map

@@ -1 +1 @@
-{"version":3,"file":"render.worker.js","sources":["../../../../src/worker/render.worker.ts"],"sourcesContent":["import { parentPort } from 'node:worker_threads'\nimport { Comlink, nodeEndpoint } from '@/worker/comlink.setup.js'\nimport { RootNode } from '@/canvas/root.canvas.js'\nimport type { Canvas } from 'skia-canvas'\nimport type { WorkerAPI, RenderResult } from '@/worker/worker.types.js'\n\nif (!parentPort) {\n  throw new Error('[render.worker] Must be run as a worker thread')\n}\n\nconst canvases = new Map<number, Canvas>()\nlet nextCanvasId = 0\n\nconst api: WorkerAPI = {\n  async render(props) {\n    const canvas = await new RootNode(props).render()\n    const canvasId = nextCanvasId++\n    canvases.set(canvasId, canvas)\n    const result: RenderResult = {\n      canvasId,\n      buffer: canvas.toBufferSync('png'),\n      width: canvas.width,\n      height: canvas.height,\n    }\n    return result\n  },\n\n  async callOnCanvas(canvasId, method, args) {\n    const canvas = canvases.get(canvasId)\n    if (!canvas) {\n      throw new Error(`[render.worker] Canvas ${canvasId} not found`)\n    }\n    switch (method) {\n      case 'toBuffer':\n        return canvas.toBuffer(...(args as [any, any?]))\n      case 'toURL':\n        return canvas.toURL(...(args as [any, any?]))\n      case 'toFile':\n        await canvas.toFile(...(args as [string, any?]))\n        return\n      case 'toSharp':\n        return await canvas.toSharp(...(args as [any?])).toBuffer()\n      default:\n        throw new Error(`[render.worker] Unknown method: ${method}`)\n    }\n  },\n\n  releaseCanvas(canvasId) {\n    canvases.delete(canvasId)\n  },\n}\n\nComlink.expose(api, nodeEndpoint(parentPort))\n"],"names":["parentPort","RootNode","Comlink"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAMA,IAAI,CAACA,8BAAU,EAAE;AACf,IAAA,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC;AACnE;AAEA,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAkB;AAC1C,IAAI,YAAY,GAAG,CAAC;AAEpB,MAAM,GAAG,GAAc;IACrB,MAAM,MAAM,CAAC,KAAK,EAAA;QAChB,MAAM,MAAM,GAAG,MAAM,IAAIC,oBAAQ,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE;AACjD,QAAA,MAAM,QAAQ,GAAG,YAAY,EAAE;AAC/B,QAAA,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC;AAC9B,QAAA,MAAM,MAAM,GAAiB;YAC3B,QAAQ;AACR,YAAA,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC;YAClC,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,MAAM,EAAE,MAAM,CAAC,MAAM;SACtB;AACD,QAAA,OAAO,MAAM;IACf,CAAC;AAED,IAAA,MAAM,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAA;QACvC,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC;QACrC,IAAI,CAAC,MAAM,EAAE;AACX,YAAA,MAAM,IAAI,KAAK,CAAC,0BAA0B,QAAQ,CAAA,UAAA,CAAY,CAAC;QACjE;QACA,QAAQ,MAAM;AACZ,YAAA,KAAK,UAAU;AACb,gBAAA,OAAO,MAAM,CAAC,QAAQ,CAAC,GAAI,IAAoB,CAAC;AAClD,YAAA,KAAK,OAAO;AACV,gBAAA,OAAO,MAAM,CAAC,KAAK,CAAC,GAAI,IAAoB,CAAC;AAC/C,YAAA,KAAK,QAAQ;AACX,gBAAA,MAAM,MAAM,CAAC,MAAM,CAAC,GAAI,IAAuB,CAAC;gBAChD;AACF,YAAA,KAAK,SAAS;gBACZ,OAAO,MAAM,MAAM,CAAC,OAAO,CAAC,GAAI,IAAe,CAAC,CAAC,QAAQ,EAAE;AAC7D,YAAA;AACE,gBAAA,MAAM,IAAI,KAAK,CAAC,mCAAmC,MAAM,CAAA,CAAE,CAAC;;IAElE,CAAC;AAED,IAAA,aAAa,CAAC,QAAQ,EAAA;AACpB,QAAA,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC;IAC3B,CAAC;CACF;AAEDC,kBAAO,CAAC,MAAM,CAAC,GAAG,EAAE,YAAY,CAACF,8BAAU,CAAC,CAAC;;"}
+{"version":3,"file":"render.worker.js","sources":["../../../../src/worker/render.worker.ts"],"sourcesContent":["import { parentPort } from 'node:worker_threads'\nimport { Comlink, nodeEndpoint } from '@/worker/comlink.setup.js'\nimport { restoreFunctions } from '@/worker/comlink.pool.js'\nimport { RootNode } from '@/canvas/root.canvas.js'\nimport type { Canvas } from 'skia-canvas'\nimport type { WorkerAPI, RenderResult, CallFn } from '@/worker/worker.types.js'\n\nif (!parentPort) {\n  throw new Error('[render.worker] Must be run as a worker thread')\n}\n\nconst canvases = new Map<number, Canvas>()\nlet nextCanvasId = 0\n\nconst api: WorkerAPI = {\n  async render(props, callFn?: CallFn) {\n    const resolved = callFn ? restoreFunctions(props, callFn) : props\n    const canvas = await new RootNode(resolved).render()\n    const canvasId = nextCanvasId++\n    canvases.set(canvasId, canvas)\n    const result: RenderResult = {\n      canvasId,\n      buffer: canvas.toBufferSync('png'),\n      width: canvas.width,\n      height: canvas.height,\n    }\n    return result\n  },\n\n  async callOnCanvas(canvasId, method, args) {\n    const canvas = canvases.get(canvasId)\n    if (!canvas) {\n      throw new Error(`[render.worker] Canvas ${canvasId} not found`)\n    }\n    switch (method) {\n      case 'toBuffer':\n        return canvas.toBuffer(...(args as [any, any?]))\n      case 'toURL':\n        return canvas.toURL(...(args as [any, any?]))\n      case 'toFile':\n        await canvas.toFile(...(args as [string, any?]))\n        return\n      case 'toSharp':\n        return await canvas.toSharp(...(args as [any?])).toBuffer()\n      default:\n        throw new Error(`[render.worker] Unknown method: ${method}`)\n    }\n  },\n\n  releaseCanvas(canvasId) {\n    canvases.delete(canvasId)\n  },\n}\n\nComlink.expose(api, nodeEndpoint(parentPort))\n"],"names":["parentPort","restoreFunctions","RootNode","Comlink"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAOA,IAAI,CAACA,8BAAU,EAAE;AACf,IAAA,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC;AACnE;AAEA,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAkB;AAC1C,IAAI,YAAY,GAAG,CAAC;AAEpB,MAAM,GAAG,GAAc;AACrB,IAAA,MAAM,MAAM,CAAC,KAAK,EAAE,MAAe,EAAA;AACjC,QAAA,MAAM,QAAQ,GAAG,MAAM,GAAGC,6BAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,KAAK;QACjE,MAAM,MAAM,GAAG,MAAM,IAAIC,oBAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE;AACpD,QAAA,MAAM,QAAQ,GAAG,YAAY,EAAE;AAC/B,QAAA,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC;AAC9B,QAAA,MAAM,MAAM,GAAiB;YAC3B,QAAQ;AACR,YAAA,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC;YAClC,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,MAAM,EAAE,MAAM,CAAC,MAAM;SACtB;AACD,QAAA,OAAO,MAAM;IACf,CAAC;AAED,IAAA,MAAM,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAA;QACvC,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC;QACrC,IAAI,CAAC,MAAM,EAAE;AACX,YAAA,MAAM,IAAI,KAAK,CAAC,0BAA0B,QAAQ,CAAA,UAAA,CAAY,CAAC;QACjE;QACA,QAAQ,MAAM;AACZ,YAAA,KAAK,UAAU;AACb,gBAAA,OAAO,MAAM,CAAC,QAAQ,CAAC,GAAI,IAAoB,CAAC;AAClD,YAAA,KAAK,OAAO;AACV,gBAAA,OAAO,MAAM,CAAC,KAAK,CAAC,GAAI,IAAoB,CAAC;AAC/C,YAAA,KAAK,QAAQ;AACX,gBAAA,MAAM,MAAM,CAAC,MAAM,CAAC,GAAI,IAAuB,CAAC;gBAChD;AACF,YAAA,KAAK,SAAS;gBACZ,OAAO,MAAM,MAAM,CAAC,OAAO,CAAC,GAAI,IAAe,CAAC,CAAC,QAAQ,EAAE;AAC7D,YAAA;AACE,gBAAA,MAAM,IAAI,KAAK,CAAC,mCAAmC,MAAM,CAAA,CAAE,CAAC;;IAElE,CAAC;AAED,IAAA,aAAa,CAAC,QAAQ,EAAA;AACpB,QAAA,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC;IAC3B,CAAC;CACF;AAEDC,kBAAO,CAAC,MAAM,CAAC,GAAG,EAAE,YAAY,CAACH,8BAAU,CAAC,CAAC;;"}

package/dist/cjs/worker/worker.types.d.ts

@@ -1,4 +1,5 @@
 import type { RootProps } from '../canvas/canvas.type.js';
+export type CallFn = (id: number, ...args: unknown[]) => Promise<unknown>;
 export interface RenderResult {
     canvasId: number;
     buffer: Buffer;
@@ -6,7 +7,7 @@ export interface RenderResult {
     height: number;
 }
 export interface WorkerAPI {
-    render(props: RootProps): Promise<RenderResult>;
+    render(props: RootProps, callFn?: CallFn): Promise<RenderResult>;
     callOnCanvas(canvasId: number, method: string, args: unknown[]): Promise<Buffer | string | void>;
     releaseCanvas(canvasId: number): void;
 }

package/dist/cjs/worker/worker.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker.types.d.ts","sourceRoot":"","sources":["../../../src/worker/worker.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,SAAS;IACxB,MAAM,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;IAC/C,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC,CAAA;IAChG,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;CACtC"}
+{"version":3,"file":"worker.types.d.ts","sourceRoot":"","sources":["../../../src/worker/worker.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD,MAAM,MAAM,MAAM,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;AAEzE,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,SAAS;IACxB,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;IAChE,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC,CAAA;IAChG,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;CACtC"}

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

@@ -3,11 +3,22 @@ import type { RootProps } from '../canvas/canvas.type.js';
 export interface PoolRenderResult extends RenderResult {
     workerIdx: number;
 }
+/** Sentinel embedded in serialized props to mark where a function was extracted. */
+export declare const FN_MARKER = "__comlinkFnId";
 /**
- * Deeply walks an object tree, wraps any function values with Comlink.proxy(),
- * and tracks wrapped proxies for deterministic cleanup.
+ * Deeply walks an object tree, replaces function values with `{ [FN_MARKER]: id }` sentinels,
+ * and collects the original functions in a Map keyed by their assigned id.
+ * Returns the cleaned (function-free) tree that is safe for structured clone.
  */
-export declare function wrapFunctions<T>(obj: T, proxies: Set<unknown>): T;
+export declare function extractFunctions<T>(obj: T, fnMap: Map<number, (...args: unknown[]) => unknown>, nextId: {
+    value: number;
+}): T;
+/**
+ * Deeply walks an object tree received on the worker side, replaces
+ * `{ [FN_MARKER]: id }` sentinels with async functions that delegate
+ * to the main-thread callback proxy.
+ */
+export declare function restoreFunctions<T>(obj: T, callFn: (id: number, ...args: unknown[]) => Promise<unknown>): T;
 /**
  * Pool of Comlink-wrapped worker threads.
  * Manages idle/queue scheduling and proxy lifecycle.

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,EAAE,MAAM,0BAA0B,CAAA;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD,MAAM,WAAW,gBAAiB,SAAQ,YAAY;IACpD,SAAS,EAAE,MAAM,CAAA;CAClB;AAQD;;;GAGG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAuBjE;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;IAWrB,MAAM,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA0CzD,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;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"}

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

@@ -5,17 +5,20 @@ import './comlink.setup.js';
 import * as Comlink from 'comlink';
 import nodeEndpoint from 'comlink/dist/esm/node-adapter.mjs';
 
+/** Sentinel embedded in serialized props to mark where a function was extracted. */
+const FN_MARKER = '__comlinkFnId';
 /**
- * Deeply walks an object tree, wraps any function values with Comlink.proxy(),
- * and tracks wrapped proxies for deterministic cleanup.
+ * Deeply walks an object tree, replaces function values with `{ [FN_MARKER]: id }` sentinels,
+ * and collects the original functions in a Map keyed by their assigned id.
+ * Returns the cleaned (function-free) tree that is safe for structured clone.
  */
-function wrapFunctions(obj, proxies) {
+function extractFunctions(obj, fnMap, nextId) {
     if (obj === null || obj === undefined)
         return obj;
     if (typeof obj === 'function') {
-        const wrapped = Comlink.proxy(obj);
-        proxies.add(wrapped);
-        return wrapped;
+        const id = nextId.value++;
+        fnMap.set(id, obj);
+        return { [FN_MARKER]: id };
     }
     if (typeof obj !== 'object')
         return obj;
@@ -27,11 +30,41 @@ function wrapFunctions(obj, proxies) {
     if (ArrayBuffer.isView(obj))
         return obj;
     if (Array.isArray(obj)) {
-        return obj.map(item => wrapFunctions(item, proxies));
+        return obj.map(item => extractFunctions(item, fnMap, nextId));
     }
     const result = {};
     for (const key of Object.keys(obj)) {
-        result[key] = wrapFunctions(obj[key], proxies);
+        result[key] = extractFunctions(obj[key], fnMap, nextId);
+    }
+    return result;
+}
+/**
+ * Deeply walks an object tree received on the worker side, replaces
+ * `{ [FN_MARKER]: id }` sentinels with async functions that delegate
+ * to the main-thread callback proxy.
+ */
+function restoreFunctions(obj, callFn) {
+    if (obj === null || obj === undefined)
+        return obj;
+    if (typeof obj !== 'object')
+        return obj;
+    if (Buffer.isBuffer(obj))
+        return obj;
+    if (obj instanceof ArrayBuffer)
+        return obj;
+    if (ArrayBuffer.isView(obj))
+        return obj;
+    // Check for sentinel
+    if (FN_MARKER in obj) {
+        const id = obj[FN_MARKER];
+        return ((...args) => callFn(id, ...args));
+    }
+    if (Array.isArray(obj)) {
+        return obj.map(item => restoreFunctions(item, callFn));
+    }
+    const result = {};
+    for (const key of Object.keys(obj)) {
+        result[key] = restoreFunctions(obj[key], callFn);
     }
     return result;
 }
@@ -65,12 +98,12 @@ class ComlinkPool {
         while (this.queue.length > 0 && this.idle.length > 0) {
             const task = this.queue.shift();
             const idx = this.idle.pop();
-            void this.executeRender(idx, task.props, task.resolve, task.reject);
+            void this.executeRender(idx, task.props, task.callFn, task.resolve, task.reject);
         }
     }
-    async executeRender(idx, props, resolve, reject) {
+    async executeRender(idx, props, callFn, resolve, reject) {
         try {
-            const result = await this.endpoints[idx].render(props);
+            const result = await this.endpoints[idx].render(props, callFn);
             resolve({ ...result, workerIdx: idx });
         }
         catch (err) {
@@ -81,13 +114,25 @@ class ComlinkPool {
         }
     }
     async render(props) {
-        const proxies = new Set();
-        const wrapped = wrapFunctions(props, proxies);
+        // 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.
+        const fnMap = new Map();
+        const cleaned = extractFunctions(props, fnMap, { value: 0 });
+        let callFnProxy;
+        if (fnMap.size > 0) {
+            callFnProxy = Comlink.proxy(async (id, ...args) => {
+                const fn = fnMap.get(id);
+                if (!fn)
+                    throw new Error(`[ComlinkPool] Function #${id} not found`);
+                return fn(...args);
+            });
+        }
         const cleanup = () => {
-            for (const p of proxies) {
+            if (callFnProxy) {
                 try {
                     ;
-                    p[Comlink.releaseProxy]?.();
+                    callFnProxy[Comlink.releaseProxy]?.();
                 }
                 catch {
                     // Proxy may already be released
@@ -98,7 +143,7 @@ class ComlinkPool {
         const idx = this.acquire();
         if (idx !== null) {
             try {
-                const result = await this.endpoints[idx].render(wrapped);
+                const result = await this.endpoints[idx].render(cleaned, callFnProxy);
                 return { ...result, workerIdx: idx };
             }
             finally {
@@ -109,7 +154,8 @@ class ComlinkPool {
         // Queued path — cleanup AFTER the queued task completes, not before
         return new Promise((resolve, reject) => {
             this.queue.push({
-                props: wrapped,
+                props: cleaned,
+                callFn: callFnProxy,
                 resolve: result => {
                     cleanup();
                     resolve(result);
@@ -136,4 +182,4 @@ class ComlinkPool {
     }
 }
 
-export { ComlinkPool, wrapFunctions };
+export { ComlinkPool, FN_MARKER, extractFunctions, restoreFunctions };

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;AA2B5D,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;AAKlC,OAAO,YAAY,MAAM,mCAAmC,CAAA;AA4B5D,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,CAAA"}

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

@@ -14,7 +14,7 @@ export { default as nodeEndpoint } from 'comlink/dist/esm/node-adapter.mjs';
  */
 function installNodeProxyHandler() {
     Comlink.transferHandlers.set('proxy', {
-        canHandle: (obj) => typeof obj === 'object' && obj !== null && Comlink.proxyMarker in obj,
+        canHandle: (obj) => (typeof obj === 'object' || typeof obj === 'function') && obj !== null && Comlink.proxyMarker in obj,
         serialize: (obj) => {
             const { port1, port2 } = new MessageChannel();
             Comlink.expose(obj, nodeEndpoint(port1));

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

@@ -1,5 +1,6 @@
 import { parentPort } from 'node:worker_threads';
 import './comlink.setup.js';
+import { restoreFunctions } from './comlink.pool.js';
 import { RootNode } from '../canvas/root.canvas.js';
 import * as Comlink from 'comlink';
 import nodeEndpoint from 'comlink/dist/esm/node-adapter.mjs';
@@ -10,8 +11,9 @@ if (!parentPort) {
 const canvases = new Map();
 let nextCanvasId = 0;
 const api = {
-    async render(props) {
-        const canvas = await new RootNode(props).render();
+    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 = {

package/dist/esm/worker/worker.types.d.ts

@@ -1,4 +1,5 @@
 import type { RootProps } from '../canvas/canvas.type.js';
+export type CallFn = (id: number, ...args: unknown[]) => Promise<unknown>;
 export interface RenderResult {
     canvasId: number;
     buffer: Buffer;
@@ -6,7 +7,7 @@ export interface RenderResult {
     height: number;
 }
 export interface WorkerAPI {
-    render(props: RootProps): Promise<RenderResult>;
+    render(props: RootProps, callFn?: CallFn): Promise<RenderResult>;
     callOnCanvas(canvasId: number, method: string, args: unknown[]): Promise<Buffer | string | void>;
     releaseCanvas(canvasId: number): void;
 }

package/dist/esm/worker/worker.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker.types.d.ts","sourceRoot":"","sources":["../../../src/worker/worker.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,SAAS;IACxB,MAAM,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;IAC/C,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC,CAAA;IAChG,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;CACtC"}
+{"version":3,"file":"worker.types.d.ts","sourceRoot":"","sources":["../../../src/worker/worker.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD,MAAM,MAAM,MAAM,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;AAEzE,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,SAAS;IACxB,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;IAChE,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC,CAAA;IAChG,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;CACtC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meonode/canvas",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "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",