@shotstack/shotstack-canvas 1.8.5 → 1.9.1

package/dist/entry.node.cjs

@@ -346,6 +346,10 @@ function setupWasmInterceptors(wasmBinary) {
     if (bufferSourceOrModule instanceof WebAssembly.Module) {
       return originalInstantiate.call(WebAssembly, bufferSourceOrModule, importObject);
     }
+    const inputSize = bufferSourceOrModule instanceof ArrayBuffer ? bufferSourceOrModule.byteLength : bufferSourceOrModule.byteLength;
+    if (inputSize !== wasmBinary.byteLength) {
+      return originalInstantiate.call(WebAssembly, bufferSourceOrModule, importObject);
+    }
     const module2 = await WebAssembly.compile(wasmBinary);
     const instance = await originalInstantiate.call(
       WebAssembly,
@@ -367,9 +371,7 @@ function setupWasmInterceptors(wasmBinary) {
         }
         return originalInstantiateStreaming.call(WebAssembly, response, importObject);
       } catch (err) {
-        const module2 = await WebAssembly.compile(wasmBinary);
-        const instance = await WebAssembly.instantiate(module2, importObject);
-        return { module: module2, instance };
+        throw err;
       }
     };
   }

package/dist/entry.node.js

@@ -302,6 +302,10 @@ function setupWasmInterceptors(wasmBinary) {
     if (bufferSourceOrModule instanceof WebAssembly.Module) {
       return originalInstantiate.call(WebAssembly, bufferSourceOrModule, importObject);
     }
+    const inputSize = bufferSourceOrModule instanceof ArrayBuffer ? bufferSourceOrModule.byteLength : bufferSourceOrModule.byteLength;
+    if (inputSize !== wasmBinary.byteLength) {
+      return originalInstantiate.call(WebAssembly, bufferSourceOrModule, importObject);
+    }
     const module = await WebAssembly.compile(wasmBinary);
     const instance = await originalInstantiate.call(
       WebAssembly,
@@ -323,9 +327,7 @@ function setupWasmInterceptors(wasmBinary) {
         }
         return originalInstantiateStreaming.call(WebAssembly, response, importObject);
       } catch (err) {
-        const module = await WebAssembly.compile(wasmBinary);
-        const instance = await WebAssembly.instantiate(module, importObject);
-        return { module, instance };
+        throw err;
       }
     };
   }

package/dist/entry.web.d.ts

@@ -528,7 +528,7 @@ interface ResvgRenderResult {
     width: number;
     height: number;
 }
-declare function initResvg(wasmBinary?: ArrayBuffer): Promise<void>;
+declare function initResvg(wasmBinary?: ArrayBuffer | string): Promise<void>;
 declare function renderSvgToPng(svgString: string, options?: ResvgRenderOptions): Promise<ResvgRenderResult>;
 declare function shapeToSvgString(asset: CanvasSvgAsset, defaultWidth: number, defaultHeight: number): string;
 declare function generateShapePathData(shape: NonNullable<CanvasSvgAsset["shape"]>): string;

package/dist/entry.web.js

@@ -306,6 +306,10 @@ function setupWasmInterceptors(wasmBinary) {
     if (bufferSourceOrModule instanceof WebAssembly.Module) {
       return originalInstantiate.call(WebAssembly, bufferSourceOrModule, importObject);
     }
+    const inputSize = bufferSourceOrModule instanceof ArrayBuffer ? bufferSourceOrModule.byteLength : bufferSourceOrModule.byteLength;
+    if (inputSize !== wasmBinary.byteLength) {
+      return originalInstantiate.call(WebAssembly, bufferSourceOrModule, importObject);
+    }
     const module = await WebAssembly.compile(wasmBinary);
     const instance = await originalInstantiate.call(
       WebAssembly,
@@ -327,9 +331,7 @@ function setupWasmInterceptors(wasmBinary) {
         }
         return originalInstantiateStreaming.call(WebAssembly, response, importObject);
       } catch (err) {
-        const module = await WebAssembly.compile(wasmBinary);
-        const instance = await WebAssembly.instantiate(module, importObject);
-        return { module, instance };
+        throw err;
       }
     };
   }
