@ai-ecoverse/slicc-kernel 1.124.3 → 1.124.5

package/dist/node.js

@@ -4505,9 +4505,13 @@ var OpfsFs = class {
     if (this.remote) this.remote.quiet = () => this.quiet().then(() => this.settle?.());
     if (this.channel) {
       const remote = this.remote;
-      meta.listen?.(
-        (c) => remote?.emit({ paths: c.paths ?? [], trees: c.trees ?? [] })
-      );
+      meta.listen?.((c) => {
+        for (const path of [...c.paths ?? [], ...c.trees ?? []]) this.forget(path);
+        remote?.emit({ paths: c.paths ?? [], trees: c.trees ?? [] });
+      });
+      remote?.listen((c) => {
+        for (const path of [...c.paths, ...c.trees]) this.forget(path);
+      });
       this.channel.onmessage = ({ data }) => {
         for (const path of data) this.forget(path);
         remote?.emit({ paths: data, trees: [] });
@@ -4668,9 +4672,13 @@ var OpfsFs = class {
       joined: () => remote.peered(),
       crowded: () => remote.crowded(),
       watch: (listener) => {
-        remote.crowd = listener;
+        remote.crowd = (crowded) => {
+          this.fresh();
+          listener(crowded);
+        };
         listener(remote.crowded());
-      }
+      },
+      fresh: () => this.fresh()
     };
   }
   quiet() {
@@ -4723,6 +4731,7 @@ var OpfsFs = class {
   async walk(parts2, from, start2) {
     let dir = start2;
     for (let at = from; at < parts2.length; at++) {
+      this.calls++;
       dir = await dir.getDirectoryHandle(parts2[at]);
       this.dirs.set(`/${parts2.slice(0, at + 1).join("/")}`, dir);
       this.checked.set(dir, performance.now());
@@ -4751,11 +4760,29 @@ var OpfsFs = class {
   async current(path, dir) {
     if (dir === this.root) return path === "/";
     if (performance.now() - (this.checked.get(dir) ?? -CHECK_MS) < CHECK_MS) return true;
+    this.calls++;
     const where = await this.root.resolve(dir).catch(() => null);
     if (where === null || `/${where.join("/")}` !== path) return false;
     this.checked.set(dir, performance.now());
     return true;
   }
+  exact = 0;
+  calls = 0;
+  opfsCalls() {
+    return this.calls;
+  }
+  fresh() {
+    this.changes++;
+    this.absent.clear();
+  }
+  async exactly(op) {
+    this.exact++;
+    try {
+      return await op();
+    } finally {
+      this.exact--;
+    }
+  }
   forget(path) {
     this.changes++;
     this.dirs.deleteTree(path);
@@ -4790,6 +4817,7 @@ var OpfsFs = class {
     }
   }
   async child(parent, name2, kind) {
+    this.calls++;
     return kind === "file" ? parent.getFileHandle(name2) : parent.getDirectoryHandle(name2);
   }
   async parent(path) {
@@ -4818,7 +4846,7 @@ var OpfsFs = class {
     const kept = this.dirs.get(path);
     if (kept && await this.current(path, kept)) return kept;
     const gone = this.absent.get(path);
-    if (gone !== void 0 && !this.shared() && performance.now() - gone < ABSENT_MS) {
+    if (gone !== void 0 && this.exact === 0 && performance.now() - gone < ABSENT_MS) {
       throw translate({ name: "NotFoundError" }, path);
     }
     const seen = this.changes;
@@ -4979,6 +5007,7 @@ var OpfsFs = class {
   flushing = {};
   touch(now, ...dirs) {
     this.changes++;
+    if (this.shared()) this.channel?.postMessage(dirs);
     for (const dir of dirs) {
       this.absent.deleteTree(dir);
       this.dirTimes.set(dir, now);
@@ -5010,7 +5039,7 @@ var OpfsFs = class {
     return this.remote?.crowded() === true;
   }
   glanced(handle) {
-    if (this.shared()) return void 0;
+    if (this.exact > 0) return void 0;
     const seen = this.glances.get(handle);
     const fresh2 = seen && seen.changes === this.changes && performance.now() - seen.at < GLANCE_MS;
     return fresh2 ? seen.file : void 0;
@@ -5018,6 +5047,7 @@ var OpfsFs = class {
   async glance(handle) {
     const at = performance.now();
     const before = this.changes;
+    this.calls++;
     const file = await handle.getFile();
     if (before === this.changes) this.glances.set(handle, { at, file, changes: before });
     else this.glances.delete(handle);
@@ -5303,7 +5333,7 @@ var OpfsFs = class {
     if (!options.recursive) return this.mkdirExcl(path, options.owner);
     let found;
     try {
-      found = await this.locate(path, true);
+      found = await this.exactly(() => this.locate(path, true));
     } catch (err) {
       if (!missing2(err)) throw err;
     }
@@ -5376,6 +5406,7 @@ var OpfsFs = class {
     });
   }
   async handleExists(dir, name2) {
+    this.calls++;
     try {
       await dir.getDirectoryHandle(name2);
       return true;
@@ -5430,7 +5461,7 @@ var OpfsFs = class {
   async link(from, to, follow2) {
     await (follow2 ? this.stat(from) : this.lstat(from));
     if (!(await this.stat(parentOf4(to))).isDirectory) throw fsError("ENOTDIR", to);
-    const taken = await this.lstat(to).then(
+    const taken = await this.exactly(() => this.lstat(to)).then(
       () => true,
       (err) => {
         if (missing2(err)) return false;
@@ -5453,7 +5484,7 @@ var OpfsFs = class {
   async moveTo(source, parent, destination, to) {
     const sourceStat = await this.describe(source);
     if (sourceStat.isDirectory && within3(destination, source.path)) throw fsError("EINVAL", to);
-    const target = await this.locate(destination, false).catch((err) => {
+    const target = await this.exactly(() => this.locate(destination, false)).catch((err) => {
       if (missing2(err)) return null;
       throw err;
     });
@@ -5572,7 +5603,7 @@ var OpfsFs = class {
     if (parent.handle?.kind !== "directory") throw fsError("ENOTDIR", path);
     const at = resolvePath(parent.path, baseOf(path));
     this.refuse(at);
-    if (await this.locate(at, false).then(
+    if (await this.exactly(() => this.locate(at, false)).then(
       () => true,
       (err) => !missing2(err)
     )) {
@@ -5825,15 +5856,21 @@ var UnlinkedKeeper = class {
     };
     const unreplaced = async (path, op) => {
       const at = fs.resolvePath("/", path);
+      const pending = async () => {
+        for (let p = at; replacing.size > 0; p = parentOf5(p)) {
+          await replacing.get(p)?.done;
+          if (p === "/") return;
+        }
+      };
       for (let attempt = 1; ; attempt++) {
-        await replacing.get(at)?.done;
+        await pending();
         const seen = keeper.replaced;
         try {
           return await op();
         } catch (err) {
           const code = err?.code;
           if (attempt >= 3 || code !== "ENOENT") throw err;
-          await replacing.get(at)?.done;
+          await pending();
           if (keeper.replaced === seen) throw err;
         }
       }
@@ -5858,9 +5895,11 @@ var UnlinkedKeeper = class {
       lstat: (path) => unreplaced(path, async () => counted3(await fs.lstat(path))),
       async rm(path, options) {
         const target = fs.resolvePath("/", path);
-        const pinned = await keeper.pin(target);
-        if (pinned.moved.has(target)) pinned.commit();
-        else await keeper.settle(pinned, () => fs.rm(path, options));
+        await replace(target, async (gated) => {
+          const pinned = await keeper.pin(target, gated);
+          if (pinned.moved.has(target)) pinned.commit();
+          else await keeper.settle(pinned, () => fs.rm(path, options));
+        });
       },
       async rename(from, to) {
         const target = fs.resolvePath("/", to);
@@ -5895,9 +5934,22 @@ var UnlinkedKeeper = class {
     return held;
   }
   async pin(target, gated = () => void 0) {
-    const paths = [...this.heldWithin(target).keys()].sort();
+    const paths = [];
     const releases = [];
-    for (const path of paths) releases.push(await this.gate.acquire(path));
+    for (; ; ) {
+      const fresh2 = [...this.heldWithin(target).keys()].filter((path) => !paths.includes(path));
+      if (fresh2.length === 0) break;
+      fresh2.sort();
+      if (paths.some((path) => path > fresh2[0])) {
+        for (const release of releases.splice(0)) release();
+        fresh2.push(...paths.splice(0));
+        fresh2.sort();
+      }
+      for (const path of fresh2) {
+        paths.push(path);
+        releases.push(await this.gate.acquire(path));
+      }
+    }
     gated();
     const now = this.heldWithin(target);
     const held = new Map(
@@ -6973,7 +7025,7 @@ function satisfies(version, range2) {
 }
 
 // src/version.ts
-var KERNEL_VERSION = true ? "1.124.3" : "0.0.0-dev";
+var KERNEL_VERSION = true ? "1.124.5" : "0.0.0-dev";
 var OS_RELEASE = "6.0.0-slicc";
 function procVersion() {
   return `Linux version ${OS_RELEASE} (slicc-kernel ${KERNEL_VERSION}) #1 SMP PREEMPT_DYNAMIC
@@ -12855,6 +12907,8 @@ var SYS_TREE = {
     slicc_shared_root: (listing) => `${listing.peers ?? 0}
 `,
     slicc_fs_calls: (listing) => `${listing.fsCalls ?? 0}
+`,
+    slicc_opfs_calls: (listing) => `${listing.opfsCalls ?? 0}
 `
   }
 };
@@ -14026,9 +14080,13 @@ async function flock(req, ctx) {
   if (req.kind !== "unlock" && req.wait)
     await locks.flocks.wait(key, owner, req.kind, ctx.blocking);
   else if (!await locks.flocks.set(key, owner, req.kind)) throw new KernelError("EAGAIN");
-  if (shared && granted2) await ctx.settle?.(req.fd, true);
+  if (shared && granted2) await grantedAcross(ctx, req.fd);
   return shared ? json3(true) : done2;
 }
+async function grantedAcross(ctx, fd) {
+  ctx.locks?.fresh?.();
+  if (fd !== void 0) await ctx.settle?.(fd, true);
+}
 async function recordLock2(req, ctx) {
   const { locks, fileKey } = ctx;
   if (!locks || !fileKey) throw new KernelError("ENOLCK");
@@ -14058,7 +14116,7 @@ async function recordLock2(req, ctx) {
     await locks.wait(key, owner, req.kind, range2, ctx.blocking);
   else if (!await locks.set(key, owner, req.kind, range2.start, range2.end))
     throw new KernelError("EAGAIN");
-  if (granted2 && fd !== void 0) await ctx.settle?.(fd, true);
+  if (granted2 && shared) await grantedAcross(ctx, fd);
   return shared ? json3(true) : done2;
 }
 
@@ -20559,6 +20617,9 @@ var LockService = class {
     };
   }
   peers;
+  fresh() {
+    this.peers?.fresh?.();
+  }
   shared() {
     if (!this.leader || this.ownerOf.size > 0 || this.tokens.size > 0) return true;
     return this.peers?.crowded() === true;
@@ -25359,7 +25420,8 @@ var Launcher = class {
         cpu: this.cpuTotal(),
         wasm: this.memories.count(),
         peers: Number(this.locks.shared?.() === true),
-        fsCalls: servedFsCalls()
+        fsCalls: servedFsCalls(),
+        opfsCalls: this.rootFs.opfsCalls?.() ?? 0
       }),
       sudo: (call, signal) => this.sudo(pid, call, signal),
       crontab: (call) => this.crontab(pid, call),