@inkandswitch/patchwork-bootloader 0.0.8 → 0.1.0

package/dist/site.js

@@ -19,13 +19,19 @@ import * as AutomergeRepo from "@automerge/automerge-repo/slim";
 import { initSync as initSubductionSync } from "@automerge/automerge-subduction/slim";
 import { ModuleWatcher } from "@inkandswitch/patchwork-filesystem";
 import { openDocument, registerPatchworkViewElement, } from "@inkandswitch/patchwork-elements";
-import { getRegistry, registerPlugins, resolveAccountHandle, } from "@inkandswitch/patchwork-plugins";
+import { getRegistry, registerPlugins, resolveAccountHandle, unregisterPlugins, } from "@inkandswitch/patchwork-plugins";
 import * as plugins from "@inkandswitch/patchwork-plugins";
 import setupServiceWorker from "./setup.js";
 import { SwLogReader } from "./sw-logger.js";
+import debug from "debug";
+const log = debug("patchwork:bootloader:site");
 const DEFAULT_REMOTE_STORAGE_ID = "3760df37-a4c6-4f66-9ecd-732039a9385d";
 // Legacy big-patchwork hash shape: `slug--<documentId>[?=type]`.
 const BIG_PATCHWORK_HASH_REGEX = /(?<title>[A-Za-z0-9-]+)--(?<docId>[1-9A-HJ-NP-Za-km-z]+)(?<type>\?=[^&?]+)?/;
