@ai-ecoverse/slicc-kernel 1.54.7 → 1.54.9

package/dist/node.js

@@ -947,9 +947,9 @@ var KernelSocket = class _KernelSocket {
         case SO_TYPE:
           return SOCK_STREAM;
         case SO_ERROR: {
-          const failed = this.failed;
+          const failed2 = this.failed;
           this.failed = void 0;
-          return failed ? wasiErrno(failed) : 0;
+          return failed2 ? wasiErrno(failed2) : 0;
         }
         case SO_ACCEPTCONN:
           return this.state === "listening" ? 1 : 0;
@@ -2813,7 +2813,7 @@ var OpfsFs = class {
     const swap = targetStat?.isDirectory === true;
     const staging = swap ? `.${name2}.${crypto.randomUUID()}` : name2;
     this.forget(destination);
-    const timed = await this.explicitTimes(source.path);
+    const timed2 = await this.explicitTimes(source.path);
     const moved2 = await this.place(source.handle, dir, staging);
     if (swap) await this.rm(destination, { recursive: true });
     await this.meta.move(source.path, destination, carry);
@@ -2825,7 +2825,7 @@ var OpfsFs = class {
       if (!placed) await dir.removeEntry(staging, { recursive: true });
       copied ||= !placed;
     }
-    if (copied) await this.restamp(destination, timed);
+    if (copied) await this.restamp(destination, timed2);
     this.changed(source.path, destination);
     this.touch(parentOf2(source.path), parent.path);
   }
@@ -2834,16 +2834,16 @@ var OpfsFs = class {
     return handle.kind === "file" ? (await handle.getFile()).lastModified : 0;
   }
   async explicitTimes(path) {
-    const timed = [];
+    const timed2 = [];
     for (const entry of await this.meta.under(path)) {
       if (entry.mtimeFor === void 0 || entry.link !== void 0) continue;
       const current = await this.modified(entry.path).catch(() => void 0);
-      if (current === entry.mtimeFor) timed.push(entry.path.slice(path.length));
+      if (current === entry.mtimeFor) timed2.push(entry.path.slice(path.length));
     }
-    return timed;
+    return timed2;
   }
-  async restamp(path, timed) {
-    for (const rest2 of timed) {
+  async restamp(path, timed2) {
+    for (const rest2 of timed2) {
       const mtimeFor = await this.modified(path + rest2);
       await this.meta.update(path + rest2, (entry) => entry && { ...entry, mtimeFor });
     }
@@ -6456,6 +6456,7 @@ function* procWalk(path, follow2) {
   let done4 = [];
   let todo = path.split("/").filter((part) => part !== "");
   let hops = 0;
+  let broken;
   while (todo.length > 0) {
     const part = todo.shift();
     if (part === ".") continue;
@@ -6465,19 +6466,31 @@ function* procWalk(path, follow2) {
     }
     const at = `/${[...done4, part].join("/")}`;
     const whole = normalize(`/${[...done4, part, ...todo].join("/")}`);
-    if (inProc(at) && inProc(whole)) return whole;
+    if (inProc(at) && inProc(whole)) return broken ?? whole;
     if (!follow2 && todo.length === 0) return void 0;
-    const target = yield at;
-    if (target === null) return void 0;
-    if (target === void 0) done4.push(part);
-    else {
+    const target = yield { at, check: todo.find((next2) => next2 !== ".") === ".." };
+    if (typeof target === "string") {
       if (++hops > MAX_HOPS2) return void 0;
-      if (target.startsWith("/")) done4 = [];
-      todo = [...target.split("/").filter((part2) => part2 !== ""), ...todo];
+      [done4, todo] = throughLink(target, done4, todo);
+    } else {
+      broken ??= refusalOf(target);
+      done4.push(part);
     }
   }
   return void 0;
 }
+function failed(err) {
+  const code = err?.code;
+  return { refused: typeof code === "string" ? code : "ENOENT" };
+}
+function refusalOf(found) {
+  if (found === true) return void 0;
+  return found === false ? { refused: "ENOTDIR" } : found;
+}
+function throughLink(target, done4, todo) {
+  const parts = target.split("/").filter((part) => part !== "");
+  return [target.startsWith("/") ? [] : done4, [...parts, ...todo]];
+}
 async function procAlias(fs, path, follow2) {
   const { readlink, lstat } = fs;
   if (!readlink || !lstat) return void 0;
@@ -6489,7 +6502,10 @@ async function procAlias(fs, path, follow2) {
   const walk = procWalk(path, follow2);
   let step = walk.next();
   while (!step.done) {
-    const target = await readlink.call(fs, step.value).catch(() => void 0);
+    const { at, check } = step.value;
+    const link2 = await readlink.call(fs, at).catch(() => void 0);
+    const isDir = (st) => st.isDirectory === true;
+    const target = link2 ?? (check ? await lstat.call(fs, at).then(isDir, failed) : true);
     step = walk.next(target);
   }
   return step.value;
@@ -9856,6 +9872,8 @@ var WasmProcess = class {
   async openVfs(req) {
     if (inProc(req.path)) return this.openProc(req, req.path);
     const alias = req.orphan ? void 0 : await procAlias(this.options.fs, req.path, !req.exclusive);
+    if (typeof alias === "object")
+      throw Object.assign(new Error(alias.refused), { code: alias.refused });
     if (alias !== void 0) return this.openProc(req, alias);
     await refuseReadonly(this.options.fs, req.path, req.flags, req);
     const fd = this.fds.install(heldFile(), 3);
@@ -11512,22 +11530,22 @@ async function mountFstab(lines2, mount, signal, retries = FSTAB_RETRIES, discar
   );
 }
 async function mountLine({ line, spec, invalid }, mount, signal, retries, discard) {
-  let failed = invalid;
+  let failed2 = invalid;
   for (let attempt = 0; !invalid && attempt <= retries.length && !signal.aborted; attempt++) {
     try {
       const entry = await mount(spec);
       if (!signal.aborted) return { line, target: spec.target, entry };
       discard(entry);
-      failed = Object.assign(new Error("the kernel stopped"), { code: "ECANCELED" });
+      failed2 = Object.assign(new Error("the kernel stopped"), { code: "ECANCELED" });
       break;
     } catch (err) {
-      failed = err;
+      failed2 = err;
       if (FINAL.has(codeOf3(err)) || attempt === retries.length) break;
       await wait(retries[attempt], signal);
     }
   }
-  const code = codeOf3(failed);
-  return { line, target: spec.target, code, error: String(failed?.message ?? code) };
+  const code = codeOf3(failed2);
+  return { line, target: spec.target, code, error: String(failed2?.message ?? code) };
 }
 
 // src/mount/hostfs.ts
@@ -11555,11 +11573,24 @@ var HostfsClient = class {
   get maxIo() {
     return this.capabilities.maxIo ?? HOSTFS_IO;
   }
-  async send(path, init, handle = false, retried = false) {
+  retired;
+  stop = new AbortController();
+  get gone() {
+    return this.retired !== void 0;
+  }
+  retire(why) {
+    this.retired ??= why;
+    this.stop.abort();
+  }
+  async send(path, init, handle = false, retried = false, cleanup = false) {
+    if (this.retired && !cleanup) throw fsError2("ENOTCONN", this.retired);
+    const stop = cleanup ? void 0 : this.stop.signal;
+    const signal = init.signal && stop ? AbortSignal.any([init.signal, stop]) : init.signal ?? stop;
     let response;
     try {
       response = await this.fetch(`${this.grant.url}${path}`, {
         ...init,
+        ...signal ? { signal } : {},
         credentials: "omit",
         headers: {
           ...init.headers,
@@ -11596,6 +11627,20 @@ var HostfsClient = class {
     );
     return await response.json();
   }
+  async cleanup(op, body) {
+    const response = await this.send(
+      "/api/hostfs",
+      {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ op, ...body })
+      },
+      true,
+      false,
+      true
+    );
+    await response.body?.cancel();
+  }
   async read(fh, offset, size, ifMatch) {
     const response = await this.send(
       "/api/hostfs",
@@ -11663,6 +11708,11 @@ function hostfsHandlers(current) {
     return fresh(remote);
   };
   const call = (op, body = {}) => current().call(op, body);
+  const settle = (client, restore) => client.call("setattr", restore).catch((err) => {
+    if (!client.gone || !client.cleanup) throw err;
+    void client.cleanup("setattr", restore).catch(() => {
+    });
+  });
   async function writable(client, path, flags) {
     const { ifMatch: _, ...asked } = flags;
     const opening = () => client.call("open", { path: rel(path), ...asked });
@@ -11673,9 +11723,9 @@ function hostfsHandlers(current) {
       const mode = (await client.call("stat", { path: rel(path) })).mode ?? 0;
       if (mode & 128) throw err;
       const restore = { path: rel(path), mode };
-      await client.call("setattr", { path: rel(path), mode: mode | 128 });
-      const opened2 = await opening().catch(async (again) => {
-        await client.call("setattr", restore);
+      const opened2 = await client.call("setattr", { path: rel(path), mode: mode | 128 }).then(opening).catch(async (again) => {
+        await settle(client, restore).catch(() => {
+        });
         throw again;
       });
       return { opened: opened2, restore };
@@ -11730,7 +11780,7 @@ function hostfsHandlers(current) {
       try {
         await fresh(remote).client.call("release", { fh: remote.fh }, true);
       } finally {
-        if (remote.restore) await current().call("setattr", remote.restore);
+        if (remote.restore) await settle(current(), remote.restore);
       }
     },
     mkdir: async (path) => void await call("mkdir", { path: rel(path) }),
@@ -11860,6 +11910,73 @@ function invalidation(event) {
   return event.paths ?? true;
 }
 var PORT_REQUEST_MS = 6e4;
+var HOSTFS_CALL_MS = 2e4;
+var PORT_BEAT_MS = 1e3;
+var PORT_DEAD_MS = 1e4;
+var PORT_LINGER_MS = 1e3;
+function timed(transport, ms) {
+  const inflight = /* @__PURE__ */ new Set();
+  const guard = (name2, run2, late, expire) => new Promise((resolve, reject) => {
+    let expired = false;
+    const running = run2();
+    inflight.add(running);
+    const done4 = () => inflight.delete(running);
+    running.then(done4, done4);
+    const timer = setTimeout(() => {
+      expired = true;
+      const why = `the host folder did not answer ${name2} within ${ms} ms`;
+      transport.retire?.(why);
+      expire?.(running);
+      reject(fsError2("ENOTCONN", why));
+    }, ms);
+    running.then(
+      (value) => {
+        clearTimeout(timer);
+        if (expired) late?.(value);
+        resolve(value);
+      },
+      (err) => {
+        clearTimeout(timer);
+        reject(err);
+      }
+    );
+  });
+  const cleanup = async (op, body, skip) => {
+    await Promise.allSettled([...inflight].filter((work) => work !== skip));
+    await transport.cleanup?.(op, body);
+  };
+  const release = (opened2) => {
+    const fh = opened2?.fh;
+    if (typeof fh === "number") void cleanup("release", { fh }).catch(() => {
+    });
+  };
+  return {
+    get capabilities() {
+      return transport.capabilities;
+    },
+    get token() {
+      return transport.token;
+    },
+    get maxIo() {
+      return transport.maxIo;
+    },
+    get gone() {
+      return transport.gone;
+    },
+    retire: (why) => transport.retire?.(why),
+    ...transport.cleanup ? { cleanup } : {},
+    call: (op, body, handle) => guard(
+      op,
+      () => transport.call(op, body, handle),
+      op === "open" ? release : void 0,
+      op === "release" ? (running) => void cleanup("release", body ?? {}, running).catch(() => {
+      }) : void 0
+    ),
+    read: (fh, offset, size, ifMatch) => guard("read", () => transport.read(fh, offset, size, ifMatch)),
+    write: (fh, offset, bytes) => guard("write", () => transport.write(fh, offset, bytes)),
+    watch: (signal, onEvent, onOpen) => transport.watch(signal, onEvent, onOpen)
+  };
+}
 var PORT_MS_PER_MIB = 1e3;
 var nextPortToken = 0;
 var PortTransport = class {
@@ -11870,13 +11987,25 @@ var PortTransport = class {
   waiting = /* @__PURE__ */ new Map();
   next = 0;
   dead;
-  constructor(grant, requestMs = PORT_REQUEST_MS) {
+  beatMs;
+  deadMs;
+  lingerMs;
+  beat;
+  answers = false;
+  pinged;
+  constructor(grant, liveness = {}) {
     this.port = grant.port;
-    this.requestMs = requestMs;
+    this.requestMs = liveness.requestMs ?? PORT_REQUEST_MS;
+    this.beatMs = liveness.beatMs ?? PORT_BEAT_MS;
+    this.deadMs = liveness.deadMs ?? PORT_DEAD_MS;
+    this.lingerMs = liveness.lingerMs ?? PORT_LINGER_MS;
     this.capabilities = grant.capabilities ?? {};
     this.token = grant.token ?? `port-${++nextPortToken}`;
     this.port.addEventListener("message", (event) => {
-      this.waiting.get(event.data?.id)?.(event.data);
+      if (event.data?.pong) {
+        this.answers = true;
+        this.pinged = void 0;
+      } else this.waiting.get(event.data?.id)?.(event.data);
     });
     this.port.addEventListener("close", () => this.fail("the folder's port closed"));
     this.port.start();
@@ -11887,8 +12016,51 @@ var PortTransport = class {
   get gone() {
     return this.dead !== void 0;
   }
+  retire(why) {
+    this.fail(why);
+  }
+  ping() {
+    if (this.pinged !== void 0) return;
+    this.pinged = Date.now();
+    try {
+      this.port.postMessage({ id: 0, op: "ping" });
+    } catch {
+    }
+  }
+  watchBeat() {
+    if (this.beat || this.dead) return;
+    this.ping();
+    this.beat = setInterval(() => {
+      if (this.waiting.size === 0) {
+        clearInterval(this.beat);
+        this.beat = void 0;
+        return;
+      }
+      if (this.answers && this.pinged !== void 0 && Date.now() - this.pinged > this.deadMs) {
+        this.fail("the folder's port stopped answering");
+        return;
+      }
+      this.ping();
+    }, this.beatMs);
+  }
+  async cleanup(op, body) {
+    if (this.closed) throw fsError2("ENOTCONN", "the folder's port is closed");
+    this.port.postMessage({ id: 0, op: "cleanup", name: op, body });
+  }
+  closed = false;
   fail(why) {
-    if (this.dead === void 0) this.port.close();
+    if (this.dead === void 0) {
+      setTimeout(() => {
+        try {
+          this.port.postMessage({ id: 0, op: "bye" });
+        } catch {
+        }
+        this.closed = true;
+        this.port.close();
+      }, this.lingerMs);
+    }
+    clearInterval(this.beat);
+    this.beat = void 0;
     this.dead ??= why;
     for (const settle of [...this.waiting.values()])
       settle({ id: 0, error: { code: "ENOTCONN", message: why } });
@@ -11905,6 +12077,7 @@ var PortTransport = class {
         },
         this.requestMs + Math.ceil(bytes / 1048576) * PORT_MS_PER_MIB
       );
+      this.watchBeat();
       this.waiting.set(id2, (reply) => {
         clearTimeout(timer);
         this.waiting.delete(id2);
@@ -11951,6 +12124,7 @@ var PortTransport = class {
         }
         resolve();
       };
+      this.watchBeat();
       this.waiting.set(id2, (reply) => {
         if (reply.open) return onOpen();
         if (reply.event) return onEvent(reply.event);
@@ -11974,11 +12148,38 @@ var errorOf = (err) => ({
 });
 function serveHostfsPort(port, transport) {
   const watches = /* @__PURE__ */ new Map();
+  const handles = /* @__PURE__ */ new Set();
+  let stopped = false;
+  const closeHandles = () => {
+    for (const fh of handles) void transport.call("release", { fh }, true).catch(() => {
+    });
+    handles.clear();
+  };
   const send = (reply, transfer = []) => port.postMessage(reply, transfer);
+  const pending = /* @__PURE__ */ new Set();
+  const track = (work) => {
+    pending.add(work);
+    const done4 = () => pending.delete(work);
+    work.then(done4, done4);
+    return work;
+  };
+  const answer = async (name2, body) => {
+    const result = await track(transport.call(name2, body));
+    const opened2 = result?.fh;
+    if (name2 === "open" && typeof opened2 === "number") handles.add(opened2);
+    if (name2 === "release") handles.delete(body?.fh);
+    if (stopped) closeHandles();
+    return result;
+  };
   const listener = async ({
     data
   }) => {
     const { id: id2, op } = data;
+    if (op === "ping") return send({ id: id2, pong: true });
+    if (op === "bye") return stop();
+    if (op === "cleanup")
+      return void Promise.allSettled([...pending]).then(() => answer(data.name, data.body)).catch(() => {
+      });
     if (op === "unwatch") return watches.get(id2)?.abort();
     if (op === "watch") {
       const stop2 = new AbortController();
@@ -11999,32 +12200,35 @@ function serveHostfsPort(port, transport) {
     }
     try {
       if (op === "read") {
-        const read = await transport.read(
-          data.fh,
-          data.offset,
-          data.size,
-          data.ifMatch
+        const read = await track(
+          transport.read(
+            data.fh,
+            data.offset,
+            data.size,
+            data.ifMatch
+          )
         );
         const bytes = read.slice();
         return send({ id: id2, bytes }, [bytes.buffer]);
       }
       if (op === "write") {
-        await transport.write(data.fh, data.offset, data.bytes);
+        await track(
+          transport.write(data.fh, data.offset, data.bytes)
+        );
         return send({ id: id2 });
       }
       if (op !== "call") throw fsError2("EINVAL", `unknown hostfs port op ${op}`);
-      send({
-        id: id2,
-        result: await transport.call(data.name, data.body)
-      });
+      send({ id: id2, result: await answer(data.name, data.body) });
     } catch (err) {
       send({ id: id2, error: errorOf(err) });
     }
   };
   const stop = () => {
+    stopped = true;
     port.removeEventListener("message", listener);
     port.removeEventListener("close", stop);
     for (const watch of watches.values()) watch.abort();
+    closeHandles();
     port.close();
   };
   port.addEventListener("message", listener);
@@ -12032,10 +12236,10 @@ function serveHostfsPort(port, transport) {
   port.start();
   return stop;
 }
-function grantConnect(hook, fetch2, requestMs) {
+function grantConnect(hook, fetch2, liveness = {}) {
   return async (source, options) => {
     const first = await hook(source, options);
-    if ("port" in first) return new PortTransport(first, requestMs);
+    if ("port" in first) return new PortTransport(first, liveness);
     const grant = async () => {
       const again = await hook(source, options);
       if ("port" in again)
@@ -12055,7 +12259,10 @@ async function openHostfs(spec, connect, timing = {}) {
   const stop = new AbortController();
   let active;
   const handlers = hostfsHandlers(() => active);
-  const ranged2 = () => active?.capabilities.ranges === true ? { ranges: true } : {};
+  const ranged2 = () => ({
+    ...active?.capabilities.ranges === true ? { ranges: true } : {},
+    ...active ? { maxIo: Math.min(active.maxIo, HOSTFS_IO) } : {}
+  });
   const served = serveFilesystem(
     port2,
     { ...slot.handlers, mount: ranged2 },
@@ -12071,7 +12278,7 @@ async function openHostfs(spec, connect, timing = {}) {
     {
       connect: () => connect(spec.source, { readonly: readonly2 }),
       up(client) {
-        active = client;
+        active = timed(client, timing.callMs ?? HOSTFS_CALL_MS);
         slot.insert(client, handlers);
         served.invalidate(true);
       },
@@ -13100,11 +13307,7 @@ var Launcher = class {
         throw fsError("ENODEV", "this kernel has no hostfs hook (createKernel({ hostfs }))");
       return openHostfs(
         spec,
-        grantConnect(
-          hostfs,
-          hostfsFetch ?? ((url, init) => fetch(url, init)),
-          hostfsTiming?.requestMs
-        ),
+        grantConnect(hostfs, hostfsFetch ?? ((url, init) => fetch(url, init)), hostfsTiming),
         hostfsTiming
       );
     }