@lobu/gateway 3.0.8 → 3.0.12
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/dist/api/platform.d.ts.map +1 -1
- package/dist/api/platform.js +8 -26
- package/dist/api/platform.js.map +1 -1
- package/dist/auth/mcp/proxy.d.ts +14 -0
- package/dist/auth/mcp/proxy.d.ts.map +1 -1
- package/dist/auth/mcp/proxy.js +149 -13
- package/dist/auth/mcp/proxy.js.map +1 -1
- package/dist/cli/gateway.d.ts.map +1 -1
- package/dist/cli/gateway.js +29 -0
- package/dist/cli/gateway.js.map +1 -1
- package/dist/cli/index.js +2 -2
- package/dist/cli/index.js.map +1 -1
- package/dist/connections/chat-instance-manager.d.ts.map +1 -1
- package/dist/connections/chat-instance-manager.js +2 -1
- package/dist/connections/chat-instance-manager.js.map +1 -1
- package/dist/connections/interaction-bridge.d.ts +9 -2
- package/dist/connections/interaction-bridge.d.ts.map +1 -1
- package/dist/connections/interaction-bridge.js +132 -230
- package/dist/connections/interaction-bridge.js.map +1 -1
- package/dist/connections/message-handler-bridge.d.ts.map +1 -1
- package/dist/connections/message-handler-bridge.js +44 -26
- package/dist/connections/message-handler-bridge.js.map +1 -1
- package/dist/interactions.d.ts +9 -43
- package/dist/interactions.d.ts.map +1 -1
- package/dist/interactions.js +10 -52
- package/dist/interactions.js.map +1 -1
- package/dist/orchestration/base-deployment-manager.js +7 -7
- package/dist/orchestration/base-deployment-manager.js.map +1 -1
- package/dist/platform/unified-thread-consumer.d.ts.map +1 -1
- package/dist/platform/unified-thread-consumer.js +38 -34
- package/dist/platform/unified-thread-consumer.js.map +1 -1
- package/dist/routes/public/agent.d.ts +4 -0
- package/dist/routes/public/agent.d.ts.map +1 -1
- package/dist/routes/public/agent.js +21 -0
- package/dist/routes/public/agent.js.map +1 -1
- package/dist/services/core-services.d.ts.map +1 -1
- package/dist/services/core-services.js +4 -0
- package/dist/services/core-services.js.map +1 -1
- package/package.json +2 -2
- package/src/__tests__/agent-config-routes.test.ts +0 -254
- package/src/__tests__/agent-history-routes.test.ts +0 -72
- package/src/__tests__/agent-routes.test.ts +0 -68
- package/src/__tests__/agent-schedules-routes.test.ts +0 -59
- package/src/__tests__/agent-settings-store.test.ts +0 -323
- package/src/__tests__/bedrock-model-catalog.test.ts +0 -40
- package/src/__tests__/bedrock-openai-service.test.ts +0 -157
- package/src/__tests__/bedrock-provider-module.test.ts +0 -56
- package/src/__tests__/chat-instance-manager-slack.test.ts +0 -204
- package/src/__tests__/chat-response-bridge.test.ts +0 -131
- package/src/__tests__/config-memory-plugins.test.ts +0 -92
- package/src/__tests__/config-request-store.test.ts +0 -127
- package/src/__tests__/connection-routes.test.ts +0 -144
- package/src/__tests__/core-services-store-selection.test.ts +0 -92
- package/src/__tests__/docker-deployment.test.ts +0 -1211
- package/src/__tests__/embedded-deployment.test.ts +0 -342
- package/src/__tests__/grant-store.test.ts +0 -148
- package/src/__tests__/http-proxy.test.ts +0 -281
- package/src/__tests__/instruction-service.test.ts +0 -37
- package/src/__tests__/link-buttons.test.ts +0 -112
- package/src/__tests__/lobu.test.ts +0 -32
- package/src/__tests__/mcp-config-service.test.ts +0 -347
- package/src/__tests__/mcp-proxy.test.ts +0 -694
- package/src/__tests__/message-handler-bridge.test.ts +0 -17
- package/src/__tests__/model-selection.test.ts +0 -172
- package/src/__tests__/oauth-templates.test.ts +0 -39
- package/src/__tests__/platform-adapter-slack-send.test.ts +0 -114
- package/src/__tests__/platform-helpers-model-resolution.test.ts +0 -253
- package/src/__tests__/provider-inheritance.test.ts +0 -212
- package/src/__tests__/routes/cli-auth.test.ts +0 -337
- package/src/__tests__/routes/interactions.test.ts +0 -121
- package/src/__tests__/secret-proxy.test.ts +0 -85
- package/src/__tests__/session-manager.test.ts +0 -572
- package/src/__tests__/setup.ts +0 -133
- package/src/__tests__/skill-and-mcp-registry.test.ts +0 -203
- package/src/__tests__/slack-routes.test.ts +0 -161
- package/src/__tests__/system-config-resolver.test.ts +0 -75
- package/src/__tests__/system-message-limiter.test.ts +0 -89
- package/src/__tests__/system-skills-service.test.ts +0 -362
- package/src/__tests__/transcription-service.test.ts +0 -222
- package/src/__tests__/utils/rate-limiter.test.ts +0 -102
- package/src/__tests__/worker-connection-manager.test.ts +0 -497
- package/src/__tests__/worker-job-router.test.ts +0 -722
- package/src/api/index.ts +0 -1
- package/src/api/platform.ts +0 -292
- package/src/api/response-renderer.ts +0 -157
- package/src/auth/agent-metadata-store.ts +0 -168
- package/src/auth/api-auth-middleware.ts +0 -69
- package/src/auth/api-key-provider-module.ts +0 -213
- package/src/auth/base-provider-module.ts +0 -201
- package/src/auth/bedrock/provider-module.ts +0 -110
- package/src/auth/chatgpt/chatgpt-oauth-module.ts +0 -185
- package/src/auth/chatgpt/device-code-client.ts +0 -218
- package/src/auth/chatgpt/index.ts +0 -1
- package/src/auth/claude/oauth-module.ts +0 -280
- package/src/auth/cli/token-service.ts +0 -249
- package/src/auth/external/client.ts +0 -560
- package/src/auth/external/device-code-client.ts +0 -235
- package/src/auth/mcp/config-service.ts +0 -420
- package/src/auth/mcp/proxy.ts +0 -1086
- package/src/auth/mcp/string-substitution.ts +0 -17
- package/src/auth/mcp/tool-cache.ts +0 -90
- package/src/auth/oauth/base-client.ts +0 -267
- package/src/auth/oauth/client.ts +0 -153
- package/src/auth/oauth/credentials.ts +0 -7
- package/src/auth/oauth/providers.ts +0 -69
- package/src/auth/oauth/state-store.ts +0 -150
- package/src/auth/oauth-templates.ts +0 -179
- package/src/auth/provider-catalog.ts +0 -220
- package/src/auth/provider-model-options.ts +0 -41
- package/src/auth/settings/agent-settings-store.ts +0 -565
- package/src/auth/settings/auth-profiles-manager.ts +0 -216
- package/src/auth/settings/index.ts +0 -12
- package/src/auth/settings/model-preference-store.ts +0 -52
- package/src/auth/settings/model-selection.ts +0 -135
- package/src/auth/settings/resolved-settings-view.ts +0 -298
- package/src/auth/settings/template-utils.ts +0 -44
- package/src/auth/settings/token-service.ts +0 -88
- package/src/auth/system-env-store.ts +0 -98
- package/src/auth/user-agents-store.ts +0 -68
- package/src/channels/binding-service.ts +0 -214
- package/src/channels/index.ts +0 -4
- package/src/cli/gateway.ts +0 -1312
- package/src/cli/index.ts +0 -74
- package/src/commands/built-in-commands.ts +0 -80
- package/src/commands/command-dispatcher.ts +0 -94
- package/src/commands/command-reply-adapters.ts +0 -27
- package/src/config/file-loader.ts +0 -618
- package/src/config/index.ts +0 -588
- package/src/config/network-allowlist.ts +0 -71
- package/src/connections/chat-instance-manager.ts +0 -1284
- package/src/connections/chat-response-bridge.ts +0 -618
- package/src/connections/index.ts +0 -7
- package/src/connections/interaction-bridge.ts +0 -831
- package/src/connections/message-handler-bridge.ts +0 -415
- package/src/connections/platform-auth-methods.ts +0 -15
- package/src/connections/types.ts +0 -84
- package/src/gateway/connection-manager.ts +0 -291
- package/src/gateway/index.ts +0 -698
- package/src/gateway/job-router.ts +0 -201
- package/src/gateway-main.ts +0 -200
- package/src/index.ts +0 -41
- package/src/infrastructure/queue/index.ts +0 -12
- package/src/infrastructure/queue/queue-producer.ts +0 -148
- package/src/infrastructure/queue/redis-queue.ts +0 -361
- package/src/infrastructure/queue/types.ts +0 -133
- package/src/infrastructure/redis/system-message-limiter.ts +0 -94
- package/src/interactions/config-request-store.ts +0 -198
- package/src/interactions.ts +0 -363
- package/src/lobu.ts +0 -311
- package/src/metrics/prometheus.ts +0 -159
- package/src/modules/module-system.ts +0 -179
- package/src/orchestration/base-deployment-manager.ts +0 -900
- package/src/orchestration/deployment-utils.ts +0 -98
- package/src/orchestration/impl/docker-deployment.ts +0 -620
- package/src/orchestration/impl/embedded-deployment.ts +0 -268
- package/src/orchestration/impl/index.ts +0 -8
- package/src/orchestration/impl/k8s/deployment.ts +0 -1061
- package/src/orchestration/impl/k8s/helpers.ts +0 -610
- package/src/orchestration/impl/k8s/index.ts +0 -1
- package/src/orchestration/index.ts +0 -333
- package/src/orchestration/message-consumer.ts +0 -584
- package/src/orchestration/scheduled-wakeup.ts +0 -704
- package/src/permissions/approval-policy.ts +0 -36
- package/src/permissions/grant-store.ts +0 -219
- package/src/platform/file-handler.ts +0 -66
- package/src/platform/link-buttons.ts +0 -57
- package/src/platform/renderer-utils.ts +0 -44
- package/src/platform/response-renderer.ts +0 -84
- package/src/platform/unified-thread-consumer.ts +0 -187
- package/src/platform.ts +0 -318
- package/src/proxy/http-proxy.ts +0 -752
- package/src/proxy/proxy-manager.ts +0 -81
- package/src/proxy/secret-proxy.ts +0 -402
- package/src/proxy/token-refresh-job.ts +0 -143
- package/src/routes/internal/audio.ts +0 -141
- package/src/routes/internal/device-auth.ts +0 -652
- package/src/routes/internal/files.ts +0 -226
- package/src/routes/internal/history.ts +0 -69
- package/src/routes/internal/images.ts +0 -127
- package/src/routes/internal/interactions.ts +0 -84
- package/src/routes/internal/middleware.ts +0 -23
- package/src/routes/internal/schedule.ts +0 -226
- package/src/routes/internal/types.ts +0 -22
- package/src/routes/openapi-auto.ts +0 -239
- package/src/routes/public/agent-access.ts +0 -23
- package/src/routes/public/agent-config.ts +0 -675
- package/src/routes/public/agent-history.ts +0 -422
- package/src/routes/public/agent-schedules.ts +0 -296
- package/src/routes/public/agent.ts +0 -1086
- package/src/routes/public/agents.ts +0 -373
- package/src/routes/public/channels.ts +0 -191
- package/src/routes/public/cli-auth.ts +0 -896
- package/src/routes/public/connections.ts +0 -574
- package/src/routes/public/landing.ts +0 -16
- package/src/routes/public/oauth.ts +0 -147
- package/src/routes/public/settings-auth.ts +0 -104
- package/src/routes/public/slack.ts +0 -173
- package/src/routes/shared/agent-ownership.ts +0 -101
- package/src/routes/shared/token-verifier.ts +0 -34
- package/src/services/bedrock-model-catalog.ts +0 -217
- package/src/services/bedrock-openai-service.ts +0 -658
- package/src/services/core-services.ts +0 -1072
- package/src/services/image-generation-service.ts +0 -257
- package/src/services/instruction-service.ts +0 -318
- package/src/services/mcp-registry.ts +0 -94
- package/src/services/platform-helpers.ts +0 -287
- package/src/services/session-manager.ts +0 -262
- package/src/services/settings-resolver.ts +0 -74
- package/src/services/system-config-resolver.ts +0 -89
- package/src/services/system-skills-service.ts +0 -229
- package/src/services/transcription-service.ts +0 -684
- package/src/session.ts +0 -110
- package/src/spaces/index.ts +0 -1
- package/src/spaces/space-resolver.ts +0 -17
- package/src/stores/in-memory-agent-store.ts +0 -403
- package/src/stores/redis-agent-store.ts +0 -279
- package/src/utils/public-url.ts +0 -44
- package/src/utils/rate-limiter.ts +0 -94
- package/tsconfig.json +0 -33
|
@@ -1,694 +0,0 @@
|
|
|
1
|
-
import {
|
|
2
|
-
afterAll,
|
|
3
|
-
beforeAll,
|
|
4
|
-
beforeEach,
|
|
5
|
-
describe,
|
|
6
|
-
expect,
|
|
7
|
-
test,
|
|
8
|
-
} from "bun:test";
|
|
9
|
-
import { generateWorkerToken } from "@lobu/core";
|
|
10
|
-
import { MockMessageQueue } from "@lobu/core/testing";
|
|
11
|
-
import { McpProxy } from "../auth/mcp/proxy";
|
|
12
|
-
import { McpToolCache } from "../auth/mcp/tool-cache";
|
|
13
|
-
import { GrantStore } from "../permissions/grant-store";
|
|
14
|
-
|
|
15
|
-
const TEST_ENCRYPTION_KEY =
|
|
16
|
-
"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef";
|
|
17
|
-
|
|
18
|
-
interface HttpMcpServerConfig {
|
|
19
|
-
id: string;
|
|
20
|
-
upstreamUrl: string;
|
|
21
|
-
oauth?: import("@lobu/core").McpOAuthConfig;
|
|
22
|
-
inputs?: unknown[];
|
|
23
|
-
headers?: Record<string, string>;
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
interface McpConfigSource {
|
|
27
|
-
getHttpServer(
|
|
28
|
-
id: string,
|
|
29
|
-
agentId?: string
|
|
30
|
-
): Promise<HttpMcpServerConfig | undefined>;
|
|
31
|
-
getAllHttpServers(
|
|
32
|
-
agentId?: string
|
|
33
|
-
): Promise<Map<string, HttpMcpServerConfig>>;
|
|
34
|
-
}
|
|
35
|
-
|
|
36
|
-
function createMockConfigSource(
|
|
37
|
-
servers: Record<string, HttpMcpServerConfig>
|
|
38
|
-
): McpConfigSource {
|
|
39
|
-
return {
|
|
40
|
-
getHttpServer: async (id) => servers[id],
|
|
41
|
-
getAllHttpServers: async () => new Map(Object.entries(servers)),
|
|
42
|
-
};
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
function mockUpstreamFetch(responseData: any) {
|
|
46
|
-
globalThis.fetch = async () => {
|
|
47
|
-
return new Response(JSON.stringify(responseData), {
|
|
48
|
-
status: 200,
|
|
49
|
-
headers: { "Content-Type": "application/json" },
|
|
50
|
-
});
|
|
51
|
-
};
|
|
52
|
-
}
|
|
53
|
-
|
|
54
|
-
const TEST_SERVER: HttpMcpServerConfig = {
|
|
55
|
-
id: "test-mcp",
|
|
56
|
-
upstreamUrl: "http://upstream:9000/mcp",
|
|
57
|
-
};
|
|
58
|
-
|
|
59
|
-
let originalEnv: string | undefined;
|
|
60
|
-
let validToken: string;
|
|
61
|
-
let originalFetch: typeof fetch;
|
|
62
|
-
|
|
63
|
-
beforeAll(() => {
|
|
64
|
-
originalEnv = process.env.ENCRYPTION_KEY;
|
|
65
|
-
process.env.ENCRYPTION_KEY = TEST_ENCRYPTION_KEY;
|
|
66
|
-
validToken = generateWorkerToken("user1", "conv1", "deploy1", {
|
|
67
|
-
channelId: "ch1",
|
|
68
|
-
agentId: "agent1",
|
|
69
|
-
});
|
|
70
|
-
originalFetch = globalThis.fetch;
|
|
71
|
-
});
|
|
72
|
-
|
|
73
|
-
afterAll(() => {
|
|
74
|
-
if (originalEnv !== undefined) process.env.ENCRYPTION_KEY = originalEnv;
|
|
75
|
-
else delete process.env.ENCRYPTION_KEY;
|
|
76
|
-
globalThis.fetch = originalFetch;
|
|
77
|
-
});
|
|
78
|
-
|
|
79
|
-
describe("McpProxy", () => {
|
|
80
|
-
let queue: MockMessageQueue;
|
|
81
|
-
|
|
82
|
-
beforeEach(() => {
|
|
83
|
-
queue = new MockMessageQueue();
|
|
84
|
-
globalThis.fetch = originalFetch;
|
|
85
|
-
});
|
|
86
|
-
|
|
87
|
-
// ---------- Auth tests ----------
|
|
88
|
-
|
|
89
|
-
describe("authentication", () => {
|
|
90
|
-
test("rejects missing token", async () => {
|
|
91
|
-
const configSource = createMockConfigSource({
|
|
92
|
-
"test-mcp": TEST_SERVER,
|
|
93
|
-
});
|
|
94
|
-
const proxy = new McpProxy(configSource, queue as any);
|
|
95
|
-
const app = proxy.getApp();
|
|
96
|
-
|
|
97
|
-
const res = await app.request("/test-mcp/tools", { method: "GET" });
|
|
98
|
-
expect(res.status).toBe(401);
|
|
99
|
-
const body = await res.json();
|
|
100
|
-
expect(body.error).toContain("Invalid authentication token");
|
|
101
|
-
});
|
|
102
|
-
|
|
103
|
-
test("rejects invalid token", async () => {
|
|
104
|
-
const configSource = createMockConfigSource({
|
|
105
|
-
"test-mcp": TEST_SERVER,
|
|
106
|
-
});
|
|
107
|
-
const proxy = new McpProxy(configSource, queue as any);
|
|
108
|
-
const app = proxy.getApp();
|
|
109
|
-
|
|
110
|
-
const res = await app.request("/test-mcp/tools", {
|
|
111
|
-
method: "GET",
|
|
112
|
-
headers: { Authorization: "Bearer invalid-garbage" },
|
|
113
|
-
});
|
|
114
|
-
expect(res.status).toBe(401);
|
|
115
|
-
});
|
|
116
|
-
|
|
117
|
-
test("accepts Bearer header", async () => {
|
|
118
|
-
const configSource = createMockConfigSource({
|
|
119
|
-
"test-mcp": TEST_SERVER,
|
|
120
|
-
});
|
|
121
|
-
const proxy = new McpProxy(configSource, queue as any);
|
|
122
|
-
const app = proxy.getApp();
|
|
123
|
-
|
|
124
|
-
mockUpstreamFetch({
|
|
125
|
-
jsonrpc: "2.0",
|
|
126
|
-
id: 1,
|
|
127
|
-
result: { tools: [{ name: "tool1" }] },
|
|
128
|
-
});
|
|
129
|
-
|
|
130
|
-
const res = await app.request("/test-mcp/tools", {
|
|
131
|
-
method: "GET",
|
|
132
|
-
headers: { Authorization: `Bearer ${validToken}` },
|
|
133
|
-
});
|
|
134
|
-
expect(res.status).toBe(200);
|
|
135
|
-
});
|
|
136
|
-
|
|
137
|
-
test("accepts workerToken query param", async () => {
|
|
138
|
-
const configSource = createMockConfigSource({
|
|
139
|
-
"test-mcp": TEST_SERVER,
|
|
140
|
-
});
|
|
141
|
-
const proxy = new McpProxy(configSource, queue as any);
|
|
142
|
-
const app = proxy.getApp();
|
|
143
|
-
|
|
144
|
-
mockUpstreamFetch({
|
|
145
|
-
jsonrpc: "2.0",
|
|
146
|
-
id: 1,
|
|
147
|
-
result: { tools: [{ name: "tool1" }] },
|
|
148
|
-
});
|
|
149
|
-
|
|
150
|
-
const res = await app.request(
|
|
151
|
-
`/test-mcp/tools?workerToken=${validToken}`,
|
|
152
|
-
{ method: "GET" }
|
|
153
|
-
);
|
|
154
|
-
expect(res.status).toBe(200);
|
|
155
|
-
});
|
|
156
|
-
});
|
|
157
|
-
|
|
158
|
-
// ---------- GET /:mcpId/tools ----------
|
|
159
|
-
|
|
160
|
-
describe("GET /:mcpId/tools", () => {
|
|
161
|
-
test("returns tools from upstream", async () => {
|
|
162
|
-
const configSource = createMockConfigSource({
|
|
163
|
-
"test-mcp": TEST_SERVER,
|
|
164
|
-
});
|
|
165
|
-
const proxy = new McpProxy(configSource, queue as any);
|
|
166
|
-
const app = proxy.getApp();
|
|
167
|
-
|
|
168
|
-
const tools = [
|
|
169
|
-
{ name: "read_file", description: "Read a file" },
|
|
170
|
-
{ name: "write_file", description: "Write a file" },
|
|
171
|
-
];
|
|
172
|
-
mockUpstreamFetch({
|
|
173
|
-
jsonrpc: "2.0",
|
|
174
|
-
id: 1,
|
|
175
|
-
result: { tools },
|
|
176
|
-
});
|
|
177
|
-
|
|
178
|
-
const res = await app.request("/test-mcp/tools", {
|
|
179
|
-
method: "GET",
|
|
180
|
-
headers: { Authorization: `Bearer ${validToken}` },
|
|
181
|
-
});
|
|
182
|
-
expect(res.status).toBe(200);
|
|
183
|
-
const body = await res.json();
|
|
184
|
-
expect(body.tools).toHaveLength(2);
|
|
185
|
-
expect(body.tools[0].name).toBe("read_file");
|
|
186
|
-
expect(body.tools[1].name).toBe("write_file");
|
|
187
|
-
});
|
|
188
|
-
|
|
189
|
-
test("returns 404 for unknown MCP", async () => {
|
|
190
|
-
const configSource = createMockConfigSource({});
|
|
191
|
-
const proxy = new McpProxy(configSource, queue as any);
|
|
192
|
-
const app = proxy.getApp();
|
|
193
|
-
|
|
194
|
-
const res = await app.request("/nonexistent/tools", {
|
|
195
|
-
method: "GET",
|
|
196
|
-
headers: { Authorization: `Bearer ${validToken}` },
|
|
197
|
-
});
|
|
198
|
-
expect(res.status).toBe(404);
|
|
199
|
-
const body = await res.json();
|
|
200
|
-
expect(body.error).toContain("not found");
|
|
201
|
-
});
|
|
202
|
-
|
|
203
|
-
test("returns 502 on upstream error", async () => {
|
|
204
|
-
const configSource = createMockConfigSource({
|
|
205
|
-
"test-mcp": TEST_SERVER,
|
|
206
|
-
});
|
|
207
|
-
const proxy = new McpProxy(configSource, queue as any);
|
|
208
|
-
const app = proxy.getApp();
|
|
209
|
-
|
|
210
|
-
globalThis.fetch = async () => {
|
|
211
|
-
throw new Error("Connection refused");
|
|
212
|
-
};
|
|
213
|
-
|
|
214
|
-
const res = await app.request("/test-mcp/tools", {
|
|
215
|
-
method: "GET",
|
|
216
|
-
headers: { Authorization: `Bearer ${validToken}` },
|
|
217
|
-
});
|
|
218
|
-
expect(res.status).toBe(502);
|
|
219
|
-
const body = await res.json();
|
|
220
|
-
expect(body.error).toContain("Failed to connect");
|
|
221
|
-
});
|
|
222
|
-
|
|
223
|
-
test("caches tools on second request", async () => {
|
|
224
|
-
const configSource = createMockConfigSource({
|
|
225
|
-
"test-mcp": TEST_SERVER,
|
|
226
|
-
});
|
|
227
|
-
const toolCache = new McpToolCache(queue.getRedisClient());
|
|
228
|
-
const proxy = new McpProxy(configSource, queue as any, toolCache);
|
|
229
|
-
const app = proxy.getApp();
|
|
230
|
-
|
|
231
|
-
let fetchCount = 0;
|
|
232
|
-
globalThis.fetch = async () => {
|
|
233
|
-
fetchCount++;
|
|
234
|
-
return new Response(
|
|
235
|
-
JSON.stringify({
|
|
236
|
-
jsonrpc: "2.0",
|
|
237
|
-
id: 1,
|
|
238
|
-
result: { tools: [{ name: "cached_tool" }] },
|
|
239
|
-
}),
|
|
240
|
-
{ status: 200, headers: { "Content-Type": "application/json" } }
|
|
241
|
-
);
|
|
242
|
-
};
|
|
243
|
-
|
|
244
|
-
// First request fetches from upstream
|
|
245
|
-
const res1 = await app.request("/test-mcp/tools", {
|
|
246
|
-
method: "GET",
|
|
247
|
-
headers: { Authorization: `Bearer ${validToken}` },
|
|
248
|
-
});
|
|
249
|
-
expect(res1.status).toBe(200);
|
|
250
|
-
const firstFetchCount = fetchCount;
|
|
251
|
-
|
|
252
|
-
// Second request should use cache
|
|
253
|
-
const res2 = await app.request("/test-mcp/tools", {
|
|
254
|
-
method: "GET",
|
|
255
|
-
headers: { Authorization: `Bearer ${validToken}` },
|
|
256
|
-
});
|
|
257
|
-
expect(res2.status).toBe(200);
|
|
258
|
-
const body = await res2.json();
|
|
259
|
-
expect(body.tools[0].name).toBe("cached_tool");
|
|
260
|
-
// fetch should NOT have been called again
|
|
261
|
-
expect(fetchCount).toBe(firstFetchCount);
|
|
262
|
-
});
|
|
263
|
-
});
|
|
264
|
-
|
|
265
|
-
// ---------- POST /:mcpId/tools/:toolName ----------
|
|
266
|
-
|
|
267
|
-
describe("POST /:mcpId/tools/:toolName", () => {
|
|
268
|
-
test("forwards call and returns result", async () => {
|
|
269
|
-
const configSource = createMockConfigSource({
|
|
270
|
-
"test-mcp": TEST_SERVER,
|
|
271
|
-
});
|
|
272
|
-
const proxy = new McpProxy(configSource, queue as any);
|
|
273
|
-
const app = proxy.getApp();
|
|
274
|
-
|
|
275
|
-
mockUpstreamFetch({
|
|
276
|
-
jsonrpc: "2.0",
|
|
277
|
-
id: 1,
|
|
278
|
-
result: {
|
|
279
|
-
content: [{ type: "text", text: "Hello world" }],
|
|
280
|
-
isError: false,
|
|
281
|
-
},
|
|
282
|
-
});
|
|
283
|
-
|
|
284
|
-
const res = await app.request("/test-mcp/tools/my_tool", {
|
|
285
|
-
method: "POST",
|
|
286
|
-
headers: {
|
|
287
|
-
Authorization: `Bearer ${validToken}`,
|
|
288
|
-
"Content-Type": "application/json",
|
|
289
|
-
},
|
|
290
|
-
body: JSON.stringify({ arg1: "value1" }),
|
|
291
|
-
});
|
|
292
|
-
expect(res.status).toBe(200);
|
|
293
|
-
const body = await res.json();
|
|
294
|
-
expect(body.content).toHaveLength(1);
|
|
295
|
-
expect(body.content[0].text).toBe("Hello world");
|
|
296
|
-
expect(body.isError).toBe(false);
|
|
297
|
-
});
|
|
298
|
-
|
|
299
|
-
test("returns 400 for invalid JSON body", async () => {
|
|
300
|
-
const configSource = createMockConfigSource({
|
|
301
|
-
"test-mcp": TEST_SERVER,
|
|
302
|
-
});
|
|
303
|
-
const proxy = new McpProxy(configSource, queue as any);
|
|
304
|
-
const app = proxy.getApp();
|
|
305
|
-
|
|
306
|
-
const res = await app.request("/test-mcp/tools/my_tool", {
|
|
307
|
-
method: "POST",
|
|
308
|
-
headers: {
|
|
309
|
-
Authorization: `Bearer ${validToken}`,
|
|
310
|
-
"Content-Type": "application/json",
|
|
311
|
-
},
|
|
312
|
-
body: "not valid json {{{",
|
|
313
|
-
});
|
|
314
|
-
expect(res.status).toBe(400);
|
|
315
|
-
const body = await res.json();
|
|
316
|
-
expect(body.error).toContain("Invalid JSON");
|
|
317
|
-
});
|
|
318
|
-
|
|
319
|
-
test("returns 404 for unknown MCP", async () => {
|
|
320
|
-
const configSource = createMockConfigSource({});
|
|
321
|
-
const proxy = new McpProxy(configSource, queue as any);
|
|
322
|
-
const app = proxy.getApp();
|
|
323
|
-
|
|
324
|
-
const res = await app.request("/nonexistent/tools/my_tool", {
|
|
325
|
-
method: "POST",
|
|
326
|
-
headers: {
|
|
327
|
-
Authorization: `Bearer ${validToken}`,
|
|
328
|
-
"Content-Type": "application/json",
|
|
329
|
-
},
|
|
330
|
-
body: JSON.stringify({}),
|
|
331
|
-
});
|
|
332
|
-
expect(res.status).toBe(404);
|
|
333
|
-
});
|
|
334
|
-
|
|
335
|
-
test("returns 502 on upstream error", async () => {
|
|
336
|
-
const configSource = createMockConfigSource({
|
|
337
|
-
"test-mcp": TEST_SERVER,
|
|
338
|
-
});
|
|
339
|
-
const proxy = new McpProxy(configSource, queue as any);
|
|
340
|
-
const app = proxy.getApp();
|
|
341
|
-
|
|
342
|
-
globalThis.fetch = async () => {
|
|
343
|
-
throw new Error("Connection refused");
|
|
344
|
-
};
|
|
345
|
-
|
|
346
|
-
const res = await app.request("/test-mcp/tools/my_tool", {
|
|
347
|
-
method: "POST",
|
|
348
|
-
headers: {
|
|
349
|
-
Authorization: `Bearer ${validToken}`,
|
|
350
|
-
"Content-Type": "application/json",
|
|
351
|
-
},
|
|
352
|
-
body: JSON.stringify({}),
|
|
353
|
-
});
|
|
354
|
-
expect(res.status).toBe(502);
|
|
355
|
-
const body = await res.json();
|
|
356
|
-
expect(body.error).toContain("Failed to connect");
|
|
357
|
-
});
|
|
358
|
-
});
|
|
359
|
-
|
|
360
|
-
// ---------- Session re-init ----------
|
|
361
|
-
|
|
362
|
-
describe("session re-initialization", () => {
|
|
363
|
-
test("retries on 'Server not initialized' error", async () => {
|
|
364
|
-
const configSource = createMockConfigSource({
|
|
365
|
-
"test-mcp": TEST_SERVER,
|
|
366
|
-
});
|
|
367
|
-
const proxy = new McpProxy(configSource, queue as any);
|
|
368
|
-
const app = proxy.getApp();
|
|
369
|
-
|
|
370
|
-
let callCount = 0;
|
|
371
|
-
globalThis.fetch = async () => {
|
|
372
|
-
callCount++;
|
|
373
|
-
// The first call is the tool call that triggers the error.
|
|
374
|
-
// After that, reinitializeSession sends initialize + notifications/initialized (2 calls).
|
|
375
|
-
// Then the retry tool call is the 4th call.
|
|
376
|
-
if (callCount === 1) {
|
|
377
|
-
return new Response(
|
|
378
|
-
JSON.stringify({
|
|
379
|
-
jsonrpc: "2.0",
|
|
380
|
-
id: 1,
|
|
381
|
-
error: { code: -32000, message: "Server not initialized" },
|
|
382
|
-
}),
|
|
383
|
-
{ status: 200, headers: { "Content-Type": "application/json" } }
|
|
384
|
-
);
|
|
385
|
-
}
|
|
386
|
-
// Re-init calls (initialize + notifications/initialized) and retry
|
|
387
|
-
return new Response(
|
|
388
|
-
JSON.stringify({
|
|
389
|
-
jsonrpc: "2.0",
|
|
390
|
-
id: 1,
|
|
391
|
-
result: {
|
|
392
|
-
content: [{ type: "text", text: "Success after re-init" }],
|
|
393
|
-
},
|
|
394
|
-
}),
|
|
395
|
-
{ status: 200, headers: { "Content-Type": "application/json" } }
|
|
396
|
-
);
|
|
397
|
-
};
|
|
398
|
-
|
|
399
|
-
const res = await app.request("/test-mcp/tools/my_tool", {
|
|
400
|
-
method: "POST",
|
|
401
|
-
headers: {
|
|
402
|
-
Authorization: `Bearer ${validToken}`,
|
|
403
|
-
"Content-Type": "application/json",
|
|
404
|
-
},
|
|
405
|
-
body: JSON.stringify({}),
|
|
406
|
-
});
|
|
407
|
-
expect(res.status).toBe(200);
|
|
408
|
-
const body = await res.json();
|
|
409
|
-
expect(body.content[0].text).toBe("Success after re-init");
|
|
410
|
-
// At least 4 fetch calls: original + initialize + notify + retry
|
|
411
|
-
expect(callCount).toBeGreaterThanOrEqual(4);
|
|
412
|
-
});
|
|
413
|
-
});
|
|
414
|
-
|
|
415
|
-
// ---------- Tool approval ----------
|
|
416
|
-
|
|
417
|
-
describe("tool approval", () => {
|
|
418
|
-
function createProxyWithGrants(
|
|
419
|
-
servers: Record<string, HttpMcpServerConfig>
|
|
420
|
-
) {
|
|
421
|
-
const configSource = createMockConfigSource(servers);
|
|
422
|
-
const toolCache = new McpToolCache(queue.getRedisClient());
|
|
423
|
-
const grantStore = new GrantStore(queue.getRedisClient());
|
|
424
|
-
const proxy = new McpProxy(
|
|
425
|
-
configSource,
|
|
426
|
-
queue as any,
|
|
427
|
-
toolCache,
|
|
428
|
-
grantStore
|
|
429
|
-
);
|
|
430
|
-
return { proxy, toolCache, grantStore, configSource };
|
|
431
|
-
}
|
|
432
|
-
|
|
433
|
-
test("blocks destructive tool without grant", async () => {
|
|
434
|
-
const { proxy, toolCache } = createProxyWithGrants({
|
|
435
|
-
"test-mcp": TEST_SERVER,
|
|
436
|
-
});
|
|
437
|
-
const app = proxy.getApp();
|
|
438
|
-
|
|
439
|
-
// Pre-populate cache with a tool that has no annotations (default destructive)
|
|
440
|
-
await toolCache.set("test-mcp", [{ name: "dangerous_tool" }], "agent1");
|
|
441
|
-
|
|
442
|
-
const res = await app.request("/test-mcp/tools/dangerous_tool", {
|
|
443
|
-
method: "POST",
|
|
444
|
-
headers: {
|
|
445
|
-
Authorization: `Bearer ${validToken}`,
|
|
446
|
-
"Content-Type": "application/json",
|
|
447
|
-
},
|
|
448
|
-
body: JSON.stringify({}),
|
|
449
|
-
});
|
|
450
|
-
expect(res.status).toBe(403);
|
|
451
|
-
const body = await res.json();
|
|
452
|
-
expect(body.isError).toBe(true);
|
|
453
|
-
expect(body.content[0].text).toContain("requires approval");
|
|
454
|
-
});
|
|
455
|
-
|
|
456
|
-
test("allows with grant", async () => {
|
|
457
|
-
const { proxy, toolCache, grantStore } = createProxyWithGrants({
|
|
458
|
-
"test-mcp": TEST_SERVER,
|
|
459
|
-
});
|
|
460
|
-
const app = proxy.getApp();
|
|
461
|
-
|
|
462
|
-
// Pre-populate cache with a tool that has no annotations (default destructive)
|
|
463
|
-
await toolCache.set("test-mcp", [{ name: "dangerous_tool" }], "agent1");
|
|
464
|
-
|
|
465
|
-
// Grant access
|
|
466
|
-
await grantStore.grant(
|
|
467
|
-
"agent1",
|
|
468
|
-
"/mcp/test-mcp/tools/dangerous_tool",
|
|
469
|
-
null
|
|
470
|
-
);
|
|
471
|
-
|
|
472
|
-
mockUpstreamFetch({
|
|
473
|
-
jsonrpc: "2.0",
|
|
474
|
-
id: 1,
|
|
475
|
-
result: {
|
|
476
|
-
content: [{ type: "text", text: "Executed" }],
|
|
477
|
-
isError: false,
|
|
478
|
-
},
|
|
479
|
-
});
|
|
480
|
-
|
|
481
|
-
const res = await app.request("/test-mcp/tools/dangerous_tool", {
|
|
482
|
-
method: "POST",
|
|
483
|
-
headers: {
|
|
484
|
-
Authorization: `Bearer ${validToken}`,
|
|
485
|
-
"Content-Type": "application/json",
|
|
486
|
-
},
|
|
487
|
-
body: JSON.stringify({}),
|
|
488
|
-
});
|
|
489
|
-
expect(res.status).toBe(200);
|
|
490
|
-
const body = await res.json();
|
|
491
|
-
expect(body.content[0].text).toBe("Executed");
|
|
492
|
-
});
|
|
493
|
-
|
|
494
|
-
test("allows readOnlyHint=true without grant", async () => {
|
|
495
|
-
const { proxy, toolCache } = createProxyWithGrants({
|
|
496
|
-
"test-mcp": TEST_SERVER,
|
|
497
|
-
});
|
|
498
|
-
const app = proxy.getApp();
|
|
499
|
-
|
|
500
|
-
// Pre-populate cache with a read-only tool
|
|
501
|
-
await toolCache.set(
|
|
502
|
-
"test-mcp",
|
|
503
|
-
[{ name: "read_tool", annotations: { readOnlyHint: true } }],
|
|
504
|
-
"agent1"
|
|
505
|
-
);
|
|
506
|
-
|
|
507
|
-
mockUpstreamFetch({
|
|
508
|
-
jsonrpc: "2.0",
|
|
509
|
-
id: 1,
|
|
510
|
-
result: {
|
|
511
|
-
content: [{ type: "text", text: "Read data" }],
|
|
512
|
-
isError: false,
|
|
513
|
-
},
|
|
514
|
-
});
|
|
515
|
-
|
|
516
|
-
const res = await app.request("/test-mcp/tools/read_tool", {
|
|
517
|
-
method: "POST",
|
|
518
|
-
headers: {
|
|
519
|
-
Authorization: `Bearer ${validToken}`,
|
|
520
|
-
"Content-Type": "application/json",
|
|
521
|
-
},
|
|
522
|
-
body: JSON.stringify({}),
|
|
523
|
-
});
|
|
524
|
-
expect(res.status).toBe(200);
|
|
525
|
-
});
|
|
526
|
-
|
|
527
|
-
test("allows destructiveHint=false without grant", async () => {
|
|
528
|
-
const { proxy, toolCache } = createProxyWithGrants({
|
|
529
|
-
"test-mcp": TEST_SERVER,
|
|
530
|
-
});
|
|
531
|
-
const app = proxy.getApp();
|
|
532
|
-
|
|
533
|
-
// Pre-populate cache with a non-destructive tool
|
|
534
|
-
await toolCache.set(
|
|
535
|
-
"test-mcp",
|
|
536
|
-
[{ name: "safe_tool", annotations: { destructiveHint: false } }],
|
|
537
|
-
"agent1"
|
|
538
|
-
);
|
|
539
|
-
|
|
540
|
-
mockUpstreamFetch({
|
|
541
|
-
jsonrpc: "2.0",
|
|
542
|
-
id: 1,
|
|
543
|
-
result: {
|
|
544
|
-
content: [{ type: "text", text: "Safe result" }],
|
|
545
|
-
isError: false,
|
|
546
|
-
},
|
|
547
|
-
});
|
|
548
|
-
|
|
549
|
-
const res = await app.request("/test-mcp/tools/safe_tool", {
|
|
550
|
-
method: "POST",
|
|
551
|
-
headers: {
|
|
552
|
-
Authorization: `Bearer ${validToken}`,
|
|
553
|
-
"Content-Type": "application/json",
|
|
554
|
-
},
|
|
555
|
-
body: JSON.stringify({}),
|
|
556
|
-
});
|
|
557
|
-
expect(res.status).toBe(200);
|
|
558
|
-
});
|
|
559
|
-
});
|
|
560
|
-
|
|
561
|
-
// ---------- GET /tools (list all) ----------
|
|
562
|
-
|
|
563
|
-
describe("GET /tools", () => {
|
|
564
|
-
test("lists tools from all MCPs", async () => {
|
|
565
|
-
const configSource = createMockConfigSource({
|
|
566
|
-
mcp1: {
|
|
567
|
-
id: "mcp1",
|
|
568
|
-
upstreamUrl: "http://upstream1:9000/mcp",
|
|
569
|
-
},
|
|
570
|
-
mcp2: {
|
|
571
|
-
id: "mcp2",
|
|
572
|
-
upstreamUrl: "http://upstream2:9000/mcp",
|
|
573
|
-
},
|
|
574
|
-
});
|
|
575
|
-
const proxy = new McpProxy(configSource, queue as any);
|
|
576
|
-
const app = proxy.getApp();
|
|
577
|
-
|
|
578
|
-
globalThis.fetch = async (url: string | URL | Request) => {
|
|
579
|
-
const urlStr =
|
|
580
|
-
typeof url === "string"
|
|
581
|
-
? url
|
|
582
|
-
: url instanceof URL
|
|
583
|
-
? url.href
|
|
584
|
-
: url.url;
|
|
585
|
-
const tools = urlStr.includes("upstream1")
|
|
586
|
-
? [{ name: "tool_a" }]
|
|
587
|
-
: [{ name: "tool_b" }];
|
|
588
|
-
return new Response(
|
|
589
|
-
JSON.stringify({
|
|
590
|
-
jsonrpc: "2.0",
|
|
591
|
-
id: 1,
|
|
592
|
-
result: { tools },
|
|
593
|
-
}),
|
|
594
|
-
{ status: 200, headers: { "Content-Type": "application/json" } }
|
|
595
|
-
);
|
|
596
|
-
};
|
|
597
|
-
|
|
598
|
-
const res = await app.request("/tools", {
|
|
599
|
-
method: "GET",
|
|
600
|
-
headers: { Authorization: `Bearer ${validToken}` },
|
|
601
|
-
});
|
|
602
|
-
expect(res.status).toBe(200);
|
|
603
|
-
const body = await res.json();
|
|
604
|
-
expect(body.mcpServers.mcp1.tools[0].name).toBe("tool_a");
|
|
605
|
-
expect(body.mcpServers.mcp2.tools[0].name).toBe("tool_b");
|
|
606
|
-
});
|
|
607
|
-
|
|
608
|
-
test("tolerates individual MCP failures", async () => {
|
|
609
|
-
const configSource = createMockConfigSource({
|
|
610
|
-
good: {
|
|
611
|
-
id: "good",
|
|
612
|
-
upstreamUrl: "http://good-upstream:9000/mcp",
|
|
613
|
-
},
|
|
614
|
-
bad: {
|
|
615
|
-
id: "bad",
|
|
616
|
-
upstreamUrl: "http://bad-upstream:9000/mcp",
|
|
617
|
-
},
|
|
618
|
-
});
|
|
619
|
-
const proxy = new McpProxy(configSource, queue as any);
|
|
620
|
-
const app = proxy.getApp();
|
|
621
|
-
|
|
622
|
-
globalThis.fetch = async (url: string | URL | Request) => {
|
|
623
|
-
const urlStr =
|
|
624
|
-
typeof url === "string"
|
|
625
|
-
? url
|
|
626
|
-
: url instanceof URL
|
|
627
|
-
? url.href
|
|
628
|
-
: url.url;
|
|
629
|
-
if (urlStr.includes("bad-upstream")) {
|
|
630
|
-
throw new Error("Connection refused");
|
|
631
|
-
}
|
|
632
|
-
return new Response(
|
|
633
|
-
JSON.stringify({
|
|
634
|
-
jsonrpc: "2.0",
|
|
635
|
-
id: 1,
|
|
636
|
-
result: { tools: [{ name: "working_tool" }] },
|
|
637
|
-
}),
|
|
638
|
-
{ status: 200, headers: { "Content-Type": "application/json" } }
|
|
639
|
-
);
|
|
640
|
-
};
|
|
641
|
-
|
|
642
|
-
const res = await app.request("/tools", {
|
|
643
|
-
method: "GET",
|
|
644
|
-
headers: { Authorization: `Bearer ${validToken}` },
|
|
645
|
-
});
|
|
646
|
-
expect(res.status).toBe(200);
|
|
647
|
-
const body = await res.json();
|
|
648
|
-
// The "good" MCP should still have its tools
|
|
649
|
-
expect(body.mcpServers.good.tools[0].name).toBe("working_tool");
|
|
650
|
-
// The "bad" MCP should be absent (empty tools are filtered out)
|
|
651
|
-
expect(body.mcpServers.bad).toBeUndefined();
|
|
652
|
-
});
|
|
653
|
-
});
|
|
654
|
-
|
|
655
|
-
// ---------- isMcpRequest ----------
|
|
656
|
-
|
|
657
|
-
describe("isMcpRequest", () => {
|
|
658
|
-
test("returns true with x-mcp-id header", async () => {
|
|
659
|
-
const configSource = createMockConfigSource({});
|
|
660
|
-
const proxy = new McpProxy(configSource, queue as any);
|
|
661
|
-
|
|
662
|
-
// Use a wrapper Hono app to get a real Context object
|
|
663
|
-
const { Hono } = await import("hono");
|
|
664
|
-
const wrapper = new Hono();
|
|
665
|
-
let result = false;
|
|
666
|
-
wrapper.all("/*", (c) => {
|
|
667
|
-
result = proxy.isMcpRequest(c);
|
|
668
|
-
return c.json({ result });
|
|
669
|
-
});
|
|
670
|
-
|
|
671
|
-
await wrapper.request("/anything", {
|
|
672
|
-
method: "GET",
|
|
673
|
-
headers: { "x-mcp-id": "some-mcp" },
|
|
674
|
-
});
|
|
675
|
-
expect(result).toBe(true);
|
|
676
|
-
});
|
|
677
|
-
|
|
678
|
-
test("returns false without x-mcp-id header", async () => {
|
|
679
|
-
const configSource = createMockConfigSource({});
|
|
680
|
-
const proxy = new McpProxy(configSource, queue as any);
|
|
681
|
-
|
|
682
|
-
const { Hono } = await import("hono");
|
|
683
|
-
const wrapper = new Hono();
|
|
684
|
-
let result = true;
|
|
685
|
-
wrapper.all("/*", (c) => {
|
|
686
|
-
result = proxy.isMcpRequest(c);
|
|
687
|
-
return c.json({ result });
|
|
688
|
-
});
|
|
689
|
-
|
|
690
|
-
await wrapper.request("/anything", { method: "GET" });
|
|
691
|
-
expect(result).toBe(false);
|
|
692
|
-
});
|
|
693
|
-
});
|
|
694
|
-
});
|
|
@@ -1,17 +0,0 @@
|
|
|
1
|
-
import { describe, expect, test } from "bun:test";
|
|
2
|
-
import { isSenderAllowed } from "../connections/message-handler-bridge";
|
|
3
|
-
|
|
4
|
-
describe("isSenderAllowed", () => {
|
|
5
|
-
test("allows everyone when allowFrom is not configured", () => {
|
|
6
|
-
expect(isSenderAllowed(undefined, "user-1")).toBe(true);
|
|
7
|
-
});
|
|
8
|
-
|
|
9
|
-
test("blocks everyone when allowFrom is an empty array", () => {
|
|
10
|
-
expect(isSenderAllowed([], "user-1")).toBe(false);
|
|
11
|
-
});
|
|
12
|
-
|
|
13
|
-
test("only allows listed users when allowFrom is configured", () => {
|
|
14
|
-
expect(isSenderAllowed(["user-1"], "user-1")).toBe(true);
|
|
15
|
-
expect(isSenderAllowed(["user-1"], "user-2")).toBe(false);
|
|
16
|
-
});
|
|
17
|
-
});
|