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

package/dist/plugins/vite.mjs

@@ -5,9 +5,9 @@ import { r as runtimeDirectory, p as popcorn$1 } from './shared.mjs';
 import 'node:child_process';
 import 'node:os';
 import 'node:util';
-import 'node:zlib';
 
-const CORS_HEADERS = {
+/** Headers required by the threaded WebAssembly runtime. */
+const crossOriginIsolationHeaders = {
     "Cross-Origin-Opener-Policy": "same-origin",
     "Cross-Origin-Embedder-Policy": "require-corp",
 };
@@ -22,7 +22,7 @@ const distDir = resolve(dirname(fileURLToPath(import.meta.url)), "..");
  * import { popcorn } from "@swmansion/popcorn/vite";
  *
  * export default defineConfig({
- *   plugins: [popcorn({ rootDir: "../my_app", app: "my_app" })],
+ *   plugins: [popcorn({ rootDir: "../my_app" })],
  * });
  * ```
  *
@@ -43,8 +43,8 @@ function popcorn(options) {
     let dirty = false;
     let outDir;
     let assetsDir = "assets";
-    // Dev/preview: pack once at first request, re-pack lazily after the app's
-    // compiled beams change. A single in-flight promise dedupes concurrent
+    // Dev/preview: pack once at server startup, then re-pack lazily after the
+    // app's compiled beams change. A single in-flight promise dedupes concurrent
     // requests; a change during a re-pack re-sets `dirty` so it isn't lost.
     const ensurePrepared = () => {
         if (prepared !== undefined && !dirty)
@@ -95,24 +95,21 @@ function popcorn(options) {
         const filePath = resolve(assetsRoot, requestPath.slice(requestRoot.length));
         if (!isUnder(assetsRoot, filePath)) {
             res.statusCode = 403;
-            setHeaders(res);
             res.end("Forbidden");
             return;
         }
         try {
             const compressible = isCompressible(filePath);
             const encoding = compressible
-                ? selectEncoding(req.headers["accept-encoding"]?.toString(), options.brotli ?? false)
+                ? selectEncoding(req.headers["accept-encoding"]?.toString())
                 : { name: null, suffix: "" };
             if (compressible && encoding.name === null) {
                 res.statusCode = 406;
-                setHeaders(res);
                 res.setHeader("Vary", "Accept-Encoding");
                 res.end("No supported content encoding");
                 return;
             }
             const content = await readFile(`${filePath}${encoding.suffix}`);
-            setHeaders(res);
             setContentType(res, filePath);
             res.setHeader("Vary", "Accept-Encoding");
             if (encoding.name !== null) {
@@ -122,7 +119,6 @@ function popcorn(options) {
         }
         catch {
             res.statusCode = 404;
-            setHeaders(res);
             res.end("Not found");
         }
     };
@@ -144,10 +140,6 @@ function popcorn(options) {
                         },
                     ],
                 },
-                // COOP/COEP must be on every response (SharedArrayBuffer/pthreads),
-                // including the worker/beam files Vite serves from the package itself.
-                server: { headers: CORS_HEADERS },
-                preview: { headers: CORS_HEADERS },
             };
         },
         configResolved(config) {
@@ -155,8 +147,9 @@ function popcorn(options) {
             outDir = resolve(config.root, config.build.outDir);
             assetsDir = config.build.assetsDir;
         },
-        configureServer(server) {
+        async configureServer(server) {
             const rootDir = resolve(options.rootDir);
+            server.httpServer?.prependListener("request", setIsolationHeaders);
             server.watcher.add(rootDir);
             server.watcher.on("all", (_event, file) => {
                 if (isUnder(rootDir, file))
@@ -164,10 +157,14 @@ function popcorn(options) {
             });
             server.middlewares.use(serve);
             server.httpServer?.once("close", cleanup);
+            await ensurePrepared();
+            dirty = false;
         },
-        configurePreviewServer(server) {
+        async configurePreviewServer(server) {
+            server.httpServer?.prependListener("request", setIsolationHeaders);
             server.middlewares.use(serve);
             server.httpServer?.once("close", cleanup);
+            await ensurePrepared();
         },
         async closeBundle() {
             assert(outDir !== undefined, "outDir was not resolved");
@@ -187,8 +184,8 @@ function popcorn(options) {
 function isCompressible(path) {
     return path.endsWith(".tar") || path.endsWith(".wasm");
 }
-function selectEncoding(header, useBrotli) {
-    if (useBrotli && header?.includes("br")) {
+function selectEncoding(header) {
+    if (header?.includes("br")) {
         return { name: "br", suffix: ".br" };
     }
     if (header?.includes("gzip"))
@@ -199,8 +196,8 @@ function isUnder(dir, file) {
     const rel = relative(dir, file);
     return rel !== "" && !rel.startsWith("..") && !isAbsolute(rel);
 }
-function setHeaders(res) {
-    for (const [key, value] of Object.entries(CORS_HEADERS)) {
+function setIsolationHeaders(_req, res) {
+    for (const [key, value] of Object.entries(crossOriginIsolationHeaders)) {
         res.setHeader(key, value);
     }
 }
@@ -224,4 +221,4 @@ function assert(ok, message) {
     }
 }
 
-export { popcorn };
+export { crossOriginIsolationHeaders, popcorn };

package/dist/popcorn.d.ts

@@ -123,6 +123,7 @@ export declare class Popcorn<Output extends TtyOutput = "text"> {
     private readonly eventHandlers;
     private readonly pendingSends;
     private readonly pendingCalls;
+    private readonly readyWaiters;
     private callSeq;
     private readonly trackedValues;
     private trackedKeySeq;
@@ -137,7 +138,7 @@ export declare class Popcorn<Output extends TtyOutput = "text"> {
      *
      * Call {@link boot} to start the VM.
      **/
-    constructor(opts: PopcornOpts<Output>);
+    constructor(opts?: PopcornOpts<Output>);
     private spawnWorker;
     /**
      * Creates an instance and waits for {@link boot}.
@@ -146,7 +147,7 @@ export declare class Popcorn<Output extends TtyOutput = "text"> {
      *
      * @returns Ok tuple or `runtime:eval-unavailable` if the page blocks JavaScript evaluation.
      */
-    static init<Output extends TtyOutput = "text">(opts: PopcornOpts<Output>): Promise<Result<Popcorn<Output>>>;
+    static init<Output extends TtyOutput = "text">(opts?: PopcornOpts<Output>): Promise<Result<Popcorn<Output>>>;
     /**
      * Starts the VM and waits for its bridge and entrypoint application.
      *
@@ -229,8 +230,11 @@ export declare class Popcorn<Output extends TtyOutput = "text"> {
     private castBridge;
     private nextCallId;
     private runJs;
+    private handleReadyRequest;
+    private flushReadyWaiters;
+    private sendReadyReply;
     private asRef;
-    private sendRunJsReply;
+    private sendBridgeReply;
     private jsWithCurrentEnv;
     private reviveHandles;
     /** Maps pids and `TrackedValue`s during encoding, collecting handles into