dsh-mcp-connector 0.2.21 → 0.2.23

package/lib/mcp-provision.js

@@ -24,7 +24,7 @@ export function authHeaders(record, grants) {
   return headers;
 }
 
-export function buildEntryConfig(record, grants) {
+export function buildEntryConfig(record, grants, { failOnStartupError = false } = {}) {
   if (record.transport === 'stdio') {
     return {
       transport: 'stdio',
@@ -33,7 +33,7 @@ export function buildEntryConfig(record, grants) {
       args: record.args ?? [],
       env: record.env ?? {},
       cwd: record.cwd || process.cwd(),
-      failOnStartupError: false,
+      failOnStartupError,
     };
   }
   return {
@@ -41,7 +41,7 @@ export function buildEntryConfig(record, grants) {
     serverName: record.serverName,
     url: record.url,
     headers: authHeaders(record, grants),
-    failOnStartupError: false,
+    failOnStartupError,
   };
 }
 
@@ -55,9 +55,9 @@ function hasEntry(ctx, id) {
 }
 
 /** 创建或更新一条 mcp-client 条目（幂等；serverName 不变则工具名不变） */
-export async function provision(ctx, config, record, grants) {
+export async function provision(ctx, config, record, grants, { failOnStartupError = false } = {}) {
   const id = entryIdFor(config, record);
-  const entryConfig = buildEntryConfig(record, grants);
+  const entryConfig = buildEntryConfig(record, grants, { failOnStartupError });
   const disabled = record.enabled === false;
   if (hasEntry(ctx, id)) {
     const existing = ctx.loader.resolve(id);

package/lib/mcp-validation.js

@@ -47,17 +47,22 @@ function parseMcpPayload(text, contentType = '') {
 function errorChain(error) {
   const parts = [];
   let current = error;
-  for (let depth = 0; current && depth < 4; depth += 1) {
+  for (let depth = 0; current && depth < 8; depth += 1) {
     parts.push(current.code, current.name, current.message);
     current = current.cause;
   }
   return parts.filter(Boolean).join(' ');
 }
 
-export function classifyConnectionError(error) {
+export function classifyConnectionError(error, { transport } = {}) {
   const text = errorChain(error);
   if (/AbortError|timeout|timed out|ETIMEDOUT/i.test(text)) {
-    return { kind: 'timeout', message: '连接超时，请检查网络、VPN/专线或服务状态' };
+    return {
+      kind: 'timeout',
+      message: transport === 'stdio'
+        ? '本地 MCP Server 启动或工具同步超时，请检查运行环境、命令和 Host 日志'
+        : '连接超时，请检查网络、VPN/专线或服务状态',
+    };
   }
   if (/ENOTFOUND|EAI_AGAIN|getaddrinfo/i.test(text)) {
     return { kind: 'dns', message: '域名解析失败，请检查当前网络 DNS' };
@@ -68,6 +73,23 @@ export function classifyConnectionError(error) {
   if (/ECONNREFUSED/i.test(text)) {
     return { kind: 'refused', message: '目标服务拒绝连接，请检查 MCP URL 和服务状态' };
   }
+  if (/ENOENT|command not found|spawn[^\n]*not found/i.test(text)) {
+    return { kind: 'process-not-found', message: '本地 MCP 启动命令不存在，请先安装所需运行时或检查 command 配置' };
+  }
+  if (/exit(?:ed)?\s+(?:with\s+)?code|process[^\n]*(?:closed|exited)|subprocess[^\n]*(?:closed|exited)/i.test(text)) {
+    const exitCode = text.match(/(?:exit(?:ed)?\s+(?:with\s+)?code|code)\s*[:=]?\s*(-?\d+)/i)?.[1];
+    return {
+      kind: 'process-exit',
+      message: `本地 MCP 进程在初始化期间退出${exitCode !== undefined ? `（退出码 ${exitCode}）` : ''}，请检查命令、参数和 Host 日志`,
+      ...(exitCode !== undefined ? { exitCode: Number(exitCode) } : {}),
+    };
+  }
+  if (/initial (?:connection|tool synchronization)|tool synchronization failed|initialize(?: handshake)? failed/i.test(text)) {
+    return { kind: 'startup', message: 'MCP 初始化或首次工具同步失败，请检查服务配置和 Host 日志' };
+  }
+  if (transport === 'stdio') {
+    return { kind: 'startup', message: '本地 MCP Server 启动或初始化失败，请检查命令、参数、运行环境和 Host 日志' };
+  }
   return { kind: 'network', message: '无法连接 MCP 服务，请检查网络和 MCP URL' };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-mcp-connector",
-  "version": "0.2.21",
+  "version": "0.2.23",
   "description": "General-purpose MCP connector, connection manager, plugin extension, and integration marketplace for DeepSeek Harness, initiated and maintained by Qichacha/QCC.",
   "type": "module",
   "main": "lib/index.js",
@@ -33,7 +33,7 @@
   ],
   "scripts": {
     "test": "node --test",
-    "lint": "node --check lib/index.js && node --check lib/web.js && node --check lib/client.js && node --check lib/schema.js && node --check lib/catalog.js && node --check lib/prompts.js && node --check lib/probe.js && node --check lib/mcp-validation.js && node --check lib/mcp-http.js && node --check lib/migration.js && node --check lib/stores.js && node --check lib/oauth.js && node --check lib/callback-server.js && node --check lib/mcp-provision.js && node --check lib/util.js && node --check lib/constants.js && node --check lib/tools.js && node --check lib/connectors/oauth-connector.js && node --check lib/connectors/manual-connector.js && node --check lib/connectors/json-connector.js && node --check scripts/probe-connector.mjs && node --check scripts/build-registry.mjs && node --check scripts/ui-harness.mjs && node --check scripts/check-market-registration.mjs && node --check scripts/sync-registry-stats.mjs",
+    "lint": "node --check lib/index.js && node --check lib/web.js && node --check lib/client.js && node --check lib/schema.js && node --check lib/catalog.js && node --check lib/prompts.js && node --check lib/probe.js && node --check lib/mcp-validation.js && node --check lib/mcp-http.js && node --check lib/migration.js && node --check lib/stores.js && node --check lib/oauth.js && node --check lib/grant-lifecycle.js && node --check lib/callback-server.js && node --check lib/mcp-provision.js && node --check lib/util.js && node --check lib/constants.js && node --check lib/tools.js && node --check lib/connectors/oauth-connector.js && node --check lib/connectors/manual-connector.js && node --check lib/connectors/json-connector.js && node --check scripts/probe-connector.mjs && node --check scripts/build-registry.mjs && node --check scripts/ui-harness.mjs && node --check scripts/check-market-registration.mjs && node --check scripts/sync-registry-stats.mjs",
     "registry:build": "node scripts/build-registry.mjs",
     "registry:validate": "node scripts/probe-connector.mjs catalog/catalog.json --validate-only",
     "dev:ui": "node scripts/ui-harness.mjs",

package/ui/index.html

@@ -455,13 +455,23 @@
 <script>
 (function () {
   const API = '/mcp-connector/api';
+  const API_TIMEOUTS = {
+    connect: 145_000,
+    configure: 145_000,
+    importJson: 145_000,
+    installFromUrl: 145_000,
+    setEnabled: 130_000,
+    toolsList: 20_000,
+    healthCheck: 10_000,
+  };
+  const DEFAULT_API_TIMEOUT_MS = 30_000;
   const $ = (sel) => document.querySelector(sel);
   const main = $('#main');
   const toast = $('#toast');
   const searchInput = $('#search');
   const LABELS = {
     details: '详情', connect: '连接', connected: '已连接', configured: '已配置', configure: '配置',
-    reauthorize: '需重新授权', connectionError: '连接异常', partialError: '部分异常', disabled: '已停用',
+    reauthorize: '需重新授权', recovering: '自动重试中', connectionError: '连接异常', partialError: '部分异常', disabled: '已停用',
     send: '发送', fillSend: '填写并发送', connectToUse: '连接后使用', try: '💬 去试试',
     connectTry: '🔗 连接后试用', configureConnect: '🔑 录入凭据并连接',
     reconfigureCredential: '🔑 重新配置凭据', loading: '加载中…',
@@ -505,18 +515,31 @@
   let promptRequestTimer = null;
   let initialHealthCheckStarted = false;
 
-  async function call(method, params) {
+  async function call(method, params, { timeoutMs: timeoutOverride } = {}) {
+    const controller = new AbortController();
+    const timeoutMs = timeoutOverride || API_TIMEOUTS[method] || DEFAULT_API_TIMEOUT_MS;
+    const timer = setTimeout(() => controller.abort(), timeoutMs);
     try {
       const res = await fetch(API, {
         method: 'POST',
         headers: { 'content-type': 'application/json' },
         body: JSON.stringify({ method, params }),
+        signal: controller.signal,
       });
       const data = await res.json();
       if (!res.ok && data.ok !== false) return { ok: false, message: `请求失败（HTTP ${res.status}）` };
       return data;
     } catch (error) {
+      if (controller.signal.aborted) {
+        return {
+          ok: false,
+          message: `请求超时（${Math.ceil(timeoutMs / 1000)} 秒），请检查服务状态和 Host 日志后重试`,
+          detail: { kind: 'timeout' },
+        };
+      }
       return { ok: false, message: `无法连接 MCP 连接器服务：${error?.message || error}` };
+    } finally {
+      clearTimeout(timer);
     }
   }
 
@@ -676,7 +699,7 @@
           return `<div class="tool-item"><div class="tool-name-row"><div class="tool-name">${esc(tool.name || tool.title || '未命名工具')}</div>${deprecated ? '<span class="tool-deprecated">已弃用</span>' : ''}</div><div class="tool-description${description ? '' : ' empty'}">${esc(description || '暂无描述')}</div></div>`;
         }).join('')
         : server.managed
-          ? '<div class="tools-loading">stdio 工具已由 DSH Host 注册；当前市场详情没有目录快照，可直接在对话中调用。</div>'
+          ? '<div class="tools-loading">Host 已完成 stdio 初始化，但该 Server 当前没有可展示的工具。</div>'
           : '<div class="tools-loading">暂无工具</div>';
       return `<div class="tools-server"><div class="tools-server-header">${esc(label)} <span class="count">· 显示 ${tools.length} / ${matched.length} 个</span></div>${items}</div>`;
     }).filter(Boolean);
@@ -834,6 +857,7 @@
       if (state === 'configured') return `<button class="btn ghost" type="button" onclick="event.stopPropagation();window.__mcp.showDetail('${id}')">${t('details')}</button><button class="btn ghost" disabled>${t('configured')}</button>`;
       if (state === 'disabled') return `<button class="btn ghost" type="button" onclick="event.stopPropagation();window.__mcp.showDetail('${id}')">${t('details')}</button><button class="btn ghost" disabled>${t('disabled')}</button>`;
       if (state === 'reauth') return `<button class="btn ghost" type="button" onclick="event.stopPropagation();window.__mcp.showDetail('${id}')">${t('details')}</button><button class="btn status-warning" type="button" onclick="event.stopPropagation();window.__mcp.showDetail('${id}')">${t('reauthorize')}</button>`;
+      if (state === 'recovering') return `<button class="btn ghost" type="button" onclick="event.stopPropagation();window.__mcp.showDetail('${id}')">${t('details')}</button><button class="btn status-warning" type="button" onclick="event.stopPropagation();window.__mcp.showDetail('${id}')">${t('recovering')}</button>`;
       if (state === 'degraded') return `<button class="btn ghost" type="button" onclick="event.stopPropagation();window.__mcp.showDetail('${id}')">${t('details')}</button><button class="btn status-warning" type="button" onclick="event.stopPropagation();window.__mcp.showDetail('${id}')">${t('partialError')}</button>`;
       if (state === 'unavailable') return `<button class="btn ghost" type="button" onclick="event.stopPropagation();window.__mcp.showDetail('${id}')">${t('details')}</button><button class="btn status-bad" type="button" onclick="event.stopPropagation();window.__mcp.showDetail('${id}')">${t('connectionError')}</button>`;
     }
@@ -863,8 +887,8 @@
   function rowHtml(r) {
     const key = esc(r.key);
     const authMode = r.authMode === 'oauth' ? '<span class="badge auth-oauth">OAuth</span>' : `<span class="badge">${esc(r.authMode || 'manual')}</span>`;
-    const healthLabels = { healthy: '已连接', configured: '已配置', reauth: '需重新授权', degraded: '部分异常', unavailable: '连接异常', disabled: '已停用' };
-    const healthClass = r.connectionState === 'healthy' ? 'pass' : ['reauth', 'degraded'].includes(r.connectionState) ? 'partial' : r.connectionState === 'unavailable' ? 'fail' : '';
+    const healthLabels = { healthy: '已连接', configured: '已配置', reauth: '需重新授权', recovering: '自动重试中', degraded: '部分异常', unavailable: '连接异常', disabled: '已停用' };
+    const healthClass = r.connectionState === 'healthy' ? 'pass' : ['reauth', 'recovering', 'degraded'].includes(r.connectionState) ? 'partial' : r.connectionState === 'unavailable' ? 'fail' : '';
     const healthBadge = `<span class="badge ${healthClass}">${esc(healthLabels[r.connectionState] || '已配置')}</span>`;
     const enabled = r.enabled !== false;
     return `<div class="row" data-key="${key}">
@@ -1038,7 +1062,8 @@
 
   window.__mcp = {
     async connect(connectorId) {
-      const r = await call('connect', { connectorId });
+      const timeoutMs = marketItems[connectorId]?.authMode === 'oauth2-pkce' ? 310_000 : undefined;
+      const r = await call('connect', { connectorId }, { timeoutMs });
       showToast(r.message, r.ok);
       if (r.ok) {
         await call('healthCheck', { connectorId });
@@ -1184,7 +1209,7 @@
       if (!d) return;
       detailConnector = d;
       detailFailureState = d.connectionState || '';
-      detailNeedsReconfigure = ['reauth', 'unavailable'].includes(detailFailureState);
+      detailNeedsReconfigure = ['reauth', 'recovering', 'unavailable'].includes(detailFailureState);
       const loadId = ++detailLoadId;
       $('#detail-icon').innerHTML = isImageIcon(d.icon)
         ? `<img src="${esc(d.icon)}" alt="" onerror="this.parentElement.innerHTML='🔌';" />`
@@ -1320,7 +1345,7 @@
       }
       if (detailFailureState === 'reauth' && detailConnector?.authMode === 'oauth2-pkce') {
         const id = detailConnector.id;
-        const r = await call('connect', { connectorId: id });
+        const r = await call('connect', { connectorId: id }, { timeoutMs: 310_000 });
         showToast(r.message, r.ok);
         if (r.ok) {
           await call('healthCheck', { connectorId: id });