@shotstack/shotstack-canvas 1.2.9 → 1.3.0

package/dist/entry.node.cjs

@@ -163,10 +163,49 @@ var RichTextAssetSchema = import_joi.default.object({
 }).unknown(false);
 
 // src/wasm/hb-loader.ts
+var import_meta = {};
 var hbSingleton = null;
 function isNode() {
   return typeof process !== "undefined" && process.versions != null && process.versions.node != null;
 }
+function bufferToArrayBuffer(buffer) {
+  if (buffer.buffer instanceof ArrayBuffer) {
+    return buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
+  }
+  const arrayBuffer = new ArrayBuffer(buffer.byteLength);
+  const view = new Uint8Array(arrayBuffer);
+  for (let i = 0; i < buffer.byteLength; i++) {
+    view[i] = buffer[i];
+  }
+  return arrayBuffer;
+}
+async function loadWasmNode() {
+  try {
+    const { readFile: readFile2 } = await import("fs/promises");
+    const { fileURLToPath } = await import("url");
+    const path = await import("path");
+    const currentDir = path.dirname(fileURLToPath(import_meta.url));
+    const candidates = [
+      path.join(currentDir, "../../dist/hb.wasm"),
+      path.join(currentDir, "../dist/hb.wasm"),
+      path.join(currentDir, "../../assets/wasm/hb.wasm"),
+      path.join(currentDir, "../assets/wasm/hb.wasm"),
+      path.join(currentDir, "./hb.wasm"),
+      path.join(currentDir, "../hb.wasm")
+    ];
+    for (const candidate of candidates) {
+      try {
+        const buffer = await readFile2(candidate);
+        return bufferToArrayBuffer(buffer);
+      } catch {
+        continue;
+      }
+    }
+    return void 0;
+  } catch {
+    return void 0;
+  }
+}
 async function loadWasmWeb(wasmBaseURL) {
   try {
     if (wasmBaseURL) {
@@ -188,14 +227,14 @@ async function loadWasmWeb(wasmBaseURL) {
     return void 0;
   }
 }
-function setupWasmFetchInterceptor(wasmBinary) {
+function setupWasmInterceptors(wasmBinary) {
   const originalFetch = window.fetch;
   window.fetch = function(input, init) {
     const url = typeof input === "string" ? input : input instanceof URL ? input.href : input.url;
-    if (url.includes("hb.wasm") || url.endsWith(".wasm")) {
+    if (url.includes("hb.wasm") || url.endsWith(".wasm") && !url.includes("source.wasm")) {
       console.log(`\u{1F504} Intercepted fetch for: ${url}`);
       return Promise.resolve(
-        new Response(wasmBinary, {
+        new Response(wasmBinary.slice(0), {
           status: 200,
           statusText: "OK",
           headers: {
@@ -207,28 +246,57 @@ function setupWasmFetchInterceptor(wasmBinary) {
     }
     return originalFetch.apply(this, [input, init]);
   };
+  const originalInstantiateStreaming = WebAssembly.instantiateStreaming;
+  if (originalInstantiateStreaming) {
+    WebAssembly.instantiateStreaming = async function(source, importObject) {
+      try {
+        const response = await source;
+        const url = response.url || "";
+        if (url.includes("hb.wasm") || url.endsWith(".wasm") && !url.includes("source.wasm")) {
+          console.log(`\u{1F504} Intercepted instantiateStreaming for: ${url}`);
+          const module2 = await WebAssembly.compile(wasmBinary);
+          const instance = await WebAssembly.instantiate(module2, importObject);
+          return { module: module2, instance };
+        }
+        return originalInstantiateStreaming.call(WebAssembly, response, importObject);
+      } catch (err) {
+        console.log("\u{1F504} instantiateStreaming failed, using pre-loaded binary");
+        const module2 = await WebAssembly.compile(wasmBinary);
+        const instance = await WebAssembly.instantiate(module2, importObject);
+        return { module: module2, instance };
+      }
+    };
+  }
 }
 async function initHB(wasmBaseURL) {
   if (hbSingleton) return hbSingleton;
   try {
     let wasmBinary;
-    wasmBinary = await loadWasmWeb(wasmBaseURL);
+    if (isNode()) {
+      wasmBinary = await loadWasmNode();
+    } else {
+      wasmBinary = await loadWasmWeb(wasmBaseURL);
+    }
     if (!wasmBinary) {
       throw new Error("Failed to load WASM binary from any source");
     }
     console.log(`\u2705 WASM binary loaded successfully (${wasmBinary.byteLength} bytes)`);
     if (!isNode()) {
-      setupWasmFetchInterceptor(wasmBinary);
+      setupWasmInterceptors(wasmBinary);
     }
     const mod = await import("harfbuzzjs");
-    const candidate = mod.default;
     let hb;
+    const candidate = mod.default || mod;
     if (typeof candidate === "function") {
-      hb = await candidate();
+      hb = await candidate({
+        wasmBinary
+      });
     } else if (candidate && typeof candidate.then === "function") {
       hb = await candidate;
-    } else {
+    } else if (candidate && typeof candidate.createBuffer === "function") {
       hb = candidate;
+    } else {
+      throw new Error(`Unexpected harfbuzzjs export type: ${typeof candidate}`);
     }
     if (!hb || typeof hb.createBuffer !== "function" || typeof hb.createFont !== "function") {
       throw new Error("Failed to initialize HarfBuzz: unexpected export shape from 'harfbuzzjs'.");
@@ -1620,7 +1688,7 @@ function tokenizePath2(d) {
 var import_promises = require("fs/promises");
 var http = __toESM(require("http"), 1);
 var https = __toESM(require("https"), 1);
-function bufferToArrayBuffer(buf) {
+function bufferToArrayBuffer2(buf) {
   const { buffer, byteOffset, byteLength } = buf;
   if (typeof SharedArrayBuffer !== "undefined" && buffer instanceof SharedArrayBuffer) {
     const ab2 = new ArrayBuffer(byteLength);
@@ -1669,10 +1737,10 @@ async function loadFileOrHttpToArrayBuffer(pathOrUrl) {
           reject(new Error(`Request timeout after 30s for ${pathOrUrl}`));
         });
       });
-      return bufferToArrayBuffer(buf2);
+      return bufferToArrayBuffer2(buf2);
     }
     const buf = await (0, import_promises.readFile)(pathOrUrl);
-    return bufferToArrayBuffer(buf);
+    return bufferToArrayBuffer2(buf);
   } catch (err) {
     if (err instanceof Error) {
       throw new Error(`Failed to load ${pathOrUrl}: ${err.message}`);

package/dist/entry.node.js

@@ -129,6 +129,44 @@ var hbSingleton = null;
 function isNode() {
   return typeof process !== "undefined" && process.versions != null && process.versions.node != null;
 }
+function bufferToArrayBuffer(buffer) {
+  if (buffer.buffer instanceof ArrayBuffer) {
+    return buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
+  }
+  const arrayBuffer = new ArrayBuffer(buffer.byteLength);
+  const view = new Uint8Array(arrayBuffer);
+  for (let i = 0; i < buffer.byteLength; i++) {
+    view[i] = buffer[i];
+  }
+  return arrayBuffer;
+}
+async function loadWasmNode() {
+  try {
+    const { readFile: readFile2 } = await import("fs/promises");
+    const { fileURLToPath } = await import("url");
+    const path = await import("path");
+    const currentDir = path.dirname(fileURLToPath(import.meta.url));
+    const candidates = [
+      path.join(currentDir, "../../dist/hb.wasm"),
+      path.join(currentDir, "../dist/hb.wasm"),
+      path.join(currentDir, "../../assets/wasm/hb.wasm"),
+      path.join(currentDir, "../assets/wasm/hb.wasm"),
+      path.join(currentDir, "./hb.wasm"),
+      path.join(currentDir, "../hb.wasm")
+    ];
+    for (const candidate of candidates) {
+      try {
+        const buffer = await readFile2(candidate);
+        return bufferToArrayBuffer(buffer);
+      } catch {
+        continue;
+      }
+    }
+    return void 0;
+  } catch {
+    return void 0;
+  }
+}
 async function loadWasmWeb(wasmBaseURL) {
   try {
     if (wasmBaseURL) {
@@ -150,14 +188,14 @@ async function loadWasmWeb(wasmBaseURL) {
     return void 0;
   }
 }
-function setupWasmFetchInterceptor(wasmBinary) {
+function setupWasmInterceptors(wasmBinary) {
   const originalFetch = window.fetch;
   window.fetch = function(input, init) {
     const url = typeof input === "string" ? input : input instanceof URL ? input.href : input.url;
-    if (url.includes("hb.wasm") || url.endsWith(".wasm")) {
+    if (url.includes("hb.wasm") || url.endsWith(".wasm") && !url.includes("source.wasm")) {
       console.log(`\u{1F504} Intercepted fetch for: ${url}`);
       return Promise.resolve(
-        new Response(wasmBinary, {
+        new Response(wasmBinary.slice(0), {
           status: 200,
           statusText: "OK",
           headers: {
@@ -169,28 +207,57 @@ function setupWasmFetchInterceptor(wasmBinary) {
     }
     return originalFetch.apply(this, [input, init]);
   };
+  const originalInstantiateStreaming = WebAssembly.instantiateStreaming;
+  if (originalInstantiateStreaming) {
+    WebAssembly.instantiateStreaming = async function(source, importObject) {
+      try {
+        const response = await source;
+        const url = response.url || "";
+        if (url.includes("hb.wasm") || url.endsWith(".wasm") && !url.includes("source.wasm")) {
+          console.log(`\u{1F504} Intercepted instantiateStreaming for: ${url}`);
+          const module = await WebAssembly.compile(wasmBinary);
+          const instance = await WebAssembly.instantiate(module, importObject);
+          return { module, instance };
+        }
+        return originalInstantiateStreaming.call(WebAssembly, response, importObject);
+      } catch (err) {
+        console.log("\u{1F504} instantiateStreaming failed, using pre-loaded binary");
+        const module = await WebAssembly.compile(wasmBinary);
+        const instance = await WebAssembly.instantiate(module, importObject);
+        return { module, instance };
+      }
+    };
+  }
 }
 async function initHB(wasmBaseURL) {
   if (hbSingleton) return hbSingleton;
   try {
     let wasmBinary;
-    wasmBinary = await loadWasmWeb(wasmBaseURL);
+    if (isNode()) {
+      wasmBinary = await loadWasmNode();
+    } else {
+      wasmBinary = await loadWasmWeb(wasmBaseURL);
+    }
     if (!wasmBinary) {
       throw new Error("Failed to load WASM binary from any source");
     }
     console.log(`\u2705 WASM binary loaded successfully (${wasmBinary.byteLength} bytes)`);
     if (!isNode()) {
-      setupWasmFetchInterceptor(wasmBinary);
+      setupWasmInterceptors(wasmBinary);
     }
     const mod = await import("harfbuzzjs");
-    const candidate = mod.default;
     let hb;
+    const candidate = mod.default || mod;
     if (typeof candidate === "function") {
-      hb = await candidate();
+      hb = await candidate({
+        wasmBinary
+      });
     } else if (candidate && typeof candidate.then === "function") {
       hb = await candidate;
-    } else {
+    } else if (candidate && typeof candidate.createBuffer === "function") {
       hb = candidate;
+    } else {
+      throw new Error(`Unexpected harfbuzzjs export type: ${typeof candidate}`);
     }
     if (!hb || typeof hb.createBuffer !== "function" || typeof hb.createFont !== "function") {
       throw new Error("Failed to initialize HarfBuzz: unexpected export shape from 'harfbuzzjs'.");
@@ -1582,7 +1649,7 @@ function tokenizePath2(d) {
 import { readFile } from "fs/promises";
 import * as http from "http";
 import * as https from "https";
-function bufferToArrayBuffer(buf) {
+function bufferToArrayBuffer2(buf) {
   const { buffer, byteOffset, byteLength } = buf;
   if (typeof SharedArrayBuffer !== "undefined" && buffer instanceof SharedArrayBuffer) {
     const ab2 = new ArrayBuffer(byteLength);
@@ -1631,10 +1698,10 @@ async function loadFileOrHttpToArrayBuffer(pathOrUrl) {
           reject(new Error(`Request timeout after 30s for ${pathOrUrl}`));
         });
       });
-      return bufferToArrayBuffer(buf2);
+      return bufferToArrayBuffer2(buf2);
     }
     const buf = await readFile(pathOrUrl);
-    return bufferToArrayBuffer(buf);
+    return bufferToArrayBuffer2(buf);
   } catch (err) {
     if (err instanceof Error) {
       throw new Error(`Failed to load ${pathOrUrl}: ${err.message}`);

package/dist/entry.web.js

@@ -133,6 +133,44 @@ var hbSingleton = null;
 function isNode() {
   return typeof process !== "undefined" && process.versions != null && process.versions.node != null;
 }
+function bufferToArrayBuffer(buffer) {
+  if (buffer.buffer instanceof ArrayBuffer) {
+    return buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
+  }
+  const arrayBuffer = new ArrayBuffer(buffer.byteLength);
+  const view = new Uint8Array(arrayBuffer);
+  for (let i = 0; i < buffer.byteLength; i++) {
+    view[i] = buffer[i];
+  }
+  return arrayBuffer;
+}
+async function loadWasmNode() {
+  try {
+    const { readFile } = await import("fs/promises");
+    const { fileURLToPath } = await import("url");
+    const path = await import("path");
+    const currentDir = path.dirname(fileURLToPath(import.meta.url));
+    const candidates = [
+      path.join(currentDir, "../../dist/hb.wasm"),
+      path.join(currentDir, "../dist/hb.wasm"),
+      path.join(currentDir, "../../assets/wasm/hb.wasm"),
+      path.join(currentDir, "../assets/wasm/hb.wasm"),
+      path.join(currentDir, "./hb.wasm"),
+      path.join(currentDir, "../hb.wasm")
+    ];
+    for (const candidate of candidates) {
+      try {
+        const buffer = await readFile(candidate);
+        return bufferToArrayBuffer(buffer);
+      } catch {
+        continue;
+      }
+    }
+    return void 0;
+  } catch {
+    return void 0;
+  }
+}
 async function loadWasmWeb(wasmBaseURL) {
   try {
     if (wasmBaseURL) {
@@ -154,14 +192,14 @@ async function loadWasmWeb(wasmBaseURL) {
     return void 0;
   }
 }
-function setupWasmFetchInterceptor(wasmBinary) {
+function setupWasmInterceptors(wasmBinary) {
   const originalFetch = window.fetch;
   window.fetch = function(input, init) {
     const url = typeof input === "string" ? input : input instanceof URL ? input.href : input.url;
-    if (url.includes("hb.wasm") || url.endsWith(".wasm")) {
+    if (url.includes("hb.wasm") || url.endsWith(".wasm") && !url.includes("source.wasm")) {
       console.log(`\u{1F504} Intercepted fetch for: ${url}`);
       return Promise.resolve(
-        new Response(wasmBinary, {
+        new Response(wasmBinary.slice(0), {
           status: 200,
           statusText: "OK",
           headers: {
@@ -173,28 +211,57 @@ function setupWasmFetchInterceptor(wasmBinary) {
     }
     return originalFetch.apply(this, [input, init]);
   };
+  const originalInstantiateStreaming = WebAssembly.instantiateStreaming;
+  if (originalInstantiateStreaming) {
+    WebAssembly.instantiateStreaming = async function(source, importObject) {
+      try {
+        const response = await source;
+        const url = response.url || "";
+        if (url.includes("hb.wasm") || url.endsWith(".wasm") && !url.includes("source.wasm")) {
+          console.log(`\u{1F504} Intercepted instantiateStreaming for: ${url}`);
+          const module = await WebAssembly.compile(wasmBinary);
+          const instance = await WebAssembly.instantiate(module, importObject);
+          return { module, instance };
+        }
+        return originalInstantiateStreaming.call(WebAssembly, response, importObject);
+      } catch (err) {
+        console.log("\u{1F504} instantiateStreaming failed, using pre-loaded binary");
+        const module = await WebAssembly.compile(wasmBinary);
+        const instance = await WebAssembly.instantiate(module, importObject);
+        return { module, instance };
+      }
+    };
+  }
 }
 async function initHB(wasmBaseURL) {
   if (hbSingleton) return hbSingleton;
   try {
     let wasmBinary;
-    wasmBinary = await loadWasmWeb(wasmBaseURL);
+    if (isNode()) {
+      wasmBinary = await loadWasmNode();
+    } else {
+      wasmBinary = await loadWasmWeb(wasmBaseURL);
+    }
     if (!wasmBinary) {
       throw new Error("Failed to load WASM binary from any source");
     }
     console.log(`\u2705 WASM binary loaded successfully (${wasmBinary.byteLength} bytes)`);
     if (!isNode()) {
-      setupWasmFetchInterceptor(wasmBinary);
+      setupWasmInterceptors(wasmBinary);
     }
     const mod = await import("harfbuzzjs");
-    const candidate = mod.default;
     let hb;
+    const candidate = mod.default || mod;
     if (typeof candidate === "function") {
-      hb = await candidate();
+      hb = await candidate({
+        wasmBinary
+      });
     } else if (candidate && typeof candidate.then === "function") {
       hb = await candidate;
-    } else {
+    } else if (candidate && typeof candidate.createBuffer === "function") {
       hb = candidate;
+    } else {
+      throw new Error(`Unexpected harfbuzzjs export type: ${typeof candidate}`);
     }
     if (!hb || typeof hb.createBuffer !== "function" || typeof hb.createFont !== "function") {
       throw new Error("Failed to initialize HarfBuzz: unexpected export shape from 'harfbuzzjs'.");

package/package.json

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