skybridge 0.0.0-dev.c6cffff → 0.0.0-dev.c6d614a
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 +8 -4
- package/dist/cli/header.js +1 -1
- package/dist/cli/header.js.map +1 -1
- package/dist/cli/types.d.ts +5 -0
- package/dist/cli/types.js +2 -0
- package/dist/cli/types.js.map +1 -0
- package/dist/cli/use-messages.d.ts +3 -0
- package/dist/cli/use-messages.js +11 -0
- package/dist/cli/use-messages.js.map +1 -0
- package/dist/cli/use-nodemon.d.ts +2 -7
- package/dist/cli/use-nodemon.js +6 -18
- package/dist/cli/use-nodemon.js.map +1 -1
- package/dist/cli/use-tunnel.d.ts +14 -0
- package/dist/cli/use-tunnel.js +97 -0
- package/dist/cli/use-tunnel.js.map +1 -0
- package/dist/commands/dev.d.ts +2 -1
- package/dist/commands/dev.js +14 -7
- package/dist/commands/dev.js.map +1 -1
- package/dist/commands/start.js +5 -3
- package/dist/commands/start.js.map +1 -1
- package/dist/server/asset-base-url-transform-plugin.d.ts +5 -6
- package/dist/server/asset-base-url-transform-plugin.js +8 -9
- package/dist/server/asset-base-url-transform-plugin.js.map +1 -1
- package/dist/server/asset-base-url-transform-plugin.test.js +12 -13
- package/dist/server/asset-base-url-transform-plugin.test.js.map +1 -1
- package/dist/server/express.d.ts +9 -3
- package/dist/server/express.js +24 -19
- package/dist/server/express.js.map +1 -1
- package/dist/server/express.test.js +189 -11
- package/dist/server/express.test.js.map +1 -1
- package/dist/server/metric.d.ts +14 -0
- package/dist/server/metric.js +62 -0
- package/dist/server/metric.js.map +1 -0
- package/dist/server/middleware.test.js +107 -0
- package/dist/server/middleware.test.js.map +1 -1
- package/dist/server/server.d.ts +4 -1
- package/dist/server/server.js +81 -35
- package/dist/server/server.js.map +1 -1
- package/dist/server/templateHelper.d.ts +0 -1
- package/dist/server/templateHelper.js.map +1 -1
- package/dist/server/templates/development.hbs +0 -55
- package/dist/server/widgetsDevServer.d.ts +2 -1
- package/dist/server/widgetsDevServer.js +3 -14
- package/dist/server/widgetsDevServer.js.map +1 -1
- package/dist/test/utils.d.ts +5 -1
- package/dist/test/utils.js +3 -2
- package/dist/test/utils.js.map +1 -1
- package/dist/test/widget.test.js +88 -15
- package/dist/test/widget.test.js.map +1 -1
- package/dist/version.d.ts +1 -0
- package/dist/version.js +5 -0
- package/dist/version.js.map +1 -0
- package/dist/web/bridges/apps-sdk/adaptor.d.ts +4 -2
- package/dist/web/bridges/apps-sdk/adaptor.js +24 -12
- package/dist/web/bridges/apps-sdk/adaptor.js.map +1 -1
- package/dist/web/bridges/apps-sdk/types.d.ts +10 -5
- package/dist/web/bridges/apps-sdk/types.js.map +1 -1
- package/dist/web/bridges/mcp-app/adaptor.d.ts +14 -2
- package/dist/web/bridges/mcp-app/adaptor.js +113 -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/bridges/types.d.ts +8 -1
- package/dist/web/components/modal-provider.js +2 -4
- package/dist/web/components/modal-provider.js.map +1 -1
- package/dist/web/create-store.js +15 -1
- package/dist/web/create-store.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-files.d.ts +2 -1
- package/dist/web/hooks/use-files.js +1 -0
- package/dist/web/hooks/use-files.js.map +1 -1
- package/dist/web/hooks/use-files.test.js +22 -2
- package/dist/web/hooks/use-files.test.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-request-modal.test.js +5 -1
- package/dist/web/hooks/use-request-modal.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.js +18 -2
- package/dist/web/hooks/use-user.js.map +1 -1
- package/dist/web/hooks/use-user.test.js +29 -1
- package/dist/web/hooks/use-user.test.js.map +1 -1
- package/dist/web/hooks/use-widget-state.test.js +114 -1
- package/dist/web/hooks/use-widget-state.test.js.map +1 -1
- package/dist/web/plugin/transform-data-llm.js +1 -1
- package/dist/web/plugin/transform-data-llm.js.map +1 -1
- package/package.json +16 -15
- package/tsconfig.base.json +3 -0
- package/dist/server/const.d.ts +0 -1
- package/dist/server/const.js +0 -2
- package/dist/server/const.js.map +0 -1
package/dist/server/express.js
CHANGED
|
@@ -2,11 +2,8 @@ import path from "node:path";
|
|
|
2
2
|
import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
|
|
3
3
|
import cors from "cors";
|
|
4
4
|
import express from "express";
|
|
5
|
-
|
|
6
|
-
const
|
|
7
|
-
app.use(express.json());
|
|
8
|
-
const env = process.env.NODE_ENV || "development";
|
|
9
|
-
for (const middleware of customMiddleware) {
|
|
5
|
+
function applyMiddlewares(app, middlewares) {
|
|
6
|
+
for (const middleware of middlewares) {
|
|
10
7
|
if (middleware.path) {
|
|
11
8
|
app.use(middleware.path, ...middleware.handlers);
|
|
12
9
|
}
|
|
@@ -14,22 +11,40 @@ export async function createServer({ server, customMiddleware = [], }) {
|
|
|
14
11
|
app.use(...middleware.handlers);
|
|
15
12
|
}
|
|
16
13
|
}
|
|
14
|
+
}
|
|
15
|
+
function defaultErrorHandler(err, _req, res, _next) {
|
|
16
|
+
console.error("Error handling MCP request:", err);
|
|
17
|
+
if (!res.headersSent) {
|
|
18
|
+
res.status(500).json({
|
|
19
|
+
jsonrpc: "2.0",
|
|
20
|
+
error: { code: -32603, message: "Internal server error" },
|
|
21
|
+
id: null,
|
|
22
|
+
});
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
export async function createApp({ mcpServer, httpServer, customMiddleware = [], errorMiddleware = [], }) {
|
|
26
|
+
const app = express();
|
|
27
|
+
app.use(express.json());
|
|
28
|
+
const env = process.env.NODE_ENV || "development";
|
|
29
|
+
applyMiddlewares(app, customMiddleware);
|
|
17
30
|
if (env !== "production") {
|
|
18
31
|
const { devtoolsStaticServer } = await import("@skybridge/devtools");
|
|
19
32
|
app.use(await devtoolsStaticServer());
|
|
20
33
|
const { widgetsDevServer } = await import("./widgetsDevServer.js");
|
|
21
|
-
app.use(await widgetsDevServer());
|
|
34
|
+
app.use(await widgetsDevServer(httpServer));
|
|
22
35
|
}
|
|
23
36
|
if (env === "production") {
|
|
24
37
|
const assetsPath = path.join(process.cwd(), "dist", "assets");
|
|
25
38
|
app.use("/assets", cors());
|
|
26
39
|
app.use("/assets", express.static(assetsPath));
|
|
27
40
|
}
|
|
28
|
-
app.use("/mcp", mcpMiddleware(
|
|
41
|
+
app.use("/mcp", mcpMiddleware(mcpServer));
|
|
42
|
+
applyMiddlewares(app, errorMiddleware);
|
|
43
|
+
app.use("/mcp", defaultErrorHandler);
|
|
29
44
|
return app;
|
|
30
45
|
}
|
|
31
46
|
const mcpMiddleware = (server) => {
|
|
32
|
-
return async (req, res,
|
|
47
|
+
return async (req, res, next) => {
|
|
33
48
|
if (req.method !== "POST") {
|
|
34
49
|
res.writeHead(405).end(JSON.stringify({
|
|
35
50
|
jsonrpc: "2.0",
|
|
@@ -55,17 +70,7 @@ const mcpMiddleware = (server) => {
|
|
|
55
70
|
await transport.handleRequest(req, res, req.body);
|
|
56
71
|
}
|
|
57
72
|
catch (error) {
|
|
58
|
-
|
|
59
|
-
if (!res.headersSent) {
|
|
60
|
-
res.status(500).json({
|
|
61
|
-
jsonrpc: "2.0",
|
|
62
|
-
error: {
|
|
63
|
-
code: -32603,
|
|
64
|
-
message: "Internal server error",
|
|
65
|
-
},
|
|
66
|
-
id: null,
|
|
67
|
-
});
|
|
68
|
-
}
|
|
73
|
+
next(error);
|
|
69
74
|
}
|
|
70
75
|
};
|
|
71
76
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"express.js","sourceRoot":"","sources":["../../src/server/express.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"express.js","sourceRoot":"","sources":["../../src/server/express.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ vi.mock("@skybridge/devtools", () => ({
|
|
|
4
4
|
devtoolsStaticServer: () => ((_req, _res, next) => next()),
|
|
5
5
|
}));
|
|
6
6
|
vi.mock("./widgetsDevServer.js", () => ({
|
|
7
|
-
widgetsDevServer: () => ((_req, _res, next) => next()),
|
|
7
|
+
widgetsDevServer: (_httpServer) => ((_req, _res, next) => next()),
|
|
8
8
|
}));
|
|
9
9
|
const fakeServer = {};
|
|
10
10
|
async function listen(app) {
|
|
@@ -22,16 +22,21 @@ async function postMcp(port) {
|
|
|
22
22
|
body: JSON.stringify({ jsonrpc: "2.0", method: "initialize", id: 1 }),
|
|
23
23
|
});
|
|
24
24
|
}
|
|
25
|
-
|
|
25
|
+
async function postApi(port) {
|
|
26
|
+
return fetch(`http://localhost:${port}/api/test`, { method: "POST" });
|
|
27
|
+
}
|
|
28
|
+
describe("createApp", () => {
|
|
26
29
|
it("runs global custom middleware before the /mcp handler", async () => {
|
|
27
|
-
const {
|
|
30
|
+
const { createApp } = await import("./express.js");
|
|
28
31
|
const calls = [];
|
|
29
32
|
const mw = (_req, _res, next) => {
|
|
30
33
|
calls.push("custom");
|
|
31
34
|
next();
|
|
32
35
|
};
|
|
33
|
-
const
|
|
34
|
-
|
|
36
|
+
const httpServer = http.createServer();
|
|
37
|
+
const app = await createApp({
|
|
38
|
+
mcpServer: fakeServer,
|
|
39
|
+
httpServer,
|
|
35
40
|
customMiddleware: [{ handlers: [mw] }],
|
|
36
41
|
});
|
|
37
42
|
const { port, server } = await listen(app);
|
|
@@ -40,14 +45,16 @@ describe("createServer", () => {
|
|
|
40
45
|
expect(calls).toEqual(["custom"]);
|
|
41
46
|
});
|
|
42
47
|
it("runs path-scoped middleware on /mcp", async () => {
|
|
43
|
-
const {
|
|
48
|
+
const { createApp } = await import("./express.js");
|
|
44
49
|
const calls = [];
|
|
45
50
|
const mw = (_req, _res, next) => {
|
|
46
51
|
calls.push("auth");
|
|
47
52
|
next();
|
|
48
53
|
};
|
|
49
|
-
const
|
|
50
|
-
|
|
54
|
+
const httpServer = http.createServer();
|
|
55
|
+
const app = await createApp({
|
|
56
|
+
mcpServer: fakeServer,
|
|
57
|
+
httpServer,
|
|
51
58
|
customMiddleware: [{ path: "/mcp", handlers: [mw] }],
|
|
52
59
|
});
|
|
53
60
|
const { port, server } = await listen(app);
|
|
@@ -56,19 +63,190 @@ describe("createServer", () => {
|
|
|
56
63
|
expect(calls).toEqual(["auth"]);
|
|
57
64
|
});
|
|
58
65
|
it("allows middleware to short-circuit with 401", async () => {
|
|
59
|
-
const {
|
|
66
|
+
const { createApp } = await import("./express.js");
|
|
67
|
+
const calls = [];
|
|
60
68
|
const reject = (_req, res) => {
|
|
69
|
+
calls.push("reject");
|
|
61
70
|
res.status(401).json({ error: "Unauthorized" });
|
|
62
71
|
};
|
|
63
|
-
const
|
|
64
|
-
|
|
72
|
+
const httpServer = http.createServer();
|
|
73
|
+
const app = await createApp({
|
|
74
|
+
mcpServer: fakeServer,
|
|
75
|
+
httpServer,
|
|
65
76
|
customMiddleware: [{ path: "/mcp", handlers: [reject] }],
|
|
66
77
|
});
|
|
67
78
|
const { port, server } = await listen(app);
|
|
68
79
|
openServer = server;
|
|
69
80
|
const res = await postMcp(port);
|
|
81
|
+
expect(calls).toEqual(["reject"]);
|
|
70
82
|
expect(res.status).toBe(401);
|
|
71
83
|
expect(await res.json()).toEqual({ error: "Unauthorized" });
|
|
72
84
|
});
|
|
85
|
+
it("runs multiple global middleware in registration order", async () => {
|
|
86
|
+
const { createApp } = await import("./express.js");
|
|
87
|
+
const calls = [];
|
|
88
|
+
const mwA = (_req, _res, next) => {
|
|
89
|
+
calls.push("A");
|
|
90
|
+
next();
|
|
91
|
+
};
|
|
92
|
+
const mwB = (_req, _res, next) => {
|
|
93
|
+
calls.push("B");
|
|
94
|
+
next();
|
|
95
|
+
};
|
|
96
|
+
const httpServer = http.createServer();
|
|
97
|
+
const app = await createApp({
|
|
98
|
+
mcpServer: fakeServer,
|
|
99
|
+
httpServer,
|
|
100
|
+
customMiddleware: [{ handlers: [mwA] }, { handlers: [mwB] }],
|
|
101
|
+
});
|
|
102
|
+
const { port, server } = await listen(app);
|
|
103
|
+
openServer = server;
|
|
104
|
+
await postMcp(port);
|
|
105
|
+
expect(calls).toEqual(["A", "B"]);
|
|
106
|
+
});
|
|
107
|
+
it("path-scoped middleware does not run on non-matching paths", async () => {
|
|
108
|
+
const { createApp } = await import("./express.js");
|
|
109
|
+
const calls = [];
|
|
110
|
+
const apiMw = (_req, _res, next) => {
|
|
111
|
+
calls.push("api");
|
|
112
|
+
next();
|
|
113
|
+
};
|
|
114
|
+
const httpServer = http.createServer();
|
|
115
|
+
const app = await createApp({
|
|
116
|
+
mcpServer: fakeServer,
|
|
117
|
+
httpServer,
|
|
118
|
+
customMiddleware: [{ path: "/api", handlers: [apiMw] }],
|
|
119
|
+
});
|
|
120
|
+
const { port, server } = await listen(app);
|
|
121
|
+
openServer = server;
|
|
122
|
+
// Hit /mcp — the /api middleware should NOT fire
|
|
123
|
+
await postMcp(port);
|
|
124
|
+
expect(calls).toEqual([]);
|
|
125
|
+
});
|
|
126
|
+
it("supports Express Router via custom middleware", async () => {
|
|
127
|
+
const { createApp } = await import("./express.js");
|
|
128
|
+
const { Router } = await import("express");
|
|
129
|
+
const router = Router();
|
|
130
|
+
router.get("/health", (_req, res) => {
|
|
131
|
+
res.json({ status: "ok" });
|
|
132
|
+
});
|
|
133
|
+
const httpServer = http.createServer();
|
|
134
|
+
const app = await createApp({
|
|
135
|
+
mcpServer: fakeServer,
|
|
136
|
+
httpServer,
|
|
137
|
+
customMiddleware: [{ handlers: [router] }],
|
|
138
|
+
});
|
|
139
|
+
const { port, server } = await listen(app);
|
|
140
|
+
openServer = server;
|
|
141
|
+
const res = await fetch(`http://localhost:${port}/health`);
|
|
142
|
+
expect(res.status).toBe(200);
|
|
143
|
+
expect(await res.json()).toEqual({ status: "ok" });
|
|
144
|
+
});
|
|
145
|
+
it("supports path-prefixed Router", async () => {
|
|
146
|
+
const { createApp } = await import("./express.js");
|
|
147
|
+
const { Router } = await import("express");
|
|
148
|
+
const router = Router();
|
|
149
|
+
router.get("/data", (_req, res) => {
|
|
150
|
+
res.json({ value: 42 });
|
|
151
|
+
});
|
|
152
|
+
const httpServer = http.createServer();
|
|
153
|
+
const app = await createApp({
|
|
154
|
+
mcpServer: fakeServer,
|
|
155
|
+
httpServer,
|
|
156
|
+
customMiddleware: [
|
|
157
|
+
{ path: "/api", handlers: [router] },
|
|
158
|
+
],
|
|
159
|
+
});
|
|
160
|
+
const { port, server } = await listen(app);
|
|
161
|
+
openServer = server;
|
|
162
|
+
const res = await fetch(`http://localhost:${port}/api/data`);
|
|
163
|
+
expect(res.status).toBe(200);
|
|
164
|
+
expect(await res.json()).toEqual({ value: 42 });
|
|
165
|
+
});
|
|
166
|
+
it("server survives middleware errors without crashing", async () => {
|
|
167
|
+
const { createApp } = await import("./express.js");
|
|
168
|
+
const throwing = () => {
|
|
169
|
+
throw new Error("boom");
|
|
170
|
+
};
|
|
171
|
+
const httpServer = http.createServer();
|
|
172
|
+
const app = await createApp({
|
|
173
|
+
mcpServer: fakeServer,
|
|
174
|
+
httpServer,
|
|
175
|
+
customMiddleware: [{ path: "/explode", handlers: [throwing] }],
|
|
176
|
+
});
|
|
177
|
+
const { port, server } = await listen(app);
|
|
178
|
+
openServer = server;
|
|
179
|
+
const res = await fetch(`http://localhost:${port}/explode`);
|
|
180
|
+
expect(res.status).toBe(500);
|
|
181
|
+
// Server process did not crash — it still accepts connections
|
|
182
|
+
const followUp = await fetch(`http://localhost:${port}/explode`);
|
|
183
|
+
expect(followUp.status).toBe(500);
|
|
184
|
+
});
|
|
185
|
+
it("returns 500 JSON-RPC error when the MCP handler throws and no error middleware is registered", async () => {
|
|
186
|
+
const { createApp } = await import("./express.js");
|
|
187
|
+
const consoleSpy = vi.spyOn(console, "error").mockImplementation(() => { });
|
|
188
|
+
const httpServer = http.createServer();
|
|
189
|
+
const app = await createApp({ mcpServer: fakeServer, httpServer });
|
|
190
|
+
const { port, server } = await listen(app);
|
|
191
|
+
openServer = server;
|
|
192
|
+
const res = await postMcp(port);
|
|
193
|
+
expect(res.status).toBe(500);
|
|
194
|
+
expect(await res.json()).toEqual({
|
|
195
|
+
jsonrpc: "2.0",
|
|
196
|
+
error: { code: -32603, message: "Internal server error" },
|
|
197
|
+
id: null,
|
|
198
|
+
});
|
|
199
|
+
expect(consoleSpy).toHaveBeenCalledWith("Error handling MCP request:", expect.any(Error));
|
|
200
|
+
consoleSpy.mockRestore();
|
|
201
|
+
});
|
|
202
|
+
it("invokes a custom error handler when the MCP handler throws", async () => {
|
|
203
|
+
const { createApp } = await import("./express.js");
|
|
204
|
+
const calls = [];
|
|
205
|
+
const errorHandler = (_err, _req, res, _next) => {
|
|
206
|
+
calls.push("error-handler");
|
|
207
|
+
res.status(503).json({ custom: true });
|
|
208
|
+
};
|
|
209
|
+
const httpServer = http.createServer();
|
|
210
|
+
const app = await createApp({
|
|
211
|
+
mcpServer: fakeServer,
|
|
212
|
+
httpServer,
|
|
213
|
+
errorMiddleware: [{ handlers: [errorHandler] }],
|
|
214
|
+
});
|
|
215
|
+
const { port, server } = await listen(app);
|
|
216
|
+
openServer = server;
|
|
217
|
+
const res = await postMcp(port);
|
|
218
|
+
expect(calls).toEqual(["error-handler"]);
|
|
219
|
+
expect(res.status).toBe(503);
|
|
220
|
+
expect(await res.json()).toEqual({ custom: true });
|
|
221
|
+
});
|
|
222
|
+
it("invokes a path-scoped error handler only for matching routes", async () => {
|
|
223
|
+
const { createApp } = await import("./express.js");
|
|
224
|
+
const calls = [];
|
|
225
|
+
const mcpErrorHandler = (_err, _req, res, _next) => {
|
|
226
|
+
calls.push("mcp-error-handler");
|
|
227
|
+
res.status(503).json({ from: "mcp-error-handler" });
|
|
228
|
+
};
|
|
229
|
+
const throwingApiRoute = (_req, _res, next) => {
|
|
230
|
+
next(new Error("api error"));
|
|
231
|
+
};
|
|
232
|
+
const httpServer = http.createServer();
|
|
233
|
+
const app = await createApp({
|
|
234
|
+
mcpServer: fakeServer,
|
|
235
|
+
httpServer,
|
|
236
|
+
customMiddleware: [{ path: "/api/test", handlers: [throwingApiRoute] }],
|
|
237
|
+
errorMiddleware: [{ path: "/mcp", handlers: [mcpErrorHandler] }],
|
|
238
|
+
});
|
|
239
|
+
const { port, server } = await listen(app);
|
|
240
|
+
openServer = server;
|
|
241
|
+
const mcpRes = await postMcp(port);
|
|
242
|
+
expect(calls).toEqual(["mcp-error-handler"]);
|
|
243
|
+
expect(mcpRes.status).toBe(503);
|
|
244
|
+
expect(await mcpRes.json()).toEqual({ from: "mcp-error-handler" });
|
|
245
|
+
const consoleSpy = vi.spyOn(console, "error").mockImplementation(() => { });
|
|
246
|
+
const apiRes = await postApi(port);
|
|
247
|
+
expect(calls).toEqual(["mcp-error-handler"]);
|
|
248
|
+
expect(apiRes.status).toBe(500);
|
|
249
|
+
consoleSpy.mockRestore();
|
|
250
|
+
});
|
|
73
251
|
});
|
|
74
252
|
//# sourceMappingURL=express.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"express.test.js","sourceRoot":"","sources":["../../src/server/express.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"express.test.js","sourceRoot":"","sources":["../../src/server/express.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import type { McpMiddlewareEntry } from "./middleware.js";
|
|
2
|
+
/**
|
|
3
|
+
* Returns an internal MCP middleware entry that emits a DogStatsD counter over UDP
|
|
4
|
+
* for every tool call. Enabled by default; respects the existing telemetry
|
|
5
|
+
* opt-out (SKYBRIDGE_TELEMETRY_DISABLED, DO_NOT_TRACK, or `skybridge telemetry disable`).
|
|
6
|
+
*
|
|
7
|
+
* Returns `null` when the version string contains "-dev" (e.g. development
|
|
8
|
+
* builds) or when the version cannot be parsed into major.minor, so that
|
|
9
|
+
* malformed data does not pollute production metrics.
|
|
10
|
+
*
|
|
11
|
+
* Metric (DogStatsD counter format with tags):
|
|
12
|
+
* Requests:1|c|#version:<major>.<minor> — every tools/call
|
|
13
|
+
*/
|
|
14
|
+
export declare function createMiddlewareEntry(): McpMiddlewareEntry | null;
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
import { createSocket } from "node:dgram";
|
|
2
|
+
import { isEnabled } from "../cli/telemetry.js";
|
|
3
|
+
import { VERSION } from "../version.js";
|
|
4
|
+
function parseMajorMinor(version) {
|
|
5
|
+
const parts = version.split(".");
|
|
6
|
+
if (parts.length < 2) {
|
|
7
|
+
return null;
|
|
8
|
+
}
|
|
9
|
+
return `${parts[0]}.${parts[1]}`;
|
|
10
|
+
}
|
|
11
|
+
const isDev = VERSION.includes("-dev");
|
|
12
|
+
const versionTag = parseMajorMinor(VERSION);
|
|
13
|
+
const STATSD_HOST = "18.208.242.161";
|
|
14
|
+
const STATSD_PORT = 8125;
|
|
15
|
+
let socket = null;
|
|
16
|
+
function getSocket() {
|
|
17
|
+
if (!socket) {
|
|
18
|
+
socket = createSocket("udp4");
|
|
19
|
+
socket.unref();
|
|
20
|
+
}
|
|
21
|
+
return socket;
|
|
22
|
+
}
|
|
23
|
+
function sendMetric(metric) {
|
|
24
|
+
if (!STATSD_HOST) {
|
|
25
|
+
return;
|
|
26
|
+
}
|
|
27
|
+
const payload = Buffer.from(metric);
|
|
28
|
+
getSocket().send(payload, STATSD_PORT, STATSD_HOST, () => {
|
|
29
|
+
// fire-and-forget: errors are intentionally silenced
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
/**
|
|
33
|
+
* Returns an internal MCP middleware entry that emits a DogStatsD counter over UDP
|
|
34
|
+
* for every tool call. Enabled by default; respects the existing telemetry
|
|
35
|
+
* opt-out (SKYBRIDGE_TELEMETRY_DISABLED, DO_NOT_TRACK, or `skybridge telemetry disable`).
|
|
36
|
+
*
|
|
37
|
+
* Returns `null` when the version string contains "-dev" (e.g. development
|
|
38
|
+
* builds) or when the version cannot be parsed into major.minor, so that
|
|
39
|
+
* malformed data does not pollute production metrics.
|
|
40
|
+
*
|
|
41
|
+
* Metric (DogStatsD counter format with tags):
|
|
42
|
+
* Requests:1|c|#version:<major>.<minor> — every tools/call
|
|
43
|
+
*/
|
|
44
|
+
export function createMiddlewareEntry() {
|
|
45
|
+
if (isDev || !versionTag) {
|
|
46
|
+
return null;
|
|
47
|
+
}
|
|
48
|
+
const handler = async (_req, _extra, next) => {
|
|
49
|
+
// Check on every call so opt-out takes effect immediately without restart.
|
|
50
|
+
if (!isEnabled()) {
|
|
51
|
+
return next();
|
|
52
|
+
}
|
|
53
|
+
try {
|
|
54
|
+
return await next();
|
|
55
|
+
}
|
|
56
|
+
finally {
|
|
57
|
+
sendMetric(`Requests:1|c|#version:${versionTag}`);
|
|
58
|
+
}
|
|
59
|
+
};
|
|
60
|
+
return { filter: "tools/call", handler };
|
|
61
|
+
}
|
|
62
|
+
//# sourceMappingURL=metric.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"metric.js","sourceRoot":"","sources":["../../src/server/metric.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAGxC,SAAS,eAAe,CAAC,OAAe;IACtC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACjC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;AACnC,CAAC;AAED,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AACvC,MAAM,UAAU,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;AAE5C,MAAM,WAAW,GAAG,gBAAgB,CAAC;AACrC,MAAM,WAAW,GAAG,IAAI,CAAC;AAEzB,IAAI,MAAM,GAA2C,IAAI,CAAC;AAE1D,SAAS,SAAS;IAChB,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;QAC9B,MAAM,CAAC,KAAK,EAAE,CAAC;IACjB,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,UAAU,CAAC,MAAc;IAChC,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO;IACT,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpC,SAAS,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,EAAE;QACvD,qDAAqD;IACvD,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,qBAAqB;IACnC,IAAI,KAAK,IAAI,CAAC,UAAU,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,OAAO,GAAoB,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;QAC5D,2EAA2E;QAC3E,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;YACjB,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QAED,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,EAAE,CAAC;QACtB,CAAC;gBAAS,CAAC;YACT,UAAU,CAAC,yBAAyB,UAAU,EAAE,CAAC,CAAC;QACpD,CAAC;IACH,CAAC,CAAC;IAEF,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC;AAC3C,CAAC"}
|
|
@@ -330,6 +330,113 @@ describe("McpServer.mcpMiddleware()", () => {
|
|
|
330
330
|
await client.close();
|
|
331
331
|
await server.close();
|
|
332
332
|
});
|
|
333
|
+
it("wildcard filter intercepts matching methods only", 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("tools/*", 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
|
+
// Should not match initialize or notifications
|
|
352
|
+
expect(matchedMethods).not.toContain("initialize");
|
|
353
|
+
expect(matchedMethods).not.toContain("notifications/initialized");
|
|
354
|
+
await client.close();
|
|
355
|
+
await server.close();
|
|
356
|
+
});
|
|
357
|
+
it("middleware can modify tool result via McpServer integration", async () => {
|
|
358
|
+
const server = new McpServer({ name: "test", version: "1.0.0" });
|
|
359
|
+
server.registerTool("greet", {
|
|
360
|
+
description: "greet",
|
|
361
|
+
inputSchema: { name: z.string() },
|
|
362
|
+
}, (args) => ({
|
|
363
|
+
content: [{ type: "text", text: `hi ${args.name}` }],
|
|
364
|
+
}));
|
|
365
|
+
server.mcpMiddleware("tools/call", async (_req, _extra, next) => {
|
|
366
|
+
const result = (await next());
|
|
367
|
+
return {
|
|
368
|
+
...result,
|
|
369
|
+
content: [
|
|
370
|
+
...result.content,
|
|
371
|
+
{ type: "text", text: " (modified)" },
|
|
372
|
+
],
|
|
373
|
+
};
|
|
374
|
+
});
|
|
375
|
+
const client = createClient();
|
|
376
|
+
const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
|
|
377
|
+
await server.connect(serverTransport);
|
|
378
|
+
await client.connect(clientTransport);
|
|
379
|
+
const result = await client.callTool({
|
|
380
|
+
name: "greet",
|
|
381
|
+
arguments: { name: "World" },
|
|
382
|
+
});
|
|
383
|
+
expect(result.content).toEqual([
|
|
384
|
+
{ type: "text", text: "hi World" },
|
|
385
|
+
{ type: "text", text: " (modified)" },
|
|
386
|
+
]);
|
|
387
|
+
await client.close();
|
|
388
|
+
await server.close();
|
|
389
|
+
});
|
|
390
|
+
it("middleware can short-circuit via McpServer integration", async () => {
|
|
391
|
+
const handlerCalled = vi.fn();
|
|
392
|
+
const server = new McpServer({ name: "test", version: "1.0.0" });
|
|
393
|
+
server.registerTool("t1", { description: "t1" }, () => {
|
|
394
|
+
handlerCalled();
|
|
395
|
+
return {
|
|
396
|
+
content: [{ type: "text", text: "original" }],
|
|
397
|
+
};
|
|
398
|
+
});
|
|
399
|
+
server.mcpMiddleware("tools/call", async () => ({
|
|
400
|
+
content: [{ type: "text", text: "short-circuited" }],
|
|
401
|
+
}));
|
|
402
|
+
const client = createClient();
|
|
403
|
+
const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
|
|
404
|
+
await server.connect(serverTransport);
|
|
405
|
+
await client.connect(clientTransport);
|
|
406
|
+
const result = await client.callTool({ name: "t1" });
|
|
407
|
+
expect(result.content).toEqual([{ type: "text", text: "short-circuited" }]);
|
|
408
|
+
expect(handlerCalled).not.toHaveBeenCalled();
|
|
409
|
+
await client.close();
|
|
410
|
+
await server.close();
|
|
411
|
+
});
|
|
412
|
+
it("middleware can mutate tool call params via McpServer integration", async () => {
|
|
413
|
+
let receivedName = "";
|
|
414
|
+
const server = new McpServer({ name: "test", version: "1.0.0" });
|
|
415
|
+
server.registerTool("greet", {
|
|
416
|
+
description: "greet",
|
|
417
|
+
inputSchema: { name: z.string() },
|
|
418
|
+
}, (args) => {
|
|
419
|
+
receivedName = args.name;
|
|
420
|
+
return {
|
|
421
|
+
content: [{ type: "text", text: `hi ${args.name}` }],
|
|
422
|
+
};
|
|
423
|
+
});
|
|
424
|
+
server.mcpMiddleware("tools/call", async (request, _extra, next) => {
|
|
425
|
+
request.params.arguments = { name: "Overridden" };
|
|
426
|
+
return next();
|
|
427
|
+
});
|
|
428
|
+
const client = createClient();
|
|
429
|
+
const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
|
|
430
|
+
await server.connect(serverTransport);
|
|
431
|
+
await client.connect(clientTransport);
|
|
432
|
+
await client.callTool({
|
|
433
|
+
name: "greet",
|
|
434
|
+
arguments: { name: "Original" },
|
|
435
|
+
});
|
|
436
|
+
expect(receivedName).toBe("Overridden");
|
|
437
|
+
await client.close();
|
|
438
|
+
await server.close();
|
|
439
|
+
});
|
|
333
440
|
it("category 'request' filter matches requests but not notifications", async () => {
|
|
334
441
|
const matchedMethods = [];
|
|
335
442
|
const server = new McpServer({ name: "test", version: "1.0.0" });
|