@ai-ecoverse/slicc-kernel 1.22.0 → 1.22.1

package/dist/node.js

@@ -2557,6 +2557,7 @@ var MountTable = class {
   mounts = /* @__PURE__ */ new Map();
   devices = 0;
   pending = /* @__PURE__ */ new Set();
+  notes = /* @__PURE__ */ new Map();
   deps;
   constructor(deps) {
     this.deps = deps;
@@ -2565,7 +2566,7 @@ var MountTable = class {
     return this.mounts.get(target);
   }
   list() {
-    return [...this.mounts.values()].map(
+    const mounted = [...this.mounts.values()].map(
       ({ type, source, target, options, state, error, present }) => ({
         type,
         source,
@@ -2575,6 +2576,19 @@ var MountTable = class {
         ...error ? { error } : {}
       })
     );
+    const noted = [...this.notes.values()].filter((note) => !this.mounts.has(note.target));
+    return [...mounted, ...noted.map((note) => ({ ...note, options: { ...note.options } }))];
+  }
+  note(spec, state, error) {
+    const target = normalizePath(spec.target);
+    this.notes.set(target, {
+      type: spec.type,
+      source: spec.source,
+      target,
+      options: { ...spec.options },
+      state,
+      ...error ? { error } : {}
+    });
   }
   locate(path) {
     let best;
@@ -2651,13 +2665,19 @@ var MountTable = class {
     };
     mounted = mount;
     this.mounts.set(target, mount);
+    this.notes.delete(target);
     return this.list().find((m) => m.target === target);
   }
+  unnote(target) {
+    this.notes.delete(normalizePath(target));
+  }
   umount(target, detach = false) {
     const at = normalizePath(target);
     const mount = this.mounts.get(at);
+    if (!mount && this.notes.delete(at)) return;
     if (!mount) throw errnoError("EINVAL", `${at} is not mounted`);
     if (!detach && this.deps.busy(at)) throw errnoError("EBUSY", `${at} has open files`);
+    this.notes.delete(at);
     this.mounts.delete(at);
     mount.conn.close();
     mount.dispose();
@@ -7468,28 +7488,34 @@ function wait(ms, signal) {
   });
 }
 async function mountFstab(lines, mount, signal, retries = FSTAB_RETRIES, discard = () => {
+}, settled = () => {
 }) {
   return Promise.all(
-    lines.map(async ({ line, spec, invalid }) => {
-      let failed = 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" });
-          break;
-        } catch (err) {
-          failed = 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) };
+    lines.map(async (each) => {
+      const result = await mountLine(each, mount, signal, retries, discard);
+      settled(each, result);
+      return result;
     })
   );
 }
+async function mountLine({ line, spec, invalid }, mount, signal, retries, discard) {
+  let failed = 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" });
+      break;
+    } catch (err) {
+      failed = 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) };
+}
 
 // src/mount/hostfs.ts
 var HOSTFS_IO = 16 * 1024 * 1024;
@@ -8301,6 +8327,7 @@ var Launcher = class {
   onMountPending;
   removable = /* @__PURE__ */ new Map();
   hostfs;
+  fstabRetries;
   inserted = /* @__PURE__ */ new Map();
   openFiles = /* @__PURE__ */ new Set();
   held = /* @__PURE__ */ new Set();
@@ -8322,6 +8349,7 @@ var Launcher = class {
     this.media = options.media ?? memoryMedia();
     this.onMountPending = options.onMountPending;
     this.hostfs = options;
+    this.fstabRetries = options.fstabRetries ?? FSTAB_RETRIES;
     this.processMounts = options.processMounts ?? true;
     this.pnpmHome = options.env?.PNPM_HOME ?? PNPM_HOME;
     this.modulesDir = options.modules ?? "/node_modules";
@@ -8755,12 +8783,22 @@ var Launcher = class {
   }
   async mountFstab() {
     const text = await this.base.readFile(FSTAB_PATH).catch(() => "");
+    const lines = parseFstab(text);
+    for (const { spec } of lines) this.mounts.note(spec, "pending");
     return mountFstab(
-      parseFstab(text),
-      (spec) => this.mount(spec),
+      lines,
+      (spec) => this.mount(spec).catch((err) => {
+        this.mounts.note(spec, "pending", err?.message ?? String(err));
+        throw err;
+      }),
       this.booting.signal,
-      FSTAB_RETRIES,
-      (entry) => this.umount(entry.target, true)
+      this.fstabRetries,
+      (entry) => this.umount(entry.target, true),
+      ({ spec }, result) => {
+        if (!result.code || result.code === "ECANCELED" || this.booting.signal.aborted) {
+          this.mounts.unnote(spec.target);
+        } else this.mounts.note(spec, "failed", result.error);
+      }
     );
   }
   environment(cwd, extra) {
@@ -9731,7 +9769,8 @@ async function createNodeKernel(options = {}) {
     ...options.modules ? { modules: options.modules } : {},
     ...options.env ? { env: options.env } : {},
     ...transport ? { transport } : {},
-    ...options.processMounts !== void 0 ? { processMounts: options.processMounts } : {}
+    ...options.processMounts !== void 0 ? { processMounts: options.processMounts } : {},
+    ...options.fstabRetries ? { fstabRetries: options.fstabRetries } : {}
   });
   await launcher.prepare();
   const guard = (work) => new Promise((resolve, reject) => {