@ai-ecoverse/slicc-kernel 1.54.7 → 1.54.9

package/dist/process-worker.js

@@ -4078,12 +4078,12 @@ async function runWasmProcess(init, port2, deps = {}) {
   const say = (fd) => (text) => sys.write(fd, encoder4.encode(`${text}
 `));
   let ready;
-  let failed4;
+  let failed5;
   let memory;
   let exports;
   const initialized = new Promise((resolve, reject) => {
     ready = resolve;
-    failed4 = reject;
+    failed5 = reject;
   });
   const id = identify(transport, init);
   const module = {
@@ -4136,7 +4136,7 @@ async function runWasmProcess(init, port2, deps = {}) {
         exports = instance.exports;
         publishMemory(init.sab, memory?.buffer.byteLength ?? 0);
         done(instance, init.program.module);
-      }, failed4);
+      }, failed5);
       return {};
     },
     preRun: [
@@ -6802,6 +6802,7 @@ function* procWalk(path, follow2) {
   let done = [];
   let todo = path.split("/").filter((part) => part !== "");
   let hops = 0;
+  let broken;
   while (todo.length > 0) {
     const part = todo.shift();
     if (part === ".") continue;
@@ -6811,32 +6812,48 @@ function* procWalk(path, follow2) {
     }
     const at = `/${[...done, part].join("/")}`;
     const whole = normalize(`/${[...done, 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) done.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("/")) done = [];
-      todo = [...target.split("/").filter((part2) => part2 !== ""), ...todo];
+      [done, todo] = throughLink(target, done, todo);
+    } else {
+      broken ??= refusalOf(target);
+      done.push(part);
     }
   }
   return void 0;
 }
+function failed2(err) {
+  const code2 = err?.code;
+  return { refused: typeof code2 === "string" ? code2 : "ENOENT" };
+}
+function refusalOf(found) {
+  if (found === true) return void 0;
+  return found === false ? { refused: "ENOTDIR" } : found;
+}
+function throughLink(target, done, todo) {
+  const parts = target.split("/").filter((part) => part !== "");
+  return [target.startsWith("/") ? [] : done, [...parts, ...todo]];
+}
 function procPath(fs, path, follow2) {
   const walk = procWalk(path, follow2);
   let step = walk.next();
   while (!step.done) {
+    const { at, check } = step.value;
     let target;
     try {
-      target = fs.lstat(step.value).isSymbolicLink ? fs.readlink(step.value) : void 0;
-    } catch {
-      target = null;
+      const st = fs.lstat(at);
+      target = st.isSymbolicLink ? fs.readlink(at) : !check || st.isDirectory;
+    } catch (err) {
+      target = failed2(err);
     }
     step = walk.next(target);
   }
-  return step.value;
+  const result = step.value;
+  if (typeof result === "object") throw syncError(result.refused, path);
+  return result;
 }
 function frozen(bytes) {
   const refuse = () => {
@@ -6918,11 +6935,19 @@ function procfsBridge(fs, tree) {
     ),
     exists: (p) => {
       if (inProc(p)) return tree.exists(p);
-      const real = shadowing() ? toProc(p, true) : void 0;
+      const probe = () => {
+        try {
+          return toProc(p, true);
+        } catch {
+          return null;
+        }
+      };
+      const real = shadowing() ? probe() : void 0;
+      if (real === null) return false;
       if (real !== void 0) return tree.exists(real);
       if (fs.exists(p)) return true;
-      const late2 = toProc(p, true);
-      return late2 !== void 0 && tree.exists(late2);
+      const late2 = probe();
+      return typeof late2 === "string" && tree.exists(late2);
     },
     readlink: (p) => via(
       p,
@@ -8856,7 +8881,7 @@ var init_wasix_host = __esm({
       }
       dlImports() {
         const { mem, host } = this;
-        const failed4 = (message2, buf, len) => {
+        const failed5 = (message2, buf, len) => {
           if (len > 0) {
             const bytes = new TextEncoder().encode(message2).subarray(0, len - 1);
             mem.bytes(buf, bytes.length).set(bytes);
@@ -8865,19 +8890,19 @@ var init_wasix_host = __esm({
           return E.NOEXEC;
         };
         const linked = (buf, len, op, out) => {
-          if (!this.linker) return failed4("not a dynamically-linked program", buf, len);
+          if (!this.linker) return failed5("not a dynamically-linked program", buf, len);
           try {
             out(op(this.linker));
             return E.SUCCESS;
           } catch (e) {
-            if (e instanceof DlError) return failed4(e.message, buf, len);
+            if (e instanceof DlError) return failed5(e.message, buf, len);
             throw e;
           }
         };
         return {
           dlopen: (p, pl, _flags, buf, len, lp, ll, out) => {
             if (p === 0) {
-              if (!this.linker) return failed4("not a dynamically-linked program", buf, len);
+              if (!this.linker) return failed5("not a dynamically-linked program", buf, len);
               mem.view().setUint32(out, MAIN_HANDLE, true);
               return E.SUCCESS;
             }
@@ -9966,7 +9991,7 @@ function withoutFragment(url) {
   url.hash = "";
   return url.href;
 }
-function failed2(err) {
+function failed3(err) {
   return new TypeError("fetch failed", { cause: err });
 }
 function plain(status2, text) {
@@ -9978,7 +10003,7 @@ function plain(status2, text) {
 function rewrite(hop, status2, location) {
   const next2 = new URL(location, hop.url);
   if (next2.protocol !== "http:" && next2.protocol !== "https:") {
-    throw failed2(new JsCallError("EPROTONOSUPPORT", next2.protocol));
+    throw failed3(new JsCallError("EPROTONOSUPPORT", next2.protocol));
   }
   const toGet = (status2 === 301 || status2 === 302) && hop.method === "POST" || status2 === 303 && hop.method !== "GET" && hop.method !== "HEAD";
   const crossOrigin = next2.origin !== new URL(hop.url).origin;
@@ -10072,7 +10097,7 @@ function dataResponse(request) {
   const url = withoutFragment(new URL(request.url));
   const rest2 = url.slice("data:".length);
   const comma = rest2.indexOf(",");
-  if (comma < 0) throw failed2(new JsCallError("EINVAL", "a data: URL without a comma"));
+  if (comma < 0) throw failed3(new JsCallError("EINVAL", "a data: URL without a comma"));
   let type = rest2.slice(0, comma).replace(/^[\t\n\f\r ]+|[\t\n\f\r ]+$/g, "");
   let body = percentDecode(rest2.slice(comma + 1));
   const base642 = BASE64.exec(type);
@@ -10082,7 +10107,7 @@ function dataResponse(request) {
     try {
       binary = atob(latin1(body));
     } catch {
-      throw failed2(new JsCallError("EINVAL", "a data: URL whose base64 does not decode"));
+      throw failed3(new JsCallError("EINVAL", "a data: URL whose base64 does not decode"));
     }
     body = Uint8Array.from(binary, (c) => c.charCodeAt(0));
   }
@@ -10110,7 +10135,7 @@ function bytesOf(chunk) {
   if (ArrayBuffer.isView(chunk)) {
     return new Uint8Array(chunk.buffer, chunk.byteOffset, chunk.byteLength);
   }
-  throw failed2(new TypeError("a request body chunk must be bytes or a string"));
+  throw failed3(new TypeError("a request body chunk must be bytes or a string"));
 }
 async function bodyOf(request, cap, signal) {
   signal.throwIfAborted();
@@ -10123,7 +10148,7 @@ async function bodyOf(request, cap, signal) {
   try {
     for (; ; ) {
       const next2 = await reader.read().catch((err) => {
-        throw signal.aborted ? signal.reason : failed2(err);
+        throw signal.aborted ? signal.reason : failed3(err);
       });
       signal.throwIfAborted();
       if (next2.done) break;
@@ -10172,7 +10197,7 @@ function fetchOp(kernel) {
       return r.ok && r.kind === "json" ? r.json : void 0;
     } catch (err) {
       await close(handle);
-      throw signal.aborted ? signal.reason : failed2(err);
+      throw signal.aborted ? signal.reason : failed3(err);
     }
   };
   const body = (handle, signal) => {
@@ -10197,7 +10222,7 @@ function fetchOp(kernel) {
           } catch (err) {
             settle();
             await close(handle);
-            throw signal.aborted ? signal.reason : failed2(err);
+            throw signal.aborted ? signal.reason : failed3(err);
           }
           const bytes = r.ok && r.kind === "bytes" ? r.bytes : new Uint8Array(0);
           if (bytes.length > 0) {
@@ -10219,7 +10244,7 @@ function fetchOp(kernel) {
   const respond = (head, method, redirected, encoded, signal) => {
     if (head.status < 200 || head.status > 599) {
       void close(head.handle);
-      throw failed2(new JsCallError("EPROTO", `status ${head.status}`));
+      throw failed3(new JsCallError("EPROTO", `status ${head.status}`));
     }
     const empty = method === "HEAD" || NULL_BODY.has(head.status);
     if (empty) void close(head.handle);
@@ -10248,13 +10273,13 @@ function fetchOp(kernel) {
     const { protocol } = new URL(request.url);
     if (protocol === "data:") return dataResponse(request);
     if (protocol !== "http:" && protocol !== "https:") {
-      throw failed2(new JsCallError("EPROTONOSUPPORT", protocol));
+      throw failed3(new JsCallError("EPROTONOSUPPORT", protocol));
     }
     const known = await traitsOf().catch((err) => {
-      throw failed2(err);
+      throw failed3(err);
     });
     if (!known.manualRedirects && request.redirect !== "follow") {
-      throw failed2(new JsCallError("ENOTSUP", `redirect: ${request.redirect}`));
+      throw failed3(new JsCallError("ENOTSUP", `redirect: ${request.redirect}`));
     }
     const url = withoutFragment(new URL(request.url));
     const bytes = await bodyOf(request, known.maxRequestBody, signal);
@@ -10276,8 +10301,8 @@ function fetchOp(kernel) {
         return respond(head, hop.method, redirected, known.encodedBodies, signal);
       }
       await close(head.handle);
-      if (request.redirect === "error") throw failed2(new JsCallError("EREDIRECT", hop.url));
-      if (hops >= MAX_REDIRECTS) throw failed2(new JsCallError("ELOOP", hop.url));
+      if (request.redirect === "error") throw failed3(new JsCallError("EREDIRECT", hop.url));
+      if (hops >= MAX_REDIRECTS) throw failed3(new JsCallError("ELOOP", hop.url));
       hop = rewrite(hop, head.status, location);
     }
   };
@@ -10514,13 +10539,13 @@ function netOps(kernel, io) {
         const r = await kernel.raw({ op: "sock-connect", fd, addr, nonblock: true });
         if (!r.ok && r.errno !== "EINPROGRESS") throw new JsCallError(r.errno, "connect");
         await kernel.blocking({ op: "fd-select", read: [], write: [fd], timeoutMs: -1 }, signal);
-        const failed4 = await kernel.json({
+        const failed5 = await kernel.json({
           op: "sock-getopt",
           fd,
           level: SOL_SOCKET,
           name: SO_ERROR
         });
-        if (failed4 !== 0) throw new JsCallError(errnoName(failed4), "connect");
+        if (failed5 !== 0) throw new JsCallError(errnoName(failed5), "connect");
         return connection(fd);
       });
     }
@@ -10853,7 +10878,7 @@ var init_js_tty = __esm({
 });
 
 // src/process/js/js-websocket.ts
-function failed3(err) {
+function failed4(err) {
   return new TypeError("websocket failed", { cause: err });
 }
 function socketUrl(input) {
@@ -10897,7 +10922,7 @@ function websocketOp(kernel) {
       protocol = (r.ok && r.kind === "json" ? r.json : {}).protocol;
     } catch (err) {
       await free();
-      throw signal.aborted ? signal.reason : failed3(err);
+      throw signal.aborted ? signal.reason : failed4(err);
     }
     let settle;
     let lose;
@@ -10947,7 +10972,7 @@ function websocketOp(kernel) {
           try {
             r = await kernel.blocking({ op: "net-ws-recv", handle }, stop.signal);
           } catch (err) {
-            hardStop(stop.signal.aborted ? stop.signal.reason : failed3(err));
+            hardStop(stop.signal.aborted ? stop.signal.reason : failed4(err));
             throw stop.signal.reason;
           }
           stop.signal.throwIfAborted();
@@ -11548,20 +11573,20 @@ function started(init, port2, run, wasi, js) {
   return run(wasmInit, port2);
 }
 function processEntry(port2, run = runWasmProcess, wasi = loadWasi, js = loadJs) {
-  const failed4 = (err) => port2.postMessage({
+  const failed5 = (err) => port2.postMessage({
     type: WASM_PROCESS_ERROR,
     message: err instanceof Error ? err.stack ?? err.message : String(err)
   });
   return (data) => {
     const type = data?.type;
     if (type === WASM_THREAD_INIT) {
-      wasi().then((m) => m.runWasiThread(data, port2)).catch(failed4);
+      wasi().then((m) => m.runWasiThread(data, port2)).catch(failed5);
       return;
     }
     if (type !== WASM_PROCESS_INIT) return;
     started(data, port2, run, wasi, js).then(
       (code2) => port2.postMessage({ type: WASM_PROCESS_EXIT, code: code2 }),
-      failed4
+      failed5
     );
   };
 }