@ai-ecoverse/slicc-kernel 1.56.0 → 1.56.2

package/dist/kernel-worker.js

@@ -438,12 +438,34 @@ var OpfsFs = class {
         const link2 = await this.linkAlong(current);
         if (!link2) throw err;
         if (link2.path === current && !follow2) return { path: current, link: link2 };
-        const rest2 = current.slice(link2.path.length);
-        current = resolvePath(parentOf2(link2.path), `${link2.link}${rest2}`);
+        const target = `${link2.link}${current.slice(link2.path.length)}`;
+        current = target.split("/").includes("..") ? await this.physical(parentOf2(link2.path), target, hops + 1) : resolvePath(parentOf2(link2.path), target);
       }
     }
     throw fsError("ELOOP", path);
   }
+  async physical(base, path, used) {
+    let done4 = [];
+    let todo = (path.startsWith("/") ? path : `${base}/${path}`).split("/").filter((p) => p !== "" && p !== ".");
+    for (let hops = used; todo.length > 0; ) {
+      const part = todo.shift();
+      if (part === "..") done4.pop();
+      else if (!todo.includes("..")) done4.push(part);
+      else {
+        const at = `/${[...done4, part].join("/")}`;
+        const st = await this.lstat(at);
+        if (!st.isSymbolicLink && !st.isDirectory) throw fsError("ENOTDIR", at);
+        if (!st.isSymbolicLink) done4.push(part);
+        else if (++hops > MAX_LINKS) throw fsError("ELOOP", path);
+        else {
+          const link2 = await this.readlink(at);
+          if (link2.startsWith("/")) done4 = [];
+          todo = [...link2.split("/").filter((p) => p !== "" && p !== "."), ...todo];
+        }
+      }
+    }
+    return `/${done4.join("/")}`;
+  }
   mode(path, directory, meta) {
     const fallback = directory || EXECUTABLE.test(path) ? 493 : 420;
     return (directory ? S_IFDIR : S_IFREG) | (meta?.mode ?? fallback);
@@ -9631,6 +9653,11 @@ var MAX_LINKS5 = 40;
 function parentOf6(path) {
   return path.slice(0, path.lastIndexOf("/")) || "/";
 }
+async function mustBeDir(fs, path) {
+  if (!fs.lstat) return;
+  const st = await fs.lstat(path);
+  if (st.isDirectory !== true) throw fsError("ENOTDIR", path);
+}
 async function linkOf(fs, path) {
   return fs.readlink?.(path).catch(() => void 0);
 }
@@ -9647,6 +9674,7 @@ async function realDir(fs, dir, budget = { hops: 0 }) {
     const next2 = at === "/" ? `/${part}` : `${at}/${part}`;
     const link2 = await linkOf(fs, next2);
     if (link2 === void 0) {
+      if (queue.find((p) => p !== ".") === "..") await mustBeDir(fs, next2);
       at = next2;
       continue;
     }
@@ -11905,7 +11933,7 @@ var HostfsClient = class {
       false,
       true
     );
-    await response.body?.cancel();
+    return response.json().catch(() => null);
   }
   async read(fh, offset, size, ifMatch) {
     const response = await this.send(
@@ -11961,7 +11989,8 @@ var HostfsClient = class {
     }
   }
 };
-function hostfsHandlers(current) {
+var RESTORE_AGAIN_MS = 3e4;
+function hostfsHandlers(current, againMs = RESTORE_AGAIN_MS) {
   const handles = /* @__PURE__ */ new Map();
   let nextFh = 0;
   const fresh = (remote) => {
@@ -11974,10 +12003,18 @@ function hostfsHandlers(current) {
     return fresh(remote);
   };
   const call = (op, body = {}) => current().call(op, body);
-  const settle3 = (client, restore) => client.call("setattr", restore).catch((err) => {
+  const same = (was, mode, seen) => seen?.mode === (mode | 128) && (was.ino !== void 0 && seen.ino !== void 0 ? seen.ino === was.ino : seen.size === was.size && seen.mtime === was.mtime);
+  const settle3 = (client, { was, ...restore }) => client.call("setattr", restore).catch((err) => {
     if (!client.gone || !client.cleanup) throw err;
     void client.cleanup("setattr", restore).catch(() => {
     });
+    const timer = setTimeout(async () => {
+      const seen = await client.cleanup?.("stat", { path: restore.path }).catch(() => null);
+      if (same(was, restore.mode, seen))
+        void client.cleanup?.("setattr", restore).catch(() => {
+        });
+    }, againMs);
+    timer.unref?.();
   });
   async function writable(client, path, flags) {
     const { ifMatch: _, ...asked } = flags;
@@ -11986,9 +12023,10 @@ function hostfsHandlers(current) {
       return { opened: await opening(), restore: void 0 };
     } catch (err) {
       if (!flags.write || codeOf4(err) !== "EACCES") throw err;
-      const mode = (await client.call("stat", { path: rel(path) })).mode ?? 0;
+      const was = await client.call("stat", { path: rel(path) });
+      const mode = was.mode ?? 0;
       if (mode & 128) throw err;
-      const restore = { path: rel(path), mode };
+      const restore = { path: rel(path), mode, was };
       const opened2 = await client.call("setattr", { path: rel(path), mode: mode | 128 }).then(opening).catch(async (again) => {
         await settle3(client, restore).catch(() => {
         });
@@ -12209,7 +12247,7 @@ function timed(transport, ms) {
   });
   const cleanup = async (op, body, skip) => {
     await Promise.allSettled([...inflight].filter((work) => work !== skip));
-    await transport.cleanup?.(op, body);
+    return await transport.cleanup?.(op, body);
   };
   const release = (opened2) => {
     const fh = opened2?.fh;