skybridge 0.0.0-dev.ecf87cf → 0.0.0-dev.ed29eee

package/dist/server/middleware.test-d.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"middleware.test-d.js","sourceRoot":"","sources":["../../src/server/middleware.test-d.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  CallToolResult,\n  ListToolsResult,\n  ServerResult,\n} from \"@modelcontextprotocol/sdk/types.js\";\nimport { expectTypeOf, test } from \"vitest\";\nimport type {\n  McpExtra,\n  McpResultFor,\n  McpTypedMiddlewareFn,\n} from \"./middleware.js\";\nimport type { McpServer } from \"./server.js\";\n\nconst server = null as unknown as McpServer;\n\ntest(\"request category narrows extra and next() result\", () => {\n  server.mcpMiddleware(\"request\", async (_request, extra, next) => {\n    expectTypeOf(extra).toEqualTypeOf<McpExtra>();\n    extra.signal;\n    const result = await next();\n    expectTypeOf(result).toEqualTypeOf<ServerResult>();\n    return result;\n  });\n});\n\ntest(\"notification category narrows extra and next() result\", () => {\n  server.mcpMiddleware(\"notification\", async (_request, extra, next) => {\n    expectTypeOf(extra).toEqualTypeOf<undefined>();\n    // @ts-expect-error extra is undefined, cannot access .signal\n    extra.signal;\n    const result = await next();\n    expectTypeOf(result).toEqualTypeOf<undefined>();\n  });\n});\n\ntest(\"exact method tools/call narrows params, extra, and next() result\", () => {\n  server.mcpMiddleware(\"tools/call\", async (request, extra, next) => {\n    expectTypeOf(request.params.name).toBeString();\n    expectTypeOf(extra).toEqualTypeOf<McpExtra>();\n    const result = await next();\n    expectTypeOf(result).toEqualTypeOf<CallToolResult>();\n    return result;\n  });\n});\n\ntest(\"exact method tools/list narrows next() to ListToolsResult\", () => {\n  server.mcpMiddleware(\"tools/list\", async (_request, _extra, next) => {\n    const result = await next();\n    expectTypeOf(result).toEqualTypeOf<ListToolsResult>();\n    return result;\n  });\n});\n\ntest(\"exact notification method narrows extra and next() result\", () => {\n  server.mcpMiddleware(\n    \"notifications/initialized\",\n    async (_request, extra, next) => {\n      expectTypeOf(extra).toEqualTypeOf<undefined>();\n      // @ts-expect-error extra is undefined\n      extra.signal;\n      const result = await next();\n      expectTypeOf(result).toEqualTypeOf<undefined>();\n    },\n  );\n});\n\ntest(\"McpTypedMiddlewareFn narrows params, extra, and next() per method\", () => {\n  expectTypeOf<\n    Parameters<McpTypedMiddlewareFn<\"tools/call\">>[0][\"params\"][\"name\"]\n  >().toBeString();\n  expectTypeOf<\n    Parameters<McpTypedMiddlewareFn<\"tools/call\">>[1]\n  >().toEqualTypeOf<McpExtra>();\n  expectTypeOf<\n    Parameters<McpTypedMiddlewareFn<\"notifications/initialized\">>[1]\n  >().toEqualTypeOf<undefined>();\n  expectTypeOf<\n    ReturnType<Parameters<McpTypedMiddlewareFn<\"tools/list\">>[2]>\n  >().toEqualTypeOf<Promise<ListToolsResult>>();\n  expectTypeOf<\n    ReturnType<Parameters<McpTypedMiddlewareFn<\"notifications/initialized\">>[2]>\n  >().toEqualTypeOf<Promise<undefined>>();\n});\n\ntest(\"McpResultFor maps methods to correct result types\", () => {\n  expectTypeOf<McpResultFor<\"tools/list\">>().toEqualTypeOf<ListToolsResult>();\n  expectTypeOf<McpResultFor<\"tools/call\">>().toEqualTypeOf<CallToolResult>();\n  expectTypeOf<\n    McpResultFor<\"notifications/initialized\">\n  >().toEqualTypeOf<undefined>();\n});\n\ntest(\"wildcard tools/* narrows next() to union of tools result types\", () => {\n  server.mcpMiddleware(\"tools/*\", async (_request, _extra, next) => {\n    const result = await next();\n    expectTypeOf(result).toEqualTypeOf<ListToolsResult | CallToolResult>();\n    return result;\n  });\n});\n\ntest(\"McpResultFor resolves wildcards to union of matching result types\", () => {\n  expectTypeOf<McpResultFor<\"tools/*\">>().toEqualTypeOf<\n    ListToolsResult | CallToolResult\n  >();\n});\n\ntest(\"catch-all middleware has no narrowing on extra or params\", () => {\n  server.mcpMiddleware((_request, extra, next) => {\n    expectTypeOf(extra).toEqualTypeOf<McpExtra | undefined>();\n    expectTypeOf(_request.params).toEqualTypeOf<Record<string, unknown>>();\n    return next();\n  });\n});\n"]}

