@wonderlandengine/ar-provider-zappar 1.2.0 → 1.2.1

package/dist/src/zappar-provider.js

@@ -209,8 +209,8 @@ export class ZapparProvider extends ARProvider {
         if (ZapparProvider._cvWorkerConfigured)
             return;
         // Hard-coded paths for local development
-        const workerUrl = './zappar-cv/zappar-cv.worker.js';
-        const wasmUrl = './zappar-cv/zappar-cv.wasm';
+        const workerUrl = './zappar-cv.worker.js';
+        const wasmUrl = './zappar-cv.wasm';
         const debugWorker = this.isVerboseDebugLoggingEnabled;
         if (debugWorker) {
             console.log('[ZapparProvider] configureCvWorkerIfNeeded()', {
@@ -284,12 +284,18 @@ export class ZapparProvider extends ARProvider {
                 }, 5000);
             }
             if (wasmUrl) {
+                const resolvedWasmUrl = new URL(wasmUrl, window.location.href).toString();
                 if (debugWorker) {
-                    console.log('[ZapparProvider] Sending WASM URL to worker:', wasmUrl);
+                    console.log('[ZapparProvider] Compiling WASM for worker:', resolvedWasmUrl);
                 }
+                // The worker's instantiateWasm callback expects a pre-compiled
+                // WebAssembly.Module (not just a URL). Compile it on the main
+                // thread so it can be structured-cloned into the worker.
+                const compiledModule = await WebAssembly.compileStreaming(fetch(resolvedWasmUrl));
                 worker.postMessage({
                     t: 'wasm',
-                    url: new URL(wasmUrl, window.location.href).toString(),
+                    url: resolvedWasmUrl,
+                    module: compiledModule,
                 });
             }
             await zapparSetOptions({ worker });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wonderlandengine/ar-provider-zappar",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "description": "Wonderland Engine AR tracking provider based on Zappar",
     "main": "dist/index.js",
     "type": "module",

package/scripts/postinstall.mjs

@@ -107,7 +107,12 @@ function main() {
     const zapparCvLibDir = path.join(zapparCvRoot, 'lib');
 
     const projectRoot = resolveProjectRoot();
-    const outDir = path.resolve(projectRoot, 'static', 'zappar-cv');
+    const outDir = path.resolve(projectRoot, 'static');
+    // Face/CV model files (.zbin) are fetched by the Zappar runtime from the
+    // hardcoded path "zappar-cv/<filename>" relative to the page origin, so
+    // they must live in a zappar-cv/ subdirectory even though the worker and
+    // wasm sit at the static root.
+    const modelsDir = path.resolve(projectRoot, 'static', 'zappar-cv');
 
     // -------------------------------------------------------------------------
     // Detect package layout.
@@ -155,13 +160,11 @@ function main() {
         const wasmDest = path.join(outDir, wasmBasename);
         copyOrThrow(wasmSource, wasmDest);
         safeLinkOrCopy(wasmDest, path.join(outDir, 'zappar-cv.wasm'));
-        // Also copy wasm to static root so the bundled worker can find it at /zappar-cv.wasm.
-        copyOrThrow(wasmSource, path.join(path.dirname(outDir), 'zappar-cv.wasm'));
 
         for (const entry of listFiles(umdDir)) {
             if (!entry.isFile()) continue;
             if (!entry.name.endsWith('.zbin')) continue;
-            copyOrThrow(path.join(umdDir, entry.name), path.join(outDir, entry.name));
+            copyOrThrow(path.join(umdDir, entry.name), path.join(modelsDir, entry.name));
         }
     } else {
         // ---- Modern (>= 4.x) path ----
@@ -211,8 +214,6 @@ function main() {
             warn('Could not find zappar-cv.wasm at', wasmSrc);
         } else {
             copyOrThrow(wasmSrc, path.join(outDir, 'zappar-cv.wasm'));
-            // Also copy wasm to static root so the bundled worker can find it at /zappar-cv.wasm.
-            copyOrThrow(wasmSrc, path.join(path.dirname(outDir), 'zappar-cv.wasm'));
         }
     }
 
@@ -225,7 +226,7 @@ function main() {
 
     for (const filename of requiredFaceModelFiles) {
         const src = path.join(zapparCvLibDir, filename);
-        const dest = path.join(outDir, filename);
+        const dest = path.join(modelsDir, filename);
         if (!fs.existsSync(src)) {
             warn('Could not locate required Zappar face model:', filename);
             warn('Looked under:', zapparCvLibDir);