dsh-mcp-ops 0.2.1 → 0.2.2
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 +25 -8
- package/lib/client.js +2 -1
- package/lib/index.js +7 -1
- package/lib/mount.js +366 -148
- package/lib/oauth-store.js +81 -0
- package/lib/oauth-web.js +2 -1
- package/lib/oauth.js +29 -1
- package/lib/probe.js +20 -39
- package/lib/refs.js +10 -2
- package/lib/service.js +85 -16
- package/lib/sources/cordis-source.js +35 -13
- package/lib/system-ca.js +79 -0
- package/lib/tool-control.js +43 -3
- package/package.json +13 -12
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 { ensureFreshToken } from "./oauth-store.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 { canHoldCredentialRef, SERVER_NAME_RE, isLegacySecretRow, oauthAccessRef } 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,21 @@ 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
|
+
}
|
|
168
173
|
return {
|
|
169
|
-
|
|
174
|
+
entry: {
|
|
170
175
|
transport: "stdio",
|
|
171
|
-
serverName: request.serverName,
|
|
172
176
|
command: request.spec.command ?? "",
|
|
173
177
|
args: [...request.spec.args],
|
|
174
178
|
cwd: request.spec.cwd ?? process.cwd(),
|
|
175
179
|
// 环境变量注入:这里传的是"父进程 scrub 后 + 进程级 + 服务器级"的合并结果。
|
|
176
|
-
env,
|
|
177
|
-
|
|
178
|
-
|
|
180
|
+
env: safe,
|
|
181
|
+
startupTimeoutMs: STARTUP_TIMEOUT_MS,
|
|
182
|
+
...timeout === void 0 ? {} : { toolCallTimeoutMs: timeout }
|
|
179
183
|
},
|
|
180
184
|
diagnostics
|
|
181
185
|
};
|
|
@@ -190,17 +194,51 @@ class MountManager {
|
|
|
190
194
|
messageKey: "diagnostics.ENV_UNRESOLVED"
|
|
191
195
|
});
|
|
192
196
|
}
|
|
197
|
+
const clean = {};
|
|
198
|
+
for (const [name, value] of Object.entries(headers)) {
|
|
199
|
+
if (this.hasUnsupportedTemplate(value)) continue;
|
|
200
|
+
clean[name] = value;
|
|
201
|
+
}
|
|
202
|
+
if (request.overlay?.oauth === true) {
|
|
203
|
+
if (!canHoldCredentialRef(request.serverName)) {
|
|
204
|
+
return {
|
|
205
|
+
diagnostics,
|
|
206
|
+
error: `serverName "${request.serverName}" cannot back a credential ref ("-" is outside the ref grammar); rename it to use OAuth`
|
|
207
|
+
};
|
|
208
|
+
}
|
|
209
|
+
const fresh = await ensureFreshToken(this.ctx.credentials, request.serverName, request.spec.url ?? "");
|
|
210
|
+
if (fresh.token === void 0) {
|
|
211
|
+
const diagnostic = {
|
|
212
|
+
code: "OAUTH_NOT_AUTHORIZED",
|
|
213
|
+
level: "warn",
|
|
214
|
+
serverName: request.serverName,
|
|
215
|
+
detail: fresh.error ?? "no fresh token; run oauthStart (Settings \u2192 \u6D4B\u8BD5\u8FDE\u63A5/\u6388\u6743) first",
|
|
216
|
+
messageKey: "diagnostics.OAUTH_NOT_AUTHORIZED"
|
|
217
|
+
};
|
|
218
|
+
diagnostics.push(diagnostic);
|
|
219
|
+
return { diagnostics, error: diagnostic.detail };
|
|
220
|
+
}
|
|
221
|
+
if (fresh.refreshed) {
|
|
222
|
+
diagnostics.push({
|
|
223
|
+
code: "OAUTH_TOKEN_REFRESHED",
|
|
224
|
+
level: "info",
|
|
225
|
+
serverName: request.serverName,
|
|
226
|
+
detail: "expired access token was refreshed with the stored refresh_token",
|
|
227
|
+
messageKey: "diagnostics.OAUTH_TOKEN_REFRESHED"
|
|
228
|
+
});
|
|
229
|
+
}
|
|
230
|
+
clean.Authorization = `Bearer \${credential:${String(oauthAccessRef(request.serverName))}}`;
|
|
231
|
+
}
|
|
193
232
|
return {
|
|
194
|
-
|
|
233
|
+
entry: {
|
|
195
234
|
transport: "streamable-http",
|
|
196
|
-
serverName: request.serverName,
|
|
197
235
|
url: request.spec.url ?? "",
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
...timeout === void 0 ? {} : { toolCallTimeoutMs: timeout }
|
|
201
|
-
failOnStartupError: true
|
|
236
|
+
headers: clean,
|
|
237
|
+
startupTimeoutMs: STARTUP_TIMEOUT_MS,
|
|
238
|
+
...timeout === void 0 ? {} : { toolCallTimeoutMs: timeout }
|
|
202
239
|
},
|
|
203
|
-
diagnostics
|
|
240
|
+
diagnostics,
|
|
241
|
+
...request.overlay?.oauth === true ? {} : {}
|
|
204
242
|
};
|
|
205
243
|
}
|
|
206
244
|
/**
|
|
@@ -237,76 +275,159 @@ class MountManager {
|
|
|
237
275
|
return owned;
|
|
238
276
|
}
|
|
239
277
|
/**
|
|
240
|
-
*
|
|
241
|
-
* @param
|
|
242
|
-
* @returns
|
|
278
|
+
* manager 里是否已有**别人**占着这个名字(configured 项或别的插件注册)。
|
|
279
|
+
* @param serverName - 服务器名。
|
|
280
|
+
* @returns 被占用时为 true。
|
|
243
281
|
*/
|
|
282
|
+
occupiedInManager(serverName) {
|
|
283
|
+
if (this.mounts.has(serverName)) return false;
|
|
284
|
+
return this.managerView(serverName) !== void 0;
|
|
285
|
+
}
|
|
244
286
|
/**
|
|
245
|
-
*
|
|
246
|
-
*
|
|
287
|
+
* 读取一个名字的 manager 状态。
|
|
247
288
|
* @param serverName - 服务器名。
|
|
248
|
-
* @returns
|
|
289
|
+
* @returns 视图,或 undefined。
|
|
249
290
|
*/
|
|
250
|
-
|
|
291
|
+
managerView(serverName) {
|
|
251
292
|
try {
|
|
252
|
-
|
|
253
|
-
const token = parseToken(resolved?.value);
|
|
254
|
-
return isTokenFresh(token) ? token?.accessToken : void 0;
|
|
293
|
+
return this.manager.list().find((view) => view.name === serverName);
|
|
255
294
|
} catch {
|
|
256
295
|
return void 0;
|
|
257
296
|
}
|
|
258
297
|
}
|
|
259
298
|
/**
|
|
260
|
-
*
|
|
299
|
+
* 订阅某个名字的状态落定(在 `register()` **之前**建好,避免错过新实例的首次事件)。
|
|
261
300
|
*
|
|
262
|
-
*
|
|
263
|
-
*
|
|
264
|
-
* 返回诊断让界面指引用户先去授权(`oauthStart`)。
|
|
301
|
+
* 注册后 manager 会异步挂载新实例并发布 `connecting` → `connected`;只读 `list()` 的当前值
|
|
302
|
+
* 可能读到**上一个实例**的 `connected`(差分重启时尤其明显),所以必须等一条新事件。
|
|
265
303
|
*
|
|
266
|
-
* @param
|
|
267
|
-
* @returns
|
|
304
|
+
* @param serverName - 服务器名。
|
|
305
|
+
* @returns 落定状态(`connected` 或失败态)与清理函数;超时时 resolve `undefined`。
|
|
268
306
|
*/
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
diagnostic: {
|
|
276
|
-
code: "OAUTH_NOT_AUTHORIZED",
|
|
277
|
-
level: "warn",
|
|
278
|
-
serverName: request.serverName,
|
|
279
|
-
detail: "no fresh token; run oauthStart (Settings \u2192 \u6D4B\u8BD5\u8FDE\u63A5/\u6388\u6743) first",
|
|
280
|
-
messageKey: "diagnostics.OAUTH_NOT_AUTHORIZED"
|
|
281
|
-
}
|
|
307
|
+
statusWaiter(serverName) {
|
|
308
|
+
const settled = (status) => status !== void 0 && (status.state === "connected" || status.state === "failed" || status.state === "waiting-credentials" || status.state === "reconnecting" || status.state === "closed");
|
|
309
|
+
let resolve = () => {
|
|
310
|
+
};
|
|
311
|
+
let finished = false;
|
|
312
|
+
let release = () => {
|
|
282
313
|
};
|
|
314
|
+
const promise = new Promise((done) => {
|
|
315
|
+
resolve = done;
|
|
316
|
+
});
|
|
317
|
+
const finish = (status) => {
|
|
318
|
+
if (finished) return;
|
|
319
|
+
finished = true;
|
|
320
|
+
clearTimeout(timer);
|
|
321
|
+
release();
|
|
322
|
+
resolve(status);
|
|
323
|
+
};
|
|
324
|
+
const timer = setTimeout(() => finish(void 0), this.settleBudgetMs);
|
|
325
|
+
timer.unref?.();
|
|
326
|
+
release = this.ctx.on("mcp-manager/status", (name, status) => {
|
|
327
|
+
if (name !== serverName) return;
|
|
328
|
+
if (!settled(status)) return;
|
|
329
|
+
finish(status);
|
|
330
|
+
});
|
|
331
|
+
return { promise, dispose: () => finish(void 0) };
|
|
283
332
|
}
|
|
284
333
|
/**
|
|
285
|
-
*
|
|
334
|
+
* 等 manager 真正把某个名字的实例卸掉(`list()` 里不再出现)。
|
|
286
335
|
*
|
|
287
|
-
*
|
|
288
|
-
* @
|
|
289
|
-
*
|
|
336
|
+
* 注销注册只删 registrations 表,实例卸载是排队执行的;不等它,紧接着的同名注册会被
|
|
337
|
+
* {@link occupiedInManager} 误判成"别人占着"(禁用→启用往返实测踩到)。
|
|
338
|
+
*
|
|
339
|
+
* @param serverName - 服务器名。
|
|
290
340
|
*/
|
|
291
|
-
async
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
341
|
+
async waitForRemoval(serverName) {
|
|
342
|
+
if (this.managerView(serverName) === void 0) return;
|
|
343
|
+
await new Promise((resolve) => {
|
|
344
|
+
let releaseTools = () => {
|
|
345
|
+
};
|
|
346
|
+
let releaseStatus = () => {
|
|
347
|
+
};
|
|
348
|
+
let finished = false;
|
|
349
|
+
const finish = () => {
|
|
350
|
+
if (finished) return;
|
|
351
|
+
finished = true;
|
|
352
|
+
clearTimeout(timer);
|
|
353
|
+
clearInterval(poll);
|
|
354
|
+
releaseTools();
|
|
355
|
+
releaseStatus();
|
|
356
|
+
resolve();
|
|
357
|
+
};
|
|
358
|
+
const check = () => {
|
|
359
|
+
if (this.managerView(serverName) === void 0) finish();
|
|
360
|
+
};
|
|
361
|
+
const timer = setTimeout(finish, 5e3);
|
|
362
|
+
timer.unref?.();
|
|
363
|
+
const poll = setInterval(check, 25);
|
|
364
|
+
poll.unref?.();
|
|
365
|
+
releaseTools = this.ctx.on("tools/change", check);
|
|
366
|
+
releaseStatus = this.ctx.on("mcp-manager/status", check);
|
|
367
|
+
check();
|
|
298
368
|
});
|
|
299
369
|
}
|
|
300
|
-
|
|
370
|
+
/**
|
|
371
|
+
* 把 manager 状态映射成界面相位。
|
|
372
|
+
* @param status - manager 状态。
|
|
373
|
+
* @param tools - 当前工具名。
|
|
374
|
+
* @returns 相位与错误文本。
|
|
375
|
+
*/
|
|
376
|
+
phaseOf(status, tools) {
|
|
377
|
+
if (status === void 0) return { phase: tools.length > 0 ? "live" : "failed", error: tools.length > 0 ? void 0 : "server is not registered" };
|
|
378
|
+
switch (status.state) {
|
|
379
|
+
case "connected":
|
|
380
|
+
return { phase: "live" };
|
|
381
|
+
case "connecting":
|
|
382
|
+
return { phase: "mounting" };
|
|
383
|
+
case "reconnecting":
|
|
384
|
+
return { phase: "failed", error: status.lastError };
|
|
385
|
+
case "waiting-credentials":
|
|
386
|
+
return { phase: "failed", error: status.lastError };
|
|
387
|
+
case "failed":
|
|
388
|
+
return { phase: "failed", error: status.lastError ?? status.reason };
|
|
389
|
+
case "closed":
|
|
390
|
+
return { phase: "stopped", error: status.result.cleanupError };
|
|
391
|
+
case "disabled":
|
|
392
|
+
return { phase: "stopped" };
|
|
393
|
+
default:
|
|
394
|
+
return { phase: "failed" };
|
|
395
|
+
}
|
|
396
|
+
}
|
|
397
|
+
/**
|
|
398
|
+
* 建一个状态对象(工具从全局注册表按前缀读)。
|
|
399
|
+
* @param request - 目标状态。
|
|
400
|
+
* @param phase - 相位。
|
|
401
|
+
* @param diagnostics - 诊断。
|
|
402
|
+
* @param error - 错误文本。
|
|
403
|
+
* @returns 状态。
|
|
404
|
+
*/
|
|
405
|
+
stateOfRequest(request, phase, diagnostics, error) {
|
|
406
|
+
const prefix = `mcp__${request.serverName}__`;
|
|
407
|
+
const tools = this.ctx.tools.schemas().filter((tool) => tool.name.startsWith(prefix)).map((tool) => tool.name);
|
|
408
|
+
return {
|
|
409
|
+
serverName: request.serverName,
|
|
410
|
+
phase,
|
|
411
|
+
tools,
|
|
412
|
+
...error === void 0 ? {} : { error },
|
|
413
|
+
generation: this.generations.get(request.serverName) ?? 0,
|
|
414
|
+
diagnostics
|
|
415
|
+
};
|
|
416
|
+
}
|
|
417
|
+
/**
|
|
418
|
+
* 注册一个服务器(调用方需已在串行锁内)。
|
|
419
|
+
* @param request - 目标状态。
|
|
420
|
+
* @returns 相位。
|
|
421
|
+
*/
|
|
422
|
+
async register(request, replacing = false) {
|
|
301
423
|
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
424
|
if (!SERVER_NAME_RE.test(serverName)) {
|
|
306
425
|
const state2 = {
|
|
307
|
-
|
|
426
|
+
serverName,
|
|
308
427
|
phase: "failed",
|
|
428
|
+
tools: [],
|
|
309
429
|
error: `serverName must match ${String(SERVER_NAME_RE)}`,
|
|
430
|
+
generation: this.generations.get(serverName) ?? 0,
|
|
310
431
|
diagnostics: [{
|
|
311
432
|
code: "SERVER_NAME_INVALID",
|
|
312
433
|
level: "error",
|
|
@@ -318,74 +439,135 @@ class MountManager {
|
|
|
318
439
|
this.phases.set(serverName, state2);
|
|
319
440
|
return state2;
|
|
320
441
|
}
|
|
321
|
-
|
|
322
|
-
if (oauthDiagnostic !== void 0) {
|
|
442
|
+
if (!replacing && this.occupiedInManager(serverName)) {
|
|
323
443
|
const state2 = {
|
|
324
|
-
|
|
444
|
+
serverName,
|
|
445
|
+
phase: "stopped-conflict",
|
|
446
|
+
tools: [],
|
|
447
|
+
error: `server "${serverName}" is already provided by the DSH composition or another plugin`,
|
|
448
|
+
generation: this.generations.get(serverName) ?? 0,
|
|
449
|
+
diagnostics: [{
|
|
450
|
+
code: "SERVER_NAME_OCCUPIED",
|
|
451
|
+
level: "warn",
|
|
452
|
+
serverName,
|
|
453
|
+
detail: `mcp__${serverName}__`,
|
|
454
|
+
messageKey: "diagnostics.SERVER_NAME_OCCUPIED"
|
|
455
|
+
}]
|
|
456
|
+
};
|
|
457
|
+
this.phases.set(serverName, state2);
|
|
458
|
+
return state2;
|
|
459
|
+
}
|
|
460
|
+
const materialized = await this.materialize(request);
|
|
461
|
+
if (materialized.entry === void 0) {
|
|
462
|
+
const state2 = {
|
|
463
|
+
serverName,
|
|
325
464
|
phase: "failed",
|
|
326
|
-
|
|
327
|
-
|
|
465
|
+
tools: [],
|
|
466
|
+
error: materialized.error ?? "cannot build an MCP registration for this server",
|
|
467
|
+
generation: this.generations.get(serverName) ?? 0,
|
|
468
|
+
diagnostics: materialized.diagnostics
|
|
328
469
|
};
|
|
329
470
|
this.phases.set(serverName, state2);
|
|
330
471
|
return state2;
|
|
331
472
|
}
|
|
332
|
-
if (!await this.waitForPrefixRelease(
|
|
473
|
+
if (!await this.waitForPrefixRelease(`mcp__${serverName}__`)) {
|
|
333
474
|
const state2 = {
|
|
334
|
-
|
|
475
|
+
serverName,
|
|
335
476
|
phase: "stopped-conflict",
|
|
336
|
-
|
|
337
|
-
|
|
477
|
+
tools: [],
|
|
478
|
+
error: `tools with prefix mcp__${serverName}__ are owned by another layer (composition?)`,
|
|
479
|
+
generation: this.generations.get(serverName) ?? 0,
|
|
480
|
+
diagnostics: [...materialized.diagnostics, {
|
|
338
481
|
code: "SERVER_NAME_OCCUPIED",
|
|
339
482
|
level: "warn",
|
|
340
483
|
serverName,
|
|
341
|
-
detail:
|
|
484
|
+
detail: `mcp__${serverName}__`,
|
|
342
485
|
messageKey: "diagnostics.SERVER_NAME_OCCUPIED"
|
|
343
486
|
}]
|
|
344
487
|
};
|
|
345
488
|
this.phases.set(serverName, state2);
|
|
346
489
|
return state2;
|
|
347
490
|
}
|
|
348
|
-
|
|
349
|
-
const
|
|
350
|
-
let child;
|
|
351
|
-
let disposeEffect;
|
|
352
|
-
try {
|
|
353
|
-
disposeEffect = this.ctx.effect(() => {
|
|
354
|
-
child = this.ctx.plugin(McpClient, McpClient.Config(config));
|
|
355
|
-
return () => child.dispose();
|
|
356
|
-
}, `dsh-mcp-ops:${serverName}`);
|
|
357
|
-
} 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);
|
|
491
|
+
let dispose;
|
|
492
|
+
const waiter = this.statusWaiter(serverName);
|
|
363
493
|
try {
|
|
364
|
-
|
|
494
|
+
dispose = this.manager.register(serverName, materialized.entry);
|
|
365
495
|
} catch (error) {
|
|
366
|
-
disposeEffect();
|
|
367
496
|
const state2 = {
|
|
368
|
-
|
|
497
|
+
serverName,
|
|
369
498
|
phase: "failed",
|
|
499
|
+
tools: [],
|
|
370
500
|
error: errorText(error),
|
|
371
|
-
|
|
501
|
+
generation: this.generations.get(serverName) ?? 0,
|
|
502
|
+
diagnostics: materialized.diagnostics
|
|
372
503
|
};
|
|
373
504
|
this.phases.set(serverName, state2);
|
|
505
|
+
waiter.dispose();
|
|
374
506
|
return state2;
|
|
375
507
|
}
|
|
376
|
-
|
|
377
|
-
this.
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
508
|
+
this.everMounted.add(serverName);
|
|
509
|
+
const fingerprint = this.fingerprintOf(materialized.entry);
|
|
510
|
+
const mount = { entry: materialized.entry, fingerprint, dispose, diagnostics: materialized.diagnostics, tools: [] };
|
|
511
|
+
this.mounts.set(serverName, mount);
|
|
512
|
+
const settled = await waiter.promise;
|
|
513
|
+
const tools = this.ctx.tools.schemas().filter((tool) => tool.name.startsWith(`mcp__${serverName}__`)).map((tool) => tool.name);
|
|
514
|
+
mount.tools = tools;
|
|
515
|
+
const mapped = this.phaseOf(settled, tools);
|
|
516
|
+
if (mapped.phase === "live") {
|
|
517
|
+
this.generations.set(serverName, (this.generations.get(serverName) ?? 0) + 1);
|
|
518
|
+
} else {
|
|
519
|
+
this.mounts.delete(serverName);
|
|
520
|
+
try {
|
|
521
|
+
dispose();
|
|
522
|
+
} catch {
|
|
523
|
+
}
|
|
524
|
+
await this.waitForRemoval(serverName);
|
|
525
|
+
}
|
|
526
|
+
const state = {
|
|
527
|
+
serverName,
|
|
528
|
+
phase: mapped.phase,
|
|
529
|
+
tools,
|
|
530
|
+
...mapped.error === void 0 ? {} : { error: mapped.error },
|
|
531
|
+
generation: this.generations.get(serverName) ?? 0,
|
|
532
|
+
diagnostics: materialized.diagnostics
|
|
533
|
+
};
|
|
386
534
|
this.phases.set(serverName, state);
|
|
387
535
|
return state;
|
|
388
536
|
}
|
|
537
|
+
/**
|
|
538
|
+
* 一次性探测一个服务器配置(**不注册、不落盘、不改 `mounts`**)。
|
|
539
|
+
*
|
|
540
|
+
* 走官方 `probeServer()`(manager 的 `probe()` 底层就是它):连接、列工具、关闭,
|
|
541
|
+
* 不占 `serverName`、不注册工具。表单里的**草稿**配置也能测,这是 manager.probe
|
|
542
|
+
* (只测已注册项)做不到的。
|
|
543
|
+
*
|
|
544
|
+
* @param request - 目标状态(只用到配置与 env 合并)。
|
|
545
|
+
* @param options - `oauth: true` 时用交互式预算(T4)。
|
|
546
|
+
* @returns 探测结论。
|
|
547
|
+
*/
|
|
548
|
+
async probe(request, options = {}) {
|
|
549
|
+
const started = Date.now();
|
|
550
|
+
const materialized = await this.materialize(request);
|
|
551
|
+
if (materialized.entry === void 0) {
|
|
552
|
+
return {
|
|
553
|
+
ok: false,
|
|
554
|
+
tools: [],
|
|
555
|
+
message: materialized.error ?? "cannot build an MCP probe configuration",
|
|
556
|
+
elapsedMs: Date.now() - started,
|
|
557
|
+
diagnostics: materialized.diagnostics
|
|
558
|
+
};
|
|
559
|
+
}
|
|
560
|
+
const entry = materialized.entry;
|
|
561
|
+
const config = McpClientConfig({
|
|
562
|
+
...entry,
|
|
563
|
+
serverName: request.serverName,
|
|
564
|
+
failOnStartupError: true,
|
|
565
|
+
reconnect: { enabled: false },
|
|
566
|
+
expandTemplates: true
|
|
567
|
+
});
|
|
568
|
+
const outcome = await probeServer(this.ctx, config, { oauth: options.oauth === true });
|
|
569
|
+
return { ...outcome, diagnostics: materialized.diagnostics };
|
|
570
|
+
}
|
|
389
571
|
/**
|
|
390
572
|
* 卸载一个服务器(幂等)。
|
|
391
573
|
* @param serverName - 服务器名。
|
|
@@ -398,9 +580,10 @@ class MountManager {
|
|
|
398
580
|
if (mount !== void 0) {
|
|
399
581
|
this.mounts.delete(serverName);
|
|
400
582
|
try {
|
|
401
|
-
|
|
583
|
+
mount.dispose();
|
|
402
584
|
} catch {
|
|
403
585
|
}
|
|
586
|
+
await this.waitForRemoval(serverName);
|
|
404
587
|
}
|
|
405
588
|
const previous = this.phases.get(serverName);
|
|
406
589
|
const state = {
|
|
@@ -415,7 +598,7 @@ class MountManager {
|
|
|
415
598
|
});
|
|
416
599
|
}
|
|
417
600
|
/**
|
|
418
|
-
*
|
|
601
|
+
* 把目标状态差分同步成真实注册(只重启内容真的变了的条目)。
|
|
419
602
|
*
|
|
420
603
|
* @param requests - 全部服务器的目标状态(含被禁用/被占用的,用于记录相位)。
|
|
421
604
|
* @returns 全部状态。
|
|
@@ -448,19 +631,31 @@ class MountManager {
|
|
|
448
631
|
}
|
|
449
632
|
for (const request of wanted.values()) {
|
|
450
633
|
const active = this.mounts.get(request.serverName);
|
|
451
|
-
if (active !== void 0
|
|
634
|
+
if (active !== void 0) {
|
|
635
|
+
const materialized = await this.materialize(request);
|
|
636
|
+
if (materialized.entry !== void 0 && this.fingerprintOf(materialized.entry) === active.fingerprint) {
|
|
637
|
+
const view = this.managerView(request.serverName);
|
|
638
|
+
const mapped = this.phaseOf(view?.status, active.tools);
|
|
639
|
+
active.tools = this.stateOfRequest(request, mapped.phase, materialized.diagnostics).tools;
|
|
640
|
+
this.phases.set(request.serverName, {
|
|
641
|
+
serverName: request.serverName,
|
|
642
|
+
...mapped,
|
|
643
|
+
tools: active.tools,
|
|
644
|
+
generation: this.generations.get(request.serverName) ?? 0,
|
|
645
|
+
diagnostics: materialized.diagnostics
|
|
646
|
+
});
|
|
647
|
+
continue;
|
|
648
|
+
}
|
|
649
|
+
}
|
|
452
650
|
await this.remount(request);
|
|
453
651
|
}
|
|
454
652
|
return this.states();
|
|
455
653
|
}
|
|
456
654
|
/**
|
|
457
|
-
*
|
|
655
|
+
* 强制重建一个(且只有这一个)注册 —— 卡片上的「刷新」用(B36)。
|
|
458
656
|
*
|
|
459
|
-
* 与 `sync()` 的差分重启共用同一段"
|
|
460
|
-
*
|
|
461
|
-
*
|
|
462
|
-
* `stopped`(未启用)与 `stopped-conflict`(组合层占用)没有"重建"可言:直接同步一次相位并
|
|
463
|
-
* 返回,不制造子进程。
|
|
657
|
+
* 与 `sync()` 的差分重启共用同一段"先撤后注"的时序,但**忽略指纹**:
|
|
658
|
+
* 用户点刷新就是"我要它现在重连一次",哪怕配置一个字没改。
|
|
464
659
|
*
|
|
465
660
|
* @param request - 该服务器的最新目标状态。
|
|
466
661
|
* @returns 重建后的相位。
|
|
@@ -480,7 +675,7 @@ class MountManager {
|
|
|
480
675
|
return await this.remount(request);
|
|
481
676
|
}
|
|
482
677
|
/**
|
|
483
|
-
*
|
|
678
|
+
* 撤掉同名注册(若有)再注册一个新实例(调用方负责决定要不要重建)。
|
|
484
679
|
*
|
|
485
680
|
* @param request - 目标状态。
|
|
486
681
|
* @returns 新相位。
|
|
@@ -491,15 +686,15 @@ class MountManager {
|
|
|
491
686
|
if (current !== void 0) {
|
|
492
687
|
this.mounts.delete(request.serverName);
|
|
493
688
|
try {
|
|
494
|
-
|
|
689
|
+
current.dispose();
|
|
495
690
|
} catch {
|
|
496
691
|
}
|
|
497
692
|
}
|
|
498
|
-
return await this.
|
|
693
|
+
return await this.register(request, current !== void 0);
|
|
499
694
|
});
|
|
500
695
|
}
|
|
501
696
|
/**
|
|
502
|
-
*
|
|
697
|
+
* 卸载全部注册(幂等)。宿主销毁/HMR 时调用;测试收尾也用它,避免子进程吊住事件循环。
|
|
503
698
|
* @returns 全部状态。
|
|
504
699
|
*/
|
|
505
700
|
async unmountAll() {
|
|
@@ -511,6 +706,22 @@ class MountManager {
|
|
|
511
706
|
* @returns 状态列表。
|
|
512
707
|
*/
|
|
513
708
|
states() {
|
|
709
|
+
for (const [serverName, mount] of this.mounts) {
|
|
710
|
+
const view = this.managerView(serverName);
|
|
711
|
+
const tools = this.ctx.tools.schemas().filter((tool) => tool.name.startsWith(`mcp__${serverName}__`)).map((tool) => tool.name);
|
|
712
|
+
mount.tools = tools;
|
|
713
|
+
const mapped = this.phaseOf(view?.status, tools);
|
|
714
|
+
if (mapped.phase === "live" && (this.generations.get(serverName) ?? 0) === 0) {
|
|
715
|
+
this.generations.set(serverName, 1);
|
|
716
|
+
}
|
|
717
|
+
this.phases.set(serverName, {
|
|
718
|
+
serverName,
|
|
719
|
+
...mapped,
|
|
720
|
+
tools,
|
|
721
|
+
generation: this.generations.get(serverName) ?? 0,
|
|
722
|
+
diagnostics: mount.diagnostics
|
|
723
|
+
});
|
|
724
|
+
}
|
|
514
725
|
return [...this.phases.values()].sort((left, right) => left.serverName.localeCompare(right.serverName));
|
|
515
726
|
}
|
|
516
727
|
/**
|
|
@@ -519,7 +730,7 @@ class MountManager {
|
|
|
519
730
|
* @returns 状态,或 undefined。
|
|
520
731
|
*/
|
|
521
732
|
stateOf(serverName) {
|
|
522
|
-
return this.phases.get(serverName);
|
|
733
|
+
return this.states().find((state) => state.serverName === serverName) ?? this.phases.get(serverName);
|
|
523
734
|
}
|
|
524
735
|
/**
|
|
525
736
|
* 明确知道曾被本插件挂过的名字(区分"自己的残留"与"外来占用")。
|
|
@@ -528,6 +739,13 @@ class MountManager {
|
|
|
528
739
|
everMountedNames() {
|
|
529
740
|
return new Set(this.everMounted);
|
|
530
741
|
}
|
|
742
|
+
/**
|
|
743
|
+
* 当前由本插件注册(存活)的服务器名 —— 工具控制层据此把 deny 限定到自有服务器。
|
|
744
|
+
* @returns 名字集合。
|
|
745
|
+
*/
|
|
746
|
+
liveServerNames() {
|
|
747
|
+
return new Set(this.mounts.keys());
|
|
748
|
+
}
|
|
531
749
|
}
|
|
532
750
|
export {
|
|
533
751
|
MountManager
|