dsh-mcp-status 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 +21 -4
- package/client.js +202 -1
- package/index.js +24 -0
- package/lib/status.js +80 -0
- package/package.json +4 -2
- package/test/status.test.mjs +98 -0
package/README.md
CHANGED
|
@@ -12,16 +12,18 @@ An MCP server panel for the DeepSeek Harness Web GUI: it lists every `@deepseek-
|
|
|
12
12
|
| 连上了没有? | 三份证据:loader fiber 的 state(已停用 / 加载失败 / 启动中 / 运行中)、工具注册表里 `mcp__<server>__*` 的条数、以及 streamable-http 行每次刷新时的 TCP 端口探活。连不上时 `mcp-client` 不抛错(`failOnStartupError` 默认 false),fiber 照样 active——而**工具条数只证明「曾经连上过」**:服务器后来死掉时工具不会注销,所以端口探活和最近一次「测试连接」的结论会推翻那个绿点 |
|
|
13
13
|
| 为什么没连上? | 「测试连接」用宿主同一份配置真做一次 JSON-RPC 握手(stdio 起进程 / http 打请求),把 `ECONNREFUSED`、`HTTP 401`、超时原文贴回行内 |
|
|
14
14
|
|
|
15
|
-
##
|
|
15
|
+
## 三个座位
|
|
16
16
|
|
|
17
|
-
- **侧边栏行**:`sidebar.panellist`,id `mcp`,order 40
|
|
17
|
+
- **侧边栏行**:`sidebar.panellist`,id `mcp`,order 40;图标右上角挂一个状态点(见下节);
|
|
18
|
+
- **侧栏收起态**:`sidebar.toggle.badge`,只在有服务器要处理时出现;
|
|
18
19
|
- **中央面板**:`main` keyed 槽,key 也是 `mcp`。
|
|
19
20
|
|
|
20
|
-
宿主维护一份状态缓存:后台每 `refreshMs`(默认 10 s)刷新,喂给 system prompt 与调用闸门;面板拉取时**当场重采**(探活有 2 s
|
|
21
|
+
宿主维护一份状态缓存:后台每 `refreshMs`(默认 10 s)刷新,喂给 system prompt 与调用闸门;面板拉取时**当场重采**(探活有 2 s 缓存,其余全是内存读取),所以面板的新鲜度与以前一样。数据来自五条同源路由:
|
|
21
22
|
|
|
22
23
|
| 路由 | 作用 |
|
|
23
24
|
| --- | --- |
|
|
24
25
|
| `GET /api/dsh-mcp-status/servers` | 快照:每行的状态、工具数、传输与地址、来源补丁文件、超时与重连策略 |
|
|
26
|
+
| `GET /api/dsh-mcp-status/summary` | 侧栏角标用的聚合摘要(`worst` / `counts` / `names` / `signature`);**读缓存、不强制重采、不探活** |
|
|
25
27
|
| `POST /api/dsh-mcp-status/toggle` | `{ id, enabled }`:改补丁行 → 等热重载 → 返回新状态(超时后主动重排一次) |
|
|
26
28
|
| `POST /api/dsh-mcp-status/retry` | `{ id }`:真正重新挂载这一行(`dispose` 旧 fiber + `init` 冷启动,重连预算清零),不是等 HMR 碰运气 |
|
|
27
29
|
| `POST /api/dsh-mcp-status/test` | `{ id }`:真握手,返回协议版本 / serverInfo / 工具数 / 失败原因 |
|
|
@@ -93,10 +95,25 @@ per-agent 作用域、全局注册表看不见,把它当断线会误报也会
|
|
|
93
95
|
guardUnreachable: true # 是否拦截发往不可用服务器的工具调用
|
|
94
96
|
```
|
|
95
97
|
|
|
98
|
+
## 侧栏状态点
|
|
99
|
+
|
|
100
|
+
面板是商品,侧栏那一行是产品:要先在门口看见,才有人点进门。
|
|
101
|
+
|
|
102
|
+
- **形状**:图标不变,右上角加一个 6 px 的点。红=有服务器不可用(`unreachable` / `failed`),黄=正在重连(`reconnecting`);
|
|
103
|
+
**全好时没有点**——没有消息就是好消息,比一个常年发绿的点更可信。悬停给出明细(`已连接 2/5 · 1 台要处理:unityMCP`)。
|
|
104
|
+
- **变化才闪**:状态变差时点脉冲一次(0.9 s);`prefers-reduced-motion` 下不播动画。恢复健康不庆祝。
|
|
105
|
+
- **收起态**:侧栏折叠时,顶部的展开按钮上出现同色小点(`sidebar.toggle.badge`);全好时该槽不渲染任何东西。
|
|
106
|
+
- **在哪个视图都在**:点的样式挂在宿主 `<head>`,不跟面板走。面板切到会话或别的插件时会被卸载,
|
|
107
|
+
侧栏那一行却还在——样式若跟着面板走,那时点就只剩一个没有尺寸的空 span,等于消失。
|
|
108
|
+
- **5 s 一次**`GET /summary`:只读宿主缓存,不探活、不强制重采;页面不可见时暂停轮询,切回前台立即拉一次。
|
|
109
|
+
面板的 `/servers` 仍然每次当场重采——角标不该为一个 6 px 的点打风暴。
|
|
110
|
+
- **红线**:判定仍然只来自 `resolveStatus`,`summarizeServers` 只做聚合。`idle`(没有工具)与 `disabled`
|
|
111
|
+
不会让点变红,和调用闸门的放行规则一致(A3)。
|
|
112
|
+
|
|
96
113
|
## 显示约定
|
|
97
114
|
|
|
98
115
|
- 样式只用 `--dsw-alias-*` 主题令牌,跟随宿主明暗主题;文案走 `ctx.locale`(zh / en)。
|
|
99
|
-
-
|
|
116
|
+
- 状态色:绿=已连接;红=未连接/不可达/加载失败;黄(呼吸)=启动中/重连中;灰=已停用。侧栏点只用红/黄两档,见上节。
|
|
100
117
|
- 顶栏副标题显示的是「状态变化 Ns 前」:面板每 4 s 轮询,但快照里的 `checkedAt` 每次拉取都会刷新,
|
|
101
118
|
所以它不表示新鲜度,只在某一行状态真的变了时计时。
|
|
102
119
|
- 「不可达」= 端口连不上,或最近一次测试失败:徽标立即变红,展开区给出原因;若工具还挂在注册表里,会单独说明那是上一次连接的残留。
|
package/client.js
CHANGED
|
@@ -21,6 +21,8 @@ window.__ModuleLoader__.load({
|
|
|
21
21
|
const PANEL_ORDER = 40;
|
|
22
22
|
const API = '/api/dsh-mcp-status';
|
|
23
23
|
const POLL_MS = 4000;
|
|
24
|
+
/** 侧栏角标的轮询周期:比面板慢一档,读的是 /summary(不探活、不强制重采)。 */
|
|
25
|
+
const DOCK_POLL_MS = 5000;
|
|
24
26
|
|
|
25
27
|
/* ------------------------------------------------------------------ *
|
|
26
28
|
* 文案
|
|
@@ -113,6 +115,14 @@ window.__ModuleLoader__.load({
|
|
|
113
115
|
'toggle.disabled': '已停用',
|
|
114
116
|
'test.ok': '连接成功:{n} 个工具,耗时 {ms} ms',
|
|
115
117
|
'test.fail': '连接失败',
|
|
118
|
+
'dock.loading': '读取 MCP 状态…',
|
|
119
|
+
'dock.empty': '还没有配置 MCP 服务器',
|
|
120
|
+
'dock.connectedOf': '已连接 {n}/{total}',
|
|
121
|
+
'dock.attention': '{n} 台要处理:{names}',
|
|
122
|
+
'dock.more': '等 {n} 台',
|
|
123
|
+
'dock.pending': '{n} 台正在连接',
|
|
124
|
+
'dock.idle': '{n} 台没有工具',
|
|
125
|
+
'dock.disabled': '{n} 台已停用',
|
|
116
126
|
};
|
|
117
127
|
|
|
118
128
|
const EN = {
|
|
@@ -202,6 +212,14 @@ window.__ModuleLoader__.load({
|
|
|
202
212
|
'toggle.timeout': 'Still connecting; the list refreshes automatically',
|
|
203
213
|
'test.ok': 'Connected: {n} tools in {ms} ms',
|
|
204
214
|
'test.fail': 'Connection failed',
|
|
215
|
+
'dock.loading': 'Reading MCP state…',
|
|
216
|
+
'dock.empty': 'No MCP server configured',
|
|
217
|
+
'dock.connectedOf': '{n}/{total} connected',
|
|
218
|
+
'dock.attention': '{n} need attention: {names}',
|
|
219
|
+
'dock.more': '+{n} more',
|
|
220
|
+
'dock.pending': '{n} connecting',
|
|
221
|
+
'dock.idle': '{n} with no tools',
|
|
222
|
+
'dock.disabled': '{n} disabled',
|
|
205
223
|
};
|
|
206
224
|
|
|
207
225
|
/* ------------------------------------------------------------------ *
|
|
@@ -262,6 +280,22 @@ window.__ModuleLoader__.load({
|
|
|
262
280
|
.mcpPanel-note[data-tone=ok]{color:var(--dsw-alias-state-success-primary)}
|
|
263
281
|
.mcpPanel-empty{border:.5px dashed var(--dsw-alias-border-l2);border-radius:10px;padding:26px 20px;text-align:center;display:flex;flex-direction:column;gap:6px;color:var(--dsw-alias-label-secondary);font-size:12.5px}
|
|
264
282
|
.mcpPanel-emptyTitle{color:var(--dsw-alias-label-primary);font-size:13.5px;font-weight:600}
|
|
283
|
+
`;
|
|
284
|
+
|
|
285
|
+
/**
|
|
286
|
+
* 侧栏角标的样式挂在宿主 <head> 上,不跟面板走。
|
|
287
|
+
*
|
|
288
|
+
* 面板切到别的视图时会被卸载,侧栏那一行却还在;样式若跟着面板走,那时 DOM 里
|
|
289
|
+
* 只剩一个没有宽度和颜色的空 span —— 点等于消失(用户看到的就是「只有打开面板才有红点」)。
|
|
290
|
+
*/
|
|
291
|
+
const DOCK_CSS = `
|
|
292
|
+
.mcpDock{position:relative;display:inline-flex;align-items:center;justify-content:center;color:inherit}
|
|
293
|
+
.mcpDock-dot{position:absolute;top:-1px;right:-3px;width:6px;height:6px;border-radius:50%;background:var(--dsw-alias-state-warn-primary);box-shadow:0 0 0 1.5px var(--dsw-alias-bg-base);animation:mcpDockPulse .9s ease-out 1}
|
|
294
|
+
.mcpDock[data-tone=bad] .mcpDock-dot{background:var(--dsw-alias-state-error-primary)}
|
|
295
|
+
.mcpDock-rail{width:6px;height:6px;border-radius:50%;flex:none;background:var(--dsw-alias-state-warn-primary);margin:-14px 0 0 -6px}
|
|
296
|
+
.mcpDock-rail[data-tone=bad]{background:var(--dsw-alias-state-error-primary)}
|
|
297
|
+
@keyframes mcpDockPulse{0%{transform:scale(1)}35%{transform:scale(1.9)}100%{transform:scale(1)}}
|
|
298
|
+
@media (prefers-reduced-motion: reduce){.mcpDock-dot{animation:none}}
|
|
265
299
|
`;
|
|
266
300
|
|
|
267
301
|
/* ------------------------------------------------------------------ *
|
|
@@ -300,6 +334,157 @@ window.__ModuleLoader__.load({
|
|
|
300
334
|
return payload;
|
|
301
335
|
}
|
|
302
336
|
|
|
337
|
+
/* ------------------------------------------------------------------ *
|
|
338
|
+
* 侧栏角标
|
|
339
|
+
*
|
|
340
|
+
* 侧栏行的文字由宿主按 locale 派生,不随数据变化,所以状态只能画在 16px 的图标上;
|
|
341
|
+
* 图标是组件(宿主经 renderSlot('sidebar.panellist') 渲染),因此它能自己订阅、自己重渲染。
|
|
342
|
+
* 数据走 /summary:读缓存、不探活,5 s 一次,页面隐藏时暂停。
|
|
343
|
+
* ------------------------------------------------------------------ */
|
|
344
|
+
|
|
345
|
+
/** 音调排序,只用于「这次比上次更糟吗」——状态本身仍由宿主判定(A1)。 */
|
|
346
|
+
function dockSeverity(tone) {
|
|
347
|
+
if (tone === 'bad') return 3;
|
|
348
|
+
if (tone === 'warn') return 2;
|
|
349
|
+
if (tone === 'idle') return 1;
|
|
350
|
+
return 0;
|
|
351
|
+
}
|
|
352
|
+
|
|
353
|
+
/** 一句话把摘要讲完:16px 里放不下的东西全放进 hover 提示。 */
|
|
354
|
+
function dockTitle(t, summary) {
|
|
355
|
+
if (summary === null || summary === undefined) return t('dock.loading');
|
|
356
|
+
const counts = summary.counts ?? {};
|
|
357
|
+
if ((counts.total ?? 0) === 0) return t('dock.empty');
|
|
358
|
+
|
|
359
|
+
const parts = [t('dock.connectedOf', { n: counts.connected ?? 0, total: counts.total })];
|
|
360
|
+
const retrying = counts.reconnecting ?? 0;
|
|
361
|
+
const unhealthy = counts.unhealthy ?? 0;
|
|
362
|
+
if (retrying + unhealthy > 0) {
|
|
363
|
+
const names = (summary.names ?? []).join(', ');
|
|
364
|
+
const more = summary.more ?? 0;
|
|
365
|
+
parts.push(t('dock.attention', {
|
|
366
|
+
n: retrying + unhealthy,
|
|
367
|
+
names: more > 0 ? names + ' ' + t('dock.more', { n: more }) : names,
|
|
368
|
+
}));
|
|
369
|
+
}
|
|
370
|
+
if ((counts.pending ?? 0) > 0) parts.push(t('dock.pending', { n: counts.pending }));
|
|
371
|
+
if ((counts.idle ?? 0) > 0) parts.push(t('dock.idle', { n: counts.idle }));
|
|
372
|
+
if ((counts.disabled ?? 0) > 0) parts.push(t('dock.disabled', { n: counts.disabled }));
|
|
373
|
+
return parts.join(' · ');
|
|
374
|
+
}
|
|
375
|
+
|
|
376
|
+
function createSummaryStore() {
|
|
377
|
+
const listeners = new Set();
|
|
378
|
+
let snapshot = { loading: true, summary: null, error: null, pulseAt: 0 };
|
|
379
|
+
let timer;
|
|
380
|
+
let inflight;
|
|
381
|
+
let lastSeverity = null;
|
|
382
|
+
|
|
383
|
+
const publish = (patch) => {
|
|
384
|
+
snapshot = { ...snapshot, ...patch };
|
|
385
|
+
for (const listener of listeners) {
|
|
386
|
+
try {
|
|
387
|
+
listener();
|
|
388
|
+
} catch {
|
|
389
|
+
/* 一个订阅者坏掉不该拖垮另一个 */
|
|
390
|
+
}
|
|
391
|
+
}
|
|
392
|
+
};
|
|
393
|
+
|
|
394
|
+
const load = () => {
|
|
395
|
+
if (inflight !== undefined) return inflight;
|
|
396
|
+
inflight = requestJson('/summary', { method: 'GET' })
|
|
397
|
+
.then((payload) => {
|
|
398
|
+
const severity = dockSeverity(payload?.worst);
|
|
399
|
+
// 只在变差时脉冲;恢复健康不在侧栏里放礼花。
|
|
400
|
+
const worsened = lastSeverity !== null && severity > lastSeverity;
|
|
401
|
+
lastSeverity = severity;
|
|
402
|
+
publish({
|
|
403
|
+
loading: false,
|
|
404
|
+
error: null,
|
|
405
|
+
summary: payload,
|
|
406
|
+
pulseAt: worsened ? Date.now() : snapshot.pulseAt,
|
|
407
|
+
});
|
|
408
|
+
})
|
|
409
|
+
.catch((error) => {
|
|
410
|
+
// 拿不到摘要就保留上一份:宁可显示略旧的真话,也不要因为一次 500 把点抹掉。
|
|
411
|
+
publish({ loading: false, error: error?.message ?? String(error) });
|
|
412
|
+
})
|
|
413
|
+
.finally(() => {
|
|
414
|
+
inflight = undefined;
|
|
415
|
+
});
|
|
416
|
+
return inflight;
|
|
417
|
+
};
|
|
418
|
+
|
|
419
|
+
const onVisibility = () => {
|
|
420
|
+
if (document.visibilityState === 'visible') load();
|
|
421
|
+
};
|
|
422
|
+
|
|
423
|
+
const start = () => {
|
|
424
|
+
load();
|
|
425
|
+
document.addEventListener('visibilitychange', onVisibility);
|
|
426
|
+
timer = setInterval(() => {
|
|
427
|
+
if (document.visibilityState === 'visible') load();
|
|
428
|
+
}, DOCK_POLL_MS);
|
|
429
|
+
};
|
|
430
|
+
|
|
431
|
+
const stop = () => {
|
|
432
|
+
if (timer !== undefined) clearInterval(timer);
|
|
433
|
+
timer = undefined;
|
|
434
|
+
document.removeEventListener('visibilitychange', onVisibility);
|
|
435
|
+
};
|
|
436
|
+
|
|
437
|
+
return {
|
|
438
|
+
getSnapshot: () => snapshot,
|
|
439
|
+
subscribe(listener) {
|
|
440
|
+
listeners.add(listener);
|
|
441
|
+
// 侧栏收起时这一行仍在树上(只是变窄),所以按订阅者数量、不按可见性决定轮询开关。
|
|
442
|
+
if (listeners.size === 1) start();
|
|
443
|
+
return () => {
|
|
444
|
+
listeners.delete(listener);
|
|
445
|
+
if (listeners.size === 0) stop();
|
|
446
|
+
};
|
|
447
|
+
},
|
|
448
|
+
};
|
|
449
|
+
}
|
|
450
|
+
|
|
451
|
+
const summaryStore = createSummaryStore();
|
|
452
|
+
|
|
453
|
+
function useSummary() {
|
|
454
|
+
const [state, setState] = useState(summaryStore.getSnapshot);
|
|
455
|
+
useEffect(() => summaryStore.subscribe(() => setState(summaryStore.getSnapshot())), []);
|
|
456
|
+
return state;
|
|
457
|
+
}
|
|
458
|
+
|
|
459
|
+
/** 侧栏那一行的图标:本体不变,右上角长出状态点。 */
|
|
460
|
+
function StatusGlyph({ size = 18, t }) {
|
|
461
|
+
const state = useSummary();
|
|
462
|
+
const summary = state.summary;
|
|
463
|
+
const tone = summary?.worst ?? 'empty';
|
|
464
|
+
const attention = tone === 'bad' || tone === 'warn';
|
|
465
|
+
return h(
|
|
466
|
+
'span',
|
|
467
|
+
{ className: 'mcpDock', 'data-tone': tone, title: dockTitle(t, summary) },
|
|
468
|
+
h(Glyph, { size }),
|
|
469
|
+
// key 换成新的 pulseAt 会让节点重建一次,CSS 动画因此只播一次。
|
|
470
|
+
attention ? h('span', { key: String(state.pulseAt), className: 'mcpDock-dot', 'aria-hidden': true }) : null,
|
|
471
|
+
);
|
|
472
|
+
}
|
|
473
|
+
|
|
474
|
+
/** 收起态:展开按钮上的点。只提示,不改变按钮行为。 */
|
|
475
|
+
function ToggleBadge({ t }) {
|
|
476
|
+
const state = useSummary();
|
|
477
|
+
const summary = state.summary;
|
|
478
|
+
const tone = summary?.worst ?? 'empty';
|
|
479
|
+
if (tone !== 'bad' && tone !== 'warn') return null;
|
|
480
|
+
return h('span', {
|
|
481
|
+
className: 'mcpDock-rail',
|
|
482
|
+
'data-tone': tone,
|
|
483
|
+
title: dockTitle(t, summary),
|
|
484
|
+
'aria-hidden': true,
|
|
485
|
+
});
|
|
486
|
+
}
|
|
487
|
+
|
|
303
488
|
/* ------------------------------------------------------------------ *
|
|
304
489
|
* 图标
|
|
305
490
|
* ------------------------------------------------------------------ */
|
|
@@ -798,13 +983,29 @@ window.__ModuleLoader__.load({
|
|
|
798
983
|
ctx.effect(() => ctx.locale.register(NS, { zh: ZH, en: EN }), 'dsh-mcp-status: dictionaries');
|
|
799
984
|
const t = ctx.locale.bind(NS);
|
|
800
985
|
|
|
986
|
+
// 角标样式必须挂在 <head>:面板切走后会被卸载,侧栏那一行还在,样式一没点就画不出来。
|
|
987
|
+
ctx.effect(() => {
|
|
988
|
+
const style = document.createElement('style');
|
|
989
|
+
style.setAttribute('data-dsh-plugin', `${NS}-dock`);
|
|
990
|
+
style.textContent = DOCK_CSS;
|
|
991
|
+
document.head.appendChild(style);
|
|
992
|
+
return () => style.remove();
|
|
993
|
+
}, 'dsh-mcp-status: dock styles');
|
|
994
|
+
|
|
801
995
|
ctx.slots.inject('sidebar.panellist', () => ctx.slots.register({
|
|
802
996
|
name: 'sidebar.panellist',
|
|
803
997
|
id: PANEL_ID,
|
|
804
998
|
order: PANEL_ORDER,
|
|
805
999
|
label: () => t('panel.title'),
|
|
806
1000
|
locale: NS,
|
|
807
|
-
}, ({ size = 18 }) => h(
|
|
1001
|
+
}, ({ size = 18 }) => h(StatusGlyph, { size, t })));
|
|
1002
|
+
|
|
1003
|
+
// 侧栏收起时,顶部展开按钮上的状态点(宿主声明为可选、不可交互)。
|
|
1004
|
+
// 全好时不注册任何东西:没有点就是没有坏事,比一个常年发绿的点更可信。
|
|
1005
|
+
ctx.slots.inject('sidebar.toggle.badge', () => ctx.slots.register({
|
|
1006
|
+
name: 'sidebar.toggle.badge',
|
|
1007
|
+
locale: NS,
|
|
1008
|
+
}, () => h(ToggleBadge, { t })));
|
|
808
1009
|
|
|
809
1010
|
ctx.slots.inject('main', () => ctx.slots.register({
|
|
810
1011
|
name: 'main',
|
package/index.js
CHANGED
|
@@ -32,6 +32,7 @@ import {
|
|
|
32
32
|
resolveStatus,
|
|
33
33
|
sectionOrder,
|
|
34
34
|
serverNameFromTool,
|
|
35
|
+
summarizeServers,
|
|
35
36
|
} from './lib/status.js';
|
|
36
37
|
import { probeServer } from './lib/probe.js';
|
|
37
38
|
|
|
@@ -769,6 +770,29 @@ export function apply(ctx, rawConfig) {
|
|
|
769
770
|
}
|
|
770
771
|
},
|
|
771
772
|
}),
|
|
773
|
+
// 侧栏角标用的轻量摘要:读缓存、不强制重采、不探活。
|
|
774
|
+
//
|
|
775
|
+
// 角标每 5 s 问一次,而 /servers 每次都要当场重采(探活 + 工具表扫描)。让角标改用这条
|
|
776
|
+
// 路由,后台 refreshMs 循环负责续期,用户没打开面板时不会因为一个 6 px 的点而打风暴。
|
|
777
|
+
ctx.webServer.register({
|
|
778
|
+
kind: 'exact',
|
|
779
|
+
path: `${ROUTE_BASE}/summary`,
|
|
780
|
+
handler: async (request, response) => {
|
|
781
|
+
const rejection = gate(request, { method: 'GET', write: false });
|
|
782
|
+
if (rejection !== undefined) return sendJson(response, rejection.status, { ok: false, error: rejection.error });
|
|
783
|
+
try {
|
|
784
|
+
// 非强制:新鲜就返回缓存,过期才采一次(仍然受 refreshMs 节流)。
|
|
785
|
+
const snapshot = await tracker.refresh(false);
|
|
786
|
+
return sendJson(response, 200, {
|
|
787
|
+
ok: true,
|
|
788
|
+
...summarizeServers(snapshot.servers),
|
|
789
|
+
checkedAt: snapshot.checkedAt,
|
|
790
|
+
});
|
|
791
|
+
} catch (error) {
|
|
792
|
+
return sendJson(response, 500, { ok: false, error: error?.message ?? String(error) });
|
|
793
|
+
}
|
|
794
|
+
},
|
|
795
|
+
}),
|
|
772
796
|
ctx.webServer.register({
|
|
773
797
|
kind: 'exact',
|
|
774
798
|
path: `${ROUTE_BASE}/toggle`,
|
package/lib/status.js
CHANGED
|
@@ -238,6 +238,86 @@ export function buildHealthText(snapshot, { now = Date.now(), maxRows = 6, maxCh
|
|
|
238
238
|
return text.length > maxChars ? `${text.slice(0, maxChars - 1)}…` : text;
|
|
239
239
|
}
|
|
240
240
|
|
|
241
|
+
/**
|
|
242
|
+
* 侧栏角标的音调:ok(全好)/ idle(还没起来)/ warn(正在自救)/ bad(要人管)/ disabled / empty。
|
|
243
|
+
* 只是渲染用的一档分组,不是第二个状态判定——每个 row 的 state 仍然来自 {@link resolveStatus}。
|
|
244
|
+
*/
|
|
245
|
+
const ATTENTION_RANK = { failed: 3, unreachable: 3, reconnecting: 2 };
|
|
246
|
+
|
|
247
|
+
/**
|
|
248
|
+
* 把一份快照压成侧栏要的那几个数:这是**聚合**,不是判定。
|
|
249
|
+
*
|
|
250
|
+
* 每个 row 的 state 已经由 {@link resolveStatus} 定好,这里只回答「最值得看的那一档是什么、
|
|
251
|
+
* 有几台要人管、它们叫什么」。所以 A3 的边界原样保留:`idle`/`pending` 不算异常、不进 attention,
|
|
252
|
+
* 只有 failed/unreachable(bad)与 reconnecting(warn)会点亮角标。
|
|
253
|
+
*
|
|
254
|
+
* @param {object[]} servers 快照里的行(DTO 子集:id、serverName、state、reason)
|
|
255
|
+
* @param {object} [options]
|
|
256
|
+
* @param {number} [options.maxNames] 最多带出几个名字(多出来的只给计数,避免侧栏提示过长)
|
|
257
|
+
* @returns {{worst: string, counts: object, attention: object[], names: string[], more: number, signature: string}}
|
|
258
|
+
*/
|
|
259
|
+
export function summarizeServers(servers, { maxNames = 3 } = {}) {
|
|
260
|
+
const rows = Array.isArray(servers) ? servers : [];
|
|
261
|
+
const counts = {
|
|
262
|
+
total: rows.length,
|
|
263
|
+
connected: 0,
|
|
264
|
+
idle: 0,
|
|
265
|
+
pending: 0,
|
|
266
|
+
reconnecting: 0,
|
|
267
|
+
unhealthy: 0,
|
|
268
|
+
disabled: 0,
|
|
269
|
+
unknown: 0,
|
|
270
|
+
};
|
|
271
|
+
const attention = [];
|
|
272
|
+
let worst = 'empty';
|
|
273
|
+
|
|
274
|
+
for (const row of rows) {
|
|
275
|
+
const state = row?.state;
|
|
276
|
+
if (state === 'connected') counts.connected += 1;
|
|
277
|
+
else if (state === 'idle') counts.idle += 1;
|
|
278
|
+
else if (state === 'pending') counts.pending += 1;
|
|
279
|
+
else if (state === 'disabled') counts.disabled += 1;
|
|
280
|
+
else if (state === 'reconnecting') {
|
|
281
|
+
counts.reconnecting += 1;
|
|
282
|
+
attention.push(row);
|
|
283
|
+
} else if (state === 'failed' || state === 'unreachable') {
|
|
284
|
+
counts.unhealthy += 1;
|
|
285
|
+
attention.push(row);
|
|
286
|
+
} else {
|
|
287
|
+
// 未知状态不猜:既不点亮角标,也不假装连上了。
|
|
288
|
+
counts.unknown += 1;
|
|
289
|
+
}
|
|
290
|
+
|
|
291
|
+
const rowRank = ATTENTION_RANK[state];
|
|
292
|
+
if (rowRank !== undefined) {
|
|
293
|
+
const currentRank = worst === 'bad' ? 3 : worst === 'warn' ? 2 : 0;
|
|
294
|
+
if (rowRank > currentRank) worst = rowRank === 3 ? 'bad' : 'warn';
|
|
295
|
+
}
|
|
296
|
+
}
|
|
297
|
+
|
|
298
|
+
if (worst === 'empty' && rows.length > 0) {
|
|
299
|
+
if (counts.connected > 0) worst = 'ok';
|
|
300
|
+
else if (counts.idle > 0 || counts.pending > 0) worst = 'idle';
|
|
301
|
+
else if (counts.disabled > 0) worst = 'disabled';
|
|
302
|
+
}
|
|
303
|
+
|
|
304
|
+
const shown = attention.slice(0, Math.max(1, maxNames));
|
|
305
|
+
return {
|
|
306
|
+
worst,
|
|
307
|
+
counts,
|
|
308
|
+
attention: shown.map((row) => ({
|
|
309
|
+
id: row?.id,
|
|
310
|
+
name: row?.serverName ?? row?.id ?? 'MCP',
|
|
311
|
+
state: row?.state,
|
|
312
|
+
reason: row?.reason,
|
|
313
|
+
})),
|
|
314
|
+
names: shown.map((row) => row?.serverName ?? row?.id ?? 'MCP'),
|
|
315
|
+
more: Math.max(0, attention.length - shown.length),
|
|
316
|
+
/** 客户端拿它判断「这份快照和上一份是不是同一回事」。 */
|
|
317
|
+
signature: rows.map((row) => `${row?.id}:${row?.state}:${row?.reason}`).join('|'),
|
|
318
|
+
};
|
|
319
|
+
}
|
|
320
|
+
|
|
241
321
|
/** 设置 section 顺序:优先问注册表,问不到就用一个稳的常量(不因为版本差异抛错)。 */
|
|
242
322
|
export function sectionOrder(registry, name = 'MCP_SERVERS', fallback = 50) {
|
|
243
323
|
try {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dsh-mcp-status",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.3.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "DSH Web GUI 的 MCP 服务器面板:在侧边栏查看每个 MCP 服务器的连接状态、工具数量与配置,并可直接开关、重试连接。",
|
|
6
6
|
"license": "MIT",
|
|
@@ -56,6 +56,8 @@
|
|
|
56
56
|
}
|
|
57
57
|
},
|
|
58
58
|
"scripts": {
|
|
59
|
-
"test": "node test/status.test.mjs && node lib/probe.test.mjs"
|
|
59
|
+
"test": "node test/status.test.mjs && node lib/probe.test.mjs",
|
|
60
|
+
"check": "node --check index.js && node --check client.js && node --check lib/status.js && node --check lib/probe.js && npm test",
|
|
61
|
+
"release": "node scripts/release.mjs"
|
|
60
62
|
}
|
|
61
63
|
}
|
package/test/status.test.mjs
CHANGED
|
@@ -19,6 +19,7 @@ import {
|
|
|
19
19
|
resolveStatus,
|
|
20
20
|
sectionOrder,
|
|
21
21
|
serverNameFromTool,
|
|
22
|
+
summarizeServers,
|
|
22
23
|
} from '../lib/status.js';
|
|
23
24
|
|
|
24
25
|
const NOW = 1_700_000_000_000;
|
|
@@ -560,8 +561,105 @@ const cases = [
|
|
|
560
561
|
assert.equal(sectionOrder(undefined), 50);
|
|
561
562
|
assert.equal(sectionOrder({ getSectionOrder: () => '7' }, 'MCP_SERVERS', 50), 50);
|
|
562
563
|
}],
|
|
564
|
+
|
|
565
|
+
// ------------------------------------------------------------ summarizeServers
|
|
566
|
+
//
|
|
567
|
+
// 这是侧栏角标唯一的输入。它只做聚合,所以用例守的是「哪些状态配点亮侧栏」这条边界,
|
|
568
|
+
// 尤其是 A3:idle(没有工具)不是断线,绝不能让侧栏变红。
|
|
569
|
+
|
|
570
|
+
['summarizeServers: all connected → ok, no attention', () => {
|
|
571
|
+
const summary = summarizeServers([
|
|
572
|
+
{ id: 'a', serverName: 'alpha', state: 'connected', reason: 'connected' },
|
|
573
|
+
{ id: 'b', serverName: 'beta', state: 'connected', reason: 'connected' },
|
|
574
|
+
]);
|
|
575
|
+
assert.equal(summary.worst, 'ok');
|
|
576
|
+
assert.equal(summary.counts.total, 2);
|
|
577
|
+
assert.equal(summary.counts.connected, 2);
|
|
578
|
+
assert.deepEqual(summary.names, []);
|
|
579
|
+
assert.equal(summary.attention.length, 0);
|
|
580
|
+
}],
|
|
581
|
+
|
|
582
|
+
['summarizeServers: failed → bad, with name and reason', () => {
|
|
583
|
+
const summary = summarizeServers([
|
|
584
|
+
{ id: 'u', serverName: 'unityMCP', state: 'failed', reason: 'gave-up' },
|
|
585
|
+
{ id: 'a', serverName: 'alpha', state: 'connected', reason: 'connected' },
|
|
586
|
+
]);
|
|
587
|
+
assert.equal(summary.worst, 'bad');
|
|
588
|
+
assert.equal(summary.counts.unhealthy, 1);
|
|
589
|
+
assert.deepEqual(summary.names, ['unityMCP']);
|
|
590
|
+
assert.equal(summary.attention[0].reason, 'gave-up');
|
|
591
|
+
}],
|
|
592
|
+
|
|
593
|
+
['summarizeServers: reconnecting alone → warn, failed outranks it', () => {
|
|
594
|
+
const warn = summarizeServers([{ id: 'a', serverName: 'alpha', state: 'reconnecting', reason: 'client-reconnecting' }]);
|
|
595
|
+
assert.equal(warn.worst, 'warn');
|
|
596
|
+
assert.equal(warn.counts.reconnecting, 1);
|
|
597
|
+
|
|
598
|
+
const bad = summarizeServers([
|
|
599
|
+
{ id: 'a', serverName: 'alpha', state: 'reconnecting', reason: 'client-reconnecting' },
|
|
600
|
+
{ id: 'b', serverName: 'beta', state: 'unreachable', reason: 'tcp-refused' },
|
|
601
|
+
]);
|
|
602
|
+
assert.equal(bad.worst, 'bad');
|
|
603
|
+
// 先出现的 warn 不能让后面更糟的 bad 被吞掉
|
|
604
|
+
assert.equal(bad.attention.length, 2);
|
|
605
|
+
}],
|
|
606
|
+
|
|
607
|
+
['summarizeServers: idle/pending are not errors (A3)', () => {
|
|
608
|
+
const idle = summarizeServers([{ id: 'a', serverName: 'alpha', state: 'idle', reason: 'no-tools' }]);
|
|
609
|
+
assert.equal(idle.worst, 'idle');
|
|
610
|
+
assert.equal(idle.counts.unhealthy, 0);
|
|
611
|
+
assert.equal(idle.counts.reconnecting, 0);
|
|
612
|
+
assert.deepEqual(idle.names, []);
|
|
613
|
+
|
|
614
|
+
const pending = summarizeServers([{ id: 'a', serverName: 'alpha', state: 'pending', reason: 'pending' }]);
|
|
615
|
+
assert.equal(pending.worst, 'idle');
|
|
616
|
+
assert.deepEqual(pending.names, []);
|
|
617
|
+
|
|
618
|
+
// 和闸门对齐:同一行 decideGuard 放行,角标就不该亮。
|
|
619
|
+
const row = { state: 'idle', reason: 'no-tools', serverName: 'alpha', connection: undefined };
|
|
620
|
+
assert.equal(decideGuard({ toolName: 'mcp__alpha__ping', row, snapshotAt: NOW, now: NOW }), undefined);
|
|
621
|
+
assert.notEqual(idle.worst, 'bad');
|
|
622
|
+
}],
|
|
623
|
+
|
|
624
|
+
['summarizeServers: disabled excluded, empty and unknown stay quiet', () => {
|
|
625
|
+
const disabled = summarizeServers([{ id: 'a', serverName: 'alpha', state: 'disabled', reason: 'disabled' }]);
|
|
626
|
+
assert.equal(disabled.worst, 'disabled');
|
|
627
|
+
assert.equal(disabled.counts.disabled, 1);
|
|
628
|
+
assert.deepEqual(disabled.names, []);
|
|
629
|
+
|
|
630
|
+
const empty = summarizeServers([]);
|
|
631
|
+
assert.equal(empty.worst, 'empty');
|
|
632
|
+
assert.equal(empty.counts.total, 0);
|
|
633
|
+
|
|
634
|
+
// 宿主给了没见过的新状态:不猜、不报警,只记个数。
|
|
635
|
+
const unknown = summarizeServers([{ id: 'a', serverName: 'alpha', state: 'brand-new-state' }]);
|
|
636
|
+
assert.equal(unknown.counts.unknown, 1);
|
|
637
|
+
assert.deepEqual(unknown.names, []);
|
|
638
|
+
assert.equal(unknown.worst, 'empty');
|
|
639
|
+
}],
|
|
640
|
+
|
|
641
|
+
['summarizeServers: names are capped, the rest become a count', () => {
|
|
642
|
+
const rows = Array.from({ length: 5 }, (_, index) => ({
|
|
643
|
+
id: `s${index}`, serverName: `srv${index}`, state: 'failed', reason: 'client-failed',
|
|
644
|
+
}));
|
|
645
|
+
const summary = summarizeServers(rows, { maxNames: 2 });
|
|
646
|
+
assert.deepEqual(summary.names, ['srv0', 'srv1']);
|
|
647
|
+
assert.equal(summary.more, 3);
|
|
648
|
+
assert.equal(summary.attention.length, 2);
|
|
649
|
+
}],
|
|
650
|
+
|
|
651
|
+
['summarizeServers: signature tracks state and reason changes', () => {
|
|
652
|
+
const rows = [{ id: 'a', serverName: 'alpha', state: 'connected', reason: 'connected' }];
|
|
653
|
+
const before = summarizeServers(rows).signature;
|
|
654
|
+
const after = summarizeServers([
|
|
655
|
+
{ id: 'a', serverName: 'alpha', state: 'failed', reason: 'client-failed' },
|
|
656
|
+
]).signature;
|
|
657
|
+
assert.notEqual(before, after);
|
|
658
|
+
assert.equal(summarizeServers(rows).signature, before);
|
|
659
|
+
}],
|
|
563
660
|
];
|
|
564
661
|
|
|
662
|
+
|
|
565
663
|
let failed = 0;
|
|
566
664
|
for (const [name, body] of cases) {
|
|
567
665
|
try {
|