@swmansion/popcorn 0.2.0-rc.4 → 0.2.0-rc.6

package/dist/AtomVM.mjs

@@ -56,7 +56,7 @@ if (ENVIRONMENT_IS_PTHREAD) {
 
 // --pre-jses are emitted after the Module integration code, so that they can
 // refer to Module (if they choose; they can also define Module)
-// include: /tmp/popcorn-swm.tJ64R0d/atomvm/src/platforms/emscripten/src/atomvm.pre.js
+// include: /tmp/atomvm-build-swm.etp6TAu/atomvm/src/platforms/emscripten/src/atomvm.pre.js
 /*
  * This file is part of AtomVM.
  *
@@ -128,7 +128,7 @@ function ensureValidResult(result) {
   throw new Error(message);
 }
 
-// end include: /tmp/popcorn-swm.tJ64R0d/atomvm/src/platforms/emscripten/src/atomvm.pre.js
+// end include: /tmp/atomvm-build-swm.etp6TAu/atomvm/src/platforms/emscripten/src/atomvm.pre.js
 var arguments_ = [];
 
 var thisProgram = "./this.program";
@@ -7366,19 +7366,19 @@ function checkIncomingModuleAPI() {
 }
 
 var ASM_CONSTS = {
-  77455: ($0, $1) => {
+  78463: ($0, $1) => {
     promiseMap.get($0).resolve($1);
   },
-  77491: ($0, $1) => {
+  78499: ($0, $1) => {
     promiseMap.get($0).reject($1);
   },
-  77526: ($0, $1) => {
+  78534: ($0, $1) => {
     promiseMap.get($0).resolve(UTF8ToString($1));
   },
-  77576: ($0, $1) => {
+  78584: ($0, $1) => {
     promiseMap.get($0).reject(UTF8ToString($1));
   },
-  77625: $0 => {
+  78633: $0 => {
     Module["onTrackedObjectDelete"]($0);
   }
 };

package/dist/errors.d.ts

@@ -6,7 +6,7 @@ export declare class PopcornError extends Error {
     constructor(code: PopcornErrorCode, message?: string);
 }
 /** Error codes for internal errors that indicate bugs or misuse */
-export type PopcornInternalErrorCode = "assert" | "private_constructor" | "bad_call" | "no_acked_call" | "bad_ack" | "already_awaited" | "already_mounted" | "unmounted" | "bad_target" | "bad_status";
+export type PopcornInternalErrorCode = "assert" | "private_constructor" | "bad_call" | "no_acked_call" | "bad_ack" | "already_awaited" | "already_mounted" | "unmounted" | "bad_target" | "bad_status" | "bundle_not_found";
 /** Non-recoverable error indicating a bug or library misuse (always thrown) */
 export declare class PopcornInternalError extends Error {
     readonly code: PopcornInternalErrorCode;
@@ -37,6 +37,10 @@ type ErrorData = {
     t: "bad_status";
     status: string;
     expectedStatus: string;
+} | {
+    t: "bundle_not_found";
+    primary: string;
+    fallback: string;
 };
 export declare function throwError(error: ErrorData): never;
 export {};

package/dist/errors.mjs

@@ -43,6 +43,8 @@ function throwError(error) {
             throw new PopcornInternalError("bad_target", "Unspecified target process");
         case "bad_status":
             throw new PopcornInternalError("bad_status", `Operation not allowed: instance in "${error.status}" state, expected "${error.expectedStatus}"`);
+        case "bundle_not_found":
+            throw new PopcornInternalError("bundle_not_found", `Could not find a valid .avm bundle at "${error.primary}" or fallback "${error.fallback}"`);
     }
 }
 

package/dist/popcorn.mjs

@@ -1,5 +1,5 @@
 import { IframeBridge } from './bridge.mjs';
-import { HEARTBEAT_TIMEOUT_MS, MESSAGES, MAX_RELOAD_N, INIT_VM_TIMEOUT_MS, CALL_TIMEOUT_MS } from './types.mjs';
+import { HEARTBEAT_TIMEOUT_MS, MESSAGES, INIT_VM_TIMEOUT_MS, MAX_RELOAD_N, CALL_TIMEOUT_MS } from './types.mjs';
 import { throwError, PopcornError } from './errors.mjs';
 export { PopcornInternalError } from './errors.mjs';
 
@@ -60,7 +60,8 @@ class Popcorn {
     static async init(options) {
         const { container, ...constructorParams } = options;
         const containerWithDefault = container ?? document.documentElement;
-        const popcorn = new Popcorn({ ...constructorParams, container: containerWithDefault }, INIT_TOKEN);
+        const bundlePath = await resolveBundleURL(constructorParams.bundlePath ?? "/bundle.avm", "/assets/bundle.avm");
+        const popcorn = new Popcorn({ ...constructorParams, bundlePath, container: containerWithDefault }, INIT_TOKEN);
         popcorn.trace("Main: init, params: ", { container, ...constructorParams });
         await popcorn.mount();
         return popcorn;
@@ -72,21 +73,27 @@ class Popcorn {
         this.transition({ status: "mount" });
         this.trace("Main: mount, container: ", this.bridgeConfig.container);
         this.bridge = new IframeBridge(this.bridgeConfig);
-        await this.awaitMessage(MESSAGES.INIT);
-        this.transition({ status: "await_vm" });
-        this.trace("Main: iframe loaded");
-        const startTime = performance.now();
-        const startVmResult = await withTimeout(this.awaitMessage(MESSAGES.START_VM).then((data) => ({
-            ok: true,
-            data,
-            durationMs: performance.now() - startTime,
-        })), INIT_VM_TIMEOUT_MS);
-        if (!startVmResult.ok)
-            throwError({ t: "assert" });
-        this.initProcess = startVmResult.data;
-        this.transition({ status: "ready" });
-        this.trace("Main: mounted, main process: ", this.initProcess);
-        this.onHeartbeat();
+        try {
+            await this.awaitMessage(MESSAGES.INIT);
+            this.transition({ status: "await_vm" });
+            this.trace("Main: iframe loaded");
+            const startTime = performance.now();
+            const startVmResult = await withTimeout(this.awaitMessage(MESSAGES.START_VM).then((data) => ({
+                ok: true,
+                data,
+                durationMs: performance.now() - startTime,
+            })), INIT_VM_TIMEOUT_MS);
+            if (!startVmResult.ok)
+                throwError({ t: "assert" });
+            this.initProcess = startVmResult.data;
+            this.transition({ status: "ready" });
+            this.trace("Main: mounted, main process: ", this.initProcess);
+            this.onHeartbeat();
+        }
+        catch (error) {
+            this.deinit();
+            throw error;
+        }
     }
     /**
      * Sends a message to an Elixir process and awaits for the response.
@@ -348,5 +355,22 @@ async function withTimeout(promise, ms) {
 function noop() {
     /* noop */
 }
+async function resolveBundleURL(primary, fallback) {
+    const fetchBundle = async (path) => {
+        const url = new URL(path, import.meta.url).href;
+        const response = await fetch(url, { method: "HEAD" });
+        const contentType = response.headers.get("Content-Type") ?? "";
+        if (!response.ok || contentType.includes("text/html")) {
+            throw new Error(`Bundle not found at "${path}"`);
+        }
+        return path;
+    };
+    try {
+        return await Promise.any([fetchBundle(primary), fetchBundle(fallback)]);
+    }
+    catch {
+        throwError({ t: "bundle_not_found", primary, fallback });
+    }
+}
 
 export { Popcorn, PopcornError };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swmansion/popcorn",
-  "version": "0.2.0-rc.4",
+  "version": "0.2.0-rc.6",
   "description": "JS bindings for Popcorn",
   "type": "module",
   "license": "Apache-2.0",
@@ -77,7 +77,7 @@
     "test": "vitest",
     "test:e2e": "playwright test --config e2e/playwright.config.ts",
     "build:prod": "pnpm run lint && (rm -rf assets || true) && (rm -rf dist || true) && pnpm run assets:prod && rollup -c",
-    "assets:dev": "./scripts/get_atomvm.sh assets/",
-    "assets:prod": "RUNTIME_SOURCE='https://github.com/software-mansion-labs/FissionVM.git#swm' ./scripts/get_atomvm.sh assets/"
+    "assets:dev": "../../scripts/build-atomvm.sh --outdir assets/ debug-wasm",
+    "assets:prod": "../../scripts/build-atomvm.sh --source 'https://github.com/software-mansion-labs/FissionVM.git#swm' --outdir assets/ debug-wasm"
   }
 }