@ai-ecoverse/mcpcat 0.29.0 → 0.29.1

package/dist/host/mcpcat.mjs

@@ -8560,6 +8560,17 @@ function within(promise, ms) {
   });
   return Promise.race([promise, stale]).finally(() => clearTimeout(timer));
 }
+function idleClock(onMessage, idleMs) {
+  let deadline = Date.now() + idleMs;
+  return {
+    left: () => Math.max(0, deadline - Date.now()),
+    onMessage: async (method, params) => {
+      const out = await onMessage(method, params);
+      deadline = Date.now() + idleMs;
+      return out;
+    }
+  };
+}
 async function dispatchStreamData(data, id, onMessage, verbose, rpcError5) {
   let msg;
   try {
@@ -8852,18 +8863,19 @@ async function readEventStream(res, id, onMessage, idleMs, t) {
   const reader = res.body.getReader();
   const decoder3 = new TextDecoder();
   const parse = createSseParser();
+  const clock = idleClock(onMessage, idleMs);
   try {
     for (; ; ) {
       let chunk;
       try {
-        chunk = await within(reader.read(), idleMs);
+        chunk = await within(reader.read(), clock.left());
       } catch {
         return t.externalSignal?.aborted ? "aborted" : "dropped";
       }
       if (chunk === STALE) return "stale";
       if (chunk.done) return "dropped";
       for (const data of parse(decoder3.decode(chunk.value, { stream: true }))) {
-        const end = await dispatchStreamData(data, id, onMessage, t.verbose, rpcError);
+        const end = await dispatchStreamData(data, id, clock.onMessage, t.verbose, rpcError);
         if (end) return end;
       }
     }
@@ -9344,8 +9356,9 @@ function createStdioJsonRpc(proc, platform2, options) {
     const body = wireBody(id, method, params);
     if (verbose?.enabled) verbose.request(method, body);
     await send(body);
+    const clock = idleClock(onMessage, streamOptions.idleMs);
     for (; ; ) {
-      const line = await nextLine(streamOptions.idleMs, signals);
+      const line = await nextLine(clock.left(), signals);
       if (line === ABORTED) {
         await cancel(id, "interrupted");
         return "aborted";
@@ -9354,7 +9367,7 @@ function createStdioJsonRpc(proc, platform2, options) {
         await cancel(id, "no heartbeat");
         return "stale";
       }
-      const end = await dispatchStreamData(line, id, onMessage, verbose, rpcError2);
+      const end = await dispatchStreamData(line, id, clock.onMessage, verbose, rpcError2);
       if (end === "stopped") await cancel(id, "done");
       if (end) return end;
     }
@@ -17355,6 +17368,7 @@ var POLL_FLOOR_MS = 1e3;
 var BACKOFF_START_MS = 500;
 var BACKOFF_MAX_MS = 3e4;
 var SEEN_LIMIT = 256;
+var HANDLER_GRACE_MS = 2e3;
 var FORBIDDEN = -32024;
 var EVENTS_VALUE_FLAGS = /* @__PURE__ */ new Set([
   "-H",
@@ -17646,13 +17660,12 @@ var Subscriber = class {
   seen = [];
   seenSet = /* @__PURE__ */ new Set();
   delivered = 0;
-  handlerProc;
   o;
   constructor(options) {
     this.o = options;
   }
   async start() {
-    const { args: args2, platform: platform2, signal } = this.o;
+    const { args: args2, platform: platform2 } = this.o;
     if (args2.cursorFile) {
       const state = await loadCursorFile(platform2, args2.cursorFile);
       this.cursor = state.cursor;
@@ -17661,18 +17674,8 @@ var Subscriber = class {
     }
     if (args2.sinceNow) this.cursor = null;
     if (args2.cursor !== void 0) this.cursor = args2.cursor;
-    const onAbort = () => {
-      const proc = this.handlerProc;
-      if (proc) void Promise.resolve(proc.kill("SIGTERM")).catch(() => {
-      });
-    };
-    signal.addEventListener("abort", onAbort, { once: true });
-    try {
-      const mode = pickDelivery(this.o.event, args2.delivery);
-      return mode === "push" ? await this.push() : await this.poll();
-    } finally {
-      signal.removeEventListener("abort", onAbort);
-    }
+    const mode = pickDelivery(this.o.event, args2.delivery);
+    return mode === "push" ? await this.push() : await this.poll();
   }
   notice(text) {
     if (this.o.args.silent) return Promise.resolve();
@@ -17690,7 +17693,7 @@ var Subscriber = class {
   }
   async persist(force = false) {
     const path = this.o.args.cursorFile;
-    if (!path || !force && this.persisted === this.cursor) return;
+    if (!path || this.o.signal.aborted || !force && this.persisted === this.cursor) return;
     const body = JSON.stringify({
       event: this.o.event.name,
       cursor: this.cursor,
@@ -17711,6 +17714,7 @@ var Subscriber = class {
     await this.persist();
   }
   async deliver(occurrence, cursor) {
+    if (this.o.signal.aborted) return;
     const id = typeof occurrence.eventId === "string" ? occurrence.eventId : void 0;
     if (id !== void 0 && this.seenSet.has(id)) {
       if (cursor !== void 0) await this.moveTo(cursor, false);
@@ -17723,7 +17727,7 @@ var Subscriber = class {
     await this.persist(true);
   }
   async handle(occurrence) {
-    const { platform: platform2, args: args2 } = this.o;
+    const { platform: platform2, args: args2, signal } = this.o;
     const line = `${sanitizeJson(JSON.stringify(occurrence))}
 `;
     if (!args2.handler) {
@@ -17743,7 +17747,9 @@ var Subscriber = class {
     } catch (err) {
       throw new McpcatError(EXIT_USAGE, `cannot run ${args2.handler[0]}: ${err.message}`);
     }
-    this.handlerProc = proc;
+    const stop = () => void reap(proc, HANDLER_GRACE_MS);
+    if (signal.aborted) stop();
+    else signal.addEventListener("abort", stop, { once: true });
     const feed = async () => {
       const writer = proc.stdin.getWriter();
       try {
@@ -17772,12 +17778,12 @@ var Subscriber = class {
         pipe(proc.stderr, 2),
         proc.wait()
       ]);
-      if (status.status !== 0 && !this.o.signal.aborted) {
+      if (status.status !== 0 && !signal.aborted) {
         const how = status.signal ? `was killed by ${status.signal}` : `exited ${status.status}`;
         await this.notice(`${args2.handler[0]} ${how} for event ${String(occurrence.eventId)}`);
       }
     } finally {
-      this.handlerProc = void 0;
+      signal.removeEventListener("abort", stop);
     }
   }
   async backoff(delay, reason, verb = "retrying") {
@@ -20578,5 +20584,5 @@ try {
   });
 } catch {
 }
-var code = await run(platform, "0.29.0", args);
+var code = await run(platform, "0.29.1", args);
 process.exit(code);

package/dist/kernel/mcpcat.mjs

@@ -8181,6 +8181,17 @@ function within(promise, ms) {
   });
   return Promise.race([promise, stale]).finally(() => clearTimeout(timer));
 }
+function idleClock(onMessage, idleMs) {
+  let deadline = Date.now() + idleMs;
+  return {
+    left: () => Math.max(0, deadline - Date.now()),
+    onMessage: async (method, params) => {
+      const out = await onMessage(method, params);
+      deadline = Date.now() + idleMs;
+      return out;
+    }
+  };
+}
 async function dispatchStreamData(data, id, onMessage, verbose, rpcError5) {
   let msg;
   try {
@@ -8473,18 +8484,19 @@ async function readEventStream(res, id, onMessage, idleMs, t) {
   const reader = res.body.getReader();
   const decoder3 = new TextDecoder();
   const parse = createSseParser();
+  const clock = idleClock(onMessage, idleMs);
   try {
     for (; ; ) {
       let chunk;
       try {
-        chunk = await within(reader.read(), idleMs);
+        chunk = await within(reader.read(), clock.left());
       } catch {
         return t.externalSignal?.aborted ? "aborted" : "dropped";
       }
       if (chunk === STALE) return "stale";
       if (chunk.done) return "dropped";
       for (const data of parse(decoder3.decode(chunk.value, { stream: true }))) {
-        const end = await dispatchStreamData(data, id, onMessage, t.verbose, rpcError);
+        const end = await dispatchStreamData(data, id, clock.onMessage, t.verbose, rpcError);
         if (end) return end;
       }
     }
@@ -8965,8 +8977,9 @@ function createStdioJsonRpc(proc, platform2, options) {
     const body = wireBody(id, method, params);
     if (verbose?.enabled) verbose.request(method, body);
     await send(body);
+    const clock = idleClock(onMessage, streamOptions.idleMs);
     for (; ; ) {
-      const line = await nextLine(streamOptions.idleMs, signals);
+      const line = await nextLine(clock.left(), signals);
       if (line === ABORTED) {
         await cancel(id, "interrupted");
         return "aborted";
@@ -8975,7 +8988,7 @@ function createStdioJsonRpc(proc, platform2, options) {
         await cancel(id, "no heartbeat");
         return "stale";
       }
-      const end = await dispatchStreamData(line, id, onMessage, verbose, rpcError2);
+      const end = await dispatchStreamData(line, id, clock.onMessage, verbose, rpcError2);
       if (end === "stopped") await cancel(id, "done");
       if (end) return end;
     }
@@ -16872,6 +16885,7 @@ var POLL_FLOOR_MS = 1e3;
 var BACKOFF_START_MS = 500;
 var BACKOFF_MAX_MS = 3e4;
 var SEEN_LIMIT = 256;
+var HANDLER_GRACE_MS = 2e3;
 var FORBIDDEN = -32024;
 var EVENTS_VALUE_FLAGS = /* @__PURE__ */ new Set([
   "-H",
@@ -17163,13 +17177,12 @@ var Subscriber = class {
   seen = [];
   seenSet = /* @__PURE__ */ new Set();
   delivered = 0;
-  handlerProc;
   o;
   constructor(options) {
     this.o = options;
   }
   async start() {
-    const { args, platform: platform2, signal } = this.o;
+    const { args, platform: platform2 } = this.o;
     if (args.cursorFile) {
       const state = await loadCursorFile(platform2, args.cursorFile);
       this.cursor = state.cursor;
@@ -17178,18 +17191,8 @@ var Subscriber = class {
     }
     if (args.sinceNow) this.cursor = null;
     if (args.cursor !== void 0) this.cursor = args.cursor;
-    const onAbort = () => {
-      const proc = this.handlerProc;
-      if (proc) void Promise.resolve(proc.kill("SIGTERM")).catch(() => {
-      });
-    };
-    signal.addEventListener("abort", onAbort, { once: true });
-    try {
-      const mode = pickDelivery(this.o.event, args.delivery);
-      return mode === "push" ? await this.push() : await this.poll();
-    } finally {
-      signal.removeEventListener("abort", onAbort);
-    }
+    const mode = pickDelivery(this.o.event, args.delivery);
+    return mode === "push" ? await this.push() : await this.poll();
   }
   notice(text) {
     if (this.o.args.silent) return Promise.resolve();
@@ -17207,7 +17210,7 @@ var Subscriber = class {
   }
   async persist(force = false) {
     const path = this.o.args.cursorFile;
-    if (!path || !force && this.persisted === this.cursor) return;
+    if (!path || this.o.signal.aborted || !force && this.persisted === this.cursor) return;
     const body = JSON.stringify({
       event: this.o.event.name,
       cursor: this.cursor,
@@ -17228,6 +17231,7 @@ var Subscriber = class {
     await this.persist();
   }
   async deliver(occurrence, cursor) {
+    if (this.o.signal.aborted) return;
     const id = typeof occurrence.eventId === "string" ? occurrence.eventId : void 0;
     if (id !== void 0 && this.seenSet.has(id)) {
       if (cursor !== void 0) await this.moveTo(cursor, false);
@@ -17240,7 +17244,7 @@ var Subscriber = class {
     await this.persist(true);
   }
   async handle(occurrence) {
-    const { platform: platform2, args } = this.o;
+    const { platform: platform2, args, signal } = this.o;
     const line = `${sanitizeJson(JSON.stringify(occurrence))}
 `;
     if (!args.handler) {
@@ -17260,7 +17264,9 @@ var Subscriber = class {
     } catch (err) {
       throw new McpcatError(EXIT_USAGE, `cannot run ${args.handler[0]}: ${err.message}`);
     }
-    this.handlerProc = proc;
+    const stop = () => void reap(proc, HANDLER_GRACE_MS);
+    if (signal.aborted) stop();
+    else signal.addEventListener("abort", stop, { once: true });
     const feed = async () => {
       const writer = proc.stdin.getWriter();
       try {
@@ -17289,12 +17295,12 @@ var Subscriber = class {
         pipe(proc.stderr, 2),
         proc.wait()
       ]);
-      if (status.status !== 0 && !this.o.signal.aborted) {
+      if (status.status !== 0 && !signal.aborted) {
         const how = status.signal ? `was killed by ${status.signal}` : `exited ${status.status}`;
         await this.notice(`${args.handler[0]} ${how} for event ${String(occurrence.eventId)}`);
       }
     } finally {
-      this.handlerProc = void 0;
+      signal.removeEventListener("abort", stop);
     }
   }
   async backoff(delay, reason, verb = "retrying") {
@@ -19805,7 +19811,7 @@ async function main(ctx) {
     packageDir: "/node_modules/@ai-ecoverse/mcpcat"
   });
   const args = ctx.argv.slice(1);
-  return run(platform2, "0.29.0", args);
+  return run(platform2, "0.29.1", args);
 }
 export {
   main as default

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-ecoverse/mcpcat",
-  "version": "0.29.0",
+  "version": "0.29.1",
   "description": "A curl for the Model Context Protocol",
   "type": "module",
   "license": "Apache-2.0",