dsh-interconnect 0.11.14 → 0.11.15

package/lib/tool-interconnect/index.js

@@ -838,8 +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 LIST_FRAME_ENVELOPE_BYTES = 4096;
-var MAX_LIST_ROWS_BYTES = MAX_LINK_FRAME_BYTES - LIST_FRAME_ENVELOPE_BYTES;
+var MAX_REQUEST_ID_CHARS = 256;
 var MAX_LISTED_SESSIONS = 100;
 var rowBytes = (row) => Buffer.byteLength(JSON.stringify(row), "utf8") + 1;
 var notificationSchema = Schema.union([
@@ -923,10 +922,10 @@ var msgResultSchema = Schema.union([
 var linkFrameSchema = Schema.union([
   Schema.object({ type: Schema.const("hello").required(), sender: Schema.string().required() }),
   Schema.object({ type: Schema.const("event").required(), notification: notificationSchema.required() }),
-  Schema.object({ type: Schema.const("msg").required(), reqId: Schema.string().required(), message: messageSchema.required() }),
-  Schema.object({ type: Schema.const("msg-result").required(), reqId: Schema.string().required(), result: msgResultSchema.required() }),
-  Schema.object({ type: Schema.const("query").required(), reqId: Schema.string().required(), query: querySchema.required() }),
-  Schema.object({ type: Schema.const("query-result").required(), reqId: Schema.string().required(), result: queryResultSchema.required() })
+  Schema.object({ type: Schema.const("msg").required(), reqId: Schema.string().max(MAX_REQUEST_ID_CHARS).required(), message: messageSchema.required() }),
+  Schema.object({ type: Schema.const("msg-result").required(), reqId: Schema.string().max(MAX_REQUEST_ID_CHARS).required(), result: msgResultSchema.required() }),
+  Schema.object({ type: Schema.const("query").required(), reqId: Schema.string().max(MAX_REQUEST_ID_CHARS).required(), query: querySchema.required() }),
+  Schema.object({ type: Schema.const("query-result").required(), reqId: Schema.string().max(MAX_REQUEST_ID_CHARS).required(), result: queryResultSchema.required() })
 ]);
 var InterconnectService = class extends Service {
   static inject = ["agents", "credentials"];
@@ -1266,7 +1265,12 @@ var InterconnectService = class extends Service {
     if (query.kind === "ping") {
       result = { pong: true, instance: this.instanceId };
     } else if (query.kind === "list") {
-      result = this.listSessions();
+      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);
     } else {
       const payload = {
         sender: this.peerOf.get(socket) ?? "unknown-peer",
@@ -1294,32 +1298,57 @@ var InterconnectService = class extends Service {
       this.ctx.logger.warn(`interconnect: listener for a ${notification.kind} event from ${sender} threw: ${detail}`);
     });
   }
+  /**
+   * 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.
+   * @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.
+   */
+  listRowsBudgetBytes(reqId) {
+    const envelope = {
+      type: "query-result",
+      reqId,
+      result: { sessions: [], instance: this.instanceId }
+    };
+    return MAX_LINK_FRAME_BYTES - Buffer.byteLength(JSON.stringify(envelope), "utf8");
+  }
   /**
    * Summarize the live local sessions so a sender can discover valid targets
    * instead of having to know a session id already. Only live agents are listed
-   * because `send` can reach exactly those, and the answer carries at most
-   * {@link MAX_LISTED_SESSIONS} rows so a large live set cannot push the
-   * `query-result` frame past the link's frame cap.
+   * because `send` can reach exactly those. The answer stops at
+   * {@link MAX_LISTED_SESSIONS} rows or at the row budget the answer's own
+   * envelope leaves, whichever comes first: that budget is what keeps the
+   * complete `query-result` frame inside the link's cap, because a title's
+   * length comes from the session-title projection's own bound rather than
+   * from anything this listing controls. A title that does not fit the
+   * remaining budget is dropped so its target stays listed; a row that does not
+   * fit even untitled ends the listing, which keeps the answer a prefix of the
+   * registration order instead of a set with gaps.
    *
    * Title and status are best-effort: the title projection is an optional
    * service, and a receiver without it still returns the ids. A projection that
    * throws degrades that one row rather than failing the whole listing, which
    * matches how the Host's own session listing treats its projection column.
+   * @param rowBudgetBytes - bytes the `sessions` rows may occupy, envelope excluded.
+   * @returns the bounded listing.
    */
-  listSessions() {
+  listSessions(rowBudgetBytes) {
     const reachable = this.ctx.agents.list().filter((agent) => !isSessionOwnedBySubagent(this.ctx, agent.session, agent));
     const sessions = [];
     let used = 0;
     for (const agent of reachable.slice(0, MAX_LISTED_SESSIONS)) {
       const row = this.sessionRow(agent);
       const sized = used + rowBytes(row);
-      if (sized > MAX_LIST_ROWS_BYTES) {
+      if (sized > rowBudgetBytes) {
         const untitled = {
           sessionId: row.sessionId,
           ...row.status === void 0 ? {} : { status: row.status }
         };
         const untitledSized = used + rowBytes(untitled);
-        if (untitledSized > MAX_LIST_ROWS_BYTES) break;
+        if (untitledSized > rowBudgetBytes) break;
         sessions.push(untitled);
         used = untitledSized;
         continue;