@swmansion/popcorn 0.4.0-next.2 → 0.4.0-next.3

package/dist/types.d.ts

@@ -45,6 +45,7 @@ export type BeamBootOptions = {
     /** VM environment variables. */
     env?: Record<string, string>;
     ttySize: TtySize;
+    noshell: boolean;
     createModule: CreateModuleFn<EmscriptenModule>;
     emit: (event: BeamEvent) => void;
 };

package/dist/worker.mjs

@@ -466,7 +466,7 @@ function start(options) {
     };
 }
 async function boot(opts, state, vm) {
-    const { otpAssetsRoot, emulatorArgs, extraArgs, env, ttySize, createModule, emit, } = opts;
+    const { otpAssetsRoot, emulatorArgs, extraArgs, env, ttySize, noshell, createModule, emit, } = opts;
     const loadedFsData = await loadFsData(otpAssetsRoot);
     if (!loadedFsData.ok) {
         return { ok: false, error: loadedFsData.error };
@@ -485,22 +485,34 @@ async function boot(opts, state, vm) {
         LINES: String(ttySize.rows),
         ERL_INETRC: INETRC_PATH,
     };
+    let emitError = function (payload) {
+        emitError = null;
+        state.isVmReady = false;
+        emit({ type: "otp:error", payload });
+    };
     const moduleConfig = {
         print: (text) => emit({ type: "otp:stdout", payload: UTF8.encode(text) }),
         printErr: (text) => emit({ type: "otp:stderr", payload: UTF8.encode(text) }),
-        onExit: (code) => emit({ type: "otp:error", payload: { kind: "exit", data: code } }),
-        onAbort: (text) => emit({ type: "otp:error", payload: { kind: "abort", data: text } }),
+        onExit: (code) => emitError?.({ kind: "exit", data: code }),
+        onAbort: (text) => emitError?.({ kind: "abort", data: text }),
         onBeamMessage: (text) => {
+            if (emitError === null) {
+                return;
+            }
             const event = deserializeBridgeMessage(text);
             if (event === null)
                 return;
+            if (event.type === "otp:error") {
+                emitError(event.payload);
+                return;
+            }
             if (handleVmReady(event))
                 return;
             if (handleAppReady(event))
                 return;
             emit(event);
         },
-        onError: (text) => emit({ type: "otp:error", payload: { kind: "error", data: text } }),
+        onError: (text) => emitError?.({ kind: "error", data: text }),
         onStdinConsumed: (size) => emit({ type: "otp:stdin-consumed", payload: size }),
         onTrackedValueDelete: (key) => emit({ type: "otp:tracked-value-delete", payload: key }),
         onTtyChunk: (fd, chunk) => emit({
@@ -510,6 +522,7 @@ async function boot(opts, state, vm) {
         arguments: buildArgs({
             appNames: fsData.appNames,
             entrypoint: fsData.entrypoint,
+            noshell,
             emulator: emulatorArgs ?? [],
             extra: extraArgs ?? [],
         }),
@@ -577,8 +590,10 @@ function toPopcornError(error) {
     const message = error instanceof Error ? error.message : String(error);
     return err("worker:load", { message });
 }
-function buildArgs({ appNames, entrypoint, emulator, extra, }) {
+function buildArgs({ appNames, entrypoint, noshell, emulator, extra, }) {
     const args = [...emulator, "--", ...BASE_ARGS, "-boot", BOOT_NAME];
+    if (noshell)
+        args.push("-noshell");
     for (const app of CORE_APPS) {
         args.push("-pa", `/lib/${app}/ebin`);
     }
@@ -775,6 +790,7 @@ self.onmessage = async (event) => {
                 extraArgs: data.payload.extraArgs,
                 env: data.payload.env,
                 ttySize: data.payload.ttySize,
+                noshell: data.payload.noshell,
                 createModule,
                 emit: toMain,
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swmansion/popcorn",
-  "version": "0.4.0-next.2",
+  "version": "0.4.0-next.3",
   "description": "JS bindings for BEAM/OTP in WebAssembly",
   "type": "module",
   "license": "Apache-2.0",