@ai-ecoverse/slicc-kernel 1.154.2 → 1.155.0

package/dist/node.js

@@ -186,6 +186,7 @@ function embedderAsker(port) {
       void asked.body.cancel(message3.error.message).catch(() => void 0);
       push(asked, message3.error);
     } else if ("progress" in message3) asked.progress(message3.progress);
+    else if ("bodyCancel" in message3) void asked.body.cancel("the page").catch(() => void 0);
     else void sendBody(message3.id, asked);
   };
   return { hookFor, answer: answer2 };
@@ -213,7 +214,8 @@ function bodyStream(id2, state, post) {
         const next3 = state.body.shift();
         if (next3) controller.enqueue(next3);
         else controller.close();
-      }
+      },
+      cancel: () => post({ id: id2, bodyCancel: true })
     },
     { highWaterMark: 0 }
   );
@@ -234,14 +236,16 @@ function embedderAnswerer(port, hookFor) {
         throw Object.assign(new Error(`this page does not answer ${ask.kind}`), {
           name: "NotSupportedError"
         });
+      const body = bodyStream(ask.id, state, post);
       const reply = await hook.handle({
         kind: ask.kind,
         options: ask.options,
-        body: bodyStream(ask.id, state, post),
+        body,
         stamp: ask.stamp,
         signal: state.abort.signal,
         progress: (line) => post({ id: ask.id, progress: String(line) })
       });
+      if (!(reply instanceof ReadableStream)) post({ id: ask.id, bodyCancel: true });
       state.reader = bytesOf(reply).getReader();
       post({ id: ask.id, ready: true });
     } catch (err) {
@@ -1891,8 +1895,8 @@ function link(a, b) {
     pipe.openRead();
     pipe.openWrite();
   }
-  a.attach({ rx: ba, tx: ab });
-  b.attach({ rx: ab, tx: ba });
+  a.attach({ rx: ba, tx: ab, peer: b });
+  b.attach({ rx: ab, tx: ba, peer: a });
 }
 var SERVE_CHUNK = 64 * 1024;
 var NEVER_ABORTED = new AbortController().signal;
