@panyam/tsappkit 0.1.0 → 0.2.0

package/dist/wasmhost/index.d.mts

@@ -0,0 +1,48 @@
+/** A mount's files, keyed by slash-separated path within the mount. */
+type Files = Record<string, Uint8Array>;
+
+/** Where the worker's pieces are served, and the global name the Go side exports under. */
+interface StartWorkerOptions {
+    /** The built worker script, @panyam/tsappkit/wasmhost/worker.js, as your bundler serves it. */
+    worker: string | URL;
+    /** The Go wasm build. */
+    wasm: string | URL;
+    /** Go's wasm_exec.js, from `$(go env GOROOT)/lib/wasm`, matching the Go that built the wasm. */
+    exec: string | URL;
+    /** The ns the Go program passed to wasmhost.Serve. */
+    ns: string;
+}
+/**
+ * Starts the worker and resolves with it once the Go program has installed its exports, or rejects
+ * with why it couldn't load. Relative URLs resolve against the page, not the worker script.
+ */
+declare function startWorker(opts: StartWorkerOptions): Promise<Worker>;
+/**
+ * A fetch that answers in the worker, for `createConnectTransport({ baseUrl, fetch: workerFetch(worker) })`.
+ * Only the path and query reach the worker, so baseUrl can be anything absolute, such as
+ * location.origin. It rejects if the worker reports an error (no handler, a failed build, a handler
+ * panic) and resolves with any HTTP status the handler chose.
+ */
+declare function workerFetch(worker: Worker): (input: RequestInfo | URL, init?: RequestInit) => Promise<Response>;
+/**
+ * Replaces the mount `name` with `files`. The buffers are transferred to the worker, not copied, so
+ * each Uint8Array is empty here afterwards; copy first anything the page still needs. Resolves once
+ * the worker has mounted them (and, for a rebuild-mode host, rebuilt its handler).
+ */
+declare function mountFiles(worker: Worker, name: string, files: Files): Promise<void>;
+/** Removes the mount `name`. Removing a name that isn't mounted succeeds. */
+declare function unmountFiles(worker: Worker, name: string): Promise<void>;
+
+/**
+ * Reads a drop into files keyed by path. A dropped folder keeps its own name as the first path
+ * element ("design/board.edn"), and dropped loose files sit at the top. Entries the browser can't
+ * read as files or folders are skipped.
+ */
+declare function filesFromDrop(dt: DataTransfer): Promise<Files>;
+/**
+ * Reads an `<input type="file" webkitdirectory>` (or `multiple`) selection into files keyed by
+ * path. Folder picks use each file's webkitRelativePath, which starts with the folder's name.
+ */
+declare function filesFromFileList(list: FileList | File[]): Promise<Files>;
+
+export { type Files, type StartWorkerOptions, filesFromDrop, filesFromFileList, mountFiles, startWorker, unmountFiles, workerFetch };

package/dist/wasmhost/index.d.ts

@@ -0,0 +1,48 @@
+/** A mount's files, keyed by slash-separated path within the mount. */
+type Files = Record<string, Uint8Array>;
+
+/** Where the worker's pieces are served, and the global name the Go side exports under. */
+interface StartWorkerOptions {
+    /** The built worker script, @panyam/tsappkit/wasmhost/worker.js, as your bundler serves it. */
+    worker: string | URL;
+    /** The Go wasm build. */
+    wasm: string | URL;
+    /** Go's wasm_exec.js, from `$(go env GOROOT)/lib/wasm`, matching the Go that built the wasm. */
+    exec: string | URL;
+    /** The ns the Go program passed to wasmhost.Serve. */
+    ns: string;
+}
+/**
+ * Starts the worker and resolves with it once the Go program has installed its exports, or rejects
+ * with why it couldn't load. Relative URLs resolve against the page, not the worker script.
+ */
+declare function startWorker(opts: StartWorkerOptions): Promise<Worker>;
+/**
+ * A fetch that answers in the worker, for `createConnectTransport({ baseUrl, fetch: workerFetch(worker) })`.
+ * Only the path and query reach the worker, so baseUrl can be anything absolute, such as
+ * location.origin. It rejects if the worker reports an error (no handler, a failed build, a handler
+ * panic) and resolves with any HTTP status the handler chose.
+ */
+declare function workerFetch(worker: Worker): (input: RequestInfo | URL, init?: RequestInit) => Promise<Response>;
+/**
+ * Replaces the mount `name` with `files`. The buffers are transferred to the worker, not copied, so
+ * each Uint8Array is empty here afterwards; copy first anything the page still needs. Resolves once
+ * the worker has mounted them (and, for a rebuild-mode host, rebuilt its handler).
+ */
+declare function mountFiles(worker: Worker, name: string, files: Files): Promise<void>;
+/** Removes the mount `name`. Removing a name that isn't mounted succeeds. */
+declare function unmountFiles(worker: Worker, name: string): Promise<void>;
+
+/**
+ * Reads a drop into files keyed by path. A dropped folder keeps its own name as the first path
+ * element ("design/board.edn"), and dropped loose files sit at the top. Entries the browser can't
+ * read as files or folders are skipped.
+ */
+declare function filesFromDrop(dt: DataTransfer): Promise<Files>;
+/**
+ * Reads an `<input type="file" webkitdirectory>` (or `multiple`) selection into files keyed by
+ * path. Folder picks use each file's webkitRelativePath, which starts with the folder's name.
+ */
+declare function filesFromFileList(list: FileList | File[]): Promise<Files>;
+
+export { type Files, type StartWorkerOptions, filesFromDrop, filesFromFileList, mountFiles, startWorker, unmountFiles, workerFetch };

package/dist/wasmhost/index.js

