skybridge 0.0.0-dev.a13daa8 → 0.0.0-dev.a16f3dc
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +9 -5
- package/dist/commands/dev.d.ts +0 -1
- package/dist/commands/dev.js +0 -6
- package/dist/commands/dev.js.map +1 -1
- package/dist/server/express.d.ts +3 -1
- package/dist/server/express.js +2 -2
- package/dist/server/express.js.map +1 -1
- package/dist/server/express.test.js +7 -1
- package/dist/server/express.test.js.map +1 -1
- package/dist/server/index.d.ts +1 -0
- package/dist/server/index.js.map +1 -1
- package/dist/server/middleware.d.ts +124 -0
- package/dist/server/middleware.js +93 -0
- package/dist/server/middleware.js.map +1 -0
- package/dist/server/middleware.test-d.d.ts +1 -0
- package/dist/server/middleware.test-d.js +75 -0
- package/dist/server/middleware.test-d.js.map +1 -0
- package/dist/server/middleware.test.d.ts +1 -0
- package/dist/server/middleware.test.js +383 -0
- package/dist/server/middleware.test.js.map +1 -0
- package/dist/server/server.d.ts +43 -1
- package/dist/server/server.js +64 -13
- package/dist/server/server.js.map +1 -1
- package/dist/server/widgetsDevServer.d.ts +2 -1
- package/dist/server/widgetsDevServer.js +2 -8
- package/dist/server/widgetsDevServer.js.map +1 -1
- package/dist/test/widget.test.js +11 -10
- package/dist/test/widget.test.js.map +1 -1
- package/dist/web/bridges/mcp-app/adaptor.d.ts +4 -2
- package/dist/web/bridges/mcp-app/adaptor.js +29 -35
- package/dist/web/bridges/mcp-app/adaptor.js.map +1 -1
- package/dist/web/bridges/mcp-app/bridge.d.ts +13 -30
- package/dist/web/bridges/mcp-app/bridge.js +43 -201
- package/dist/web/bridges/mcp-app/bridge.js.map +1 -1
- package/dist/web/bridges/mcp-app/use-mcp-app-context.d.ts +5 -3
- package/dist/web/bridges/mcp-app/use-mcp-app-context.js +2 -2
- package/dist/web/bridges/mcp-app/use-mcp-app-context.js.map +1 -1
- package/dist/web/bridges/mcp-app/use-mcp-app-context.test.js +1 -41
- package/dist/web/bridges/mcp-app/use-mcp-app-context.test.js.map +1 -1
- package/dist/web/create-store.test.js +3 -1
- package/dist/web/create-store.test.js.map +1 -1
- package/dist/web/data-llm.test.js +1 -0
- package/dist/web/data-llm.test.js.map +1 -1
- package/dist/web/hooks/test/utils.js +4 -0
- package/dist/web/hooks/test/utils.js.map +1 -1
- package/dist/web/hooks/use-layout.test.js +3 -3
- package/dist/web/hooks/use-layout.test.js.map +1 -1
- package/dist/web/hooks/use-open-external.test.js +15 -10
- package/dist/web/hooks/use-open-external.test.js.map +1 -1
- package/dist/web/hooks/use-tool-info.test.js +1 -1
- package/dist/web/hooks/use-tool-info.test.js.map +1 -1
- package/dist/web/hooks/use-user.test.js +1 -1
- package/dist/web/hooks/use-user.test.js.map +1 -1
- package/package.json +9 -9
- package/dist/server/const.d.ts +0 -1
- package/dist/server/const.js +0 -2
- package/dist/server/const.js.map +0 -1
|
@@ -0,0 +1,383 @@
|
|
|
1
|
+
import { Client } from "@modelcontextprotocol/sdk/client/index.js";
|
|
2
|
+
import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js";
|
|
3
|
+
import { describe, expect, it, vi } from "vitest";
|
|
4
|
+
import { z } from "zod";
|
|
5
|
+
import { buildMiddlewareChain, getHandlerMaps, matchesFilter, } from "./middleware.js";
|
|
6
|
+
import { McpServer } from "./server.js";
|
|
7
|
+
// ---------------------------------------------------------------------------
|
|
8
|
+
// matchesFilter
|
|
9
|
+
// ---------------------------------------------------------------------------
|
|
10
|
+
describe("matchesFilter", () => {
|
|
11
|
+
it("matches exact method", () => {
|
|
12
|
+
expect(matchesFilter("tools/call", "tools/call", false)).toBe(true);
|
|
13
|
+
});
|
|
14
|
+
it("rejects non-matching exact method", () => {
|
|
15
|
+
expect(matchesFilter("tools/list", "tools/call", false)).toBe(false);
|
|
16
|
+
});
|
|
17
|
+
it("matches wildcard", () => {
|
|
18
|
+
expect(matchesFilter("tools/call", "tools/*", false)).toBe(true);
|
|
19
|
+
expect(matchesFilter("tools/list", "tools/*", false)).toBe(true);
|
|
20
|
+
});
|
|
21
|
+
it("rejects non-matching wildcard", () => {
|
|
22
|
+
expect(matchesFilter("resources/read", "tools/*", false)).toBe(false);
|
|
23
|
+
});
|
|
24
|
+
it('category "request" matches when isNotification=false', () => {
|
|
25
|
+
expect(matchesFilter("tools/call", "request", false)).toBe(true);
|
|
26
|
+
});
|
|
27
|
+
it('category "request" rejects when isNotification=true', () => {
|
|
28
|
+
expect(matchesFilter("notifications/initialized", "request", true)).toBe(false);
|
|
29
|
+
});
|
|
30
|
+
it('category "notification" matches when isNotification=true', () => {
|
|
31
|
+
expect(matchesFilter("notifications/initialized", "notification", true)).toBe(true);
|
|
32
|
+
});
|
|
33
|
+
it('category "notification" rejects when isNotification=false', () => {
|
|
34
|
+
expect(matchesFilter("tools/call", "notification", false)).toBe(false);
|
|
35
|
+
});
|
|
36
|
+
});
|
|
37
|
+
// ---------------------------------------------------------------------------
|
|
38
|
+
// buildMiddlewareChain
|
|
39
|
+
// ---------------------------------------------------------------------------
|
|
40
|
+
describe("buildMiddlewareChain", () => {
|
|
41
|
+
const fakeExtra = {};
|
|
42
|
+
const makeHandler = (returnValue) => vi.fn(async () => returnValue);
|
|
43
|
+
const makeEntry = (filter, handler) => ({ filter, handler });
|
|
44
|
+
it("returns original handler when no middleware applies", () => {
|
|
45
|
+
const original = makeHandler("result");
|
|
46
|
+
const chain = buildMiddlewareChain("tools/call", false, original, [
|
|
47
|
+
makeEntry("resources/*", async (_req, _extra, next) => next()),
|
|
48
|
+
]);
|
|
49
|
+
expect(chain).toBe(original);
|
|
50
|
+
});
|
|
51
|
+
it("catch-all middleware runs for any method", async () => {
|
|
52
|
+
const original = makeHandler("ok");
|
|
53
|
+
const spy = vi.fn();
|
|
54
|
+
const chain = buildMiddlewareChain("tools/call", false, original, [
|
|
55
|
+
makeEntry(null, async (request, _extra, next) => {
|
|
56
|
+
spy(request.method);
|
|
57
|
+
return next();
|
|
58
|
+
}),
|
|
59
|
+
]);
|
|
60
|
+
const result = await chain({ method: "tools/call", params: {} }, fakeExtra);
|
|
61
|
+
expect(spy).toHaveBeenCalledWith("tools/call");
|
|
62
|
+
expect(result).toBe("ok");
|
|
63
|
+
});
|
|
64
|
+
it("method-scoped middleware only runs for matching methods", async () => {
|
|
65
|
+
const original = makeHandler("ok");
|
|
66
|
+
const spy = vi.fn();
|
|
67
|
+
const entries = [
|
|
68
|
+
makeEntry("tools/call", async (_req, _extra, next) => {
|
|
69
|
+
spy("tools/call");
|
|
70
|
+
return next();
|
|
71
|
+
}),
|
|
72
|
+
];
|
|
73
|
+
// Matching
|
|
74
|
+
const chain1 = buildMiddlewareChain("tools/call", false, original, entries);
|
|
75
|
+
await chain1({ method: "tools/call", params: {} }, fakeExtra);
|
|
76
|
+
expect(spy).toHaveBeenCalledTimes(1);
|
|
77
|
+
// Non-matching — returns original handler directly
|
|
78
|
+
const chain2 = buildMiddlewareChain("tools/list", false, original, entries);
|
|
79
|
+
expect(chain2).toBe(original);
|
|
80
|
+
});
|
|
81
|
+
it("executes middleware in registration order (onion model)", async () => {
|
|
82
|
+
const calls = [];
|
|
83
|
+
const original = makeHandler("result");
|
|
84
|
+
const chain = buildMiddlewareChain("tools/call", false, original, [
|
|
85
|
+
makeEntry(null, async (_req, _extra, next) => {
|
|
86
|
+
calls.push("A:before");
|
|
87
|
+
const result = await next();
|
|
88
|
+
calls.push("A:after");
|
|
89
|
+
return result;
|
|
90
|
+
}),
|
|
91
|
+
makeEntry(null, async (_req, _extra, next) => {
|
|
92
|
+
calls.push("B:before");
|
|
93
|
+
const result = await next();
|
|
94
|
+
calls.push("B:after");
|
|
95
|
+
return result;
|
|
96
|
+
}),
|
|
97
|
+
]);
|
|
98
|
+
await chain({ method: "tools/call", params: {} }, fakeExtra);
|
|
99
|
+
expect(calls).toEqual(["A:before", "B:before", "B:after", "A:after"]);
|
|
100
|
+
});
|
|
101
|
+
it("short-circuit (no next() call) skips handler", async () => {
|
|
102
|
+
const original = makeHandler("original");
|
|
103
|
+
const chain = buildMiddlewareChain("tools/call", false, original, [
|
|
104
|
+
makeEntry(null, async () => "short-circuited"),
|
|
105
|
+
]);
|
|
106
|
+
const result = await chain({ method: "tools/call", params: {} }, fakeExtra);
|
|
107
|
+
expect(result).toBe("short-circuited");
|
|
108
|
+
expect(original).not.toHaveBeenCalled();
|
|
109
|
+
});
|
|
110
|
+
it("middleware can modify result post-next()", async () => {
|
|
111
|
+
const original = makeHandler({ value: 1 });
|
|
112
|
+
const chain = buildMiddlewareChain("tools/call", false, original, [
|
|
113
|
+
makeEntry(null, async (_req, _extra, next) => {
|
|
114
|
+
const result = (await next());
|
|
115
|
+
return { value: result.value + 10 };
|
|
116
|
+
}),
|
|
117
|
+
]);
|
|
118
|
+
const result = await chain({ method: "tools/call", params: {} }, fakeExtra);
|
|
119
|
+
expect(result).toEqual({ value: 11 });
|
|
120
|
+
});
|
|
121
|
+
it("throws on double next() call", async () => {
|
|
122
|
+
const original = makeHandler("ok");
|
|
123
|
+
const chain = buildMiddlewareChain("tools/call", false, original, [
|
|
124
|
+
makeEntry(null, async (_req, _extra, next) => {
|
|
125
|
+
await next();
|
|
126
|
+
return next(); // double call
|
|
127
|
+
}),
|
|
128
|
+
]);
|
|
129
|
+
await expect(chain({ method: "tools/call", params: {} }, fakeExtra)).rejects.toThrow("next() called multiple times");
|
|
130
|
+
});
|
|
131
|
+
it("propagates errors from handler and middleware", async () => {
|
|
132
|
+
// Error from original handler bubbles through middleware
|
|
133
|
+
const failingHandler = vi.fn(async () => {
|
|
134
|
+
throw new Error("handler boom");
|
|
135
|
+
});
|
|
136
|
+
const chain1 = buildMiddlewareChain("tools/call", false, failingHandler, [
|
|
137
|
+
makeEntry(null, async (_req, _extra, next) => next()),
|
|
138
|
+
]);
|
|
139
|
+
await expect(chain1({ method: "tools/call", params: {} }, fakeExtra)).rejects.toThrow("handler boom");
|
|
140
|
+
// Error thrown inside middleware propagates
|
|
141
|
+
const chain2 = buildMiddlewareChain("tools/call", false, makeHandler("ok"), [
|
|
142
|
+
makeEntry(null, async () => {
|
|
143
|
+
throw new Error("middleware boom");
|
|
144
|
+
}),
|
|
145
|
+
]);
|
|
146
|
+
await expect(chain2({ method: "tools/call", params: {} }, fakeExtra)).rejects.toThrow("middleware boom");
|
|
147
|
+
});
|
|
148
|
+
it("passes extra as undefined for notifications (isNotification=true)", async () => {
|
|
149
|
+
const original = makeHandler(undefined);
|
|
150
|
+
let capturedExtra = {};
|
|
151
|
+
const chain = buildMiddlewareChain("notifications/initialized", true, original, [
|
|
152
|
+
makeEntry(null, async (_req, extra, next) => {
|
|
153
|
+
capturedExtra = extra;
|
|
154
|
+
return next();
|
|
155
|
+
}),
|
|
156
|
+
]);
|
|
157
|
+
await chain({ method: "notifications/initialized" });
|
|
158
|
+
expect(capturedExtra).toBeUndefined();
|
|
159
|
+
});
|
|
160
|
+
it("defaults params to empty object when rawRequest has no params", async () => {
|
|
161
|
+
const original = makeHandler("ok");
|
|
162
|
+
let capturedParams;
|
|
163
|
+
const chain = buildMiddlewareChain("tools/call", false, original, [
|
|
164
|
+
makeEntry(null, async (request, _extra, next) => {
|
|
165
|
+
capturedParams = request.params;
|
|
166
|
+
return next();
|
|
167
|
+
}),
|
|
168
|
+
]);
|
|
169
|
+
await chain({ method: "tools/call" }, fakeExtra);
|
|
170
|
+
expect(capturedParams).toEqual({});
|
|
171
|
+
});
|
|
172
|
+
it("propagates in-place param mutation to original handler", async () => {
|
|
173
|
+
let handlerReceivedName = "";
|
|
174
|
+
const original = vi.fn(async (rawReq) => {
|
|
175
|
+
handlerReceivedName = rawReq.params.name;
|
|
176
|
+
return "ok";
|
|
177
|
+
});
|
|
178
|
+
const chain = buildMiddlewareChain("tools/call", false, original, [
|
|
179
|
+
makeEntry(null, async (request, _extra, next) => {
|
|
180
|
+
request.params.name = "mutated";
|
|
181
|
+
return next();
|
|
182
|
+
}),
|
|
183
|
+
]);
|
|
184
|
+
await chain({ params: { name: "original" } }, fakeExtra);
|
|
185
|
+
expect(handlerReceivedName).toBe("mutated");
|
|
186
|
+
});
|
|
187
|
+
it("propagates full param replacement to original handler", async () => {
|
|
188
|
+
let handlerReceivedParams = {};
|
|
189
|
+
const original = vi.fn(async (rawReq) => {
|
|
190
|
+
handlerReceivedParams = rawReq.params;
|
|
191
|
+
return "ok";
|
|
192
|
+
});
|
|
193
|
+
const chain = buildMiddlewareChain("tools/call", false, original, [
|
|
194
|
+
makeEntry(null, async (request, _extra, next) => {
|
|
195
|
+
request.params = { replaced: true };
|
|
196
|
+
return next();
|
|
197
|
+
}),
|
|
198
|
+
]);
|
|
199
|
+
await chain({ params: { original: true } }, fakeExtra);
|
|
200
|
+
expect(handlerReceivedParams).toEqual({ replaced: true });
|
|
201
|
+
});
|
|
202
|
+
});
|
|
203
|
+
// ---------------------------------------------------------------------------
|
|
204
|
+
// McpServer.mcpMiddleware() integration tests
|
|
205
|
+
// ---------------------------------------------------------------------------
|
|
206
|
+
describe("McpServer.mcpMiddleware()", () => {
|
|
207
|
+
function createClient() {
|
|
208
|
+
return new Client({ name: "test-client", version: "1.0.0" });
|
|
209
|
+
}
|
|
210
|
+
it("returns this for chaining", () => {
|
|
211
|
+
const server = new McpServer({ name: "test", version: "1.0.0" });
|
|
212
|
+
const result = server.mcpMiddleware(async (_req, _extra, next) => next());
|
|
213
|
+
expect(result).toBe(server);
|
|
214
|
+
});
|
|
215
|
+
it("intercepts tools/call and exposes request params", async () => {
|
|
216
|
+
let capturedMethod = "";
|
|
217
|
+
let capturedParams = {};
|
|
218
|
+
const server = new McpServer({ name: "test", version: "1.0.0" });
|
|
219
|
+
server.registerTool("greet", {
|
|
220
|
+
description: "greet",
|
|
221
|
+
inputSchema: { name: z.string() },
|
|
222
|
+
}, (args) => ({
|
|
223
|
+
content: [{ type: "text", text: `hi ${args.name}` }],
|
|
224
|
+
}));
|
|
225
|
+
server.mcpMiddleware("tools/call", async (request, _extra, next) => {
|
|
226
|
+
capturedMethod = request.method;
|
|
227
|
+
capturedParams = request.params;
|
|
228
|
+
return next();
|
|
229
|
+
});
|
|
230
|
+
const client = createClient();
|
|
231
|
+
const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
|
|
232
|
+
await server.connect(serverTransport);
|
|
233
|
+
await client.connect(clientTransport);
|
|
234
|
+
const result = await client.callTool({
|
|
235
|
+
name: "greet",
|
|
236
|
+
arguments: { name: "World" },
|
|
237
|
+
});
|
|
238
|
+
expect(capturedMethod).toBe("tools/call");
|
|
239
|
+
expect(capturedParams).toMatchObject({
|
|
240
|
+
name: "greet",
|
|
241
|
+
arguments: { name: "World" },
|
|
242
|
+
});
|
|
243
|
+
expect(result.content).toEqual([{ type: "text", text: "hi World" }]);
|
|
244
|
+
await client.close();
|
|
245
|
+
await server.close();
|
|
246
|
+
});
|
|
247
|
+
it("array filter works", async () => {
|
|
248
|
+
const matchedMethods = [];
|
|
249
|
+
const server = new McpServer({ name: "test", version: "1.0.0" });
|
|
250
|
+
server.registerTool("t1", { description: "t1" }, () => ({
|
|
251
|
+
content: [{ type: "text", text: "ok" }],
|
|
252
|
+
}));
|
|
253
|
+
server.mcpMiddleware(["tools/call", "tools/list"], async (request, _extra, next) => {
|
|
254
|
+
matchedMethods.push(request.method);
|
|
255
|
+
return next();
|
|
256
|
+
});
|
|
257
|
+
const client = createClient();
|
|
258
|
+
const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
|
|
259
|
+
await server.connect(serverTransport);
|
|
260
|
+
await client.connect(clientTransport);
|
|
261
|
+
await client.listTools();
|
|
262
|
+
await client.callTool({ name: "t1" });
|
|
263
|
+
expect(matchedMethods).toEqual(["tools/list", "tools/call"]);
|
|
264
|
+
await client.close();
|
|
265
|
+
await server.close();
|
|
266
|
+
});
|
|
267
|
+
it("throws if registered after connect()", async () => {
|
|
268
|
+
const server = new McpServer({ name: "test", version: "1.0.0" });
|
|
269
|
+
const [_clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
|
|
270
|
+
await server.connect(serverTransport);
|
|
271
|
+
expect(() => server.mcpMiddleware(async (_req, _extra, next) => next())).toThrow("Cannot register MCP middleware after run() or connect()");
|
|
272
|
+
await server.close();
|
|
273
|
+
});
|
|
274
|
+
it("throws when filter provided without handler", () => {
|
|
275
|
+
const server = new McpServer({ name: "test", version: "1.0.0" });
|
|
276
|
+
expect(() =>
|
|
277
|
+
// @ts-expect-error intentionally passing filter without handler
|
|
278
|
+
server.mcpMiddleware("tools/call")).toThrow("mcpMiddleware requires a handler function");
|
|
279
|
+
});
|
|
280
|
+
it("catch-all middleware + filtered middleware stack correctly", async () => {
|
|
281
|
+
const calls = [];
|
|
282
|
+
const server = new McpServer({ name: "test", version: "1.0.0" });
|
|
283
|
+
server.registerTool("t1", { description: "t1" }, () => ({
|
|
284
|
+
content: [{ type: "text", text: "ok" }],
|
|
285
|
+
}));
|
|
286
|
+
server
|
|
287
|
+
.mcpMiddleware(async (request, _extra, next) => {
|
|
288
|
+
calls.push(`global:${request.method}`);
|
|
289
|
+
return next();
|
|
290
|
+
})
|
|
291
|
+
.mcpMiddleware("tools/call", async (_req, _extra, next) => {
|
|
292
|
+
calls.push("tools-only");
|
|
293
|
+
return next();
|
|
294
|
+
});
|
|
295
|
+
const client = createClient();
|
|
296
|
+
const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
|
|
297
|
+
await server.connect(serverTransport);
|
|
298
|
+
await client.connect(clientTransport);
|
|
299
|
+
await client.listTools();
|
|
300
|
+
await client.callTool({ name: "t1" });
|
|
301
|
+
// Catch-all also intercepts initialize + notifications/initialized from handshake.
|
|
302
|
+
// tools/list: only global middleware runs
|
|
303
|
+
// tools/call: global + tools-only both run
|
|
304
|
+
expect(calls).toContain("global:tools/list");
|
|
305
|
+
expect(calls).toContain("global:tools/call");
|
|
306
|
+
expect(calls).toContain("tools-only");
|
|
307
|
+
// "tools-only" must come right after "global:tools/call"
|
|
308
|
+
const toolsCallIdx = calls.indexOf("global:tools/call");
|
|
309
|
+
expect(calls[toolsCallIdx + 1]).toBe("tools-only");
|
|
310
|
+
await client.close();
|
|
311
|
+
await server.close();
|
|
312
|
+
});
|
|
313
|
+
it("notification middleware receives extra as undefined", async () => {
|
|
314
|
+
let capturedExtra = "sentinel";
|
|
315
|
+
const server = new McpServer({ name: "test", version: "1.0.0" });
|
|
316
|
+
server.registerTool("t1", { description: "t1" }, () => ({
|
|
317
|
+
content: [{ type: "text", text: "ok" }],
|
|
318
|
+
}));
|
|
319
|
+
server.mcpMiddleware("notification", async (_request, extra, next) => {
|
|
320
|
+
capturedExtra = extra;
|
|
321
|
+
return next();
|
|
322
|
+
});
|
|
323
|
+
const client = createClient();
|
|
324
|
+
const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
|
|
325
|
+
await server.connect(serverTransport);
|
|
326
|
+
await client.connect(clientTransport);
|
|
327
|
+
// The client sends notifications/initialized automatically on connect.
|
|
328
|
+
await client.listTools();
|
|
329
|
+
expect(capturedExtra).toBeUndefined();
|
|
330
|
+
await client.close();
|
|
331
|
+
await server.close();
|
|
332
|
+
});
|
|
333
|
+
it("category 'request' filter matches requests but not notifications", async () => {
|
|
334
|
+
const matchedMethods = [];
|
|
335
|
+
const server = new McpServer({ name: "test", version: "1.0.0" });
|
|
336
|
+
server.registerTool("t1", { description: "t1" }, () => ({
|
|
337
|
+
content: [{ type: "text", text: "ok" }],
|
|
338
|
+
}));
|
|
339
|
+
server.mcpMiddleware("request", async (request, _extra, next) => {
|
|
340
|
+
matchedMethods.push(request.method);
|
|
341
|
+
return next();
|
|
342
|
+
});
|
|
343
|
+
const client = createClient();
|
|
344
|
+
const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
|
|
345
|
+
await server.connect(serverTransport);
|
|
346
|
+
await client.connect(clientTransport);
|
|
347
|
+
await client.listTools();
|
|
348
|
+
await client.callTool({ name: "t1" });
|
|
349
|
+
expect(matchedMethods).toContain("tools/list");
|
|
350
|
+
expect(matchedMethods).toContain("tools/call");
|
|
351
|
+
expect(matchedMethods).not.toContain("notifications/initialized");
|
|
352
|
+
await client.close();
|
|
353
|
+
await server.close();
|
|
354
|
+
});
|
|
355
|
+
});
|
|
356
|
+
// ---------------------------------------------------------------------------
|
|
357
|
+
// getHandlerMaps
|
|
358
|
+
// ---------------------------------------------------------------------------
|
|
359
|
+
describe("getHandlerMaps", () => {
|
|
360
|
+
it("throws for incompatible server objects", () => {
|
|
361
|
+
// Empty object
|
|
362
|
+
expect(() => getHandlerMaps({})).toThrow("Incompatible MCP SDK version");
|
|
363
|
+
// Only _requestHandlers (missing _notificationHandlers)
|
|
364
|
+
expect(() => getHandlerMaps({ _requestHandlers: new Map() })).toThrow("Incompatible MCP SDK version");
|
|
365
|
+
// Non-Map values
|
|
366
|
+
expect(() => getHandlerMaps({
|
|
367
|
+
_requestHandlers: {},
|
|
368
|
+
_notificationHandlers: {},
|
|
369
|
+
})).toThrow("Incompatible MCP SDK version");
|
|
370
|
+
});
|
|
371
|
+
it("returns handler maps from valid server", () => {
|
|
372
|
+
const reqMap = new Map();
|
|
373
|
+
const notifMap = new Map();
|
|
374
|
+
const fake = {
|
|
375
|
+
_requestHandlers: reqMap,
|
|
376
|
+
_notificationHandlers: notifMap,
|
|
377
|
+
};
|
|
378
|
+
const result = getHandlerMaps(fake);
|
|
379
|
+
expect(result.requestHandlers).toBe(reqMap);
|
|
380
|
+
expect(result.notificationHandlers).toBe(notifMap);
|
|
381
|
+
});
|
|
382
|
+
});
|
|
383
|
+
//# sourceMappingURL=middleware.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"middleware.test.js","sourceRoot":"","sources":["../../src/server/middleware.test.ts"],"names":[],"mappings":"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"}
|
package/dist/server/server.d.ts
CHANGED
|
@@ -2,8 +2,9 @@ import type { McpUiResourceMeta } from "@modelcontextprotocol/ext-apps";
|
|
|
2
2
|
import { McpServer as McpServerBase, type RegisteredTool } from "@modelcontextprotocol/sdk/server/mcp.js";
|
|
3
3
|
import type { AnySchema, SchemaOutput, ZodRawShapeCompat } from "@modelcontextprotocol/sdk/server/zod-compat.js";
|
|
4
4
|
import type { RequestHandlerExtra } from "@modelcontextprotocol/sdk/shared/protocol.js";
|
|
5
|
-
import type { CallToolResult, Resource, ServerNotification, ServerRequest, ToolAnnotations } from "@modelcontextprotocol/sdk/types.js";
|
|
5
|
+
import type { CallToolResult, Resource, ServerNotification, ServerRequest, ServerResult, ToolAnnotations } from "@modelcontextprotocol/sdk/types.js";
|
|
6
6
|
import type { RequestHandler } from "express";
|
|
7
|
+
import type { McpExtra, McpExtraFor, McpMethodString, McpMiddlewareFilter, McpMiddlewareFn, McpResultFor, McpTypedMiddlewareFn, McpWildcard } from "./middleware.js";
|
|
7
8
|
export type ToolDef<TInput = unknown, TOutput = unknown, TResponseMetadata = unknown> = {
|
|
8
9
|
input: TInput;
|
|
9
10
|
output: TOutput;
|
|
@@ -84,8 +85,49 @@ export declare class McpServer<TTools extends Record<string, ToolDef> = Record<n
|
|
|
84
85
|
readonly $types: McpServerTypes<TTools>;
|
|
85
86
|
private express?;
|
|
86
87
|
private customMiddleware;
|
|
88
|
+
private mcpMiddlewareEntries;
|
|
89
|
+
private mcpMiddlewareApplied;
|
|
87
90
|
use(...handlers: RequestHandler[]): this;
|
|
88
91
|
use(path: string, ...handlers: RequestHandler[]): this;
|
|
92
|
+
/**
|
|
93
|
+
* Register MCP protocol-level middleware (catch-all).
|
|
94
|
+
*/
|
|
95
|
+
mcpMiddleware(handler: McpMiddlewareFn): this;
|
|
96
|
+
/**
|
|
97
|
+
* Register MCP protocol-level middleware for all requests (`extra` is `McpExtra`).
|
|
98
|
+
*/
|
|
99
|
+
mcpMiddleware(filter: "request", handler: (request: {
|
|
100
|
+
method: string;
|
|
101
|
+
params: Record<string, unknown>;
|
|
102
|
+
}, extra: McpExtra, next: () => Promise<ServerResult>) => Promise<unknown> | unknown): this;
|
|
103
|
+
/**
|
|
104
|
+
* Register MCP protocol-level middleware for all notifications (`extra` is `undefined`).
|
|
105
|
+
*/
|
|
106
|
+
mcpMiddleware(filter: "notification", handler: (request: {
|
|
107
|
+
method: string;
|
|
108
|
+
params: Record<string, unknown>;
|
|
109
|
+
}, extra: undefined, next: () => Promise<undefined>) => Promise<unknown> | unknown): this;
|
|
110
|
+
/**
|
|
111
|
+
* Register MCP protocol-level middleware for an exact method.
|
|
112
|
+
* Narrows `params`, `extra`, and `next()` result based on the method string.
|
|
113
|
+
*/
|
|
114
|
+
mcpMiddleware<M extends McpMethodString>(filter: M, handler: McpTypedMiddlewareFn<M>): this;
|
|
115
|
+
/**
|
|
116
|
+
* Register MCP protocol-level middleware for a wildcard pattern (e.g. `"tools/*"`).
|
|
117
|
+
* `next()` returns the union of result types for matching methods.
|
|
118
|
+
*/
|
|
119
|
+
mcpMiddleware<W extends McpWildcard>(filter: W, handler: (request: {
|
|
120
|
+
method: string;
|
|
121
|
+
params: Record<string, unknown>;
|
|
122
|
+
}, extra: McpExtraFor<W>, next: () => Promise<McpResultFor<W>>) => Promise<unknown> | unknown): this;
|
|
123
|
+
/**
|
|
124
|
+
* Register MCP protocol-level middleware with a method filter.
|
|
125
|
+
* Filter can be an exact method (`"tools/call"`), wildcard (`"tools/*"`),
|
|
126
|
+
* category (`"request"` | `"notification"`), or an array of those.
|
|
127
|
+
*/
|
|
128
|
+
mcpMiddleware(filter: McpMiddlewareFilter, handler: McpMiddlewareFn): this;
|
|
129
|
+
private applyMcpMiddleware;
|
|
130
|
+
connect(transport: Parameters<typeof McpServerBase.prototype.connect>[0]): Promise<void>;
|
|
89
131
|
run(): Promise<void>;
|
|
90
132
|
registerWidget<TName extends string, TInput extends ZodRawShapeCompat, TReturn extends {
|
|
91
133
|
content: CallToolResult["content"];
|
package/dist/server/server.js
CHANGED
|
@@ -4,8 +4,8 @@ import http from "node:http";
|
|
|
4
4
|
import path from "node:path";
|
|
5
5
|
import { McpServer as McpServerBase, } from "@modelcontextprotocol/sdk/server/mcp.js";
|
|
6
6
|
import { mergeWith, union } from "es-toolkit";
|
|
7
|
-
import { DEFAULT_HMR_PORT } from "./const.js";
|
|
8
7
|
import { createServer } from "./express.js";
|
|
8
|
+
import { buildMiddlewareChain, getHandlerMaps } from "./middleware.js";
|
|
9
9
|
import { templateHelper } from "./templateHelper.js";
|
|
10
10
|
const mergeWithUnion = (target, source) => {
|
|
11
11
|
return mergeWith(target, source, (targetVal, sourceVal) => {
|
|
@@ -17,6 +17,8 @@ const mergeWithUnion = (target, source) => {
|
|
|
17
17
|
export class McpServer extends McpServerBase {
|
|
18
18
|
express;
|
|
19
19
|
customMiddleware = [];
|
|
20
|
+
mcpMiddlewareEntries = [];
|
|
21
|
+
mcpMiddlewareApplied = false;
|
|
20
22
|
use(pathOrHandler, ...handlers) {
|
|
21
23
|
if (typeof pathOrHandler === "string") {
|
|
22
24
|
this.customMiddleware.push({
|
|
@@ -31,22 +33,73 @@ export class McpServer extends McpServerBase {
|
|
|
31
33
|
}
|
|
32
34
|
return this;
|
|
33
35
|
}
|
|
36
|
+
mcpMiddleware(filterOrHandler,
|
|
37
|
+
// biome-ignore lint/suspicious/noExplicitAny: overloads narrow the handler type at call sites; implementation must accept all variants
|
|
38
|
+
maybeHandler) {
|
|
39
|
+
if (this.mcpMiddlewareApplied) {
|
|
40
|
+
throw new Error("Cannot register MCP middleware after run() or connect() has been called");
|
|
41
|
+
}
|
|
42
|
+
const handler = maybeHandler;
|
|
43
|
+
if (typeof filterOrHandler === "function") {
|
|
44
|
+
this.mcpMiddlewareEntries.push({
|
|
45
|
+
filter: null,
|
|
46
|
+
handler: filterOrHandler,
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
else if (handler) {
|
|
50
|
+
this.mcpMiddlewareEntries.push({
|
|
51
|
+
filter: filterOrHandler,
|
|
52
|
+
handler,
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
throw new Error("mcpMiddleware requires a handler function when a filter is provided");
|
|
57
|
+
}
|
|
58
|
+
return this;
|
|
59
|
+
}
|
|
60
|
+
applyMcpMiddleware() {
|
|
61
|
+
if (this.mcpMiddlewareApplied) {
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
this.mcpMiddlewareApplied = true;
|
|
65
|
+
if (this.mcpMiddlewareEntries.length === 0) {
|
|
66
|
+
return;
|
|
67
|
+
}
|
|
68
|
+
const { requestHandlers, notificationHandlers } = getHandlerMaps(this.server);
|
|
69
|
+
const entries = this.mcpMiddlewareEntries;
|
|
70
|
+
// Wrap existing handlers and proxy future .set() for lazy SDK registration
|
|
71
|
+
const instrumentMap = (map, isNotification) => {
|
|
72
|
+
for (const [method, handler] of map) {
|
|
73
|
+
map.set(method, buildMiddlewareChain(method, isNotification, handler, entries));
|
|
74
|
+
}
|
|
75
|
+
const originalSet = map.set.bind(map);
|
|
76
|
+
map.set = (method, handler) => originalSet(method, buildMiddlewareChain(method, isNotification, handler, entries));
|
|
77
|
+
};
|
|
78
|
+
instrumentMap(requestHandlers, false);
|
|
79
|
+
instrumentMap(notificationHandlers, true);
|
|
80
|
+
}
|
|
81
|
+
async connect(transport) {
|
|
82
|
+
this.applyMcpMiddleware();
|
|
83
|
+
return super.connect(transport);
|
|
84
|
+
}
|
|
34
85
|
async run() {
|
|
86
|
+
this.applyMcpMiddleware();
|
|
87
|
+
const httpServer = http.createServer();
|
|
35
88
|
if (!this.express) {
|
|
36
89
|
this.express = await createServer({
|
|
37
90
|
server: this,
|
|
91
|
+
httpServer,
|
|
38
92
|
customMiddleware: this.customMiddleware,
|
|
39
93
|
});
|
|
40
94
|
}
|
|
41
|
-
|
|
95
|
+
httpServer.on("request", this.express);
|
|
42
96
|
return new Promise((resolve, reject) => {
|
|
43
|
-
|
|
44
|
-
server.on("error", (error) => {
|
|
97
|
+
httpServer.on("error", (error) => {
|
|
45
98
|
console.error("Failed to start server:", error);
|
|
46
99
|
reject(error);
|
|
47
100
|
});
|
|
48
101
|
const port = parseInt(process.env.__PORT ?? "3000", 10);
|
|
49
|
-
|
|
102
|
+
httpServer.listen(port, () => {
|
|
50
103
|
resolve();
|
|
51
104
|
});
|
|
52
105
|
});
|
|
@@ -136,14 +189,14 @@ export class McpServer extends McpServerBase {
|
|
|
136
189
|
const { hostType, uri: widgetUri, mimeType, buildContentMeta, } = widgetConfig;
|
|
137
190
|
this.registerResource(name, widgetUri, { ...resourceConfig, _meta: resourceConfig._meta }, async (uri, extra) => {
|
|
138
191
|
const isProduction = process.env.NODE_ENV === "production";
|
|
139
|
-
const useForwardedHost = process.env.SKYBRIDGE_USE_FORWARDED_HOST === "true";
|
|
140
192
|
const isClaude = extra?.requestInfo?.headers?.["user-agent"] === "Claude-User";
|
|
141
|
-
const
|
|
142
|
-
|
|
143
|
-
const
|
|
193
|
+
const forwardedHost = extra?.requestInfo?.headers?.["x-forwarded-host"];
|
|
194
|
+
const forwardedProto = extra?.requestInfo?.headers?.["x-forwarded-proto"] ?? "https";
|
|
195
|
+
const hostFromHeaders = forwardedHost ?? extra?.requestInfo?.headers?.host;
|
|
196
|
+
const useExternalHost = isProduction || isClaude || forwardedHost != null;
|
|
144
197
|
const devPort = process.env.__PORT || "3000";
|
|
145
198
|
const serverUrl = useExternalHost
|
|
146
|
-
?
|
|
199
|
+
? `${forwardedProto}://${hostFromHeaders}`
|
|
147
200
|
: `http://localhost:${devPort}`;
|
|
148
201
|
const html = isProduction
|
|
149
202
|
? templateHelper.renderProduction({
|
|
@@ -160,9 +213,7 @@ export class McpServer extends McpServerBase {
|
|
|
160
213
|
});
|
|
161
214
|
const connectDomains = [serverUrl];
|
|
162
215
|
if (!isProduction) {
|
|
163
|
-
|
|
164
|
-
const VITE_HMR_WEBSOCKET_DEFAULT_URL = `ws://localhost:${hmrPort}`;
|
|
165
|
-
connectDomains.push(VITE_HMR_WEBSOCKET_DEFAULT_URL);
|
|
216
|
+
connectDomains.push(serverUrl.replace(/^http/, "ws"));
|
|
166
217
|
}
|
|
167
218
|
const pathname = extra?.requestInfo?.url?.pathname ?? "";
|
|
168
219
|
const url = `https://${hostFromHeaders}${pathname}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server/server.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,IAAI,MAAM,WAAW,CAAC;AAK7B,OAAO,EACL,SAAS,IAAI,aAAa,GAG3B,MAAM,yCAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server/server.ts"],"names":[],"mappings":"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"}
|