skybridge 2.0.0-beta.dd3cba3 → 2.0.0

package/dist/server/middleware.test.js

@@ -207,29 +207,37 @@ describe("McpServer.mcpMiddleware()", () => {
         return new Client({ name: "test-client", version: "1.0.0" });
     }
     it("returns this for chaining", () => {
-        new Skybridge({ name: "test", version: "1.0.0" }, (server) => {
-            const result = server.mcpMiddleware(async (_req, _extra, next) => next());
-            expect(result).toBe(server);
-            return server;
+        new Skybridge({
+            name: "test",
+            version: "1.0.0",
+            handler: (server) => {
+                const result = server.mcpMiddleware(async (_req, _extra, next) => next());
+                expect(result).toBe(server);
+                return server;
+            },
         });
     });
     it("intercepts tools/call and exposes request params", async () => {
         let capturedMethod = "";
         let capturedParams = {};
-        const app = new Skybridge({ name: "test", version: "1.0.0" }, (server) => {
-            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();
-            });
-            return server;
+        const app = new Skybridge({
+            name: "test",
+            version: "1.0.0",
+            handler: (server) => {
+                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();
+                });
+                return server;
+            },
         });
         const client = createClient();
         const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
@@ -251,15 +259,19 @@ describe("McpServer.mcpMiddleware()", () => {
     });
     it("array filter works", async () => {
         const matchedMethods = [];
-        const app = new Skybridge({ name: "test", version: "1.0.0" }, (server) => {
-            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();
-            });
-            return server;
+        const app = new Skybridge({
+            name: "test",
+            version: "1.0.0",
+            handler: (server) => {
+                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();
+                });
+                return server;
+            },
         });
         const client = createClient();
         const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
@@ -272,27 +284,36 @@ describe("McpServer.mcpMiddleware()", () => {
         await client.close();
         await instance.close();
     });
-    it("throws when filter provided without handler", () => {
-        expect(() => new Skybridge({ name: "test", version: "1.0.0" }, (server) => 
-        // @ts-expect-error intentionally passing filter without handler
-        server.mcpMiddleware("tools/call"))).toThrow("mcpMiddleware requires a handler function");
+    it("throws when filter provided without handler", async () => {
+        const app = new Skybridge({
+            name: "test",
+            version: "1.0.0",
+            handler: (server) => 
+            // @ts-expect-error intentionally passing filter without handler
+            server.mcpMiddleware("tools/call"),
+        });
+        await expect(app.createServerInstance()).rejects.toThrow("mcpMiddleware requires a handler function");
     });
     it("catch-all middleware + filtered middleware stack correctly", async () => {
         const calls = [];
-        const app = new Skybridge({ name: "test", version: "1.0.0" }, (server) => {
-            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();
-            });
-            return server;
+        const app = new Skybridge({
+            name: "test",
+            version: "1.0.0",
+            handler: (server) => {
+                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();
+                });
+                return server;
+            },
         });
         const client = createClient();
         const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
@@ -315,15 +336,19 @@ describe("McpServer.mcpMiddleware()", () => {
     });
     it("notification middleware receives extra as undefined", async () => {
         let capturedExtra = "sentinel";
-        const app = new Skybridge({ name: "test", version: "1.0.0" }, (server) => {
-            server.registerTool({ name: "t1", description: "t1" }, () => ({
-                content: [{ type: "text", text: "ok" }],
-            }));
-            server.mcpMiddleware("notification", async (_request, extra, next) => {
-                capturedExtra = extra;
-                return next();
-            });
-            return server;
+        const app = new Skybridge({
+            name: "test",
+            version: "1.0.0",
+            handler: (server) => {
+                server.registerTool({ name: "t1", description: "t1" }, () => ({
+                    content: [{ type: "text", text: "ok" }],
+                }));
+                server.mcpMiddleware("notification", async (_request, extra, next) => {
+                    capturedExtra = extra;
+                    return next();
+                });
+                return server;
+            },
         });
         const client = createClient();
         const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
@@ -338,15 +363,19 @@ describe("McpServer.mcpMiddleware()", () => {
     });
     it("wildcard filter intercepts matching methods only", async () => {
         const matchedMethods = [];
-        const app = new Skybridge({ name: "test", version: "1.0.0" }, (server) => {
-            server.registerTool({ name: "t1", description: "t1" }, () => ({
-                content: [{ type: "text", text: "ok" }],
-            }));
-            server.mcpMiddleware("tools/*", async (request, _extra, next) => {
-                matchedMethods.push(request.method);
-                return next();
-            });
-            return server;
+        const app = new Skybridge({
+            name: "test",
+            version: "1.0.0",
+            handler: (server) => {
+                server.registerTool({ name: "t1", description: "t1" }, () => ({
+                    content: [{ type: "text", text: "ok" }],
+                }));
+                server.mcpMiddleware("tools/*", async (request, _extra, next) => {
+                    matchedMethods.push(request.method);
+                    return next();
+                });
+                return server;
+            },
         });
         const client = createClient();
         const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
@@ -364,25 +393,29 @@ describe("McpServer.mcpMiddleware()", () => {
         await instance.close();
     });
     it("middleware can modify tool result via Skybridge integration", async () => {
-        const app = new Skybridge({ name: "test", version: "1.0.0" }, (server) => {
-            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)" },
-                    ],
-                };
-            });
-            return server;
+        const app = new Skybridge({
+            name: "test",
+            version: "1.0.0",
+            handler: (server) => {
+                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)" },
+                        ],
+                    };
+                });
+                return server;
+            },
         });
         const client = createClient();
         const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
@@ -402,17 +435,21 @@ describe("McpServer.mcpMiddleware()", () => {
     });
     it("middleware can short-circuit via Skybridge integration", async () => {
         const handlerCalled = vi.fn();
-        const app = new Skybridge({ name: "test", version: "1.0.0" }, (server) => {
-            server.registerTool({ name: "t1", description: "t1" }, () => {
-                handlerCalled();
-                return {
-                    content: [{ type: "text", text: "original" }],
-                };
-            });
-            server.mcpMiddleware("tools/call", async () => ({
-                content: [{ type: "text", text: "short-circuited" }],
-            }));
-            return server;
+        const app = new Skybridge({
+            name: "test",
+            version: "1.0.0",
+            handler: (server) => {
+                server.registerTool({ name: "t1", description: "t1" }, () => {
+                    handlerCalled();
+                    return {
+                        content: [{ type: "text", text: "original" }],
+                    };
+                });
+                server.mcpMiddleware("tools/call", async () => ({
+                    content: [{ type: "text", text: "short-circuited" }],
+                }));
+                return server;
+            },
         });
         const client = createClient();
         const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
@@ -429,23 +466,27 @@ describe("McpServer.mcpMiddleware()", () => {
         const schemaError = new Error("boom with schema");
         const schemalessError = new Error("boom without schema");
         let captured;
-        const app = new Skybridge({ name: "test", version: "1.0.0" }, (server) => {
-            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;
-            });
-            return server;
+        const app = new Skybridge({
+            name: "test",
+            version: "1.0.0",
+            handler: (server) => {
+                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;
+                });
+                return server;
+            },
         });
         const client = createClient();
         const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
@@ -466,22 +507,26 @@ describe("McpServer.mcpMiddleware()", () => {
     });
     it("middleware can mutate tool call params via Skybridge integration", async () => {
         let receivedName = "";
-        const app = new Skybridge({ name: "test", version: "1.0.0" }, (server) => {
-            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();
-            });
-            return server;
+        const app = new Skybridge({
+            name: "test",
+            version: "1.0.0",
+            handler: (server) => {
+                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();
+                });
+                return server;
+            },
         });
         const client = createClient();
         const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
@@ -498,15 +543,19 @@ describe("McpServer.mcpMiddleware()", () => {
     });
     it("category 'request' filter matches requests but not notifications", async () => {
         const matchedMethods = [];
-        const app = new Skybridge({ name: "test", version: "1.0.0" }, (server) => {
-            server.registerTool({ name: "t1", description: "t1" }, () => ({
-                content: [{ type: "text", text: "ok" }],
-            }));
-            server.mcpMiddleware("request", async (request, _extra, next) => {
-                matchedMethods.push(request.method);
-                return next();
-            });
-            return server;
+        const app = new Skybridge({
+            name: "test",
+            version: "1.0.0",
+            handler: (server) => {
+                server.registerTool({ name: "t1", description: "t1" }, () => ({
+                    content: [{ type: "text", text: "ok" }],
+                }));
+                server.mcpMiddleware("request", async (request, _extra, next) => {
+                    matchedMethods.push(request.method);
+                    return next();
+                });
+                return server;
+            },
         });
         const client = createClient();
         const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();