+const [automergeWasm, subductionWasm] = await Promise.all([
+    fetch("/automerge.wasm?main").then((r) => r.bytes()),
+    fetch("/subduction.wasm").then((r) => r.bytes()),
+]);
 /**
  * Boot a Patchwork browser site.
  *
@@ -37,11 +43,8 @@ const BIG_PATCHWORK_HASH_REGEX = /(?<title>[A-Za-z0-9-]+)--(?<docId>[1-9A-HJ-NP-
  */
 export async function bootPatchworkSite(config) {
     const defaultModulesUrl = resolveDefaultModulesUrl(config.defaultModulesUrl);
-    // Fetch both Wasm binaries in parallel, then compile
-    const [automergeWasm, subductionWasm] = await Promise.all([
-        fetch("/automerge.wasm").then((r) => r.bytes()),
-        fetch("/subduction.wasm").then((r) => r.bytes()),
-    ]);
+    showLoadingAnimation();
+    log(`booting`, config);
     await initializeWasm(automergeWasm);
     initSubductionSync(subductionWasm);
     const repo = new Repo({
@@ -50,21 +53,29 @@ export async function bootPatchworkSite(config) {
             return peerId.includes("service-worker");
         },
         enableRemoteHeadsGossiping: true,
+        peerId: `${config.titleSuffix}-tab-${crypto.randomUUID()}`,
     });
     repo.subscribeToRemotes(config.remoteStorageIds ?? [DEFAULT_REMOTE_STORAGE_ID]);
     const sw = await setupServiceWorker();
     if (!sw)
         throw new Error("Failed to set up service worker");
-    const net = new MessageChannelNetworkAdapter(sw.port);
-    repo.networkSubsystem.addNetworkAdapter(net);
-    await net.whenReady();
+    let activeServiceWorkerPort;
+    const connectServiceWorkerPort = async (port) => {
+        const previousPort = activeServiceWorkerPort;
+        activeServiceWorkerPort = port;
+        const net = new MessageChannelNetworkAdapter(port);
+        repo.networkSubsystem.addNetworkAdapter(net);
+        await net.whenReady();
+        previousPort?.close();
+    };
+    await sw.subscribeToRepoChannel(connectServiceWorkerPort);
     installDevConsoleGlobals(repo);
     registerPatchworkViewElement({ repo });
     // The watcher is started with the site's default-tools bundle alone so that
     // `resolveAccountHandle` below has something to await on (the `account`
     // datatype lives in that bundle today). The user's own module-settings URL
     // is added lazily once it appears on the account doc — see below.
-    const moduleWatcher = new ModuleWatcher(repo, [defaultModulesUrl], onModuleLoaded);
+    const moduleWatcher = new ModuleWatcher(repo, { system: defaultModulesUrl }, onModuleLoaded, unregisterPlugins);
     const accountDocHandle = await resolveAccountHandle(repo, {
         storageKey: config.accountStorageKey,
     });
@@ -78,10 +89,13 @@ export async function bootPatchworkSite(config) {
     logToolRegistryWhenLoaded(moduleWatcher);
     window.patchwork = {
         repo,
-        modules: moduleWatcher,
+        packages: moduleWatcher,
         plugins,
         accountDocHandle,
-        sw: buildSwLogApi(),
+        sw: {
+            ...buildSwLogApi(),
+            subscribeToRepoChannel: sw.subscribeToRepoChannel,
+        },
     };
     window.uncache = uncache;
     installHashRouting({
@@ -111,19 +125,14 @@ function installDevConsoleGlobals(repo) {
     window.repo = repo;
     window.Automerge = Automerge;
     window.AutomergeRepo = AutomergeRepo;
-    window.getRepoChannel = () => {
-        const { port1, port2 } = new MessageChannel();
-        navigator.serviceWorker.controller.postMessage({ type: "port" }, [port2]);
-        return port1;
-    };
 }
 function onModuleLoaded(name, mod) {
     if (Array.isArray(mod.plugins)) {
-        console.log(`[site] registering ${mod.plugins.length} plugin(s) from ${name.slice(0, 30)}...`, mod.plugins.map((p) => `${p.type}:${p.id}`));
+        log(`registering ${mod.plugins.length} plugin(s) from ${name.slice(0, 30)}...`, mod.plugins.map((p) => `${p.type}:${p.id}`));
         registerPlugins(mod.plugins, name);
     }
     else {
-        console.warn(`[site] module ${name.slice(0, 30)}... has no plugins array`, Object.keys(mod));
+        console.warn(`module ${name.slice(0, 30)}... has no plugins array`, Object.keys(mod));
     }
 }
 /**
@@ -136,7 +145,7 @@ function wireModuleSettingsWhenReady(accountDocHandle, moduleWatcher) {
         const url = accountDocHandle.doc()?.moduleSettingsUrl;
         if (!url)
             return;
-        void moduleWatcher.addUrl(url);
+        void moduleWatcher.addUrl("user", url);
         accountDocHandle.off("change", wire);
     };
     wire();
@@ -151,7 +160,6 @@ function wireModuleSettingsWhenReady(accountDocHandle, moduleWatcher) {
  */
 function primeRootElement(rootElement, accountDocHandle) {
     rootElement.style.visibility = "hidden";
-    showLoadingAnimation();
     const initialParams = new URLSearchParams(location.hash.slice(1));
     if (initialParams.has("frame")) {
         rootElement.setAttribute("tool-id", initialParams.get("frame"));
@@ -171,10 +179,10 @@ function logToolRegistryWhenLoaded(moduleWatcher) {
         .then(() => {
         const toolReg = getRegistry("patchwork:tool");
         const tools = toolReg.all();
-        console.log(`[site] doneLoading: ${tools.length} tools registered:`, tools.map((t) => t.id));
+        log(`doneLoading: ${tools.length} tools registered:`, tools.map((t) => t.id));
     })
         .catch((err) => {
-        console.error("[site] doneLoading rejected:", err);
+        console.error("doneLoading rejected:", err);
     });
 }
 function buildSwLogApi() {
@@ -184,11 +192,11 @@ function buildSwLogApi() {
             for (const e of entries) {
                 const prefix = `[${e.ts}] [${e.level}]`;
                 if (e.data !== undefined)
-                    console.log(prefix, e.msg, e.data);
+                    log(prefix, e.msg, e.data);
                 else
-                    console.log(prefix, e.msg);
+                    log(prefix, e.msg);
             }
-            console.log(`--- ${entries.length} entries ---`);
+            log(`--- ${entries.length} entries ---`);
         },
         tailLogs: (n = 200) => SwLogReader.tail(n),
         exportLogs: () => SwLogReader.exportAll(),
@@ -218,6 +226,10 @@ function showLoadingAnimation() {
           radial-gradient(ellipse 65% 55% at 50% 50%, #f1e6f6, transparent 80%);
         animation: pw-bootloader-pulse 3.5s ease-in-out infinite;
         transition: opacity 0.6s ease-out;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
       }
       @media (prefers-color-scheme: dark) {
         #${LOADING_ELEMENT_ID} {

package/dist/types.d.ts

@@ -5,3 +5,7 @@ export type SetupServiceWorkerOptions = {
      */
     path?: string;
 };
+export type ServiceWorkerRepoChannelListener = (port: MessagePort) => void | Promise<void>;
+export type SetupServiceWorkerResult = {
+    subscribeToRepoChannel: (listener: ServiceWorkerRepoChannelListener) => Promise<() => void>;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inkandswitch/patchwork-bootloader",
-  "version": "0.0.8",
+  "version": "0.1.0",
   "author": "chee",
   "type": "module",
   "license": "MIT",
@@ -40,27 +40,27 @@
     }
   },
   "dependencies": {
-    "@automerge/automerge": "3.2.5",
-    "@automerge/automerge-repo": "2.6.0-subduction.15",
-    "@automerge/automerge-subduction": "0.8.1",
-    "@automerge/automerge-repo-network-messagechannel": "2.6.0-subduction.15",
-    "@automerge/automerge-repo-network-websocket": "2.6.0-subduction.15",
-    "@automerge/automerge-repo-storage-indexeddb": "2.6.0-subduction.15",
-    "@automerge/vanillajs": "2.6.0-subduction.15",
+    "@automerge/automerge": "3.2.6",
+    "@automerge/automerge-repo": "2.6.0-subduction.19",
+    "@automerge/automerge-subduction": "0.12.0",
+    "@automerge/automerge-repo-network-messagechannel": "2.6.0-subduction.19",
+    "@automerge/automerge-repo-network-websocket": "2.6.0-subduction.19",
+    "@automerge/automerge-repo-storage-indexeddb": "2.6.0-subduction.19",
+    "@automerge/vanillajs": "2.6.0-subduction.19",
     "@types/debug": "^4.1.12",
     "debug": "^4.4.3",
     "resolve.exports": "^2.0.3",
     "service-worker-types": "npm:@types/serviceworker@^0.0.153",
     "tinyargs": "^0.1.4",
-    "@inkandswitch/patchwork-elements": "^0.0.7",
-    "@inkandswitch/patchwork-filesystem": "^0.0.5",
-    "@inkandswitch/patchwork-plugins": "^0.0.7"
+    "@inkandswitch/patchwork-elements": "^0.0.8",
+    "@inkandswitch/patchwork-plugins": "^0.0.8",
+    "@inkandswitch/patchwork-filesystem": "^0.0.6"
   },
   "peerDependencies": {
-    "@automerge/automerge": "3.2.5",
-    "@automerge/automerge-repo": "2.6.0-subduction.15",
+    "@automerge/automerge": "3.2.6",
+    "@automerge/automerge-repo": "2.6.0-subduction.19",
     "@automerge/automerge-repo-keyhive": "0.2.0-alpha.1d",
-    "@automerge/vanillajs": "2.6.0-subduction.15"
+    "@automerge/vanillajs": "2.6.0-subduction.19"
   },
   "scripts": {
     "build": "tsc",

package/src/externals.ts

@@ -6,7 +6,12 @@ const externals = [
   "@automerge/automerge/slim",
   "@automerge/automerge-repo",
   "@automerge/automerge-repo/slim",
+  "@automerge/automerge-repo-network-messagechannel",
+  "@automerge/automerge-repo-storage-indexeddb",
   "@automerge/automerge-repo-keyhive",
+  "@automerge/automerge-repo-react-hooks",
+  "@automerge/automerge-repo-network-messagechannel",
+  "@automerge/automerge-repo-storage-indexeddb",
   "@automerge/automerge-subduction",
   "@automerge/automerge-subduction/slim",
   "@keyhive/keyhive",

package/src/service-worker.ts

@@ -8,7 +8,7 @@ import { SwLogger } from "./sw-logger.js";
 // Uses /slim to avoid top-level await (disallowed in service workers).
 // Wasm is fetched from /automerge.wasm (emitted by the vite plugin) instead
 // of bundling the ~3MB base64 string.
-import { initializeWasm } from "@automerge/automerge/slim";
+import { initializeWasm, hasHeads } from "@automerge/automerge/slim";
 // eslint-disable-next-line
 // @ts-ignore — initSync is a wasm-bindgen runtime helper not in the .d.ts
 import { initSync as initSubductionSync } from "@automerge/automerge-subduction/slim";
@@ -21,11 +21,7 @@ import {
   stringifyAutomergeUrl,
   type PeerId,
 } from "@automerge/automerge-repo/slim";
-import {
-  findHandleInFolderHandle,
-  resolvePackageExport,
-  type FolderDoc,
-} from "@inkandswitch/patchwork-filesystem";
+import { resolvePath } from "@inkandswitch/patchwork-filesystem";
 
 // Small adapters — bundled directly into the SW
 import { IndexedDBStorageAdapter } from "@automerge/automerge-repo-storage-indexeddb";
@@ -35,8 +31,10 @@ import { WebSocketClientAdapter } from "@automerge/automerge-repo-network-websoc
 // TEMPORARY: enable debug npm module in SW context (no localStorage available)
 let cachename = "default";
 let debugging = false;
+const workerInstanceId = crypto.randomUUID();
 
 const SUBDUCTION_ENDPOINTS = ["wss://subduction.sync.inkandswitch.com"];
+const RESOLVE_TIMEOUT_MS = 30_000;
 
 // ── Persistent logger ───────────────────────────────────────────────────
 // Initialized eagerly so it's available for the entire SW lifetime.
@@ -66,9 +64,7 @@ const slog = SwLogger.open().then((logger) => {
   return logger;
 });
 
-const cacheableStatuses = [
-  200, 203, 204, 206, 300, 301, 404, 405, 410, 414, 501,
-];
+const cacheableStatuses = [200, 203, 204, 206];
 
 function log(...args: any[]) {
   if (!debugging) return;
@@ -103,12 +99,13 @@ let repoPromise: Promise<Repo> | null = null;
 
 function getRepo() {
   if (!repoPromise) {
-    repoPromise = (async () => {
+    const p: Promise<Repo> = (async () => {
       const logger = await slog;
+      logger.info("getRepo: starting");
 
       logger.info("fetching wasm modules");
       const [amWasmBuf, sdnWasmBuf] = await Promise.all([
-        fetch("/automerge.wasm").then((r) => r.arrayBuffer()),
+        fetch("/automerge.wasm?sw").then((r) => r.arrayBuffer()),
         fetch("/subduction.wasm").then((r) => r.arrayBuffer()),
       ]);
       initSubductionSync(new Uint8Array(sdnWasmBuf));
@@ -127,7 +124,7 @@ function getRepo() {
         },
         enableRemoteHeadsGossiping: true,
         subductionWebsocketEndpoints: SUBDUCTION_ENDPOINTS,
-        network: [new WebSocketClientAdapter("wss://sync3.automerge.org")],
+        //network: [new WebSocketClientAdapter("wss://sync3.automerge.org")],
       });
 
       (self as any).repo = repo;
@@ -143,6 +140,13 @@ function getRepo() {
 
       return repo;
     })();
+    // If construction fails (e.g. wasm fetch errors out because the SW was
+    // terminated mid-flight), don't permanently cache the rejection — clear
+    // the slot so the next caller can retry from scratch.
+    p.catch(() => {
+      if (repoPromise === p) repoPromise = null;
+    });
+    repoPromise = p;
   }
   return repoPromise;
 }
@@ -163,17 +167,39 @@ self.addEventListener("message", async (event) => {
     const [pongPort] = event.ports;
     log("ping");
     if (pongPort) {
-      pongPort.postMessage({ type: "pong" });
+      pongPort.postMessage({ type: "pong", workerInstanceId });
       log("pong");
       pongPort.close();
     } else if (event.source) {
-      (event.source as unknown as Client).postMessage({ type: "pong" });
+      (event.source as unknown as Client).postMessage({
+        type: "pong",
+        workerInstanceId,
+      });
       log("pong");
     }
   } else if (event.data.type == "port") {
     log("received messagechannel");
     const [port] = event.ports;
-    connectPort(port);
+    const source = event.source as Client | null;
+    const id = event.data.id;
+    // event.waitUntil keeps the SW alive until the work completes. Without
+    // it, the browser can terminate the SW the moment this synchronous block
+    // returns, killing the in-flight wasm fetch.
+    (event as unknown as FetchEvent).waitUntil(
+      connectPort(port).then(
+        () => source?.postMessage({ type: "port-ready", id, workerInstanceId }),
+        (err) => {
+          console.error("connectPort failed", err);
+          // Tell the client we failed so it doesn't hang forever.
+          source?.postMessage({
+            type: "port-failed",
+            id,
+            error: String(err),
+            workerInstanceId,
+          });
+        }
+      )
+    );
   } else if (event.data.type == "cachename") {
     const nextCachename = event.data.cachename;
     if (cachename == nextCachename) {
@@ -190,11 +216,6 @@ self.addEventListener("message", async (event) => {
   }
 });
 
-interface FileDoc {
-  content: string | Uint8Array;
-  mimeType?: string;
-}
-
 // ── Automerge URL resolution ───────────────────────────────────────────
 
 async function resolveAutomergeUrl(automergeURL: URL): Promise<Response> {
@@ -209,11 +230,11 @@ async function resolveAutomergeUrl(automergeURL: URL): Promise<Response> {
   // Trim trailing empty path segment
   if (path.length && !path[path.length - 1]) path.pop();
 
-  const { heads, documentId } = parseAutomergeUrl(maybeAutomergeUrl);
+  const { heads, hexHeads, documentId } = parseAutomergeUrl(maybeAutomergeUrl);
+  const signal = AbortSignal.timeout(RESOLVE_TIMEOUT_MS);
 
   if (!heads) {
-    // Redirect to pinned-heads URL
-    const folder = await repo.find(maybeAutomergeUrl);
+    const folder = await repo.find(maybeAutomergeUrl, { signal });
     const latestHeads = folder.heads();
     const url = stringifyAutomergeUrl({ documentId, heads: latestHeads });
     let location = `/${encodeURIComponent(url)}`;
@@ -221,93 +242,35 @@ async function resolveAutomergeUrl(automergeURL: URL): Promise<Response> {
     return Response.redirect(location, 307);
   }
 
-  // If no path, check if this is a package with exports to resolve
-  // e.g. /automerge%3Adocid/abc → resolve "abc" via package.json exports
-  const folderHandle = await repo.find<FolderDoc>(maybeAutomergeUrl);
-
-  let fileHandle;
-  if (path.length) {
-    // Try direct file navigation first
-    fileHandle = await findHandleInFolderHandle<FileDoc>(
-      repo,
-      folderHandle,
-      path.map(decodeURIComponent)
-    );
-
-    // If not found as a direct path, try resolving as a package subpath export
-    // e.g. /automerge%3Adocid/abc → exports["./abc"] → "./dist/abc.js"
-    if (!fileHandle) {
-      const subpath = "./" + path.map(decodeURIComponent).join("/");
-      const pkgFileHandle = await findHandleInFolderHandle<FileDoc>(
-        repo,
-        folderHandle,
-        ["package.json"]
-      );
-      if (pkgFileHandle) {
-        const pkgDoc = pkgFileHandle.doc() as FileDoc | undefined;
-        if (pkgDoc?.content) {
-          const pkgJson = JSON.parse(String(pkgDoc.content));
-          try {
-            const resolved = resolvePackageExport(pkgJson, subpath);
-            if (resolved) {
-              const resolvedPath = resolved.replace(/^\.\//, "").split("/");
-              fileHandle = await findHandleInFolderHandle<FileDoc>(
-                repo,
-                folderHandle,
-                resolvedPath
-              );
-            }
-          } catch {
-            // not a valid export subpath, fall through to error
-          }
-        }
-      }
-    }
-  } else {
-    // No path — resolve the root export (like "." in package.json)
-    const pkgFileHandle = await findHandleInFolderHandle<FileDoc>(
-      repo,
-      folderHandle,
-      ["package.json"]
-    );
-    if (pkgFileHandle) {
-      const pkgDoc = pkgFileHandle.doc() as FileDoc | undefined;
-      if (pkgDoc?.content) {
-        const pkgJson = JSON.parse(String(pkgDoc.content));
-        try {
-          const resolved = resolvePackageExport(pkgJson);
-          if (resolved) {
-            const resolvedPath = resolved.replace(/^\.\//, "").split("/");
-            fileHandle = await findHandleInFolderHandle<FileDoc>(
-              repo,
-              folderHandle,
-              resolvedPath
-            );
-          }
-        } catch {}
-      }
-    }
+  // Load by documentId only so we can verify the requested heads are actually
+  // in our local history. repo.find with a heads-bearing URL returns a view
+  // at those heads, which silently materializes garbage if we never synced them.
+  const baseHandle = await repo.find(stringifyAutomergeUrl({ documentId }), {
+    signal,
+  });
+  if (!hasHeads(baseHandle.doc(), hexHeads ?? [])) {
+    return new Response("heads not found", { status: 404 });
   }
+  const rootHandle = baseHandle.view(heads);
+
+  const resolved = await resolvePath(
+    repo,
+    rootHandle,
+    path.map(decodeURIComponent)
+  );
 
-  if (!fileHandle) {
+  if (!resolved) {
     throw new Error(
       `couldn't resolve ${path.join("/")} in folder at ${maybeAutomergeUrl}`
     );
   }
 
-  const fileDoc = fileHandle.doc() as unknown as FileDoc;
-  const content = fileDoc?.content;
-  if (!content) {
-    throw new Error(`file at ${href} has no content`);
-  }
-
-  let body: BodyInit =
-    content instanceof Uint8Array
-      ? (new Uint8Array(content) as BlobPart)
-      : String(content);
-  const mimeType = fileDoc.mimeType ?? "text/plain";
+  const body: BodyInit =
+    resolved.content instanceof Uint8Array
+      ? (new Uint8Array(resolved.content) as BlobPart)
+      : resolved.content;
 
-  const headers = new Headers({ "content-type": mimeType });
+  const headers = new Headers({ "content-type": resolved.type });
   headers.set("cross-origin-embedder-policy", "credentialless");
   headers.set("cross-origin-resource-policy", "cross-origin");
 
@@ -353,7 +316,18 @@ self.addEventListener("fetch", (fetchEvent: FetchEvent) => {
             });
           }
 
-          const response = await resolveAutomergeUrl(specialURL);
+          const response = await Promise.race([
+            resolveAutomergeUrl(specialURL),
+            new Promise<never>((_, reject) =>
+              setTimeout(
+                () =>
+                  reject(
+                    new Error(`resolve timeout after ${RESOLVE_TIMEOUT_MS}ms`)
+                  ),
+                RESOLVE_TIMEOUT_MS
+              )
+            ),
+          ]);
 
           if (response.status === 307) {
             return response;