@itphx/synth-backend 0.7.3 → 0.8.3
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/app.d.ts +1 -2
- package/dist/app.js +241 -85
- package/dist/auth/middleware.d.ts +0 -1
- package/dist/auth/middleware.js +0 -1
- package/dist/auth/oidc.d.ts +0 -1
- package/dist/auth/oidc.js +0 -1
- package/dist/events/hub.d.ts +0 -1
- package/dist/events/hub.js +0 -1
- package/dist/lib/app-config.d.ts +0 -1
- package/dist/lib/app-config.js +0 -1
- package/dist/lib/defaults-store.d.ts +0 -1
- package/dist/lib/defaults-store.js +0 -1
- package/dist/lib/i18n-config.d.ts +0 -1
- package/dist/lib/i18n-config.js +0 -1
- package/dist/lib/i18n.d.ts +0 -1
- package/dist/lib/i18n.js +2 -1
- package/dist/lib/recalc-can-summarize.d.ts +15 -0
- package/dist/lib/recalc-can-summarize.js +47 -0
- package/dist/main.d.ts +0 -1
- package/dist/main.js +0 -1
- package/dist/middleware/rate-limiter.d.ts +0 -1
- package/dist/middleware/rate-limiter.js +0 -1
- package/dist/routes/agents.d.ts +8 -4
- package/dist/routes/agents.js +18 -155
- package/dist/routes/audit.d.ts +0 -1
- package/dist/routes/audit.js +0 -1
- package/dist/routes/auth.d.ts +0 -1
- package/dist/routes/auth.js +0 -1
- package/dist/routes/context.d.ts +0 -1
- package/dist/routes/context.js +0 -1
- package/dist/routes/debug.d.ts +0 -1
- package/dist/routes/debug.js +0 -1
- package/dist/routes/gateway-patterns.d.ts +0 -1
- package/dist/routes/gateway-patterns.js +0 -1
- package/dist/routes/llm.d.ts +0 -1
- package/dist/routes/llm.js +0 -1
- package/dist/routes/logs.d.ts +0 -1
- package/dist/routes/logs.js +0 -1
- package/dist/routes/mcp-registry.d.ts +16 -0
- package/dist/routes/mcp-registry.js +359 -0
- package/dist/routes/mcp.d.ts +9 -14
- package/dist/routes/mcp.js +10 -383
- package/dist/routes/messages.d.ts +5 -1
- package/dist/routes/messages.js +15 -154
- package/dist/routes/models.d.ts +3 -3
- package/dist/routes/models.js +7 -169
- package/dist/routes/projects.d.ts +24 -4
- package/dist/routes/projects.js +53 -217
- package/dist/routes/providers.d.ts +1 -2
- package/dist/routes/providers.js +0 -1
- package/dist/routes/queue.d.ts +4 -1
- package/dist/routes/queue.js +11 -139
- package/dist/routes/sessions.d.ts +1 -2
- package/dist/routes/sessions.js +4 -2
- package/dist/routes/users.d.ts +0 -1
- package/dist/routes/users.js +0 -1
- package/package.json +4 -5
- package/dist/app.d.ts.map +0 -1
- package/dist/app.js.map +0 -1
- package/dist/auth/middleware.d.ts.map +0 -1
- package/dist/auth/middleware.js.map +0 -1
- package/dist/auth/oidc.d.ts.map +0 -1
- package/dist/auth/oidc.js.map +0 -1
- package/dist/auth/oidc.test.d.ts +0 -2
- package/dist/auth/oidc.test.d.ts.map +0 -1
- package/dist/auth/oidc.test.js +0 -39
- package/dist/auth/oidc.test.js.map +0 -1
- package/dist/events/hub.d.ts.map +0 -1
- package/dist/events/hub.js.map +0 -1
- package/dist/events/hub.test.d.ts +0 -2
- package/dist/events/hub.test.d.ts.map +0 -1
- package/dist/events/hub.test.js +0 -74
- package/dist/events/hub.test.js.map +0 -1
- package/dist/integration/hybrid.integration.test.d.ts +0 -2
- package/dist/integration/hybrid.integration.test.d.ts.map +0 -1
- package/dist/integration/hybrid.integration.test.js +0 -289
- package/dist/integration/hybrid.integration.test.js.map +0 -1
- package/dist/lib/app-config.d.ts.map +0 -1
- package/dist/lib/app-config.js.map +0 -1
- package/dist/lib/defaults-store.d.ts.map +0 -1
- package/dist/lib/defaults-store.js.map +0 -1
- package/dist/lib/defaults-store.test.d.ts +0 -2
- package/dist/lib/defaults-store.test.d.ts.map +0 -1
- package/dist/lib/defaults-store.test.js +0 -168
- package/dist/lib/defaults-store.test.js.map +0 -1
- package/dist/lib/git-service.d.ts +0 -15
- package/dist/lib/git-service.d.ts.map +0 -1
- package/dist/lib/git-service.js +0 -215
- package/dist/lib/git-service.js.map +0 -1
- package/dist/lib/i18n-config.d.ts.map +0 -1
- package/dist/lib/i18n-config.js.map +0 -1
- package/dist/lib/i18n.d.ts.map +0 -1
- package/dist/lib/i18n.js.map +0 -1
- package/dist/lib/orchestrator-workspace.test.d.ts +0 -2
- package/dist/lib/orchestrator-workspace.test.d.ts.map +0 -1
- package/dist/lib/orchestrator-workspace.test.js +0 -85
- package/dist/lib/orchestrator-workspace.test.js.map +0 -1
- package/dist/lib/workspace-resolver.d.ts +0 -26
- package/dist/lib/workspace-resolver.d.ts.map +0 -1
- package/dist/lib/workspace-resolver.js +0 -249
- package/dist/lib/workspace-resolver.js.map +0 -1
- package/dist/main.d.ts.map +0 -1
- package/dist/main.js.map +0 -1
- package/dist/middleware/rate-limiter.d.ts.map +0 -1
- package/dist/middleware/rate-limiter.js.map +0 -1
- package/dist/routes/agents.d.ts.map +0 -1
- package/dist/routes/agents.js.map +0 -1
- package/dist/routes/agents.test.d.ts +0 -2
- package/dist/routes/agents.test.d.ts.map +0 -1
- package/dist/routes/agents.test.js +0 -211
- package/dist/routes/agents.test.js.map +0 -1
- package/dist/routes/audit.d.ts.map +0 -1
- package/dist/routes/audit.js.map +0 -1
- package/dist/routes/audit.test.d.ts +0 -2
- package/dist/routes/audit.test.d.ts.map +0 -1
- package/dist/routes/audit.test.js +0 -285
- package/dist/routes/audit.test.js.map +0 -1
- package/dist/routes/auth.d.ts.map +0 -1
- package/dist/routes/auth.js.map +0 -1
- package/dist/routes/auth.test.d.ts +0 -2
- package/dist/routes/auth.test.d.ts.map +0 -1
- package/dist/routes/auth.test.js +0 -63
- package/dist/routes/auth.test.js.map +0 -1
- package/dist/routes/context.d.ts.map +0 -1
- package/dist/routes/context.js.map +0 -1
- package/dist/routes/debug.d.ts.map +0 -1
- package/dist/routes/debug.js.map +0 -1
- package/dist/routes/debug.test.d.ts +0 -2
- package/dist/routes/debug.test.d.ts.map +0 -1
- package/dist/routes/debug.test.js +0 -102
- package/dist/routes/debug.test.js.map +0 -1
- package/dist/routes/fs.d.ts +0 -5
- package/dist/routes/fs.d.ts.map +0 -1
- package/dist/routes/fs.js +0 -391
- package/dist/routes/fs.js.map +0 -1
- package/dist/routes/gateway-patterns.d.ts.map +0 -1
- package/dist/routes/gateway-patterns.js.map +0 -1
- package/dist/routes/gateway-patterns.test.d.ts +0 -2
- package/dist/routes/gateway-patterns.test.d.ts.map +0 -1
- package/dist/routes/gateway-patterns.test.js +0 -176
- package/dist/routes/gateway-patterns.test.js.map +0 -1
- package/dist/routes/git.d.ts +0 -5
- package/dist/routes/git.d.ts.map +0 -1
- package/dist/routes/git.js +0 -105
- package/dist/routes/git.js.map +0 -1
- package/dist/routes/llm.d.ts.map +0 -1
- package/dist/routes/llm.js.map +0 -1
- package/dist/routes/llm.test.d.ts +0 -2
- package/dist/routes/llm.test.d.ts.map +0 -1
- package/dist/routes/llm.test.js +0 -629
- package/dist/routes/llm.test.js.map +0 -1
- package/dist/routes/logs.d.ts.map +0 -1
- package/dist/routes/logs.js.map +0 -1
- package/dist/routes/logs.test.d.ts +0 -2
- package/dist/routes/logs.test.d.ts.map +0 -1
- package/dist/routes/logs.test.js +0 -269
- package/dist/routes/logs.test.js.map +0 -1
- package/dist/routes/mcp-network-policy.integration.test.d.ts +0 -2
- package/dist/routes/mcp-network-policy.integration.test.d.ts.map +0 -1
- package/dist/routes/mcp-network-policy.integration.test.js +0 -44
- package/dist/routes/mcp-network-policy.integration.test.js.map +0 -1
- package/dist/routes/mcp-registry.test.d.ts +0 -2
- package/dist/routes/mcp-registry.test.d.ts.map +0 -1
- package/dist/routes/mcp-registry.test.js +0 -247
- package/dist/routes/mcp-registry.test.js.map +0 -1
- package/dist/routes/mcp.d.ts.map +0 -1
- package/dist/routes/mcp.js.map +0 -1
- package/dist/routes/mcp.test.d.ts +0 -2
- package/dist/routes/mcp.test.d.ts.map +0 -1
- package/dist/routes/mcp.test.js +0 -388
- package/dist/routes/mcp.test.js.map +0 -1
- package/dist/routes/messages.d.ts.map +0 -1
- package/dist/routes/messages.js.map +0 -1
- package/dist/routes/models.d.ts.map +0 -1
- package/dist/routes/models.js.map +0 -1
- package/dist/routes/models.test.d.ts +0 -2
- package/dist/routes/models.test.d.ts.map +0 -1
- package/dist/routes/models.test.js +0 -449
- package/dist/routes/models.test.js.map +0 -1
- package/dist/routes/projects-mcp.test.d.ts +0 -6
- package/dist/routes/projects-mcp.test.d.ts.map +0 -1
- package/dist/routes/projects-mcp.test.js +0 -160
- package/dist/routes/projects-mcp.test.js.map +0 -1
- package/dist/routes/projects.d.ts.map +0 -1
- package/dist/routes/projects.js.map +0 -1
- package/dist/routes/projects.test.d.ts +0 -2
- package/dist/routes/projects.test.d.ts.map +0 -1
- package/dist/routes/projects.test.js +0 -250
- package/dist/routes/projects.test.js.map +0 -1
- package/dist/routes/providers.d.ts.map +0 -1
- package/dist/routes/providers.js.map +0 -1
- package/dist/routes/providers.test.d.ts +0 -2
- package/dist/routes/providers.test.d.ts.map +0 -1
- package/dist/routes/providers.test.js +0 -211
- package/dist/routes/providers.test.js.map +0 -1
- package/dist/routes/queue.d.ts.map +0 -1
- package/dist/routes/queue.js.map +0 -1
- package/dist/routes/queue.test.d.ts +0 -2
- package/dist/routes/queue.test.d.ts.map +0 -1
- package/dist/routes/queue.test.js +0 -224
- package/dist/routes/queue.test.js.map +0 -1
- package/dist/routes/sessions-mcp.test.d.ts +0 -6
- package/dist/routes/sessions-mcp.test.d.ts.map +0 -1
- package/dist/routes/sessions-mcp.test.js +0 -182
- package/dist/routes/sessions-mcp.test.js.map +0 -1
- package/dist/routes/sessions.d.ts.map +0 -1
- package/dist/routes/sessions.js.map +0 -1
- package/dist/routes/sessions.test.d.ts +0 -2
- package/dist/routes/sessions.test.d.ts.map +0 -1
- package/dist/routes/sessions.test.js +0 -602
- package/dist/routes/sessions.test.js.map +0 -1
- package/dist/routes/settings.test.d.ts +0 -2
- package/dist/routes/settings.test.d.ts.map +0 -1
- package/dist/routes/settings.test.js +0 -184
- package/dist/routes/settings.test.js.map +0 -1
- package/dist/routes/users.d.ts.map +0 -1
- package/dist/routes/users.js.map +0 -1
- package/dist/storage/json-store.d.ts +0 -20
- package/dist/storage/json-store.d.ts.map +0 -1
- package/dist/storage/json-store.js +0 -100
- package/dist/storage/json-store.js.map +0 -1
- package/dist/storage/json-store.test.d.ts +0 -2
- package/dist/storage/json-store.test.d.ts.map +0 -1
- package/dist/storage/json-store.test.js +0 -59
- package/dist/storage/json-store.test.js.map +0 -1
- package/dist/storage/project-store.d.ts +0 -30
- package/dist/storage/project-store.d.ts.map +0 -1
- package/dist/storage/project-store.js +0 -109
- package/dist/storage/project-store.js.map +0 -1
|
@@ -0,0 +1,359 @@
|
|
|
1
|
+
import { Hono } from 'hono';
|
|
2
|
+
import { z } from 'zod';
|
|
3
|
+
import { evaluateMcpNetworkAccess } from '@itphx/synth-core';
|
|
4
|
+
import { sessionMcpScopeSchema } from '@itphx/synth-shared';
|
|
5
|
+
import { mcpServerConfigSchema } from '@itphx/synth-shared/config';
|
|
6
|
+
// Backend-only MCP-роуты (AD-071 §2.5): legacy `/servers*`, `/session/:id` и
|
|
7
|
+
// единый реестр `/registry*`. Probe (`POST /probe`) — общая логика core,
|
|
8
|
+
// монтируется в `routes/mcp.ts` ПЕРЕД этим роутером.
|
|
9
|
+
const addServerSchema = z.object({
|
|
10
|
+
name: z.string().min(1),
|
|
11
|
+
config: mcpServerConfigSchema,
|
|
12
|
+
});
|
|
13
|
+
const updateServerSchema = mcpServerConfigSchema;
|
|
14
|
+
// AD-071 §2.5: единый реестр MCP-серверов.
|
|
15
|
+
const registryAddSchema = z.object({
|
|
16
|
+
name: z.string().min(1).max(200),
|
|
17
|
+
config: mcpServerConfigSchema,
|
|
18
|
+
/** Системный мастер-флаг (дефолт `true`). */
|
|
19
|
+
enabled: z.boolean().optional(),
|
|
20
|
+
enabledByDefault: z.boolean().optional(),
|
|
21
|
+
/** Только admin может явно запросить instance-запись; иначе — user/community. */
|
|
22
|
+
origin: z.enum(['instance', 'user']).optional(),
|
|
23
|
+
});
|
|
24
|
+
const registryUpdateSchema = z.object({
|
|
25
|
+
name: z.string().min(1).max(200).optional(),
|
|
26
|
+
config: mcpServerConfigSchema.optional(),
|
|
27
|
+
/** Системный мастер-флаг. */
|
|
28
|
+
enabled: z.boolean().optional(),
|
|
29
|
+
enabledByDefault: z.boolean().optional(),
|
|
30
|
+
});
|
|
31
|
+
export function createMcpRegistryRoutes(kit, mcpManager, sessionManager, options) {
|
|
32
|
+
const app = new Hono();
|
|
33
|
+
const registry = options.registry;
|
|
34
|
+
const resolveNetworkPolicy = () => options.getNetworkPolicy?.() ?? options.networkPolicy;
|
|
35
|
+
/** Синхронизировать конфиг менеджера из реестра — одно чтение на все карты. */
|
|
36
|
+
const syncManagerConfig = async () => {
|
|
37
|
+
if (!mcpManager)
|
|
38
|
+
return;
|
|
39
|
+
const maps = await registry.toManagerMaps();
|
|
40
|
+
mcpManager.setConfig(maps.servers);
|
|
41
|
+
mcpManager.setServerOrigins(maps.origins);
|
|
42
|
+
mcpManager.setServerTrusts(maps.trusts);
|
|
43
|
+
mcpManager.setServerAuthors(maps.authors);
|
|
44
|
+
mcpManager.setDefaultServers(maps.defaults);
|
|
45
|
+
mcpManager.setServerSystemEnabled(maps.systemEnabled);
|
|
46
|
+
};
|
|
47
|
+
const isConnected = (name) => mcpManager?.getConfiguredServers().find((s) => s.name === name)?.connected ?? false;
|
|
48
|
+
const currentUser = (c) => c.get('user') ?? null;
|
|
49
|
+
const checkNetwork = async (config, origin) => {
|
|
50
|
+
// AD-071 §2.3.1: политика — для пользовательских HTTP-серверов; instance
|
|
51
|
+
// (в т.ч. приватные сети инстанса) доверенные.
|
|
52
|
+
if (origin !== 'user' || config.type === 'stdio' || !config.url)
|
|
53
|
+
return null;
|
|
54
|
+
const policy = resolveNetworkPolicy();
|
|
55
|
+
if (!policy)
|
|
56
|
+
return null;
|
|
57
|
+
const result = await evaluateMcpNetworkAccess(config.url, policy);
|
|
58
|
+
if (result.allowed)
|
|
59
|
+
return null;
|
|
60
|
+
return { code: 'NETWORK_POLICY_VIOLATION', message: result.reason ?? 'Адрес запрещён сетевой политикой' };
|
|
61
|
+
};
|
|
62
|
+
// ---------------------------------------------------------------------------
|
|
63
|
+
// Legacy `/servers*` — тонкие адаптеры над единым реестром (AD-071 §2.5).
|
|
64
|
+
// Второго хранилища (config.yaml) больше нет: источник истины — McpRegistryStore.
|
|
65
|
+
// ---------------------------------------------------------------------------
|
|
66
|
+
// --- Список настроенных серверов ---
|
|
67
|
+
app.get('/servers', kit.requireAuth, async (c) => {
|
|
68
|
+
const entries = await registry.list();
|
|
69
|
+
const result = {};
|
|
70
|
+
for (const entry of entries) {
|
|
71
|
+
result[entry.name] = { name: entry.name, config: entry.config, connected: isConnected(entry.name) };
|
|
72
|
+
}
|
|
73
|
+
return c.json(result);
|
|
74
|
+
});
|
|
75
|
+
// --- Добавить сервер (instance-запись; ADMIN) ---
|
|
76
|
+
app.post('/servers', kit.requireAdmin, async (c) => {
|
|
77
|
+
const body = await c.req.json();
|
|
78
|
+
const parsed = addServerSchema.safeParse(body);
|
|
79
|
+
if (!parsed.success) {
|
|
80
|
+
return c.json({ error: { code: 'VALIDATION_ERROR', message: parsed.error.message } }, 400);
|
|
81
|
+
}
|
|
82
|
+
const { name, config } = parsed.data;
|
|
83
|
+
if (await registry.getByName(name)) {
|
|
84
|
+
return c.json({ error: { code: 'CONFLICT', message: `Сервер "${name}" уже существует` } }, 409);
|
|
85
|
+
}
|
|
86
|
+
const networkError = await checkNetwork(config, 'instance');
|
|
87
|
+
if (networkError) {
|
|
88
|
+
return c.json({ error: networkError }, 400);
|
|
89
|
+
}
|
|
90
|
+
// ADMIN-роут: сервер трактуется как instance/builtin (как config.mcp.servers).
|
|
91
|
+
await registry.add({ name, config, origin: 'instance', trust: 'builtin' });
|
|
92
|
+
await syncManagerConfig();
|
|
93
|
+
return c.json({ name, config, connected: isConnected(name) }, 201);
|
|
94
|
+
});
|
|
95
|
+
// --- Получить сервер ---
|
|
96
|
+
app.get('/servers/:name', kit.requireAuth, async (c) => {
|
|
97
|
+
const name = c.req.param('name');
|
|
98
|
+
const entry = await registry.getByName(name);
|
|
99
|
+
if (!entry) {
|
|
100
|
+
return c.json({ error: { code: 'NOT_FOUND', message: `Сервер "${name}" не найден` } }, 404);
|
|
101
|
+
}
|
|
102
|
+
return c.json({ name: entry.name, config: entry.config, connected: isConnected(entry.name) });
|
|
103
|
+
});
|
|
104
|
+
// --- Обновить сервер (ADMIN) ---
|
|
105
|
+
app.put('/servers/:name', kit.requireAdmin, async (c) => {
|
|
106
|
+
const name = c.req.param('name');
|
|
107
|
+
const entry = await registry.getByName(name);
|
|
108
|
+
if (!entry) {
|
|
109
|
+
return c.json({ error: { code: 'NOT_FOUND', message: `Сервер "${name}" не найден` } }, 404);
|
|
110
|
+
}
|
|
111
|
+
const body = await c.req.json();
|
|
112
|
+
const parsed = updateServerSchema.safeParse(body);
|
|
113
|
+
if (!parsed.success) {
|
|
114
|
+
return c.json({ error: { code: 'VALIDATION_ERROR', message: parsed.error.message } }, 400);
|
|
115
|
+
}
|
|
116
|
+
const networkError = await checkNetwork(parsed.data, entry.origin);
|
|
117
|
+
if (networkError) {
|
|
118
|
+
return c.json({ error: networkError }, 400);
|
|
119
|
+
}
|
|
120
|
+
await registry.update(entry.id, { config: parsed.data });
|
|
121
|
+
await syncManagerConfig();
|
|
122
|
+
return c.json({ name, config: parsed.data, connected: isConnected(name) });
|
|
123
|
+
});
|
|
124
|
+
// --- Удалить сервер (ADMIN) ---
|
|
125
|
+
app.delete('/servers/:name', kit.requireAdmin, async (c) => {
|
|
126
|
+
const name = c.req.param('name');
|
|
127
|
+
const entry = await registry.getByName(name);
|
|
128
|
+
if (!entry) {
|
|
129
|
+
return c.json({ error: { code: 'NOT_FOUND', message: `Сервер "${name}" не найден` } }, 404);
|
|
130
|
+
}
|
|
131
|
+
if (mcpManager) {
|
|
132
|
+
await mcpManager.disconnectServer(name);
|
|
133
|
+
}
|
|
134
|
+
await registry.remove(entry.id);
|
|
135
|
+
await syncManagerConfig();
|
|
136
|
+
return c.json({ success: true });
|
|
137
|
+
});
|
|
138
|
+
// --- Проверить подключение (ADMIN) ---
|
|
139
|
+
app.post('/servers/:name/test', kit.requireAdmin, async (c) => {
|
|
140
|
+
const name = c.req.param('name');
|
|
141
|
+
// Принимаем опциональный конфиг в теле — для теста до сохранения.
|
|
142
|
+
let config;
|
|
143
|
+
try {
|
|
144
|
+
const body = await c.req.json();
|
|
145
|
+
const bodyConfig = body?.config;
|
|
146
|
+
if (bodyConfig)
|
|
147
|
+
config = bodyConfig;
|
|
148
|
+
}
|
|
149
|
+
catch {
|
|
150
|
+
// тело не JSON — используем конфиг из реестра
|
|
151
|
+
}
|
|
152
|
+
config ??= (await registry.getByName(name))?.config;
|
|
153
|
+
if (!config) {
|
|
154
|
+
return c.json({ error: { code: 'NOT_FOUND', message: `Сервер "${name}" не найден` } }, 404);
|
|
155
|
+
}
|
|
156
|
+
if (!mcpManager) {
|
|
157
|
+
return c.json({ error: { code: 'INTERNAL_ERROR', message: 'McpManager не настроен' } }, 500);
|
|
158
|
+
}
|
|
159
|
+
try {
|
|
160
|
+
mcpManager.setConfig({ ...mcpManager.getConfig(), [name]: config });
|
|
161
|
+
const tools = await mcpManager.probeServer(name);
|
|
162
|
+
return c.json({ success: true, toolCount: tools.length, tools: tools.map((t) => ({ name: t.name, description: t.description })) });
|
|
163
|
+
}
|
|
164
|
+
catch (err) {
|
|
165
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
166
|
+
return c.json({ success: false, error: message });
|
|
167
|
+
}
|
|
168
|
+
});
|
|
169
|
+
// --- Список инструментов сервера ---
|
|
170
|
+
app.get('/servers/:name/tools', kit.requireAuth, async (c) => {
|
|
171
|
+
const name = c.req.param('name');
|
|
172
|
+
const entry = await registry.getByName(name);
|
|
173
|
+
if (!entry) {
|
|
174
|
+
return c.json({ error: { code: 'NOT_FOUND', message: `Сервер "${name}" не найден` } }, 404);
|
|
175
|
+
}
|
|
176
|
+
if (!mcpManager) {
|
|
177
|
+
return c.json({ tools: [] });
|
|
178
|
+
}
|
|
179
|
+
const configured = mcpManager.getConfiguredServers().find((s) => s.name === name);
|
|
180
|
+
if (!configured?.connected) {
|
|
181
|
+
try {
|
|
182
|
+
const tools = await mcpManager.probeServer(name);
|
|
183
|
+
return c.json({ server: name, tools, connected: false, probed: true });
|
|
184
|
+
}
|
|
185
|
+
catch (err) {
|
|
186
|
+
return c.json({ server: name, tools: [], connected: false, probed: true, error: err instanceof Error ? err.message : String(err) });
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
const tools = mcpManager.getServerTools(name) ?? [];
|
|
190
|
+
return c.json({
|
|
191
|
+
server: name,
|
|
192
|
+
tools,
|
|
193
|
+
connected: true,
|
|
194
|
+
});
|
|
195
|
+
});
|
|
196
|
+
// --- MCP-серверы сессии (legacy; канонический эндпоинт — /api/v2/sessions/:id/mcp) ---
|
|
197
|
+
if (sessionManager) {
|
|
198
|
+
/** Известные серверы — единый реестр. */
|
|
199
|
+
const knownServerNames = async () => new Set((await registry.list()).map((e) => e.name));
|
|
200
|
+
app.get('/session/:sessionId', kit.requireAuth, async (c) => {
|
|
201
|
+
const sessionId = c.req.param('sessionId');
|
|
202
|
+
const session = await sessionManager.getSession(sessionId);
|
|
203
|
+
if (!session) {
|
|
204
|
+
return c.json({ error: { code: 'NOT_FOUND', message: 'Сессия не найдена' } }, 404);
|
|
205
|
+
}
|
|
206
|
+
const entries = await registry.list();
|
|
207
|
+
const allServers = entries.map((entry) => ({
|
|
208
|
+
name: entry.name,
|
|
209
|
+
active: (session.settings.mcpServers || []).includes(entry.name),
|
|
210
|
+
}));
|
|
211
|
+
return c.json({
|
|
212
|
+
mcpServers: session.settings.mcpServers || [],
|
|
213
|
+
mcpDisabledServers: session.settings.mcpDisabledServers || [],
|
|
214
|
+
allServers,
|
|
215
|
+
});
|
|
216
|
+
});
|
|
217
|
+
app.put('/session/:sessionId', kit.requireAuth, async (c) => {
|
|
218
|
+
const sessionId = c.req.param('sessionId');
|
|
219
|
+
const session = await sessionManager.getSession(sessionId);
|
|
220
|
+
if (!session) {
|
|
221
|
+
return c.json({ error: { code: 'NOT_FOUND', message: 'Сессия не найдена' } }, 404);
|
|
222
|
+
}
|
|
223
|
+
const body = await c.req.json().catch(() => ({}));
|
|
224
|
+
const parsed = sessionMcpScopeSchema.safeParse(body);
|
|
225
|
+
if (!parsed.success) {
|
|
226
|
+
return c.json({ error: { code: 'VALIDATION_ERROR', message: parsed.error.message } }, 400);
|
|
227
|
+
}
|
|
228
|
+
const { mcpServers, mcpDisabledServers } = parsed.data;
|
|
229
|
+
const known = await knownServerNames();
|
|
230
|
+
for (const name of [...(mcpServers ?? []), ...(mcpDisabledServers ?? [])]) {
|
|
231
|
+
if (!known.has(name)) {
|
|
232
|
+
return c.json({ error: { code: 'VALIDATION_ERROR', message: `Сервер "${name}" не настроен` } }, 400);
|
|
233
|
+
}
|
|
234
|
+
}
|
|
235
|
+
// Legacy-совместимость: `mcpServers` — явно включённые; `mcpDisabledServers`
|
|
236
|
+
// — явные opt-out. Оба поля независимы (новый opt-out доступен и здесь).
|
|
237
|
+
if (mcpServers !== undefined)
|
|
238
|
+
session.settings.mcpServers = mcpServers;
|
|
239
|
+
if (mcpDisabledServers !== undefined)
|
|
240
|
+
session.settings.mcpDisabledServers = mcpDisabledServers;
|
|
241
|
+
await sessionManager.saveSession(session);
|
|
242
|
+
const entries = await registry.list();
|
|
243
|
+
return c.json({
|
|
244
|
+
mcpServers: session.settings.mcpServers || [],
|
|
245
|
+
mcpDisabledServers: session.settings.mcpDisabledServers || [],
|
|
246
|
+
allServers: entries.map((entry) => ({
|
|
247
|
+
name: entry.name,
|
|
248
|
+
active: (session.settings.mcpServers || []).includes(entry.name),
|
|
249
|
+
})),
|
|
250
|
+
});
|
|
251
|
+
});
|
|
252
|
+
}
|
|
253
|
+
// --- Единый реестр MCP-серверов (AD-071 §2.5) ---
|
|
254
|
+
// Список записей реестра (auth).
|
|
255
|
+
app.get('/registry', kit.requireAuth, async (c) => {
|
|
256
|
+
const entries = await registry.list();
|
|
257
|
+
return c.json({ entries });
|
|
258
|
+
});
|
|
259
|
+
// Добавить запись (auth): HTTP — любой пользователь, stdio — только ADMIN.
|
|
260
|
+
app.post('/registry', kit.requireAuth, async (c) => {
|
|
261
|
+
const body = await c.req.json().catch(() => null);
|
|
262
|
+
const parsed = registryAddSchema.safeParse(body);
|
|
263
|
+
if (!parsed.success) {
|
|
264
|
+
return c.json({ error: { code: 'VALIDATION_ERROR', message: parsed.error.message } }, 400);
|
|
265
|
+
}
|
|
266
|
+
const { name, config, enabled, enabledByDefault, origin } = parsed.data;
|
|
267
|
+
const admin = kit.isAdmin(c);
|
|
268
|
+
let entryOrigin;
|
|
269
|
+
let trust;
|
|
270
|
+
if (config.type === 'stdio') {
|
|
271
|
+
if (!admin) {
|
|
272
|
+
return c.json({
|
|
273
|
+
error: { code: 'FORBIDDEN', message: 'stdio-серверы может добавлять только ADMIN' },
|
|
274
|
+
}, 403);
|
|
275
|
+
}
|
|
276
|
+
entryOrigin = 'instance';
|
|
277
|
+
trust = 'builtin';
|
|
278
|
+
}
|
|
279
|
+
else {
|
|
280
|
+
entryOrigin = admin && origin === 'instance' ? 'instance' : 'user';
|
|
281
|
+
trust = entryOrigin === 'instance' ? 'builtin' : 'community';
|
|
282
|
+
}
|
|
283
|
+
const networkError = await checkNetwork(config, entryOrigin);
|
|
284
|
+
if (networkError) {
|
|
285
|
+
return c.json({ error: networkError }, 400);
|
|
286
|
+
}
|
|
287
|
+
if (await registry.getByName(name)) {
|
|
288
|
+
return c.json({ error: { code: 'CONFLICT', message: `Сервер "${name}" уже существует в реестре` } }, 409);
|
|
289
|
+
}
|
|
290
|
+
const user = currentUser(c);
|
|
291
|
+
const author = user ? { userId: user.id, username: user.username } : null;
|
|
292
|
+
const entry = await registry.add({
|
|
293
|
+
name,
|
|
294
|
+
config,
|
|
295
|
+
origin: entryOrigin,
|
|
296
|
+
trust,
|
|
297
|
+
author,
|
|
298
|
+
enabled,
|
|
299
|
+
enabledByDefault,
|
|
300
|
+
});
|
|
301
|
+
await syncManagerConfig();
|
|
302
|
+
return c.json(entry, 201);
|
|
303
|
+
});
|
|
304
|
+
// Обновить запись (автор или ADMIN).
|
|
305
|
+
app.put('/registry/:id', kit.requireAuth, async (c) => {
|
|
306
|
+
const id = c.req.param('id');
|
|
307
|
+
const existing = await registry.get(id);
|
|
308
|
+
if (!existing) {
|
|
309
|
+
return c.json({ error: { code: 'NOT_FOUND', message: `Запись "${id}" не найдена` } }, 404);
|
|
310
|
+
}
|
|
311
|
+
const admin = kit.isAdmin(c);
|
|
312
|
+
const user = currentUser(c);
|
|
313
|
+
if (!admin && existing.author?.userId !== user?.id) {
|
|
314
|
+
return c.json({ error: { code: 'FORBIDDEN', message: 'Обновлять запись может автор или ADMIN' } }, 403);
|
|
315
|
+
}
|
|
316
|
+
const body = await c.req.json().catch(() => null);
|
|
317
|
+
const parsed = registryUpdateSchema.safeParse(body);
|
|
318
|
+
if (!parsed.success) {
|
|
319
|
+
return c.json({ error: { code: 'VALIDATION_ERROR', message: parsed.error.message } }, 400);
|
|
320
|
+
}
|
|
321
|
+
const nextConfig = parsed.data.config ?? existing.config;
|
|
322
|
+
if (nextConfig.type === 'stdio' && !admin) {
|
|
323
|
+
return c.json({ error: { code: 'FORBIDDEN', message: 'stdio-серверы может изменять только ADMIN' } }, 403);
|
|
324
|
+
}
|
|
325
|
+
const networkError = await checkNetwork(nextConfig, existing.origin);
|
|
326
|
+
if (networkError) {
|
|
327
|
+
return c.json({ error: networkError }, 400);
|
|
328
|
+
}
|
|
329
|
+
if (parsed.data.name
|
|
330
|
+
&& parsed.data.name !== existing.name
|
|
331
|
+
&& await registry.getByName(parsed.data.name)) {
|
|
332
|
+
return c.json({
|
|
333
|
+
error: { code: 'CONFLICT', message: `Сервер "${parsed.data.name}" уже существует в реестре` },
|
|
334
|
+
}, 409);
|
|
335
|
+
}
|
|
336
|
+
const updated = await registry.update(id, parsed.data);
|
|
337
|
+
await syncManagerConfig();
|
|
338
|
+
return c.json(updated);
|
|
339
|
+
});
|
|
340
|
+
// Удалить запись (автор или ADMIN).
|
|
341
|
+
app.delete('/registry/:id', kit.requireAuth, async (c) => {
|
|
342
|
+
const id = c.req.param('id');
|
|
343
|
+
const existing = await registry.get(id);
|
|
344
|
+
if (!existing) {
|
|
345
|
+
return c.json({ error: { code: 'NOT_FOUND', message: `Запись "${id}" не найдена` } }, 404);
|
|
346
|
+
}
|
|
347
|
+
const admin = kit.isAdmin(c);
|
|
348
|
+
const user = currentUser(c);
|
|
349
|
+
if (!admin && existing.author?.userId !== user?.id) {
|
|
350
|
+
return c.json({ error: { code: 'FORBIDDEN', message: 'Удалять запись может автор или ADMIN' } }, 403);
|
|
351
|
+
}
|
|
352
|
+
if (mcpManager)
|
|
353
|
+
await mcpManager.disconnectServer(existing.name);
|
|
354
|
+
await registry.remove(id);
|
|
355
|
+
await syncManagerConfig();
|
|
356
|
+
return c.json({ success: true });
|
|
357
|
+
});
|
|
358
|
+
return app;
|
|
359
|
+
}
|
package/dist/routes/mcp.d.ts
CHANGED
|
@@ -1,17 +1,12 @@
|
|
|
1
1
|
import { Hono } from 'hono';
|
|
2
2
|
import type { AuthKit } from '../auth/middleware.js';
|
|
3
|
-
import type { SessionManager, McpManager
|
|
4
|
-
import type {
|
|
5
|
-
export
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
* Приоритетнее статической `networkPolicy`; читается на каждый запрос.
|
|
13
|
-
*/
|
|
14
|
-
getNetworkPolicy?: () => McpNetworkPolicy | undefined;
|
|
15
|
-
}
|
|
3
|
+
import type { SessionManager, McpManager } from '@itphx/synth-core';
|
|
4
|
+
import type { McpRoutesOptions } from './mcp-registry.js';
|
|
5
|
+
export type { McpRoutesOptions } from './mcp-registry.js';
|
|
6
|
+
/**
|
|
7
|
+
* Backend MCP: probe (`POST /probe`) — общая логика core-фабрики; legacy
|
|
8
|
+
* `/servers*`, `/session/:id` и единый реестр `/registry*` (AD-071) —
|
|
9
|
+
* backend-only (см. `mcp-registry.ts`). Порядок монтирования: core probe
|
|
10
|
+
* первым, затем backend-only.
|
|
11
|
+
*/
|
|
16
12
|
export declare function createMcpRoutes(kit: AuthKit, mcpManager: McpManager | null, sessionManager: SessionManager | null, options: McpRoutesOptions): Hono;
|
|
17
|
-
//# sourceMappingURL=mcp.d.ts.map
|