openmcp-sdk 0.0.4 → 0.0.6

package/service/mcp/client.service.js

@@ -1,4 +1,3 @@
-"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -19,20 +18,19 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.McpClient = void 0;
-exports.connect = connect;
-exports.postProcessMcpToolcallResponse = postProcessMcpToolcallResponse;
-const index_js_1 = require("@modelcontextprotocol/sdk/client/index.js");
-const stdio_js_1 = require("@modelcontextprotocol/sdk/client/stdio.js");
-const sse_js_1 = require("@modelcontextprotocol/sdk/client/sse.js");
-const ocr_service_1 = require("./ocr.service");
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
+import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
+import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+import { createOcrWorker, saveBase64ImageData } from "./ocr.service.js";
+import { OAuthClient } from "./auth.service.js";
+import { UnauthorizedError } from '@modelcontextprotocol/sdk/client/auth.js';
 // 增强的客户端类
-class McpClient {
+export class McpClient {
     constructor(options) {
         this.options = options;
         this.serverVersion = undefined;
-        this.client = new index_js_1.Client({
+        this.client = new Client({
             name: "openmcp test local client",
             version: "0.0.1"
         }, {
@@ -42,14 +40,18 @@ class McpClient {
                 tools: {}
             }
         });
+        this.oAuthClient = new OAuthClient();
     }
     // 连接方法
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!this.oauthPovider) {
+                this.oauthPovider = yield this.oAuthClient.getOAuthProvider();
+            }
             // 根据连接类型创建传输层
             switch (this.options.connectionType) {
                 case 'STDIO':
-                    this.transport = new stdio_js_1.StdioClientTransport({
+                    this.transport = new StdioClientTransport({
                         command: this.options.command || '',
                         args: this.options.args || [],
                         cwd: this.options.cwd || process.cwd(),
@@ -61,15 +63,47 @@ class McpClient {
                     if (!this.options.url) {
                         throw new Error('URL is required for SSE connection');
                     }
-                    this.transport = new sse_js_1.SSEClientTransport(new URL(this.options.url));
+                    this.transport = new SSEClientTransport(new URL(this.options.url), {
+                        authProvider: this.oauthPovider
+                    });
+                    break;
+                case 'STREAMABLE_HTTP':
+                    if (!this.options.url) {
+                        throw new Error('URL is required for STREAMABLE_HTTP connection');
+                    }
+                    this.transport = new StreamableHTTPClientTransport(new URL(this.options.url), {
+                        authProvider: this.oauthPovider
+                    });
                     break;
                 default:
                     throw new Error(`Unsupported connection type: ${this.options.connectionType}`);
             }
             // 建立连接
             if (this.transport) {
-                yield this.client.connect(this.transport);
-                console.log(`Connected to MCP server via ${this.options.connectionType}`);
+                try {
+                    // console.log(`🔌 Connecting to MCP server via ${this.options.connectionType}...`);
+                    yield this.client.connect(this.transport);
+                    // console.log(`✅ Connected to MCP server via ${this.options.connectionType}`);
+                }
+                catch (error) {
+                    if (error instanceof UnauthorizedError) {
+                        if (!(this.transport instanceof StreamableHTTPClientTransport) && !(this.transport instanceof SSEClientTransport)) {
+                            console.error('❌ OAuth is only supported for StreamableHTTP and SSE transports. Please use one of these transports for OAuth authentication.');
+                            return;
+                        }
+                        console.log('🔐 OAuth required - waiting for authorization...');
+                        const callbackPromise = this.oAuthClient.waitForOAuthCallback();
+                        const authCode = yield callbackPromise;
+                        yield this.transport.finishAuth(authCode);
+                        console.log('🔐 Authorization code received:', authCode);
+                        console.log('🔌 Reconnecting with authenticated transport...');
+                        yield this.connect(); // 递归重试
+                    }
+                    else {
+                        console.error('❌ Connection failed with non-auth error:', error);
+                        throw error;
+                    }
+                }
             }
         });
     }
@@ -132,14 +166,13 @@ class McpClient {
     callTool(options) {
         return __awaiter(this, void 0, void 0, function* () {
             const { callToolOption } = options, methodArgs = __rest(options, ["callToolOption"]);
-            console.log('callToolOption', callToolOption);
-            return yield this.client.callTool(methodArgs, undefined, callToolOption);
+            const res = yield this.client.callTool(methodArgs, undefined, callToolOption);
+            return res;
         });
     }
 }
-exports.McpClient = McpClient;
 // Connect 函数实现
-function connect(options) {
+export function connect(options) {
     return __awaiter(this, void 0, void 0, function* () {
         const client = new McpClient(options);
         yield client.connect();
@@ -149,10 +182,10 @@ function connect(options) {
 function handleImage(content, webview) {
     return __awaiter(this, void 0, void 0, function* () {
         if (content.data && content.mimeType) {
-            const filename = (0, ocr_service_1.saveBase64ImageData)(content.data, content.mimeType);
+            const filename = saveBase64ImageData(content.data, content.mimeType);
             content.data = filename;
             // 加入工作线程
-            const worker = (0, ocr_service_1.createOcrWorker)(filename, webview);
+            const worker = createOcrWorker(filename, webview);
             content._meta = {
                 ocr: true,
                 workerId: worker.id
@@ -167,7 +200,7 @@ function handleImage(content, webview) {
  * @param response
  * @returns
  */
-function postProcessMcpToolcallResponse(response, webview) {
+export function postProcessMcpToolcallResponse(response, webview) {
     if (response.isError) {
         // 如果是错误响应，将其转换为错误信息
         return response;

package/service/mcp/connect.controller.d.ts

@@ -1,12 +1,12 @@
-import { RequestClientType } from '../common';
-import { PostMessageble } from '../hook/adapter';
+import { PostMessageble } from '../hook/adapter.js';
+import { RequestData } from '../common/index.dto.js';
 export declare class ConnectController {
-    connect(client: RequestClientType, data: any, webview: PostMessageble): Promise<import("../common/index.dto").RestfulResponse>;
-    lookupEnvVar(client: RequestClientType, data: any, webview: PostMessageble): Promise<{
+    connect(data: any, webview: PostMessageble): Promise<import("../common/index.dto.js").RestfulResponse>;
+    lookupEnvVar(data: RequestData, webview: PostMessageble): Promise<{
         code: number;
         msg: any;
     }>;
-    ping(client: RequestClientType, data: any, webview: PostMessageble): Promise<{
+    ping(data: RequestData, webview: PostMessageble): Promise<{
         code: number;
         msg: string;
     } | {

package/service/mcp/connect.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connect.controller.d.ts","sourceRoot":"","sources":["../../src/mcp/connect.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGjD,qBAAa,iBAAiB;IAGpB,OAAO,CAAC,MAAM,EAAE,iBAAiB,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,cAAc;IAMrE,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,cAAc;;;;IAW1E,IAAI,CAAC,MAAM,EAAE,iBAAiB,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,cAAc;;;;;;;CAc3E"}
+{"version":3,"file":"connect.controller.d.ts","sourceRoot":"","sources":["../../src/mcp/connect.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAGrD,qBAAa,iBAAiB;IAGpB,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,cAAc;IAM1C,YAAY,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,cAAc;;;;IA6BvD,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,cAAc;;;;;;;CAexD"}

package/service/mcp/connect.controller.js

@@ -1,4 +1,3 @@
-"use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -14,29 +13,44 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConnectController = void 0;
-const common_1 = require("../common");
-const connect_service_1 = require("./connect.service");
-class ConnectController {
-    connect(client, data, webview) {
+import { Controller } from '../common/index.js';
+import { connectService, getClient } from './connect.service.js';
+export class ConnectController {
+    connect(data, webview) {
         return __awaiter(this, void 0, void 0, function* () {
-            const res = yield (0, connect_service_1.connectService)(client, data);
+            const res = yield connectService(data, webview);
             return res;
         });
     }
-    lookupEnvVar(client, data, webview) {
+    lookupEnvVar(data, webview) {
         return __awaiter(this, void 0, void 0, function* () {
             const { keys } = data;
-            const values = keys.map((key) => process.env[key] || '');
+            const values = keys.map((key) => {
+                if (process.platform === 'win32') {
+                    switch (key) {
+                        case 'USER':
+                            return process.env.USERNAME || '';
+                        case 'HOME':
+                            return process.env.USERPROFILE || process.env.HOME;
+                        case 'LOGNAME':
+                            return process.env.USERNAME || '';
+                        case 'SHELL':
+                            return process.env.SHELL || process.env.COMSPEC;
+                        case 'TERM':
+                            return process.env.TERM || '未设置 (Windows 默认终端)';
+                    }
+                }
+                return process.env[key] || '';
+            });
             return {
                 code: 200,
                 msg: values
             };
         });
     }
-    ping(client, data, webview) {
+    ping(data, webview) {
         return __awaiter(this, void 0, void 0, function* () {
+            const client = getClient(data.clientId);
             if (!client) {
                 const connectResult = {
                     code: 501,
@@ -51,13 +65,12 @@ class ConnectController {
         });
     }
 }
-exports.ConnectController = ConnectController;
 __decorate([
-    (0, common_1.Controller)('connect')
+    Controller('connect')
 ], ConnectController.prototype, "connect", null);
 __decorate([
-    (0, common_1.Controller)('lookup-env-var')
+    Controller('lookup-env-var')
 ], ConnectController.prototype, "lookupEnvVar", null);
 __decorate([
-    (0, common_1.Controller)('ping')
+    Controller('ping')
 ], ConnectController.prototype, "ping", null);

package/service/mcp/connect.service.d.ts

@@ -1,7 +1,9 @@
-import { RequestClientType } from '../common';
-import { RestfulResponse } from '../common/index.dto';
-import { McpOptions } from './client.dto';
-export declare let client: RequestClientType;
+import { RequestClientType } from '../common/index.dto.js';
+import { RestfulResponse } from '../common/index.dto.js';
+import { McpOptions } from './client.dto.js';
+import { PostMessageble } from '../hook/adapter.js';
+export declare const clientMap: Map<string, RequestClientType>;
+export declare function getClient(clientId?: string): RequestClientType | undefined;
 export declare function tryGetRunCommandError(command: string, args?: string[], cwd?: string): string | null;
-export declare function connectService(_client: RequestClientType, option: McpOptions): Promise<RestfulResponse>;
+export declare function connectService(option: McpOptions, webview?: PostMessageble): Promise<RestfulResponse>;
 //# sourceMappingURL=connect.service.d.ts.map

package/service/mcp/connect.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connect.service.d.ts","sourceRoot":"","sources":["../../src/mcp/connect.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE9C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAI1C,eAAO,IAAI,MAAM,EAAE,iBAA6B,CAAC;AAEjD,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,EAAO,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAqBvG;AAED,wBAAsB,cAAc,CAChC,OAAO,EAAE,iBAAiB,EAC1B,MAAM,EAAE,UAAU,GACnB,OAAO,CAAC,eAAe,CAAC,CA0C1B"}
+{"version":3,"file":"connect.service.d.ts","sourceRoot":"","sources":["../../src/mcp/connect.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAK7C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGpD,eAAO,MAAM,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAa,CAAC;AACnE,wBAAgB,SAAS,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS,CAE1E;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,EAAO,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAmBvG;AA8MD,wBAAsB,cAAc,CACnC,MAAM,EAAE,UAAU,EAClB,OAAO,CAAC,EAAE,cAAc,GACtB,OAAO,CAAC,eAAe,CAAC,CAiF1B"}

package/service/mcp/connect.service.js

@@ -1,4 +1,3 @@
-"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,19 +7,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.client = void 0;
-exports.tryGetRunCommandError = tryGetRunCommandError;
-exports.connectService = connectService;
-const node_child_process_1 = require("node:child_process");
-const client_service_1 = require("./client.service");
-// TODO: 更多的 client
-exports.client = undefined;
-function tryGetRunCommandError(command, args = [], cwd) {
+import { exec, execSync, spawnSync } from 'node:child_process';
+import { connect } from './client.service.js';
+import * as crypto from 'node:crypto';
+import path from 'node:path';
+import fs from 'node:fs';
+import * as os from 'os';
+import Table from 'cli-table3';
+export const clientMap = new Map();
+export function getClient(clientId) {
+    return clientMap.get(clientId || '');
+}
+export function tryGetRunCommandError(command, args = [], cwd) {
     try {
-        console.log('current command', command);
-        console.log('current args', args);
-        const result = (0, node_child_process_1.spawnSync)(command, args, {
+        const commandString = command + ' ' + args.join(' ');
+        const result = spawnSync(commandString, {
             cwd: cwd || process.cwd(),
             stdio: 'pipe',
             encoding: 'utf-8'
@@ -37,33 +38,240 @@ function tryGetRunCommandError(command, args = [], cwd) {
         return error instanceof Error ? error.message : String(error);
     }
 }
-function connectService(_client, option) {
+function getCWD(option) {
+    var _a;
+    // if (option.cwd) {
+    // 	return option.cwd;
+    // }
+    const file = (_a = option.args) === null || _a === void 0 ? void 0 : _a.at(-1);
+    if (file) {
+        // 如果是绝对路径，直接返回目录
+        if (path.isAbsolute(file)) {
+            // 如果是是文件，则返回文件所在的目录
+            if (fs.statSync(file).isDirectory()) {
+                return file;
+            }
+            else {
+                return path.dirname(file);
+            }
+        }
+        else {
+            // 如果是相对路径，根据 cwd 获取真实路径
+            const absPath = path.resolve(option.cwd || process.cwd(), file);
+            // 如果是是文件，则返回文件所在的目录
+            if (fs.statSync(absPath).isDirectory()) {
+                return absPath;
+            }
+            else {
+                return path.dirname(absPath);
+            }
+        }
+    }
+    return undefined;
+}
+function getCommandFileExt(option) {
+    var _a;
+    const file = (_a = option.args) === null || _a === void 0 ? void 0 : _a.at(-1);
+    if (file) {
+        return path.extname(file);
+    }
+    return undefined;
+}
+function collectAllOutputExec(command, cwd) {
+    return new Promise((resolve, reject) => {
+        const handler = setTimeout(() => {
+            resolve('');
+        }, 5000);
+        exec(command, { cwd }, (error, stdout, stderr) => {
+            const errorString = error || '';
+            const stdoutString = stdout || '';
+            const stderrString = stderr || '';
+            console.log('[collectAllOutputExec]', errorString);
+            console.log('[collectAllOutputExec]', stdoutString);
+            console.log('[collectAllOutputExec]', stderrString);
+            clearTimeout(handler);
+            resolve(errorString + stdoutString + stderrString);
+        });
+    });
+}
+function preprocessCommand(option, webview) {
     return __awaiter(this, void 0, void 0, function* () {
-        try {
-            console.log('ready to connect', option);
-            // 对于特殊表示的路径，进行特殊的支持
-            if (option.args) {
-                option.args = option.args.map(arg => {
-                    if (arg.startsWith('~/')) {
-                        return arg.replace('~', process.env.HOME || '');
-                    }
-                    return arg;
-                });
+        // 对于特殊表示的路径，进行特殊的支持
+        if (option.args) {
+            option.args = option.args.map(arg => {
+                if (arg.startsWith('~/')) {
+                    return arg.replace('~', process.env.HOME || '');
+                }
+                return arg;
+            });
+        }
+        if (option.cwd && option.cwd.startsWith('~/')) {
+            option.cwd = option.cwd.replace('~', process.env.HOME || '');
+        }
+        if (option.connectionType === 'SSE' || option.connectionType === 'STREAMABLE_HTTP') {
+            return;
+        }
+        const cwd = getCWD(option);
+        if (!cwd) {
+            return;
+        }
+        const ext = getCommandFileExt(option);
+        if (!ext) {
+            return;
+        }
+        // STDIO 模式下，对不同类型的项目进行额外支持
+        // uv：如果没有初始化，则进行 uv sync，将 mcp 设置为虚拟环境的
+        // npm：如果没有初始化，则进行 npm init，将 mcp 设置为虚拟环境
+        // go：如果没有初始化，则进行 go mod init
+        switch (ext) {
+            case '.py':
+                yield initUv(option, cwd, webview);
+                break;
+            case '.js':
+            case '.ts':
+                yield initNpm(option, cwd, webview);
+                break;
+            default:
+                break;
+        }
+    });
+}
+function initUv(option, cwd, webview) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let projectDir = cwd;
+        while (projectDir !== path.dirname(projectDir)) {
+            if (fs.readdirSync(projectDir).includes('pyproject.toml')) {
+                break;
+            }
+            projectDir = path.dirname(projectDir);
+        }
+        const venv = path.join(projectDir, '.venv');
+        // judge by OS
+        const mcpCli = os.platform() === 'win32' ?
+            path.join(venv, 'Scripts', 'mcp.exe') :
+            path.join(venv, 'bin', 'mcp');
+        if (option.command === 'mcp') {
+            option.command = mcpCli;
+            option.cwd = projectDir;
+        }
+        if (fs.existsSync(mcpCli)) {
+            return '';
+        }
+        const syncOutput = yield collectAllOutputExec('uv sync', projectDir);
+        webview === null || webview === void 0 ? void 0 : webview.postMessage({
+            command: 'connect/log',
+            data: {
+                code: syncOutput.toLowerCase().startsWith('error') ? 501 : 200,
+                msg: {
+                    title: 'uv sync',
+                    message: syncOutput
+                }
+            }
+        });
+        const addOutput = yield collectAllOutputExec('uv add mcp "mcp[cli]"', projectDir);
+        webview === null || webview === void 0 ? void 0 : webview.postMessage({
+            command: 'connect/log',
+            data: {
+                code: addOutput.toLowerCase().startsWith('error') ? 501 : 200,
+                msg: {
+                    title: 'uv add mcp "mcp[cli]"',
+                    message: addOutput
+                }
+            }
+        });
+    });
+}
+function initNpm(option, cwd, webview) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let projectDir = cwd;
+        while (projectDir !== path.dirname(projectDir)) {
+            if (fs.readdirSync(projectDir).includes('package.json')) {
+                break;
             }
-            exports.client = yield (0, client_service_1.connect)(option);
+            projectDir = path.dirname(projectDir);
+        }
+        const nodeModulesPath = path.join(projectDir, 'node_modules');
+        if (fs.existsSync(nodeModulesPath)) {
+            return '';
+        }
+        const installOutput = execSync('npm i', { cwd: projectDir }).toString('utf-8') + '\n';
+        webview === null || webview === void 0 ? void 0 : webview.postMessage({
+            command: 'connect/log',
+            data: {
+                code: installOutput.toLowerCase().startsWith('error') ? 200 : 501,
+                msg: {
+                    title: 'npm i',
+                    message: installOutput
+                }
+            }
+        });
+    });
+}
+function deterministicUUID(input) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // 使用Web Crypto API进行哈希
+        const msgBuffer = new TextEncoder().encode(input);
+        const hashBuffer = yield crypto.subtle.digest('SHA-1', msgBuffer);
+        const hashArray = Array.from(new Uint8Array(hashBuffer));
+        const hashHex = hashArray.map(b => b.toString(16).padStart(2, '0')).join('');
+        // 格式化为UUID (版本5)
+        return [
+            hashHex.substring(0, 8),
+            hashHex.substring(8, 4),
+            '5' + hashHex.substring(13, 3), // 设置版本为5
+            '8' + hashHex.substring(17, 3), // 设置变体
+            hashHex.substring(20, 12)
+        ].join('-');
+    });
+}
+export function connectService(option, webview) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        try {
+            // 使用cli-table3创建美观的表格
+            const table = new Table({
+                head: ['Property', 'Value'],
+                colWidths: [20, 60],
+                style: {
+                    head: ['green'],
+                    border: ['grey']
+                }
+            });
+            table.push(['Connection Type', option.connectionType], ['Command', option.command || 'N/A'], ['Arguments', ((_a = option.args) === null || _a === void 0 ? void 0 : _a.join(' ')) || 'N/A'], ['Working Directory', option.cwd || 'N/A'], ['URL', option.url || 'N/A']);
+            console.log(table.toString());
+            // 预处理字符串
+            yield preprocessCommand(option, webview);
+            // 通过 option 字符串进行 hash，得到唯一的 uuid
+            const uuid = yield deterministicUUID(JSON.stringify(option));
+            const reuseConntion = clientMap.has(uuid);
+            // if (!clientMap.has(uuid)) {
+            // 	const client = await connect(option);
+            // 	clientMap.set(uuid, client);
+            // }
+            // const client = clientMap.get(uuid)!;
+            const client = yield connect(option);
+            clientMap.set(uuid, client);
+            const versionInfo = client.getServerVersion();
             const connectResult = {
                 code: 200,
-                msg: 'Connect to OpenMCP successfully\nWelcome back, Kirigaya'
+                msg: {
+                    status: 'success',
+                    clientId: uuid,
+                    reuseConntion,
+                    name: versionInfo === null || versionInfo === void 0 ? void 0 : versionInfo.name,
+                    version: versionInfo === null || versionInfo === void 0 ? void 0 : versionInfo.version
+                }
             };
             return connectResult;
         }
         catch (error) {
+            console.log('[connectService catch error]', error);
             // TODO: 这边获取到的 error 不够精致，如何才能获取到更加精准的错误
             // 比如	error: Failed to spawn: `server.py`
             //		  Caused by: No such file or directory (os error 2)
             let errorMsg = '';
             if (option.command) {
-                errorMsg += tryGetRunCommandError(option.command, option.args, option.cwd);
+                errorMsg += yield collectAllOutputExec(option.command + ' ' + (option.args || []).join(' '), option.cwd || process.cwd());
             }
             errorMsg += error.toString();
             const connectResult = {

package/service/mcp/ocr.controller.d.ts

@@ -1,13 +1,12 @@
-import { RequestClientType } from "../common";
-import { PostMessageble } from "../hook/adapter";
+import { PostMessageble } from "../hook/adapter.js";
 export declare class OcrController {
-    getOcrImage(client: RequestClientType, data: any, webview: PostMessageble): Promise<{
+    getOcrImage(data: any, webview: PostMessageble): Promise<{
         code: number;
         msg: {
             base64String: string | undefined;
         };
     }>;
-    startOcr(client: RequestClientType, data: any, webview: PostMessageble): Promise<{
+    startOcr(data: any, webview: PostMessageble): Promise<{
         code: number;
         msg: {
             filename: string;

package/service/mcp/ocr.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ocr.controller.d.ts","sourceRoot":"","sources":["../../src/mcp/ocr.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAIjD,qBAAa,aAAa;IAEhB,WAAW,CAAC,MAAM,EAAE,iBAAiB,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,cAAc;;;;;;IAazE,QAAQ,CAAC,MAAM,EAAE,iBAAiB,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,cAAc;;;;;;;CAe/E"}
+{"version":3,"file":"ocr.controller.d.ts","sourceRoot":"","sources":["../../src/mcp/ocr.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAIpD,qBAAa,aAAa;IAEhB,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,cAAc;;;;;;IAa9C,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,cAAc;;;;;;;CAepD"}

package/service/mcp/ocr.controller.js

@@ -1,4 +1,3 @@
-"use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -14,16 +13,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OcrController = void 0;
-const common_1 = require("../common");
-const db_1 = require("../hook/db");
-const ocr_service_1 = require("./ocr.service");
-class OcrController {
-    getOcrImage(client, data, webview) {
+import { Controller } from "../common/index.js";
+import { diskStorage } from "../hook/db.js";
+import { createOcrWorker, saveBase64ImageData } from "./ocr.service.js";
+export class OcrController {
+    getOcrImage(data, webview) {
         return __awaiter(this, void 0, void 0, function* () {
             const { filename } = data;
-            const buffer = db_1.diskStorage.getSync(filename);
+            const buffer = diskStorage.getSync(filename);
             const base64String = buffer ? buffer.toString('base64') : undefined;
             return {
                 code: 200,
@@ -33,11 +30,11 @@ class OcrController {
             };
         });
     }
-    startOcr(client, data, webview) {
+    startOcr(data, webview) {
         return __awaiter(this, void 0, void 0, function* () {
             const { base64String, mimeType } = data;
-            const filename = (0, ocr_service_1.saveBase64ImageData)(base64String, mimeType);
-            const worker = (0, ocr_service_1.createOcrWorker)(filename, webview);
+            const filename = saveBase64ImageData(base64String, mimeType);
+            const worker = createOcrWorker(filename, webview);
             return {
                 code: 200,
                 msg: {
@@ -48,10 +45,9 @@ class OcrController {
         });
     }
 }
-exports.OcrController = OcrController;
 __decorate([
-    (0, common_1.Controller)('ocr/get-ocr-image')
+    Controller('ocr/get-ocr-image')
 ], OcrController.prototype, "getOcrImage", null);
 __decorate([
-    (0, common_1.Controller)('ocr/start-ocr')
+    Controller('ocr/start-ocr')
 ], OcrController.prototype, "startOcr", null);

package/service/mcp/ocr.dto.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};