@ai-ecoverse/slicc-kernel 1.138.0 → 1.139.0

package/dist/node-process-worker.js

@@ -25,11 +25,7 @@ function chain(target) {
 function hide(target, names) {
   for (const name2 of names) {
     const holders = chain(target);
-    for (const holder of holders) {
-      if (Object.getOwnPropertyDescriptor(holder, name2)?.configurable) {
-        Reflect.deleteProperty(holder, name2);
-      }
-    }
+    for (const holder of holders) Reflect.deleteProperty(holder, name2);
     const kept = holders.slice(1).some((holder) => Object.hasOwn(holder, name2));
     const defined = Reflect.defineProperty(target, name2, {
       value: void 0,
@@ -45,11 +41,7 @@ function hide(target, names) {
 function vacate(target, names) {
   for (const name2 of names) {
     const holders = chain(target);
-    for (const holder of holders) {
-      if (Object.getOwnPropertyDescriptor(holder, name2)?.configurable) {
-        Reflect.deleteProperty(holder, name2);
-      }
-    }
+    for (const holder of holders) Reflect.deleteProperty(holder, name2);
     const kept = holders.slice(1).some((holder) => Object.hasOwn(holder, name2));
     const opened2 = Reflect.defineProperty(target, name2, {
       value: void 0,
@@ -4059,12 +4051,16 @@ function readyEvents(subs, ready) {
     ...nbytesOf(s, ready)
   }));
 }
-function selectOnce(deps, read2, write2, timeoutMs2) {
+function selectOnce(deps, read2, write2, timeoutMs2, mayResume) {
   try {
     const ready = deps.kernel.call({ op: "fd-select", read: read2, write: write2, timeoutMs: timeoutMs2 });
     return { ready, interrupted: false };
   } catch (e) {
-    if (!deps.interruptWakes || e.code !== "EINTR") throw e;
+    if (e.code !== "EINTR") throw e;
+    if (!deps.interruptWakes && mayResume && deps.resumes?.()) {
+      return { ready: { read: [], write: [] }, interrupted: false, resumed: true };
+    }
+    if (!deps.interruptWakes) throw e;
     return { ready: { read: [], write: [] }, interrupted: true };
   }
 }
@@ -4074,8 +4070,15 @@ function waitEvents(deps, subs, { events, read: read2, write: write2 }, entered)
     if (events.length > 0 || entered) return 0;
     return earliest === Infinity ? -1 : Math.max(0, Math.ceil(earliest - performance.now()));
   };
-  for (; ; ) {
-    const { ready, interrupted } = selectOnce(deps, read2, write2, timeout());
+  for (let resumes = 0; ; ) {
+    const { ready, interrupted, resumed } = selectOnce(
+      deps,
+      read2,
+      write2,
+      timeout(),
+      resumes++ < RESUMES
+    );
+    if (resumed) continue;
     events.push(...readyEvents(subs, ready));
     if (interrupted) return true;
     if (events.length > 0 || entered || earliest === Infinity) return false;
@@ -4102,10 +4105,12 @@ function pollOneoff(deps, inPtr, outPtr, nsubs, neventsPtr) {
   mem.view().setUint32(neventsPtr, events.length, true);
   return E.SUCCESS;
 }
+var RESUMES;
 var init_wasi_poll = __esm({
   "src/process/wasi/wasi-poll.ts"() {
     "use strict";
     init_wasi_abi();
+    RESUMES = 64;
   }
 });
 
@@ -4139,10 +4144,10 @@ var init_wasi_sigmask = __esm({
       deliver;
       process;
       tid;
-      constructor(header, deliver, process, tid = 1) {
+      constructor(header, deliver, process2, tid = 1) {
         this.header = header;
         this.deliver = deliver;
-        this.process = process;
+        this.process = process2;
         this.tid = tid;
         this.lo = libcBits(Atomics.load(header, SAB_I_BLOCKED));
         this.hi = Atomics.load(header, SAB_I_BLOCKED_HI);
@@ -5348,7 +5353,8 @@ var init_wasi_host = __esm({
           }
         });
       }
-      poll(inPtr, outPtr, n, nevents) {
+      poll(inPtr, outPtr, n, nevents, resume = true) {
+        const ran = this.signals?.ran ?? 0;
         try {
           return pollOneoff(
             {
@@ -5357,7 +5363,8 @@ var init_wasi_host = __esm({
               kernel: this.o.kernel,
               now: (id) => this.now(id),
               interruptWakes: this.interruptWakes,
-              entered: this.entered
+              entered: this.entered,
+              ...resume ? { resumes: () => this.resumesPoll(ran) } : {}
             },
             inPtr,
             outPtr,
@@ -5368,13 +5375,17 @@ var init_wasi_host = __esm({
           this.o.fs.invalidate?.();
         }
       }
+      resumesPoll(ran) {
+        this.interrupted?.();
+        return (this.signals?.ran ?? 0) === ran;
+      }
       maskedPoll(mask, set, [inPtr, outPtr, n, nevents]) {
         const old = mask.swap(set[0], set[1]);
         try {
           this.mem.view().setUint32(nevents, 0, true);
           if (mask.deliverUnblocked()) return E.INTR;
           this.settleEntry(mask);
-          if (n > 0) return this.poll(inPtr, outPtr, n, nevents);
+          if (n > 0) return this.poll(inPtr, outPtr, n, nevents, false);
           return this.entered ? E.INTR : this.suspend();
         } finally {
           mask.deliverUnblocked();
@@ -6699,7 +6710,7 @@ var KERNEL_VERSION, OS_RELEASE;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    KERNEL_VERSION = true ? "1.138.0" : "0.0.0-dev";
+    KERNEL_VERSION = true ? "1.139.0" : "0.0.0-dev";
     OS_RELEASE = "6.0.0-slicc";
   }
 });
@@ -7501,7 +7512,7 @@ var init_js_fetch = __esm({
 });
 
 // src/process/js/js-net.ts
-function fromBase64(text) {
+function fromBase642(text) {
   const bin = atob(text);
   const out = new Uint8Array(bin.length);
   for (let i = 0; i < bin.length; i++) out[i] = bin.charCodeAt(i);
@@ -7584,7 +7595,7 @@ function sessionOf(r) {
     authorized: r.authorized === true,
     ...r.authorizationError ? { authorizationError: r.authorizationError } : {},
     servername: r.servername,
-    peerCertificates: Object.freeze((r.peerCertificates ?? []).map(fromBase64)),
+    peerCertificates: Object.freeze((r.peerCertificates ?? []).map(fromBase642)),
     ...controlsOf(r)
   });
 }
@@ -15157,6 +15168,15 @@ function heldOn(init, lane, syncKernel) {
   const ask = () => syncKernel.json({ op: "cwd-check" });
   return new HeldCwd(init.sab, init.slot, ask, init);
 }
+function measured(measure) {
+  const got = measure?.() ?? {};
+  const out = {};
+  for (const field2 of MEMORY_FIELDS) {
+    const value2 = got[field2];
+    if (typeof value2 === "number" && Number.isFinite(value2)) out[field2] = value2;
+  }
+  return out;
+}
 function createContext(o) {
   const { kernel } = o;
   const infos = /* @__PURE__ */ new Map();
@@ -15297,6 +15317,7 @@ function createContext(o) {
     tty: terminal.tty,
     exit,
     thread: o.thread,
+    memory: () => measured(o.memory),
     onUncaught: (listener) => listen(strays.exception, listener),
     onUnhandledRejection: (listener) => listen(strays.rejection, listener)
   };
@@ -15494,7 +15515,7 @@ function pathOps(kernel, resolve, statOf, open, tryDev) {
     }
   };
 }
-var KERNEL_INFO, JsExit, encoder4, cryptoRandom;
+var KERNEL_INFO, JsExit, encoder4, cryptoRandom, MEMORY_FIELDS;
 var init_js_context = __esm({
   "src/process/js/js-context.ts"() {
     "use strict";
@@ -15529,6 +15550,7 @@ var init_js_context = __esm({
     };
     encoder4 = new TextEncoder();
     cryptoRandom = (bytes) => void crypto.getRandomValues(bytes);
+    MEMORY_FIELDS = ["heapUsed", "heapTotal", "heapLimit", "external", "arrayBuffers"];
   }
 });
 
@@ -15702,6 +15724,7 @@ async function runJs(init, port3, deps, thread) {
     fs: { owners: init.owners === true, links: init.links === true },
     strays,
     thread: threadContext(port3, thread),
+    memory: deps.memory,
     ...thread?.owned ? { owned: thread.owned } : {},
     held: init.held,
     failed: () => failedWith
@@ -16028,7 +16051,9 @@ var init_wasi_signals = __esm({
         this.deferred &= ~bit;
         this.raise(sig);
       }
+      ran = 0;
       run(handler, sig) {
+        this.ran++;
         const outer = { sig: this.delivering, defaulted: this.defaulted, libc: this.libcDefault };
         this.delivering = sig;
         this.defaulted = false;
@@ -17420,9 +17445,9 @@ var init_wasix_host = __esm({
         };
       }
       processImports() {
-        const { mem, process } = this;
+        const { mem, process: process2 } = this;
         return {
-          proc_fork: (_copy, pidPtr) => process.fork(pidPtr),
+          proc_fork: (_copy, pidPtr) => process2.fork(pidPtr),
           stack_checkpoint: (snapPtr, retPtr) => {
             const back = this.driver.rewound();
             if (back === void 0) return this.driver.checkpoint(snapPtr, retPtr);
@@ -17430,7 +17455,7 @@ var init_wasix_host = __esm({
             return E.SUCCESS;
           },
           stack_restore: (snapPtr, val) => void this.driver.restore(snapPtr, val),
-          proc_join: (pidPtr, flags, statusPtr) => void process.join(pidPtr, flags, statusPtr),
+          proc_join: (pidPtr, flags, statusPtr) => void process2.join(pidPtr, flags, statusPtr),
           proc_signal: (pid, sig) => {
             const posix = sig === 0 ? 0 : wasixSignal(sig);
             if (posix === void 0) throw new WasiError("EINVAL");
@@ -17439,14 +17464,14 @@ var init_wasix_host = __esm({
           },
           proc_exec: (n, nl, a, al) => this.execOrExit(n, nl, a, al, 0, 0),
           proc_exec2: (n, nl, a, al, e, el) => this.execOrExit(n, nl, a, al, e, el),
-          proc_exec3: (n, nl, a, al, e, el, search, p, pl) => process.exec({
+          proc_exec3: (n, nl, a, al, e, el, search, p, pl) => process2.exec({
             name: this.str(n, nl),
             argv: _WasixHost.lines(this.str(a, al)),
             env: _WasixHost.env(_WasixHost.lines(this.str(e, el))),
             search: search !== 0,
             path: this.str(p, pl)
           }),
-          proc_exec4: (n, nl, a, ac, e, ec, search, p, pl) => process.exec({
+          proc_exec4: (n, nl, a, ac, e, ec, search, p, pl) => process2.exec({
             name: this.str(n, nl),
             argv: this.cStrings(a, ac),
             env: _WasixHost.env(e === 0 ? void 0 : this.cStrings(e, ec)),
@@ -17455,7 +17480,7 @@ var init_wasix_host = __esm({
           }),
           proc_spawn2: (...args) => {
             const [n, nl, a, al, e, el, ops, opc, , , search, p, pl, out] = args;
-            const pid = process.spawn({
+            const pid = process2.spawn({
               name: this.str(n, nl),
               argv: _WasixHost.lines(this.str(a, al)),
               env: _WasixHost.env(_WasixHost.lines(this.str(e, el))),
@@ -17467,7 +17492,7 @@ var init_wasix_host = __esm({
           },
           proc_spawn3: (...args) => {
             const [n, nl, a, ac, e, ec, ops, opc, , , search, p, pl, out] = args;
-            const pid = process.spawn({
+            const pid = process2.spawn({
               name: this.str(n, nl),
               argv: this.cStrings(a, ac),
               env: _WasixHost.env(e === 0 ? void 0 : this.cStrings(e, ec)),
@@ -17734,14 +17759,14 @@ function delivering(ns, table, host, driver, before) {
   }
   return out;
 }
-function sigmaskOf(module, sab, gate, threads, process) {
+function sigmaskOf(module, sab, gate, threads, process2) {
   const header = new Int32Array(sab, 0, SAB_HEADER_I32);
   if (!importsSlicc(module, "sigmask_set")) {
     WasiSigmask.unsupported(header);
     return void 0;
   }
   if (threads) threads.blocked = () => loadBlocked(header);
-  const shared = process && new Int32Array(process, 0, SAB_HEADER_I32);
+  const shared = process2 && new Int32Array(process2, 0, SAB_HEADER_I32);
   return new WasiSigmask(header, () => gate.deliver(), shared, threads?.tid ?? MAIN_TID);
 }
 function enosys(module, name2, foreign) {
@@ -18424,6 +18449,7 @@ import { parentPort } from "node:worker_threads";
 // src/node-lockdown.ts
 init_lockdown();
 import { isBuiltin, registerHooks } from "node:module";
+import { getHeapStatistics } from "node:v8";
 var NODE_GLOBALS = ["localStorage", "sessionStorage"];
 var NODE_SLOTS = [
   "require",
@@ -18450,6 +18476,10 @@ function refused(specifier) {
     code: "ERR_ACCESS_DENIED"
   });
 }
+var BASE64_MODULE = "data:text/javascript;base64,";
+var fromBase64 = Buffer.from.bind(Buffer);
+var toText = Function.prototype.call.bind(Buffer.prototype.toString);
+var PLAIN_BASE64 = /^[A-Za-z0-9+/]+={0,2}$/;
 function refuseModules() {
   registerHooks({
     resolve(specifier, context, next2) {
@@ -18457,11 +18487,30 @@ function refuseModules() {
       const resolved2 = next2(specifier, context);
       if (!resolved2.url.startsWith("data:")) throw refused(resolved2.url);
       return resolved2;
+    },
+    load(url, context, next2) {
+      const payload = url.startsWith(BASE64_MODULE) ? url.slice(BASE64_MODULE.length) : "";
+      if (payload.length % 4 !== 0 || !PLAIN_BASE64.test(payload)) return next2(url, context);
+      const source = toText(fromBase64(payload, "base64"), "utf8");
+      return { format: "module", source, shortCircuit: true };
     }
   });
 }
 var locked = /* @__PURE__ */ new WeakSet();
 var nodeProcess = typeof globalThis.process === "object" && globalThis.process !== null ? globalThis.process : void 0;
+var heapStatistics = getHeapStatistics;
+var memoryUsage = process.memoryUsage.bind(process);
+function nodeMemory() {
+  const heap = heapStatistics();
+  const usage = memoryUsage();
+  return {
+    heapUsed: heap.used_heap_size,
+    heapTotal: heap.total_heap_size,
+    heapLimit: heap.heap_size_limit,
+    external: heap.external_memory,
+    arrayBuffers: usage.arrayBuffers
+  };
+}
 function nodeLockdown(scope2 = globalThis) {
   if (locked.has(scope2)) return;
   locked.add(scope2);
@@ -18579,8 +18628,16 @@ var onMessage = processEntry(
   },
   async () => wasi_runtime_exports,
   async () => ({
-    runJsProcess: (init, at) => runJsProcess(init, at, { lockdown: () => nodeLockdown(), scope: strayScope }),
-    runJsThread: (init, at) => runJsThread(init, at, { lockdown: () => nodeLockdown(), scope: strayScope })
+    runJsProcess: (init, at) => runJsProcess(init, at, {
+      lockdown: () => nodeLockdown(),
+      scope: strayScope,
+      memory: nodeMemory
+    }),
+    runJsThread: (init, at) => runJsThread(init, at, {
+      lockdown: () => nodeLockdown(),
+      scope: strayScope,
+      memory: nodeMemory
+    })
   }),
   () => nodeLockdown()
 );