@@ -1904,6 +1908,8 @@ var KernelSocket = class _KernelSocket {
   dialing;
   failed;
   reset;
+  abortive = false;
+  refused;
   local;
   peer;
   peerCred;
@@ -1940,20 +1946,25 @@ var KernelSocket = class _KernelSocket {
   }
   async read(max, signal) {
     const { rx } = this.connection();
+    if (this.refused) throw this.refused;
     if (this.readShut || max <= 0) return new Uint8Array(0);
     const bytes = await pipeCall(() => rx.read(max, signal));
+    if (this.refused) throw this.refused;
     if (bytes.length === 0 && this.reset) throw this.reset;
     return bytes;
   }
   async peek(max, signal) {
     const { rx } = this.connection();
+    if (this.refused) throw this.refused;
     if (this.readShut || max <= 0) return new Uint8Array(0);
     const bytes = await pipeCall(() => rx.peek(max, signal));
+    if (this.refused) throw this.refused;
     if (bytes.length === 0 && this.reset) throw this.reset;
     return bytes;
   }
   async write(bytes, signal) {
     const { tx } = this.connection();
+    if (this.refused) throw this.refused;
     if (this.writeShut) throw new KernelError("EPIPE");
     if (this.reset?.code === "EPROTO") throw this.reset;
     return pipeCall(() => tx.write(bytes, signal));
@@ -2140,10 +2151,11 @@ var KernelSocket = class _KernelSocket {
       handshaking = false;
       signal.removeEventListener("abort", abandon);
     }
-    this.link = uplinkLink(made2.conn, (err) => {
+    const plain3 = uplinkLink(made2.conn, (err) => {
       this.reset = err instanceof KernelError && err.code === "EPROTO" ? err : new KernelError("ECONNRESET");
       this.changes.wake();
     });
+    this.link = { ...plain3, ...raw2.peer ? { peer: raw2.peer } : {} };
     this.changes.wake();
     return made2.info;
   }
@@ -2261,8 +2273,22 @@ var KernelSocket = class _KernelSocket {
   setOption(level, name2, value2) {
     this.options.set(`${level}:${name2}`, value2);
   }
+  resetOnClose() {
+    this.connection();
+    this.abortive = true;
+  }
+  abort() {
+    const link2 = this.link;
+    if (link2.peer) link2.peer.resetBy();
+    else link2.tx.closeRead();
+  }
+  resetBy() {
+    this.refused ??= new KernelError("ECONNRESET");
+    this.changes.wake();
+  }
   close() {
     const was = this.state;
+    if (this.abortive && was === "connected") this.abort();
     this.state = "closed";
     this.dialing?.abort(new KernelError("ECONNABORTED"));
     this.dialing = void 0;
@@ -3562,7 +3588,7 @@ function satisfies(version, range2) {
 }
 
 // src/version.ts
-var KERNEL_VERSION = true ? "1.154.2" : "0.0.0-dev";
+var KERNEL_VERSION = true ? "1.155.0" : "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
@@ -7957,6 +7983,7 @@ var BodyPipe = class {
   queue = [];
   size = 0;
   ended = false;
+  dropped = false;
   wake;
   room;
   stream;
@@ -7975,7 +8002,8 @@ var BodyPipe = class {
             this.room?.();
             controller.enqueue(next3);
           } else controller.close();
-        }
+        },
+        cancel: () => this.drop()
       },
       { highWaterMark: 0 }
     );
@@ -7983,8 +8011,14 @@ var BodyPipe = class {
   get full() {
     return this.size >= EMBEDDER_WINDOW;
   }
+  drop() {
+    this.dropped = true;
+    this.queue = [];
+    this.size = 0;
+    this.end();
+  }
   push(bytes) {
-    if (bytes.length === 0) return;
+    if (bytes.length === 0 || this.dropped) return;
     this.queue.push(bytes.slice());
     this.size += bytes.length;
     this.wake?.();
@@ -8000,6 +8034,30 @@ var BodyPipe = class {
     this.room?.();
   }
 };
+function endsWith(stream2, ended) {
+  const reader = stream2.getReader();
+  return new ReadableStream(
+    {
+      pull: async (controller) => {
+        let got;
+        try {
+          got = await reader.read();
+        } catch (err) {
+          ended();
+          throw err;
+        }
+        if (!got.done) return controller.enqueue(got.value);
+        ended();
+        controller.close();
+      },
+      cancel: (reason) => {
+        ended();
+        return reader.cancel(reason);
+      }
+    },
+    { highWaterMark: 0 }
+  );
+}
 function replyStream(reply) {
   if (reply instanceof ReadableStream) return reply;
   const bytes = typeof reply === "string" ? new TextEncoder().encode(reply) : reply instanceof Uint8Array ? reply : new Uint8Array(0);
@@ -8074,7 +8132,10 @@ var EmbedderChannel = class {
         signal: this.abort.signal,
         progress
       })
-    ).then((reply) => replyStream(reply).getReader());
+    ).then((reply) => {
+      if (!(reply instanceof ReadableStream)) body.drop();
+      return endsWith(replyStream(reply), () => body.drop()).getReader();
+    });
     this.replied = asked.catch((err) => {
       body.end();
       throw this.fail(err);
@@ -19149,6 +19210,7 @@ var SOCKET_OPS = [
   "sock-accept",
   "sock-connect",
   "sock-shutdown",
+  "sock-reset",
   "sock-name",
   "sock-getopt",
   "sock-setopt",
@@ -19216,6 +19278,9 @@ async function socketSyscall(req, proc) {
     case "sock-shutdown":
       anySocketAt(fds, req.fd).shutdown(req.how);
       return ok3();
+    case "sock-reset":
+      socketAt(fds, req.fd).resetOnClose();
+      return ok3();
     case "sock-name": {
       const socket = anySocketAt(fds, req.fd);
       const addr = req.peer ? socket.peer : socket.local;