@wrongstack/mcp 1.0.1 → 1.0.3

package/dist/index.js

@@ -1262,7 +1262,7 @@ import { Agent as UndiciAgent, fetch as undiciFetch } from "undici";
 import * as dns2 from "node:dns/promises";
 import * as net2 from "node:net";
 import { ConfigError } from "@wrongstack/core/types";
-import { isPrivateIPv4 as isPrivateIPv42, isPrivateIPv6 as isPrivateIPv62 } from "@wrongstack/core/utils";
+import { embeddedIPv4, expandIPv6, isPrivateIPv4 as isPrivateIPv42, isPrivateIPv6 as isPrivateIPv62 } from "@wrongstack/core/utils";
 function isTlsUnsafeAllowed() {
   return process.env["WRONGSTACK_UNSAFE_MCP_TLS"] === "1";
 }
@@ -1351,6 +1351,11 @@ function classifyTransportAddress(address, family) {
       }
       return "blocked";
     }
+    const groups = expandIPv6(v6);
+    if (groups !== null) {
+      const embedded = embeddedIPv4(groups);
+      if (embedded !== void 0) return classifyTransportAddress(embedded, 4);
+    }
     return isPrivateIPv62(v6) ? "private" : "public";
   }
   return "blocked";
@@ -1425,6 +1430,9 @@ function makeAbortError(method) {
   err.name = "AbortError";
   return err;
 }
+function nextJsonRpcId(id) {
+  return id >= Number.MAX_SAFE_INTEGER ? 1 : id + 1;
+}
 function createTimeoutSignal(parent, timeoutMs) {
   const ctrl = new AbortController();
   const onAbort = () => ctrl.abort(parent?.reason);
@@ -1807,7 +1815,9 @@ var SSETransport = class extends BaseHTTPTransport {
     super(opts, "SSETransport");
   }
   genId() {
-    return this._nextId++;
+    const id = this._nextId;
+    this._nextId = nextJsonRpcId(id);
+    return id;
   }
   /** Refresh tool list when server sends notifications/tools/list_changed. */
   async handleToolsListChanged() {
@@ -2121,7 +2131,9 @@ var StreamableHTTPTransport = class _StreamableHTTPTransport extends BaseHTTPTra
     super(opts, "StreamableHTTP");
   }
   genId() {
-    return this._nextId++;
+    const id = this._nextId;
+    this._nextId = nextJsonRpcId(id);
+    return id;
   }
   consumeResponseText(text, requestId) {
     const envelopes = extractJsonRpcEnvelopes(text);
@@ -2166,6 +2178,7 @@ var StreamableHTTPTransport = class _StreamableHTTPTransport extends BaseHTTPTra
     const signal = this.abortController.signal;
     const startupTimer = setTimeout(() => this.abortController?.abort(), this.timeout);
     try {
+      const initializeId = this.genId();
       const initFetchOpts = {
         method: "POST",
         headers: {
@@ -2175,7 +2188,7 @@ var StreamableHTTPTransport = class _StreamableHTTPTransport extends BaseHTTPTra
         },
         body: JSON.stringify({
           jsonrpc: "2.0",
-          id: this.genId(),
+          id: initializeId,
           method: "initialize",
           params: {
             protocolVersion: MCP_CONSTANTS.PROTOCOL_VERSION,
@@ -2201,7 +2214,7 @@ var StreamableHTTPTransport = class _StreamableHTTPTransport extends BaseHTTPTra
       if (!data) {
         throw new Error("Could not parse initialize response");
       }
-      data = assertMatchingJsonRpcResult(data, this._nextId - 1, "initialize");
+      data = assertMatchingJsonRpcResult(data, initializeId, "initialize");
       if (data.error) {
         throw new Error(`initialize failed: ${data.error.message}`);
       }
@@ -2794,7 +2807,7 @@ var MCPClient = class _MCPClient {
           gracefulTimer.unref?.();
         })
       ]);
-      if (gracefulTimer) clearTimeout(gracefulTimer);
+      clearTimeout(gracefulTimer);
       if (gracefulRace === "timeout") {
         forceKillTree(child);
         let forceTimer;
@@ -2805,7 +2818,7 @@ var MCPClient = class _MCPClient {
             forceTimer.unref?.();
           })
         ]);
-        if (forceTimer) clearTimeout(forceTimer);
+        clearTimeout(forceTimer);
       }
       child.stdout?.removeAllListeners();
       child.stderr?.removeAllListeners();
@@ -2826,7 +2839,8 @@ var MCPClient = class _MCPClient {
       err.name = "AbortError";
       return Promise.reject(err);
     }
-    const id = this.nextId++;
+    const id = this.nextId;
+    this.nextId = nextJsonRpcId(id);
     const req = { jsonrpc: "2.0", id, method, params };
     return new Promise((resolve, reject) => {
       const onAbort = signal ? () => {
@@ -5420,11 +5434,9 @@ async function handleHttpRequest(server, req, res, token, log, boundHost) {
   req.on("end", () => {
     if (aborted) return;
     void server.handleMessage(body).then((out) => {
-      if (aborted) return;
       if (out === null) return send(202, "");
       return send(200, out);
     }).catch((err) => {
-      if (aborted) return;
       log?.warn?.(`MCP http handler error: ${toErrorMessage2(err)}`);
       send(500, JSON.stringify({ error: "internal error" }));
     });

package/dist/server.d.ts

@@ -1,3 +1,4 @@
+import { type IncomingMessage, type ServerResponse } from 'node:http';
 import type { MCPPromptArgument, MCPPromptMessage, MCPResourceContents } from './protocol.js';
 /**
  * Server-side MCP. The mirror image of `MCPClient`: instead of consuming a
@@ -164,4 +165,5 @@ export interface ServeHttpHandle {
  * otherwise expose tool execution to the whole network unauthenticated.
  */
 export declare function serveHttp(server: MCPServer, opts?: ServeHttpOptions): Promise<ServeHttpHandle>;
+export declare function handleHttpRequest(server: MCPServer, req: IncomingMessage, res: ServerResponse, token: string | undefined, log: MCPServerLogger | undefined, boundHost: string): Promise<void>;
 //# sourceMappingURL=server.d.ts.map

package/dist/transport-base.d.ts

@@ -49,6 +49,8 @@ export interface HttpTransportOptions {
  * classifyToolError maps it to FATAL / not-retryable (user cancellation).
  */
 export declare function makeAbortError(method: string): Error;
+/** Advance a JSON-RPC number id without leaving JavaScript's safe-integer range. */
+export declare function nextJsonRpcId(id: number): number;
 export declare function createTimeoutSignal(parent: AbortSignal | undefined, timeoutMs: number): {
     signal: AbortSignal;
     dispose: () => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wrongstack/mcp",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "license": "MIT",
   "description": "WrongStack Model Context Protocol client and registry: stdio, SSE, and streamable HTTP transports.",
   "repository": {
@@ -26,7 +26,7 @@
     "!dist/**/*.map"
   ],
   "dependencies": {
-    "@wrongstack/core": "1.0.1",
+    "@wrongstack/core": "1.0.3",
     "undici": "^8.10.0"
   },
   "devDependencies": {