@ai-ecoverse/slicc-kernel 1.149.0 → 1.150.0

package/dist/node-process-worker.js

@@ -7187,7 +7187,7 @@ var KERNEL_VERSION, OS_RELEASE;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    KERNEL_VERSION = true ? "1.149.0" : "0.0.0-dev";
+    KERNEL_VERSION = true ? "1.150.0" : "0.0.0-dev";
     OS_RELEASE = "6.0.0-slicc";
   }
 });

package/dist/node.js

@@ -843,12 +843,12 @@ var KernelPipe = class {
       await this.changed(signal);
     }
     const out = new Uint8Array(Math.min(max, this.size));
-    let filled = 0;
+    let filled2 = 0;
     for (const chunk2 of this.chunks) {
-      if (filled === out.length) break;
-      const count2 = Math.min(chunk2.length, out.length - filled);
-      out.set(chunk2.subarray(0, count2), filled);
-      filled += count2;
+      if (filled2 === out.length) break;
+      const count2 = Math.min(chunk2.length, out.length - filled2);
+      out.set(chunk2.subarray(0, count2), filled2);
+      filled2 += count2;
     }
     return out;
   }
@@ -876,12 +876,12 @@ var KernelPipe = class {
   }
   take(n) {
     const out = new Uint8Array(n);
-    let filled = 0;
-    while (filled < n) {
+    let filled2 = 0;
+    while (filled2 < n) {
       const head = this.chunks[0];
-      const count2 = Math.min(head.length, n - filled);
-      out.set(head.subarray(0, count2), filled);
-      filled += count2;
+      const count2 = Math.min(head.length, n - filled2);
+      out.set(head.subarray(0, count2), filled2);
+      filled2 += count2;
       if (count2 === head.length) this.chunks.shift();
       else this.chunks[0] = head.subarray(count2);
     }
@@ -1646,8 +1646,8 @@ var DIAL_ERRORS = [
   "ETIMEDOUT",
   "ECONNRESET"
 ];
-function dialError(e, timedOut, closed) {
-  if (timedOut) return new KernelError("ETIMEDOUT");
+function dialError(e, timedOut2, closed) {
+  if (timedOut2) return new KernelError("ETIMEDOUT");
   if (closed) return new KernelError("ECONNABORTED");
   const code = e?.code;
   const known = DIAL_ERRORS.find((errno3) => errno3 === code);
@@ -1902,7 +1902,7 @@ var KernelSocket = class _KernelSocket {
   get loopbackLinked() {
     return this.state === "connected" && !this.switch;
   }
-  async secureLink(make, signal = NEVER_ABORTED) {
+  async secureLink(make, signal = NEVER_ABORTED, keeps = () => false) {
     const raw2 = this.connection();
     if (this.switch || this.served || this.writeShut || this.readShut)
       throw new KernelError("EINVAL");
@@ -1924,14 +1924,18 @@ var KernelSocket = class _KernelSocket {
       }
     };
     let made2;
-    const abandon = () => view2.close();
+    const abandon = () => {
+      if (!keeps(signal.reason)) view2.close();
+    };
     signal.addEventListener("abort", abandon, { once: true });
     try {
       made2 = await make(view2);
     } catch (err) {
-      view2.close();
-      this.readShut = true;
-      this.writeShut = true;
+      if (!(signal.aborted && keeps(signal.reason))) {
+        view2.close();
+        this.readShut = true;
+        this.writeShut = true;
+      }
       this.changes.wake();
       throw signal.aborted ? signal.reason : err;
     } finally {
@@ -1955,9 +1959,9 @@ var KernelSocket = class _KernelSocket {
     this.state = "connecting";
     const abort = new AbortController();
     this.dialing = abort;
-    let timedOut = false;
+    let timedOut2 = false;
     const timer = setTimeout(() => {
-      timedOut = true;
+      timedOut2 = true;
       abort.abort(new KernelError("ETIMEDOUT"));
     }, route2.timeoutMs ?? DIAL_TIMEOUT_MS);
     const abandoned = new Promise((_, reject) => {
@@ -1973,7 +1977,7 @@ var KernelSocket = class _KernelSocket {
     );
     return Promise.race([dialled, abandoned]).then(
       async (raw2) => {
-        if (abort.signal.aborted) throw dialError(abort.signal.reason, timedOut, true);
+        if (abort.signal.aborted) throw dialError(abort.signal.reason, timedOut2, true);
         const conn = new SwitchConn(raw2);
         if (secure2) {
           clearTimeout(timer);
@@ -1999,7 +2003,7 @@ var KernelSocket = class _KernelSocket {
         );
       },
       (e) => {
-        throw this.dialFailed(abort, dialError(e, timedOut, abort.signal.aborted));
+        throw this.dialFailed(abort, dialError(e, timedOut2, abort.signal.aborted));
       }
     ).finally(() => clearTimeout(timer));
   }
@@ -3358,7 +3362,7 @@ function satisfies(version, range2) {
 }
 
 // src/version.ts
-var KERNEL_VERSION = true ? "1.149.0" : "0.0.0-dev";
+var KERNEL_VERSION = true ? "1.150.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
@@ -13691,8 +13695,8 @@ var HttpHandles = class {
         else entry.left = next3.value;
       } catch (e) {
         entry.done = true;
-        const timedOut = e?.code === "ETIMEDOUT";
-        return { ok: false, errno: timedOut ? "ETIMEDOUT" : "EIO", message: message2(e) };
+        const timedOut2 = e?.code === "ETIMEDOUT";
+        return { ok: false, errno: timedOut2 ? "ETIMEDOUT" : "EIO", message: message2(e) };
       }
     }
     const bytes = entry.left.subarray(0, Math.max(0, max));
@@ -14746,15 +14750,22 @@ async function tlsClient(conn, o, taken = new Uint8Array(0)) {
     throw err;
   }
 }
-async function serverHandshake(conn, session, inbox) {
+var HTTP_REQUEST = /^[A-Z]{3,10} [!-~]/;
+function serverRefusal(err, session, first) {
+  const opening2 = first ? new TextDecoder("latin1").decode(first.subarray(0, 16)) : "";
+  if (HTTP_REQUEST.test(opening2))
+    return new KernelError("EPROTO", "ERR_SSL_HTTP_REQUEST: http request");
+  const text = err instanceof TlsError ? err.message : String(err);
+  return new KernelError("EPROTO", `ERR_SSL_HANDSHAKE_FAILURE: ${text}${alertOf(session)}`);
+}
+async function serverHandshake(conn, session, inbox, first) {
   for (; ; ) {
     let done4;
     try {
       done4 = session.handshake();
     } catch (err) {
       await send(conn, session).catch(() => void 0);
-      const text = err instanceof TlsError ? err.message : String(err);
-      throw new KernelError("EPROTO", `ERR_SSL_HANDSHAKE_FAILURE: ${text}${alertOf(session)}`);
+      throw serverRefusal(err, session, first());
     }
     await send(conn, session);
     if (done4) return;
@@ -14767,9 +14778,18 @@ async function serverHandshake(conn, session, inbox) {
   }
 }
 async function tlsServer(conn, session, clientCerts) {
-  const inbox = new Ciphertext(conn, session);
+  let first;
+  const watched = {
+    ...conn,
+    read: async () => {
+      const bytes = await conn.read();
+      first ??= bytes ?? void 0;
+      return bytes;
+    }
+  };
+  const inbox = new Ciphertext(watched, session);
   try {
-    await serverHandshake(conn, session, inbox);
+    await serverHandshake(conn, session, inbox, () => first);
     const chain2 = session.peerChain();
     const code = clientCerts ? verifyCode(session.verifyResult) : void 0;
     const info = {
@@ -15239,6 +15259,7 @@ var RANK = {
 var CR2 = 13;
 var LF2 = 10;
 var EMPTY4 = new Uint8Array(0);
+var FILLER = 42;
 function register(automaton, sources, ids, bytes, source) {
   const key = Array.from(bytes).join(",");
   let id2 = ids.get(key);
@@ -15249,7 +15270,7 @@ function register(automaton, sources, ids, bytes, source) {
   }
   sources[id2].push(source);
 }
-function prepare(secrets) {
+function prepare(secrets, sameLength) {
   const main = new Automaton();
   const wrap = new Automaton();
   const sources = [];
@@ -15273,7 +15294,19 @@ function prepare(secrets) {
     utf82(secret.placeholder),
     utf82(`[redacted:${secret.name}]`)
   ]);
-  return { secrets, values, main, wrap, sources, wrapSources, replacements };
+  return { secrets, values, main, wrap, sources, wrapSources, replacements, sameLength };
+}
+function filled(input, start2, end) {
+  const out = new Uint8Array(end - start2);
+  for (let i = start2; i < end; i++) {
+    const byte = input[i];
+    out[i - start2] = byte === CR2 || byte === LF2 ? byte : FILLER;
+  }
+  return out;
+}
+function replacement(c, input, candidate) {
+  if (c.sameLength) return filled(input, candidate.start, candidate.end);
+  return c.replacements[candidate.secret][candidate.form === "raw" ? 0 : 1];
 }
 function better(a, b) {
   if (!b) return true;
@@ -15382,10 +15415,7 @@ function pass(c, input, final) {
       break;
     }
     const candidate = best.get(next3);
-    parts2.push(
-      input.subarray(pos, next3),
-      c.replacements[candidate.secret][candidate.form === "raw" ? 0 : 1]
-    );
+    parts2.push(input.subarray(pos, next3), replacement(c, input, candidate));
     count(c, hits, candidate);
     pos = candidate.end;
   }
@@ -15400,7 +15430,10 @@ function merge(into, from) {
   }
 }
 function compile(secrets, options = {}) {
-  const c = prepare(secrets.map((secret) => ({ ...secret })));
+  const c = prepare(
+    secrets.map((secret) => ({ ...secret })),
+    options.sameLength === true
+  );
   const decoder4 = new TextDecoder();
   const idleMs = options.idleMs ?? 250;
   const scrubBytes = (input) => {
@@ -17973,12 +18006,10 @@ function timeoutOf(req) {
     );
   return ms;
 }
+var timedOut = new KernelError("EPROTO", "ERR_TLS_HANDSHAKE_TIMEOUT: TLS handshake timeout");
 function handshakeSignal(proc, ms) {
   const timer = new AbortController();
-  const id2 = setTimeout(
-    () => timer.abort(new KernelError("EPROTO", "ERR_TLS_HANDSHAKE_TIMEOUT: TLS handshake timeout")),
-    ms
-  );
+  const id2 = setTimeout(() => timer.abort(timedOut), ms);
   return {
     signal: AbortSignal.any([handshakeAbort(proc), timer.signal]),
     done: () => clearTimeout(id2)
@@ -18036,7 +18067,8 @@ async function serveSecure(proc, socket, req) {
     const limit = handshakeSignal(proc, server.timeoutMs);
     const info = await socket.secureLink(
       (raw2) => tlsServer(raw2, engine.serverSession(leaf, alpn, store, flags2), flags2 !== 0),
-      limit.signal
+      limit.signal,
+      (reason) => !shared && reason === timedOut
     ).finally(limit.done);
     return {
       path: "kernel",
@@ -31209,10 +31241,11 @@ function serveTransport(peer, transport, { closeWaitMs = CLOSE_WAIT_MS3 } = {})
     const flow = {
       inflight: 0,
       closing: false,
+      dropped: false,
       deadline: () => AbortSignal.timeout(closeWaitMs).addEventListener("abort", late, { once: true })
     };
     credit.set(nid, flow);
-    const timedOut = { code: 1006, reason: "the far end did not answer the close" };
+    const timedOut2 = { code: 1006, reason: "the far end did not answer the close" };
     let oversize = false;
     try {
       const messages = socket.messages[Symbol.asyncIterator]();
@@ -31220,7 +31253,7 @@ function serveTransport(peer, transport, { closeWaitMs = CLOSE_WAIT_MS3 } = {})
         const next3 = await Promise.race([messages.next(), unanswered]);
         if (next3 === "late" || next3.done) break;
         const data = next3.value;
-        if (flow.closing) continue;
+        if (flow.dropped) continue;
         if (payloadSize(data) > MESSAGE_LIMIT) {
           oversize = true;
           break;
@@ -31238,7 +31271,7 @@ function serveTransport(peer, transport, { closeWaitMs = CLOSE_WAIT_MS3 } = {})
         }
       }
       if (oversize) socket.close(1e3, "a message is too big");
-      ending = oversize ? { code: 1009, reason: `a message is over ${MESSAGE_LIMIT} bytes` } : await Promise.race([socket.closed, unanswered.then(() => timedOut)]);
+      ending = oversize ? { code: 1009, reason: `a message is over ${MESSAGE_LIMIT} bytes` } : await Promise.race([socket.closed, unanswered.then(() => timedOut2)]);
     } catch (e) {
       socket.close(1e3, "the relay failed");
       ending = { code: 1011, reason: e instanceof Error ? e.message : String(e) };
@@ -31274,6 +31307,8 @@ function serveTransport(peer, transport, { closeWaitMs = CLOSE_WAIT_MS3 } = {})
   };
   const drop = (nid) => {
     sockets.get(nid)?.close(1e3, "cancelled");
+    const flow = credit.get(nid);
+    if (flow) flow.dropped = true;
     refill(nid, 0, true);
     const entry = open.get(nid);
     open.delete(nid);