@ai-ecoverse/slicc-kernel 1.102.3 → 1.102.5

package/README.md

@@ -389,7 +389,7 @@ const kernel = await createKernel({ network: { transport: fetchTransport() } });
 await kernel.run(['curl', '-sS', 'https://registry.npmjs.org/@ai-ecoverse/wasm-bash/latest']);
 ```
 
-- **Sockets**: `AF_INET` stream sockets on `127.x` and `AF_UNIX` sockets are kernel descriptors on one loopback network per kernel, so processes can serve and connect to each other. They survive `dup`, `fork` and `exec` and work with `select`, `poll` and WASIX epoll, like pipe ends. A bind of an `AF_UNIX` socket creates its path in OPFS. Other addresses are unreachable (`ENETUNREACH`) unless the [uplink](#uplink) routes them: otherwise programs reach the outside world only through the proxy.
+- **Sockets**: `AF_INET` stream sockets on `127.x` and `AF_UNIX` sockets are kernel descriptors on one loopback network per kernel, so processes can serve and connect to each other. They survive `dup`, `fork` and `exec` and work with `select`, `poll` and WASIX epoll, like pipe ends. A bind of an `AF_UNIX` socket creates its path in OPFS. A program's `connect` to a listener whose accept queue is full waits for a slot, as on Linux, instead of failing. A blocking connect waits, and a nonblocking one answers `EINPROGRESS` and turns writable once it's queued. After 30 s it fails with `ETIMEDOUT`, and it's `ECONNREFUSED` if the listener closes. Other addresses are unreachable (`ENETUNREACH`) unless the [uplink](#uplink) routes them: otherwise programs reach the outside world only through the proxy.
 
 #### Datagram sockets (UDP)
 

package/dist/kernel-worker.js

@@ -3564,6 +3564,7 @@ var KernelSocket = class _KernelSocket {
   backlog = 0;
   boundAt;
   changes = new Changes();
+  room = new Changes();
   options = /* @__PURE__ */ new Map();
   constructor(net, domain) {
     this.net = net;
@@ -3648,7 +3649,10 @@ var KernelSocket = class _KernelSocket {
     for (; ; ) {
       if (this.state !== "listening") throw new KernelError("EINVAL");
       const next2 = this.queue.shift();
-      if (next2) return next2;
+      if (next2) {
+        this.room.wake();
+        return next2;
+      }
       if (nonblock) throw new KernelError("EAGAIN");
       await this.changes.wait(signal);
     }
@@ -3659,7 +3663,13 @@ var KernelSocket = class _KernelSocket {
     this.changes.wake();
     return true;
   }
-  connect(addr, viaUplink = true, cred, stamp) {
+  get full() {
+    return this.state === "listening" && this.queue.length >= this.backlog;
+  }
+  waitRoom(signal) {
+    return this.room.wait(signal);
+  }
+  connect(addr, viaUplink = true, cred, stamp, waits = true) {
     if (this.state === "connected") throw new KernelError("EISCONN");
     if (this.state === "connecting") throw new KernelError("EALREADY");
     if (this.state !== "open") throw new KernelError("EINVAL");
@@ -3674,6 +3684,11 @@ var KernelSocket = class _KernelSocket {
         this.boundAt = this.local;
       } else this.local = { family: "unix", path: "" };
     }
+    if (waits && target.full) return this.queued(addr, target, cred, stamp);
+    this.join(addr, target, cred, stamp);
+    return void 0;
+  }
+  join(addr, target, cred, stamp) {
     const server = new _KernelSocket(this.net, this.domain);
     server.local = addr.family === "inet" ? { ...addr, host: canonicalHost(addr.host) } : addr;
     server.peer = this.local;
@@ -3687,7 +3702,34 @@ var KernelSocket = class _KernelSocket {
       server.close();
       throw new KernelError("ECONNREFUSED");
     }
-    return void 0;
+  }
+  async queued(addr, target, cred, stamp) {
+    this.state = "connecting";
+    const abort = new AbortController();
+    this.dialing = abort;
+    const timer = setTimeout(
+      () => abort.abort(new KernelError("ETIMEDOUT")),
+      this.net.backlogWaitMs
+    );
+    try {
+      while (target.full) await target.waitRoom(abort.signal);
+      if (abort.signal.aborted) throw abort.signal.reason;
+      this.state = "open";
+      this.join(addr, target, cred, stamp);
+      this.dialing = void 0;
+    } catch (e) {
+      const reason = abort.signal.aborted ? abort.signal.reason : e;
+      const error = reason instanceof KernelError ? reason : new KernelError("ECONNREFUSED");
+      if (this.dialing === abort) {
+        this.dialing = void 0;
+        this.failed = error.code;
+        if (this.state === "connecting") this.state = "open";
+        this.changes.wake();
+      }
+      throw error;
+    } finally {
+      clearTimeout(timer);
+    }
   }
   dial(addr, route) {
     this.state = "connecting";
@@ -3788,6 +3830,7 @@ var KernelSocket = class _KernelSocket {
     this.dialing = void 0;
     if (was === "listening") {
       for (const pending of this.queue.splice(0)) pending.close();
+      this.room.wake();
     }
     if (this.link) {
       if (!this.readShut) this.link.rx.closeRead();
@@ -3885,9 +3928,10 @@ var LoopbackNet = class {
     socket.listen(backlog);
     return socket;
   }
+  backlogWaitMs = DIAL_TIMEOUT_MS;
   connect(addr) {
     const socket = this.socket(addr.family);
-    void socket.connect(addr, false);
+    void socket.connect(addr, false, void 0, void 0, false);
     return socket;
   }
   bind(socket, addr, kernel = false) {
@@ -8273,7 +8317,8 @@ var GEN = 0;
 var RING = 1;
 var RING_SIZE = 4096;
 var SLOT = 2;
-var CHANGES_BYTES = (RING + RING_SIZE * SLOT) * 4;
+var DIRTY = RING + RING_SIZE * SLOT;
+var CHANGES_BYTES = (DIRTY + 1) * 4;
 function changeHash(path) {
   let h = 2166136261;
   for (let i = 0; i < path.length; i++) {
@@ -8298,6 +8343,9 @@ var FileChanges = class {
     this.sab = sab;
     this.view = new Int32Array(sab);
   }
+  dirtied(delta) {
+    Atomics.add(this.view, DIRTY, delta);
+  }
   publish(...paths) {
     for (const path of paths) {
       const g = Atomics.add(this.view, GEN, 1) + 1 | 0;
@@ -12136,7 +12184,7 @@ var PATH_OPS = new Set(SYNC_FS_OPS);
 var EARLY_WHOLE_FILE = 64 * 1024;
 
 // src/version.ts
-var KERNEL_VERSION = true ? "1.102.3" : "0.0.0-dev";
+var KERNEL_VERSION = true ? "1.102.5" : "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
@@ -13391,7 +13439,8 @@ var KernelLoopback = class {
         { family: "inet", host: "127.0.0.1", port },
         false,
         this.cred(),
-        this.stamp ? await this.stamp() : void 0
+        this.stamp ? await this.stamp() : void 0,
+        false
       );
     } catch (err) {
       socket.close();
@@ -15017,6 +15066,15 @@ var VfsNode = class {
   orphaned;
   id;
   onDirty;
+  onDirtyState;
+  counted = false;
+  recount() {
+    if (!this.onDirtyState) return;
+    const on = this.dirty && !this.orphaned;
+    if (on === this.counted) return;
+    this.counted = on;
+    this.onDirtyState?.(on);
+  }
   constructor(fs, path, contents2, orphaned = false, dirty = false, pin) {
     this.fs = fs;
     this.pin = pin;
@@ -15166,6 +15224,7 @@ var VfsNode = class {
   }
   markDirty() {
     this.dirty = true;
+    this.recount();
     if (!this.orphaned) this.onDirty?.();
     if (this.writeBack !== void 0 || this.orphaned) return;
     const delay = Math.max(WRITEBACK_MS, this.writeBackCost * WRITEBACK_COST_FACTOR);
@@ -15193,6 +15252,8 @@ var VfsNode = class {
     } catch (err) {
       this.dirty = true;
       throw err;
+    } finally {
+      this.recount();
     }
     this.writeBackCost = performance.now() - started;
   }
@@ -15203,6 +15264,7 @@ var VfsNodes = class {
   byId = /* @__PURE__ */ new Map();
   keepsOnDisk = false;
   changed;
+  dirtied;
   fs;
   entries;
   onClosed;
@@ -15286,6 +15348,7 @@ var VfsNodes = class {
   }
   orphan(node) {
     node.orphaned = true;
+    node.recount();
     this.forget(node);
   }
   dropName(path, node) {
@@ -15340,6 +15403,8 @@ var VfsNodes = class {
   create(path, id2, node) {
     this.reshaped();
     node.onDirty = () => this.changed?.(node.path);
+    node.onDirtyState = (on) => this.dirtied?.(on ? 1 : -1);
+    node.recount();
     this.byPath.set(path, node);
     if (id2 !== void 0) this.know(node, id2);
     return node;
@@ -22556,6 +22621,7 @@ var Launcher = class {
   }
   processChain(fs, nodes, unlinked) {
     nodes.changed = (path) => this.changes.publish(path);
+    nodes.dirtied = (delta) => this.changes.dirtied(delta);
     return unlinked.wrap(keepingOpen(fs, nodes, (path) => this.changes.publish(path)));
   }
   async starting(argv, dir, account, tag) {