@inkandswitch/patchwork-bootloader 0.4.2 → 0.4.4

package/src/types.ts

@@ -161,7 +161,28 @@ export interface HandoffResponseMessage {
   response: HandoffResponse;
 }
 
-export type HandoffReplyMessage = HandoffCachedMessage | HandoffResponseMessage;
+/**
+ * Automerge worker → service worker: fail the request as a network error
+ * rather than serving any response at all.
+ *
+ * "Heads haven't arrived yet" is not a 404 — the document may well exist, so
+ * a status implying it doesn't is a lie any HTTP cache is entitled to store.
+ * A network error is the honest answer and isn't storable as a response.
+ *
+ * This does *not* help with `import()`: the ES module map memoizes failed
+ * fetches, network errors included, so a retry needs a distinct URL either
+ * way (see `importModule` in patchwork-filesystem).
+ */
+export interface HandoffAbortMessage {
+  id: string;
+  type: "abort";
+  reason: string;
+}
+
+export type HandoffReplyMessage =
+  | HandoffCachedMessage
+  | HandoffResponseMessage
+  | HandoffAbortMessage;
 
 /**
  * Automerge worker → world: broadcast once on startup so the service worker

package/src/vite/importmap-plugin.ts

@@ -5,6 +5,7 @@ import type {
 } from "./patchwork-plugin.js";
 import { readFileSync } from "node:fs";
 import { createRequire } from "node:module";
+import { fileURLToPath } from "node:url";
 const require = createRequire(import.meta.url);
 
 /**
@@ -19,8 +20,35 @@ export const builtins = externals.reduce(
 );
 
 /**
- * merge the importmap option with our builtins
+ * pretend the import came from inside this package, so node_modules resolution
+ * walks up from *our* directory and finds our copy of each external. that's why
+ * a consuming site never has to install them or agree with us about versions.
  */
+const self = fileURLToPath(import.meta.url);
+
+/**
+ * resolve an external from our node_modules rather than the site's.
+ *
+ * this goes through rollup's resolver rather than import.meta.resolve or
+ * require.resolve because those apply node's conditions: subduction (and
+ * others) would hand us `dist/esm/node.js`, which imports node:path and blows
+ * up at bundle time. rollup applies the browser conditions vite configured.
+ */
+async function resolveExternal(
+  this: import("rollup").PluginContext,
+  name: string
+) {
+  const resolved = await this.resolve(name, self, { skipSelf: true });
+  if (!resolved) {
+    throw new Error(
+      `@patchwork/vite: couldn't resolve the external "${name}" from ` +
+        `@inkandswitch/patchwork-bootloader. it should be one of the ` +
+        `bootloader's own dependencies.`
+    );
+  }
+  return resolved.id;
+}
+
 function createImportMap(options?: PatchworkVitePluginOptions) {
   const importmap: ImportMap = structuredClone(
     options?.importmap ?? { imports: {}, scopes: {} }
@@ -40,12 +68,12 @@ export function importmap(options?: PatchworkVitePluginOptions): Plugin {
         this.emitFile({
           type: "chunk",
           fileName: fileName.slice(1),
-          id,
+          id: await resolveExternal.call(this, id),
           preserveSignature: "strict",
         });
       }
 
-      // Emit automerge, keyhive, and subduction wasm so the service worker can fetch them
+      // Emitted so the service worker can fetch them
       const automergeWasmPath = require.resolve(
         "@automerge/automerge/automerge.wasm"
       );
@@ -63,7 +91,6 @@ export function importmap(options?: PatchworkVitePluginOptions): Plugin {
         source: readFileSync(keyhiveWasmPath),
       });
 
-      // Emit subduction wasm so the service worker can fetch it
       const subdWasmPath =
         require.resolve("@automerge/automerge-subduction/wasm");
       this.emitFile({
@@ -72,8 +99,14 @@ export function importmap(options?: PatchworkVitePluginOptions): Plugin {
         source: readFileSync(subdWasmPath),
       });
     },
-    resolveId(id) {
-      if (id in importmap.imports && !(id in builtins)) {
+    async resolveId(id) {
+      if (id in builtins) {
+        // point the site's own imports at the same copy we emit as a chunk,
+        // otherwise rollup bundles a second one out of the site's node_modules
+        // and you end up with two automerges racing to init the same wasm
+        return resolveExternal.call(this, id);
+      }
+      if (id in importmap.imports) {
         return { id: importmap.imports[id], external: true };
       }
     },