@telemetry-dev/mcp 0.1.0 → 0.1.2

package/dist/index.mjs

@@ -188,13 +188,17 @@ function instrumentMcpTransport(transport, options = {}) {
 	const originalSetProtocolVersion = target.setProtocolVersion?.bind(target);
 	const outgoing = /* @__PURE__ */ new Map();
 	const incoming = /* @__PURE__ */ new Map();
+	const sendingResponses = /* @__PURE__ */ new Set();
 	const dispatching = /* @__PURE__ */ new WeakSet();
 	const capturePayloads = options.capturePayloads === true;
 	const propagateBaggage = options.propagateBaggage === true;
 	let onmessage = target.onmessage;
 	const wrapClose = (handler) => function() {
 		for (const [key, pending] of outgoing) completePending(outgoing, key, pending, () => setFailure(pending, "connection_error"));
-		for (const [key, pending] of incoming) completePending(incoming, key, pending, () => setFailure(pending, "connection_error"));
+		for (const [key, pending] of incoming) {
+			if (sendingResponses.has(pending)) continue;
+			completePending(incoming, key, pending, () => setFailure(pending, "connection_error"));
+		}
 		handler?.call(target);
 	};
 	let onclose = wrapClose(target.onclose);
@@ -296,26 +300,33 @@ function instrumentMcpTransport(transport, options = {}) {
 				}
 			}
 		}
