@ai-ecoverse/slicc-kernel 1.69.0 → 1.70.0

package/dist/node.js

@@ -5387,6 +5387,18 @@ function capturing(chunks2, max = Number.POSITIVE_INFINITY, overflow) {
     size += bytes.length;
   };
 }
+function captureFile(onData, control) {
+  if (!control) return sinkFile(onData);
+  control.opened = true;
+  return new OpenFile({
+    write: async (bytes) => {
+      if (control.shut) throw new KernelError("EPIPE");
+      onData(bytes.slice());
+      return bytes.length;
+    },
+    close: () => control.ended()
+  });
+}
 function concat2(chunks2) {
   const out = new Uint8Array(chunks2.reduce((n, c) => n + c.length, 0));
   let offset = 0;
@@ -5421,7 +5433,12 @@ var ChildTable = class {
     const fds = new FdTable();
     const captured = /* @__PURE__ */ new Map();
     try {
-      for (const [n, slot2] of stdio.entries()) fds.installAt(n, this.openSlot(slot2, n, captured));
+      for (const [n, slot2] of stdio.entries()) {
+        fds.installAt(
+          n,
+          "sameAs" in slot2 ? fds.get(slot2.sameAs).retain() : this.openSlot(slot2, n, captured)
+        );
+      }
       for (const slot2 of inherit2) {
         if (slot2.fd <= 2) continue;
         if ("device" in slot2) {
@@ -5478,7 +5495,7 @@ var ChildTable = class {
     if ("capture" in slot2) {
       const chunks2 = [];
       captured.set(n, chunks2);
-      return sinkFile(capturing(chunks2, slot2.max, slot2.overflow));
+      return captureFile(capturing(chunks2, slot2.max, slot2.overflow), slot2.control);
     }
     return deviceFile("null");
   }
@@ -10333,9 +10350,11 @@ function capLimit(maxBuffer) {
   return Math.min(asked, RUN_CAPTURE_CAP);
 }
 function slot(how, n, extra) {
+  if (how === "stdout") return { sameAs: 1 };
+  if (typeof how === "number") return { fd: how };
   if (how === "inherit") return { fd: n };
   if (how === "ignore") return { none: true };
-  return extra;
+  return extra();
 }
 function frame2(outcome, out, err) {
   const head = new TextEncoder().encode(JSON.stringify(outcome));
@@ -10365,12 +10384,20 @@ async function runChild(req, deps) {
     if (failure !== void 0) return;
     failure = code;
     if (pid !== 0) kill();
+    decided.resolve();
+  };
+  const controls = [];
+  const capture = () => {
+    const { promise, resolve } = Promise.withResolvers();
+    const control = { shut: false, ended: resolve, eof: promise };
+    controls.push(control);
+    return { capture: true, max, overflow: () => stop("ENOBUFS"), control };
   };
-  const capture = () => ({ capture: true, max, overflow: () => stop("ENOBUFS") });
+  const decided = Promise.withResolvers();
   const stdio = [
-    slot(req.stdin, 0, { input: req.input ?? new Uint8Array(0) }),
-    slot(req.stdout, 1, capture()),
-    slot(req.stderr, 2, capture())
+    slot(req.stdin, 0, () => ({ input: req.input ?? new Uint8Array(0) })),
+    slot(req.stdout, 1, capture),
+    slot(req.stderr, 2, capture)
   ];
   try {
     pid = await deps.children.spawn(
@@ -10387,8 +10414,11 @@ async function runChild(req, deps) {
   let status;
   try {
     status = await reaped(deps, pid);
+    const open = controls.filter((c) => c.opened);
+    await Promise.race([Promise.all(open.map((c) => c.eof)), decided.promise]);
   } finally {
     clearTimeout(timer);
+    for (const control of controls) control.shut = true;
   }
   const out = deps.children.captured(pid, 1);
   const err = deps.children.captured(pid, 2);