dsh-interconnect 0.11.2 → 0.11.4

package/dsh.plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-interconnect",
   "description": "Cross-instance message/event handoff for DeepSeek Harness (DSH): WebSocket link, model-facing tools, and companion skill.",
-  "version": "0.11.2",
+  "version": "0.11.4",
   "entry": {
     "name": "dsh-interconnect/interconnect",
     "inject": ["agents", "credentials"]

package/lib/index.js

@@ -853,14 +853,37 @@ var listResultSchema = Schema.object({
     status: Schema.string().required(false)
   })).required()
 });
-var acceptsQueryResult = (schema, result) => {
+var withoutNullFields = (value) => {
+  if (Array.isArray(value)) return value.map((item) => withoutNullFields(item));
+  if (value === null || typeof value !== "object") return value;
+  return Object.fromEntries(Object.entries(value).filter(([, field]) => field !== null).map(([key, field]) => [key, withoutNullFields(field)]));
+};
+var projectMsgResult = (result) => result.delivered ? { delivered: true, instance: result.instance, ...result.delivery === void 0 ? {} : { delivery: result.delivery } } : { delivered: false, instance: result.instance, reason: result.reason };
+var parseQueryResult = (schema, result) => {
   try {
     const [parsed] = Schema.resolve(result, schema, {});
-    return parsed !== void 0 && parsed !== null;
+    return parsed;
   } catch {
-    return false;
+    return void 0;
   }
 };
+var projectPingResult = (result) => {
+  const parsed = parseQueryResult(pingResultSchema, result);
+  return parsed === void 0 ? void 0 : { pong: true, instance: parsed.instance };
+};
+var projectListResult = (result) => {
+  const parsed = parseQueryResult(listResultSchema, result);
+  if (parsed === void 0) return void 0;
+  const rows = parsed.sessions;
+  return {
+    instance: parsed.instance,
+    sessions: rows.map((row) => ({
+      sessionId: row.sessionId,
+      ...row.title === void 0 || row.title === null ? {} : { title: row.title },
+      ...row.status === void 0 || row.status === null ? {} : { status: row.status }
+    }))
+  };
+};
 var queryResultSchema = Schema.union([
   pingResultSchema,
   listResultSchema,
@@ -1119,7 +1142,7 @@ var InterconnectService = class extends Service {
     const state = this.linkStates.get(instanceId);
     if (state === void 0 || !state.writable()) return void 0;
     const reqId = `q${++this.reqIdCounter}-${randomUUID()}`;
-    const accept = query.kind === "ping" ? (result) => acceptsQueryResult(pingResultSchema, result) : (result) => acceptsQueryResult(listResultSchema, result);
+    const accept = query.kind === "ping" ? projectPingResult : projectListResult;
     try {
       return await this.waitForResult(reqId, "query", (failure) => {
         const wrote = state.sendFrame({ type: "query", reqId, query });
@@ -1136,16 +1159,12 @@ var InterconnectService = class extends Service {
         this.pendingMessages.delete(reqId);
         reject(new Error(`interconnect: no result for ${reqId} within ${this.requestTimeoutMs}ms`));
       }, this.requestTimeoutMs);
-      this.pendingMessages.set(reqId, {
-        timer,
-        kind,
-        ...accept === void 0 ? {} : { accept },
-        resolve: (result) => {
-          clearTimeout(timer);
-          this.pendingMessages.delete(reqId);
-          resolve2(result);
-        }
-      });
+      const settle = (result) => {
+        clearTimeout(timer);
+        this.pendingMessages.delete(reqId);
+        resolve2(result);
+      };
+      this.pendingMessages.set(reqId, kind === "query" ? { timer, kind, accept, resolve: settle } : { timer, kind, resolve: settle });
       send((error) => {
         clearTimeout(timer);
         this.pendingMessages.delete(reqId);
@@ -1200,7 +1219,7 @@ var InterconnectService = class extends Service {
         this.attachSocket(socket);
       },
       this.ctx.logger,
-      () => this.resolveTokenForDial(),
+      () => this.resolveToken(),
       instanceId,
       trimBase(origin)
     );
@@ -1389,8 +1408,18 @@ var InterconnectService = class extends Service {
     const credential = await this.ctx.credentials.resolve(credentialRef(INTERCONNECT_TOKEN_REF));
     return credential === void 0 || credential.value.length === 0 ? void 0 : credential.value;
   }
-  resolveTokenForDial() {
-    return this.resolveToken();
+  /**
+   * Answer one refused upgrade and close its socket. `socket.end()` alone only
+   * half-closes the connection: a client that keeps its own writing side open
+   * (a socket created with `allowHalfOpen`) leaves the connection live, and a
+   * refused socket never enters the link pool, so nothing else would reap it.
+   * @param socket - the refused upgrade socket.
+   * @param response - the complete HTTP response sent to the client.
+   */
+  refuseUpgrade(socket, response) {
+    socket.end(response, () => {
+      socket.destroy();
+    });
   }
   /** Inbound WebSocket upgrade: authenticate the bearer header, then accept. */
   async handleUpgrade(req, socket, head) {
@@ -1399,21 +1428,21 @@ var InterconnectService = class extends Service {
       token = await this.resolveToken();
     } catch (error) {
       this.ctx.logger.warn(`interconnect: upgrade token read failed: ${error instanceof Error ? error.message : String(error)}`);
-      socket.end("HTTP/1.1 403 Forbidden\r\nConnection: close\r\nContent-Length: 9\r\n\r\nforbidden");
+      this.refuseUpgrade(socket, "HTTP/1.1 403 Forbidden\r\nConnection: close\r\nContent-Length: 9\r\n\r\nforbidden");
       return;
     }
     if (token === void 0) {
-      socket.end("HTTP/1.1 403 Forbidden\r\nConnection: close\r\nContent-Length: 9\r\n\r\nforbidden");
+      this.refuseUpgrade(socket, "HTTP/1.1 403 Forbidden\r\nConnection: close\r\nContent-Length: 9\r\n\r\nforbidden");
       return;
     }
     if (this.disposed) {
-      socket.end("HTTP/1.1 503 Service Unavailable\r\nConnection: close\r\nContent-Length: 11\r\n\r\nunavailable");
+      this.refuseUpgrade(socket, "HTTP/1.1 503 Service Unavailable\r\nConnection: close\r\nContent-Length: 11\r\n\r\nunavailable");
       return;
     }
     const expected = `Bearer ${token}`;
     const header = req.headers.authorization;
     if (header === void 0 || !timingSafeEqual(header, expected)) {
-      socket.end("HTTP/1.1 401 Unauthorized\r\nConnection: close\r\nContent-Length: 12\r\n\r\nunauthorized");
+      this.refuseUpgrade(socket, "HTTP/1.1 401 Unauthorized\r\nConnection: close\r\nContent-Length: 12\r\n\r\nunauthorized");
       return;
     }
     this.server.handleUpgrade(req, socket, head, (websocket) => {
@@ -1458,7 +1487,7 @@ var InterconnectService = class extends Service {
     const text = typeof data === "string" ? data : Array.isArray(data) ? Buffer.concat(data).toString("utf8") : Buffer.isBuffer(data) ? data.toString("utf8") : Buffer.from(data).toString("utf8");
     let parsed;
     try {
-      parsed = Schema.resolve(JSON.parse(text), linkFrameSchema, {})[0];
+      parsed = withoutNullFields(Schema.resolve(JSON.parse(text), linkFrameSchema, {})[0]);
     } catch {
       this.ctx.logger.warn("interconnect: dropping malformed link frame");
       return;
@@ -1488,15 +1517,15 @@ var InterconnectService = class extends Service {
       const pending = this.pendingMessages.get(frame.reqId);
       if (pending !== void 0 && pending.kind === "msg") {
         ;
-        pending.resolve?.(frame.result);
+        pending.resolve?.(projectMsgResult(frame.result));
       }
       return;
     }
     if (frame.type === "query-result") {
       const pending = this.pendingMessages.get(frame.reqId);
-      if (pending !== void 0 && pending.kind === "query" && (pending.accept === void 0 || pending.accept(frame.result))) {
-        ;
-        pending.resolve?.(frame.result);
+      if (pending !== void 0 && pending.kind === "query") {
+        const answer = pending.accept(frame.result);
+        if (answer !== void 0) pending.resolve?.(answer);
       }
       return;
     }

package/lib/interconnect/index.js

@@ -853,14 +853,37 @@ var listResultSchema = Schema.object({
     status: Schema.string().required(false)
   })).required()
 });
-var acceptsQueryResult = (schema, result) => {
+var withoutNullFields = (value) => {
+  if (Array.isArray(value)) return value.map((item) => withoutNullFields(item));
+  if (value === null || typeof value !== "object") return value;
+  return Object.fromEntries(Object.entries(value).filter(([, field]) => field !== null).map(([key, field]) => [key, withoutNullFields(field)]));
+};
+var projectMsgResult = (result) => result.delivered ? { delivered: true, instance: result.instance, ...result.delivery === void 0 ? {} : { delivery: result.delivery } } : { delivered: false, instance: result.instance, reason: result.reason };
+var parseQueryResult = (schema, result) => {
   try {
     const [parsed] = Schema.resolve(result, schema, {});
-    return parsed !== void 0 && parsed !== null;
+    return parsed;
   } catch {
-    return false;
+    return void 0;
   }
 };
+var projectPingResult = (result) => {
+  const parsed = parseQueryResult(pingResultSchema, result);
+  return parsed === void 0 ? void 0 : { pong: true, instance: parsed.instance };
+};
+var projectListResult = (result) => {
+  const parsed = parseQueryResult(listResultSchema, result);
+  if (parsed === void 0) return void 0;
+  const rows = parsed.sessions;
+  return {
+    instance: parsed.instance,
+    sessions: rows.map((row) => ({
+      sessionId: row.sessionId,
+      ...row.title === void 0 || row.title === null ? {} : { title: row.title },
+      ...row.status === void 0 || row.status === null ? {} : { status: row.status }
+    }))
+  };
+};
 var queryResultSchema = Schema.union([
   pingResultSchema,
   listResultSchema,
@@ -1119,7 +1142,7 @@ var InterconnectService = class extends Service {
     const state = this.linkStates.get(instanceId);
     if (state === void 0 || !state.writable()) return void 0;
     const reqId = `q${++this.reqIdCounter}-${randomUUID()}`;
-    const accept = query.kind === "ping" ? (result) => acceptsQueryResult(pingResultSchema, result) : (result) => acceptsQueryResult(listResultSchema, result);
+    const accept = query.kind === "ping" ? projectPingResult : projectListResult;
     try {
       return await this.waitForResult(reqId, "query", (failure) => {
         const wrote = state.sendFrame({ type: "query", reqId, query });
@@ -1136,16 +1159,12 @@ var InterconnectService = class extends Service {
         this.pendingMessages.delete(reqId);
         reject(new Error(`interconnect: no result for ${reqId} within ${this.requestTimeoutMs}ms`));
       }, this.requestTimeoutMs);
-      this.pendingMessages.set(reqId, {
-        timer,
-        kind,
-        ...accept === void 0 ? {} : { accept },
-        resolve: (result) => {
-          clearTimeout(timer);
-          this.pendingMessages.delete(reqId);
-          resolve2(result);
-        }
-      });
+      const settle = (result) => {
+        clearTimeout(timer);
+        this.pendingMessages.delete(reqId);
+        resolve2(result);
+      };
+      this.pendingMessages.set(reqId, kind === "query" ? { timer, kind, accept, resolve: settle } : { timer, kind, resolve: settle });
       send((error) => {
         clearTimeout(timer);
         this.pendingMessages.delete(reqId);
@@ -1200,7 +1219,7 @@ var InterconnectService = class extends Service {
         this.attachSocket(socket);
       },
       this.ctx.logger,
-      () => this.resolveTokenForDial(),
+      () => this.resolveToken(),
       instanceId,
       trimBase(origin)
     );
@@ -1389,8 +1408,18 @@ var InterconnectService = class extends Service {
     const credential = await this.ctx.credentials.resolve(credentialRef(INTERCONNECT_TOKEN_REF));
     return credential === void 0 || credential.value.length === 0 ? void 0 : credential.value;
   }
-  resolveTokenForDial() {
-    return this.resolveToken();
+  /**
+   * Answer one refused upgrade and close its socket. `socket.end()` alone only
+   * half-closes the connection: a client that keeps its own writing side open
+   * (a socket created with `allowHalfOpen`) leaves the connection live, and a
+   * refused socket never enters the link pool, so nothing else would reap it.
+   * @param socket - the refused upgrade socket.
+   * @param response - the complete HTTP response sent to the client.
+   */
+  refuseUpgrade(socket, response) {
+    socket.end(response, () => {
+      socket.destroy();
+    });
   }
   /** Inbound WebSocket upgrade: authenticate the bearer header, then accept. */
   async handleUpgrade(req, socket, head) {
@@ -1399,21 +1428,21 @@ var InterconnectService = class extends Service {
       token = await this.resolveToken();
     } catch (error) {
       this.ctx.logger.warn(`interconnect: upgrade token read failed: ${error instanceof Error ? error.message : String(error)}`);
-      socket.end("HTTP/1.1 403 Forbidden\r\nConnection: close\r\nContent-Length: 9\r\n\r\nforbidden");
+      this.refuseUpgrade(socket, "HTTP/1.1 403 Forbidden\r\nConnection: close\r\nContent-Length: 9\r\n\r\nforbidden");
       return;
     }
     if (token === void 0) {
-      socket.end("HTTP/1.1 403 Forbidden\r\nConnection: close\r\nContent-Length: 9\r\n\r\nforbidden");
+      this.refuseUpgrade(socket, "HTTP/1.1 403 Forbidden\r\nConnection: close\r\nContent-Length: 9\r\n\r\nforbidden");
       return;
     }
     if (this.disposed) {
-      socket.end("HTTP/1.1 503 Service Unavailable\r\nConnection: close\r\nContent-Length: 11\r\n\r\nunavailable");
+      this.refuseUpgrade(socket, "HTTP/1.1 503 Service Unavailable\r\nConnection: close\r\nContent-Length: 11\r\n\r\nunavailable");
       return;
     }
     const expected = `Bearer ${token}`;
     const header = req.headers.authorization;
     if (header === void 0 || !timingSafeEqual(header, expected)) {
-      socket.end("HTTP/1.1 401 Unauthorized\r\nConnection: close\r\nContent-Length: 12\r\n\r\nunauthorized");
+      this.refuseUpgrade(socket, "HTTP/1.1 401 Unauthorized\r\nConnection: close\r\nContent-Length: 12\r\n\r\nunauthorized");
       return;
     }
     this.server.handleUpgrade(req, socket, head, (websocket) => {
@@ -1458,7 +1487,7 @@ var InterconnectService = class extends Service {
     const text = typeof data === "string" ? data : Array.isArray(data) ? Buffer.concat(data).toString("utf8") : Buffer.isBuffer(data) ? data.toString("utf8") : Buffer.from(data).toString("utf8");
     let parsed;
     try {
-      parsed = Schema.resolve(JSON.parse(text), linkFrameSchema, {})[0];
+      parsed = withoutNullFields(Schema.resolve(JSON.parse(text), linkFrameSchema, {})[0]);
     } catch {
       this.ctx.logger.warn("interconnect: dropping malformed link frame");
       return;
@@ -1488,15 +1517,15 @@ var InterconnectService = class extends Service {
       const pending = this.pendingMessages.get(frame.reqId);
       if (pending !== void 0 && pending.kind === "msg") {
         ;
-        pending.resolve?.(frame.result);
+        pending.resolve?.(projectMsgResult(frame.result));
       }
       return;
     }
     if (frame.type === "query-result") {
       const pending = this.pendingMessages.get(frame.reqId);
-      if (pending !== void 0 && pending.kind === "query" && (pending.accept === void 0 || pending.accept(frame.result))) {
-        ;
-        pending.resolve?.(frame.result);
+      if (pending !== void 0 && pending.kind === "query") {
+        const answer = pending.accept(frame.result);
+        if (answer !== void 0) pending.resolve?.(answer);
       }
       return;
     }