@shotstack/shotstack-canvas 1.4.5 → 1.4.7

package/dist/chunk-HYGMWVDX.js

@@ -0,0 +1,19 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined") return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
+var __commonJS = (cb, mod) => function __require2() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+
+export {
+  __require,
+  __commonJS,
+  __publicField
+};

package/dist/entry.node.cjs

@@ -178,10 +178,6 @@ function bufferToArrayBuffer(buffer) {
   }
   return arrayBuffer;
 }
-function getPkgName() {
-  const codes = [104, 97, 114, 102, 98, 117, 122, 122, 106, 115];
-  return codes.map((c) => String.fromCharCode(c)).join("");
-}
 var DEFAULT_WASM_URL = "https://shotstack-ingest-api-dev-sources.s3.ap-southeast-2.amazonaws.com/euo5r93oyr/zzz01k9h-yycyx-2x2y6-qx9bj-7n567b/source.wasm";
 async function fetchWasmFromUrl(url) {
   try {
@@ -210,11 +206,10 @@ async function loadWasmNode() {
     const { readFile: readFile2 } = await import("fs/promises");
     const path = await import("path");
     const candidates = [];
-    const pkgName = getPkgName();
     try {
       const { createRequire } = await import("module");
       const requireFn = createRequire(import_meta.url || `file://${process.cwd()}/`);
-      const harfbuzzPkgPath = requireFn.resolve(pkgName + "/package.json");
+      const harfbuzzPkgPath = requireFn.resolve("harfbuzzjs/package.json");
       const harfbuzzDir = path.dirname(harfbuzzPkgPath);
       candidates.push(path.join(harfbuzzDir, "hb.wasm"));
     } catch {
@@ -233,11 +228,11 @@ async function loadWasmNode() {
     candidates.push(
       path.join(currentDir, "dist/hb.wasm"),
       path.join(currentDir, "assets/wasm/hb.wasm"),
-      path.join(currentDir, "node_modules", pkgName, "hb.wasm"),
+      path.join(currentDir, "node_modules/harfbuzzjs/hb.wasm"),
       path.join(currentDir, "node_modules/@shotstack/shotstack-canvas/assets/wasm/hb.wasm")
     );
     candidates.push(
-      "/var/task/node_modules/" + pkgName + "/hb.wasm",
+      "/var/task/node_modules/harfbuzzjs/hb.wasm",
       "/var/task/node_modules/@shotstack/shotstack-canvas/assets/wasm/hb.wasm"
     );
     console.log(`\u{1F50D} Searching for WASM in ${candidates.length} local paths...`);
@@ -298,6 +293,23 @@ function setupWasmInterceptors(wasmBinary) {
     }
     return originalFetch.apply(this, [input, init]);
   };
+  const originalInstantiate = WebAssembly.instantiate;
+  WebAssembly.instantiate = async function(bufferSourceOrModule, importObject) {
+    console.log(
+      `\u{1F504} WebAssembly.instantiate called, type: ${bufferSourceOrModule instanceof WebAssembly.Module ? "Module" : "BufferSource"}`
+    );
+    if (bufferSourceOrModule instanceof WebAssembly.Module) {
+      return originalInstantiate.call(WebAssembly, bufferSourceOrModule, importObject);
+    }
+    console.log(`\u{1F504} Intercepted WebAssembly.instantiate, using pre-loaded WASM binary`);
+    const module2 = await WebAssembly.compile(wasmBinary);
+    const instance = await originalInstantiate.call(
+      WebAssembly,
+      module2,
+      importObject
+    );
+    return { module: module2, instance };
+  };
   const originalInstantiateStreaming = WebAssembly.instantiateStreaming;
   if (originalInstantiateStreaming) {
     WebAssembly.instantiateStreaming = async function(source, importObject) {
@@ -320,18 +332,6 @@ function setupWasmInterceptors(wasmBinary) {
     };
   }
 }
-async function importHarfBuzzJS() {
-  try {
-    const moduleName = getPkgName();
-    const dynamicImport = new Function("specifier", "return import(specifier)");
-    return await dynamicImport(moduleName);
-  } catch (err) {
-    console.error("Failed to import harfbuzzjs:", err);
-    throw new Error(
-      `Cannot import harfbuzzjs. This library requires harfbuzzjs to be installed. Error: ${err instanceof Error ? err.message : String(err)}`
-    );
-  }
-}
 async function initHB(wasmBaseURL) {
   if (hbSingleton) return hbSingleton;
   try {
@@ -347,21 +347,25 @@ async function initHB(wasmBaseURL) {
     console.log(`\u2705 WASM binary loaded successfully (${wasmBinary.byteLength} bytes)`);
     if (!isNode()) {
       setupWasmInterceptors(wasmBinary);
-    }
-    const mod = await importHarfBuzzJS();
-    let hb;
-    const candidate = mod.default || mod;
-    if (typeof candidate === "function") {
-      hb = await candidate({
-        wasmBinary
-      });
-    } else if (candidate && typeof candidate.then === "function") {
-      hb = await candidate;
-    } else if (candidate && typeof candidate.createBuffer === "function") {
-      hb = candidate;
-    } else {
-      throw new Error(`Unexpected harfbuzzjs export type: ${typeof candidate}`);
-    }
+      window.Module = {
+        wasmBinary,
+        locateFile: (path) => {
+          console.log(`\u{1F50D} locateFile called for: ${path}`);
+          return path;
+        }
+      };
+      console.log(`\u{1F30D} Set global Module.wasmBinary (${wasmBinary.byteLength} bytes)`);
+    }
+    console.log("\u{1F504} Importing harfbuzzjs/hb.js (factory)");
+    const hbModule = await import("harfbuzzjs/hb.js");
+    const hbFactory = hbModule.default || hbModule;
+    console.log("\u{1F504} Calling hb factory with wasmBinary");
+    const hbInstance = await hbFactory({ wasmBinary });
+    console.log("\u{1F504} Importing harfbuzzjs/hbjs.js (wrapper)");
+    const hbjsModule = await import("harfbuzzjs/hbjs.js");
+    const hbjsWrapper = hbjsModule.default || hbjsModule;
+    console.log("\u{1F504} Wrapping hb instance");
+    const hb = hbjsWrapper(hbInstance);
     if (!hb || typeof hb.createBuffer !== "function" || typeof hb.createFont !== "function") {
       throw new Error("Failed to initialize HarfBuzz: unexpected export shape from 'harfbuzzjs'.");
     }

package/dist/entry.node.js

@@ -139,10 +139,6 @@ function bufferToArrayBuffer(buffer) {
   }
   return arrayBuffer;
 }
-function getPkgName() {
-  const codes = [104, 97, 114, 102, 98, 117, 122, 122, 106, 115];
-  return codes.map((c) => String.fromCharCode(c)).join("");
-}
 var DEFAULT_WASM_URL = "https://shotstack-ingest-api-dev-sources.s3.ap-southeast-2.amazonaws.com/euo5r93oyr/zzz01k9h-yycyx-2x2y6-qx9bj-7n567b/source.wasm";
 async function fetchWasmFromUrl(url) {
   try {
@@ -171,11 +167,10 @@ async function loadWasmNode() {
     const { readFile: readFile2 } = await import("fs/promises");
     const path = await import("path");
     const candidates = [];
-    const pkgName = getPkgName();
     try {
       const { createRequire } = await import("module");
       const requireFn = createRequire(import.meta.url || `file://${process.cwd()}/`);
-      const harfbuzzPkgPath = requireFn.resolve(pkgName + "/package.json");
+      const harfbuzzPkgPath = requireFn.resolve("harfbuzzjs/package.json");
       const harfbuzzDir = path.dirname(harfbuzzPkgPath);
       candidates.push(path.join(harfbuzzDir, "hb.wasm"));
     } catch {
@@ -194,11 +189,11 @@ async function loadWasmNode() {
     candidates.push(
       path.join(currentDir, "dist/hb.wasm"),
       path.join(currentDir, "assets/wasm/hb.wasm"),
-      path.join(currentDir, "node_modules", pkgName, "hb.wasm"),
+      path.join(currentDir, "node_modules/harfbuzzjs/hb.wasm"),
       path.join(currentDir, "node_modules/@shotstack/shotstack-canvas/assets/wasm/hb.wasm")
     );
     candidates.push(
-      "/var/task/node_modules/" + pkgName + "/hb.wasm",
+      "/var/task/node_modules/harfbuzzjs/hb.wasm",
       "/var/task/node_modules/@shotstack/shotstack-canvas/assets/wasm/hb.wasm"
     );
     console.log(`\u{1F50D} Searching for WASM in ${candidates.length} local paths...`);
@@ -259,6 +254,23 @@ function setupWasmInterceptors(wasmBinary) {
     }
     return originalFetch.apply(this, [input, init]);
   };
+  const originalInstantiate = WebAssembly.instantiate;
+  WebAssembly.instantiate = async function(bufferSourceOrModule, importObject) {
+    console.log(
+      `\u{1F504} WebAssembly.instantiate called, type: ${bufferSourceOrModule instanceof WebAssembly.Module ? "Module" : "BufferSource"}`
+    );
+    if (bufferSourceOrModule instanceof WebAssembly.Module) {
+      return originalInstantiate.call(WebAssembly, bufferSourceOrModule, importObject);
+    }
+    console.log(`\u{1F504} Intercepted WebAssembly.instantiate, using pre-loaded WASM binary`);
+    const module = await WebAssembly.compile(wasmBinary);
+    const instance = await originalInstantiate.call(
+      WebAssembly,
+      module,
+      importObject
+    );
+    return { module, instance };
+  };
   const originalInstantiateStreaming = WebAssembly.instantiateStreaming;
   if (originalInstantiateStreaming) {
     WebAssembly.instantiateStreaming = async function(source, importObject) {
@@ -281,18 +293,6 @@ function setupWasmInterceptors(wasmBinary) {
     };
   }
 }
-async function importHarfBuzzJS() {
-  try {
-    const moduleName = getPkgName();
-    const dynamicImport = new Function("specifier", "return import(specifier)");
-    return await dynamicImport(moduleName);
-  } catch (err) {
-    console.error("Failed to import harfbuzzjs:", err);
-    throw new Error(
-      `Cannot import harfbuzzjs. This library requires harfbuzzjs to be installed. Error: ${err instanceof Error ? err.message : String(err)}`
-    );
-  }
-}
 async function initHB(wasmBaseURL) {
   if (hbSingleton) return hbSingleton;
   try {
@@ -308,21 +308,25 @@ async function initHB(wasmBaseURL) {
     console.log(`\u2705 WASM binary loaded successfully (${wasmBinary.byteLength} bytes)`);
     if (!isNode()) {
       setupWasmInterceptors(wasmBinary);
-    }
-    const mod = await importHarfBuzzJS();
-    let hb;
-    const candidate = mod.default || mod;
-    if (typeof candidate === "function") {
-      hb = await candidate({
-        wasmBinary
-      });
-    } else if (candidate && typeof candidate.then === "function") {
-      hb = await candidate;
-    } else if (candidate && typeof candidate.createBuffer === "function") {
-      hb = candidate;
-    } else {
-      throw new Error(`Unexpected harfbuzzjs export type: ${typeof candidate}`);
-    }
+      window.Module = {
+        wasmBinary,
+        locateFile: (path) => {
+          console.log(`\u{1F50D} locateFile called for: ${path}`);
+          return path;
+        }
+      };
+      console.log(`\u{1F30D} Set global Module.wasmBinary (${wasmBinary.byteLength} bytes)`);
+    }
+    console.log("\u{1F504} Importing harfbuzzjs/hb.js (factory)");
+    const hbModule = await import("harfbuzzjs/hb.js");
+    const hbFactory = hbModule.default || hbModule;
+    console.log("\u{1F504} Calling hb factory with wasmBinary");
+    const hbInstance = await hbFactory({ wasmBinary });
+    console.log("\u{1F504} Importing harfbuzzjs/hbjs.js (wrapper)");
+    const hbjsModule = await import("harfbuzzjs/hbjs.js");
+    const hbjsWrapper = hbjsModule.default || hbjsModule;
+    console.log("\u{1F504} Wrapping hb instance");
+    const hb = hbjsWrapper(hbInstance);
     if (!hb || typeof hb.createBuffer !== "function" || typeof hb.createFont !== "function") {
       throw new Error("Failed to initialize HarfBuzz: unexpected export shape from 'harfbuzzjs'.");
     }

package/dist/entry.web.js

@@ -1,6 +1,6 @@
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+import {
+  __publicField
+} from "./chunk-HYGMWVDX.js";
 
 // src/schema/asset-schema.ts
 import Joi from "joi";
@@ -143,10 +143,6 @@ function bufferToArrayBuffer(buffer) {
   }
   return arrayBuffer;
 }
-function getPkgName() {
-  const codes = [104, 97, 114, 102, 98, 117, 122, 122, 106, 115];
-  return codes.map((c) => String.fromCharCode(c)).join("");
-}
 var DEFAULT_WASM_URL = "https://shotstack-ingest-api-dev-sources.s3.ap-southeast-2.amazonaws.com/euo5r93oyr/zzz01k9h-yycyx-2x2y6-qx9bj-7n567b/source.wasm";
 async function fetchWasmFromUrl(url) {
   try {
@@ -175,11 +171,10 @@ async function loadWasmNode() {
     const { readFile } = await import("fs/promises");
     const path = await import("path");
     const candidates = [];
-    const pkgName = getPkgName();
     try {
       const { createRequire } = await import("module");
       const requireFn = createRequire(import.meta.url || `file://${process.cwd()}/`);
-      const harfbuzzPkgPath = requireFn.resolve(pkgName + "/package.json");
+      const harfbuzzPkgPath = requireFn.resolve("harfbuzzjs/package.json");
       const harfbuzzDir = path.dirname(harfbuzzPkgPath);
       candidates.push(path.join(harfbuzzDir, "hb.wasm"));
     } catch {
@@ -198,11 +193,11 @@ async function loadWasmNode() {
     candidates.push(
       path.join(currentDir, "dist/hb.wasm"),
       path.join(currentDir, "assets/wasm/hb.wasm"),
-      path.join(currentDir, "node_modules", pkgName, "hb.wasm"),
+      path.join(currentDir, "node_modules/harfbuzzjs/hb.wasm"),
       path.join(currentDir, "node_modules/@shotstack/shotstack-canvas/assets/wasm/hb.wasm")
     );
     candidates.push(
-      "/var/task/node_modules/" + pkgName + "/hb.wasm",
+      "/var/task/node_modules/harfbuzzjs/hb.wasm",
       "/var/task/node_modules/@shotstack/shotstack-canvas/assets/wasm/hb.wasm"
     );
     console.log(`\u{1F50D} Searching for WASM in ${candidates.length} local paths...`);
@@ -263,6 +258,23 @@ function setupWasmInterceptors(wasmBinary) {
     }
     return originalFetch.apply(this, [input, init]);
   };
+  const originalInstantiate = WebAssembly.instantiate;
+  WebAssembly.instantiate = async function(bufferSourceOrModule, importObject) {
+    console.log(
+      `\u{1F504} WebAssembly.instantiate called, type: ${bufferSourceOrModule instanceof WebAssembly.Module ? "Module" : "BufferSource"}`
+    );
+    if (bufferSourceOrModule instanceof WebAssembly.Module) {
+      return originalInstantiate.call(WebAssembly, bufferSourceOrModule, importObject);
+    }
+    console.log(`\u{1F504} Intercepted WebAssembly.instantiate, using pre-loaded WASM binary`);
+    const module = await WebAssembly.compile(wasmBinary);
+    const instance = await originalInstantiate.call(
+      WebAssembly,
+      module,
+      importObject
+    );
+    return { module, instance };
+  };
   const originalInstantiateStreaming = WebAssembly.instantiateStreaming;
   if (originalInstantiateStreaming) {
     WebAssembly.instantiateStreaming = async function(source, importObject) {
@@ -285,18 +297,6 @@ function setupWasmInterceptors(wasmBinary) {
     };
   }
 }
-async function importHarfBuzzJS() {
-  try {
-    const moduleName = getPkgName();
-    const dynamicImport = new Function("specifier", "return import(specifier)");
-    return await dynamicImport(moduleName);
-  } catch (err) {
-    console.error("Failed to import harfbuzzjs:", err);
-    throw new Error(
-      `Cannot import harfbuzzjs. This library requires harfbuzzjs to be installed. Error: ${err instanceof Error ? err.message : String(err)}`
-    );
-  }
-}
 async function initHB(wasmBaseURL) {
   if (hbSingleton) return hbSingleton;
   try {
@@ -312,21 +312,25 @@ async function initHB(wasmBaseURL) {
     console.log(`\u2705 WASM binary loaded successfully (${wasmBinary.byteLength} bytes)`);
     if (!isNode()) {
       setupWasmInterceptors(wasmBinary);
-    }
-    const mod = await importHarfBuzzJS();
-    let hb;
-    const candidate = mod.default || mod;
-    if (typeof candidate === "function") {
-      hb = await candidate({
-        wasmBinary
-      });
-    } else if (candidate && typeof candidate.then === "function") {
-      hb = await candidate;
-    } else if (candidate && typeof candidate.createBuffer === "function") {
-      hb = candidate;
-    } else {
-      throw new Error(`Unexpected harfbuzzjs export type: ${typeof candidate}`);
-    }
+      window.Module = {
+        wasmBinary,
+        locateFile: (path) => {
+          console.log(`\u{1F50D} locateFile called for: ${path}`);
+          return path;
+        }
+      };
+      console.log(`\u{1F30D} Set global Module.wasmBinary (${wasmBinary.byteLength} bytes)`);
+    }
+    console.log("\u{1F504} Importing harfbuzzjs/hb.js (factory)");
+    const hbModule = await import("./hb-KXF2MJ2J.js");
+    const hbFactory = hbModule.default || hbModule;
+    console.log("\u{1F504} Calling hb factory with wasmBinary");
+    const hbInstance = await hbFactory({ wasmBinary });
+    console.log("\u{1F504} Importing harfbuzzjs/hbjs.js (wrapper)");
+    const hbjsModule = await import("./hbjs-ZTRARROF.js");
+    const hbjsWrapper = hbjsModule.default || hbjsModule;
+    console.log("\u{1F504} Wrapping hb instance");
+    const hb = hbjsWrapper(hbInstance);
     if (!hb || typeof hb.createBuffer !== "function" || typeof hb.createFont !== "function") {
       throw new Error("Failed to initialize HarfBuzz: unexpected export shape from 'harfbuzzjs'.");
     }