@@ -2748,17 +2750,55 @@ function quadraticToCubic(x0, y0, qx, qy, x, y) {
 // src/core/resvg-renderer-web.ts
 var resvgWasmModule = null;
 var wasmInitialized = false;
-async function initResvgWasm() {
+var DEFAULT_RESVG_WASM_URL = "https://unpkg.com/@resvg/resvg-wasm@2.6.2/index_bg.wasm";
+async function fetchResvgWasmFromUrl(url) {
+  try {
+    const response = await fetch(url);
+    if (response.ok) {
+      const arrayBuffer = await response.arrayBuffer();
+      const bytes = new Uint8Array(arrayBuffer);
+      if (bytes.length >= 4 && bytes[0] === 0 && bytes[1] === 97 && bytes[2] === 115 && bytes[3] === 109) {
+        return arrayBuffer;
+      } else {
+        console.error(`Invalid WASM magic number from URL: ${url}`);
+      }
+    } else {
+      console.error(`Failed to fetch resvg WASM from URL: ${url}, status: ${response.status}`);
+    }
+    return void 0;
+  } catch (err) {
+    console.error(`Error fetching resvg WASM from ${url}:`, err);
+    return void 0;
+  }
+}
+async function loadResvgWasmWeb(wasmBaseURL) {
+  try {
+    if (wasmBaseURL) {
+      const url = wasmBaseURL.endsWith(".wasm") ? wasmBaseURL : wasmBaseURL.endsWith("/") ? `${wasmBaseURL}resvg.wasm` : `${wasmBaseURL}/resvg.wasm`;
+      const result = await fetchResvgWasmFromUrl(url);
+      if (result) return result;
+    }
+    return void 0;
+  } catch (err) {
+    console.error("Error in loadResvgWasmWeb:", err);
+    return void 0;
+  }
+}
+async function initResvgWasm(wasmBaseURL) {
   if (resvgWasmModule && wasmInitialized) {
     return resvgWasmModule;
   }
   const wasmModule = await import("@resvg/resvg-wasm");
   resvgWasmModule = wasmModule;
   if (!wasmInitialized) {
-    const wasmUrl = new URL("@resvg/resvg-wasm/index_bg.wasm", import.meta.url);
-    const wasmResponse = await fetch(wasmUrl);
-    const wasmBytes = await wasmResponse.arrayBuffer();
-    const compiled = await WebAssembly.compile(wasmBytes);
+    let wasmBinary = await loadResvgWasmWeb(wasmBaseURL);
+    if (!wasmBinary) {
+      wasmBinary = await fetchResvgWasmFromUrl(DEFAULT_RESVG_WASM_URL);
+    }
+    if (!wasmBinary) {
+      throw new Error("Failed to load resvg WASM from any source");
+    }
+    const compiled = await WebAssembly.compile(wasmBinary);
     await resvgWasmModule.initWasm(compiled);
     wasmInitialized = true;
   }
@@ -2770,16 +2810,20 @@ async function initResvg(wasmBinary) {
   }
   const wasmModule = await import("@resvg/resvg-wasm");
   resvgWasmModule = wasmModule;
-  if (wasmBinary) {
-    const compiled = await WebAssembly.compile(wasmBinary);
-    await resvgWasmModule.initWasm(compiled);
+  let binary;
+  if (wasmBinary instanceof ArrayBuffer) {
+    binary = wasmBinary;
   } else {
-    const wasmUrl = new URL("@resvg/resvg-wasm/index_bg.wasm", import.meta.url);
-    const wasmResponse = await fetch(wasmUrl);
-    const wasmBytes = await wasmResponse.arrayBuffer();
-    const compiled = await WebAssembly.compile(wasmBytes);
-    await resvgWasmModule.initWasm(compiled);
+    binary = await loadResvgWasmWeb(wasmBinary);
+    if (!binary) {
+      binary = await fetchResvgWasmFromUrl(DEFAULT_RESVG_WASM_URL);
+    }
+  }
+  if (!binary) {
+    throw new Error("Failed to load resvg WASM from any source");
   }
+  const compiled = await WebAssembly.compile(binary);
+  await resvgWasmModule.initWasm(compiled);
   wasmInitialized = true;
 }
 async function renderSvgToPng(svgString, options = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shotstack/shotstack-canvas",
-  "version": "1.8.5",
+  "version": "1.9.1",
   "description": "Text layout & animation engine (HarfBuzz) for Node & Web - fully self-contained.",
   "type": "module",
   "main": "./dist/entry.node.cjs",