@volter/tabnode 0.5.36 → 0.5.37

package/dist/__sw__.js

@@ -578,7 +578,7 @@ async function virtualContext(event) {
   // virtual request asks for its port, so a restart does not send the
   // preview's own requests to the network.
   if (hosts.size === 0 && ((client && client.frameType === 'nested') || (event.request.mode === 'navigate' && (event.request.destination === 'iframe' || event.request.destination === 'frame')))) {
-    await askForInit();
+    await askForInit(event.clientId);
   }
   const contextUrl = event.request.referrer || (client ? client.url : '');
   if (contextUrl) {
@@ -607,9 +607,16 @@ function ownPath(pathname) {
   return pathname.length > 1 && pathname.endsWith('/') ? pathname.slice(0, -1) : pathname;
 }
 
-/** Asks every window for the page's registrations and waits for them, as a request waits for its port. */
-async function askForInit() {
-  const allClients = await self.clients.matchAll({ type: 'window' });
+/**
+ * Asks every window for the page's registrations and waits for them, as a
+ * request waits for its port. Only another window can answer: a page's own
+ * document and scripts come before its `init`, and a frame being opened is no
+ * window yet, so with no other window each waited out the whole ask (a page
+ * opened on an origin whose worker had restarted took 5 s per request).
+ */
+async function askForInit(requesterId) {
+  const allClients = (await self.clients.matchAll({ type: 'window' })).filter((client) => client.id !== requesterId);
+  if (allClients.length === 0) return;
   for (const client of allClients) client.postMessage({ type: 'sw-needs-init' });
   await new Promise((resolve) => {
     const check = setInterval(() => { if (hosts.size > 0) { clearInterval(check); resolve(); } }, 50);
@@ -739,7 +746,7 @@ async function withDocumentPrelude(event, response) {
  */
 async function handleVirtualRequest(request, port, path, rooted = false) {
   try {
-    if (hosts.size === 0) await askForInit();
+    if (hosts.size === 0) await askForInit(requestEvents.get(request)?.clientId);
     const host = await hostForRequest(request, port);
     const registration = host ? host.flowControlledPorts.get(port) : undefined;
     // Build headers object

package/dist/assets/{runtime-worker-DEgP1CYS.js → runtime-worker-BloPQBYA.js}

@@ -73561,10 +73561,7 @@ function createNodeResolver(options) {
     const packageName = packageNameOf2(specifier);
     const packageRoot = `${nodeModules}/${packageName}`;
     const pkg = isDirectory(packageRoot) ? manifest(packageRoot) : null;
-    if (pkg && pkg.exports !== void 0 && pkg.exports !== null) {
-      const found = loadPackageExports(packageRoot, pkg, specifier, packageName);
-      if (found) return found;
-    }
+    if (pkg && pkg.exports !== void 0 && pkg.exports !== null) return loadPackageExports(packageRoot, pkg, specifier, packageName);
     const path2 = `${nodeModules}/${specifier}`;
     return loadAsFile(path2) ?? loadAsDirectory(path2);
   };
@@ -78595,27 +78592,27 @@ function __substrateFollowAwaits(code2) {
   };
   const isFunction = (node) => node.type === "FunctionDeclaration" || node.type === "FunctionExpression" || node.type === "ArrowFunctionExpression";
   const visit = (node, framed, parent) => {
+    const leading = [];
     if (isFunction(node)) {
       framed = node.async && node.body.type === "BlockStatement";
       if (framed) {
         const directives = node.body.body.filter((statement) => statement.directive !== void 0);
-        const at3 = directives.length ? directives[directives.length - 1].end : node.body.start + 1;
-        insert(at3, FOLLOW_TAKE);
+        leading.push([directives.length ? directives[directives.length - 1].end : node.body.start + 1, FOLLOW_TAKE]);
       }
     } else if (node.type === "AwaitExpression") {
       insert(node.start, framed ? FOLLOW_RESUME_FRAMED : FOLLOW_RESUME_TAKEN);
       insert(node.end, `${FOLLOW_MARK})`);
     } else if (framed && node.type === "CatchClause") {
-      insert(node.body.start + 1, FOLLOW_RESTORE);
+      leading.push([node.body.start + 1, FOLLOW_RESTORE]);
     } else if (framed && node.type === "TryStatement" && node.finalizer) {
-      insert(node.finalizer.start + 1, FOLLOW_RESTORE);
+      leading.push([node.finalizer.start + 1, FOLLOW_RESTORE]);
     } else if (framed && node.type === "ForOfStatement" && node.await) {
       const whole = (parent == null ? void 0 : parent.type) === "LabeledStatement" ? parent : node;
       insert(whole.start, `{${FOLLOW_MARK}`);
       insert(whole.end, `;${FOLLOW_RESTORE}${FOLLOW_MARK}}`);
-      if (node.body.type === "BlockStatement") insert(node.body.start + 1, FOLLOW_RESTORE);
+      if (node.body.type === "BlockStatement") leading.push([node.body.start + 1, FOLLOW_RESTORE]);
       else {
-        insert(node.body.start, `{${FOLLOW_MARK}${FOLLOW_RESTORE}`);
+        leading.push([node.body.start, `{${FOLLOW_MARK}${FOLLOW_RESTORE}`]);
         insert(node.body.end, `${FOLLOW_MARK}}`);
       }
     }
@@ -78627,6 +78624,7 @@ function __substrateFollowAwaits(code2) {
         for (const item of child) if (item && typeof item.type === "string") visit(item, framed, node);
       } else if (typeof child.type === "string") visit(child, framed, node);
     }
+    for (const [at3, text] of leading) insert(at3, text);
   };
   visit(ast, false, void 0);
   return edits.length ? applyReplacements(code2, edits) : code2;
@@ -78666,7 +78664,7 @@ function __substratePrepareBody(rawCode, resolvedPath, format2, process2) {
   }
   return __substrateFollowAwaits(code2);
 }
-const PREPARED_MODULES_DIR = "/.tabnode/prepared";
+const PREPARED_MODULES_DIR = "/opt/.tabnode/prepared";
 const PREPARED_MODULES_FORMAT = "tabnode-prepared-2";
 function preparedModuleKey(rawCode, resolvedPath) {
   var _a3;

package/dist/index.mjs

@@ -33156,10 +33156,7 @@ function createNodeResolver(options) {
     const packageName = packageNameOf2(specifier);
     const packageRoot = `${nodeModules}/${packageName}`;
     const pkg = isDirectory(packageRoot) ? manifest(packageRoot) : null;
-    if (pkg && pkg.exports !== void 0 && pkg.exports !== null) {
-      const found = loadPackageExports(packageRoot, pkg, specifier, packageName);
-      if (found) return found;
-    }
+    if (pkg && pkg.exports !== void 0 && pkg.exports !== null) return loadPackageExports(packageRoot, pkg, specifier, packageName);
     const path2 = `${nodeModules}/${specifier}`;
     return loadAsFile(path2) ?? loadAsDirectory(path2);
   };
@@ -38253,27 +38250,27 @@ function __substrateFollowAwaits(code2) {
   };
   const isFunction = (node) => node.type === "FunctionDeclaration" || node.type === "FunctionExpression" || node.type === "ArrowFunctionExpression";
   const visit = (node, framed, parent) => {
+    const leading = [];
     if (isFunction(node)) {
       framed = node.async && node.body.type === "BlockStatement";
       if (framed) {
         const directives = node.body.body.filter((statement) => statement.directive !== void 0);
-        const at2 = directives.length ? directives[directives.length - 1].end : node.body.start + 1;
-        insert(at2, FOLLOW_TAKE);
+        leading.push([directives.length ? directives[directives.length - 1].end : node.body.start + 1, FOLLOW_TAKE]);
       }
     } else if (node.type === "AwaitExpression") {
       insert(node.start, framed ? FOLLOW_RESUME_FRAMED : FOLLOW_RESUME_TAKEN);
       insert(node.end, `${FOLLOW_MARK})`);
     } else if (framed && node.type === "CatchClause") {
-      insert(node.body.start + 1, FOLLOW_RESTORE);
+      leading.push([node.body.start + 1, FOLLOW_RESTORE]);
     } else if (framed && node.type === "TryStatement" && node.finalizer) {
-      insert(node.finalizer.start + 1, FOLLOW_RESTORE);
+      leading.push([node.finalizer.start + 1, FOLLOW_RESTORE]);
     } else if (framed && node.type === "ForOfStatement" && node.await) {
       const whole = (parent == null ? void 0 : parent.type) === "LabeledStatement" ? parent : node;
       insert(whole.start, `{${FOLLOW_MARK}`);
       insert(whole.end, `;${FOLLOW_RESTORE}${FOLLOW_MARK}}`);
-      if (node.body.type === "BlockStatement") insert(node.body.start + 1, FOLLOW_RESTORE);
+      if (node.body.type === "BlockStatement") leading.push([node.body.start + 1, FOLLOW_RESTORE]);
       else {
-        insert(node.body.start, `{${FOLLOW_MARK}${FOLLOW_RESTORE}`);
+        leading.push([node.body.start, `{${FOLLOW_MARK}${FOLLOW_RESTORE}`]);
         insert(node.body.end, `${FOLLOW_MARK}}`);
       }
     }
@@ -38285,6 +38282,7 @@ function __substrateFollowAwaits(code2) {
         for (const item of child) if (item && typeof item.type === "string") visit(item, framed, node);
       } else if (typeof child.type === "string") visit(child, framed, node);
     }
+    for (const [at2, text] of leading) insert(at2, text);
   };
   visit(ast, false, void 0);
   return edits.length ? applyReplacements(code2, edits) : code2;
@@ -38324,7 +38322,7 @@ function __substratePrepareBody(rawCode, resolvedPath, format2, process2) {
   }
   return __substrateFollowAwaits(code2);
 }
-const PREPARED_MODULES_DIR = "/.tabnode/prepared";
+const PREPARED_MODULES_DIR = "/opt/.tabnode/prepared";
 const PREPARED_MODULES_FORMAT = "tabnode-prepared-2";
 function preparedModuleKey(rawCode, resolvedPath) {
   var _a2;
@@ -40293,7 +40291,7 @@ class WorkerRuntime {
     this.worker = new Worker(
       new URL(
         /* @vite-ignore */
-        "/assets/runtime-worker-DEgP1CYS.js",
+        "/assets/runtime-worker-BloPQBYA.js",
         import.meta.url
       ),
       { type: "module" }

package/dist/runtime.d.ts

@@ -16,8 +16,11 @@ export { pendingGuestTimers, stopGuestTimers } from './guest-timers';
  * from, in this directory of the tab's filesystem, and the loader takes it in
  * place of the passes when the file it read hashes to one. A body the loader
  * prepares for a file the image has none for is kept there the same way.
+ * Under `/opt`, a root a tab's store keeps, so a host can link the image's
+ * bodies there once from a store they share instead of writing each into
+ * every process's memory.
  */
-export declare const PREPARED_MODULES_DIR = "/.tabnode/prepared";
+export declare const PREPARED_MODULES_DIR = "/opt/.tabnode/prepared";
 /** The name a prepared body goes under: the hash of the file as read, and how it is compiled. Undefined for a file no body is prepared for. */
 export declare function preparedModuleKey(rawCode: string, resolvedPath: string): string | undefined;
 /** The body the loader would compile for this file, with no load hooks and no type stripping: what the image carries. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/tabnode",
-  "version": "0.5.36",
+  "version": "0.5.37",
   "description": "Node's own library, in a browser tab.",
   "type": "module",
   "license": "MIT",

package/src/node-resolution.ts

@@ -158,14 +158,17 @@ export function createNodeResolver(options: NodeResolverOptions): NodeResolver {
     return parts[0]!.startsWith("@") && parts.length > 1 ? `${parts[0]}/${parts[1]}` : parts[0]!;
   };
   // LOAD_NODE_MODULES from one directory: exports, else the package's own entry or a file under it.
+  // A package with `exports` is answered by the map alone, as Node answers it:
+  // a subpath the map does not name, or names to a missing file, does not
+  // resolve. Falling through to the file under the package made
+  // `require.resolve("<pkg>/package.json")` succeed where Node throws, and a
+  // program that asks that question to decide what it does (Vite config that
+  // excludes a package it cannot resolve) decided differently in the tab.
   const loadFromNodeModules = (nodeModules: string, specifier: string): string | null => {
     const packageName = packageNameOf(specifier);
     const packageRoot = `${nodeModules}/${packageName}`;
     const pkg = isDirectory(packageRoot) ? manifest(packageRoot) : null;
-    if (pkg && pkg.exports !== undefined && pkg.exports !== null) {
-      const found = loadPackageExports(packageRoot, pkg, specifier, packageName);
-      if (found) return found;
-    }
+    if (pkg && pkg.exports !== undefined && pkg.exports !== null) return loadPackageExports(packageRoot, pkg, specifier, packageName);
     const path = `${nodeModules}/${specifier}`;
     return loadAsFile(path) ?? loadAsDirectory(path);
   };

package/src/runtime.ts

@@ -468,28 +468,35 @@ function __substrateFollowAwaits(code: string): string {
   const isFunction = (node: any): boolean => node.type === 'FunctionDeclaration' || node.type === 'FunctionExpression' || node.type === 'ArrowFunctionExpression';
   // `framed`: the nearest function is async and holds the frame in ASYNC_FRAME.
   const visit = (node: any, framed: boolean, parent: any): void => {
+    // What opens a block (the frame's take in an async body, the restore
+    // at the start of a catch, a finally or a for-await body) goes before
+    // anything in it: where the block's first statement is an `await`
+    // (`async function f(){await g()}`, `finally{await h()}`, as minified code
+    // writes them), both share an offset, and edits at one offset land in
+    // reverse of the order they were made. So these are made after the
+    // block's own edits, and land first.
+    const leading: Array<[number, string]> = [];
     if (isFunction(node)) {
       framed = node.async && node.body.type === 'BlockStatement';
       if (framed) {
         const directives = node.body.body.filter((statement: any) => statement.directive !== undefined);
-        const at = directives.length ? directives[directives.length - 1].end : node.body.start + 1;
-        insert(at, FOLLOW_TAKE);
+        leading.push([directives.length ? directives[directives.length - 1].end : node.body.start + 1, FOLLOW_TAKE]);
       }
     } else if (node.type === 'AwaitExpression') {
       insert(node.start, framed ? FOLLOW_RESUME_FRAMED : FOLLOW_RESUME_TAKEN);
       insert(node.end, `${FOLLOW_MARK})`);
     } else if (framed && node.type === 'CatchClause') {
-      insert(node.body.start + 1, FOLLOW_RESTORE);
+      leading.push([node.body.start + 1, FOLLOW_RESTORE]);
     } else if (framed && node.type === 'TryStatement' && node.finalizer) {
-      insert(node.finalizer.start + 1, FOLLOW_RESTORE);
+      leading.push([node.finalizer.start + 1, FOLLOW_RESTORE]);
     } else if (framed && node.type === 'ForOfStatement' && node.await) {
       // The loop's own wrap first: where its end is the body's, an insertion
       // made later lands before it, so the body's brace closes inside.
       const whole = parent?.type === 'LabeledStatement' ? parent : node;
       insert(whole.start, `{${FOLLOW_MARK}`);
       insert(whole.end, `;${FOLLOW_RESTORE}${FOLLOW_MARK}}`);
-      if (node.body.type === 'BlockStatement') insert(node.body.start + 1, FOLLOW_RESTORE);
-      else { insert(node.body.start, `{${FOLLOW_MARK}${FOLLOW_RESTORE}`); insert(node.body.end, `${FOLLOW_MARK}}`); }
+      if (node.body.type === 'BlockStatement') leading.push([node.body.start + 1, FOLLOW_RESTORE]);
+      else { leading.push([node.body.start, `{${FOLLOW_MARK}${FOLLOW_RESTORE}`]); insert(node.body.end, `${FOLLOW_MARK}}`); }
     }
     for (const key of Object.keys(node)) {
       if (key === 'type' || key === 'start' || key === 'end' || key === 'loc' || key === 'range') continue;
@@ -499,6 +506,7 @@ function __substrateFollowAwaits(code: string): string {
         for (const item of child) if (item && typeof item.type === 'string') visit(item, framed, node);
       } else if (typeof child.type === 'string') visit(child, framed, node);
     }
+    for (const [at, text] of leading) insert(at, text);
   };
   visit(ast, false, undefined);
   return edits.length ? applyReplacements(code, edits) : code;
@@ -589,8 +597,11 @@ function __substratePrepareBody(rawCode: string, resolvedPath: string, format: s
  * from, in this directory of the tab's filesystem, and the loader takes it in
  * place of the passes when the file it read hashes to one. A body the loader
  * prepares for a file the image has none for is kept there the same way.
+ * Under `/opt`, a root a tab's store keeps, so a host can link the image's
+ * bodies there once from a store they share instead of writing each into
+ * every process's memory.
  */
-export const PREPARED_MODULES_DIR = '/.tabnode/prepared';
+export const PREPARED_MODULES_DIR = '/opt/.tabnode/prepared';
 const PREPARED_MODULES_FORMAT = 'tabnode-prepared-2';
 /** The name a prepared body goes under: the hash of the file as read, and how it is compiled. Undefined for a file no body is prepared for. */
 export function preparedModuleKey(rawCode: string, resolvedPath: string): string | undefined {