Compare commits

..

8 Commits

Author SHA1 Message Date
23d0ce1d93 update 2025-05-19 04:38:36 +08:00
9b45c272b4 update 2025-05-18 21:05:49 +08:00
c1cad24790 Merge branch 'appli456-chore/cross-platform-script' 2025-05-17 00:49:47 +08:00
e9e9d7e119 merge 2025-05-17 00:49:37 +08:00
lirz
e72b03a995 chore: service模块给electron继续使用原编译方案;修改文档 2025-05-09 09:23:00 +08:00
lirun
7c30463062 chore: lock update 2025-05-09 00:17:07 +08:00
lirz
72248864da chore:turbo config 2025-05-08 22:53:17 +08:00
lirz
86cd49fae6 chore:turbo config 2025-05-08 22:53:03 +08:00
54 changed files with 15893 additions and 11626 deletions

3
.gitignore vendored
View File

@ -13,4 +13,5 @@ resources/ocr/*.js
resources/ocr/*.wasm
resources/renderer
resources/service
*.traineddata
*.traineddata
.turbo

View File

@ -10,7 +10,10 @@
},
// Turn off tsc task auto detection since we have the necessary tasks as npm scripts
"typescript.tsc.autoDetect": "off",
"i18n-haru.root": "renderer/src/i18n",
"i18n-haru.main": "zh"
"i18n-haru.main": "zh",
"i18n-ally.localesPaths": [
"renderer/src/i18n"
]
}

View File

@ -331,6 +331,34 @@
"state": "success",
"serverName": "Huoshan DeepSeek"
}
},
{
"role": "user",
"content": "请将下面的更新日志翻译成 GitHub release 风格的英文说明,请只返回翻译后的结果,不要出现任何多余的前缀: ",
"extraInfo": {
"created": 1747598248965,
"state": "success",
"serverName": "deepseek"
}
},
{
"role": "assistant",
"content": "Heres the translation in GitHub release style:\n\n---\n\n### **New Features**\n- Added support for real-time data synchronization.\n- Introduced a new dashboard for analytics.\n\n### **Improvements**\n- Optimized query performance for large datasets.\n- Enhanced error handling for API requests.\n\n### **Bug Fixes**\n- Fixed an issue where the system crashed on invalid input.\n- Resolved a memory leak in the background service.\n\n### **Breaking Changes**\n- Removed deprecated endpoints (`/v1/old`).\n- Updated the authentication mechanism to use OAuth 2.0.\n\n### **Documentation**\n- Added detailed guides for API integration.\n- Improved inline code comments.",
"extraInfo": {
"created": 1747598260799,
"state": "success",
"serverName": "deepseek",
"usage": {
"prompt_tokens": 7946,
"completion_tokens": 136,
"total_tokens": 8082,
"prompt_tokens_details": {
"cached_tokens": 896
},
"prompt_cache_hit_tokens": 896,
"prompt_cache_miss_tokens": 7050
}
}
}
],
"settings": {

View File

@ -1,8 +1,9 @@
# Change Log
## [main] 0.0.9
- 修复 0.0.8 引入的bugsystem prompt 返回的是索引而非真实内容
-
- 修复 0.0.8 引入的 bugsystem prompt 返回的是索引而非真实内容
- 新特性:支持同时连入多个 mcp server
- 新特性:更新协议内容,支持 streamable http 协议,未来将逐步取代 SSE 的连接方式
## [main] 0.0.8
- 大模型 API 测试时更加完整的报错

View File

@ -145,10 +145,7 @@ B <--mcp--> m(MCP Server)
启动 dev server
```bash
## linux
./dev.sh
## windows
./dev.ps1
npm run dev
```
> 端口占用: 8282 (renderer) + 8081 (service)
@ -163,11 +160,7 @@ B <--mcp--> m(MCP Server)
负载部署
```bash
## linux
./build_service.sh
## windows
./build_service.ps1
npm run build
```
and just press f5, いただきます

View File

@ -1,17 +1,19 @@
# 安装 renderer 依赖
Set-Location renderer
npm i
Set-Location ..
# 安装 service 依赖并打补丁
Set-Location service
npm i
node patch-mcp-sdk.js
Set-Location ..
## 安装 renderer 依赖
#Set-Location renderer
#npm i
#Set-Location ..
#
## 安装 service 依赖并打补丁
#Set-Location service
#npm i
#node patch-mcp-sdk.js
#Set-Location ..
Set-Location servers
uv sync
Set-Location ..
# 安装根目录依赖
npm i
npm i
npm run prepare:ocr

View File

@ -1,5 +1,3 @@
cd renderer && npm i && cd ..
cd service && npm i && cd ..
cd servers && uv sync
cd servers && uv sync && cd ..
npm i
npm run prepare:ocr
npm run prepare:ocr

15563
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -2,7 +2,7 @@
"name": "openmcp",
"displayName": "OpenMCP",
"description": "An all in one MCP Client/TestTool",
"version": "0.0.8",
"version": "0.1.0",
"publisher": "kirigaya",
"author": {
"name": "kirigaya",
@ -212,7 +212,18 @@
]
}
},
"workspaces": [
"service",
"renderer",
"software"
],
"scripts": {
"dev": "turbo dev --filter=!@openmcp/electron",
"dev:electron": "turbo dev --filter=@openmcp/electron",
"dev:all": "turbo dev",
"build": "turbo build --filter=!@openmcp/electron",
"build:electron": "turbo build --filter=@openmcp/electron",
"build:all": "turbo build",
"vscode:prepublish": "webpack --mode production",
"compile": "tsc -p ./",
"watch": "tsc -watch -p ./",
@ -224,6 +235,7 @@
},
"dependencies": {
"@modelcontextprotocol/sdk": "^1.10.2",
"@openmcp/service": "*",
"@seald-io/nedb": "^4.1.1",
"axios": "^1.7.7",
"bson": "^6.8.0",
@ -242,8 +254,10 @@
"fork-ts-checker-webpack-plugin": "^9.1.0",
"null-loader": "^4.0.1",
"ts-loader": "^9.5.1",
"turbo": "^2.5.3",
"typescript": "^5.4.2",
"webpack": "^5.99.5",
"webpack-cli": "^5.1.4"
}
},
"packageManager": "npm@10.0.0"
}

View File

@ -1 +1,2 @@
VITE_USE_AUTH=false
VITE_WEBSOCKET_URL=ws://localhost:8282

View File

@ -1 +1,2 @@
VITE_USE_AUTH=false
VITE_WEBSOCKET_URL=ws://localhost:8282

View File

@ -1,33 +1,18 @@
# test-vite
## dev
This template should help get you started developing with Vue 3 in Vite.
如果想要部署到公网中,想要通过密码认证才能进入,进行如下步骤:
## Recommended IDE Setup
[VSCode](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar) (and disable Vetur).
## Type Support for `.vue` Imports in TS
TypeScript cannot handle type information for `.vue` imports by default, so we replace the `tsc` CLI with `vue-tsc` for type checking. In editors, we need [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar) to make the TypeScript language service aware of `.vue` types.
## Customize configuration
See [Vite Configuration Reference](https://vite.dev/config/).
## Project Setup
```sh
npm install
```bash
touch .env.website.local
```
### Compile and Hot-Reload for Development
写入:
```sh
npm run dev
```toml
VITE_USE_AUTH=true
VITE_WEBSOCKET_URL=wss://<IP>/<路径>
```
### Type-Check, Compile and Minify for Production
使用 `npm run serve:website` 进行测试(服务端使用 ts-node src/server.ts
```sh
npm run build
```
使用 `npm run build:website` 进行打包

View File

@ -1,9 +1,12 @@
{
"name": "test-vite",
"version": "0.0.0",
"name": "@openmcp/renderer",
"version": "0.1.0",
"private": true,
"type": "module",
"scripts": {
"dev": "vite",
"postbuild": "node scripts/post-build.mjs",
"lint": "vue-cli-service lint",
"serve": "vite",
"serve:website": "vite --mode website",
"build": "run-p type-check \"build-only {@}\" --",

Binary file not shown.

View File

@ -0,0 +1,43 @@
import fsPath from 'node:path';
import fs from 'node:fs';
import * as process from "node:process";
function createDirIfExists(filePath) {
if (!fs.existsSync(filePath)) {
fs.mkdirSync(filePath, { recursive: true })
}
}
function recreateDir(filePath) {
if (fs.existsSync(filePath)) {
fs.rmSync(filePath, { recursive: true, force: true });
}
fs.mkdirSync(filePath, { recursive: true });
}
const currentDir = process.cwd();
// 确保上级目录的 openmcp-sdk 存在
const openMCPSdkPath = fsPath.join(currentDir, '..', 'openmcp-sdk')
createDirIfExists(openMCPSdkPath);
const sdkRenderPath = fsPath.join(openMCPSdkPath, 'renderer');
recreateDir(sdkRenderPath);
const sourceDist = fsPath.join(currentDir, 'dist');
// 如果源目录不存在则报错
if (!fs.existsSync(sourceDist)) {
throw new Error(`Source directory not found: ${sourceDist}`)
}
fs.cpSync(sourceDist, sdkRenderPath, { recursive: true })
// electron目录
const electronOpenMcpSdkPath = fsPath.join(currentDir, '..', 'software', 'openmcp-sdk');
createDirIfExists(electronOpenMcpSdkPath);
const electronRendererPath = fsPath.join(electronOpenMcpSdkPath, 'renderer');
recreateDir(electronRendererPath);
fs.cpSync(sourceDist, electronRendererPath, { recursive: true })

View File

@ -4,7 +4,7 @@
<MainPanel></MainPanel>
<Tour v-if="!userHasReadGuide"/>
<PasswordDialog v-if="password"/>
<PasswordDialog v-if="useAuth"/>
</div>
</template>
@ -37,8 +37,8 @@ bridge.addCommandListener('hello', data => {
const route = useRoute();
const router = useRouter();
const password = Boolean(import.meta.env.VITE_USE_PASSWORD);
privilegeStatus.allow = !Boolean(password);
const useAuth = Boolean(import.meta.env.VITE_USE_AUTH);
privilegeStatus.allow = !Boolean(useAuth);
onMounted(async () => {
// css

View File

@ -7,9 +7,9 @@ export interface VSCodeMessage {
callbackId?: string;
}
export interface RestFulResponse {
export interface RestFulResponse<T = any> {
code: number;
msg: any;
msg: T;
}
export type MessageHandler = (message: VSCodeMessage) => void;
@ -19,6 +19,11 @@ interface AddCommandListenerOption {
once: boolean // 只调用一次就销毁
}
export interface ICommandRequestData {
clientId?: string;
[key: string]: any;
}
export class MessageBridge {
private ws: WebSocket | null = null;
private handlers = new Map<string, Set<CommandHandler>>();
@ -206,7 +211,7 @@ export class MessageBridge {
* @param data
* @returns
*/
public commandRequest(command: string, data?: any) {
public commandRequest<T = any>(command: string, data?: ICommandRequestData): Promise<RestFulResponse<T>> {
return new Promise<RestFulResponse>((resolve, reject) => {
this.addCommandListener(command, (data) => {
resolve(data as RestFulResponse);

View File

@ -3,6 +3,7 @@ import { pinkLog } from "@/views/setting/util";
import { debugModes, tabs } from "@/components/main-panel/panel";
import { markRaw, ref, nextTick } from "vue";
import { v4 as uuidv4 } from 'uuid';
import type { McpClient } from "@/views/connect/connection-item";
interface SaveTabItem {
name: string;
@ -12,64 +13,55 @@ interface SaveTabItem {
storage: Record<string, any>;
}
interface SaveTab {
export interface SaveTab {
tabs: SaveTabItem[]
currentIndex: number
}
export const panelLoaded = ref(false);
export function loadPanels() {
return new Promise((resolve, reject) => {
const bridge = useMessageBridge();
bridge.addCommandListener('panel/load', data => {
if (data.code !== 200) {
pinkLog('tabs 加载失败');
console.log(data.msg);
} else {
const persistTab = data.msg as SaveTab;
pinkLog('tabs 加载成功');
if (persistTab.tabs.length === 0) {
// 空的,直接返回不需要管
panelLoaded.value = true;
resolve(void 0);
return;
}
tabs.activeIndex = 0;
tabs.content = [];
for (const tab of persistTab.tabs || []) {
const component = tab.componentIndex >= 0? markRaw(debugModes[tab.componentIndex]) : undefined;
tabs.content.push({
id: uuidv4(),
name: tab.name,
icon: tab.icon,
type: tab.type,
componentIndex: tab.componentIndex,
component: component,
storage: tab.storage
});
}
tabs.activeIndex = persistTab.currentIndex;
}
panelLoaded.value = true;
resolve(void 0);
}, { once: true });
bridge.postMessage({
command: 'panel/load'
});
export async function loadPanels(client: McpClient) {
const bridge = useMessageBridge();
const { code, msg } = await bridge.commandRequest<SaveTab>('panel/load', {
clientId: client.clientId
});
if (code !== 200) {
pinkLog('tabs 加载失败');
console.log(msg);
} else {
const persistTab = msg;
pinkLog('tabs 加载成功');
if (persistTab.tabs.length === 0) {
// 空的,直接返回不需要管
panelLoaded.value = true;
return;
}
tabs.activeIndex = 0;
tabs.content = [];
for (const tab of persistTab.tabs || []) {
const component = tab.componentIndex >= 0? markRaw(debugModes[tab.componentIndex]) : undefined;
tabs.content.push({
id: uuidv4(),
name: tab.name,
icon: tab.icon,
type: tab.type,
componentIndex: tab.componentIndex,
component: component,
storage: tab.storage
});
}
tabs.activeIndex = persistTab.currentIndex;
}
panelLoaded.value = true;
}
let debounceHandler: NodeJS.Timeout;

View File

@ -149,7 +149,7 @@ export type APIRequest =
| ToolCallRequest;
export interface IStdioConnectionItem {
type: 'stdio';
type: 'STDIO';
name: string;
command: string;
args: string[];
@ -159,7 +159,7 @@ export interface IStdioConnectionItem {
}
export interface ISSEConnectionItem {
type: 'sse';
type: 'SSE';
name: string;
url: string;
oauth?: string;
@ -169,13 +169,13 @@ export interface ISSEConnectionItem {
export interface IStdioLaunchSignature {
type: 'stdio';
type: 'STDIO';
commandString: string;
cwd: string;
}
export interface ISSELaunchSignature {
type:'sse';
type:'SSE';
url: string;
oauth: string;
}

View File

@ -25,10 +25,10 @@
<span>{{ t('connect-sigature') }}</span>
<span style="width: 310px;">
<el-form :model="connectionArgs" :rules="rules" ref="urlForm">
<el-form-item prop="urlString">
<el-form-item prop="url">
<div class="input-with-label">
<span class="input-label">URL</span>
<el-input v-model="connectionArgs.urlString" placeholder="http://"></el-input>
<el-input v-model="connectionArgs.url" placeholder="http://"></el-input>
</div>
</el-form-item>
<el-form-item prop="oauth">
@ -65,7 +65,7 @@ const rules = reactive<FormRules>({
oauth: [
{ required: false, trigger: 'blur' }
],
urlString: [
url: [
{ required: true, message: 'URL不能为空', trigger: 'blur' }
]
})

View File

@ -0,0 +1,286 @@
import { useMessageBridge } from "@/api/message-bridge";
import { reactive, type Reactive } from "vue";
import type { IConnectionResult, ConnectionTypeOptionItem, IConnectionArgs, IConnectionEnvironment, McpOptions } from "./type";
import { ElMessage } from "element-plus";
import { loadPanels, type SaveTab } from "@/hook/panel";
import { getPlatform } from "@/api/platform";
export const connectionSelectDataViewOption: ConnectionTypeOptionItem[] = [
{
value: 'STDIO',
label: 'STDIO'
},
{
value: 'SSE',
label: 'SSE'
},
{
value: 'STREAMABLE_HTTP',
label: 'STREAMABLE_HTTP'
}
]
export async function getLaunchSignature(platform: string): Promise<IConnectionArgs[]> {
const bridge = useMessageBridge();
const { code, msg } = await bridge.commandRequest(platform + '/launch-signature');
if (code !== 200) {
const message = msg.toString();
ElMessage.error(message);
return [];
}
// 判断一下版本,新版本的 msg 应该是数组,老版本是对象
// 返回的数组的第一个为主节点,其余为从节点
if (Array.isArray(msg)) {
return msg;
}
return [msg];
}
export class McpClient {
public connectionArgs: Reactive<IConnectionArgs>;
public connectionResult: Reactive<IConnectionResult>;
public presetsEnvironment: string[] = ['HOME', 'LOGNAME', 'PATH', 'SHELL', 'TERM', 'USER'];
public connectionEnvironment: Reactive<IConnectionEnvironment>;
constructor(
public clientVersion: string = '0.0.1',
public clientNamePrefix: string = 'openmcp.connect'
) {
// 连接入参
this.connectionArgs = reactive({
type: 'STDIO',
commandString: '',
cwd: '',
url: '',
oauth: ''
});
// 连接出参
this.connectionResult = reactive({
success: false,
status: 'disconnected',
clientId: '',
name: '',
version: '',
logString: []
});
// 环境变量
this.connectionEnvironment = reactive({
data: [],
newKey: '',
newValue: ''
});
}
async acquireConnectionSignature(args: IConnectionArgs) {
this.connectionArgs.type = args.type;
this.connectionArgs.commandString = args.commandString || '';
this.connectionArgs.cwd = args.cwd || '';
this.connectionArgs.url = args.url || '';
this.connectionArgs.oauth = args.oauth || '';
}
get clientId() {
return this.connectionResult.clientId;
}
get name() {
return this.connectionResult.name;
}
get version() {
return this.connectionResult.version;
}
get status() {
return this.connectionResult.status;
}
get connected() {
return this.connectionResult.success;
}
get env() {
const env = {} as Record<string, string>;
this.connectionEnvironment.data.forEach(item => {
env[item.key] = item.value;
});
return env;
}
private get commandAndArgs() {
const commandString = this.connectionArgs.commandString;
if (!commandString) {
return { command: '', args: [] };
}
const args = commandString.split(' ');
const command = args.shift() || '';
return { command, args };
}
get connectOption() {
const { command, args } = this.commandAndArgs;
const env = this.env;
const url = this.connectionArgs.url;
const oauth = this.connectionArgs.oauth;
const connectionType = this.connectionArgs.type;
const clientName = this.clientNamePrefix + '.' + this.connectionArgs.type;
const clientVersion = this.clientVersion;
const option: McpOptions = {
connectionType,
command,
args,
url,
oauth,
clientName,
clientVersion,
env,
serverInfo: {
name: this.connectionResult.name,
version: this.connectionResult.version
}
};
return option;
}
public async connect(platform: string) {
const bridge = useMessageBridge();
const { code, msg } = await bridge.commandRequest<IConnectionResult>('connect', this.connectOption);
this.connectionResult.success = (code === 200);
if (code !== 200) {
const message = msg.toString();
this.connectionResult.logString.push({
type: 'error',
message
});
ElMessage.error(message);
return;
}
this.connectionResult.status = msg.status;
this.connectionResult.clientId = msg.clientId;
this.connectionResult.name = msg.name;
this.connectionResult.version = msg.version;
// 同步成功的连接参数到后端,更新 vscode treeview 中的列表
const deserializeOption = JSON.parse(JSON.stringify(this.connectOption));
bridge.postMessage({
command: platform + '/update-connection-sigature',
data: deserializeOption
});
}
/**
* @description
* -
* -
* @param enabled
*/
public async handleEnvSwitch(enabled: boolean) {
const presetVars = this.presetsEnvironment;
if (enabled) {
const values = await this.lookupEnvVar(presetVars);
if (values) {
// 将 key values 合并进 connectionEnv.data 中
// 若已有相同的 key, 则替换 value
for (let i = 0; i < presetVars.length; i++) {
const key = presetVars[i];
const value = values[i];
const sameNameItems = this.connectionEnvironment.data.filter(item => item.key === key);
if (sameNameItems.length > 0) {
const conflictItem = sameNameItems[0];
conflictItem.value = value;
} else {
this.connectionEnvironment.data.push({
key: key, value: value
});
}
}
}
} else {
// 清空 connectionEnv.data 中所有 key 为 presetVars 的项
const reserveItems = this.connectionEnvironment.data.filter(item => !presetVars.includes(item.key));
this.connectionEnvironment.data = reserveItems;
}
}
/**
* @description
* @param varNames
* @returns
*/
public async lookupEnvVar(varNames: string[]) {
const bridge = useMessageBridge();
const { code, msg } = await bridge.commandRequest('lookup-env-var', { keys: varNames });
if (code === 200) {
this.connectionResult.logString.push({
type: 'info',
message: '预设环境变量同步完成'
});
return msg;
} else {
this.connectionResult.logString.push({
type: 'error',
message: '预设环境变量同步失败: ' + msg
});
}
}
}
class McpClientAdapter {
public clients: McpClient[] = [];
constructor(
public platform: string
) {}
public async launch() {
const launchSignature = await getLaunchSignature(this.platform);
for (const item of launchSignature) {
const client = new McpClient();
// 同步连接参数
await client.acquireConnectionSignature(item);
// 同步环境变量
await client.handleEnvSwitch(true);
// 连接
await client.connect(this.platform);
this.clients.push(client);
}
}
public async loadPanels() {
const masterNode = this.clients[0];
await loadPanels(masterNode);
}
}
const platform = getPlatform();
export const mcpClientAdapter = new McpClientAdapter(platform);

View File

@ -1,383 +0,0 @@
import { useMessageBridge } from '@/api/message-bridge';
import { reactive, ref } from 'vue';
import { pinkLog } from '../setting/util';
import { ElLoading, ElMessage } from 'element-plus';
import { getPlatform, type OpenMcpSupportPlatform } from '@/api/platform';
import { getTour, loadSetting } from '@/hook/setting';
import { loadPanels } from '@/hook/panel';
export const connectionMethods = reactive({
current: 'STDIO',
data: [
{
value: 'STDIO',
label: 'STDIO'
},
{
value: 'SSE',
label: 'SSE'
}
]
});
export const connectionSettingRef = ref<any>(null);
export const connectionLogRef = ref<any>(null);
export const connectionArgs = reactive({
commandString: '',
cwd: '',
oauth: '',
urlString: ''
});
export interface EnvItem {
key: string
value: string
}
export interface IConnectionEnv {
data: EnvItem[]
newKey: string
newValue: string
}
export const connectionEnv = reactive<IConnectionEnv>({
data: [],
newKey: '',
newValue: ''
});
export function makeEnv() {
const env = {} as Record<string, string>;
connectionEnv.data.forEach(item => {
env[item.key] = item.value;
});
return env;
}
// 定义连接类型
type ConnectionType = 'STDIO' | 'SSE';
// 定义命令行参数接口
export interface McpOptions {
connectionType: ConnectionType;
// STDIO 特定选项
command?: string;
args?: string[];
cwd?: string;
env?: Record<string, string>;
// SSE 特定选项
url?: string;
// 通用客户端选项
clientName?: string;
clientVersion?: string;
}
export async function doConnect(
option: {
namespace: OpenMcpSupportPlatform
updateCommandString?: boolean
}
) {
const {
// updateCommandString 为 true 代表是初始化阶段
namespace,
updateCommandString = true
} = option;
if (updateCommandString) {
pinkLog('请求启动参数');
const connectionItem = await getLaunchSignature(namespace + '/launch-signature');
if (connectionItem.type ==='stdio') {
connectionMethods.current = 'STDIO';
connectionArgs.commandString = connectionItem.commandString;
connectionArgs.cwd = connectionItem.cwd;
if (connectionArgs.commandString.length === 0) {
return;
}
} else {
connectionMethods.current = 'SSE';
connectionArgs.urlString = connectionItem.url || '';
if (connectionArgs.urlString.length === 0) {
return;
}
}
}
if (connectionMethods.current === 'STDIO') {
await launchStdio(namespace);
} else {
await launchSSE(namespace);
}
}
async function launchStdio(namespace: string) {
const bridge = useMessageBridge();
const env = makeEnv();
const commandComponents = connectionArgs.commandString.split(/\s+/g);
const command = commandComponents[0];
commandComponents.shift();
const connectOption = {
connectionType: 'STDIO',
command: command,
args: commandComponents,
cwd: connectionArgs.cwd,
clientName: 'openmcp.connect.stdio',
clientVersion: '0.0.1',
env
};
const { code, msg } = await bridge.commandRequest('connect', connectOption);
connectionResult.success = (code === 200);
if (code === 200) {
connectionResult.logString.push({
type: 'info',
message: msg
});
const res = await getServerVersion() as { name: string, version: string };
connectionResult.serverInfo.name = res.name || '';
connectionResult.serverInfo.version = res.version || '';
// 同步信息到 vscode
const commandComponents = connectionArgs.commandString.split(/\s+/g);
const command = commandComponents[0];
commandComponents.shift();
const clientStdioConnectionItem = {
serverInfo: connectionResult.serverInfo,
connectionType: 'STDIO',
name: 'openmcp.connect.stdio',
command: command,
args: commandComponents,
cwd: connectionArgs.cwd,
env
};
bridge.postMessage({
command: namespace + '/update-connection-sigature',
data: JSON.parse(JSON.stringify(clientStdioConnectionItem))
});
} else {
connectionResult.logString.push({
type: 'error',
message: msg
});
ElMessage.error(msg);
}
}
async function launchSSE(namespace: string) {
const bridge = useMessageBridge();
const env = makeEnv();
const connectOption: McpOptions = {
connectionType: 'SSE',
url: connectionArgs.urlString,
clientName: 'openmcp.connect.sse',
clientVersion: '0.0.1',
env
};
const { code, msg } = await bridge.commandRequest('connect', connectOption);
connectionResult.success = (code === 200);
if (code === 200) {
connectionResult.logString.push({
type: 'info',
message: msg
});
const res = await getServerVersion() as { name: string, version: string };
connectionResult.serverInfo.name = res.name || '';
connectionResult.serverInfo.version = res.version || '';
// 同步信息到 vscode
const clientSseConnectionItem = {
serverInfo: connectionResult.serverInfo,
connectionType: 'SSE',
name: 'openmcp.connect.sse',
url: connectionArgs.urlString,
oauth: connectionArgs.oauth,
env: env
};
bridge.postMessage({
command: namespace + '/update-connection-sigature',
data: JSON.parse(JSON.stringify(clientSseConnectionItem))
});
} else {
connectionResult.logString.push({
type: 'error',
message: msg
});
ElMessage.error(msg);
}
}
async function getLaunchSignature(signatureName: string) {
const bridge = useMessageBridge();
const { code, msg } = await bridge.commandRequest(signatureName);
return msg;
}
export function doReconnect() {
// TODO: finish this
console.log();
}
export const connectionResult = reactive<{
success: boolean,
logString: { type: 'info' | 'error' | 'warning', message: string }[],
serverInfo: {
name: string,
version: string
}
}>({
success: false,
logString: [],
serverInfo: {
name: '',
version: ''
}
});
export function getServerVersion() {
return new Promise((resolve, reject) => {
const bridge = useMessageBridge();
bridge.addCommandListener('server/version', data => {
if (data.code === 200) {
resolve(data.msg);
} else {
reject(data.msg);
}
}, { once: true });
bridge.postMessage({
command: 'server/version',
});
});
}
export const envVarStatus = {
launched: false
};
function lookupEnvVar(varNames: string[]) {
const bridge = useMessageBridge();
return new Promise<string[] | undefined>((resolve, reject) => {
bridge.addCommandListener('lookup-env-var', data => {
const { code, msg } = data;
if (code === 200) {
connectionResult.logString.push({
type: 'info',
message: '预设环境变量同步完成'
});
resolve(msg);
} else {
connectionResult.logString.push({
type: 'error',
message: '预设环境变量同步失败: ' + msg
});
resolve(undefined);
}
}, { once: true });
console.log(varNames);
bridge.postMessage({
command: 'lookup-env-var',
data: {
keys: varNames
}
})
});
}
export async function handleEnvSwitch(enabled: boolean) {
const presetVars = ['HOME', 'LOGNAME', 'PATH', 'SHELL', 'TERM', 'USER'];
if (enabled) {
const values = await lookupEnvVar(presetVars);
if (values) {
// 将 key values 合并进 connectionEnv.data 中
// 若已有相同的 key, 则替换 value
for (let i = 0; i < presetVars.length; i++) {
const key = presetVars[i];
const value = values[i];
const sameNameItems = connectionEnv.data.filter(item => item.key === key);
if (sameNameItems.length > 0) {
const conflictItem = sameNameItems[0];
conflictItem.value = value;
} else {
connectionEnv.data.push({
key: key, value: value
});
}
}
}
} else {
// 清空 connectionEnv.data 中所有 key 为 presetVars 的项
const reserveItems = connectionEnv.data.filter(item => !presetVars.includes(item.key));
connectionEnv.data = reserveItems;
}
}
export async function loadEnvVar() {
return await handleEnvSwitch(true);
}
export async function initialise() {
pinkLog('准备请求设置');
const loading = ElLoading.service({
fullscreen: true,
lock: true,
text: 'Loading',
background: 'rgba(0, 0, 0, 0.7)'
});
const platform = getPlatform();
// 加载全局设置
loadSetting();
// 设置环境变量
await loadEnvVar();
// 获取引导状态
await getTour();
// 尝试进行初始化连接
await doConnect({
namespace: platform,
updateCommandString: true
});
// loading panels
await loadPanels();
loading.close();
}

View File

@ -44,7 +44,6 @@
<script setup lang="ts">
import { defineComponent, ref } from 'vue';
import { useI18n } from 'vue-i18n';
import { connectionEnv, type EnvItem, handleEnvSwitch } from './connection';
defineComponent({ name: 'env-var' });

View File

@ -0,0 +1,30 @@
import { getTour, loadSetting } from "@/hook/setting";
import { ElLoading } from "element-plus";
import { pinkLog } from "../setting/util";
import { mcpClientAdapter } from "./connection-item";
export async function initialise() {
pinkLog('准备请求设置');
const loading = ElLoading.service({
fullscreen: true,
lock: true,
text: 'Loading',
background: 'rgba(0, 0, 0, 0.7)'
});
// 加载全局设置
loadSetting();
// 获取引导状态
await getTour();
// 尝试进行初始化连接
await mcpClientAdapter.launch();
// loading panels
await mcpClientAdapter.loadPanels();
loading.close();
}

View File

@ -0,0 +1,80 @@
export type ConnectionType = 'STDIO' | 'SSE' | 'STREAMABLE_HTTP';
export interface ConnectionTypeOptionItem {
value: ConnectionType;
label: string;
}
export interface IConnectionArgs {
type: ConnectionType;
commandString?: string;
cwd?: string;
url?: string;
oauth?: string;
}
export interface IConnectionResult {
success: boolean;
status: string
clientId: string
name: string
version: string
logString: {
type: 'info' | 'error' | 'warning',
message: string
}[]
}
export interface McpOptions {
connectionType: ConnectionType;
command?: string;
// STDIO 特定选项
args?: string[];
cwd?: string;
env?: Record<string, string>;
// SSE 特定选项
url?: string;
oauth?: any;
// 通用客户端选项
clientName?: string;
clientVersion?: string;
serverInfo: {
name: string
version: string
}
}
export interface EnvItem {
key: string
value: string
}
export interface IConnectionEnvironment {
data: EnvItem[]
newKey: string
newValue: string
}
export interface IConnectionArgs {
type: ConnectionType;
commandString?: string;
cwd?: string;
url?: string;
oauth?: string;
}
export interface ConnectionResult {
status: string
clientId: string
name: string
version: string
}

10
servers/uv.lock generated
View File

@ -175,10 +175,10 @@ wheels = [
]
[[package]]
name = "httpx-sse"
name = "httpx-SSE"
version = "0.4.0"
source = { registry = "https://pypi.org/simple" }
sdist = { url = "https://files.pythonhosted.org/packages/4c/60/8f4281fa9bbf3c8034fd54c0e7412e66edbab6bc74c4996bd616f8d0406e/httpx-sse-0.4.0.tar.gz", hash = "sha256:1e81a3a3070ce322add1d3529ed42eb5f70817f45ed6ec915ab753f961139721", size = 12624 }
sdist = { url = "https://files.pythonhosted.org/packages/4c/60/8f4281fa9bbf3c8034fd54c0e7412e66edbab6bc74c4996bd616f8d0406e/httpx-SSE-0.4.0.tar.gz", hash = "sha256:1e81a3a3070ce322add1d3529ed42eb5f70817f45ed6ec915ab753f961139721", size = 12624 }
wheels = [
{ url = "https://files.pythonhosted.org/packages/e1/9b/a181f281f65d776426002f330c31849b86b31fc9d848db62e16f03ff739f/httpx_sse-0.4.0-py3-none-any.whl", hash = "sha256:f329af6eae57eaa2bdfd962b42524764af68075ea87370a2de920af5341e318f", size = 7819 },
]
@ -258,10 +258,10 @@ source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "anyio" },
{ name = "httpx" },
{ name = "httpx-sse" },
{ name = "httpx-SSE" },
{ name = "pydantic" },
{ name = "pydantic-settings" },
{ name = "sse-starlette" },
{ name = "SSE-starlette" },
{ name = "starlette" },
{ name = "uvicorn" },
]
@ -477,7 +477,7 @@ wheels = [
]
[[package]]
name = "sse-starlette"
name = "SSE-starlette"
version = "2.2.1"
source = { registry = "https://pypi.org/simple" }
dependencies = [

5023
service/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,13 +1,16 @@
{
"name": "openmcp-service",
"name": "@openmcp/service",
"version": "0.0.1",
"description": "",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"type": "commonjs",
"scripts": {
"serve": "ts-node-dev --respawn --transpile-only src/main.ts",
"postinstall": "npm run build",
"dev": "ts-node-dev --respawn --transpile-only src/main.ts",
"build": "tsc",
"build:watch": "tsc --watch",
"postbuild": "node ./scripts/post-build.mjs",
"start": "node dist/main.js",
"start:prod": "NODE_ENV=production node dist/main.js",
"debug": "node --inspect -r ts-node/register src/main.ts",

View File

@ -0,0 +1,33 @@
import fs from "node:fs";
import process from "node:process";
import fsPath from "node:path";
function createDirIfExists(filePath) {
if (!fs.existsSync(filePath)) {
fs.mkdirSync(filePath, { recursive: true })
}
}
function recreateDir(filePath) {
if (fs.existsSync(filePath)) {
fs.rmSync(filePath, { recursive: true, force: true });
}
fs.mkdirSync(filePath, { recursive: true });
}
const currentDir = process.cwd();
const sourceDist = fsPath.join(currentDir, 'dist');
// 如果源目录不存在则报错
if (!fs.existsSync(sourceDist)) {
throw new Error(`Source directory not found: ${sourceDist}`)
}
// electron目录
const electronOpenMcpSdkPath = fsPath.join(currentDir, '..', 'software', 'openmcp-sdk');
createDirIfExists(electronOpenMcpSdkPath);
const electronServicePath = fsPath.join(electronOpenMcpSdkPath, 'service');
recreateDir(electronServicePath);
fs.cpSync(sourceDist, electronServicePath, { recursive: true })

View File

@ -3,9 +3,13 @@ import { McpClient } from "../mcp/client.service";
export type RequestClientType = McpClient | undefined;
export interface RequestData {
clientId?: string;
[key: string]: any;
}
export type RequestHandler<T, R> = (
client: RequestClientType,
data: T,
data: T & RequestData,
webview: PostMessageble
) => Promise<R>;

View File

@ -3,7 +3,6 @@ import type { PostMessageble } from "../hook/adapter";
import { LlmController } from "../llm/llm.controller";
import { ClientController } from "../mcp/client.controller";
import { ConnectController } from "../mcp/connect.controller";
import { client } from "../mcp/connect.service";
import { OcrController } from "../mcp/ocr.controller";
import { PanelController } from "../panel/panel.controller";
import { SettingController } from "../setting/setting.controller";
@ -24,7 +23,7 @@ export async function routeMessage(command: string, data: any, webview: PostMess
try {
// TODO: select client based on something
const res = await handler(client, data, webview);
const res = await handler(data, webview);
// res.code = -1 代表当前请求不需要返回发送
if (res.code >= 0) {

View File

@ -2,7 +2,7 @@ import { WebSocket } from 'ws';
import { EventEmitter } from 'events';
import { routeMessage } from '../common/router';
import { McpOptions } from '../mcp/client.dto';
import { client, connectService } from '../mcp/connect.service';
import { clientMap, connectService } from '../mcp/connect.service';
// WebSocket 消息格式
export interface WebSocketMessage {
@ -114,9 +114,12 @@ export class TaskLoopAdapter {
* @param mcpOption
*/
public async connectMcpServer(mcpOption: McpOptions) {
const res = await connectService(undefined, mcpOption);
const res = await connectService(mcpOption);
if (res.code === 200) {
console.log('✅ 成功连接 mcp 服务器: ' + res.msg);
const uuid = res.msg.uuid;
const client = clientMap.get(uuid);
const version = client?.getServerVersion();
console.log(version);
} else {
@ -129,14 +132,19 @@ export class TaskLoopAdapter {
* @returns
*/
public async listTools() {
const tools = await client?.listTools();
if (tools?.tools) {
return tools.tools.map((tool) => {
const enabledTools = { ...tool, enabled: true };
return enabledTools;
});
const tools = [];
for (const client of clientMap.values()) {
const clientTools = await client?.listTools();
if (clientTools?.tools) {
const enabledTools = clientTools.tools.map((tool) => {
const enabledTools = {...tool, enabled: true };
return enabledTools;
});
tools.push(...enabledTools);
}
}
return [];
return tools;
}
}

View File

@ -1,13 +1,17 @@
import { Controller, RequestClientType } from "../common";
import { RequestData } from "../common/index.dto";
import { PostMessageble } from "../hook/adapter";
import { getClient } from "../mcp/connect.service";
import { abortMessageService, streamingChatCompletion } from "./llm.service";
export class LlmController {
@Controller('llm/chat/completions')
async chatCompletion(client: RequestClientType, data: any, webview: PostMessageble) {
async chatCompletion(data: RequestData, webview: PostMessageble) {
let { tools = [] } = data;
const client = getClient(data.clientId);
if (tools.length > 0 && !client) {
return {
code: 501,
@ -37,7 +41,7 @@ export class LlmController {
}
@Controller('llm/chat/completions/abort')
async abortChatCompletion(client: RequestClientType, data: any, webview: PostMessageble) {
async abortChatCompletion(data: RequestData, webview: PostMessageble) {
return abortMessageService(data, webview);
}

View File

@ -28,13 +28,13 @@ const logger = pino({
export type MessageHandler = (message: VSCodeMessage) => void;
interface IStdioLaunchSignature {
type: 'stdio';
type: 'STDIO';
commandString: string;
cwd: string;
}
interface ISSELaunchSignature {
type:'sse';
type:'SSE';
url: string;
oauth: string;
}
@ -43,7 +43,7 @@ export type ILaunchSigature = IStdioLaunchSignature | ISSELaunchSignature;
function refreshConnectionOption(envPath: string) {
const defaultOption = {
type:'stdio',
type:'STDIO',
command: 'mcp',
args: ['run', 'main.py'],
cwd: '../server'
@ -76,7 +76,7 @@ function updateConnectionOption(data: any) {
if (data.connectionType === 'STDIO') {
const connectionItem = {
type: 'stdio',
type: 'STDIO',
command: data.command,
args: data.args,
cwd: data.cwd.replace(/\\/g, '/')
@ -85,7 +85,7 @@ function updateConnectionOption(data: any) {
fs.writeFileSync(envPath, JSON.stringify(connectionItem, null, 4));
} else {
const connectionItem = {
type: 'sse',
type: 'SSE',
url: data.url,
oauth: data.oauth
};
@ -124,14 +124,14 @@ wss.on('connection', (ws: any) => {
switch (command) {
case 'web/launch-signature':
const launchResultMessage: ILaunchSigature = option.type === 'stdio' ?
const launchResultMessage: ILaunchSigature = option.type === 'STDIO' ?
{
type: 'stdio',
type: 'STDIO',
commandString: option.command + ' ' + option.args.join(' '),
cwd: option.cwd || ''
} :
{
type: 'sse',
type: 'SSE',
url: option.url,
oauth: option.oauth || ''
};

View File

@ -1,11 +1,14 @@
import { Controller, RequestClientType } from "../common";
import { Controller } from "../common";
import { RequestData } from "../common/index.dto";
import { PostMessageble } from "../hook/adapter";
import { postProcessMcpToolcallResponse } from "./client.service";
import { getClient } from "./connect.service";
export class ClientController {
@Controller('server/version')
async getServerVersion(client: RequestClientType, data: any, webview: PostMessageble) {
async getServerVersion(data: RequestData, webview: PostMessageble) {
const client = getClient(data.clientId);
if (!client) {
return {
code: 501,
@ -21,7 +24,8 @@ export class ClientController {
}
@Controller('prompts/list')
async listPrompts(client: RequestClientType, data: any, webview: PostMessageble) {
async listPrompts(data: RequestData, webview: PostMessageble) {
const client = getClient(data.clientId);
if (!client) {
const connectResult = {
code: 501,
@ -39,7 +43,8 @@ export class ClientController {
}
@Controller('prompts/get')
async getPrompt(client: RequestClientType, option: any, webview: PostMessageble) {
async getPrompt(data: RequestData, webview: PostMessageble) {
const client = getClient(data.clientId);
if (!client) {
return {
code: 501,
@ -47,7 +52,7 @@ export class ClientController {
};
}
const prompt = await client.getPrompt(option.promptId, option.args || {});
const prompt = await client.getPrompt(data.promptId, data.args || {});
return {
code: 200,
msg: prompt
@ -55,7 +60,8 @@ export class ClientController {
}
@Controller('resources/list')
async listResources(client: RequestClientType, data: any, webview: PostMessageble) {
async listResources(data: RequestData, webview: PostMessageble) {
const client = getClient(data.clientId);
if (!client) {
return {
code: 501,
@ -71,8 +77,8 @@ export class ClientController {
}
@Controller('resources/templates/list')
async listResourceTemplates(client: RequestClientType, data: any, webview: PostMessageble) {
async listResourceTemplates(data: RequestData, webview: PostMessageble) {
const client = getClient(data.clientId);
if (!client) {
return {
code: 501,
@ -88,7 +94,8 @@ export class ClientController {
}
@Controller('resources/read')
async readResource(client: RequestClientType, option: any, webview: PostMessageble) {
async readResource(data: RequestData, webview: PostMessageble) {
const client = getClient(data.clientId);
if (!client) {
return {
code: 501,
@ -96,7 +103,7 @@ export class ClientController {
};
}
const resource = await client.readResource(option.resourceUri);
const resource = await client.readResource(data.resourceUri);
console.log(resource);
return {
@ -106,7 +113,8 @@ export class ClientController {
}
@Controller('tools/list')
async listTools(client: RequestClientType, data: any, webview: PostMessageble) {
async listTools(data: RequestData, webview: PostMessageble) {
const client = getClient(data.clientId);
if (!client) {
return {
code: 501,
@ -122,7 +130,8 @@ export class ClientController {
}
@Controller('tools/call')
async callTool(client: RequestClientType, option: any, webview: PostMessageble) {
async callTool(data: RequestData, webview: PostMessageble) {
const client = getClient(data.clientId);
if (!client) {
return {
code: 501,
@ -131,18 +140,13 @@ export class ClientController {
}
const toolResult = await client.callTool({
name: option.toolName,
arguments: option.toolArgs,
callToolOption: option.callToolOption
name: data.toolName,
arguments: data.toolArgs,
callToolOption: data.callToolOption
});
// console.log(JSON.stringify(toolResult, null, 2));
postProcessMcpToolcallResponse(toolResult, webview);
// console.log(JSON.stringify(toolResult, null, 2));
return {
code: 200,
msg: toolResult

View File

@ -1,5 +1,5 @@
import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.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 { Implementation } from "@modelcontextprotocol/sdk/types";

View File

@ -1,7 +1,7 @@
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 { StdioClientTransport } from "@modelcontextprotocol/sdk/client/STDIO.js";
import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/SSE.js";
import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
import type { McpOptions, McpTransport, IServerVersion, ToolCallResponse, ToolCallContent } from './client.dto';
import { PostMessageble } from "../hook/adapter";

View File

@ -1,17 +1,19 @@
import { Controller, RequestClientType } from '../common';
import { Controller } from '../common';
import { PostMessageble } from '../hook/adapter';
import { connectService } from './connect.service';
import { RequestData } from '../common/index.dto';
import { connectService, getClient } from './connect.service';
export class ConnectController {
@Controller('connect')
async connect(client: RequestClientType, data: any, webview: PostMessageble) {
const res = await connectService(client, data);
async connect(data: any, webview: PostMessageble) {
const res = await connectService(data);
return res;
}
@Controller('lookup-env-var')
async lookupEnvVar(client: RequestClientType, data: any, webview: PostMessageble) {
async lookupEnvVar(data: RequestData, webview: PostMessageble) {
const client = getClient(data.clientId);
const { keys } = data;
const values = keys.map((key: string) => process.env[key] || '');
@ -22,7 +24,8 @@ export class ConnectController {
}
@Controller('ping')
async ping(client: RequestClientType, data: any, webview: PostMessageble) {
async ping(data: RequestData, webview: PostMessageble) {
const client = getClient(data.clientId);
if (!client) {
const connectResult = {
code: 501,

View File

@ -3,10 +3,12 @@ import { RequestClientType } from '../common';
import { connect } from './client.service';
import { RestfulResponse } from '../common/index.dto';
import { McpOptions } from './client.dto';
import { randomUUID } from 'node:crypto';
// TODO: 更多的 client
export let client: RequestClientType = undefined;
export const clientMap: Map<string, RequestClientType> = new Map();
export function getClient(clientId?: string): RequestClientType | undefined {
return clientMap.get(clientId || '');
}
export function tryGetRunCommandError(command: string, args: string[] = [], cwd?: string): string | null {
try {
@ -15,7 +17,7 @@ export function tryGetRunCommandError(command: string, args: string[] = [], cwd?
const result = spawnSync(command, args, {
cwd: cwd || process.cwd(),
stdio: 'pipe',
STDIO: 'pipe',
encoding: 'utf-8'
});
@ -32,7 +34,6 @@ export function tryGetRunCommandError(command: string, args: string[] = [], cwd?
}
export async function connectService(
_client: RequestClientType,
option: McpOptions
): Promise<RestfulResponse> {
try {
@ -48,19 +49,25 @@ export async function connectService(
});
}
client = await connect(option);
const client = await connect(option);
const uuid = randomUUID();
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,
name: versionInfo?.name,
version: versionInfo?.version
}
};
return connectResult;
} catch (error) {
console.log('meet error');
console.log(error);
// TODO: 这边获取到的 error 不够精致,如何才能获取到更加精准的错误
// 比如 error: Failed to spawn: `server.py`
// Caused by: No such file or directory (os error 2)

View File

@ -1,13 +1,16 @@
import { Controller, RequestClientType } from "../common";
import { Controller } from "../common";
import { PostMessageble } from "../hook/adapter";
import { RequestData } from "../common/index.dto";
import { getClient } from "../mcp/connect.service";
import { systemPromptDB } from "../hook/db";
import { loadTabSaveConfig, saveTabSaveConfig } from "./panel.service";
export class PanelController {
@Controller('panel/save')
async savePanel(client: RequestClientType, data: any, webview: PostMessageble) {
async savePanel(data: RequestData, webview: PostMessageble) {
const client = getClient(data.clientId);
const serverInfo = client?.getServerVersion();
saveTabSaveConfig(serverInfo, data);
saveTabSaveConfig(serverInfo, data);
return {
code: 200,
@ -15,11 +18,11 @@ export class PanelController {
};
}
@Controller('panel/load')
async loadPanel(client: RequestClientType, data: any, webview: PostMessageble) {
async loadPanel(data: RequestData, webview: PostMessageble) {
const client = getClient(data.clientId);
const serverInfo = client?.getServerVersion();
const config = loadTabSaveConfig(serverInfo);
const config = loadTabSaveConfig(serverInfo);
return {
code: 200,
@ -28,7 +31,8 @@ export class PanelController {
}
@Controller('system-prompts/set')
async setSystemPrompt(client: RequestClientType, data: any, webview: PostMessageble) {
async setSystemPrompt(data: RequestData, webview: PostMessageble) {
const client = getClient(data.clientId);
const { name, content } = data;
await systemPromptDB.insert({
@ -44,7 +48,8 @@ export class PanelController {
}
@Controller('system-prompts/delete')
async deleteSystemPrompt(client: RequestClientType, data: any, webview: PostMessageble) {
async deleteSystemPrompt(data: RequestData, webview: PostMessageble) {
const client = getClient(data.clientId);
const { name } = data;
await systemPromptDB.delete(name);
return {
@ -54,7 +59,8 @@ export class PanelController {
}
@Controller('system-prompts/save')
async saveSystemPrompts(client: RequestClientType, data: any, webview: PostMessageble) {
async saveSystemPrompts(data: RequestData, webview: PostMessageble) {
const client = getClient(data.clientId);
const { prompts } = data;
await Promise.all(prompts.map((prompt: any) => {
@ -72,8 +78,8 @@ export class PanelController {
}
@Controller('system-prompts/load')
async loadSystemPrompts(client: RequestClientType, data: any, webview: PostMessageble) {
async loadSystemPrompts(data: RequestData, webview: PostMessageble) {
const client = getClient(data.clientId);
const queryPrompts = await systemPromptDB.findAll();
const prompts = [];
for (const prompt of queryPrompts) {

View File

@ -29,13 +29,13 @@ const logger = pino({
export type MessageHandler = (message: VSCodeMessage) => void;
interface IStdioLaunchSignature {
type: 'stdio';
type: 'STDIO';
commandString: string;
cwd: string;
}
interface ISSELaunchSignature {
type: 'sse';
type: 'SSE';
url: string;
oauth: string;
}
@ -44,7 +44,7 @@ export type ILaunchSigature = IStdioLaunchSignature | ISSELaunchSignature;
function refreshConnectionOption(envPath: string) {
const defaultOption = {
type: 'stdio',
type: 'STDIO',
command: 'mcp',
args: ['run', 'main.py'],
cwd: '../server'
@ -84,7 +84,7 @@ function updateConnectionOption(data: any) {
if (data.connectionType === 'STDIO') {
const connectionItem = {
type: 'stdio',
type: 'STDIO',
command: data.command,
args: data.args,
cwd: data.cwd.replace(/\\/g, '/')
@ -93,7 +93,7 @@ function updateConnectionOption(data: any) {
fs.writeFileSync(envPath, JSON.stringify(connectionItem, null, 4));
} else {
const connectionItem = {
type: 'sse',
type: 'SSE',
url: data.url,
oauth: data.oauth
};
@ -155,14 +155,14 @@ wss.on('connection', (ws: any) => {
switch (command) {
case 'web/launch-signature':
const launchResultMessage: ILaunchSigature = option.type === 'stdio' ?
const launchResultMessage: ILaunchSigature = option.type === 'STDIO' ?
{
type: 'stdio',
type: 'STDIO',
commandString: option.command + ' ' + option.args.join(' '),
cwd: option.cwd || ''
} :
{
type: 'sse',
type: 'SSE',
url: option.url,
oauth: option.oauth || ''
};

View File

@ -1,11 +1,14 @@
import { Controller, RequestClientType } from "../common";
import { Controller } from "../common";
import { PostMessageble } from "../hook/adapter";
import { RequestData } from "../common/index.dto";
import { getClient } from "../mcp/connect.service";
import { getTour, loadSetting, saveSetting, setTour } from "./setting.service";
export class SettingController {
@Controller('setting/save')
async saveSetting(client: RequestClientType, data: any, webview: PostMessageble) {
async saveSetting(data: RequestData, webview: PostMessageble) {
const client = getClient(data.clientId);
saveSetting(data);
console.log('Settings saved successfully');
@ -16,8 +19,8 @@ export class SettingController {
}
@Controller('setting/load')
async loadSetting(client: RequestClientType, data: any, webview: PostMessageble) {
async loadSetting(data: RequestData, webview: PostMessageble) {
const client = getClient(data.clientId);
const config = loadSetting();
return {
code: 200,
@ -26,10 +29,8 @@ export class SettingController {
}
@Controller('setting/set-tour')
async setTourController(client: RequestClientType, data: any, webview: PostMessageble) {
async setTourController(data: any, webview: PostMessageble) {
const { userHasReadGuide } = data;
setTour(userHasReadGuide);
return {
@ -39,7 +40,7 @@ export class SettingController {
}
@Controller('setting/get-tour')
async getTourController(client: RequestClientType, data: any, webview: PostMessageble) {
async getTourController(data: any, webview: PostMessageble) {
const { userHasReadGuide } = getTour();

View File

@ -9,7 +9,8 @@
"outDir": "./dist",
"declaration": true,
"declarationMap": true,
"experimentalDecorators": true
"experimentalDecorators": true,
"moduleResolution": "node"
},
"paths": {
"@/*": [
@ -18,4 +19,4 @@
},
"include": ["src/**/*"],
"exclude": ["node_modules", "src/main.ts"] // main.ts
}
}

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
{
"name": "openmcp-electron",
"name": "@openmcp/electron",
"version": "0.0.1",
"description": "",
"main": "dist/main.js",
@ -13,6 +13,7 @@
"email": "1193466151@qq.com"
},
"dependencies": {
"@openmcp/service": "*",
"@modelcontextprotocol/sdk": "^1.10.2",
"@seald-io/nedb": "^4.1.1",
"axios": "^1.7.7",

View File

@ -33,25 +33,25 @@ function createWindow(): void {
const option = getInitConnectionOption();
// 注册消息接受的管线
webview.onDidReceiveMessage((message: any) => {
webview.onDidReceiveMessage((message: any) => {
console.info(`command: [${message.command || 'No Command'}]`);
const { command, data } = message;
switch (command) {
case 'electron/launch-signature':
const launchResultMessage: ILaunchSigature = option.type === 'stdio' ?
const launchResultMessage: ILaunchSigature = option.type === 'STDIO' ?
{
type: 'stdio',
type: 'STDIO',
commandString: option.command + ' ' + option.args.join(' '),
cwd: option.cwd || ''
} :
{
type: 'sse',
type: 'SSE',
url: option.url,
oauth: option.oauth || ''
};
const launchResult = {
code: 200,
msg: launchResultMessage
@ -63,11 +63,11 @@ function createWindow(): void {
});
break;
case 'electron/update-connection-sigature':
updateConnectionOption(data);
break;
default:
OpenMCPService.routeMessage(command, data, webview);
break;
@ -94,4 +94,4 @@ app.whenReady().then(() => {
app.on('window-all-closed', function () {
if (process.platform !== 'darwin') app.quit()
})
})

View File

@ -24,13 +24,13 @@ export class ElectronIPCLike {
interface IStdioLaunchSignature {
type: 'stdio';
type: 'STDIO';
commandString: string;
cwd: string;
}
interface ISSELaunchSignature {
type:'sse';
type:'SSE';
url: string;
oauth: string;
}
@ -39,7 +39,7 @@ export type ILaunchSigature = IStdioLaunchSignature | ISSELaunchSignature;
export function refreshConnectionOption(envPath: string) {
const defaultOption = {
type:'stdio',
type:'STDIO',
command: 'mcp',
args: ['run', 'main.py'],
cwd: '../server'
@ -80,7 +80,7 @@ export function updateConnectionOption(data: any) {
if (data.connectionType === 'STDIO') {
const connectionItem = {
type: 'stdio',
type: 'STDIO',
command: data.command,
args: data.args,
cwd: data.cwd.replace(/\\/g, '/')
@ -89,7 +89,7 @@ export function updateConnectionOption(data: any) {
fs.writeFileSync(envPath, JSON.stringify(connectionItem, null, 4));
} else {
const connectionItem = {
type: 'sse',
type: 'SSE',
url: data.url,
oauth: data.oauth
};

View File

@ -1,5 +1,5 @@
import * as vscode from 'vscode';
import * as OpenMCPService from '../openmcp-sdk/service';
import * as OpenMCPService from '@openmcp/service';
import { launch } from './common/entry';
export function activate(context: vscode.ExtensionContext) {
@ -19,4 +19,4 @@ export function activate(context: vscode.ExtensionContext) {
export function deactivate() {
}
}

View File

@ -7,7 +7,7 @@ export type FsPath = string;
export const panels = new Map<FsPath, vscode.WebviewPanel>();
export interface IStdioConnectionItem {
type: 'stdio';
type: 'STDIO';
name: string;
version?: string;
command: string;
@ -18,7 +18,7 @@ export interface IStdioConnectionItem {
}
export interface ISSEConnectionItem {
type: 'sse';
type: 'SSE';
name: string;
version: string;
url: string;
@ -29,13 +29,13 @@ export interface ISSEConnectionItem {
interface IStdioLaunchSignature {
type: 'stdio';
type: 'STDIO';
commandString: string;
cwd: string;
}
interface ISSELaunchSignature {
type:'sse';
type:'SSE';
url: string;
oauth: string;
}
@ -123,7 +123,7 @@ export function getWorkspaceConnectionConfig() {
if (item.filePath && item.filePath.startsWith('{workspace}')) {
item.filePath = item.filePath.replace('{workspace}', workspacePath).replace(/\\/g, '/');
}
if (item.type === 'stdio' && item.cwd && item.cwd.startsWith('{workspace}')) {
if (item.type === 'STDIO' && item.cwd && item.cwd.startsWith('{workspace}')) {
item.cwd = item.cwd.replace('{workspace}', workspacePath).replace(/\\/g, '/');
}
}
@ -169,7 +169,7 @@ export function saveWorkspaceConnectionConfig(workspace: string) {
if (item.filePath && item.filePath.replace(/\\/g, '/').startsWith(workspacePath)) {
item.filePath = item.filePath.replace(workspacePath, '{workspace}').replace(/\\/g, '/');
}
if (item.type ==='stdio' && item.cwd && item.cwd.replace(/\\/g, '/').startsWith(workspacePath)) {
if (item.type ==='STDIO' && item.cwd && item.cwd.replace(/\\/g, '/').startsWith(workspacePath)) {
item.cwd = item.cwd.replace(workspacePath, '{workspace}').replace(/\\/g, '/');
}
}
@ -213,7 +213,7 @@ export function updateWorkspaceConnectionConfig(
if (data.connectionType === 'STDIO') {
const connectionItem: IStdioConnectionItem = {
type: 'stdio',
type: 'STDIO',
name: data.serverInfo.name,
version: data.serverInfo.version,
command: data.command,
@ -234,7 +234,7 @@ export function updateWorkspaceConnectionConfig(
} else {
const connectionItem: ISSEConnectionItem = {
type: 'sse',
type: 'SSE',
name: data.serverInfo.name,
version: data.serverInfo.version,
url: data.url,
@ -267,7 +267,7 @@ export function updateInstalledConnectionConfig(
if (data.connectionType === 'STDIO') {
const connectionItem: IStdioConnectionItem = {
type: 'stdio',
type: 'STDIO',
name: data.serverInfo.name,
version: data.serverInfo.version,
command: data.command,
@ -287,7 +287,7 @@ export function updateInstalledConnectionConfig(
} else {
const connectionItem: ISSEConnectionItem = {
type: 'sse',
type: 'SSE',
name: data.serverInfo.name,
version: data.serverInfo.version,
url: data.url,

View File

@ -52,7 +52,7 @@ export async function validateAndGetCommandPath(commandString: string, cwd?: str
export async function acquireInstalledConnection(): Promise<IConnectionItem | undefined> {
// 让用户选择连接类型
const connectionType = await vscode.window.showQuickPick(['stdio', 'sse'], {
const connectionType = await vscode.window.showQuickPick(['STDIO', 'SSE'], {
placeHolder: '请选择连接类型',
canPickMany: false
});
@ -61,7 +61,7 @@ export async function acquireInstalledConnection(): Promise<IConnectionItem | un
return; // 用户取消选择
}
if (connectionType === 'stdio') {
if (connectionType === 'STDIO') {
// 获取 command
const commandString = await vscode.window.showInputBox({
prompt: '请输入连接的 command',
@ -97,15 +97,15 @@ export async function acquireInstalledConnection(): Promise<IConnectionItem | un
// 保存连接配置
return {
type: 'stdio',
name: `stdio-${Date.now()}`,
type: 'STDIO',
name: `STDIO-${Date.now()}`,
command: command,
args,
cwd: cwd || '',
filePath: filePath,
};
} else if (connectionType === 'sse') {
} else if (connectionType === 'SSE') {
// 获取 url
const url = await vscode.window.showInputBox({
prompt: '请输入连接的 URL',
@ -124,8 +124,8 @@ export async function acquireInstalledConnection(): Promise<IConnectionItem | un
// 保存连接配置
return {
type: 'sse',
name: `sse-${Date.now()}`,
type: 'SSE',
name: `SSE-${Date.now()}`,
version: '1.0', // 假设默认版本为 1.0,可根据实际情况修改
url: url,
oauth: oauth || ''

View File

@ -6,7 +6,7 @@ import * as vscode from 'vscode';
export async function acquireUserCustomConnection(): Promise<IConnectionItem | undefined> {
// 让用户选择连接类型
const connectionType = await vscode.window.showQuickPick(['stdio', 'sse'], {
const connectionType = await vscode.window.showQuickPick(['STDIO', 'SSE'], {
placeHolder: '请选择连接类型'
});
@ -14,7 +14,7 @@ export async function acquireUserCustomConnection(): Promise<IConnectionItem | u
return; // 用户取消选择
}
if (connectionType === 'stdio') {
if (connectionType === 'STDIO') {
// 获取 command
const commandString = await vscode.window.showInputBox({
prompt: '请输入连接的 command',
@ -47,15 +47,15 @@ export async function acquireUserCustomConnection(): Promise<IConnectionItem | u
// 保存连接配置
return {
type: 'stdio',
name: `stdio-${Date.now()}`,
type: 'STDIO',
name: `STDIO-${Date.now()}`,
command: command,
args,
cwd: cwd || '',
filePath
};
} else if (connectionType === 'sse') {
} else if (connectionType === 'SSE') {
// 获取 url
const url = await vscode.window.showInputBox({
prompt: '请输入连接的 URL',
@ -74,8 +74,8 @@ export async function acquireUserCustomConnection(): Promise<IConnectionItem | u
// 保存连接配置
return {
type: 'sse',
name: `sse-${Date.now()}`,
type: 'SSE',
name: `SSE-${Date.now()}`,
version: '1.0', // 假设默认版本为 1.0,可根据实际情况修改
url: url,
oauth: oauth || ''

View File

@ -19,7 +19,7 @@ export class WebviewController {
}
revealOpenMcpWebviewPanel(context, 'workspace', uri.fsPath, {
type: 'stdio',
type: 'STDIO',
name: 'OpenMCP',
command: sigature.command,
args: sigature.args,

View File

@ -2,18 +2,18 @@ import * as vscode from 'vscode';
import * as fs from 'fs';
import * as fspath from 'path';
import { IConnectionItem, ILaunchSigature, panels, updateInstalledConnectionConfig, updateWorkspaceConnectionConfig } from '../global';
import * as OpenMCPService from '../../openmcp-sdk/service';
import * as OpenMCPService from '@openmcp/service';
export function getWebviewContent(context: vscode.ExtensionContext, panel: vscode.WebviewPanel): string | undefined {
const viewRoot = fspath.join(context.extensionPath, 'openmcp-sdk', 'renderer');
const htmlIndexPath = fspath.join(viewRoot, 'index.html');
const html = fs.readFileSync(htmlIndexPath, { encoding: 'utf-8' })?.replace(/(<link.+?href="|<script.+?src="|<img.+?src="|url\()(.+?)(\)|")/g, (m, $1, $2) => {
const absLocalPath = fspath.resolve(viewRoot, $2);
const absLocalPath = fspath.resolve(viewRoot, $2);
const webviewUri = panel.webview.asWebviewUri(vscode.Uri.file(absLocalPath));
const replaceHref = $1 + webviewUri?.toString() + '"';
return replaceHref;
});
});
return html;
}
@ -29,7 +29,7 @@ export function revealOpenMcpWebviewPanel(
type: 'workspace' | 'installed',
panelKey: string,
option: IConnectionItem = {
type: 'stdio',
type: 'STDIO',
name: 'OpenMCP',
command: 'mcp',
args: ['run', 'main.py']
@ -56,9 +56,9 @@ export function revealOpenMcpWebviewPanel(
// 设置HTML内容
const html = getWebviewContent(context, panel);
const html = getWebviewContent(context, panel);
panel.webview.html = html || '';
panel.iconPath = vscode.Uri.file(fspath.join(context.extensionPath, 'openmcp-sdk', 'renderer', 'images', 'openmcp.png'));
panel.iconPath = vscode.Uri.file(fspath.join(context.extensionPath, 'openmcp-sdk', 'renderer', 'images', 'openmcp.png'));
// 处理来自webview的消息
panel.webview.onDidReceiveMessage(message => {
@ -68,18 +68,18 @@ export function revealOpenMcpWebviewPanel(
// 拦截消息,注入额外信息
switch (command) {
case 'vscode/launch-signature':
const launchResultMessage: ILaunchSigature = option.type === 'stdio' ?
const launchResultMessage: ILaunchSigature = option.type === 'STDIO' ?
{
type: 'stdio',
type: 'STDIO',
commandString: option.command + ' ' + option.args.join(' '),
cwd: option.cwd || ''
} :
{
type: 'sse',
type: 'SSE',
url: option.url,
oauth: option.oauth || ''
};
const launchResult = {
code: 200,
msg: launchResultMessage
@ -91,7 +91,7 @@ export function revealOpenMcpWebviewPanel(
});
break;
case 'vscode/update-connection-sigature':
if (type === 'installed') {
updateInstalledConnectionConfig(panelKey, data);
@ -101,7 +101,7 @@ export function revealOpenMcpWebviewPanel(
break;
default:
OpenMCPService.routeMessage(command, data, panel.webview);
OpenMCPService.routeMessage(command, data, panel.webview);
break;
}

22
turbo.json Normal file
View File

@ -0,0 +1,22 @@
{
"$schema": "https://turborepo.com/schema.json",
"tasks": {
"dev": {
"persistent": true,
"cache": false
},
"build": {
"dependsOn": ["^build"],
"outputs": ["dist/**"]
},
"@openmcp/electron#dev": {
"dependsOn": ["@openmcp/renderer#build", "@openmcp/service#build"],
"persistent": true,
"cache": false
},
"@openmcp/electron#build": {
"dependsOn": ["@openmcp/renderer#build", "@openmcp/service#build"],
"outputs": ["dist/**"]
}
}
}