dsh-interconnect 0.11.16 → 0.11.18

package/lib/tool-interconnect/index.js

@@ -838,6 +838,7 @@ var PLUGIN_SOURCE = "dsh-interconnect";
 var MAX_LINK_FRAME_BYTES = 1024 * 1024;
 var LINK_HANDSHAKE_TIMEOUT_MS = 1e4;
 var LINK_CHANNEL = "/interconnect/link";
+var MAX_INSTANCE_ID_CHARS = 256;
 var MAX_REQUEST_ID_CHARS = 256;
 var MAX_LISTED_SESSIONS = 100;
 var frameFitsLink = (frame) => Buffer.byteLength(JSON.stringify(frame), "utf8") <= MAX_LINK_FRAME_BYTES;
@@ -931,7 +932,7 @@ var linkFrameSchema = Schema.union([
 var InterconnectService = class extends Service {
   static inject = ["agents", "credentials"];
   static Config = Schema.object({
-    instanceId: Schema.string().default("dsh"),
+    instanceId: Schema.string().max(MAX_INSTANCE_ID_CHARS).default("dsh"),
     requestTimeoutMs: Schema.natural().max(6e4).default(1e4),
     peers: Schema.dict(Schema.string()).default({}),
     delivery: Schema.union([Schema.const("followup"), Schema.const("steer"), Schema.const("inject")]).default("followup"),
@@ -941,7 +942,6 @@ var InterconnectService = class extends Service {
   requestTimeoutMs;
   delivery;
   allowResume;
-  subscriptions = [];
   server = new WebSocketServer({ noServer: true, maxPayload: MAX_LINK_FRAME_BYTES });
   sockets = /* @__PURE__ */ new Set();
   /** Outbound peer links keyed by the peer's `instanceId`. */
@@ -951,6 +951,8 @@ var InterconnectService = class extends Service {
   peerOf = /* @__PURE__ */ new WeakMap();
   /** Configured peer an outbound dial owns a socket for; absent on inbound sockets. */
   dialedPeerOf = /* @__PURE__ */ new WeakMap();
+  /** Dialed sockets already reported as announcing an id other than their configured key. */
+  mismatchWarned = /* @__PURE__ */ new WeakSet();
   /** Sender each local session last received a send from, keyed by local session id. */
   senders = /* @__PURE__ */ new Map();
   /** In-flight frames sent over a peer link, keyed by `reqId`, awaiting a correlated result. */
@@ -998,28 +1000,28 @@ var InterconnectService = class extends Service {
         socket.ping();
       }
     }, 3e4);
-    this.subscriptions.push(ctx.on("agent/status", ({ agent, status }) => {
+    ctx.on("agent/status", ({ agent, status }) => {
       this.fanout({ kind: "agent/status", sessionId: String(agent.session.id), status });
-    }));
-    this.subscriptions.push(ctx.on("agent/created", ({ agent }) => {
+    });
+    ctx.on("agent/created", ({ agent }) => {
       this.fanout({ kind: "agent/created", sessionId: String(agent.session.id) });
-    }));
-    this.subscriptions.push(ctx.on("agent/disposed", ({ agent }) => {
+    });
+    ctx.on("agent/disposed", ({ agent }) => {
       this.fanout({ kind: "agent/disposed", sessionId: String(agent.session.id) });
-    }));
-    this.subscriptions.push(ctx.on("session/created", (session) => {
+    });
+    ctx.on("session/created", (session) => {
       const parentSessionId = session.header.parentSession === void 0 ? void 0 : String(session.header.parentSession);
       this.fanout({
         kind: "session/created",
         sessionId: String(session.id),
         ...parentSessionId === void 0 ? {} : { parentSessionId }
       });
-    }));
-    this.subscriptions.push(ctx.on("session/disposed", (session) => {
+    });
+    ctx.on("session/disposed", (session) => {
       this.senders.delete(String(session.id));
       this.fanout({ kind: "session/disposed", sessionId: String(session.id) });
-    }));
-    this.subscriptions.push(ctx.on("subagent/end", (info) => {
+    });
+    ctx.on("subagent/end", (info) => {
       if (!info.local) return;
       this.fanout({
         kind: "subagent/end",
@@ -1027,10 +1029,7 @@ var InterconnectService = class extends Service {
         childSessionId: String(info.id),
         stopReason: info.stopReason
       });
-    }));
-    ctx.effect(() => () => {
-      for (const dispose of this.subscriptions.splice(0)) dispose();
-    }, "interconnect: event subscriptions");
+    });
     ctx.effect(() => () => {
       if (this.heartbeatTimer !== void 0) clearInterval(this.heartbeatTimer);
       for (const state of this.linkStates.values()) state.close();
@@ -1220,10 +1219,12 @@ var InterconnectService = class extends Service {
    * dialed link plus the peer's inbound one), so one event must leave over one
    * of them. Which one is decided by local ownership, not by the peer: a dialed
    * socket is a configured peer's link and always sends. An inbound socket is
-   * skipped only when a dialed link to the id that socket itself announced is
-   * open, so an announcement can suppress nothing but a duplicate the
-   * controlled link already carries — an impostor cannot drop an event for a
-   * peer, and without a dialed link every inbound socket receives it.
+   * skipped only when this instance has an open dialed link configured under
+   * the id that socket itself announced, so a self-reported announcement can
+   * never silence another peer's link; with no such dialed link every inbound
+   * socket receives the event. A peer listed under a key other than the id it
+   * announces is warned about once per link, because then its own inbound
+   * socket is not attributable and the peer receives each event twice.
    *
    * That holds once a peer's announcement has been seen. Between this
    * instance's dialed link opening and the peer's `hello` arriving on its
@@ -1274,12 +1275,7 @@ var InterconnectService = class extends Service {
     if (query.kind === "ping") {
       result = { pong: true, instance: this.instanceId };
     } else if (query.kind === "list") {
-      const rowBudget = this.listRowsBudgetBytes(reqId);
-      if (rowBudget < 0) {
-        this.ctx.logger.warn("interconnect: list answer cannot fit the link frame cap; not answering");
-        return;
-      }
-      result = this.listSessions(rowBudget);
+      result = this.listSessions(this.listRowsBudgetBytes(reqId));
     } else {
       const payload = {
         sender: this.peerOf.get(socket) ?? "unknown-peer",
@@ -1311,10 +1307,11 @@ var InterconnectService = class extends Service {
    * Bytes one `list` answer may spend on its `sessions` rows: the frame cap
    * minus the serialized envelope that answer will carry. The envelope holds
    * the peer-supplied `reqId` and this instance's own id, so it is measured per
-   * answer instead of reserved with a fixed constant.
+   * answer instead of reserved with a fixed constant. Both ids are bounded
+   * ({@link MAX_REQUEST_ID_CHARS} and {@link MAX_INSTANCE_ID_CHARS} characters),
+   * so the envelope always fits and the budget is always positive.
    * @param reqId - the request id the answer has to echo.
-   * @returns the byte budget for the rows, negative when even an empty answer
-   * exceeds the cap and so cannot be sent at all.
+   * @returns the byte budget for the rows.
    */
   listRowsBudgetBytes(reqId) {
     const envelope = {
@@ -1579,6 +1576,13 @@ var InterconnectService = class extends Service {
     const frame = parsed;
     if (frame.type === "hello") {
       this.peerOf.set(socket, frame.sender);
+      const dialedPeer = this.dialedPeerOf.get(socket);
+      if (dialedPeer !== void 0 && dialedPeer !== frame.sender && !this.mismatchWarned.has(socket)) {
+        this.mismatchWarned.add(socket);
+        this.ctx.logger.warn(
+          `interconnect: peer configured as ${dialedPeer} announces ${frame.sender}; list a peer under the instanceId it announces, or the duplicate inbound link is not recognised`
+        );
+      }
       return;
     }
     if (frame.type === "event") {