dsh-mcp-ops 0.2.1 → 0.3.0
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 +39 -12
- package/lib/client.js +282 -145
- package/lib/configs.js +21 -8
- package/lib/host-locales.js +2 -20
- package/lib/index.js +7 -1
- package/lib/mount.js +353 -146
- package/lib/oauth-key.js +21 -0
- package/lib/probe.js +38 -43
- package/lib/refs.js +0 -34
- package/lib/service.js +113 -216
- package/lib/sources/cordis-source.js +38 -17
- package/lib/system-ca.js +79 -0
- package/lib/tool-control.js +91 -271
- package/package.json +14 -15
- package/lib/oauth-web.js +0 -119
- package/lib/oauth.js +0 -228
package/lib/mount.js
CHANGED
|
@@ -1,23 +1,20 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { Config as McpClientConfig } from "@deepseek-ai/dsh-mcp-client";
|
|
2
2
|
import { buildChildEnv, makeLookup, resolveEnv, resolveHeaders } from "./env.js";
|
|
3
3
|
import { errorText } from "./error-text.js";
|
|
4
|
-
import {
|
|
4
|
+
import { oauthCredentialKey } from "./oauth-key.js";
|
|
5
5
|
import { probeServer } from "./probe.js";
|
|
6
|
-
import { SERVER_NAME_RE, isLegacySecretRow
|
|
7
|
-
const
|
|
8
|
-
name: McpClientModule.name,
|
|
9
|
-
inject: McpClientModule.inject,
|
|
10
|
-
Config: McpClientModule.Config,
|
|
11
|
-
apply: McpClientModule.apply
|
|
12
|
-
};
|
|
6
|
+
import { SERVER_NAME_RE, isLegacySecretRow } from "./refs.js";
|
|
7
|
+
const STARTUP_TIMEOUT_MS = 6e4;
|
|
13
8
|
class MountManager {
|
|
14
9
|
/** 宿主上下文。 */
|
|
15
10
|
ctx;
|
|
16
11
|
/** 等待外来工具让出前缀的预算。 */
|
|
17
12
|
conflictWaitMs;
|
|
18
|
-
/**
|
|
13
|
+
/** 等待首次状态落定的预算。 */
|
|
14
|
+
settleBudgetMs;
|
|
15
|
+
/** 活着的注册,键 = `serverName`。 */
|
|
19
16
|
mounts = /* @__PURE__ */ new Map();
|
|
20
|
-
/**
|
|
17
|
+
/** 每个名字的串行锁:同一名字的注册/注销/重启串行执行。 */
|
|
21
18
|
locks = /* @__PURE__ */ new Map();
|
|
22
19
|
/** **本管理器**注册过的工具名(含已卸载的),用来区分"自己的残留"与"外来占用"。 */
|
|
23
20
|
everMounted = /* @__PURE__ */ new Set();
|
|
@@ -26,12 +23,17 @@ class MountManager {
|
|
|
26
23
|
/** 每个名字的成功挂载次数(差分重启的观测点)。 */
|
|
27
24
|
generations = /* @__PURE__ */ new Map();
|
|
28
25
|
/**
|
|
29
|
-
* @param ctx - 宿主上下文(需要 `tools`
|
|
26
|
+
* @param ctx - 宿主上下文(需要 `tools` / `credentials` / `mcpManager`)。
|
|
30
27
|
* @param options - 行为选项。
|
|
31
28
|
*/
|
|
32
29
|
constructor(ctx, options = {}) {
|
|
33
30
|
this.ctx = ctx;
|
|
34
31
|
this.conflictWaitMs = options.conflictWaitMs ?? 3e3;
|
|
32
|
+
this.settleBudgetMs = options.settleBudgetMs ?? 65e3;
|
|
33
|
+
}
|
|
34
|
+
/** 官方 manager 服务(缺失即插件不应激活;`inject` 已保证存在)。 */
|
|
35
|
+
get manager() {
|
|
36
|
+
return this.ctx.mcpManager;
|
|
35
37
|
}
|
|
36
38
|
/**
|
|
37
39
|
* 在一个名字的串行锁里执行。
|
|
@@ -46,31 +48,12 @@ class MountManager {
|
|
|
46
48
|
return next;
|
|
47
49
|
}
|
|
48
50
|
/**
|
|
49
|
-
* 计算一个请求的"配置指纹"
|
|
50
|
-
* @param
|
|
51
|
+
* 计算一个请求的"配置指纹":变化即需要重新注册(差分重启)。
|
|
52
|
+
* @param entry - 已物化的 manager 注册项。
|
|
51
53
|
* @returns 指纹字符串。
|
|
52
54
|
*/
|
|
53
|
-
fingerprintOf(
|
|
54
|
-
|
|
55
|
-
return JSON.stringify({
|
|
56
|
-
transport: spec.transport,
|
|
57
|
-
// 可选字符串统一成 `''`:写回器在 create 模式会写 `"cwd": ""`(读回来是空串),
|
|
58
|
-
// 而 update 模式会把空可选键删掉(读回来是 undefined)—— 不归一化的话"新建后第一次保存"
|
|
59
|
-
// 会因为这一个键白重启一次(B37 实测发现)。
|
|
60
|
-
command: spec.command ?? "",
|
|
61
|
-
args: spec.args,
|
|
62
|
-
cwd: spec.cwd ?? "",
|
|
63
|
-
url: spec.url ?? "",
|
|
64
|
-
headers: spec.headers,
|
|
65
|
-
env: spec.env,
|
|
66
|
-
// B37:密钥真值进指纹 —— 轮换(credentials/reference-updated)即触发差分重建。
|
|
67
|
-
secrets: request.secrets ?? {},
|
|
68
|
-
globalEnv: request.globalEnv ?? {},
|
|
69
|
-
injectGlobalEnv: request.injectGlobalEnv !== false,
|
|
70
|
-
builtins: request.builtins ?? {},
|
|
71
|
-
timeout: spec.timeoutMs ?? request.overlay?.toolCallTimeoutMs ?? null,
|
|
72
|
-
occupied: request.occupiedByComposition === true
|
|
73
|
-
});
|
|
55
|
+
fingerprintOf(entry) {
|
|
56
|
+
return JSON.stringify(entry);
|
|
74
57
|
}
|
|
75
58
|
/**
|
|
76
59
|
* 组装"服务器级 env"的投影:凭据派生的密钥 + 文件里的行(B45)。
|
|
@@ -138,11 +121,28 @@ class MountManager {
|
|
|
138
121
|
}));
|
|
139
122
|
}
|
|
140
123
|
/**
|
|
141
|
-
*
|
|
124
|
+
* 值里是否还有**官方模板不认识的** `${…}` 占位符。
|
|
125
|
+
*
|
|
126
|
+
* 官方 manager 对每个字符串做 `assertTemplateSyntax()`:任何 `${…}` 要么整串是
|
|
127
|
+
* `${credential:REF}`,要么直接拒绝。我们解析不出来的 `${VAR}` 若原样传过去,
|
|
128
|
+
* 会让**整个注册**失败;这里返回 true 时由调用方丢掉该键并出 `ENV_UNRESOLVED` 诊断。
|
|
129
|
+
*
|
|
130
|
+
* @param value - 已解析的字符串。
|
|
131
|
+
* @returns 含有非法占位符时为 true。
|
|
132
|
+
*/
|
|
133
|
+
hasUnsupportedTemplate(value) {
|
|
134
|
+
for (const match of value.matchAll(/\$\{[^}]*\}/g)) {
|
|
135
|
+
if (!/^\$\{credential:[A-Za-z_][A-Za-z0-9_]*\}$/.test(match[0])) return true;
|
|
136
|
+
}
|
|
137
|
+
return false;
|
|
138
|
+
}
|
|
139
|
+
/**
|
|
140
|
+
* 物化一个请求:合成 env / headers / OAuth 头,产出 manager 注册项与诊断。
|
|
141
|
+
*
|
|
142
142
|
* @param request - 目标状态。
|
|
143
|
-
* @returns
|
|
143
|
+
* @returns 注册项、诊断与失败原因(失败时没有注册项)。
|
|
144
144
|
*/
|
|
145
|
-
|
|
145
|
+
async materialize(request) {
|
|
146
146
|
const diagnostics = [];
|
|
147
147
|
for (const name of request.secretProblems ?? []) {
|
|
148
148
|
diagnostics.push({
|
|
@@ -165,17 +165,31 @@ class MountManager {
|
|
|
165
165
|
messageKey: "diagnostics.ENV_UNRESOLVED"
|
|
166
166
|
});
|
|
167
167
|
}
|
|
168
|
+
const safe = {};
|
|
169
|
+
for (const [name, value] of Object.entries(env)) {
|
|
170
|
+
if (this.hasUnsupportedTemplate(value)) continue;
|
|
171
|
+
safe[name] = value;
|
|
172
|
+
}
|
|
173
|
+
if (request.overlay?.oauth === true) {
|
|
174
|
+
diagnostics.push({
|
|
175
|
+
code: "OAUTH_NOT_SUPPORTED",
|
|
176
|
+
level: "warn",
|
|
177
|
+
serverName: request.serverName,
|
|
178
|
+
detail: "OAuth requires the streamable-http transport; the stdio entry is mounted without it",
|
|
179
|
+
messageKey: "diagnostics.OAUTH_NOT_SUPPORTED"
|
|
180
|
+
});
|
|
181
|
+
}
|
|
168
182
|
return {
|
|
169
|
-
|
|
183
|
+
entry: {
|
|
170
184
|
transport: "stdio",
|
|
171
|
-
serverName: request.serverName,
|
|
172
185
|
command: request.spec.command ?? "",
|
|
173
186
|
args: [...request.spec.args],
|
|
174
187
|
cwd: request.spec.cwd ?? process.cwd(),
|
|
175
188
|
// 环境变量注入:这里传的是"父进程 scrub 后 + 进程级 + 服务器级"的合并结果。
|
|
176
|
-
env,
|
|
177
|
-
|
|
178
|
-
|
|
189
|
+
env: safe,
|
|
190
|
+
startupTimeoutMs: STARTUP_TIMEOUT_MS,
|
|
191
|
+
toolLoading: request.toolLoading ?? "on-demand",
|
|
192
|
+
...timeout === void 0 ? {} : { toolCallTimeoutMs: timeout }
|
|
179
193
|
},
|
|
180
194
|
diagnostics
|
|
181
195
|
};
|
|
@@ -190,15 +204,25 @@ class MountManager {
|
|
|
190
204
|
messageKey: "diagnostics.ENV_UNRESOLVED"
|
|
191
205
|
});
|
|
192
206
|
}
|
|
207
|
+
const clean = {};
|
|
208
|
+
for (const [name, value] of Object.entries(headers)) {
|
|
209
|
+
if (this.hasUnsupportedTemplate(value)) continue;
|
|
210
|
+
clean[name] = value;
|
|
211
|
+
}
|
|
212
|
+
const oauth = request.overlay?.oauth === true ? {
|
|
213
|
+
credentialKey: oauthCredentialKey(request.serverName),
|
|
214
|
+
...request.overlay.oauthScope === void 0 || request.overlay.oauthScope === "" ? {} : { scope: request.overlay.oauthScope },
|
|
215
|
+
...request.overlay.oauthClientId === void 0 || request.overlay.oauthClientId === "" ? {} : { clientId: request.overlay.oauthClientId }
|
|
216
|
+
} : void 0;
|
|
193
217
|
return {
|
|
194
|
-
|
|
218
|
+
entry: {
|
|
195
219
|
transport: "streamable-http",
|
|
196
|
-
serverName: request.serverName,
|
|
197
220
|
url: request.spec.url ?? "",
|
|
198
|
-
|
|
199
|
-
|
|
221
|
+
headers: clean,
|
|
222
|
+
startupTimeoutMs: STARTUP_TIMEOUT_MS,
|
|
223
|
+
toolLoading: request.toolLoading ?? "on-demand",
|
|
200
224
|
...timeout === void 0 ? {} : { toolCallTimeoutMs: timeout },
|
|
201
|
-
|
|
225
|
+
...oauth === void 0 ? {} : { oauth }
|
|
202
226
|
},
|
|
203
227
|
diagnostics
|
|
204
228
|
};
|
|
@@ -237,76 +261,163 @@ class MountManager {
|
|
|
237
261
|
return owned;
|
|
238
262
|
}
|
|
239
263
|
/**
|
|
240
|
-
*
|
|
241
|
-
* @param
|
|
242
|
-
* @returns
|
|
264
|
+
* manager 里是否已有**别人**占着这个名字(configured 项或别的插件注册)。
|
|
265
|
+
* @param serverName - 服务器名。
|
|
266
|
+
* @returns 被占用时为 true。
|
|
243
267
|
*/
|
|
268
|
+
occupiedInManager(serverName) {
|
|
269
|
+
if (this.mounts.has(serverName)) return false;
|
|
270
|
+
return this.managerView(serverName) !== void 0;
|
|
271
|
+
}
|
|
244
272
|
/**
|
|
245
|
-
*
|
|
246
|
-
*
|
|
273
|
+
* 读取一个名字的 manager 状态。
|
|
247
274
|
* @param serverName - 服务器名。
|
|
248
|
-
* @returns
|
|
275
|
+
* @returns 视图,或 undefined。
|
|
249
276
|
*/
|
|
250
|
-
|
|
277
|
+
managerView(serverName) {
|
|
251
278
|
try {
|
|
252
|
-
|
|
253
|
-
const token = parseToken(resolved?.value);
|
|
254
|
-
return isTokenFresh(token) ? token?.accessToken : void 0;
|
|
279
|
+
return this.manager.list().find((view) => view.name === serverName);
|
|
255
280
|
} catch {
|
|
256
281
|
return void 0;
|
|
257
282
|
}
|
|
258
283
|
}
|
|
259
284
|
/**
|
|
260
|
-
*
|
|
285
|
+
* 订阅某个名字的状态落定(在 `register()` **之前**建好,避免错过新实例的首次事件)。
|
|
261
286
|
*
|
|
262
|
-
*
|
|
263
|
-
*
|
|
264
|
-
* 返回诊断让界面指引用户先去授权(`oauthStart`)。
|
|
287
|
+
* 注册后 manager 会异步挂载新实例并发布 `connecting` → `connected`;只读 `list()` 的当前值
|
|
288
|
+
* 可能读到**上一个实例**的 `connected`(差分重启时尤其明显),所以必须等一条新事件。
|
|
265
289
|
*
|
|
266
|
-
* @param
|
|
267
|
-
* @returns
|
|
290
|
+
* @param serverName - 服务器名。
|
|
291
|
+
* @returns 落定状态(`connected` 或失败态)与清理函数;超时时 resolve `undefined`。
|
|
268
292
|
*/
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
293
|
+
statusWaiter(serverName) {
|
|
294
|
+
const settled = (status) => status !== void 0 && (status.state === "connected" || status.state === "failed" || status.state === "waiting-credentials" || status.state === "reconnecting" || status.state === "waiting-authorization" || status.state === "closed");
|
|
295
|
+
let resolve = () => {
|
|
296
|
+
};
|
|
297
|
+
let finished = false;
|
|
298
|
+
let release = () => {
|
|
299
|
+
};
|
|
300
|
+
const promise = new Promise((done) => {
|
|
301
|
+
resolve = done;
|
|
302
|
+
});
|
|
303
|
+
const finish = (status) => {
|
|
304
|
+
if (finished) return;
|
|
305
|
+
finished = true;
|
|
306
|
+
clearTimeout(timer);
|
|
307
|
+
release();
|
|
308
|
+
resolve(status);
|
|
282
309
|
};
|
|
310
|
+
const timer = setTimeout(() => finish(void 0), this.settleBudgetMs);
|
|
311
|
+
timer.unref?.();
|
|
312
|
+
release = this.ctx.on("mcp-manager/status", (name, status) => {
|
|
313
|
+
if (name !== serverName) return;
|
|
314
|
+
if (!settled(status)) return;
|
|
315
|
+
finish(status);
|
|
316
|
+
});
|
|
317
|
+
return { promise, dispose: () => finish(void 0) };
|
|
283
318
|
}
|
|
284
319
|
/**
|
|
285
|
-
*
|
|
320
|
+
* 等 manager 真正把某个名字的实例卸掉(`list()` 里不再出现)。
|
|
286
321
|
*
|
|
287
|
-
*
|
|
288
|
-
* @
|
|
289
|
-
*
|
|
322
|
+
* 注销注册只删 registrations 表,实例卸载是排队执行的;不等它,紧接着的同名注册会被
|
|
323
|
+
* {@link occupiedInManager} 误判成"别人占着"(禁用→启用往返实测踩到)。
|
|
324
|
+
*
|
|
325
|
+
* @param serverName - 服务器名。
|
|
290
326
|
*/
|
|
291
|
-
async
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
327
|
+
async waitForRemoval(serverName) {
|
|
328
|
+
if (this.managerView(serverName) === void 0) return;
|
|
329
|
+
await new Promise((resolve) => {
|
|
330
|
+
let releaseTools = () => {
|
|
331
|
+
};
|
|
332
|
+
let releaseStatus = () => {
|
|
333
|
+
};
|
|
334
|
+
let finished = false;
|
|
335
|
+
const finish = () => {
|
|
336
|
+
if (finished) return;
|
|
337
|
+
finished = true;
|
|
338
|
+
clearTimeout(timer);
|
|
339
|
+
clearInterval(poll);
|
|
340
|
+
releaseTools();
|
|
341
|
+
releaseStatus();
|
|
342
|
+
resolve();
|
|
343
|
+
};
|
|
344
|
+
const check = () => {
|
|
345
|
+
if (this.managerView(serverName) === void 0) finish();
|
|
346
|
+
};
|
|
347
|
+
const timer = setTimeout(finish, 5e3);
|
|
348
|
+
timer.unref?.();
|
|
349
|
+
const poll = setInterval(check, 25);
|
|
350
|
+
poll.unref?.();
|
|
351
|
+
releaseTools = this.ctx.on("tools/change", check);
|
|
352
|
+
releaseStatus = this.ctx.on("mcp-manager/status", check);
|
|
353
|
+
check();
|
|
298
354
|
});
|
|
299
355
|
}
|
|
300
|
-
|
|
356
|
+
/**
|
|
357
|
+
* 把 manager 状态映射成界面相位。
|
|
358
|
+
* @param status - manager 状态。
|
|
359
|
+
* @param tools - 当前工具名。
|
|
360
|
+
* @returns 相位与错误文本。
|
|
361
|
+
*/
|
|
362
|
+
phaseOf(status, tools) {
|
|
363
|
+
if (status === void 0) return { phase: tools.length > 0 ? "live" : "failed", error: tools.length > 0 ? void 0 : "server is not registered" };
|
|
364
|
+
switch (status.state) {
|
|
365
|
+
case "connected":
|
|
366
|
+
return { phase: "live" };
|
|
367
|
+
case "connecting":
|
|
368
|
+
return { phase: "mounting" };
|
|
369
|
+
case "reconnecting":
|
|
370
|
+
return { phase: "failed", error: status.lastError };
|
|
371
|
+
case "waiting-credentials":
|
|
372
|
+
return { phase: "failed", error: status.lastError };
|
|
373
|
+
// 官方 OAuth:没有可用 grant(或过期/绑定不匹配/被拒/缺 scope),等用户显式授权。
|
|
374
|
+
// 单独一档而不是 `failed`:这是"可操作"的中间态,界面要给授权按钮。
|
|
375
|
+
case "waiting-authorization":
|
|
376
|
+
return { phase: "waiting-authorization", error: status.lastError };
|
|
377
|
+
case "failed":
|
|
378
|
+
return { phase: "failed", error: status.lastError ?? status.reason };
|
|
379
|
+
case "closed":
|
|
380
|
+
return { phase: "stopped", error: status.result.cleanupError };
|
|
381
|
+
case "disabled":
|
|
382
|
+
return { phase: "stopped" };
|
|
383
|
+
default:
|
|
384
|
+
return { phase: "failed" };
|
|
385
|
+
}
|
|
386
|
+
}
|
|
387
|
+
/**
|
|
388
|
+
* 建一个状态对象(工具从全局注册表按前缀读)。
|
|
389
|
+
* @param request - 目标状态。
|
|
390
|
+
* @param phase - 相位。
|
|
391
|
+
* @param diagnostics - 诊断。
|
|
392
|
+
* @param error - 错误文本。
|
|
393
|
+
* @returns 状态。
|
|
394
|
+
*/
|
|
395
|
+
stateOfRequest(request, phase, diagnostics, error) {
|
|
396
|
+
const prefix = `mcp__${request.serverName}__`;
|
|
397
|
+
const tools = this.ctx.tools.schemas().filter((tool) => tool.name.startsWith(prefix)).map((tool) => tool.name);
|
|
398
|
+
return {
|
|
399
|
+
serverName: request.serverName,
|
|
400
|
+
phase,
|
|
401
|
+
tools,
|
|
402
|
+
...error === void 0 ? {} : { error },
|
|
403
|
+
generation: this.generations.get(request.serverName) ?? 0,
|
|
404
|
+
diagnostics
|
|
405
|
+
};
|
|
406
|
+
}
|
|
407
|
+
/**
|
|
408
|
+
* 注册一个服务器(调用方需已在串行锁内)。
|
|
409
|
+
* @param request - 目标状态。
|
|
410
|
+
* @returns 相位。
|
|
411
|
+
*/
|
|
412
|
+
async register(request, replacing = false) {
|
|
301
413
|
const { serverName } = request;
|
|
302
|
-
const prefix = `mcp__${serverName}__`;
|
|
303
|
-
const generation = this.generations.get(serverName) ?? 0;
|
|
304
|
-
const base = { serverName, phase: "mounting", tools: [], diagnostics: [], generation };
|
|
305
414
|
if (!SERVER_NAME_RE.test(serverName)) {
|
|
306
415
|
const state2 = {
|
|
307
|
-
|
|
416
|
+
serverName,
|
|
308
417
|
phase: "failed",
|
|
418
|
+
tools: [],
|
|
309
419
|
error: `serverName must match ${String(SERVER_NAME_RE)}`,
|
|
420
|
+
generation: this.generations.get(serverName) ?? 0,
|
|
310
421
|
diagnostics: [{
|
|
311
422
|
code: "SERVER_NAME_INVALID",
|
|
312
423
|
level: "error",
|
|
@@ -318,74 +429,134 @@ class MountManager {
|
|
|
318
429
|
this.phases.set(serverName, state2);
|
|
319
430
|
return state2;
|
|
320
431
|
}
|
|
321
|
-
|
|
322
|
-
if (oauthDiagnostic !== void 0) {
|
|
432
|
+
if (!replacing && this.occupiedInManager(serverName)) {
|
|
323
433
|
const state2 = {
|
|
324
|
-
|
|
434
|
+
serverName,
|
|
435
|
+
phase: "stopped-conflict",
|
|
436
|
+
tools: [],
|
|
437
|
+
error: `server "${serverName}" is already provided by the DSH composition or another plugin`,
|
|
438
|
+
generation: this.generations.get(serverName) ?? 0,
|
|
439
|
+
diagnostics: [{
|
|
440
|
+
code: "SERVER_NAME_OCCUPIED",
|
|
441
|
+
level: "warn",
|
|
442
|
+
serverName,
|
|
443
|
+
detail: `mcp__${serverName}__`,
|
|
444
|
+
messageKey: "diagnostics.SERVER_NAME_OCCUPIED"
|
|
445
|
+
}]
|
|
446
|
+
};
|
|
447
|
+
this.phases.set(serverName, state2);
|
|
448
|
+
return state2;
|
|
449
|
+
}
|
|
450
|
+
const materialized = await this.materialize(request);
|
|
451
|
+
if (materialized.entry === void 0) {
|
|
452
|
+
const state2 = {
|
|
453
|
+
serverName,
|
|
325
454
|
phase: "failed",
|
|
326
|
-
|
|
327
|
-
|
|
455
|
+
tools: [],
|
|
456
|
+
error: materialized.error ?? "cannot build an MCP registration for this server",
|
|
457
|
+
generation: this.generations.get(serverName) ?? 0,
|
|
458
|
+
diagnostics: materialized.diagnostics
|
|
328
459
|
};
|
|
329
460
|
this.phases.set(serverName, state2);
|
|
330
461
|
return state2;
|
|
331
462
|
}
|
|
332
|
-
if (!await this.waitForPrefixRelease(
|
|
463
|
+
if (!await this.waitForPrefixRelease(`mcp__${serverName}__`)) {
|
|
333
464
|
const state2 = {
|
|
334
|
-
|
|
465
|
+
serverName,
|
|
335
466
|
phase: "stopped-conflict",
|
|
336
|
-
|
|
337
|
-
|
|
467
|
+
tools: [],
|
|
468
|
+
error: `tools with prefix mcp__${serverName}__ are owned by another layer (composition?)`,
|
|
469
|
+
generation: this.generations.get(serverName) ?? 0,
|
|
470
|
+
diagnostics: [...materialized.diagnostics, {
|
|
338
471
|
code: "SERVER_NAME_OCCUPIED",
|
|
339
472
|
level: "warn",
|
|
340
473
|
serverName,
|
|
341
|
-
detail:
|
|
474
|
+
detail: `mcp__${serverName}__`,
|
|
342
475
|
messageKey: "diagnostics.SERVER_NAME_OCCUPIED"
|
|
343
476
|
}]
|
|
344
477
|
};
|
|
345
478
|
this.phases.set(serverName, state2);
|
|
346
479
|
return state2;
|
|
347
480
|
}
|
|
348
|
-
|
|
349
|
-
const
|
|
350
|
-
let child;
|
|
351
|
-
let disposeEffect;
|
|
481
|
+
let dispose;
|
|
482
|
+
const waiter = this.statusWaiter(serverName);
|
|
352
483
|
try {
|
|
353
|
-
|
|
354
|
-
child = this.ctx.plugin(McpClient, McpClient.Config(config));
|
|
355
|
-
return () => child.dispose();
|
|
356
|
-
}, `dsh-mcp-ops:${serverName}`);
|
|
484
|
+
dispose = this.manager.register(serverName, materialized.entry);
|
|
357
485
|
} catch (error) {
|
|
358
|
-
const state2 = { ...base, phase: "failed", error: errorText(error), diagnostics };
|
|
359
|
-
this.phases.set(serverName, state2);
|
|
360
|
-
return state2;
|
|
361
|
-
}
|
|
362
|
-
this.everMounted.add(serverName);
|
|
363
|
-
try {
|
|
364
|
-
await child.await();
|
|
365
|
-
} catch (error) {
|
|
366
|
-
disposeEffect();
|
|
367
486
|
const state2 = {
|
|
368
|
-
|
|
487
|
+
serverName,
|
|
369
488
|
phase: "failed",
|
|
489
|
+
tools: [],
|
|
370
490
|
error: errorText(error),
|
|
371
|
-
|
|
491
|
+
generation: this.generations.get(serverName) ?? 0,
|
|
492
|
+
diagnostics: materialized.diagnostics
|
|
372
493
|
};
|
|
373
494
|
this.phases.set(serverName, state2);
|
|
495
|
+
waiter.dispose();
|
|
374
496
|
return state2;
|
|
375
497
|
}
|
|
376
|
-
|
|
377
|
-
this.
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
498
|
+
this.everMounted.add(serverName);
|
|
499
|
+
const fingerprint = this.fingerprintOf(materialized.entry);
|
|
500
|
+
const mount = { entry: materialized.entry, fingerprint, dispose, diagnostics: materialized.diagnostics, tools: [] };
|
|
501
|
+
this.mounts.set(serverName, mount);
|
|
502
|
+
const settled = await waiter.promise;
|
|
503
|
+
const tools = this.ctx.tools.schemas().filter((tool) => tool.name.startsWith(`mcp__${serverName}__`)).map((tool) => tool.name);
|
|
504
|
+
mount.tools = tools;
|
|
505
|
+
const mapped = this.phaseOf(settled, tools);
|
|
506
|
+
if (mapped.phase === "live") {
|
|
507
|
+
this.generations.set(serverName, (this.generations.get(serverName) ?? 0) + 1);
|
|
508
|
+
} else {
|
|
509
|
+
this.mounts.delete(serverName);
|
|
510
|
+
try {
|
|
511
|
+
dispose();
|
|
512
|
+
} catch {
|
|
513
|
+
}
|
|
514
|
+
await this.waitForRemoval(serverName);
|
|
515
|
+
}
|
|
516
|
+
const state = {
|
|
517
|
+
serverName,
|
|
518
|
+
phase: mapped.phase,
|
|
519
|
+
tools,
|
|
520
|
+
...mapped.error === void 0 ? {} : { error: mapped.error },
|
|
521
|
+
generation: this.generations.get(serverName) ?? 0,
|
|
522
|
+
diagnostics: materialized.diagnostics
|
|
523
|
+
};
|
|
386
524
|
this.phases.set(serverName, state);
|
|
387
525
|
return state;
|
|
388
526
|
}
|
|
527
|
+
/**
|
|
528
|
+
* 一次性探测一个服务器配置(**不注册、不落盘、不改 `mounts`**)。
|
|
529
|
+
*
|
|
530
|
+
* 走官方 `ctx.mcpClientHost.probe()`(0.2.3 起 `probeServer` 已不在包根):连接、列工具、关闭,
|
|
531
|
+
* 不占 `serverName`、不注册工具、不碰活动实例。表单里的**草稿**配置也能测,这是
|
|
532
|
+
* `ctx.mcpManager.probe()`(只测已注册项)做不到的。
|
|
533
|
+
*
|
|
534
|
+
* @param request - 目标状态(只用到配置与 env 合并)。
|
|
535
|
+
* @returns 探测结论。
|
|
536
|
+
*/
|
|
537
|
+
async probe(request) {
|
|
538
|
+
const started = Date.now();
|
|
539
|
+
const materialized = await this.materialize(request);
|
|
540
|
+
if (materialized.entry === void 0) {
|
|
541
|
+
return {
|
|
542
|
+
ok: false,
|
|
543
|
+
tools: [],
|
|
544
|
+
message: materialized.error ?? "cannot build an MCP probe configuration",
|
|
545
|
+
elapsedMs: Date.now() - started,
|
|
546
|
+
diagnostics: materialized.diagnostics
|
|
547
|
+
};
|
|
548
|
+
}
|
|
549
|
+
const entry = materialized.entry;
|
|
550
|
+
const config = McpClientConfig({
|
|
551
|
+
...entry,
|
|
552
|
+
serverName: request.serverName,
|
|
553
|
+
failOnStartupError: true,
|
|
554
|
+
reconnect: { enabled: false },
|
|
555
|
+
expandTemplates: true
|
|
556
|
+
});
|
|
557
|
+
const outcome = await probeServer(this.ctx, config);
|
|
558
|
+
return { ...outcome, diagnostics: materialized.diagnostics };
|
|
559
|
+
}
|
|
389
560
|
/**
|
|
390
561
|
* 卸载一个服务器(幂等)。
|
|
391
562
|
* @param serverName - 服务器名。
|
|
@@ -398,9 +569,10 @@ class MountManager {
|
|
|
398
569
|
if (mount !== void 0) {
|
|
399
570
|
this.mounts.delete(serverName);
|
|
400
571
|
try {
|
|
401
|
-
|
|
572
|
+
mount.dispose();
|
|
402
573
|
} catch {
|
|
403
574
|
}
|
|
575
|
+
await this.waitForRemoval(serverName);
|
|
404
576
|
}
|
|
405
577
|
const previous = this.phases.get(serverName);
|
|
406
578
|
const state = {
|
|
@@ -415,7 +587,7 @@ class MountManager {
|
|
|
415
587
|
});
|
|
416
588
|
}
|
|
417
589
|
/**
|
|
418
|
-
*
|
|
590
|
+
* 把目标状态差分同步成真实注册(只重启内容真的变了的条目)。
|
|
419
591
|
*
|
|
420
592
|
* @param requests - 全部服务器的目标状态(含被禁用/被占用的,用于记录相位)。
|
|
421
593
|
* @returns 全部状态。
|
|
@@ -448,19 +620,31 @@ class MountManager {
|
|
|
448
620
|
}
|
|
449
621
|
for (const request of wanted.values()) {
|
|
450
622
|
const active = this.mounts.get(request.serverName);
|
|
451
|
-
if (active !== void 0
|
|
623
|
+
if (active !== void 0) {
|
|
624
|
+
const materialized = await this.materialize(request);
|
|
625
|
+
if (materialized.entry !== void 0 && this.fingerprintOf(materialized.entry) === active.fingerprint) {
|
|
626
|
+
const view = this.managerView(request.serverName);
|
|
627
|
+
const mapped = this.phaseOf(view?.status, active.tools);
|
|
628
|
+
active.tools = this.stateOfRequest(request, mapped.phase, materialized.diagnostics).tools;
|
|
629
|
+
this.phases.set(request.serverName, {
|
|
630
|
+
serverName: request.serverName,
|
|
631
|
+
...mapped,
|
|
632
|
+
tools: active.tools,
|
|
633
|
+
generation: this.generations.get(request.serverName) ?? 0,
|
|
634
|
+
diagnostics: materialized.diagnostics
|
|
635
|
+
});
|
|
636
|
+
continue;
|
|
637
|
+
}
|
|
638
|
+
}
|
|
452
639
|
await this.remount(request);
|
|
453
640
|
}
|
|
454
641
|
return this.states();
|
|
455
642
|
}
|
|
456
643
|
/**
|
|
457
|
-
*
|
|
458
|
-
*
|
|
459
|
-
* 与 `sync()` 的差分重启共用同一段"先卸后挂"的时序(必须先 `await` 旧 fiber 的 `dispose()`,
|
|
460
|
-
* 见 B21),但**忽略指纹**:用户点刷新就是"我要它现在重连一次",哪怕配置一个字没改。
|
|
644
|
+
* 强制重建一个(且只有这一个)注册 —— 卡片上的「刷新」用(B36)。
|
|
461
645
|
*
|
|
462
|
-
* `
|
|
463
|
-
*
|
|
646
|
+
* 与 `sync()` 的差分重启共用同一段"先撤后注"的时序,但**忽略指纹**:
|
|
647
|
+
* 用户点刷新就是"我要它现在重连一次",哪怕配置一个字没改。
|
|
464
648
|
*
|
|
465
649
|
* @param request - 该服务器的最新目标状态。
|
|
466
650
|
* @returns 重建后的相位。
|
|
@@ -480,7 +664,7 @@ class MountManager {
|
|
|
480
664
|
return await this.remount(request);
|
|
481
665
|
}
|
|
482
666
|
/**
|
|
483
|
-
*
|
|
667
|
+
* 撤掉同名注册(若有)再注册一个新实例(调用方负责决定要不要重建)。
|
|
484
668
|
*
|
|
485
669
|
* @param request - 目标状态。
|
|
486
670
|
* @returns 新相位。
|
|
@@ -491,15 +675,15 @@ class MountManager {
|
|
|
491
675
|
if (current !== void 0) {
|
|
492
676
|
this.mounts.delete(request.serverName);
|
|
493
677
|
try {
|
|
494
|
-
|
|
678
|
+
current.dispose();
|
|
495
679
|
} catch {
|
|
496
680
|
}
|
|
497
681
|
}
|
|
498
|
-
return await this.
|
|
682
|
+
return await this.register(request, current !== void 0);
|
|
499
683
|
});
|
|
500
684
|
}
|
|
501
685
|
/**
|
|
502
|
-
*
|
|
686
|
+
* 卸载全部注册(幂等)。宿主销毁/HMR 时调用;测试收尾也用它,避免子进程吊住事件循环。
|
|
503
687
|
* @returns 全部状态。
|
|
504
688
|
*/
|
|
505
689
|
async unmountAll() {
|
|
@@ -511,6 +695,22 @@ class MountManager {
|
|
|
511
695
|
* @returns 状态列表。
|
|
512
696
|
*/
|
|
513
697
|
states() {
|
|
698
|
+
for (const [serverName, mount] of this.mounts) {
|
|
699
|
+
const view = this.managerView(serverName);
|
|
700
|
+
const tools = this.ctx.tools.schemas().filter((tool) => tool.name.startsWith(`mcp__${serverName}__`)).map((tool) => tool.name);
|
|
701
|
+
mount.tools = tools;
|
|
702
|
+
const mapped = this.phaseOf(view?.status, tools);
|
|
703
|
+
if (mapped.phase === "live" && (this.generations.get(serverName) ?? 0) === 0) {
|
|
704
|
+
this.generations.set(serverName, 1);
|
|
705
|
+
}
|
|
706
|
+
this.phases.set(serverName, {
|
|
707
|
+
serverName,
|
|
708
|
+
...mapped,
|
|
709
|
+
tools,
|
|
710
|
+
generation: this.generations.get(serverName) ?? 0,
|
|
711
|
+
diagnostics: mount.diagnostics
|
|
712
|
+
});
|
|
713
|
+
}
|
|
514
714
|
return [...this.phases.values()].sort((left, right) => left.serverName.localeCompare(right.serverName));
|
|
515
715
|
}
|
|
516
716
|
/**
|
|
@@ -519,7 +719,7 @@ class MountManager {
|
|
|
519
719
|
* @returns 状态,或 undefined。
|
|
520
720
|
*/
|
|
521
721
|
stateOf(serverName) {
|
|
522
|
-
return this.phases.get(serverName);
|
|
722
|
+
return this.states().find((state) => state.serverName === serverName) ?? this.phases.get(serverName);
|
|
523
723
|
}
|
|
524
724
|
/**
|
|
525
725
|
* 明确知道曾被本插件挂过的名字(区分"自己的残留"与"外来占用")。
|
|
@@ -528,6 +728,13 @@ class MountManager {
|
|
|
528
728
|
everMountedNames() {
|
|
529
729
|
return new Set(this.everMounted);
|
|
530
730
|
}
|
|
731
|
+
/**
|
|
732
|
+
* 当前由本插件注册(存活)的服务器名 —— 工具控制层据此把 deny 限定到自有服务器。
|
|
733
|
+
* @returns 名字集合。
|
|
734
|
+
*/
|
|
735
|
+
liveServerNames() {
|
|
736
|
+
return new Set(this.mounts.keys());
|
|
737
|
+
}
|
|
531
738
|
}
|
|
532
739
|
export {
|
|
533
740
|
MountManager
|