@@ -0,0 +1,152 @@
+'use strict';
+
+// src/wasmhost/client.ts
+var Channel = class {
+  constructor(worker) {
+    this.worker = worker;
+    this.next = 1;
+    this.pending = /* @__PURE__ */ new Map();
+    this.dead = null;
+    worker.addEventListener("message", (ev) => {
+      const m = ev.data;
+      if ("exited" in m) {
+        this.fail(new Error(`wasm host: ${m.exited}`));
+      } else if ("id" in m) {
+        this.pending.get(m.id)?.resolve(m);
+        this.pending.delete(m.id);
+      }
+    });
+    worker.addEventListener("error", (ev) => this.fail(new Error(`wasm host worker: ${ev.message}`)));
+  }
+  call(req, transfer) {
+    if (this.dead) return Promise.reject(this.dead);
+    return new Promise((resolve, reject) => {
+      const id = this.next++;
+      this.pending.set(id, { resolve, reject });
+      this.worker.postMessage({ ...req, id }, transfer);
+    });
+  }
+  fail(err) {
+    this.dead = err;
+    for (const p of this.pending.values()) p.reject(err);
+    this.pending.clear();
+  }
+};
+var channels = /* @__PURE__ */ new WeakMap();
+function channel(worker) {
+  let c = channels.get(worker);
+  if (!c) {
+    c = new Channel(worker);
+    channels.set(worker, c);
+  }
+  return c;
+}
+function startWorker(opts) {
+  const abs = (u) => new URL(u, location.href).href;
+  const url = new URL(abs(opts.worker));
+  url.searchParams.set("wasm", abs(opts.wasm));
+  url.searchParams.set("exec", abs(opts.exec));
+  url.searchParams.set("ns", opts.ns);
+  const worker = new Worker(url);
+  channel(worker);
+  return new Promise((resolve, reject) => {
+    const onMessage = (ev) => {
+      const m = ev.data;
+      if (!("ready" in m)) return;
+      worker.removeEventListener("message", onMessage);
+      if (m.ready) resolve(worker);
+      else reject(new Error(`wasm host failed to load: ${m.error}`));
+    };
+    worker.addEventListener("message", onMessage);
+    worker.addEventListener("error", (ev) => reject(new Error(`wasm host worker: ${ev.message}`)), {
+      once: true
+    });
+  });
+}
+var NULL_BODY = /* @__PURE__ */ new Set([101, 103, 204, 205, 304]);
+function workerFetch(worker) {
+  const c = channel(worker);
+  return async (input, init) => {
+    const req = new Request(input, init);
+    const buf = new Uint8Array(await req.arrayBuffer());
+    const body = buf.byteLength ? buf : null;
+    const headers = {};
+    req.headers.forEach((v, k) => headers[k] = v);
+    const u = new URL(req.url);
+    const reply = await c.call(
+      { kind: "http", method: req.method, url: u.pathname + u.search, headers, body },
+      body ? [body.buffer] : []
+    );
+    if (!reply.ok) throw new Error(reply.error);
+    const status = reply.status ?? 200;
+    const resBody = NULL_BODY.has(status) ? null : reply.body ?? null;
+    return new Response(resBody, { status, headers: reply.headers });
+  };
+}
+async function mountFiles(worker, name, files) {
+  const transfer = /* @__PURE__ */ new Set();
+  for (const b of Object.values(files)) {
+    if (Object.prototype.toString.call(b.buffer) === "[object ArrayBuffer]") transfer.add(b.buffer);
+  }
+  const reply = await channel(worker).call({ kind: "mount", name, files }, [...transfer]);
+  if (!reply.ok) throw new Error(reply.error);
+}
+async function unmountFiles(worker, name) {
+  const reply = await channel(worker).call({ kind: "unmount", name }, []);
+  if (!reply.ok) throw new Error(reply.error);
+}
+
+// src/wasmhost/drop.ts
+async function filesFromDrop(dt) {
+  const entries = [];
+  const loose = [];
+  for (const item of Array.from(dt.items)) {
+    if (item.kind !== "file") continue;
+    const entry = item.webkitGetAsEntry?.();
+    if (entry) entries.push(entry);
+    else {
+      const f = item.getAsFile();
+      if (f) loose.push(f);
+    }
+  }
+  const out = {};
+  await Promise.all([
+    ...entries.map((e) => readEntry(e, out)),
+    ...loose.map(async (f) => {
+      out[f.name] = new Uint8Array(await f.arrayBuffer());
+    })
+  ]);
+  return out;
+}
+async function filesFromFileList(list) {
+  const out = {};
+  await Promise.all(
+    Array.from(list).map(async (f) => {
+      out[f.webkitRelativePath || f.name] = new Uint8Array(await f.arrayBuffer());
+    })
+  );
+  return out;
+}
+async function readEntry(entry, out) {
+  if (entry.isFile) {
+    const f = await new Promise((ok, err) => entry.file(ok, err));
+    out[entry.fullPath.replace(/^\/+/, "")] = new Uint8Array(await f.arrayBuffer());
+    return;
+  }
+  if (!entry.isDirectory) return;
+  const reader = entry.createReader();
+  for (; ; ) {
+    const batch = await new Promise((ok, err) => reader.readEntries(ok, err));
+    if (batch.length === 0) return;
+    await Promise.all(batch.map((e) => readEntry(e, out)));
+  }
+}
+
+exports.filesFromDrop = filesFromDrop;
+exports.filesFromFileList = filesFromFileList;
+exports.mountFiles = mountFiles;
+exports.startWorker = startWorker;
+exports.unmountFiles = unmountFiles;
+exports.workerFetch = workerFetch;
+//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/dist/wasmhost/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/wasmhost/client.ts","../../src/wasmhost/drop.ts"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["// The page's side of a wasm host worker (goapplib issue 32). startWorker loads the app's Go wasm in\n// a Web Worker; workerFetch is a fetch to hand a Connect transport, so the app's generated clients\n// talk to the worker exactly as they would to a server; mountFiles pushes files in before the\n// requests that read them.\nimport type { Files, HostReply, HostRequest, HostStatus } from \"./protocol\";\n\nexport type { Files } from \"./protocol\";\n\n/** Where the worker's pieces are served, and the global name the Go side exports under. */\nexport interface StartWorkerOptions {\n  /** The built worker script, @panyam/tsappkit/wasmhost/worker.js, as your bundler serves it. */\n  worker: string | URL;\n  /** The Go wasm build. */\n  wasm: string | URL;\n  /** Go's wasm_exec.js, from `$(go env GOROOT)/lib/wasm`, matching the Go that built the wasm. */\n  exec: string | URL;\n  /** The ns the Go program passed to wasmhost.Serve. */\n  ns: string;\n}\n\ntype Unsent = HostRequest extends infer R ? (R extends HostRequest ? Omit<R, \"id\"> : never) : never;\n\nclass Channel {\n  private next = 1;\n  private pending = new Map<number, { resolve: (r: HostReply) => void; reject: (e: Error) => void }>();\n  private dead: Error | null = null;\n\n  constructor(private worker: Worker) {\n    worker.addEventListener(\"message\", (ev: MessageEvent<HostReply | HostStatus>) => {\n      const m = ev.data;\n      if (\"exited\" in m) {\n        this.fail(new Error(`wasm host: ${m.exited}`));\n      } else if (\"id\" in m) {\n        this.pending.get(m.id)?.resolve(m);\n        this.pending.delete(m.id);\n      }\n    });\n    worker.addEventListener(\"error\", (ev: ErrorEvent) => this.fail(new Error(`wasm host worker: ${ev.message}`)));\n  }\n\n  call(req: Unsent, transfer: Transferable[]): Promise<HostReply> {\n    if (this.dead) return Promise.reject(this.dead);\n    return new Promise((resolve, reject) => {\n      const id = this.next++;\n      this.pending.set(id, { resolve, reject });\n      this.worker.postMessage({ ...req, id }, transfer);\n    });\n  }\n\n  private fail(err: Error) {\n    this.dead = err;\n    for (const p of this.pending.values()) p.reject(err);\n    this.pending.clear();\n  }\n}\n\nconst channels = new WeakMap<Worker, Channel>();\n\nfunction channel(worker: Worker): Channel {\n  let c = channels.get(worker);\n  if (!c) {\n    c = new Channel(worker);\n    channels.set(worker, c);\n  }\n  return c;\n}\n\n/**\n * Starts the worker and resolves with it once the Go program has installed its exports, or rejects\n * with why it couldn't load. Relative URLs resolve against the page, not the worker script.\n */\nexport function startWorker(opts: StartWorkerOptions): Promise<Worker> {\n  const abs = (u: string | URL) => new URL(u, location.href).href;\n  const url = new URL(abs(opts.worker));\n  url.searchParams.set(\"wasm\", abs(opts.wasm));\n  url.searchParams.set(\"exec\", abs(opts.exec));\n  url.searchParams.set(\"ns\", opts.ns);\n  const worker = new Worker(url);\n  channel(worker);\n  return new Promise((resolve, reject) => {\n    const onMessage = (ev: MessageEvent<HostStatus | HostReply>) => {\n      const m = ev.data;\n      if (!(\"ready\" in m)) return;\n      worker.removeEventListener(\"message\", onMessage);\n      if (m.ready) resolve(worker);\n      else reject(new Error(`wasm host failed to load: ${m.error}`));\n    };\n    worker.addEventListener(\"message\", onMessage);\n    worker.addEventListener(\"error\", (ev: ErrorEvent) => reject(new Error(`wasm host worker: ${ev.message}`)), {\n      once: true,\n    });\n  });\n}\n\n// Statuses whose Response must have no body.\nconst NULL_BODY = new Set([101, 103, 204, 205, 304]);\n\n/**\n * A fetch that answers in the worker, for `createConnectTransport({ baseUrl, fetch: workerFetch(worker) })`.\n * Only the path and query reach the worker, so baseUrl can be anything absolute, such as\n * location.origin. It rejects if the worker reports an error (no handler, a failed build, a handler\n * panic) and resolves with any HTTP status the handler chose.\n */\nexport function workerFetch(worker: Worker): (input: RequestInfo | URL, init?: RequestInit) => Promise<Response> {\n  const c = channel(worker);\n  return async (input, init) => {\n    const req = new Request(input, init);\n    const buf = new Uint8Array(await req.arrayBuffer());\n    const body = buf.byteLength ? buf : null;\n    const headers: Record<string, string> = {};\n    req.headers.forEach((v, k) => (headers[k] = v));\n    const u = new URL(req.url);\n    const reply = await c.call(\n      { kind: \"http\", method: req.method, url: u.pathname + u.search, headers, body },\n      body ? [body.buffer] : [],\n    );\n    if (!reply.ok) throw new Error(reply.error);\n    const status = reply.status ?? 200;\n    const resBody = NULL_BODY.has(status) ? null : ((reply.body ?? null) as BodyInit | null);\n    return new Response(resBody, { status, headers: reply.headers });\n  };\n}\n\n/**\n * Replaces the mount `name` with `files`. The buffers are transferred to the worker, not copied, so\n * each Uint8Array is empty here afterwards; copy first anything the page still needs. Resolves once\n * the worker has mounted them (and, for a rebuild-mode host, rebuilt its handler).\n */\nexport async function mountFiles(worker: Worker, name: string, files: Files): Promise<void> {\n  const transfer = new Set<ArrayBuffer>();\n  for (const b of Object.values(files)) {\n    // A tag check rather than instanceof, which fails for a buffer from another realm (an iframe),\n    // and a SharedArrayBuffer can't be transferred.\n    if (Object.prototype.toString.call(b.buffer) === \"[object ArrayBuffer]\") transfer.add(b.buffer as ArrayBuffer);\n  }\n  const reply = await channel(worker).call({ kind: \"mount\", name, files }, [...transfer]);\n  if (!reply.ok) throw new Error(reply.error);\n}\n\n/** Removes the mount `name`. Removing a name that isn't mounted succeeds. */\nexport async function unmountFiles(worker: Worker, name: string): Promise<void> {\n  const reply = await channel(worker).call({ kind: \"unmount\", name }, []);\n  if (!reply.ok) throw new Error(reply.error);\n}\n","// Turning what a user drops or picks into the {path: bytes} map mountFiles takes. The bytes are\n// read here, before any request, because the Go side can't wait on File.arrayBuffer() mid-request.\nimport type { Files } from \"./protocol\";\n\n// The parts of the File and Directory Entries API used here. Chromium, Firefox and Safari all ship\n// it under the webkit prefix.\ninterface Entry {\n  isFile: boolean;\n  isDirectory: boolean;\n  fullPath: string;\n}\ninterface FileEntry extends Entry {\n  file(ok: (f: File) => void, err: (e: unknown) => void): void;\n}\ninterface DirectoryEntry extends Entry {\n  createReader(): { readEntries(ok: (es: Entry[]) => void, err: (e: unknown) => void): void };\n}\n\n/**\n * Reads a drop into files keyed by path. A dropped folder keeps its own name as the first path\n * element (\"design/board.edn\"), and dropped loose files sit at the top. Entries the browser can't\n * read as files or folders are skipped.\n */\nexport async function filesFromDrop(dt: DataTransfer): Promise<Files> {\n  const entries: Entry[] = [];\n  const loose: File[] = [];\n  for (const item of Array.from(dt.items)) {\n    if (item.kind !== \"file\") continue;\n    const entry = (item as DataTransferItem & { webkitGetAsEntry?: () => Entry | null }).webkitGetAsEntry?.();\n    if (entry) entries.push(entry);\n    else {\n      const f = item.getAsFile();\n      if (f) loose.push(f);\n    }\n  }\n  const out: Files = {};\n  await Promise.all([\n    ...entries.map((e) => readEntry(e, out)),\n    ...loose.map(async (f) => {\n      out[f.name] = new Uint8Array(await f.arrayBuffer());\n    }),\n  ]);\n  return out;\n}\n\n/**\n * Reads an `<input type=\"file\" webkitdirectory>` (or `multiple`) selection into files keyed by\n * path. Folder picks use each file's webkitRelativePath, which starts with the folder's name.\n */\nexport async function filesFromFileList(list: FileList | File[]): Promise<Files> {\n  const out: Files = {};\n  await Promise.all(\n    Array.from(list).map(async (f) => {\n      out[f.webkitRelativePath || f.name] = new Uint8Array(await f.arrayBuffer());\n    }),\n  );\n  return out;\n}\n\nasync function readEntry(entry: Entry, out: Files): Promise<void> {\n  if (entry.isFile) {\n    const f = await new Promise<File>((ok, err) => (entry as FileEntry).file(ok, err));\n    out[entry.fullPath.replace(/^\\/+/, \"\")] = new Uint8Array(await f.arrayBuffer());\n    return;\n  }\n  if (!entry.isDirectory) return;\n  const reader = (entry as DirectoryEntry).createReader();\n  // readEntries returns a batch at a time (100 in Chromium) and an empty batch at the end.\n  for (;;) {\n    const batch = await new Promise<Entry[]>((ok, err) => reader.readEntries(ok, err));\n    if (batch.length === 0) return;\n    await Promise.all(batch.map((e) => readEntry(e, out)));\n  }\n}\n"]}

