@tensor-cad/engine 0.1.0 → 0.1.2

package/index.js

@@ -176,15 +176,34 @@ function unwrap(text) {
 function point(options) {
   return options ? JSON.stringify(options) : "";
 }
+var WASM_MAGIC = [0, 97, 115, 109];
+function looksLikeWasm(bytes) {
+  if (bytes.byteLength < 4)
+    return false;
+  const head = new Uint8Array(bytes, 0, 4);
+  return WASM_MAGIC.every((b, i) => head[i] === b);
+}
 async function bytesOf(wasm) {
   if (wasm && typeof wasm !== "string" && !(wasm instanceof URL))
     return wasm;
-  const url = wasm ?? new URL("../wasm/tensorcad.wasm", import.meta.url);
-  const response = await fetch(url);
-  if (!response.ok) {
-    throw new EngineError(`Could not load the engine from ${String(url)}: ${response.status}`);
+  const urls = wasm ? [wasm] : [new URL("./tensorcad.wasm", import.meta.url)];
+  const tried = [];
+  for (const url of urls) {
+    try {
+      const response = await fetch(url);
+      if (!response.ok) {
+        tried.push(`${String(url)} (${response.status})`);
+        continue;
+      }
+      const bytes = await response.arrayBuffer();
+      if (looksLikeWasm(bytes))
+        return bytes;
+      tried.push(`${String(url)} (not WebAssembly — ${bytes.byteLength} bytes)`);
+    } catch (error) {
+      tried.push(`${String(url)} (${error.message})`);
+    }
   }
-  return await response.arrayBuffer();
+  throw new EngineError(`Could not load the engine. Tried ${tried.join(", ")}. ` + `Pass \`wasm\` to createEngine() if it lives somewhere else.`);
 }
 async function createEngine(options = {}) {
   if (typeof globalThis.Go !== "function") {

package/node.js

@@ -757,15 +757,34 @@ function unwrap(text) {
 function point(options) {
   return options ? JSON.stringify(options) : "";
 }
+var WASM_MAGIC = [0, 97, 115, 109];
+function looksLikeWasm(bytes) {
+  if (bytes.byteLength < 4)
+    return false;
+  const head = new Uint8Array(bytes, 0, 4);
+  return WASM_MAGIC.every((b, i) => head[i] === b);
+}
 async function bytesOf(wasm) {
   if (wasm && typeof wasm !== "string" && !(wasm instanceof URL))
     return wasm;
-  const url = wasm ?? new URL("../wasm/tensorcad.wasm", import.meta.url);
-  const response = await fetch(url);
-  if (!response.ok) {
-    throw new EngineError(`Could not load the engine from ${String(url)}: ${response.status}`);
+  const urls = wasm ? [wasm] : [new URL("../wasm/tensorcad.wasm", import.meta.url)];
+  const tried = [];
+  for (const url of urls) {
+    try {
+      const response = await fetch(url);
+      if (!response.ok) {
+        tried.push(`${String(url)} (${response.status})`);
+        continue;
+      }
+      const bytes = await response.arrayBuffer();
+      if (looksLikeWasm(bytes))
+        return bytes;
+      tried.push(`${String(url)} (not WebAssembly — ${bytes.byteLength} bytes)`);
+    } catch (error) {
+      tried.push(`${String(url)} (${error.message})`);
+    }
   }
-  return await response.arrayBuffer();
+  throw new EngineError(`Could not load the engine. Tried ${tried.join(", ")}. ` + `Pass \`wasm\` to createEngine() if it lives somewhere else.`);
 }
 async function createEngine(options = {}) {
   if (typeof globalThis.Go !== "function") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tensor-cad/engine",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "The TensorCAD analysis engine, compiled from Go to WebAssembly, with its TypeScript client",
   "type": "module",
   "main": "./index.js",