dsh-my-config 1.8.0 → 1.8.1

package/README.md

@@ -12,6 +12,11 @@ DeepSeek Harness 插件：在 Web 侧边栏提供「我的技能 / 我的连接
 
 ## 更新日志
 
+### v1.8.1
+
+- **修复**：streamable-http「测试连接」适配 stateful 服务端——带回 `mcp-session-id`（TS SDK 服务端强校验，缺失返回 400）；响应支持 gzip / deflate / br 解码（部分 CDN 强制压缩导致解析失败）；initialize 协议版本不匹配时自动降级重试。
+- **修复**：Windows 下 stdio 探测无法启动 `npx` / `uvx` 等 `.cmd` shim 的问题（改经 cmd.exe 启动，与内核 MCP SDK 行为一致）。
+
 ### v1.8.0
 
 - **技能**：编辑器支持 license / compatibility / metadata / allowed-tools 全字段（对齐 agentskills.io 规范）；保存与导入时执行规范校验，错误逐字段定位展示。

package/index.js

@@ -13,7 +13,7 @@
 import { promises as fs } from 'node:fs';
 import os from 'node:os';
 import { join, resolve, sep, basename } from 'node:path';
-import { inflateRawSync } from 'node:zlib';
+import { inflateRawSync, gunzipSync, inflateSync, brotliDecompressSync } from 'node:zlib';
 import { spawn } from 'node:child_process';
 import http from 'node:http';
 import https from 'node:https';
@@ -635,8 +635,12 @@ function normalizeToolList(list) {
   })).filter((t) => t.name);
 }
 