package/dist/wasmhost/index.mjs

@@ -0,0 +1,145 @@
+// src/wasmhost/client.ts
+var Channel = class {
+  constructor(worker) {
+    this.worker = worker;
+    this.next = 1;
+    this.pending = /* @__PURE__ */ new Map();
+    this.dead = null;
+    worker.addEventListener("message", (ev) => {
+      const m = ev.data;
+      if ("exited" in m) {
+        this.fail(new Error(`wasm host: ${m.exited}`));
+      } else if ("id" in m) {
+        this.pending.get(m.id)?.resolve(m);
+        this.pending.delete(m.id);
+      }
+    });
+    worker.addEventListener("error", (ev) => this.fail(new Error(`wasm host worker: ${ev.message}`)));
+  }
+  call(req, transfer) {
+    if (this.dead) return Promise.reject(this.dead);
+    return new Promise((resolve, reject) => {
+      const id = this.next++;
+      this.pending.set(id, { resolve, reject });
+      this.worker.postMessage({ ...req, id }, transfer);
+    });
+  }
+  fail(err) {
+    this.dead = err;
+    for (const p of this.pending.values()) p.reject(err);
+    this.pending.clear();
+  }
+};
+var channels = /* @__PURE__ */ new WeakMap();
+function channel(worker) {
+  let c = channels.get(worker);
+  if (!c) {
+    c = new Channel(worker);
+    channels.set(worker, c);
+  }
+  return c;
+}
+function startWorker(opts) {
+  const abs = (u) => new URL(u, location.href).href;
+  const url = new URL(abs(opts.worker));
+  url.searchParams.set("wasm", abs(opts.wasm));
+  url.searchParams.set("exec", abs(opts.exec));
+  url.searchParams.set("ns", opts.ns);
+  const worker = new Worker(url);
+  channel(worker);
+  return new Promise((resolve, reject) => {
+    const onMessage = (ev) => {
+      const m = ev.data;
+      if (!("ready" in m)) return;
+      worker.removeEventListener("message", onMessage);
+      if (m.ready) resolve(worker);
+      else reject(new Error(`wasm host failed to load: ${m.error}`));
+    };
+    worker.addEventListener("message", onMessage);
+    worker.addEventListener("error", (ev) => reject(new Error(`wasm host worker: ${ev.message}`)), {
+      once: true
+    });
+  });
+}
+var NULL_BODY = /* @__PURE__ */ new Set([101, 103, 204, 205, 304]);
+function workerFetch(worker) {
+  const c = channel(worker);
+  return async (input, init) => {
+    const req = new Request(input, init);
+    const buf = new Uint8Array(await req.arrayBuffer());
+    const body = buf.byteLength ? buf : null;
+    const headers = {};
+    req.headers.forEach((v, k) => headers[k] = v);
+    const u = new URL(req.url);
+    const reply = await c.call(
+      { kind: "http", method: req.method, url: u.pathname + u.search, headers, body },
+      body ? [body.buffer] : []
+    );
+    if (!reply.ok) throw new Error(reply.error);
+    const status = reply.status ?? 200;
+    const resBody = NULL_BODY.has(status) ? null : reply.body ?? null;
+    return new Response(resBody, { status, headers: reply.headers });
+  };
+}
+async function mountFiles(worker, name, files) {
+  const transfer = /* @__PURE__ */ new Set();
+  for (const b of Object.values(files)) {
+    if (Object.prototype.toString.call(b.buffer) === "[object ArrayBuffer]") transfer.add(b.buffer);
+  }
+  const reply = await channel(worker).call({ kind: "mount", name, files }, [...transfer]);
+  if (!reply.ok) throw new Error(reply.error);
+}
+async function unmountFiles(worker, name) {
+  const reply = await channel(worker).call({ kind: "unmount", name }, []);
+  if (!reply.ok) throw new Error(reply.error);
+}
+
+// src/wasmhost/drop.ts
+async function filesFromDrop(dt) {
+  const entries = [];
+  const loose = [];
+  for (const item of Array.from(dt.items)) {
+    if (item.kind !== "file") continue;
+    const entry = item.webkitGetAsEntry?.();
+    if (entry) entries.push(entry);
+    else {
+      const f = item.getAsFile();
+      if (f) loose.push(f);
+    }
+  }
+  const out = {};
+  await Promise.all([
+    ...entries.map((e) => readEntry(e, out)),
+    ...loose.map(async (f) => {
+      out[f.name] = new Uint8Array(await f.arrayBuffer());
+    })
+  ]);
+  return out;
+}
+async function filesFromFileList(list) {
+  const out = {};
+  await Promise.all(
+    Array.from(list).map(async (f) => {
+      out[f.webkitRelativePath || f.name] = new Uint8Array(await f.arrayBuffer());
+    })
+  );
+  return out;
+}
+async function readEntry(entry, out) {
+  if (entry.isFile) {
+    const f = await new Promise((ok, err) => entry.file(ok, err));
+    out[entry.fullPath.replace(/^\/+/, "")] = new Uint8Array(await f.arrayBuffer());
+    return;
+  }
+  if (!entry.isDirectory) return;
+  const reader = entry.createReader();
+  for (; ; ) {
+    const batch = await new Promise((ok, err) => reader.readEntries(ok, err));
+    if (batch.length === 0) return;
+    await Promise.all(batch.map((e) => readEntry(e, out)));
+  }
+}
+
+export { filesFromDrop, filesFromFileList, mountFiles, startWorker, unmountFiles, workerFetch };
+//# sourceMappingURL=index.mjs.map
+//# sourceMappingURL=index.mjs.map

