dsh-mcp-station 0.1.0 → 0.1.1

package/MARKET.md

@@ -1,5 +1,8 @@
 # MCP Station — MARKET
 
+npm: https://www.npmjs.com/package/dsh-mcp-station
+GitHub: https://github.com/WilShi/dsh-mcp-station
+
 ## 一句话
 
 DSH 的 MCP 应用商店：精选目录、一键安装、连通性检测、浏览器预设。
@@ -32,6 +35,12 @@ mcp, mcp-manager, mcp-store, playwright, browser, automation, devtools, one-clic
 
 ## 更新日志
 
+### 0.1.1
+
+- 自定义 MCP 服务器（stdio/HTTP + headers）
+- Claude/Cursor JSON 配置导入
+- 安装后自动测试 / 一键重试
+
 ### 0.1.0
 
 - 首个 MVP：精选目录、一键安装、连通性检测、Playwright 预设、环境体检。

package/README.md

@@ -1,5 +1,8 @@
 # MCP Station
 
+[![npm](https://img.shields.io/npm/v/dsh-mcp-station)](https://www.npmjs.com/package/dsh-mcp-station)
+[![license](https://img.shields.io/npm/l/dsh-mcp-station)](LICENSE)
+
 > The MCP app store for DeepSeek Harness: curated catalog, one-click install, health checks and browser presets.
 
 ![Store](docs/screenshots/store.png)
@@ -10,6 +13,12 @@ MCP Station solves three concrete problems for DSH users:
 2. **Slow markets**: the default market index goes through jsDelivr and often takes 15-25s or times out in mainland China. The MCP Station catalog is bundled with the plugin and works offline.
 3. **Did it actually work?**: every entry can be tested (initialize + tools/list) with tool count, latency and error details. The Playwright preset detects local Chrome and adds --browser chrome for you.
 
+## What's new in 0.1.1
+
+- **Custom MCP servers**: stdio (command/args/env) or HTTP (url/headers), with validation and a test button.
+- **Import JSON**: paste Claude / Cursor mcpServers configs or a servers array; invalid or duplicate entries are skipped with reasons.
+- **Auto-test after install**: initialize + tools/list immediately, showing status, tool count and errors; can be disabled in Settings.
+
 ## Features
 
 - Curated store: browser, search, dev, data, memory and productivity categories, bilingual copy and risk labels.

package/README.zh.md

@@ -1,5 +1,8 @@
 # MCP Station
 
+[![npm](https://img.shields.io/npm/v/dsh-mcp-station)](https://www.npmjs.com/package/dsh-mcp-station)
+[![license](https://img.shields.io/npm/l/dsh-mcp-station)](LICENSE)
+
 > DSH 的 MCP 应用商店：精选目录、一键安装、连通性检测、浏览器自动化预设。
 
 ![应用商店](docs/screenshots/store.png)
@@ -10,6 +13,12 @@ MCP Station 是 DeepSeek Harness（DSH）的 MCP 管理插件。它解决三个
 2. **市场太慢**：官方插件市场的索引走 jsDelivr，国内经常 15-25 秒甚至超时。MCP Station 的目录随插件打包，离线可用，不依赖任何远程索引。
 3. **装完不知道好不好**：每一项都能「测试连接」，列出工具数量、延迟和错误原因；Playwright 预设会自动检测本机 Chrome 并补上 --browser chrome。
 
+## 0.1.1 新增
+
+- **自定义 MCP 服务器**：stdio（command/args/env）或 HTTP（url/headers），带表单校验与测试。
+- **从 JSON 导入**：粘贴 Claude / Cursor 的 mcpServers 配置或 servers 数组，一次导入；非法/重名项逐条跳过并给原因。
+- **安装后自动测试**：装完立即 initialize + tools/list，状态、工具数、错误直接显示；设置页可关闭。
+
 ## 功能
 
 - **精选应用商店**：浏览器、搜索、开发、数据、记忆、效率分类；中英文说明与风险标签。
@@ -61,6 +70,11 @@ MCP Station 是 DeepSeek Harness（DSH）的 MCP 管理插件。它解决三个
 - env 值写 env:NAME 时只写入 !!js process.env.NAME，密钥不落盘；secret 输入不回显。
 - 受管块之外的 MCP 配置只读展示，不会被修改。
 
+## 更新日志
+
+- **0.1.1**：自定义服务器（stdio/HTTP + headers）、Claude/Cursor JSON 导入、安装后自动测试。
+- **0.1.0**：首个 MVP，9 个精选预设、一键安装、连通性检测、Playwright 预设、环境体检。
+
 ## 兼容性
 
 - DSH 0.2.x（web / desktop profile）。

package/lib/api.js

@@ -6,7 +6,7 @@
 import { existsSync } from 'node:fs';
 import { findPreset, findPresetForServer, loadCatalog, resolvePresetRow, uniqueServerName, } from "./catalog.js";
 import { callStdioTool, probeHttp, probeStdio, resolveEnvValues } from "./mcp/probe.js";
-import { MANAGED_ID_PREFIX, addManagedRow, installedFromServer, inspectPatchText, isValidServerName, parsePatchRows, readPatchText, removeManagedRow, setManagedRowEnabled, writePatchTextAtomic, } from "./patch.js";
+import { MANAGED_ID_PREFIX, addManagedRow, installedFromServer, inspectPatchText, isValidServerName, parsePatchRows, readPatchText, removeManagedRow, replaceManagedRow, setManagedRowEnabled, writePatchTextAtomic, } from "./patch.js";
 import { resolveStationPaths } from "./paths.js";
 import { detectChrome, detectDshVersion, playwrightBrowserCache } from "./runtime.js";
 const JSON_HEADERS = { 'content-type': 'application/json; charset=utf-8', 'cache-control': 'no-store' };
@@ -122,6 +122,240 @@ function optionalRecord(value, label) {
         throw new ApiError(400, 'invalid-request', label + ' 必须是对象');
     return value;
 }
+function optionalBoolean(body, key) {
+    const value = body[key];
+    if (value === undefined || value === null)
+        return undefined;
+    if (typeof value !== 'boolean')
+        throw new ApiError(400, 'invalid-request', '字段 ' + key + ' 必须是布尔值');
+    return value;
+}
+function requireTransport(body) {
+    const value = body.transport;
+    if (value === 'stdio' || value === 'streamable-http')
+        return value;
+    throw new ApiError(400, 'invalid-request', 'transport 必须是 stdio 或 streamable-http');
+}
+function optionalStringArray(value, label) {
+    if (value === undefined || value === null)
+        return undefined;
+    if (!Array.isArray(value))
+        throw new ApiError(400, 'invalid-request', label + ' 必须是字符串数组');
+    const out = [];
+    for (const item of value) {
+        if (typeof item !== 'string')
+            throw new ApiError(400, 'invalid-request', label + ' 必须是字符串数组');
+        out.push(item);
+    }
+    return out;
+}
+function customStringMap(value, label) {
+    if (value === undefined || value === null)
+        return undefined;
+    if (!isRecord(value))
+        throw new ApiError(400, 'invalid-request', label + ' 必须是对象');
+    const out = {};
+    for (const [key, item] of Object.entries(value)) {
+        if (typeof item !== 'string')
+            throw new ApiError(400, 'invalid-request', label + '.' + key + ' 必须是字符串');
+        if (/^\s*!!js\s+/.test(item)) {
+            throw new ApiError(400, 'invalid-request', label + '.' + key + ' 不允许 !!js 表达式（请改用 env:NAME 引用）');
+        }
+        out[key] = item;
+    }
+    return out;
+}
+/** Validate one custom server body into a managed row. */
+function parseCustomRow(body, options = {}) {
+    const serverName = requireString(body, 'serverName');
+    if (!isValidServerName(serverName)) {
+        throw new ApiError(400, 'invalid-request', 'serverName 必须是 1-32 位字母、数字、下划线或连字符');
+    }
+    const transport = requireTransport(body);
+    const enabled = body.enabled === undefined ? (options.existing?.enabled ?? true) : requireBoolean(body, 'enabled');
+    const row = { serverName, transport, enabled };
+    if (transport === 'stdio') {
+        const command = optionalString(body, 'command');
+        if (command === undefined || command === '') {
+            throw new ApiError(400, 'invalid-request', 'stdio 必须提供 command');
+        }
+        row.command = command;
+        const args = optionalStringArray(body.args, 'args');
+        if (args !== undefined)
+            row.args = args;
+        const env = customStringMap(body.env, 'env');
+        if (env !== undefined)
+            row.env = env;
+    }
+    else {
+        const url = optionalString(body, 'url');
+        if (url === undefined || url === '') {
+            throw new ApiError(400, 'invalid-request', 'streamable-http 必须提供 url');
+        }
+        let parsed;
+        try {
+            parsed = new URL(url);
+        }
+        catch {
+            throw new ApiError(400, 'invalid-request', 'url 不是合法 URL');
+        }
+        if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') {
+            throw new ApiError(400, 'invalid-request', 'url 只支持 http(s)');
+        }
+        row.url = url;
+        const headers = customStringMap(body.headers, 'headers');
+        if (headers !== undefined)
+            row.headers = headers;
+    }
+    return row;
+}
+/** Normalize Claude/Cursor mcpServers objects and servers arrays into candidates. */
+function collectImportCandidates(parsed) {
+    const candidates = [];
+    const skipped = [];
+    const pushArray = (items) => {
+        items.forEach((item, index) => {
+            if (!isRecord(item)) {
+                skipped.push({ name: '#' + String(index + 1), reason: '配置必须是对象' });
+                return;
+            }
+            const rawName = typeof item.serverName === 'string' ? item.serverName : typeof item.name === 'string' ? item.name : '';
+            const name = rawName.trim();
+            if (name === '') {
+                skipped.push({ name: '#' + String(index + 1), reason: '缺少 serverName' });
+                return;
+            }
+            candidates.push({ name, spec: item });
+        });
+    };
+    if (Array.isArray(parsed)) {
+        pushArray(parsed);
+        return { candidates, skipped };
+    }
+    if (!isRecord(parsed))
+        throw new ApiError(400, 'invalid-import', 'json 必须是 JSON 对象或数组');
+    if (isRecord(parsed.mcpServers)) {
+        for (const [name, spec] of Object.entries(parsed.mcpServers)) {
+            if (!isRecord(spec)) {
+                skipped.push({ name, reason: '配置必须是对象' });
+                continue;
+            }
+            candidates.push({ name, spec });
+        }
+        return { candidates, skipped };
+    }
+    if (Array.isArray(parsed.servers)) {
+        pushArray(parsed.servers);
+        return { candidates, skipped };
+    }
+    throw new ApiError(400, 'invalid-import', 'json 里没有 mcpServers 对象或 servers 数组');
+}
+function importStringArray(value) {
+    if (value === undefined || value === null)
+        return undefined;
+    if (!Array.isArray(value))
+        return 'invalid';
+    const out = [];
+    for (const item of value) {
+        if (typeof item !== 'string')
+            return 'invalid';
+        out.push(item);
+    }
+    return out;
+}
+function importStringMap(value) {
+    if (value === undefined || value === null)
+        return undefined;
+    if (!isRecord(value))
+        return 'invalid';
+    const out = {};
+    for (const [key, item] of Object.entries(value)) {
+        if (typeof item !== 'string')
+            return 'invalid';
+        out[key] = item;
+    }
+    return out;
+}
+/** Convert one imported config into a managed row, or explain why it was skipped. */
+function importCandidateToRow(candidate) {
+    const name = candidate.name;
+    if (!isValidServerName(name)) {
+        return { reason: 'serverName 不合法（1-32 位字母、数字、下划线或连字符）' };
+    }
+    const spec = candidate.spec;
+    let transport;
+    const declared = spec.transport ?? spec.type;
+    if (declared !== undefined) {
+        if (declared === 'stdio')
+            transport = 'stdio';
+        else if (declared === 'http' || declared === 'streamable-http')
+            transport = 'streamable-http';
+        else if (declared === 'sse')
+            return { reason: 'mcp-client 不支持 SSE transport' };
+        else if (typeof declared === 'string')
+            return { reason: '不支持的 transport: ' + declared };
+        else
+            return { reason: 'transport 必须是字符串' };
+    }
+    const command = typeof spec.command === 'string' && spec.command.trim() !== '' ? spec.command.trim() : undefined;
+    const url = typeof spec.url === 'string' && spec.url.trim() !== '' ? spec.url.trim() : undefined;
+    if (transport === undefined) {
+        if (command !== undefined)
+            transport = 'stdio';
+        else if (url !== undefined)
+            transport = 'streamable-http';
+        else
+            return { reason: '缺少 command 或 url' };
+    }
+    let enabled = true;
+    if (typeof spec.enabled === 'boolean')
+        enabled = spec.enabled;
+    else if (typeof spec.disabled === 'boolean')
+        enabled = !spec.disabled;
+    if (transport === 'stdio') {
+        if (command === undefined)
+            return { reason: 'stdio 缺少 command' };
+        const args = importStringArray(spec.args);
+        if (args === 'invalid')
+            return { reason: 'args 必须是字符串数组' };
+        const env = importStringMap(spec.env);
+        if (env === 'invalid')
+            return { reason: 'env 必须是字符串映射' };
+        return {
+            row: {
+                serverName: name,
+                transport: 'stdio',
+                command,
+                ...(args === undefined ? {} : { args }),
+                ...(env === undefined ? {} : { env }),
+                enabled,
+            },
+        };
+    }
+    if (url === undefined)
+        return { reason: 'streamable-http 缺少 url' };
+    let parsedUrl;
+    try {
+        parsedUrl = new URL(url);
+    }
+    catch {
+        return { reason: 'url 不合法' };
+    }
+    if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:')
+        return { reason: 'url 只支持 http(s)' };
+    const headers = importStringMap(spec.headers);
+    if (headers === 'invalid')
+        return { reason: 'headers 必须是字符串映射' };
+    return {
+        row: {
+            serverName: name,
+            transport: 'streamable-http',
+            url,
+            ...(headers === undefined ? {} : { headers }),
+            enabled,
+        },
+    };
+}
 function toProbeResult(outcome) {
     return {
         ok: outcome.ok,
@@ -138,7 +372,7 @@ function toProbeResult(outcome) {
  * @param config - validated plugin configuration.
  * @returns the node:http handler.
  */
-export function makeApiHandler(_ctx, config) {
+export function makeApiHandler(_ctx, config, dependencies = {}) {
     const maxBodyBytes = config.maxBodyBytes ?? DEFAULT_MAX_BODY_BYTES;
     const probeTimeoutMs = config.probeTimeoutMs ?? DEFAULT_PROBE_TIMEOUT_MS;
     const probeCache = new Map();
@@ -187,7 +421,7 @@ export function makeApiHandler(_ctx, config) {
         }
         throw new ApiError(404, 'not-found', '找不到 MCP server: ' + serverName);
     }
-    async function probeRow(row) {
+    async function probeRowDefault(row) {
         let outcome;
         try {
             if (row.transport === 'streamable-http') {
@@ -212,6 +446,26 @@ export function makeApiHandler(_ctx, config) {
         }
         return toProbeResult(outcome);
     }
+    const probeRow = dependencies.probeRow ?? probeRowDefault;
+    async function persistManagedRows(paths, next) {
+        try {
+            await writePatchTextAtomic(paths.patchPath, next, { requireBlock: true });
+        }
+        catch (error) {
+            throw new ApiError(500, 'patch-write', '写入 cordis.patch.yml 失败: ' + errorMessage(error));
+        }
+        const written = await readPatchText(paths.patchPath);
+        const check = inspectPatchText(written.text, { requireBlock: true });
+        if (!check.ok)
+            throw new ApiError(500, 'patch-invalid', '写入后自检失败: ' + (check.error ?? 'unknown'));
+        return written.text;
+    }
+    function storedStationRow(writtenText, serverName) {
+        const stored = parsePatchRows(writtenText).find((item) => item.origin === 'station' && item.serverName === serverName);
+        if (stored === undefined)
+            throw new ApiError(500, 'patch-invalid', '写入后找不到受管行: ' + serverName);
+        return stored;
+    }
     async function handleStatus() {
         const catalog = await loadCatalogOrFail();
         const paths = resolvePaths();
@@ -262,10 +516,101 @@ export function makeApiHandler(_ctx, config) {
     async function handleServers() {
         return { servers: await listServers() };
     }
+    async function handleCustomCreate(body) {
+        const catalog = await loadCatalogOrFail();
+        const { paths, text, rows } = await readRows();
+        const row = parseCustomRow(body);
+        const taken = rows.map((item) => item.serverName.toLowerCase());
+        if (taken.includes(row.serverName.toLowerCase())) {
+            throw new ApiError(409, 'conflict', 'serverName 已存在: ' + row.serverName);
+        }
+        row.id = MANAGED_ID_PREFIX + row.serverName;
+        let next;
+        try {
+            next = addManagedRow(text, row);
+        }
+        catch (error) {
+            const message = errorMessage(error);
+            if (/已存在|重复/.test(message))
+                throw new ApiError(409, 'conflict', message);
+            throw new ApiError(500, 'patch-invalid', message);
+        }
+        const writtenText = await persistManagedRows(paths, next);
+        const stored = storedStationRow(writtenText, row.serverName);
+        return { server: installedFromServer(stored, catalog) };
+    }
+    async function handleCustomUpdate(body) {
+        const serverName = requireString(body, 'serverName');
+        const catalog = await loadCatalogOrFail();
+        const { paths, text, rows } = await readRows();
+        const station = rows.find((item) => item.origin === 'station' && item.serverName === serverName);
+        if (station === undefined) {
+            if (rows.some((item) => item.serverName === serverName)) {
+                throw new ApiError(403, 'read-only', '外部 MCP 行只读，不能通过 MCP Station 更新: ' + serverName);
+            }
+            throw new ApiError(404, 'not-found', '找不到 MCP server: ' + serverName);
+        }
+        const row = parseCustomRow(body, { existing: station });
+        row.id = station.id ?? MANAGED_ID_PREFIX + serverName;
+        let next;
+        try {
+            next = replaceManagedRow(text, row);
+        }
+        catch (error) {
+            throw new ApiError(500, 'patch-invalid', errorMessage(error));
+        }
+        const writtenText = await persistManagedRows(paths, next);
+        const stored = storedStationRow(writtenText, serverName);
+        return { server: withRuntime(installedFromServer(stored, catalog), probeCache.get(serverName)) };
+    }
+    async function handleImport(body) {
+        const jsonText = requireString(body, 'json');
+        let parsed;
+        try {
+            parsed = JSON.parse(jsonText);
+        }
+        catch {
+            throw new ApiError(400, 'invalid-json', 'json 字段不是合法的 JSON 文本');
+        }
+        const collection = collectImportCandidates(parsed);
+        const catalog = await loadCatalogOrFail();
+        const { paths, text, rows } = await readRows();
+        const taken = new Set(rows.map((item) => item.serverName.toLowerCase()));
+        const accepted = [];
+        const skipped = [...collection.skipped];
+        for (const candidate of collection.candidates) {
+            const parsedRow = importCandidateToRow(candidate);
+            if (parsedRow.row === undefined) {
+                skipped.push({ name: candidate.name, reason: parsedRow.reason ?? '非法配置' });
+                continue;
+            }
+            const key = parsedRow.row.serverName.toLowerCase();
+            if (taken.has(key)) {
+                skipped.push({ name: candidate.name, reason: '已存在同名 server' });
+                continue;
+            }
+            taken.add(key);
+            accepted.push(parsedRow.row);
+        }
+        if (accepted.length === 0)
+            return { imported: [], skipped };
+        let next = text;
+        try {
+            for (const row of accepted)
+                next = addManagedRow(next, row);
+        }
+        catch (error) {
+            throw new ApiError(500, 'patch-invalid', errorMessage(error));
+        }
+        const writtenText = await persistManagedRows(paths, next);
+        const imported = accepted.map((row) => installedFromServer(storedStationRow(writtenText, row.serverName), catalog));
+        return { imported, skipped };
+    }
     async function handleInstall(body) {
         const presetId = requireString(body, 'presetId');
         const requestedName = optionalString(body, 'serverName');
         const values = stringRecord(body.values, 'values');
+        const shouldTest = optionalBoolean(body, 'test') === true;
         const catalog = await loadCatalogOrFail();
         const preset = findPreset(catalog, presetId);
         if (preset === undefined)
@@ -323,7 +668,12 @@ export function makeApiHandler(_ctx, config) {
         const stored = parsePatchRows(written.text).find((item) => item.origin === 'station' && item.serverName === serverName);
         if (stored === undefined)
             throw new ApiError(500, 'patch-invalid', '写入后找不到新行: ' + serverName);
-        return { server: installedFromServer(stored, catalog) };
+        const server = installedFromServer(stored, catalog);
+        if (!shouldTest)
+            return { server };
+        const result = await probeRow(stored);
+        probeCache.set(serverName, { result, at: Date.now() });
+        return { server: withRuntime(server, probeCache.get(serverName)) };
     }
     async function handleTest(body) {
         const serverName = requireString(body, 'serverName');
@@ -602,6 +952,18 @@ export function makeApiHandler(_ctx, config) {
                     sendData(res, await handleInstall(body));
                     return;
                 }
+                if (route === '/servers/custom') {
+                    sendData(res, await handleCustomCreate(body));
+                    return;
+                }
+                if (route === '/servers/custom/update') {
+                    sendData(res, await handleCustomUpdate(body));
+                    return;
+                }
+                if (route === '/servers/import') {
+                    sendData(res, await handleImport(body));
+                    return;
+                }
                 if (route === '/servers/test') {
                     sendData(res, await handleTest(body));
                     return;