package/dist/server/middleware.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/server/middleware.test.js

@@ -0,0 +1,529 @@
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js";
+import { describe, expect, it, vi } from "vitest";
+import { z } from "zod";
+import { buildMiddlewareChain, getHandlerMaps, getToolError, matchesFilter, } from "./middleware.js";
+import { McpServer } from "./server.js";
+// ---------------------------------------------------------------------------
+// matchesFilter
+// ---------------------------------------------------------------------------
+describe("matchesFilter", () => {
+    it("matches exact method", () => {
+        expect(matchesFilter("tools/call", "tools/call", false)).toBe(true);
+    });
+    it("rejects non-matching exact method", () => {
+        expect(matchesFilter("tools/list", "tools/call", false)).toBe(false);
+    });
+    it("matches wildcard", () => {
+        expect(matchesFilter("tools/call", "tools/*", false)).toBe(true);
+        expect(matchesFilter("tools/list", "tools/*", false)).toBe(true);
+    });
+    it("rejects non-matching wildcard", () => {
+        expect(matchesFilter("resources/read", "tools/*", false)).toBe(false);
+    });
+    it('category "request" matches when isNotification=false', () => {
+        expect(matchesFilter("tools/call", "request", false)).toBe(true);
+    });
+    it('category "request" rejects when isNotification=true', () => {
+        expect(matchesFilter("notifications/initialized", "request", true)).toBe(false);
+    });
+    it('category "notification" matches when isNotification=true', () => {
+        expect(matchesFilter("notifications/initialized", "notification", true)).toBe(true);
+    });
+    it('category "notification" rejects when isNotification=false', () => {
+        expect(matchesFilter("tools/call", "notification", false)).toBe(false);
+    });
+});
+// ---------------------------------------------------------------------------
+// buildMiddlewareChain
+// ---------------------------------------------------------------------------
+describe("buildMiddlewareChain", () => {
+    const fakeExtra = {};
+    const makeHandler = (returnValue) => vi.fn(async () => returnValue);
+    const makeEntry = (filter, handler) => ({ filter, handler });
+    it("returns original handler when no middleware applies", () => {
+        const original = makeHandler("result");
+        const chain = buildMiddlewareChain("tools/call", false, original, [
+            makeEntry("resources/*", async (_req, _extra, next) => next()),
+        ]);
+        expect(chain).toBe(original);
+    });
+    it("catch-all middleware runs for any method", async () => {
+        const original = makeHandler("ok");
+        const spy = vi.fn();
+        const chain = buildMiddlewareChain("tools/call", false, original, [
+            makeEntry(null, async (request, _extra, next) => {
+                spy(request.method);
+                return next();
+            }),
+        ]);
+        const result = await chain({ method: "tools/call", params: {} }, fakeExtra);
+        expect(spy).toHaveBeenCalledWith("tools/call");
+        expect(result).toBe("ok");
+    });
+    it("method-scoped middleware only runs for matching methods", async () => {
+        const original = makeHandler("ok");
+        const spy = vi.fn();
+        const entries = [
+            makeEntry("tools/call", async (_req, _extra, next) => {
+                spy("tools/call");
+                return next();
+            }),
+        ];
+        // Matching
+        const chain1 = buildMiddlewareChain("tools/call", false, original, entries);
+        await chain1({ method: "tools/call", params: {} }, fakeExtra);
+        expect(spy).toHaveBeenCalledTimes(1);
+        // Non-matching — returns original handler directly
+        const chain2 = buildMiddlewareChain("tools/list", false, original, entries);
+        expect(chain2).toBe(original);
+    });
+    it("executes middleware in registration order (onion model)", async () => {
+        const calls = [];
+        const original = makeHandler("result");
+        const chain = buildMiddlewareChain("tools/call", false, original, [
+            makeEntry(null, async (_req, _extra, next) => {
+                calls.push("A:before");
+                const result = await next();
+                calls.push("A:after");
+                return result;
+            }),
+            makeEntry(null, async (_req, _extra, next) => {
+                calls.push("B:before");
+                const result = await next();
+                calls.push("B:after");
+                return result;
+            }),
+        ]);
+        await chain({ method: "tools/call", params: {} }, fakeExtra);
+        expect(calls).toEqual(["A:before", "B:before", "B:after", "A:after"]);
+    });
+    it("short-circuit (no next() call) skips handler", async () => {
+        const original = makeHandler("original");
+        const chain = buildMiddlewareChain("tools/call", false, original, [
+            makeEntry(null, async () => "short-circuited"),
+        ]);
+        const result = await chain({ method: "tools/call", params: {} }, fakeExtra);
+        expect(result).toBe("short-circuited");
+        expect(original).not.toHaveBeenCalled();
+    });
+    it("middleware can modify result post-next()", async () => {
+        const original = makeHandler({ value: 1 });
+        const chain = buildMiddlewareChain("tools/call", false, original, [
+            makeEntry(null, async (_req, _extra, next) => {
+                const result = (await next());
+                return { value: result.value + 10 };
+            }),
+        ]);
+        const result = await chain({ method: "tools/call", params: {} }, fakeExtra);
+        expect(result).toEqual({ value: 11 });
+    });
+    it("throws on double next() call", async () => {
+        const original = makeHandler("ok");
+        const chain = buildMiddlewareChain("tools/call", false, original, [
+            makeEntry(null, async (_req, _extra, next) => {
+                await next();
+                return next(); // double call
+            }),
+        ]);
+        await expect(chain({ method: "tools/call", params: {} }, fakeExtra)).rejects.toThrow("next() called multiple times");
+    });
+    it("propagates errors from handler and middleware", async () => {
+        // Error from original handler bubbles through middleware
+        const failingHandler = vi.fn(async () => {
+            throw new Error("handler boom");
+        });
+        const chain1 = buildMiddlewareChain("tools/call", false, failingHandler, [
+            makeEntry(null, async (_req, _extra, next) => next()),
+        ]);
+        await expect(chain1({ method: "tools/call", params: {} }, fakeExtra)).rejects.toThrow("handler boom");
+        // Error thrown inside middleware propagates
+        const chain2 = buildMiddlewareChain("tools/call", false, makeHandler("ok"), [
+            makeEntry(null, async () => {
+                throw new Error("middleware boom");
+            }),
+        ]);
+        await expect(chain2({ method: "tools/call", params: {} }, fakeExtra)).rejects.toThrow("middleware boom");
+    });
+    it("passes extra as undefined for notifications (isNotification=true)", async () => {
+        const original = makeHandler(undefined);
+        let capturedExtra = {};
+        const chain = buildMiddlewareChain("notifications/initialized", true, original, [
+            makeEntry(null, async (_req, extra, next) => {
+                capturedExtra = extra;
+                return next();
+            }),
+        ]);
+        await chain({ method: "notifications/initialized" });
+        expect(capturedExtra).toBeUndefined();
+    });
+    it("defaults params to empty object when rawRequest has no params", async () => {
+        const original = makeHandler("ok");
+        let capturedParams;
+        const chain = buildMiddlewareChain("tools/call", false, original, [
+            makeEntry(null, async (request, _extra, next) => {
+                capturedParams = request.params;
+                return next();
+            }),
+        ]);
+        await chain({ method: "tools/call" }, fakeExtra);
+        expect(capturedParams).toEqual({});
+    });
+    it("propagates in-place param mutation to original handler", async () => {
+        let handlerReceivedName = "";
+        const original = vi.fn(async (rawReq) => {
+            handlerReceivedName = rawReq.params.name;
+            return "ok";
+        });
+        const chain = buildMiddlewareChain("tools/call", false, original, [
+            makeEntry(null, async (request, _extra, next) => {
+                request.params.name = "mutated";
+                return next();
+            }),
+        ]);
+        await chain({ params: { name: "original" } }, fakeExtra);
+        expect(handlerReceivedName).toBe("mutated");
+    });
+    it("propagates full param replacement to original handler", async () => {
+        let handlerReceivedParams = {};
+        const original = vi.fn(async (rawReq) => {
+            handlerReceivedParams = rawReq.params;
+            return "ok";
+        });
+        const chain = buildMiddlewareChain("tools/call", false, original, [
+            makeEntry(null, async (request, _extra, next) => {
+                request.params = { replaced: true };
+                return next();
+            }),
+        ]);
+        await chain({ params: { original: true } }, fakeExtra);
+        expect(handlerReceivedParams).toEqual({ replaced: true });
+    });
+});
+// ---------------------------------------------------------------------------
+// McpServer.mcpMiddleware() integration tests
+// ---------------------------------------------------------------------------
+describe("McpServer.mcpMiddleware()", () => {
+    function createClient() {
+        return new Client({ name: "test-client", version: "1.0.0" });
+    }
+    it("returns this for chaining", () => {
+        const server = new McpServer({ name: "test", version: "1.0.0" });
+        const result = server.mcpMiddleware(async (_req, _extra, next) => next());
+        expect(result).toBe(server);
+    });
+    it("intercepts tools/call and exposes request params", async () => {
+        let capturedMethod = "";
+        let capturedParams = {};
+        const server = new McpServer({ name: "test", version: "1.0.0" });
+        server.registerTool({
+            name: "greet",
+            description: "greet",
+            inputSchema: { name: z.string() },
+        }, (args) => ({
+            content: [{ type: "text", text: `hi ${args.name}` }],
+        }));
+        server.mcpMiddleware("tools/call", async (request, _extra, next) => {
+            capturedMethod = request.method;
+            capturedParams = request.params;
+            return next();
+        });
+        const client = createClient();
+        const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
+        await server.connect(serverTransport);
+        await client.connect(clientTransport);
+        const result = await client.callTool({
+            name: "greet",
+            arguments: { name: "World" },
+        });
+        expect(capturedMethod).toBe("tools/call");
+        expect(capturedParams).toMatchObject({
+            name: "greet",
+            arguments: { name: "World" },
+        });
+        expect(result.content).toEqual([{ type: "text", text: "hi World" }]);
+        await client.close();
+        await server.close();
+    });
+    it("array filter works", async () => {
+        const matchedMethods = [];
+        const server = new McpServer({ name: "test", version: "1.0.0" });
+        server.registerTool({ name: "t1", description: "t1" }, () => ({
+            content: [{ type: "text", text: "ok" }],
+        }));
+        server.mcpMiddleware(["tools/call", "tools/list"], async (request, _extra, next) => {
+            matchedMethods.push(request.method);
+            return next();
+        });
+        const client = createClient();
+        const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
+        await server.connect(serverTransport);
+        await client.connect(clientTransport);
+        await client.listTools();
+        await client.callTool({ name: "t1" });
+        expect(matchedMethods).toEqual(["tools/list", "tools/call"]);
+        await client.close();
+        await server.close();
+    });
+    it("throws if registered after connect()", async () => {
+        const server = new McpServer({ name: "test", version: "1.0.0" });
+        const [_clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
+        await server.connect(serverTransport);
+        expect(() => server.mcpMiddleware(async (_req, _extra, next) => next())).toThrow("Cannot register MCP middleware after run() or connect()");
+        await server.close();
+    });
+    it("throws when filter provided without handler", () => {
+        const server = new McpServer({ name: "test", version: "1.0.0" });
+        expect(() => 
+        // @ts-expect-error intentionally passing filter without handler
+        server.mcpMiddleware("tools/call")).toThrow("mcpMiddleware requires a handler function");
+    });
+    it("catch-all middleware + filtered middleware stack correctly", async () => {
+        const calls = [];
+        const server = new McpServer({ name: "test", version: "1.0.0" });
+        server.registerTool({ name: "t1", description: "t1" }, () => ({
+            content: [{ type: "text", text: "ok" }],
+        }));
+        server
+            .mcpMiddleware(async (request, _extra, next) => {
+            calls.push(`global:${request.method}`);
+            return next();
+        })
+            .mcpMiddleware("tools/call", async (_req, _extra, next) => {
+            calls.push("tools-only");
+            return next();
+        });
+        const client = createClient();
+        const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
+        await server.connect(serverTransport);
+        await client.connect(clientTransport);
+        await client.listTools();
+        await client.callTool({ name: "t1" });
+        // Catch-all also intercepts initialize + notifications/initialized from handshake.
+        // tools/list: only global middleware runs
+        // tools/call: global + tools-only both run
+        expect(calls).toContain("global:tools/list");
+        expect(calls).toContain("global:tools/call");
+        expect(calls).toContain("tools-only");
+        // "tools-only" must come right after "global:tools/call"
+        const toolsCallIdx = calls.indexOf("global:tools/call");
+        expect(calls[toolsCallIdx + 1]).toBe("tools-only");
+        await client.close();
+        await server.close();
+    });
+    it("notification middleware receives extra as undefined", async () => {
+        let capturedExtra = "sentinel";
+        const server = new McpServer({ name: "test", version: "1.0.0" });
+        server.registerTool({ name: "t1", description: "t1" }, () => ({
+            content: [{ type: "text", text: "ok" }],
+        }));
+        server.mcpMiddleware("notification", async (_request, extra, next) => {
+            capturedExtra = extra;
+            return next();
+        });
+        const client = createClient();
+        const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
+        await server.connect(serverTransport);
+        await client.connect(clientTransport);
+        // The client sends notifications/initialized automatically on connect.
+        await client.listTools();
+        expect(capturedExtra).toBeUndefined();
+        await client.close();
+        await server.close();
+    });
+    it("wildcard filter intercepts matching methods only", async () => {
+        const matchedMethods = [];
+        const server = new McpServer({ name: "test", version: "1.0.0" });
+        server.registerTool({ name: "t1", description: "t1" }, () => ({
+            content: [{ type: "text", text: "ok" }],
+        }));
+        server.mcpMiddleware("tools/*", async (request, _extra, next) => {
+            matchedMethods.push(request.method);
+            return next();
+        });
+        const client = createClient();
+        const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
+        await server.connect(serverTransport);
+        await client.connect(clientTransport);
+        await client.listTools();
+        await client.callTool({ name: "t1" });
+        expect(matchedMethods).toContain("tools/list");
+        expect(matchedMethods).toContain("tools/call");
+        // Should not match initialize or notifications
+        expect(matchedMethods).not.toContain("initialize");
+        expect(matchedMethods).not.toContain("notifications/initialized");
+        await client.close();
+        await server.close();
+    });
+    it("middleware can modify tool result via McpServer integration", async () => {
+        const server = new McpServer({ name: "test", version: "1.0.0" });
+        server.registerTool({
+            name: "greet",
+            description: "greet",
+            inputSchema: { name: z.string() },
+        }, (args) => ({
+            content: [{ type: "text", text: `hi ${args.name}` }],
+        }));
+        server.mcpMiddleware("tools/call", async (_req, _extra, next) => {
+            const result = (await next());
+            return {
+                ...result,
+                content: [
+                    ...result.content,
+                    { type: "text", text: " (modified)" },
+                ],
+            };
+        });
+        const client = createClient();
+        const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
+        await server.connect(serverTransport);
+        await client.connect(clientTransport);
+        const result = await client.callTool({
+            name: "greet",
+            arguments: { name: "World" },
+        });
+        expect(result.content).toEqual([
+            { type: "text", text: "hi World" },
+            { type: "text", text: " (modified)" },
+        ]);
+        await client.close();
+        await server.close();
+    });
+    it("middleware can short-circuit via McpServer integration", async () => {
+        const handlerCalled = vi.fn();
+        const server = new McpServer({ name: "test", version: "1.0.0" });
+        server.registerTool({ name: "t1", description: "t1" }, () => {
+            handlerCalled();
+            return {
+                content: [{ type: "text", text: "original" }],
+            };
+        });
+        server.mcpMiddleware("tools/call", async () => ({
+            content: [{ type: "text", text: "short-circuited" }],
+        }));
+        const client = createClient();
+        const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
+        await server.connect(serverTransport);
+        await client.connect(clientTransport);
+        const result = await client.callTool({ name: "t1" });
+        expect(result.content).toEqual([{ type: "text", text: "short-circuited" }]);
+        expect(handlerCalled).not.toHaveBeenCalled();
+        await client.close();
+        await server.close();
+    });
+    it("exposes a thrown tool error to middleware via getToolError", async () => {
+        const schemaError = new Error("boom with schema");
+        const schemalessError = new Error("boom without schema");
+        let captured;
+        const server = new McpServer({ name: "test", version: "1.0.0" });
+        server.registerTool({
+            name: "withSchema",
+            description: "withSchema",
+            inputSchema: { name: z.string() },
+        }, () => {
+            throw schemaError;
+        });
+        server.registerTool({ name: "withoutSchema", description: "withoutSchema" }, () => {
+            throw schemalessError;
+        });
+        server.mcpMiddleware("tools/call", async (_request, extra, next) => {
+            const result = await next();
+            captured = getToolError(extra);
+            return result;
+        });
+        const client = createClient();
+        const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
+        await server.connect(serverTransport);
+        await client.connect(clientTransport);
+        const withSchema = await client.callTool({
+            name: "withSchema",
+            arguments: { name: "World" },
+        });
+        expect(withSchema.isError).toBe(true);
+        expect(captured).toBe(schemaError);
+        const withoutSchema = await client.callTool({ name: "withoutSchema" });
+        expect(withoutSchema.isError).toBe(true);
+        expect(captured).toBe(schemalessError);
+        await client.close();
+        await server.close();
+    });
+    it("middleware can mutate tool call params via McpServer integration", async () => {
+        let receivedName = "";
+        const server = new McpServer({ name: "test", version: "1.0.0" });
+        server.registerTool({
+            name: "greet",
+            description: "greet",
+            inputSchema: { name: z.string() },
+        }, (args) => {
+            receivedName = args.name;
+            return {
+                content: [{ type: "text", text: `hi ${args.name}` }],
+            };
+        });
+        server.mcpMiddleware("tools/call", async (request, _extra, next) => {
+            request.params.arguments = { name: "Overridden" };
+            return next();
+        });
+        const client = createClient();
+        const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
+        await server.connect(serverTransport);
+        await client.connect(clientTransport);
+        await client.callTool({
+            name: "greet",
+            arguments: { name: "Original" },
+        });
+        expect(receivedName).toBe("Overridden");
+        await client.close();
+        await server.close();
+    });
+    it("category 'request' filter matches requests but not notifications", async () => {
+        const matchedMethods = [];
+        const server = new McpServer({ name: "test", version: "1.0.0" });
+        server.registerTool({ name: "t1", description: "t1" }, () => ({
+            content: [{ type: "text", text: "ok" }],
+        }));
+        server.mcpMiddleware("request", async (request, _extra, next) => {
+            matchedMethods.push(request.method);
+            return next();
+        });
+        const client = createClient();
+        const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
+        await server.connect(serverTransport);
+        await client.connect(clientTransport);
+        await client.listTools();
+        await client.callTool({ name: "t1" });
+        expect(matchedMethods).toContain("tools/list");
+        expect(matchedMethods).toContain("tools/call");
+        expect(matchedMethods).not.toContain("notifications/initialized");
+        await client.close();
+        await server.close();
+    });
+});
+// ---------------------------------------------------------------------------
+// getHandlerMaps
+// ---------------------------------------------------------------------------
+describe("getHandlerMaps", () => {
+    it("throws for incompatible server objects", () => {
+        // Empty object
+        expect(() => getHandlerMaps({})).toThrow("Incompatible MCP SDK version");
+        // Only _requestHandlers (missing _notificationHandlers)
+        expect(() => getHandlerMaps({ _requestHandlers: new Map() })).toThrow("Incompatible MCP SDK version");
+        // Non-Map values
+        expect(() => getHandlerMaps({
+            _requestHandlers: {},
+            _notificationHandlers: {},
+        })).toThrow("Incompatible MCP SDK version");
+    });
+    it("returns handler maps from valid server", () => {
+        const reqMap = new Map();
+        const notifMap = new Map();
+        const fake = {
+            _requestHandlers: reqMap,
+            _notificationHandlers: notifMap,
+        };
+        const result = getHandlerMaps(fake);
+        expect(result.requestHandlers).toBe(reqMap);
+        expect(result.notificationHandlers).toBe(notifMap);
+    });
+});
+//# sourceMappingURL=middleware.test.js.map