package/dist/wasmhost/index.mjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/wasmhost/client.ts","../../src/wasmhost/drop.ts"],"names":[],"mappings":"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","file":"index.mjs","sourcesContent":["// The page's side of a wasm host worker (goapplib issue 32). startWorker loads the app's Go wasm in\n// a Web Worker; workerFetch is a fetch to hand a Connect transport, so the app's generated clients\n// talk to the worker exactly as they would to a server; mountFiles pushes files in before the\n// requests that read them.\nimport type { Files, HostReply, HostRequest, HostStatus } from \"./protocol\";\n\nexport type { Files } from \"./protocol\";\n\n/** Where the worker's pieces are served, and the global name the Go side exports under. */\nexport interface StartWorkerOptions {\n  /** The built worker script, @panyam/tsappkit/wasmhost/worker.js, as your bundler serves it. */\n  worker: string | URL;\n  /** The Go wasm build. */\n  wasm: string | URL;\n  /** Go's wasm_exec.js, from `$(go env GOROOT)/lib/wasm`, matching the Go that built the wasm. */\n  exec: string | URL;\n  /** The ns the Go program passed to wasmhost.Serve. */\n  ns: string;\n}\n\ntype Unsent = HostRequest extends infer R ? (R extends HostRequest ? Omit<R, \"id\"> : never) : never;\n\nclass Channel {\n  private next = 1;\n  private pending = new Map<number, { resolve: (r: HostReply) => void; reject: (e: Error) => void }>();\n  private dead: Error | null = null;\n\n  constructor(private worker: Worker) {\n    worker.addEventListener(\"message\", (ev: MessageEvent<HostReply | HostStatus>) => {\n      const m = ev.data;\n      if (\"exited\" in m) {\n        this.fail(new Error(`wasm host: ${m.exited}`));\n      } else if (\"id\" in m) {\n        this.pending.get(m.id)?.resolve(m);\n        this.pending.delete(m.id);\n      }\n    });\n    worker.addEventListener(\"error\", (ev: ErrorEvent) => this.fail(new Error(`wasm host worker: ${ev.message}`)));\n  }\n\n  call(req: Unsent, transfer: Transferable[]): Promise<HostReply> {\n    if (this.dead) return Promise.reject(this.dead);\n    return new Promise((resolve, reject) => {\n      const id = this.next++;\n      this.pending.set(id, { resolve, reject });\n      this.worker.postMessage({ ...req, id }, transfer);\n    });\n  }\n\n  private fail(err: Error) {\n    this.dead = err;\n    for (const p of this.pending.values()) p.reject(err);\n    this.pending.clear();\n  }\n}\n\nconst channels = new WeakMap<Worker, Channel>();\n\nfunction channel(worker: Worker): Channel {\n  let c = channels.get(worker);\n  if (!c) {\n    c = new Channel(worker);\n    channels.set(worker, c);\n  }\n  return c;\n}\n\n/**\n * Starts the worker and resolves with it once the Go program has installed its exports, or rejects\n * with why it couldn't load. Relative URLs resolve against the page, not the worker script.\n */\nexport function startWorker(opts: StartWorkerOptions): Promise<Worker> {\n  const abs = (u: string | URL) => new URL(u, location.href).href;\n  const url = new URL(abs(opts.worker));\n  url.searchParams.set(\"wasm\", abs(opts.wasm));\n  url.searchParams.set(\"exec\", abs(opts.exec));\n  url.searchParams.set(\"ns\", opts.ns);\n  const worker = new Worker(url);\n  channel(worker);\n  return new Promise((resolve, reject) => {\n    const onMessage = (ev: MessageEvent<HostStatus | HostReply>) => {\n      const m = ev.data;\n      if (!(\"ready\" in m)) return;\n      worker.removeEventListener(\"message\", onMessage);\n      if (m.ready) resolve(worker);\n      else reject(new Error(`wasm host failed to load: ${m.error}`));\n    };\n    worker.addEventListener(\"message\", onMessage);\n    worker.addEventListener(\"error\", (ev: ErrorEvent) => reject(new Error(`wasm host worker: ${ev.message}`)), {\n      once: true,\n    });\n  });\n}\n\n// Statuses whose Response must have no body.\nconst NULL_BODY = new Set([101, 103, 204, 205, 304]);\n\n/**\n * A fetch that answers in the worker, for `createConnectTransport({ baseUrl, fetch: workerFetch(worker) })`.\n * Only the path and query reach the worker, so baseUrl can be anything absolute, such as\n * location.origin. It rejects if the worker reports an error (no handler, a failed build, a handler\n * panic) and resolves with any HTTP status the handler chose.\n */\nexport function workerFetch(worker: Worker): (input: RequestInfo | URL, init?: RequestInit) => Promise<Response> {\n  const c = channel(worker);\n  return async (input, init) => {\n    const req = new Request(input, init);\n    const buf = new Uint8Array(await req.arrayBuffer());\n    const body = buf.byteLength ? buf : null;\n    const headers: Record<string, string> = {};\n    req.headers.forEach((v, k) => (headers[k] = v));\n    const u = new URL(req.url);\n    const reply = await c.call(\n      { kind: \"http\", method: req.method, url: u.pathname + u.search, headers, body },\n      body ? [body.buffer] : [],\n    );\n    if (!reply.ok) throw new Error(reply.error);\n    const status = reply.status ?? 200;\n    const resBody = NULL_BODY.has(status) ? null : ((reply.body ?? null) as BodyInit | null);\n    return new Response(resBody, { status, headers: reply.headers });\n  };\n}\n\n/**\n * Replaces the mount `name` with `files`. The buffers are transferred to the worker, not copied, so\n * each Uint8Array is empty here afterwards; copy first anything the page still needs. Resolves once\n * the worker has mounted them (and, for a rebuild-mode host, rebuilt its handler).\n */\nexport async function mountFiles(worker: Worker, name: string, files: Files): Promise<void> {\n  const transfer = new Set<ArrayBuffer>();\n  for (const b of Object.values(files)) {\n    // A tag check rather than instanceof, which fails for a buffer from another realm (an iframe),\n    // and a SharedArrayBuffer can't be transferred.\n    if (Object.prototype.toString.call(b.buffer) === \"[object ArrayBuffer]\") transfer.add(b.buffer as ArrayBuffer);\n  }\n  const reply = await channel(worker).call({ kind: \"mount\", name, files }, [...transfer]);\n  if (!reply.ok) throw new Error(reply.error);\n}\n\n/** Removes the mount `name`. Removing a name that isn't mounted succeeds. */\nexport async function unmountFiles(worker: Worker, name: string): Promise<void> {\n  const reply = await channel(worker).call({ kind: \"unmount\", name }, []);\n  if (!reply.ok) throw new Error(reply.error);\n}\n","// Turning what a user drops or picks into the {path: bytes} map mountFiles takes. The bytes are\n// read here, before any request, because the Go side can't wait on File.arrayBuffer() mid-request.\nimport type { Files } from \"./protocol\";\n\n// The parts of the File and Directory Entries API used here. Chromium, Firefox and Safari all ship\n// it under the webkit prefix.\ninterface Entry {\n  isFile: boolean;\n  isDirectory: boolean;\n  fullPath: string;\n}\ninterface FileEntry extends Entry {\n  file(ok: (f: File) => void, err: (e: unknown) => void): void;\n}\ninterface DirectoryEntry extends Entry {\n  createReader(): { readEntries(ok: (es: Entry[]) => void, err: (e: unknown) => void): void };\n}\n\n/**\n * Reads a drop into files keyed by path. A dropped folder keeps its own name as the first path\n * element (\"design/board.edn\"), and dropped loose files sit at the top. Entries the browser can't\n * read as files or folders are skipped.\n */\nexport async function filesFromDrop(dt: DataTransfer): Promise<Files> {\n  const entries: Entry[] = [];\n  const loose: File[] = [];\n  for (const item of Array.from(dt.items)) {\n    if (item.kind !== \"file\") continue;\n    const entry = (item as DataTransferItem & { webkitGetAsEntry?: () => Entry | null }).webkitGetAsEntry?.();\n    if (entry) entries.push(entry);\n    else {\n      const f = item.getAsFile();\n      if (f) loose.push(f);\n    }\n  }\n  const out: Files = {};\n  await Promise.all([\n    ...entries.map((e) => readEntry(e, out)),\n    ...loose.map(async (f) => {\n      out[f.name] = new Uint8Array(await f.arrayBuffer());\n    }),\n  ]);\n  return out;\n}\n\n/**\n * Reads an `<input type=\"file\" webkitdirectory>` (or `multiple`) selection into files keyed by\n * path. Folder picks use each file's webkitRelativePath, which starts with the folder's name.\n */\nexport async function filesFromFileList(list: FileList | File[]): Promise<Files> {\n  const out: Files = {};\n  await Promise.all(\n    Array.from(list).map(async (f) => {\n      out[f.webkitRelativePath || f.name] = new Uint8Array(await f.arrayBuffer());\n    }),\n  );\n  return out;\n}\n\nasync function readEntry(entry: Entry, out: Files): Promise<void> {\n  if (entry.isFile) {\n    const f = await new Promise<File>((ok, err) => (entry as FileEntry).file(ok, err));\n    out[entry.fullPath.replace(/^\\/+/, \"\")] = new Uint8Array(await f.arrayBuffer());\n    return;\n  }\n  if (!entry.isDirectory) return;\n  const reader = (entry as DirectoryEntry).createReader();\n  // readEntries returns a batch at a time (100 in Chromium) and an empty batch at the end.\n  for (;;) {\n    const batch = await new Promise<Entry[]>((ok, err) => reader.readEntries(ok, err));\n    if (batch.length === 0) return;\n    await Promise.all(batch.map((e) => readEntry(e, out)));\n  }\n}\n"]}