-		try {
-			await originalSend(sent, forwardedOptions);
-		} catch (error) {
-			for (const { key, pending } of started) completePending(outgoing, key, pending, () => pending.handle.update({ error }));
-			for (const message of messages) {
-				if (message === void 0 || message.method !== void 0 || message.id === void 0) continue;
-				const key = idKey(message.id);
-				const inbound = incoming.get(key);
-				if (inbound !== void 0) completePending(incoming, key, inbound, () => inbound.handle.update({ error }));
-			}
-			throw error;
+		const responses = [];
+		for (const message of messages) {
+			if (message === void 0 || message.method !== void 0 || message.id === void 0) continue;
+			const key = idKey(message.id);
+			const pending = incoming.get(key);
+			if (pending === void 0 || sendingResponses.has(pending)) continue;
+			sendingResponses.add(pending);
+			responses.push({
+				key,
+				pending,
+				message
+			});
 		}
 		try {
-			for (const message of messages) {
-				if (message === void 0 || message.method !== void 0 || message.id === void 0) continue;
-				const key = idKey(message.id);
-				const inbound = incoming.get(key);
-				if (inbound !== void 0) completePending(incoming, key, inbound, () => finishResponse(target, inbound, message));
+			try {
+				await originalSend(sent, forwardedOptions);
+			} catch (error) {
+				for (const { key, pending } of started) completePending(outgoing, key, pending, () => pending.handle.update({ error }));
+				for (const { key, pending } of responses) completePending(incoming, key, pending, () => pending.handle.update({ error }));
+				throw error;
 			}
-		} catch {}
+			try {
+				for (const { key, pending, message } of responses) completePending(incoming, key, pending, () => finishResponse(target, pending, message));
+			} catch {}
+		} finally {
+			for (const { pending } of responses) sendingResponses.delete(pending);
+		}
 	};
 	if (originalSetProtocolVersion !== void 0) target.setProtocolVersion = (version) => {
 		PROTOCOL_VERSIONS.set(target, version);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@telemetry-dev/mcp",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Model Context Protocol SDK instrumentation for telemetry.dev: instruments MCP v2 transports and emits OpenTelemetry spans.",
   "keywords": [
     "mcp",
@@ -38,17 +38,17 @@
     "@modelcontextprotocol/server": "2.0.0",
     "@opentelemetry/api": "^1.9.1",
     "@opentelemetry/sdk-trace-base": "^2.7.1",
+    "@telemetry-dev/sdk": "0.1.2",
     "@types/node": "^24",
     "typescript": "^5",
     "vite-plus": "0.1.20",
-    "vitest": "npm:@voidzero-dev/vite-plus-test@0.1.20",
-    "@telemetry-dev/sdk": "0.1.0"
+    "vitest": "npm:@voidzero-dev/vite-plus-test@0.1.20"
   },
   "peerDependencies": {
     "@modelcontextprotocol/client": ">=2.0.0 <3",
     "@modelcontextprotocol/server": ">=2.0.0 <3",
     "@opentelemetry/api": ">=1.9.0 <2",
-    "@telemetry-dev/sdk": "^0.1.0"
+    "@telemetry-dev/sdk": "^0.1.2"
   },
   "peerDependenciesMeta": {
     "@modelcontextprotocol/client": {

package/src/index.ts

@@ -328,6 +328,7 @@ export function instrumentMcpTransport<T extends McpTransport>(
   const originalSetProtocolVersion = target.setProtocolVersion?.bind(target);
   const outgoing = new Map<string, PendingRequest>();
   const incoming = new Map<string, PendingRequest>();
+  const sendingResponses = new Set<PendingRequest>();
   const dispatching = new WeakSet<object>();
   const capturePayloads = options.capturePayloads === true;
   const propagateBaggage = options.propagateBaggage === true;
@@ -338,6 +339,7 @@ export function instrumentMcpTransport<T extends McpTransport>(
         completePending(outgoing, key, pending, () => setFailure(pending, "connection_error"));
       }
       for (const [key, pending] of incoming) {
+        if (sendingResponses.has(pending)) continue;
         completePending(incoming, key, pending, () => setFailure(pending, "connection_error"));
       }
       handler?.call(target);
@@ -472,35 +474,38 @@ export function instrumentMcpTransport<T extends McpTransport>(
       }
     }
 
-    try {
-      await originalSend(sent, forwardedOptions);
-    } catch (error) {
-      for (const { key, pending } of started) {
-        completePending(outgoing, key, pending, () => pending.handle.update({ error }));
-      }
-      for (const message of messages) {
-        if (message === undefined || message.method !== undefined || message.id === undefined)
-          continue;
-        const key = idKey(message.id);
-        const inbound = incoming.get(key);
-        if (inbound !== undefined) {
-          completePending(incoming, key, inbound, () => inbound.handle.update({ error }));
-        }
-      }
-      throw error;
+    const responses: Array<{ key: string; pending: PendingRequest; message: ParsedMessage }> = [];
+    for (const message of messages) {
+      if (message === undefined || message.method !== undefined || message.id === undefined)
+        continue;
+      const key = idKey(message.id);
+      const pending = incoming.get(key);
+      if (pending === undefined || sendingResponses.has(pending)) continue;
+      sendingResponses.add(pending);
+      responses.push({ key, pending, message });
     }
 
     try {
-      for (const message of messages) {
-        if (message === undefined || message.method !== undefined || message.id === undefined)
-          continue;
-        const key = idKey(message.id);
-        const inbound = incoming.get(key);
-        if (inbound !== undefined) {
-          completePending(incoming, key, inbound, () => finishResponse(target, inbound, message));
+      try {
+        await originalSend(sent, forwardedOptions);
+      } catch (error) {
+        for (const { key, pending } of started) {
+          completePending(outgoing, key, pending, () => pending.handle.update({ error }));
+        }
+        for (const { key, pending } of responses) {
+          completePending(incoming, key, pending, () => pending.handle.update({ error }));
         }
+        throw error;
       }
-    } catch {}
+
+      try {
+        for (const { key, pending, message } of responses) {
+          completePending(incoming, key, pending, () => finishResponse(target, pending, message));
+        }
+      } catch {}
+    } finally {
+      for (const { pending } of responses) sendingResponses.delete(pending);
+    }
   };
 
   if (originalSetProtocolVersion !== undefined) {