-/** streamable-http 单次 JSON-RPC POST；兼容 text/event-stream 响应。 */
-function httpJsonRpcPost(urlString, headers, payload, timeoutMs) {
+/**
+ * streamable-http 单次 JSON-RPC POST；兼容 text/event-stream 与 gzip/deflate 响应。
+ * 返回 { msg, sessionId }：msg 为解析后的 JSON-RPC 消息；sessionId 取响应 mcp-session-id
+ * 头（stateful 服务端在 initialize 后要求后续请求带回，缺失会被 400 拒绝）。
+ */
+function httpJsonRpcPost(urlString, headers, payload, timeoutMs, sessionId) {
   return new Promise((resolvePromise, rejectPromise) => {
     let target;
     try { target = new URL(urlString); } catch { rejectPromise(new Error('url 不是合法地址')); return; }
@@ -647,6 +651,8 @@ function httpJsonRpcPost(urlString, headers, payload, timeoutMs) {
       headers: {
         'content-type': 'application/json',
         accept: 'application/json, text/event-stream',
+        'accept-encoding': 'identity', // 明示不压缩；部分 CDN 仍强推 gzip，响应侧再做兼容解码
+        ...(sessionId ? { 'mcp-session-id': sessionId } : {}),
         ...(headers && typeof headers === 'object' ? headers : {}),
         'content-length': Buffer.byteLength(body),
       },
@@ -655,20 +661,36 @@ function httpJsonRpcPost(urlString, headers, payload, timeoutMs) {
       const chunks = [];
       res.on('data', (chunk) => chunks.push(chunk));
       res.on('end', () => {
-        const text = Buffer.concat(chunks).toString('utf8');
+        let raw = Buffer.concat(chunks);
+        try {
+          const enc = String(res.headers['content-encoding'] ?? '').toLowerCase();
+          if (enc === 'gzip') raw = gunzipSync(raw);
+          else if (enc === 'deflate') raw = inflateSync(raw);
+          else if (enc === 'br') raw = brotliDecompressSync(raw);
+        } catch (err) {
+          rejectPromise(new Error(`响应压缩解码失败（${String(res.headers['content-encoding'])}）: ${err?.message ?? err}`));
+          return;
+        }
+        const text = raw.toString('utf8');
         if (res.statusCode < 200 || res.statusCode >= 300) {
           rejectPromise(new Error(`HTTP ${res.statusCode}: ${text.slice(0, 200)}`));
           return;
         }
+        const nextSid = res.headers['mcp-session-id'] ?? sessionId;
         try {
           if (String(res.headers['content-type'] ?? '').includes('text/event-stream')) {
-            const dataLines = text.split(/\r?\n/).filter((l) => l.startsWith('data:')).map((l) => l.slice(5).trim());
-            resolvePromise(JSON.parse(dataLines[dataLines.length - 1] ?? ''));
+            const dataLines = text.split(/\r?\n/).filter((l) => l.startsWith('data:')).map((l) => l.slice(5).trim()).filter(Boolean);
+            let msg;
+            for (let i = dataLines.length - 1; i >= 0; i--) {
+              try { msg = JSON.parse(dataLines[i]); break; } catch { /* 继续往前找 */ }
+            }
+            if (msg === undefined) throw new Error('no-json');
+            resolvePromise({ msg, sessionId: nextSid });
           } else {
-            resolvePromise(JSON.parse(text));
+            resolvePromise({ msg: JSON.parse(text), sessionId: nextSid });
           }
         } catch {
-          rejectPromise(new Error('响应不是合法 JSON'));
+          rejectPromise(new Error(`响应不是合法 JSON：${text.slice(0, 120)}`));
         }
       });
     });
@@ -683,24 +705,32 @@ function jsonRpcErrorMessage(msg) {
   return msg?.error?.message ? String(msg.error.message) : 'JSON-RPC 返回错误';
 }
 
-/** streamable-http 探测：initialize → notifications/initialized → tools/list。 */
+/** streamable-http 探测：initialize → notifications/initialized → tools/list。
+ *  带回 mcp-session-id（stateful 服务端强校验）；initialize 报协议版本错误时降级重试旧版本。 */
 async function probeHttpConnector(record, timeoutMs) {
-  const initMsg = {
-    jsonrpc: '2.0', id: 1, method: 'initialize',
-    params: {
-      protocolVersion: '2025-06-18',
-      capabilities: {},
-      clientInfo: { name: 'dsh-manager-center', version: '1.8.0' },
-    },
+  const tryInit = async (protocolVersion) => {
+    const init = await httpJsonRpcPost(record.url, record.headers, {
+      jsonrpc: '2.0', id: 1, method: 'initialize',
+      params: {
+        protocolVersion,
+        capabilities: {},
+        clientInfo: { name: 'dsh-manager-center', version: '1.8.1' },
+      },
+    }, timeoutMs);
+    return init;
   };
-  const init = await httpJsonRpcPost(record.url, record.headers, initMsg, timeoutMs);
-  if (init?.error) throw new Error(jsonRpcErrorMessage(init));
+  let init = await tryInit('2025-06-18');
+  if (init.msg?.error && /protocol/i.test(String(init.msg.error.message ?? ''))) {
+    init = await tryInit('2024-11-05');
+  }
+  if (init.msg?.error) throw new Error(jsonRpcErrorMessage(init.msg));
+  const sessionId = init.sessionId; // stateful 服务端在 initialize 响应头发 mcp-session-id
   try {
-    await httpJsonRpcPost(record.url, record.headers, { jsonrpc: '2.0', method: 'notifications/initialized' }, timeoutMs);
+    await httpJsonRpcPost(record.url, record.headers, { jsonrpc: '2.0', method: 'notifications/initialized' }, timeoutMs, sessionId);
   } catch { /* initialized 通知失败不阻断（部分服务端不要求） */ }
-  const list = await httpJsonRpcPost(record.url, record.headers, { jsonrpc: '2.0', id: 2, method: 'tools/list', params: {} }, timeoutMs);
-  if (list?.error) throw new Error(jsonRpcErrorMessage(list));
-  return normalizeToolList(list?.result?.tools);
+  const list = await httpJsonRpcPost(record.url, record.headers, { jsonrpc: '2.0', id: 2, method: 'tools/list', params: {} }, timeoutMs, sessionId);
+  if (list.msg?.error) throw new Error(jsonRpcErrorMessage(list.msg));
+  return normalizeToolList(list.msg?.result?.tools);
 }
 
 /**
@@ -761,13 +791,17 @@ function probeStdioTransport(child, timeoutMs) {
   });
 }
 
-/** stdio 连接器探测：spawn 子进程（env 合并 process.env），再走统一传输层。绝不同步抛出。 */
+/** stdio 连接器探测：spawn 子进程（env 合并 process.env），再走统一传输层。绝不同步抛出。
+ *  Windows 兼容：npx/uvx 等是 .cmd 脚本 shim，CreateProcess 无法直接执行，
+ *  无扩展名命令统一经 shell（cmd.exe /d /s /c）启动，与内核 MCP SDK 行为一致。 */
 function probeStdioConnector(record, timeoutMs) {
   let child;
   try {
-    child = spawn(record.command, Array.isArray(record.args) ? record.args : [], {
+    const command = String(record.command ?? '');
+    child = spawn(command, Array.isArray(record.args) ? record.args : [], {
       env: { ...process.env, ...(record.env && typeof record.env === 'object' ? record.env : {}) },
       ...(record.cwd ? { cwd: record.cwd } : {}),
+      ...(process.platform === 'win32' && !/\.[a-z0-9]+$/i.test(command) ? { shell: true } : {}),
       stdio: ['pipe', 'pipe', 'pipe'],
     });
   } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-my-config",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "My Config (我的配置): manage skills (with external skill markets and zip import), MCP connectors and agent experts from dedicated Web sidebar panels.",
   "type": "module",
   "main": "index.js",