package/dist/wasmhost/worker.js

@@ -0,0 +1,46 @@
+"use strict";
+(() => {
+  // src/wasmhost/worker.ts
+  var params = new URLSearchParams(self.location.search);
+  var wasmUrl = params.get("wasm") ?? "app.wasm";
+  var execUrl = params.get("exec") ?? "wasm_exec.js";
+  var ns = params.get("ns") ?? "wasmhost";
+  var post = (m, transfer = []) => self.postMessage(m, transfer);
+  async function boot() {
+    importScripts(execUrl);
+    const go = new self.Go();
+    const ready = new Promise((resolve) => {
+      self[ns] = { ready: resolve };
+    });
+    const res = await fetch(wasmUrl);
+    if (!res.ok) throw new Error(`fetch ${wasmUrl}: ${res.status}`);
+    const { instance } = res.headers.get("content-type")?.startsWith("application/wasm") ? await WebAssembly.instantiateStreaming(res, go.importObject) : await WebAssembly.instantiate(await res.arrayBuffer(), go.importObject);
+    void go.run(instance).then(() => post({ exited: "the Go program exited" }));
+    await ready;
+    return self[ns];
+  }
+  var booted = boot();
+  booted.then(
+    () => post({ ready: true }),
+    (err) => post({ ready: false, error: String(err) })
+  );
+  self.onmessage = async (ev) => {
+    const req = ev.data;
+    try {
+      const host = await booted;
+      if (req.kind === "http") {
+        const res = await host.http(req.method, req.url, req.headers, req.body);
+        post({ id: req.id, ok: true, status: res.status, headers: res.headers, body: res.body }, [res.body.buffer]);
+      } else if (req.kind === "mount") {
+        await host.mount(req.name, req.files);
+        post({ id: req.id, ok: true });
+      } else {
+        await host.unmount(req.name);
+        post({ id: req.id, ok: true });
+      }
+    } catch (err) {
+      post({ id: req.id, ok: false, error: err instanceof Error ? err.message : String(err) });
+    }
+  };
+})();
+//# sourceMappingURL=worker.js.map

package/dist/wasmhost/worker.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/wasmhost/worker.ts"],"sourcesContent":["// The wasm host worker. It loads a Go wasm build that calls goapplib's wasmhost.Serve (or\n// ServeRebuild) and forwards the page's messages to the functions that build exports on\n// globalThis[ns]. Running the Go program here, off the page's thread, keeps a request that takes\n// seconds from freezing the page.\n//\n// It is a classic worker, built as an IIFE, because Go's wasm_exec.js is a plain script defining\n// globalThis.Go, which importScripts can load and a module worker cannot. The asset URLs and the\n// namespace come in the worker's query string (?wasm=&exec=&ns=), which startWorker writes.\nimport type { Files, HostReply, HostRequest, HostStatus } from \"./protocol\";\n\ninterface Exports {\n  ready?: () => void;\n  http(\n    method: string,\n    url: string,\n    headers: Record<string, string>,\n    body: Uint8Array | null,\n  ): Promise<{ status: number; headers: Record<string, string>; body: Uint8Array }>;\n  mount(name: string, files: Files): Promise<void>;\n  unmount(name: string): Promise<void>;\n}\n\n// The project compiles against the DOM lib, which describes a window, and the WebWorker lib can't\n// be loaded beside it, so the few worker globals used here are declared.\ndeclare function importScripts(...urls: string[]): void;\ndeclare const self: {\n  location: Location;\n  postMessage(message: unknown, transfer?: Transferable[]): void;\n  onmessage: ((ev: MessageEvent<HostRequest>) => void) | null;\n  Go: new () => { importObject: WebAssembly.Imports; run(i: WebAssembly.Instance): Promise<void> };\n} & Record<string, unknown>;\n\nconst params = new URLSearchParams(self.location.search);\nconst wasmUrl = params.get(\"wasm\") ?? \"app.wasm\";\nconst execUrl = params.get(\"exec\") ?? \"wasm_exec.js\";\nconst ns = params.get(\"ns\") ?? \"wasmhost\";\n\nconst post = (m: HostStatus | HostReply, transfer: Transferable[] = []) => self.postMessage(m, transfer);\n\nasync function boot(): Promise<Exports> {\n  importScripts(execUrl);\n  const go = new self.Go();\n  const ready = new Promise<void>((resolve) => {\n    self[ns] = { ready: resolve };\n  });\n  const res = await fetch(wasmUrl);\n  if (!res.ok) throw new Error(`fetch ${wasmUrl}: ${res.status}`);\n  // instantiateStreaming insists on the application/wasm content type, which not every static\n  // server sends.\n  const { instance } = res.headers.get(\"content-type\")?.startsWith(\"application/wasm\")\n    ? await WebAssembly.instantiateStreaming(res, go.importObject)\n    : await WebAssembly.instantiate(await res.arrayBuffer(), go.importObject);\n  void go.run(instance).then(() => post({ exited: \"the Go program exited\" }));\n  await ready;\n  return self[ns] as Exports;\n}\n\nconst booted = boot();\nbooted.then(\n  () => post({ ready: true }),\n  (err: unknown) => post({ ready: false, error: String(err) }),\n);\n\nself.onmessage = async (ev) => {\n  const req = ev.data;\n  try {\n    const host = await booted;\n    if (req.kind === \"http\") {\n      const res = await host.http(req.method, req.url, req.headers, req.body);\n      post({ id: req.id, ok: true, status: res.status, headers: res.headers, body: res.body }, [res.body.buffer]);\n    } else if (req.kind === \"mount\") {\n      await host.mount(req.name, req.files);\n      post({ id: req.id, ok: true });\n    } else {\n      await host.unmount(req.name);\n      post({ id: req.id, ok: true });\n    }\n  } catch (err) {\n    post({ id: req.id, ok: false, error: err instanceof Error ? err.message : String(err) });\n  }\n};\n"],"mappings":";;;AAgCA,MAAM,SAAS,IAAI,gBAAgB,KAAK,SAAS,MAAM;AACvD,MAAM,UAAU,OAAO,IAAI,MAAM,KAAK;AACtC,MAAM,UAAU,OAAO,IAAI,MAAM,KAAK;AACtC,MAAM,KAAK,OAAO,IAAI,IAAI,KAAK;AAE/B,MAAM,OAAO,CAAC,GAA2B,WAA2B,CAAC,MAAM,KAAK,YAAY,GAAG,QAAQ;AAEvG,iBAAe,OAAyB;AACtC,kBAAc,OAAO;AACrB,UAAM,KAAK,IAAI,KAAK,GAAG;AACvB,UAAM,QAAQ,IAAI,QAAc,CAAC,YAAY;AAC3C,WAAK,EAAE,IAAI,EAAE,OAAO,QAAQ;AAAA,IAC9B,CAAC;AACD,UAAM,MAAM,MAAM,MAAM,OAAO;AAC/B,QAAI,CAAC,IAAI,GAAI,OAAM,IAAI,MAAM,SAAS,OAAO,KAAK,IAAI,MAAM,EAAE;AAG9D,UAAM,EAAE,SAAS,IAAI,IAAI,QAAQ,IAAI,cAAc,GAAG,WAAW,kBAAkB,IAC/E,MAAM,YAAY,qBAAqB,KAAK,GAAG,YAAY,IAC3D,MAAM,YAAY,YAAY,MAAM,IAAI,YAAY,GAAG,GAAG,YAAY;AAC1E,SAAK,GAAG,IAAI,QAAQ,EAAE,KAAK,MAAM,KAAK,EAAE,QAAQ,wBAAwB,CAAC,CAAC;AAC1E,UAAM;AACN,WAAO,KAAK,EAAE;AAAA,EAChB;AAEA,MAAM,SAAS,KAAK;AACpB,SAAO;AAAA,IACL,MAAM,KAAK,EAAE,OAAO,KAAK,CAAC;AAAA,IAC1B,CAAC,QAAiB,KAAK,EAAE,OAAO,OAAO,OAAO,OAAO,GAAG,EAAE,CAAC;AAAA,EAC7D;AAEA,OAAK,YAAY,OAAO,OAAO;AAC7B,UAAM,MAAM,GAAG;AACf,QAAI;AACF,YAAM,OAAO,MAAM;AACnB,UAAI,IAAI,SAAS,QAAQ;AACvB,cAAM,MAAM,MAAM,KAAK,KAAK,IAAI,QAAQ,IAAI,KAAK,IAAI,SAAS,IAAI,IAAI;AACtE,aAAK,EAAE,IAAI,IAAI,IAAI,IAAI,MAAM,QAAQ,IAAI,QAAQ,SAAS,IAAI,SAAS,MAAM,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,MAAM,CAAC;AAAA,MAC5G,WAAW,IAAI,SAAS,SAAS;AAC/B,cAAM,KAAK,MAAM,IAAI,MAAM,IAAI,KAAK;AACpC,aAAK,EAAE,IAAI,IAAI,IAAI,IAAI,KAAK,CAAC;AAAA,MAC/B,OAAO;AACL,cAAM,KAAK,QAAQ,IAAI,IAAI;AAC3B,aAAK,EAAE,IAAI,IAAI,IAAI,IAAI,KAAK,CAAC;AAAA,MAC/B;AAAA,IACF,SAAS,KAAK;AACZ,WAAK,EAAE,IAAI,IAAI,IAAI,IAAI,OAAO,OAAO,eAAe,QAAQ,IAAI,UAAU,OAAO,GAAG,EAAE,CAAC;AAAA,IACzF;AAAA,EACF;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@panyam/tsappkit",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "TypeScript application toolkit with component lifecycle management, event system, UI utilities, and documentation site components",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -16,12 +16,19 @@
       "import": "./dist/docs/index.mjs",
       "require": "./dist/docs/index.js"
     },
+    "./wasmhost": {
+      "types": "./dist/wasmhost/index.d.ts",
+      "import": "./dist/wasmhost/index.mjs",
+      "require": "./dist/wasmhost/index.js"
+    },
+    "./wasmhost/worker.js": "./dist/wasmhost/worker.js",
     "./styles/*": "./styles/*",
     "./dist/*": "./dist/*"
   },
   "files": [
     "dist",
     "src",
+    "!src/**/*.test.ts",
     "styles"
   ],
   "scripts": {

package/src/wasmhost/client.ts

@@ -0,0 +1,144 @@
+// The page's side of a wasm host worker (goapplib issue 32). startWorker loads the app's Go wasm in
+// a Web Worker; workerFetch is a fetch to hand a Connect transport, so the app's generated clients
+// talk to the worker exactly as they would to a server; mountFiles pushes files in before the
+// requests that read them.
+import type { Files, HostReply, HostRequest, HostStatus } from "./protocol";
+
+export type { Files } from "./protocol";
+
+/** Where the worker's pieces are served, and the global name the Go side exports under. */
+export interface StartWorkerOptions {
+  /** The built worker script, @panyam/tsappkit/wasmhost/worker.js, as your bundler serves it. */
+  worker: string | URL;
+  /** The Go wasm build. */
+  wasm: string | URL;
+  /** Go's wasm_exec.js, from `$(go env GOROOT)/lib/wasm`, matching the Go that built the wasm. */
+  exec: string | URL;
+  /** The ns the Go program passed to wasmhost.Serve. */
+  ns: string;
+}
+
+type Unsent = HostRequest extends infer R ? (R extends HostRequest ? Omit<R, "id"> : never) : never;
+
+class Channel {
+  private next = 1;
+  private pending = new Map<number, { resolve: (r: HostReply) => void; reject: (e: Error) => void }>();
+  private dead: Error | null = null;
+
+  constructor(private worker: Worker) {
+    worker.addEventListener("message", (ev: MessageEvent<HostReply | HostStatus>) => {
+      const m = ev.data;
+      if ("exited" in m) {
+        this.fail(new Error(`wasm host: ${m.exited}`));
+      } else if ("id" in m) {
+        this.pending.get(m.id)?.resolve(m);
+        this.pending.delete(m.id);
+      }
+    });
+    worker.addEventListener("error", (ev: ErrorEvent) => this.fail(new Error(`wasm host worker: ${ev.message}`)));
+  }
+
+  call(req: Unsent, transfer: Transferable[]): Promise<HostReply> {
+    if (this.dead) return Promise.reject(this.dead);
+    return new Promise((resolve, reject) => {
+      const id = this.next++;
+      this.pending.set(id, { resolve, reject });
+      this.worker.postMessage({ ...req, id }, transfer);
+    });
+  }
+
+  private fail(err: Error) {
+    this.dead = err;
+    for (const p of this.pending.values()) p.reject(err);
+    this.pending.clear();
+  }
+}
+
+const channels = new WeakMap<Worker, Channel>();
+
+function channel(worker: Worker): Channel {
+  let c = channels.get(worker);
+  if (!c) {
+    c = new Channel(worker);
+    channels.set(worker, c);
+  }
+  return c;
+}
+
+/**
+ * Starts the worker and resolves with it once the Go program has installed its exports, or rejects
+ * with why it couldn't load. Relative URLs resolve against the page, not the worker script.
+ */
+export function startWorker(opts: StartWorkerOptions): Promise<Worker> {
+  const abs = (u: string | URL) => new URL(u, location.href).href;
+  const url = new URL(abs(opts.worker));
+  url.searchParams.set("wasm", abs(opts.wasm));
+  url.searchParams.set("exec", abs(opts.exec));
+  url.searchParams.set("ns", opts.ns);
+  const worker = new Worker(url);
+  channel(worker);
+  return new Promise((resolve, reject) => {
+    const onMessage = (ev: MessageEvent<HostStatus | HostReply>) => {
+      const m = ev.data;
+      if (!("ready" in m)) return;
+      worker.removeEventListener("message", onMessage);
+      if (m.ready) resolve(worker);
+      else reject(new Error(`wasm host failed to load: ${m.error}`));
+    };
+    worker.addEventListener("message", onMessage);
+    worker.addEventListener("error", (ev: ErrorEvent) => reject(new Error(`wasm host worker: ${ev.message}`)), {
+      once: true,
+    });
+  });
+}
+
+// Statuses whose Response must have no body.
+const NULL_BODY = new Set([101, 103, 204, 205, 304]);
+
+/**
+ * A fetch that answers in the worker, for `createConnectTransport({ baseUrl, fetch: workerFetch(worker) })`.
+ * Only the path and query reach the worker, so baseUrl can be anything absolute, such as
+ * location.origin. It rejects if the worker reports an error (no handler, a failed build, a handler
+ * panic) and resolves with any HTTP status the handler chose.
+ */
+export function workerFetch(worker: Worker): (input: RequestInfo | URL, init?: RequestInit) => Promise<Response> {
+  const c = channel(worker);
+  return async (input, init) => {
+    const req = new Request(input, init);
+    const buf = new Uint8Array(await req.arrayBuffer());
+    const body = buf.byteLength ? buf : null;
+    const headers: Record<string, string> = {};
+    req.headers.forEach((v, k) => (headers[k] = v));
+    const u = new URL(req.url);
+    const reply = await c.call(
+      { kind: "http", method: req.method, url: u.pathname + u.search, headers, body },
+      body ? [body.buffer] : [],
+    );
+    if (!reply.ok) throw new Error(reply.error);
+    const status = reply.status ?? 200;
+    const resBody = NULL_BODY.has(status) ? null : ((reply.body ?? null) as BodyInit | null);
+    return new Response(resBody, { status, headers: reply.headers });
+  };
+}
+
+/**
+ * Replaces the mount `name` with `files`. The buffers are transferred to the worker, not copied, so
+ * each Uint8Array is empty here afterwards; copy first anything the page still needs. Resolves once
+ * the worker has mounted them (and, for a rebuild-mode host, rebuilt its handler).
+ */
+export async function mountFiles(worker: Worker, name: string, files: Files): Promise<void> {
+  const transfer = new Set<ArrayBuffer>();
+  for (const b of Object.values(files)) {
+    // A tag check rather than instanceof, which fails for a buffer from another realm (an iframe),
+    // and a SharedArrayBuffer can't be transferred.
+    if (Object.prototype.toString.call(b.buffer) === "[object ArrayBuffer]") transfer.add(b.buffer as ArrayBuffer);
+  }
+  const reply = await channel(worker).call({ kind: "mount", name, files }, [...transfer]);
+  if (!reply.ok) throw new Error(reply.error);
+}
+
+/** Removes the mount `name`. Removing a name that isn't mounted succeeds. */
+export async function unmountFiles(worker: Worker, name: string): Promise<void> {
+  const reply = await channel(worker).call({ kind: "unmount", name }, []);
+  if (!reply.ok) throw new Error(reply.error);
+}

package/src/wasmhost/drop.ts

@@ -0,0 +1,74 @@
+// Turning what a user drops or picks into the {path: bytes} map mountFiles takes. The bytes are
+// read here, before any request, because the Go side can't wait on File.arrayBuffer() mid-request.
+import type { Files } from "./protocol";
+
+// The parts of the File and Directory Entries API used here. Chromium, Firefox and Safari all ship
+// it under the webkit prefix.
+interface Entry {
+  isFile: boolean;
+  isDirectory: boolean;
+  fullPath: string;
+}
+interface FileEntry extends Entry {
+  file(ok: (f: File) => void, err: (e: unknown) => void): void;
+}
+interface DirectoryEntry extends Entry {
+  createReader(): { readEntries(ok: (es: Entry[]) => void, err: (e: unknown) => void): void };
+}
+
+/**
+ * Reads a drop into files keyed by path. A dropped folder keeps its own name as the first path
+ * element ("design/board.edn"), and dropped loose files sit at the top. Entries the browser can't
+ * read as files or folders are skipped.
+ */
+export async function filesFromDrop(dt: DataTransfer): Promise<Files> {
+  const entries: Entry[] = [];
+  const loose: File[] = [];
+  for (const item of Array.from(dt.items)) {
+    if (item.kind !== "file") continue;
+    const entry = (item as DataTransferItem & { webkitGetAsEntry?: () => Entry | null }).webkitGetAsEntry?.();
+    if (entry) entries.push(entry);
+    else {
+      const f = item.getAsFile();
+      if (f) loose.push(f);
+    }
+  }
+  const out: Files = {};
+  await Promise.all([
+    ...entries.map((e) => readEntry(e, out)),
+    ...loose.map(async (f) => {
+      out[f.name] = new Uint8Array(await f.arrayBuffer());
+    }),
+  ]);
+  return out;
+}
+
+/**
+ * Reads an `<input type="file" webkitdirectory>` (or `multiple`) selection into files keyed by
+ * path. Folder picks use each file's webkitRelativePath, which starts with the folder's name.
+ */
+export async function filesFromFileList(list: FileList | File[]): Promise<Files> {
+  const out: Files = {};
+  await Promise.all(
+    Array.from(list).map(async (f) => {
+      out[f.webkitRelativePath || f.name] = new Uint8Array(await f.arrayBuffer());
+    }),
+  );
+  return out;
+}
+
+async function readEntry(entry: Entry, out: Files): Promise<void> {
+  if (entry.isFile) {
+    const f = await new Promise<File>((ok, err) => (entry as FileEntry).file(ok, err));
+    out[entry.fullPath.replace(/^\/+/, "")] = new Uint8Array(await f.arrayBuffer());
+    return;
+  }
+  if (!entry.isDirectory) return;
+  const reader = (entry as DirectoryEntry).createReader();
+  // readEntries returns a batch at a time (100 in Chromium) and an empty batch at the end.
+  for (;;) {
+    const batch = await new Promise<Entry[]>((ok, err) => reader.readEntries(ok, err));
+    if (batch.length === 0) return;
+    await Promise.all(batch.map((e) => readEntry(e, out)));
+  }
+}

package/src/wasmhost/index.ts

@@ -0,0 +1,3 @@
+export { startWorker, workerFetch, mountFiles, unmountFiles } from "./client";
+export type { StartWorkerOptions, Files } from "./client";
+export { filesFromDrop, filesFromFileList } from "./drop";

package/src/wasmhost/protocol.ts

@@ -0,0 +1,24 @@
+// Messages between the page (client.ts) and the wasm host worker (worker.ts). One request message
+// and one reply per call, matched by id. Byte buffers travel as transferables, not copies.
+
+/** A mount's files, keyed by slash-separated path within the mount. */
+export type Files = Record<string, Uint8Array>;
+
+export type HostRequest =
+  | {
+      id: number;
+      kind: "http";
+      method: string;
+      url: string;
+      headers: Record<string, string>;
+      body: Uint8Array | null;
+    }
+  | { id: number; kind: "mount"; name: string; files: Files }
+  | { id: number; kind: "unmount"; name: string };
+
+export type HostReply =
+  | { id: number; ok: true; status?: number; headers?: Record<string, string>; body?: Uint8Array }
+  | { id: number; ok: false; error: string };
+
+/** Sent once when the wasm has loaded (or failed to), and again if the Go program exits. */
+export type HostStatus = { ready: true } | { ready: false; error: string } | { exited: string };

package/src/wasmhost/worker.ts

@@ -0,0 +1,81 @@
+// The wasm host worker. It loads a Go wasm build that calls goapplib's wasmhost.Serve (or
+// ServeRebuild) and forwards the page's messages to the functions that build exports on
+// globalThis[ns]. Running the Go program here, off the page's thread, keeps a request that takes
+// seconds from freezing the page.
+//
+// It is a classic worker, built as an IIFE, because Go's wasm_exec.js is a plain script defining
+// globalThis.Go, which importScripts can load and a module worker cannot. The asset URLs and the
+// namespace come in the worker's query string (?wasm=&exec=&ns=), which startWorker writes.
+import type { Files, HostReply, HostRequest, HostStatus } from "./protocol";
+
+interface Exports {
+  ready?: () => void;
+  http(
+    method: string,
+    url: string,
+    headers: Record<string, string>,
+    body: Uint8Array | null,
+  ): Promise<{ status: number; headers: Record<string, string>; body: Uint8Array }>;
+  mount(name: string, files: Files): Promise<void>;
+  unmount(name: string): Promise<void>;
+}
+
+// The project compiles against the DOM lib, which describes a window, and the WebWorker lib can't
+// be loaded beside it, so the few worker globals used here are declared.
+declare function importScripts(...urls: string[]): void;
+declare const self: {
+  location: Location;
+  postMessage(message: unknown, transfer?: Transferable[]): void;
+  onmessage: ((ev: MessageEvent<HostRequest>) => void) | null;
+  Go: new () => { importObject: WebAssembly.Imports; run(i: WebAssembly.Instance): Promise<void> };
+} & Record<string, unknown>;
+
+const params = new URLSearchParams(self.location.search);
+const wasmUrl = params.get("wasm") ?? "app.wasm";
+const execUrl = params.get("exec") ?? "wasm_exec.js";
+const ns = params.get("ns") ?? "wasmhost";
+
+const post = (m: HostStatus | HostReply, transfer: Transferable[] = []) => self.postMessage(m, transfer);
+
+async function boot(): Promise<Exports> {
+  importScripts(execUrl);
+  const go = new self.Go();
+  const ready = new Promise<void>((resolve) => {
+    self[ns] = { ready: resolve };
+  });
+  const res = await fetch(wasmUrl);
+  if (!res.ok) throw new Error(`fetch ${wasmUrl}: ${res.status}`);
+  // instantiateStreaming insists on the application/wasm content type, which not every static
+  // server sends.
+  const { instance } = res.headers.get("content-type")?.startsWith("application/wasm")
+    ? await WebAssembly.instantiateStreaming(res, go.importObject)
+    : await WebAssembly.instantiate(await res.arrayBuffer(), go.importObject);
+  void go.run(instance).then(() => post({ exited: "the Go program exited" }));
+  await ready;
+  return self[ns] as Exports;
+}
+
+const booted = boot();
+booted.then(
+  () => post({ ready: true }),
+  (err: unknown) => post({ ready: false, error: String(err) }),
+);
+
+self.onmessage = async (ev) => {
+  const req = ev.data;
+  try {
+    const host = await booted;
+    if (req.kind === "http") {
+      const res = await host.http(req.method, req.url, req.headers, req.body);
+      post({ id: req.id, ok: true, status: res.status, headers: res.headers, body: res.body }, [res.body.buffer]);
+    } else if (req.kind === "mount") {
+      await host.mount(req.name, req.files);
+      post({ id: req.id, ok: true });
+    } else {
+      await host.unmount(req.name);
+      post({ id: req.id, ok: true });
+    }
+  } catch (err) {
+    post({ id: req.id, ok: false, error: err instanceof Error ? err.message : String(err) });
+  }
+};

package/src/page/IslandPage.test.ts

@@ -1,83 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import type { LCMComponent } from "../LCMComponent";
-import { IslandPage } from "./IslandPage";
-import type { PageSpec } from "./spec";
-
-type Ctx = { built: number };
-type Ext = { things: string[] };
-
-const mounted: { name: string; el: HTMLElement; config: unknown; ctx: Ctx }[] = [];
-const contexts: (PageSpec & Ext)[] = [];
-
-const island = (name: string) => (el: HTMLElement, spec: { config: unknown }, ctx: Ctx) => {
-  mounted.push({ name, el, config: spec.config, ctx });
-  return { name } as unknown as LCMComponent;
-};
-
-class TestPage extends IslandPage<Ctx, Ext> {
-  protected registry() {
-    return { player: island("player"), chat: island("chat") };
-  }
-  protected readExtension(raw: Record<string, unknown>): Ext {
-    return { things: Array.isArray(raw.things) ? raw.things.map(String) : [] };
-  }
-  protected makeContext(spec: PageSpec & Ext): Ctx {
-    contexts.push(spec);
-    return { built: contexts.length };
-  }
-  mount() {
-    return this.initializeSpecificComponents();
-  }
-}
-
-function page(spec: string | null, slots: string[]) {
-  document.body.innerHTML =
-    (spec === null ? "" : `<script type="application/json" id="page-spec">${spec}</script>`) +
-    slots.map((s) => `<section data-slot="${s}"></section>`).join("");
-  return new TestPage("test");
-}
-
-describe("IslandPage", () => {
-  let warn: ReturnType<typeof vi.spyOn>;
-  beforeEach(() => {
-    // jsdom has no matchMedia, and BasePage's ThemeManager asks it for the colour scheme.
-    window.matchMedia ??= ((query: string) => ({ matches: false, media: query, addEventListener() {}, removeEventListener() {} })) as unknown as typeof window.matchMedia;
-    mounted.length = 0;
-    contexts.length = 0;
-    warn = vi.spyOn(console, "warn").mockImplementation(() => {});
-  });
-  afterEach(() => warn.mockRestore());
-
-  it("mounts each island from the spec into its data-slot, sharing one context", () => {
-    const spec = JSON.stringify({
-      layout: "drawer",
-      islands: [
-        { name: "player", slot: "main", config: { a: 1 } },
-        { name: "nobody", slot: "side" },
-        { name: "chat", slot: "drawer" },
-      ],
-      things: ["x"],
-    });
-    const out = page(spec, ["main", "side", "drawer"]).mount();
-    expect(out).toHaveLength(2);
-    expect(mounted.map((m) => [m.name, m.el.dataset.slot, m.config])).toEqual([
-      ["player", "main", { a: 1 }],
-      ["chat", "drawer", {}],
-    ]);
-    expect(mounted[0].ctx).toBe(mounted[1].ctx);
-    expect(contexts).toHaveLength(1);
-    expect(contexts[0].things).toEqual(["x"]);
-    expect(warn.mock.calls.flat().join("\n")).toMatch(/nobody/);
-  });
-
-  it("mounts nothing, and builds no context, without a readable spec", () => {
-    for (const spec of [null, "not json"]) {
-      const p = page(spec, ["main"]);
-      warn.mockClear();
-      expect(p.mount()).toEqual([]);
-      expect(warn).toHaveBeenCalledOnce();
-      expect(String(warn.mock.calls[0][0])).toMatch(/page-spec/);
-    }
-    expect(contexts).toHaveLength(0);
-  });
-});

package/src/page/mount.test.ts

@@ -1,73 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { mountIslands, type Registry } from "./mount";
-import type { PageSpec } from "./spec";
-
-type El = { slot: string };
-const ctx = { tag: "ctx" };
-const bus = { tag: "bus" };
-
-const spec: PageSpec = {
-  layout: "drawer",
-  islands: [
-    { name: "player", slot: "main", presentation: "page", config: { a: 1 } },
-    { name: "unknown", slot: "side", config: {} },
-    { name: "chat", slot: "missing", config: {} },
-    { name: "chat", slot: "drawer", presentation: "drawer", config: {} },
-  ],
-};
-
-describe("mountIslands", () => {
-  it("mounts each island in its slot with its config and the page's context, in spec order", () => {
-    const calls: unknown[][] = [];
-    const registry: Registry<typeof ctx, El, string, typeof bus> = {
-      player: (el, island, c, b) => (calls.push([el, island, c, b]), "player-component"),
-      chat: (el, island) => (calls.push([el, island.presentation]), "chat-component"),
-    };
-    const logs: string[] = [];
-    const out = mountIslands(spec, registry, (slot) => (slot === "missing" ? null : { slot }), () => ctx, bus, (m) => logs.push(m));
-    expect(out).toEqual(["player-component", "chat-component"]);
-    expect(calls).toEqual([
-      [{ slot: "main" }, spec.islands[0], ctx, bus],
-      [{ slot: "drawer" }, "drawer"],
-    ]);
-    // The unknown island and the missing slot are logged and skipped.
-    expect(logs).toHaveLength(2);
-    expect(logs.join("\n")).toMatch(/unknown/);
-    expect(logs.join("\n")).toMatch(/missing/);
-  });
-
-  it("doesn't take an island name from the registry's prototype", () => {
-    const logs: string[] = [];
-    const out = mountIslands({ layout: "a", islands: [{ name: "toString", slot: "main", config: {} }] }, {}, (slot) => ({ slot }), () => ctx, bus, (m) => logs.push(m));
-    expect(out).toEqual([]);
-    expect(logs).toHaveLength(1);
-  });
-
-  it("carries on when a factory throws", () => {
-    const logs: string[] = [];
-    const out = mountIslands(
-      spec,
-      {
-        player: () => {
-          throw new Error("boom");
-        },
-        chat: () => "ok",
-      },
-      (slot) => ({ slot }),
-      () => ctx,
-      bus,
-      (m) => logs.push(m),
-    );
-    expect(out).toEqual(["ok", "ok"]);
-    expect(logs.some((m) => m.includes("boom"))).toBe(true);
-  });
-
-  it("builds the page's context once, and only when there's an island to mount", () => {
-    let built = 0;
-    const context = () => (built++, ctx);
-    mountIslands({ layout: "index", islands: [] }, {}, () => ({ slot: "" }), context, bus, () => {});
-    expect(built).toBe(0);
-    mountIslands(spec, { player: () => "a", chat: () => "b" }, (slot) => ({ slot }), context, bus, () => {});
-    expect(built).toBe(1);
-  });
-});

package/src/page/spec.test.ts

@@ -1,65 +0,0 @@
-import { readFileSync } from "node:fs";
-import { join } from "node:path";
-import { describe, expect, it } from "vitest";
-import { readSpec } from "./spec";
-
-describe("readSpec", () => {
-  it("reads the spec goapplib's page.Spec writes (page/testdata/spec.json)", () => {
-    const text = readFileSync(join(__dirname, "../../../page/testdata/spec.json"), "utf8");
-    expect(readSpec(text)).toEqual({
-      layout: "drawer",
-      islands: [
-        { name: "player", slot: "main", presentation: "page", config: { note: "</script>", urls: ["/a.json"] } },
-        { name: "chat", slot: "side", config: {} },
-      ],
-    });
-  });
-
-  it("is null when there's no spec or it isn't one", () => {
-    for (const bad of [null, undefined, "", "not json", "null", "[]", '{"islands":[]}', '{"layout":"drawer"}', '{"layout":3,"islands":[]}']) {
-      expect(readSpec(bad), String(bad)).toBeNull();
-    }
-  });
-
-  it("drops islands it couldn't mount and cleans the rest", () => {
-    const spec = readSpec(
-      JSON.stringify({
-        layout: "drawer",
-        islands: [
-          { name: "player", slot: "main" },
-          { slot: "orphan" },
-          { name: "x", slot: 'main"] , body' },
-          { name: "chat", slot: "drawer", presentation: 7, config: "nope" },
-          "junk",
-        ],
-      }),
-    );
-    expect(spec).toEqual({
-      layout: "drawer",
-      islands: [
-        { name: "player", slot: "main", config: {} },
-        { name: "chat", slot: "drawer", config: {} },
-      ],
-    });
-  });
-
-  it("leaves an app's own fields out unless it reads them", () => {
-    expect(readSpec('{"layout":"a","islands":[],"things":[1]}')).toEqual({ layout: "a", islands: [] });
-  });
-
-  it("merges in what an extension reads, without letting it replace layout or islands", () => {
-    const text = JSON.stringify({ layout: "a", islands: [{ name: "p", slot: "main" }], things: [1, "x", 2] });
-    const spec = readSpec(text, (raw) => ({
-      things: Array.isArray(raw.things) ? raw.things.filter((t): t is number => typeof t === "number") : [],
-      layout: "overridden",
-    }));
-    expect(spec).toEqual({ layout: "a", islands: [{ name: "p", slot: "main", config: {} }], things: [1, 2] });
-  });
-
-  it("is null when the extension throws", () => {
-    const spec = readSpec('{"layout":"a","islands":[]}', () => {
-      throw new Error("bad things");
-    });
-    expect(spec).toBeNull();
-  });
-});