mirror of
https://github.com/samanhappy/mcphub.git
synced 2026-01-01 12:18:39 -05:00
Compare commits
2 Commits
main
...
copilot/ad
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3d667e10f8 | ||
|
|
c06f9ed916 |
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@@ -106,7 +106,7 @@ jobs:
|
|||||||
|
|
||||||
# - name: Run integration tests
|
# - name: Run integration tests
|
||||||
# run: |
|
# run: |
|
||||||
# export DB_URL="postgresql://postgres:postgres@localhost:5432/mcphub_test"
|
# export DATABASE_URL="postgresql://postgres:postgres@localhost:5432/mcphub_test"
|
||||||
# node test-integration.ts
|
# node test-integration.ts
|
||||||
# env:
|
# env:
|
||||||
# NODE_ENV: test
|
# NODE_ENV: test
|
||||||
|
|||||||
@@ -106,7 +106,7 @@ services:
|
|||||||
- NODE_ENV=production
|
- NODE_ENV=production
|
||||||
- PORT=3000
|
- PORT=3000
|
||||||
- JWT_SECRET=${JWT_SECRET:-your-jwt-secret}
|
- JWT_SECRET=${JWT_SECRET:-your-jwt-secret}
|
||||||
- DB_URL=postgresql://mcphub:password@postgres:5432/mcphub
|
- DATABASE_URL=postgresql://mcphub:password@postgres:5432/mcphub
|
||||||
volumes:
|
volumes:
|
||||||
- ./mcp_settings.json:/app/mcp_settings.json:ro
|
- ./mcp_settings.json:/app/mcp_settings.json:ro
|
||||||
- ./servers.json:/app/servers.json:ro
|
- ./servers.json:/app/servers.json:ro
|
||||||
@@ -180,7 +180,7 @@ services:
|
|||||||
- PORT=3000
|
- PORT=3000
|
||||||
- JWT_SECRET=${JWT_SECRET}
|
- JWT_SECRET=${JWT_SECRET}
|
||||||
- JWT_EXPIRES_IN=${JWT_EXPIRES_IN:-24h}
|
- JWT_EXPIRES_IN=${JWT_EXPIRES_IN:-24h}
|
||||||
- DB_URL=postgresql://mcphub:${POSTGRES_PASSWORD}@postgres:5432/mcphub
|
- DATABASE_URL=postgresql://mcphub:${POSTGRES_PASSWORD}@postgres:5432/mcphub
|
||||||
- OPENAI_API_KEY=${OPENAI_API_KEY}
|
- OPENAI_API_KEY=${OPENAI_API_KEY}
|
||||||
- REDIS_URL=redis://redis:6379
|
- REDIS_URL=redis://redis:6379
|
||||||
volumes:
|
volumes:
|
||||||
@@ -293,7 +293,7 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
- NODE_ENV=development
|
- NODE_ENV=development
|
||||||
- PORT=3000
|
- PORT=3000
|
||||||
- DB_URL=postgresql://mcphub:password@postgres:5432/mcphub
|
- DATABASE_URL=postgresql://mcphub:password@postgres:5432/mcphub
|
||||||
volumes:
|
volumes:
|
||||||
- .:/app
|
- .:/app
|
||||||
- /app/node_modules
|
- /app/node_modules
|
||||||
|
|||||||
@@ -259,92 +259,6 @@ MCPHub supports environment variable substitution using `${VAR_NAME}` syntax:
|
|||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
### Proxy Configuration (proxychains4)
|
|
||||||
|
|
||||||
MCPHub supports routing STDIO server network traffic through a proxy using **proxychains4**. This feature is available on **Linux and macOS only** (Windows is not supported).
|
|
||||||
|
|
||||||
<Note>
|
|
||||||
To use this feature, you must have `proxychains4` installed on your system:
|
|
||||||
- **Debian/Ubuntu**: `apt install proxychains4`
|
|
||||||
- **macOS**: `brew install proxychains-ng`
|
|
||||||
- **Arch Linux**: `pacman -S proxychains-ng`
|
|
||||||
</Note>
|
|
||||||
|
|
||||||
#### Basic Proxy Configuration
|
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"mcpServers": {
|
|
||||||
"fetch-via-proxy": {
|
|
||||||
"command": "uvx",
|
|
||||||
"args": ["mcp-server-fetch"],
|
|
||||||
"proxy": {
|
|
||||||
"enabled": true,
|
|
||||||
"type": "socks5",
|
|
||||||
"host": "127.0.0.1",
|
|
||||||
"port": 1080
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Proxy Configuration Options
|
|
||||||
|
|
||||||
| Field | Type | Default | Description |
|
|
||||||
| ------------ | ------- | --------- | ------------------------------------------------ |
|
|
||||||
| `enabled` | boolean | `false` | Enable/disable proxy routing |
|
|
||||||
| `type` | string | `socks5` | Proxy protocol: `socks4`, `socks5`, or `http` |
|
|
||||||
| `host` | string | - | Proxy server hostname or IP address |
|
|
||||||
| `port` | number | - | Proxy server port |
|
|
||||||
| `username` | string | - | Proxy authentication username (optional) |
|
|
||||||
| `password` | string | - | Proxy authentication password (optional) |
|
|
||||||
| `configPath` | string | - | Path to custom proxychains4 config file |
|
|
||||||
|
|
||||||
#### Proxy with Authentication
|
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"mcpServers": {
|
|
||||||
"secure-server": {
|
|
||||||
"command": "npx",
|
|
||||||
"args": ["-y", "@example/mcp-server"],
|
|
||||||
"proxy": {
|
|
||||||
"enabled": true,
|
|
||||||
"type": "http",
|
|
||||||
"host": "proxy.example.com",
|
|
||||||
"port": 8080,
|
|
||||||
"username": "${PROXY_USER}",
|
|
||||||
"password": "${PROXY_PASSWORD}"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Using Custom proxychains4 Configuration
|
|
||||||
|
|
||||||
For advanced use cases, you can provide your own proxychains4 configuration file:
|
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"mcpServers": {
|
|
||||||
"custom-proxy-server": {
|
|
||||||
"command": "python",
|
|
||||||
"args": ["-m", "custom_mcp_server"],
|
|
||||||
"proxy": {
|
|
||||||
"enabled": true,
|
|
||||||
"configPath": "/etc/proxychains4/custom.conf"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
<Tip>
|
|
||||||
When `configPath` is specified, all other proxy settings (`type`, `host`, `port`, etc.) are ignored, and the custom configuration file is used directly.
|
|
||||||
</Tip>
|
|
||||||
|
|
||||||
{/* ### Custom Server Scripts
|
{/* ### Custom Server Scripts
|
||||||
|
|
||||||
#### Local Python Server
|
#### Local Python Server
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ PORT=3000
|
|||||||
NODE_ENV=development
|
NODE_ENV=development
|
||||||
|
|
||||||
# Database Configuration
|
# Database Configuration
|
||||||
DB_URL=postgresql://username:password@localhost:5432/mcphub
|
DATABASE_URL=postgresql://username:password@localhost:5432/mcphub
|
||||||
|
|
||||||
# JWT Configuration
|
# JWT Configuration
|
||||||
JWT_SECRET=your-secret-key
|
JWT_SECRET=your-secret-key
|
||||||
|
|||||||
@@ -69,7 +69,7 @@ Smart Routing requires additional setup compared to basic MCPHub usage:
|
|||||||
ports:
|
ports:
|
||||||
- "3000:3000"
|
- "3000:3000"
|
||||||
environment:
|
environment:
|
||||||
- DB_URL=postgresql://mcphub:password@postgres:5432/mcphub
|
- DATABASE_URL=postgresql://mcphub:password@postgres:5432/mcphub
|
||||||
- OPENAI_API_KEY=your_openai_api_key
|
- OPENAI_API_KEY=your_openai_api_key
|
||||||
- ENABLE_SMART_ROUTING=true
|
- ENABLE_SMART_ROUTING=true
|
||||||
depends_on:
|
depends_on:
|
||||||
@@ -114,7 +114,7 @@ Smart Routing requires additional setup compared to basic MCPHub usage:
|
|||||||
|
|
||||||
2. **Set Environment Variables**:
|
2. **Set Environment Variables**:
|
||||||
```bash
|
```bash
|
||||||
export DB_URL="postgresql://mcphub:your_password@localhost:5432/mcphub"
|
export DATABASE_URL="postgresql://mcphub:your_password@localhost:5432/mcphub"
|
||||||
export OPENAI_API_KEY="your_openai_api_key"
|
export OPENAI_API_KEY="your_openai_api_key"
|
||||||
export ENABLE_SMART_ROUTING="true"
|
export ENABLE_SMART_ROUTING="true"
|
||||||
```
|
```
|
||||||
@@ -178,7 +178,7 @@ Smart Routing requires additional setup compared to basic MCPHub usage:
|
|||||||
- name: mcphub
|
- name: mcphub
|
||||||
image: samanhappy/mcphub:latest
|
image: samanhappy/mcphub:latest
|
||||||
env:
|
env:
|
||||||
- name: DB_URL
|
- name: DATABASE_URL
|
||||||
value: "postgresql://mcphub:password@postgres:5432/mcphub"
|
value: "postgresql://mcphub:password@postgres:5432/mcphub"
|
||||||
- name: OPENAI_API_KEY
|
- name: OPENAI_API_KEY
|
||||||
valueFrom:
|
valueFrom:
|
||||||
@@ -202,7 +202,7 @@ Configure Smart Routing with these environment variables:
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Required
|
# Required
|
||||||
DB_URL=postgresql://user:password@host:5432/database
|
DATABASE_URL=postgresql://user:password@host:5432/database
|
||||||
OPENAI_API_KEY=your_openai_api_key
|
OPENAI_API_KEY=your_openai_api_key
|
||||||
|
|
||||||
# Optional
|
# Optional
|
||||||
@@ -219,10 +219,10 @@ EMBEDDING_BATCH_SIZE=100
|
|||||||
<Accordion title="Database Configuration">
|
<Accordion title="Database Configuration">
|
||||||
```bash
|
```bash
|
||||||
# Full PostgreSQL connection string
|
# Full PostgreSQL connection string
|
||||||
DB_URL=postgresql://username:password@host:port/database?schema=public
|
DATABASE_URL=postgresql://username:password@host:port/database?schema=public
|
||||||
|
|
||||||
# SSL configuration for cloud databases
|
# SSL configuration for cloud databases
|
||||||
DB_URL=postgresql://user:pass@host:5432/db?sslmode=require
|
DATABASE_URL=postgresql://user:pass@host:5432/db?sslmode=require
|
||||||
|
|
||||||
# Connection pool settings
|
# Connection pool settings
|
||||||
DATABASE_POOL_SIZE=20
|
DATABASE_POOL_SIZE=20
|
||||||
@@ -673,11 +673,11 @@ curl -X POST http://localhost:3000/api/smart-routing/feedback \
|
|||||||
|
|
||||||
**Solutions:**
|
**Solutions:**
|
||||||
1. Verify PostgreSQL is running
|
1. Verify PostgreSQL is running
|
||||||
2. Check DB_URL format
|
2. Check DATABASE_URL format
|
||||||
3. Ensure pgvector extension is installed
|
3. Ensure pgvector extension is installed
|
||||||
4. Test connection manually:
|
4. Test connection manually:
|
||||||
```bash
|
```bash
|
||||||
psql $DB_URL -c "SELECT 1;"
|
psql $DATABASE_URL -c "SELECT 1;"
|
||||||
```
|
```
|
||||||
|
|
||||||
</Accordion>
|
</Accordion>
|
||||||
|
|||||||
@@ -445,7 +445,7 @@ Set the following environment variables:
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Database connection
|
# Database connection
|
||||||
DB_URL=postgresql://mcphub:your_password@localhost:5432/mcphub
|
DATABASE_URL=postgresql://mcphub:your_password@localhost:5432/mcphub
|
||||||
|
|
||||||
# OpenAI API for embeddings
|
# OpenAI API for embeddings
|
||||||
OPENAI_API_KEY=your_openai_api_key
|
OPENAI_API_KEY=your_openai_api_key
|
||||||
@@ -563,10 +563,10 @@ curl -X POST http://localhost:3000/mcp \
|
|||||||
**Database connection failed:**
|
**Database connection failed:**
|
||||||
```bash
|
```bash
|
||||||
# Test database connection
|
# Test database connection
|
||||||
psql $DB_URL -c "SELECT 1;"
|
psql $DATABASE_URL -c "SELECT 1;"
|
||||||
|
|
||||||
# Check if pgvector is installed
|
# Check if pgvector is installed
|
||||||
psql $DB_URL -c "CREATE EXTENSION IF NOT EXISTS vector;"
|
psql $DATABASE_URL -c "CREATE EXTENSION IF NOT EXISTS vector;"
|
||||||
```
|
```
|
||||||
|
|
||||||
**Embedding service errors:**
|
**Embedding service errors:**
|
||||||
|
|||||||
@@ -106,7 +106,7 @@ services:
|
|||||||
- NODE_ENV=production
|
- NODE_ENV=production
|
||||||
- PORT=3000
|
- PORT=3000
|
||||||
- JWT_SECRET=${JWT_SECRET:-your-jwt-secret}
|
- JWT_SECRET=${JWT_SECRET:-your-jwt-secret}
|
||||||
- DB_URL=postgresql://mcphub:password@postgres:5432/mcphub
|
- DATABASE_URL=postgresql://mcphub:password@postgres:5432/mcphub
|
||||||
volumes:
|
volumes:
|
||||||
- ./mcp_settings.json:/app/mcp_settings.json:ro
|
- ./mcp_settings.json:/app/mcp_settings.json:ro
|
||||||
- ./servers.json:/app/servers.json:ro
|
- ./servers.json:/app/servers.json:ro
|
||||||
@@ -180,7 +180,7 @@ services:
|
|||||||
- PORT=3000
|
- PORT=3000
|
||||||
- JWT_SECRET=${JWT_SECRET}
|
- JWT_SECRET=${JWT_SECRET}
|
||||||
- JWT_EXPIRES_IN=${JWT_EXPIRES_IN:-24h}
|
- JWT_EXPIRES_IN=${JWT_EXPIRES_IN:-24h}
|
||||||
- DB_URL=postgresql://mcphub:${POSTGRES_PASSWORD}@postgres:5432/mcphub
|
- DATABASE_URL=postgresql://mcphub:${POSTGRES_PASSWORD}@postgres:5432/mcphub
|
||||||
- OPENAI_API_KEY=${OPENAI_API_KEY}
|
- OPENAI_API_KEY=${OPENAI_API_KEY}
|
||||||
- REDIS_URL=redis://redis:6379
|
- REDIS_URL=redis://redis:6379
|
||||||
volumes:
|
volumes:
|
||||||
@@ -293,7 +293,7 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
- NODE_ENV=development
|
- NODE_ENV=development
|
||||||
- PORT=3000
|
- PORT=3000
|
||||||
- DB_URL=postgresql://mcphub:password@postgres:5432/mcphub
|
- DATABASE_URL=postgresql://mcphub:password@postgres:5432/mcphub
|
||||||
volumes:
|
volumes:
|
||||||
- .:/app
|
- .:/app
|
||||||
- /app/node_modules
|
- /app/node_modules
|
||||||
|
|||||||
@@ -290,7 +290,7 @@ MCPHub 支持使用 `${VAR_NAME}` 语法进行环境变量替换:
|
|||||||
"command": "python",
|
"command": "python",
|
||||||
"args": ["-m", "db_server"],
|
"args": ["-m", "db_server"],
|
||||||
"env": {
|
"env": {
|
||||||
"DB_URL": "${NODE_ENV:development == 'production' ? DB_URL : DEV_DB_URL}"
|
"DB_URL": "${NODE_ENV:development == 'production' ? DATABASE_URL : DEV_DATABASE_URL}"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ PORT=3000
|
|||||||
NODE_ENV=development
|
NODE_ENV=development
|
||||||
|
|
||||||
# 数据库配置
|
# 数据库配置
|
||||||
DB_URL=postgresql://username:password@localhost:5432/mcphub
|
DATABASE_URL=postgresql://username:password@localhost:5432/mcphub
|
||||||
|
|
||||||
# JWT 配置
|
# JWT 配置
|
||||||
JWT_SECRET=your-secret-key
|
JWT_SECRET=your-secret-key
|
||||||
|
|||||||
@@ -480,7 +480,7 @@ docker run -d \
|
|||||||
--name mcphub \
|
--name mcphub \
|
||||||
-p 3000:3000 \
|
-p 3000:3000 \
|
||||||
-e NODE_ENV=production \
|
-e NODE_ENV=production \
|
||||||
-e DB_URL=postgresql://user:pass@host:5432/mcphub \
|
-e DATABASE_URL=postgresql://user:pass@host:5432/mcphub \
|
||||||
-e JWT_SECRET=your-secret-key \
|
-e JWT_SECRET=your-secret-key \
|
||||||
mcphub/server:latest
|
mcphub/server:latest
|
||||||
|
|
||||||
@@ -504,7 +504,7 @@ docker run -d \
|
|||||||
--name mcphub \
|
--name mcphub \
|
||||||
-p 3000:3000 \
|
-p 3000:3000 \
|
||||||
-e NODE_ENV=production \
|
-e NODE_ENV=production \
|
||||||
-e DB_URL=postgresql://user:pass@host:5432/mcphub \
|
-e DATABASE_URL=postgresql://user:pass@host:5432/mcphub \
|
||||||
-e JWT_SECRET=your-secret-key \
|
-e JWT_SECRET=your-secret-key \
|
||||||
mcphub/server:latest
|
mcphub/server:latest
|
||||||
|
|
||||||
|
|||||||
@@ -159,7 +159,7 @@ services:
|
|||||||
- '3000:3000'
|
- '3000:3000'
|
||||||
environment:
|
environment:
|
||||||
- NODE_ENV=production
|
- NODE_ENV=production
|
||||||
- DB_URL=postgresql://user:pass@db:5432/mcphub
|
- DATABASE_URL=postgresql://user:pass@db:5432/mcphub
|
||||||
```
|
```
|
||||||
````
|
````
|
||||||
|
|
||||||
@@ -172,7 +172,7 @@ services:
|
|||||||
- '3000:3000'
|
- '3000:3000'
|
||||||
environment:
|
environment:
|
||||||
- NODE_ENV=production
|
- NODE_ENV=production
|
||||||
- DB_URL=postgresql://user:pass@db:5432/mcphub
|
- DATABASE_URL=postgresql://user:pass@db:5432/mcphub
|
||||||
```
|
```
|
||||||
|
|
||||||
### 终端命令
|
### 终端命令
|
||||||
|
|||||||
@@ -245,11 +245,11 @@ curl -X POST http://localhost:3000/api/smart-routing/feedback \
|
|||||||
|
|
||||||
**解决方案:**
|
**解决方案:**
|
||||||
1. 验证 PostgreSQL 是否正在运行
|
1. 验证 PostgreSQL 是否正在运行
|
||||||
2. 检查 DB_URL 格式
|
2. 检查 DATABASE_URL 格式
|
||||||
3. 确保安装了 pgvector 扩展
|
3. 确保安装了 pgvector 扩展
|
||||||
4. 手动测试连接:
|
4. 手动测试连接:
|
||||||
```bash
|
```bash
|
||||||
psql $DB_URL -c "SELECT 1;"
|
psql $DATABASE_URL -c "SELECT 1;"
|
||||||
```
|
```
|
||||||
|
|
||||||
</Accordion>
|
</Accordion>
|
||||||
|
|||||||
@@ -420,7 +420,7 @@ description: '各种平台的详细安装说明'
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
# 数据库连接
|
# 数据库连接
|
||||||
DB_URL=postgresql://mcphub:your_password@localhost:5432/mcphub
|
DATABASE_URL=postgresql://mcphub:your_password@localhost:5432/mcphub
|
||||||
|
|
||||||
# 用于嵌入的 OpenAI API
|
# 用于嵌入的 OpenAI API
|
||||||
OPENAI_API_KEY=your_openai_api_key
|
OPENAI_API_KEY=your_openai_api_key
|
||||||
@@ -538,10 +538,10 @@ curl -X POST http://localhost:3000/mcp \
|
|||||||
**数据库连接失败:**
|
**数据库连接失败:**
|
||||||
```bash
|
```bash
|
||||||
# 测试数据库连接
|
# 测试数据库连接
|
||||||
psql $DB_URL -c "SELECT 1;"
|
psql $DATABASE_URL -c "SELECT 1;"
|
||||||
|
|
||||||
# 检查是否安装了 pgvector
|
# 检查是否安装了 pgvector
|
||||||
psql $DB_URL -c "CREATE EXTENSION IF NOT EXISTS vector;"
|
psql $DATABASE_URL -c "CREATE EXTENSION IF NOT EXISTS vector;"
|
||||||
```
|
```
|
||||||
|
|
||||||
**嵌入服务错误:**
|
**嵌入服务错误:**
|
||||||
|
|||||||
@@ -28,48 +28,7 @@
|
|||||||
"env": {
|
"env": {
|
||||||
"API_KEY": "${MY_API_KEY}",
|
"API_KEY": "${MY_API_KEY}",
|
||||||
"DEBUG": "${DEBUG_MODE}",
|
"DEBUG": "${DEBUG_MODE}",
|
||||||
"DB_URL": "${DB_URL}"
|
"DATABASE_URL": "${DATABASE_URL}"
|
||||||
}
|
|
||||||
},
|
|
||||||
"example-stdio-with-proxy": {
|
|
||||||
"type": "stdio",
|
|
||||||
"command": "uvx",
|
|
||||||
"args": [
|
|
||||||
"mcp-server-fetch"
|
|
||||||
],
|
|
||||||
"proxy": {
|
|
||||||
"enabled": true,
|
|
||||||
"type": "socks5",
|
|
||||||
"host": "${PROXY_HOST}",
|
|
||||||
"port": 1080
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"example-stdio-with-auth-proxy": {
|
|
||||||
"type": "stdio",
|
|
||||||
"command": "npx",
|
|
||||||
"args": [
|
|
||||||
"-y",
|
|
||||||
"@example/mcp-server"
|
|
||||||
],
|
|
||||||
"proxy": {
|
|
||||||
"enabled": true,
|
|
||||||
"type": "http",
|
|
||||||
"host": "${HTTP_PROXY_HOST}",
|
|
||||||
"port": 8080,
|
|
||||||
"username": "${PROXY_USERNAME}",
|
|
||||||
"password": "${PROXY_PASSWORD}"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"example-stdio-with-custom-proxy-config": {
|
|
||||||
"type": "stdio",
|
|
||||||
"command": "python",
|
|
||||||
"args": [
|
|
||||||
"-m",
|
|
||||||
"custom_mcp_server"
|
|
||||||
],
|
|
||||||
"proxy": {
|
|
||||||
"enabled": true,
|
|
||||||
"configPath": "/etc/proxychains4/custom.conf"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"example-openapi-server": {
|
"example-openapi-server": {
|
||||||
@@ -96,10 +55,7 @@
|
|||||||
"clientId": "${OAUTH_CLIENT_ID}",
|
"clientId": "${OAUTH_CLIENT_ID}",
|
||||||
"clientSecret": "${OAUTH_CLIENT_SECRET}",
|
"clientSecret": "${OAUTH_CLIENT_SECRET}",
|
||||||
"accessToken": "${OAUTH_ACCESS_TOKEN}",
|
"accessToken": "${OAUTH_ACCESS_TOKEN}",
|
||||||
"scopes": [
|
"scopes": ["read", "write"]
|
||||||
"read",
|
|
||||||
"write"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,103 +1,99 @@
|
|||||||
import { useState, useRef, useEffect } from 'react';
|
import { useState, useRef, useEffect } from 'react'
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next'
|
||||||
import { Group, Server, IGroupServerConfig } from '@/types';
|
import { Group, Server, IGroupServerConfig } from '@/types'
|
||||||
import {
|
import { Edit, Trash, Copy, Check, Link, FileCode, DropdownIcon, Wrench } from '@/components/icons/LucideIcons'
|
||||||
Edit,
|
import DeleteDialog from '@/components/ui/DeleteDialog'
|
||||||
Trash,
|
import { useToast } from '@/contexts/ToastContext'
|
||||||
Copy,
|
import { useSettingsData } from '@/hooks/useSettingsData'
|
||||||
Check,
|
|
||||||
Link,
|
|
||||||
FileCode,
|
|
||||||
DropdownIcon,
|
|
||||||
Wrench,
|
|
||||||
} from '@/components/icons/LucideIcons';
|
|
||||||
import DeleteDialog from '@/components/ui/DeleteDialog';
|
|
||||||
import { useToast } from '@/contexts/ToastContext';
|
|
||||||
import { useSettingsData } from '@/hooks/useSettingsData';
|
|
||||||
|
|
||||||
interface GroupCardProps {
|
interface GroupCardProps {
|
||||||
group: Group;
|
group: Group
|
||||||
servers: Server[];
|
servers: Server[]
|
||||||
onEdit: (group: Group) => void;
|
onEdit: (group: Group) => void
|
||||||
onDelete: (groupId: string) => void;
|
onDelete: (groupId: string) => void
|
||||||
}
|
}
|
||||||
|
|
||||||
const GroupCard = ({ group, servers, onEdit, onDelete }: GroupCardProps) => {
|
const GroupCard = ({
|
||||||
const { t } = useTranslation();
|
group,
|
||||||
const { showToast } = useToast();
|
servers,
|
||||||
const { installConfig } = useSettingsData();
|
onEdit,
|
||||||
const [showDeleteDialog, setShowDeleteDialog] = useState(false);
|
onDelete
|
||||||
const [copied, setCopied] = useState(false);
|
}: GroupCardProps) => {
|
||||||
const [showCopyDropdown, setShowCopyDropdown] = useState(false);
|
const { t } = useTranslation()
|
||||||
const [expandedServer, setExpandedServer] = useState<string | null>(null);
|
const { showToast } = useToast()
|
||||||
const dropdownRef = useRef<HTMLDivElement>(null);
|
const { installConfig } = useSettingsData()
|
||||||
|
const [showDeleteDialog, setShowDeleteDialog] = useState(false)
|
||||||
|
const [copied, setCopied] = useState(false)
|
||||||
|
const [showCopyDropdown, setShowCopyDropdown] = useState(false)
|
||||||
|
const [expandedServer, setExpandedServer] = useState<string | null>(null)
|
||||||
|
const dropdownRef = useRef<HTMLDivElement>(null)
|
||||||
|
|
||||||
// Close dropdown when clicking outside
|
// Close dropdown when clicking outside
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const handleClickOutside = (event: MouseEvent) => {
|
const handleClickOutside = (event: MouseEvent) => {
|
||||||
if (dropdownRef.current && !dropdownRef.current.contains(event.target as Node)) {
|
if (dropdownRef.current && !dropdownRef.current.contains(event.target as Node)) {
|
||||||
setShowCopyDropdown(false);
|
setShowCopyDropdown(false)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
|
||||||
|
|
||||||
document.addEventListener('mousedown', handleClickOutside);
|
document.addEventListener('mousedown', handleClickOutside)
|
||||||
return () => {
|
return () => {
|
||||||
document.removeEventListener('mousedown', handleClickOutside);
|
document.removeEventListener('mousedown', handleClickOutside)
|
||||||
};
|
}
|
||||||
}, []);
|
}, [])
|
||||||
|
|
||||||
const handleEdit = () => {
|
const handleEdit = () => {
|
||||||
onEdit(group);
|
onEdit(group)
|
||||||
};
|
}
|
||||||
|
|
||||||
const handleDelete = () => {
|
const handleDelete = () => {
|
||||||
setShowDeleteDialog(true);
|
setShowDeleteDialog(true)
|
||||||
};
|
}
|
||||||
|
|
||||||
const handleConfirmDelete = () => {
|
const handleConfirmDelete = () => {
|
||||||
onDelete(group.id);
|
onDelete(group.id)
|
||||||
setShowDeleteDialog(false);
|
setShowDeleteDialog(false)
|
||||||
};
|
}
|
||||||
|
|
||||||
const copyToClipboard = (text: string) => {
|
const copyToClipboard = (text: string) => {
|
||||||
if (navigator.clipboard && window.isSecureContext) {
|
if (navigator.clipboard && window.isSecureContext) {
|
||||||
navigator.clipboard.writeText(text).then(() => {
|
navigator.clipboard.writeText(text).then(() => {
|
||||||
setCopied(true);
|
setCopied(true)
|
||||||
setShowCopyDropdown(false);
|
setShowCopyDropdown(false)
|
||||||
showToast(t('common.copySuccess'), 'success');
|
showToast(t('common.copySuccess'), 'success')
|
||||||
setTimeout(() => setCopied(false), 2000);
|
setTimeout(() => setCopied(false), 2000)
|
||||||
});
|
})
|
||||||
} else {
|
} else {
|
||||||
// Fallback for HTTP or unsupported clipboard API
|
// Fallback for HTTP or unsupported clipboard API
|
||||||
const textArea = document.createElement('textarea');
|
const textArea = document.createElement('textarea')
|
||||||
textArea.value = text;
|
textArea.value = text
|
||||||
// Avoid scrolling to bottom
|
// Avoid scrolling to bottom
|
||||||
textArea.style.position = 'fixed';
|
textArea.style.position = 'fixed'
|
||||||
textArea.style.left = '-9999px';
|
textArea.style.left = '-9999px'
|
||||||
document.body.appendChild(textArea);
|
document.body.appendChild(textArea)
|
||||||
textArea.focus();
|
textArea.focus()
|
||||||
textArea.select();
|
textArea.select()
|
||||||
try {
|
try {
|
||||||
document.execCommand('copy');
|
document.execCommand('copy')
|
||||||
setCopied(true);
|
setCopied(true)
|
||||||
setShowCopyDropdown(false);
|
setShowCopyDropdown(false)
|
||||||
showToast(t('common.copySuccess'), 'success');
|
showToast(t('common.copySuccess'), 'success')
|
||||||
setTimeout(() => setCopied(false), 2000);
|
setTimeout(() => setCopied(false), 2000)
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
showToast(t('common.copyFailed') || 'Copy failed', 'error');
|
showToast(t('common.copyFailed') || 'Copy failed', 'error')
|
||||||
console.error('Copy to clipboard failed:', err);
|
console.error('Copy to clipboard failed:', err)
|
||||||
|
}
|
||||||
|
document.body.removeChild(textArea)
|
||||||
}
|
}
|
||||||
document.body.removeChild(textArea);
|
|
||||||
}
|
}
|
||||||
};
|
|
||||||
|
|
||||||
const handleCopyId = () => {
|
const handleCopyId = () => {
|
||||||
copyToClipboard(group.id);
|
copyToClipboard(group.id)
|
||||||
};
|
}
|
||||||
|
|
||||||
const handleCopyUrl = () => {
|
const handleCopyUrl = () => {
|
||||||
copyToClipboard(`${installConfig.baseUrl}/mcp/${group.id}`);
|
copyToClipboard(`${installConfig.baseUrl}/mcp/${group.id}`)
|
||||||
};
|
}
|
||||||
|
|
||||||
const handleCopyJson = () => {
|
const handleCopyJson = () => {
|
||||||
const jsonConfig = {
|
const jsonConfig = {
|
||||||
@@ -105,23 +101,23 @@ const GroupCard = ({ group, servers, onEdit, onDelete }: GroupCardProps) => {
|
|||||||
mcphub: {
|
mcphub: {
|
||||||
url: `${installConfig.baseUrl}/mcp/${group.id}`,
|
url: `${installConfig.baseUrl}/mcp/${group.id}`,
|
||||||
headers: {
|
headers: {
|
||||||
Authorization: 'Bearer <your-access-token>',
|
Authorization: "Bearer <your-access-token>"
|
||||||
},
|
}
|
||||||
},
|
}
|
||||||
},
|
}
|
||||||
};
|
}
|
||||||
copyToClipboard(JSON.stringify(jsonConfig, null, 2));
|
copyToClipboard(JSON.stringify(jsonConfig, null, 2))
|
||||||
};
|
}
|
||||||
|
|
||||||
// Helper function to normalize group servers to get server names
|
// Helper function to normalize group servers to get server names
|
||||||
const getServerNames = (servers: string[] | IGroupServerConfig[]): string[] => {
|
const getServerNames = (servers: string[] | IGroupServerConfig[]): string[] => {
|
||||||
return servers.map((server) => (typeof server === 'string' ? server : server.name));
|
return servers.map(server => typeof server === 'string' ? server : server.name);
|
||||||
};
|
};
|
||||||
|
|
||||||
// Helper function to get server configuration
|
// Helper function to get server configuration
|
||||||
const getServerConfig = (serverName: string): IGroupServerConfig | undefined => {
|
const getServerConfig = (serverName: string): IGroupServerConfig | undefined => {
|
||||||
const server = group.servers.find((s) =>
|
const server = group.servers.find(s =>
|
||||||
typeof s === 'string' ? s === serverName : s.name === serverName,
|
typeof s === 'string' ? s === serverName : s.name === serverName
|
||||||
);
|
);
|
||||||
if (typeof server === 'string') {
|
if (typeof server === 'string') {
|
||||||
return { name: server, tools: 'all' };
|
return { name: server, tools: 'all' };
|
||||||
@@ -131,11 +127,11 @@ const GroupCard = ({ group, servers, onEdit, onDelete }: GroupCardProps) => {
|
|||||||
|
|
||||||
// Get servers that belong to this group
|
// Get servers that belong to this group
|
||||||
const serverNames = getServerNames(group.servers);
|
const serverNames = getServerNames(group.servers);
|
||||||
const groupServers = servers.filter((server) => serverNames.includes(server.name));
|
const groupServers = servers.filter(server => serverNames.includes(server.name));
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="bg-white shadow rounded-lg p-4">
|
<div className="bg-white shadow rounded-lg p-6 ">
|
||||||
<div className="flex justify-between items-center">
|
<div className="flex justify-between items-center mb-4">
|
||||||
<div>
|
<div>
|
||||||
<div className="flex items-center">
|
<div className="flex items-center">
|
||||||
<h2 className="text-xl font-semibold text-gray-800">{group.name}</h2>
|
<h2 className="text-xl font-semibold text-gray-800">{group.name}</h2>
|
||||||
@@ -179,7 +175,9 @@ const GroupCard = ({ group, servers, onEdit, onDelete }: GroupCardProps) => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{group.description && <p className="text-gray-600 text-sm mt-1">{group.description}</p>}
|
{group.description && (
|
||||||
|
<p className="text-gray-600 text-sm mt-1">{group.description}</p>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
<div className="flex items-center space-x-3">
|
<div className="flex items-center space-x-3">
|
||||||
<div className="bg-blue-50 text-blue-700 px-3 py-1 rounded-full text-sm btn-secondary">
|
<div className="bg-blue-50 text-blue-700 px-3 py-1 rounded-full text-sm btn-secondary">
|
||||||
@@ -202,19 +200,17 @@ const GroupCard = ({ group, servers, onEdit, onDelete }: GroupCardProps) => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="">
|
<div className="mt-4">
|
||||||
{groupServers.length === 0 ? (
|
{groupServers.length === 0 ? (
|
||||||
<p className="text-gray-500 italic">{t('groups.noServers')}</p>
|
<p className="text-gray-500 italic">{t('groups.noServers')}</p>
|
||||||
) : (
|
) : (
|
||||||
<div className="flex flex-wrap gap-2">
|
<div className="flex flex-wrap gap-2">
|
||||||
{groupServers.map((server) => {
|
{groupServers.map(server => {
|
||||||
const serverConfig = getServerConfig(server.name);
|
const serverConfig = getServerConfig(server.name);
|
||||||
const hasToolRestrictions =
|
const hasToolRestrictions = serverConfig && serverConfig.tools !== 'all' && Array.isArray(serverConfig.tools);
|
||||||
serverConfig && serverConfig.tools !== 'all' && Array.isArray(serverConfig.tools);
|
const toolCount = hasToolRestrictions && Array.isArray(serverConfig?.tools)
|
||||||
const toolCount =
|
|
||||||
hasToolRestrictions && Array.isArray(serverConfig?.tools)
|
|
||||||
? serverConfig.tools.length
|
? serverConfig.tools.length
|
||||||
: server.tools?.length || 0; // Show total tool count when all tools are selected
|
: (server.tools?.length || 0); // Show total tool count when all tools are selected
|
||||||
|
|
||||||
const isExpanded = expandedServer === server.name;
|
const isExpanded = expandedServer === server.name;
|
||||||
|
|
||||||
@@ -223,7 +219,7 @@ const GroupCard = ({ group, servers, onEdit, onDelete }: GroupCardProps) => {
|
|||||||
if (hasToolRestrictions && Array.isArray(serverConfig?.tools)) {
|
if (hasToolRestrictions && Array.isArray(serverConfig?.tools)) {
|
||||||
return serverConfig.tools;
|
return serverConfig.tools;
|
||||||
} else if (server.tools && server.tools.length > 0) {
|
} else if (server.tools && server.tools.length > 0) {
|
||||||
return server.tools.map((tool) => tool.name);
|
return server.tools.map(tool => tool.name);
|
||||||
}
|
}
|
||||||
return [];
|
return [];
|
||||||
};
|
};
|
||||||
@@ -239,15 +235,9 @@ const GroupCard = ({ group, servers, onEdit, onDelete }: GroupCardProps) => {
|
|||||||
onClick={handleServerClick}
|
onClick={handleServerClick}
|
||||||
>
|
>
|
||||||
<span className="font-medium text-gray-700 text-sm">{server.name}</span>
|
<span className="font-medium text-gray-700 text-sm">{server.name}</span>
|
||||||
<span
|
<span className={`inline-block h-2 w-2 rounded-full ${server.status === 'connected' ? 'bg-green-500' :
|
||||||
className={`inline-block h-2 w-2 rounded-full ${
|
server.status === 'connecting' ? 'bg-yellow-500' : 'bg-red-500'
|
||||||
server.status === 'connected'
|
}`}></span>
|
||||||
? 'bg-green-500'
|
|
||||||
: server.status === 'connecting'
|
|
||||||
? 'bg-yellow-500'
|
|
||||||
: 'bg-red-500'
|
|
||||||
}`}
|
|
||||||
></span>
|
|
||||||
{toolCount > 0 && (
|
{toolCount > 0 && (
|
||||||
<span className="text-xs text-blue-600 bg-blue-100 px-2 py-0.5 rounded flex items-center gap-1">
|
<span className="text-xs text-blue-600 bg-blue-100 px-2 py-0.5 rounded flex items-center gap-1">
|
||||||
<Wrench size={12} />
|
<Wrench size={12} />
|
||||||
@@ -288,7 +278,7 @@ const GroupCard = ({ group, servers, onEdit, onDelete }: GroupCardProps) => {
|
|||||||
isGroup={true}
|
isGroup={true}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
);
|
)
|
||||||
};
|
}
|
||||||
|
|
||||||
export default GroupCard;
|
export default GroupCard
|
||||||
@@ -18,14 +18,7 @@ interface ServerCardProps {
|
|||||||
onReload?: (server: Server) => Promise<boolean>;
|
onReload?: (server: Server) => Promise<boolean>;
|
||||||
}
|
}
|
||||||
|
|
||||||
const ServerCard = ({
|
const ServerCard = ({ server, onRemove, onEdit, onToggle, onRefresh, onReload }: ServerCardProps) => {
|
||||||
server,
|
|
||||||
onRemove,
|
|
||||||
onEdit,
|
|
||||||
onToggle,
|
|
||||||
onRefresh,
|
|
||||||
onReload,
|
|
||||||
}: ServerCardProps) => {
|
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const { showToast } = useToast();
|
const { showToast } = useToast();
|
||||||
const [isExpanded, setIsExpanded] = useState(false);
|
const [isExpanded, setIsExpanded] = useState(false);
|
||||||
@@ -239,10 +232,10 @@ const ServerCard = ({
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<div
|
<div
|
||||||
className={`bg-white shadow rounded-lg mb-6 page-card transition-all duration-200 ${server.enabled === false ? 'opacity-60' : ''}`}
|
className={`bg-white shadow rounded-lg p-6 mb-6 page-card transition-all duration-200 ${server.enabled === false ? 'opacity-60' : ''}`}
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
className="flex justify-between items-center cursor-pointer p-4"
|
className="flex justify-between items-center cursor-pointer"
|
||||||
onClick={() => setIsExpanded(!isExpanded)}
|
onClick={() => setIsExpanded(!isExpanded)}
|
||||||
>
|
>
|
||||||
<div className="flex items-center space-x-3">
|
<div className="flex items-center space-x-3">
|
||||||
@@ -392,9 +385,9 @@ const ServerCard = ({
|
|||||||
{isExpanded && (
|
{isExpanded && (
|
||||||
<>
|
<>
|
||||||
{server.tools && (
|
{server.tools && (
|
||||||
<div className="px-4">
|
<div className="mt-6">
|
||||||
<h6
|
<h6
|
||||||
className={`font-medium ${server.enabled === false ? 'text-gray-600' : 'text-gray-900'} mb-2`}
|
className={`font-medium ${server.enabled === false ? 'text-gray-600' : 'text-gray-900'} mb-4`}
|
||||||
>
|
>
|
||||||
{t('server.tools')}
|
{t('server.tools')}
|
||||||
</h6>
|
</h6>
|
||||||
@@ -412,9 +405,9 @@ const ServerCard = ({
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
{server.prompts && (
|
{server.prompts && (
|
||||||
<div className="px-4 pb-2">
|
<div className="mt-6">
|
||||||
<h6
|
<h6
|
||||||
className={`font-medium ${server.enabled === false ? 'text-gray-600' : 'text-gray-900'}`}
|
className={`font-medium ${server.enabled === false ? 'text-gray-600' : 'text-gray-900'} mb-4`}
|
||||||
>
|
>
|
||||||
{t('server.prompts')}
|
{t('server.prompts')}
|
||||||
</h6>
|
</h6>
|
||||||
|
|||||||
@@ -1,20 +1,16 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { useTranslation } from 'react-i18next';
|
|
||||||
|
|
||||||
interface PaginationProps {
|
interface PaginationProps {
|
||||||
currentPage: number;
|
currentPage: number;
|
||||||
totalPages: number;
|
totalPages: number;
|
||||||
onPageChange: (page: number) => void;
|
onPageChange: (page: number) => void;
|
||||||
disabled?: boolean;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const Pagination: React.FC<PaginationProps> = ({
|
const Pagination: React.FC<PaginationProps> = ({
|
||||||
currentPage,
|
currentPage,
|
||||||
totalPages,
|
totalPages,
|
||||||
onPageChange,
|
onPageChange
|
||||||
disabled = false
|
|
||||||
}) => {
|
}) => {
|
||||||
const { t } = useTranslation();
|
|
||||||
// Generate page buttons
|
// Generate page buttons
|
||||||
const getPageButtons = () => {
|
const getPageButtons = () => {
|
||||||
const buttons = [];
|
const buttons = [];
|
||||||
@@ -99,26 +95,26 @@ const Pagination: React.FC<PaginationProps> = ({
|
|||||||
<div className="flex justify-center items-center my-6">
|
<div className="flex justify-center items-center my-6">
|
||||||
<button
|
<button
|
||||||
onClick={() => onPageChange(Math.max(1, currentPage - 1))}
|
onClick={() => onPageChange(Math.max(1, currentPage - 1))}
|
||||||
disabled={disabled || currentPage === 1}
|
disabled={currentPage === 1}
|
||||||
className={`px-3 py-1 rounded mr-2 ${disabled || currentPage === 1
|
className={`px-3 py-1 rounded mr-2 ${currentPage === 1
|
||||||
? 'bg-gray-100 text-gray-400 cursor-not-allowed'
|
? 'bg-gray-100 text-gray-400 cursor-not-allowed'
|
||||||
: 'bg-gray-200 hover:bg-gray-300 text-gray-700 btn-secondary'
|
: 'bg-gray-200 hover:bg-gray-300 text-gray-700 btn-secondary'
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
« {t('common.previous')}
|
« Prev
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<div className="flex">{getPageButtons()}</div>
|
<div className="flex">{getPageButtons()}</div>
|
||||||
|
|
||||||
<button
|
<button
|
||||||
onClick={() => onPageChange(Math.min(totalPages, currentPage + 1))}
|
onClick={() => onPageChange(Math.min(totalPages, currentPage + 1))}
|
||||||
disabled={disabled || currentPage === totalPages}
|
disabled={currentPage === totalPages}
|
||||||
className={`px-3 py-1 rounded ml-2 ${disabled || currentPage === totalPages
|
className={`px-3 py-1 rounded ml-2 ${currentPage === totalPages
|
||||||
? 'bg-gray-100 text-gray-400 cursor-not-allowed'
|
? 'bg-gray-100 text-gray-400 cursor-not-allowed'
|
||||||
: 'bg-gray-200 hover:bg-gray-300 text-gray-700 btn-secondary'
|
: 'bg-gray-200 hover:bg-gray-300 text-gray-700 btn-secondary'
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
{t('common.next')} »
|
Next »
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -171,9 +171,9 @@ const PromptCard = ({ prompt, server, onToggle, onDescriptionUpdate }: PromptCar
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="bg-white border border-gray-200 shadow rounded-lg mb-4">
|
<div className="bg-white border border-gray-200 shadow rounded-lg p-4 mb-4">
|
||||||
<div
|
<div
|
||||||
className="flex justify-between items-center p-2 cursor-pointer"
|
className="flex justify-between items-center cursor-pointer"
|
||||||
onClick={() => setIsExpanded(!isExpanded)}
|
onClick={() => setIsExpanded(!isExpanded)}
|
||||||
>
|
>
|
||||||
<div className="flex-1">
|
<div className="flex-1">
|
||||||
|
|||||||
@@ -1,27 +1,19 @@
|
|||||||
import { useState, useCallback, useRef, useEffect } from 'react';
|
import { useState, useCallback, useRef, useEffect } from 'react'
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next'
|
||||||
import { Tool } from '@/types';
|
import { Tool } from '@/types'
|
||||||
import {
|
import { ChevronDown, ChevronRight, Play, Loader, Edit, Check, Copy } from '@/components/icons/LucideIcons'
|
||||||
ChevronDown,
|
import { callTool, ToolCallResult, updateToolDescription } from '@/services/toolService'
|
||||||
ChevronRight,
|
import { useSettingsData } from '@/hooks/useSettingsData'
|
||||||
Play,
|
import { useToast } from '@/contexts/ToastContext'
|
||||||
Loader,
|
import { Switch } from './ToggleGroup'
|
||||||
Edit,
|
import DynamicForm from './DynamicForm'
|
||||||
Check,
|
import ToolResult from './ToolResult'
|
||||||
Copy,
|
|
||||||
} from '@/components/icons/LucideIcons';
|
|
||||||
import { callTool, ToolCallResult, updateToolDescription } from '@/services/toolService';
|
|
||||||
import { useSettingsData } from '@/hooks/useSettingsData';
|
|
||||||
import { useToast } from '@/contexts/ToastContext';
|
|
||||||
import { Switch } from './ToggleGroup';
|
|
||||||
import DynamicForm from './DynamicForm';
|
|
||||||
import ToolResult from './ToolResult';
|
|
||||||
|
|
||||||
interface ToolCardProps {
|
interface ToolCardProps {
|
||||||
server: string;
|
server: string
|
||||||
tool: Tool;
|
tool: Tool
|
||||||
onToggle?: (toolName: string, enabled: boolean) => void;
|
onToggle?: (toolName: string, enabled: boolean) => void
|
||||||
onDescriptionUpdate?: (toolName: string, description: string) => void;
|
onDescriptionUpdate?: (toolName: string, description: string) => void
|
||||||
}
|
}
|
||||||
|
|
||||||
// Helper to check for "empty" values
|
// Helper to check for "empty" values
|
||||||
@@ -34,173 +26,165 @@ function isEmptyValue(value: any): boolean {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const ToolCard = ({ tool, server, onToggle, onDescriptionUpdate }: ToolCardProps) => {
|
const ToolCard = ({ tool, server, onToggle, onDescriptionUpdate }: ToolCardProps) => {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation()
|
||||||
const { showToast } = useToast();
|
const { showToast } = useToast()
|
||||||
const { nameSeparator } = useSettingsData();
|
const { nameSeparator } = useSettingsData()
|
||||||
const [isExpanded, setIsExpanded] = useState(false);
|
const [isExpanded, setIsExpanded] = useState(false)
|
||||||
const [showRunForm, setShowRunForm] = useState(false);
|
const [showRunForm, setShowRunForm] = useState(false)
|
||||||
const [isRunning, setIsRunning] = useState(false);
|
const [isRunning, setIsRunning] = useState(false)
|
||||||
const [result, setResult] = useState<ToolCallResult | null>(null);
|
const [result, setResult] = useState<ToolCallResult | null>(null)
|
||||||
const [isEditingDescription, setIsEditingDescription] = useState(false);
|
const [isEditingDescription, setIsEditingDescription] = useState(false)
|
||||||
const [customDescription, setCustomDescription] = useState(tool.description || '');
|
const [customDescription, setCustomDescription] = useState(tool.description || '')
|
||||||
const descriptionInputRef = useRef<HTMLInputElement>(null);
|
const descriptionInputRef = useRef<HTMLInputElement>(null)
|
||||||
const descriptionTextRef = useRef<HTMLSpanElement>(null);
|
const descriptionTextRef = useRef<HTMLSpanElement>(null)
|
||||||
const [textWidth, setTextWidth] = useState<number>(0);
|
const [textWidth, setTextWidth] = useState<number>(0)
|
||||||
const [copiedToolName, setCopiedToolName] = useState(false);
|
const [copiedToolName, setCopiedToolName] = useState(false)
|
||||||
|
|
||||||
// Focus the input when editing mode is activated
|
// Focus the input when editing mode is activated
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (isEditingDescription && descriptionInputRef.current) {
|
if (isEditingDescription && descriptionInputRef.current) {
|
||||||
descriptionInputRef.current.focus();
|
descriptionInputRef.current.focus()
|
||||||
// Set input width to match text width
|
// Set input width to match text width
|
||||||
if (textWidth > 0) {
|
if (textWidth > 0) {
|
||||||
descriptionInputRef.current.style.width = `${textWidth + 20}px`; // Add some padding
|
descriptionInputRef.current.style.width = `${textWidth + 20}px` // Add some padding
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, [isEditingDescription, textWidth]);
|
}, [isEditingDescription, textWidth])
|
||||||
|
|
||||||
// Measure text width when not editing
|
// Measure text width when not editing
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!isEditingDescription && descriptionTextRef.current) {
|
if (!isEditingDescription && descriptionTextRef.current) {
|
||||||
setTextWidth(descriptionTextRef.current.offsetWidth);
|
setTextWidth(descriptionTextRef.current.offsetWidth)
|
||||||
}
|
}
|
||||||
}, [isEditingDescription, customDescription]);
|
}, [isEditingDescription, customDescription])
|
||||||
|
|
||||||
// Generate a unique key for localStorage based on tool name and server
|
// Generate a unique key for localStorage based on tool name and server
|
||||||
const getStorageKey = useCallback(() => {
|
const getStorageKey = useCallback(() => {
|
||||||
return `mcphub_tool_form_${server ? `${server}_` : ''}${tool.name}`;
|
return `mcphub_tool_form_${server ? `${server}_` : ''}${tool.name}`
|
||||||
}, [tool.name, server]);
|
}, [tool.name, server])
|
||||||
|
|
||||||
// Clear form data from localStorage
|
// Clear form data from localStorage
|
||||||
const clearStoredFormData = useCallback(() => {
|
const clearStoredFormData = useCallback(() => {
|
||||||
localStorage.removeItem(getStorageKey());
|
localStorage.removeItem(getStorageKey())
|
||||||
}, [getStorageKey]);
|
}, [getStorageKey])
|
||||||
|
|
||||||
const handleToggle = (enabled: boolean) => {
|
const handleToggle = (enabled: boolean) => {
|
||||||
if (onToggle) {
|
if (onToggle) {
|
||||||
onToggle(tool.name, enabled);
|
onToggle(tool.name, enabled)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
|
||||||
|
|
||||||
const handleDescriptionEdit = () => {
|
const handleDescriptionEdit = () => {
|
||||||
setIsEditingDescription(true);
|
setIsEditingDescription(true)
|
||||||
};
|
}
|
||||||
|
|
||||||
const handleDescriptionSave = async () => {
|
const handleDescriptionSave = async () => {
|
||||||
try {
|
try {
|
||||||
const result = await updateToolDescription(server, tool.name, customDescription);
|
const result = await updateToolDescription(server, tool.name, customDescription)
|
||||||
if (result.success) {
|
if (result.success) {
|
||||||
setIsEditingDescription(false);
|
setIsEditingDescription(false)
|
||||||
if (onDescriptionUpdate) {
|
if (onDescriptionUpdate) {
|
||||||
onDescriptionUpdate(tool.name, customDescription);
|
onDescriptionUpdate(tool.name, customDescription)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Revert on error
|
// Revert on error
|
||||||
setCustomDescription(tool.description || '');
|
setCustomDescription(tool.description || '')
|
||||||
console.error('Failed to update tool description:', result.error);
|
console.error('Failed to update tool description:', result.error)
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Error updating tool description:', error);
|
console.error('Error updating tool description:', error)
|
||||||
setCustomDescription(tool.description || '');
|
setCustomDescription(tool.description || '')
|
||||||
setIsEditingDescription(false);
|
setIsEditingDescription(false)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
|
||||||
|
|
||||||
const handleDescriptionChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
const handleDescriptionChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||||
setCustomDescription(e.target.value);
|
setCustomDescription(e.target.value)
|
||||||
};
|
}
|
||||||
|
|
||||||
const handleDescriptionKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
|
const handleDescriptionKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
|
||||||
if (e.key === 'Enter') {
|
if (e.key === 'Enter') {
|
||||||
handleDescriptionSave();
|
handleDescriptionSave()
|
||||||
} else if (e.key === 'Escape') {
|
} else if (e.key === 'Escape') {
|
||||||
setCustomDescription(tool.description || '');
|
setCustomDescription(tool.description || '')
|
||||||
setIsEditingDescription(false);
|
setIsEditingDescription(false)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
|
||||||
|
|
||||||
const handleCopyToolName = async (e: React.MouseEvent) => {
|
const handleCopyToolName = async (e: React.MouseEvent) => {
|
||||||
e.stopPropagation();
|
e.stopPropagation()
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if (navigator.clipboard && window.isSecureContext) {
|
if (navigator.clipboard && window.isSecureContext) {
|
||||||
await navigator.clipboard.writeText(tool.name);
|
await navigator.clipboard.writeText(tool.name)
|
||||||
setCopiedToolName(true);
|
setCopiedToolName(true)
|
||||||
showToast(t('common.copySuccess'), 'success');
|
showToast(t('common.copySuccess'), 'success')
|
||||||
setTimeout(() => setCopiedToolName(false), 2000);
|
setTimeout(() => setCopiedToolName(false), 2000)
|
||||||
} else {
|
} else {
|
||||||
// Fallback for HTTP or unsupported clipboard API
|
// Fallback for HTTP or unsupported clipboard API
|
||||||
const textArea = document.createElement('textarea');
|
const textArea = document.createElement('textarea')
|
||||||
textArea.value = tool.name;
|
textArea.value = tool.name
|
||||||
textArea.style.position = 'fixed';
|
textArea.style.position = 'fixed'
|
||||||
textArea.style.left = '-9999px';
|
textArea.style.left = '-9999px'
|
||||||
document.body.appendChild(textArea);
|
document.body.appendChild(textArea)
|
||||||
textArea.focus();
|
textArea.focus()
|
||||||
textArea.select();
|
textArea.select()
|
||||||
try {
|
try {
|
||||||
document.execCommand('copy');
|
document.execCommand('copy')
|
||||||
setCopiedToolName(true);
|
setCopiedToolName(true)
|
||||||
showToast(t('common.copySuccess'), 'success');
|
showToast(t('common.copySuccess'), 'success')
|
||||||
setTimeout(() => setCopiedToolName(false), 2000);
|
setTimeout(() => setCopiedToolName(false), 2000)
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
showToast(t('common.copyFailed'), 'error');
|
showToast(t('common.copyFailed'), 'error')
|
||||||
console.error('Copy to clipboard failed:', err);
|
console.error('Copy to clipboard failed:', err)
|
||||||
}
|
}
|
||||||
document.body.removeChild(textArea);
|
document.body.removeChild(textArea)
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
showToast(t('common.copyFailed'), 'error');
|
showToast(t('common.copyFailed'), 'error')
|
||||||
console.error('Copy to clipboard failed:', error);
|
console.error('Copy to clipboard failed:', error)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
|
||||||
|
|
||||||
const handleRunTool = async (arguments_: Record<string, any>) => {
|
const handleRunTool = async (arguments_: Record<string, any>) => {
|
||||||
setIsRunning(true);
|
setIsRunning(true)
|
||||||
try {
|
try {
|
||||||
// filter empty values
|
// filter empty values
|
||||||
arguments_ = Object.fromEntries(
|
arguments_ = Object.fromEntries(Object.entries(arguments_).filter(([_, v]) => !isEmptyValue(v)))
|
||||||
Object.entries(arguments_).filter(([_, v]) => !isEmptyValue(v)),
|
const result = await callTool({
|
||||||
);
|
|
||||||
const result = await callTool(
|
|
||||||
{
|
|
||||||
toolName: tool.name,
|
toolName: tool.name,
|
||||||
arguments: arguments_,
|
arguments: arguments_,
|
||||||
},
|
}, server)
|
||||||
server,
|
|
||||||
);
|
|
||||||
|
|
||||||
setResult(result);
|
setResult(result)
|
||||||
// Clear form data on successful submission
|
// Clear form data on successful submission
|
||||||
// clearStoredFormData()
|
// clearStoredFormData()
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
setResult({
|
setResult({
|
||||||
success: false,
|
success: false,
|
||||||
error: error instanceof Error ? error.message : 'Unknown error occurred',
|
error: error instanceof Error ? error.message : 'Unknown error occurred',
|
||||||
});
|
})
|
||||||
} finally {
|
} finally {
|
||||||
setIsRunning(false);
|
setIsRunning(false)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
|
||||||
|
|
||||||
const handleCancelRun = () => {
|
const handleCancelRun = () => {
|
||||||
setShowRunForm(false);
|
setShowRunForm(false)
|
||||||
// Clear form data when cancelled
|
// Clear form data when cancelled
|
||||||
clearStoredFormData();
|
clearStoredFormData()
|
||||||
setResult(null);
|
setResult(null)
|
||||||
};
|
}
|
||||||
|
|
||||||
const handleCloseResult = () => {
|
const handleCloseResult = () => {
|
||||||
setResult(null);
|
setResult(null)
|
||||||
};
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="bg-white border border-gray-200 shadow rounded-lg mb-4">
|
<div className="bg-white border border-gray-200 shadow rounded-lg p-4 mb-4">
|
||||||
<div
|
<div
|
||||||
className="flex justify-between items-center cursor-pointer p-2"
|
className="flex justify-between items-center cursor-pointer"
|
||||||
onClick={(e) => {
|
onClick={() => setIsExpanded(!isExpanded)}
|
||||||
e.stopPropagation();
|
|
||||||
setIsExpanded(!isExpanded);
|
|
||||||
}}
|
|
||||||
>
|
>
|
||||||
<div className="flex-1">
|
<div className="flex-1">
|
||||||
<h3 className="text-lg font-medium text-gray-900 inline-flex items-center">
|
<h3 className="text-lg font-medium text-gray-900 inline-flex items-center">
|
||||||
@@ -210,7 +194,11 @@ const ToolCard = ({ tool, server, onToggle, onDescriptionUpdate }: ToolCardProps
|
|||||||
onClick={handleCopyToolName}
|
onClick={handleCopyToolName}
|
||||||
title={t('common.copy')}
|
title={t('common.copy')}
|
||||||
>
|
>
|
||||||
{copiedToolName ? <Check size={16} className="text-green-500" /> : <Copy size={16} />}
|
{copiedToolName ? (
|
||||||
|
<Check size={16} className="text-green-500" />
|
||||||
|
) : (
|
||||||
|
<Copy size={16} />
|
||||||
|
)}
|
||||||
</button>
|
</button>
|
||||||
<span className="ml-2 text-sm font-normal text-gray-600 inline-flex items-center">
|
<span className="ml-2 text-sm font-normal text-gray-600 inline-flex items-center">
|
||||||
{isEditingDescription ? (
|
{isEditingDescription ? (
|
||||||
@@ -225,14 +213,14 @@ const ToolCard = ({ tool, server, onToggle, onDescriptionUpdate }: ToolCardProps
|
|||||||
onClick={(e) => e.stopPropagation()}
|
onClick={(e) => e.stopPropagation()}
|
||||||
style={{
|
style={{
|
||||||
minWidth: '100px',
|
minWidth: '100px',
|
||||||
width: textWidth > 0 ? `${textWidth + 20}px` : 'auto',
|
width: textWidth > 0 ? `${textWidth + 20}px` : 'auto'
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<button
|
<button
|
||||||
className="ml-2 p-1 text-green-600 hover:text-green-800 cursor-pointer transition-colors"
|
className="ml-2 p-1 text-green-600 hover:text-green-800 cursor-pointer transition-colors"
|
||||||
onClick={(e) => {
|
onClick={(e) => {
|
||||||
e.stopPropagation();
|
e.stopPropagation()
|
||||||
handleDescriptionSave();
|
handleDescriptionSave()
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Check size={16} />
|
<Check size={16} />
|
||||||
@@ -240,14 +228,12 @@ const ToolCard = ({ tool, server, onToggle, onDescriptionUpdate }: ToolCardProps
|
|||||||
</>
|
</>
|
||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
<span ref={descriptionTextRef}>
|
<span ref={descriptionTextRef}>{customDescription || t('tool.noDescription')}</span>
|
||||||
{customDescription || t('tool.noDescription')}
|
|
||||||
</span>
|
|
||||||
<button
|
<button
|
||||||
className="ml-2 p-1 text-gray-500 hover:text-blue-600 cursor-pointer transition-colors"
|
className="ml-2 p-1 text-gray-500 hover:text-blue-600 cursor-pointer transition-colors"
|
||||||
onClick={(e) => {
|
onClick={(e) => {
|
||||||
e.stopPropagation();
|
e.stopPropagation()
|
||||||
handleDescriptionEdit();
|
handleDescriptionEdit()
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Edit size={14} />
|
<Edit size={14} />
|
||||||
@@ -258,7 +244,10 @@ const ToolCard = ({ tool, server, onToggle, onDescriptionUpdate }: ToolCardProps
|
|||||||
</h3>
|
</h3>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex items-center space-x-2">
|
<div className="flex items-center space-x-2">
|
||||||
<div className="flex items-center space-x-2" onClick={(e) => e.stopPropagation()}>
|
<div
|
||||||
|
className="flex items-center space-x-2"
|
||||||
|
onClick={(e) => e.stopPropagation()}
|
||||||
|
>
|
||||||
<Switch
|
<Switch
|
||||||
checked={tool.enabled ?? true}
|
checked={tool.enabled ?? true}
|
||||||
onCheckedChange={handleToggle}
|
onCheckedChange={handleToggle}
|
||||||
@@ -267,14 +256,18 @@ const ToolCard = ({ tool, server, onToggle, onDescriptionUpdate }: ToolCardProps
|
|||||||
</div>
|
</div>
|
||||||
<button
|
<button
|
||||||
onClick={(e) => {
|
onClick={(e) => {
|
||||||
e.stopPropagation();
|
e.stopPropagation()
|
||||||
setIsExpanded(true); // Ensure card is expanded when showing run form
|
setIsExpanded(true) // Ensure card is expanded when showing run form
|
||||||
setShowRunForm(true);
|
setShowRunForm(true)
|
||||||
}}
|
}}
|
||||||
className="flex items-center space-x-1 px-3 py-1 text-sm text-blue-600 bg-blue-50 hover:bg-blue-100 rounded-md transition-colors btn-primary"
|
className="flex items-center space-x-1 px-3 py-1 text-sm text-blue-600 bg-blue-50 hover:bg-blue-100 rounded-md transition-colors btn-primary"
|
||||||
disabled={isRunning || !tool.enabled}
|
disabled={isRunning || !tool.enabled}
|
||||||
>
|
>
|
||||||
{isRunning ? <Loader size={14} className="animate-spin" /> : <Play size={14} />}
|
{isRunning ? (
|
||||||
|
<Loader size={14} className="animate-spin" />
|
||||||
|
) : (
|
||||||
|
<Play size={14} />
|
||||||
|
)}
|
||||||
<span>{isRunning ? t('tool.running') : t('tool.run')}</span>
|
<span>{isRunning ? t('tool.running') : t('tool.run')}</span>
|
||||||
</button>
|
</button>
|
||||||
<button className="text-gray-400 hover:text-gray-600">
|
<button className="text-gray-400 hover:text-gray-600">
|
||||||
@@ -304,9 +297,7 @@ const ToolCard = ({ tool, server, onToggle, onDescriptionUpdate }: ToolCardProps
|
|||||||
onCancel={handleCancelRun}
|
onCancel={handleCancelRun}
|
||||||
loading={isRunning}
|
loading={isRunning}
|
||||||
storageKey={getStorageKey()}
|
storageKey={getStorageKey()}
|
||||||
title={t('tool.runToolWithName', {
|
title={t('tool.runToolWithName', { name: tool.name.replace(server + nameSeparator, '') })}
|
||||||
name: tool.name.replace(server + nameSeparator, ''),
|
|
||||||
})}
|
|
||||||
/>
|
/>
|
||||||
{/* Tool Result */}
|
{/* Tool Result */}
|
||||||
{result && (
|
{result && (
|
||||||
@@ -316,10 +307,12 @@ const ToolCard = ({ tool, server, onToggle, onDescriptionUpdate }: ToolCardProps
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
);
|
)
|
||||||
};
|
}
|
||||||
|
|
||||||
export default ToolCard;
|
export default ToolCard
|
||||||
@@ -17,16 +17,6 @@ const CONFIG = {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
// Pagination info type
|
|
||||||
interface PaginationInfo {
|
|
||||||
page: number;
|
|
||||||
limit: number;
|
|
||||||
total: number;
|
|
||||||
totalPages: number;
|
|
||||||
hasNextPage: boolean;
|
|
||||||
hasPrevPage: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Context type definition
|
// Context type definition
|
||||||
interface ServerContextType {
|
interface ServerContextType {
|
||||||
servers: Server[];
|
servers: Server[];
|
||||||
@@ -34,11 +24,6 @@ interface ServerContextType {
|
|||||||
setError: (error: string | null) => void;
|
setError: (error: string | null) => void;
|
||||||
isLoading: boolean;
|
isLoading: boolean;
|
||||||
fetchAttempts: number;
|
fetchAttempts: number;
|
||||||
pagination: PaginationInfo | null;
|
|
||||||
currentPage: number;
|
|
||||||
serversPerPage: number;
|
|
||||||
setCurrentPage: (page: number) => void;
|
|
||||||
setServersPerPage: (limit: number) => void;
|
|
||||||
triggerRefresh: () => void;
|
triggerRefresh: () => void;
|
||||||
refreshIfNeeded: () => void; // Smart refresh with debounce
|
refreshIfNeeded: () => void; // Smart refresh with debounce
|
||||||
handleServerAdd: () => void;
|
handleServerAdd: () => void;
|
||||||
@@ -60,9 +45,6 @@ export const ServerProvider: React.FC<{ children: React.ReactNode }> = ({ childr
|
|||||||
const [refreshKey, setRefreshKey] = useState(0);
|
const [refreshKey, setRefreshKey] = useState(0);
|
||||||
const [isInitialLoading, setIsInitialLoading] = useState(true);
|
const [isInitialLoading, setIsInitialLoading] = useState(true);
|
||||||
const [fetchAttempts, setFetchAttempts] = useState(0);
|
const [fetchAttempts, setFetchAttempts] = useState(0);
|
||||||
const [pagination, setPagination] = useState<PaginationInfo | null>(null);
|
|
||||||
const [currentPage, setCurrentPage] = useState(1);
|
|
||||||
const [serversPerPage, setServersPerPage] = useState(10);
|
|
||||||
|
|
||||||
// Timer reference for polling
|
// Timer reference for polling
|
||||||
const intervalRef = useRef<NodeJS.Timeout | null>(null);
|
const intervalRef = useRef<NodeJS.Timeout | null>(null);
|
||||||
@@ -91,31 +73,18 @@ export const ServerProvider: React.FC<{ children: React.ReactNode }> = ({ childr
|
|||||||
const fetchServers = async () => {
|
const fetchServers = async () => {
|
||||||
try {
|
try {
|
||||||
console.log('[ServerContext] Fetching servers from API...');
|
console.log('[ServerContext] Fetching servers from API...');
|
||||||
// Build query parameters for pagination
|
const data = await apiGet('/servers');
|
||||||
const params = new URLSearchParams();
|
|
||||||
params.append('page', currentPage.toString());
|
|
||||||
params.append('limit', serversPerPage.toString());
|
|
||||||
const data = await apiGet(`/servers?${params.toString()}`);
|
|
||||||
|
|
||||||
// Update last fetch time
|
// Update last fetch time
|
||||||
lastFetchTimeRef.current = Date.now();
|
lastFetchTimeRef.current = Date.now();
|
||||||
|
|
||||||
if (data && data.success && Array.isArray(data.data)) {
|
if (data && data.success && Array.isArray(data.data)) {
|
||||||
setServers(data.data);
|
setServers(data.data);
|
||||||
// Update pagination info if available
|
|
||||||
if (data.pagination) {
|
|
||||||
setPagination(data.pagination);
|
|
||||||
} else {
|
|
||||||
setPagination(null);
|
|
||||||
}
|
|
||||||
} else if (data && Array.isArray(data)) {
|
} else if (data && Array.isArray(data)) {
|
||||||
// Compatibility handling for non-paginated responses
|
|
||||||
setServers(data);
|
setServers(data);
|
||||||
setPagination(null);
|
|
||||||
} else {
|
} else {
|
||||||
console.error('Invalid server data format:', data);
|
console.error('Invalid server data format:', data);
|
||||||
setServers([]);
|
setServers([]);
|
||||||
setPagination(null);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Reset error state
|
// Reset error state
|
||||||
@@ -145,7 +114,7 @@ export const ServerProvider: React.FC<{ children: React.ReactNode }> = ({ childr
|
|||||||
// Set up regular polling
|
// Set up regular polling
|
||||||
intervalRef.current = setInterval(fetchServers, CONFIG.normal.pollingInterval);
|
intervalRef.current = setInterval(fetchServers, CONFIG.normal.pollingInterval);
|
||||||
},
|
},
|
||||||
[t, currentPage, serversPerPage],
|
[t],
|
||||||
);
|
);
|
||||||
|
|
||||||
// Watch for authentication status changes
|
// Watch for authentication status changes
|
||||||
@@ -181,11 +150,7 @@ export const ServerProvider: React.FC<{ children: React.ReactNode }> = ({ childr
|
|||||||
const fetchInitialData = async () => {
|
const fetchInitialData = async () => {
|
||||||
try {
|
try {
|
||||||
console.log('[ServerContext] Initial fetch - attempt', attemptsRef.current + 1);
|
console.log('[ServerContext] Initial fetch - attempt', attemptsRef.current + 1);
|
||||||
// Build query parameters for pagination
|
const data = await apiGet('/servers');
|
||||||
const params = new URLSearchParams();
|
|
||||||
params.append('page', currentPage.toString());
|
|
||||||
params.append('limit', serversPerPage.toString());
|
|
||||||
const data = await apiGet(`/servers?${params.toString()}`);
|
|
||||||
|
|
||||||
// Update last fetch time
|
// Update last fetch time
|
||||||
lastFetchTimeRef.current = Date.now();
|
lastFetchTimeRef.current = Date.now();
|
||||||
@@ -193,12 +158,6 @@ export const ServerProvider: React.FC<{ children: React.ReactNode }> = ({ childr
|
|||||||
// Handle API response wrapper object, extract data field
|
// Handle API response wrapper object, extract data field
|
||||||
if (data && data.success && Array.isArray(data.data)) {
|
if (data && data.success && Array.isArray(data.data)) {
|
||||||
setServers(data.data);
|
setServers(data.data);
|
||||||
// Update pagination info if available
|
|
||||||
if (data.pagination) {
|
|
||||||
setPagination(data.pagination);
|
|
||||||
} else {
|
|
||||||
setPagination(null);
|
|
||||||
}
|
|
||||||
setIsInitialLoading(false);
|
setIsInitialLoading(false);
|
||||||
// Initialization successful, start normal polling (skip immediate to avoid duplicate fetch)
|
// Initialization successful, start normal polling (skip immediate to avoid duplicate fetch)
|
||||||
startNormalPolling({ immediate: false });
|
startNormalPolling({ immediate: false });
|
||||||
@@ -206,7 +165,6 @@ export const ServerProvider: React.FC<{ children: React.ReactNode }> = ({ childr
|
|||||||
} else if (data && Array.isArray(data)) {
|
} else if (data && Array.isArray(data)) {
|
||||||
// Compatibility handling, if API directly returns array
|
// Compatibility handling, if API directly returns array
|
||||||
setServers(data);
|
setServers(data);
|
||||||
setPagination(null);
|
|
||||||
setIsInitialLoading(false);
|
setIsInitialLoading(false);
|
||||||
// Initialization successful, start normal polling (skip immediate to avoid duplicate fetch)
|
// Initialization successful, start normal polling (skip immediate to avoid duplicate fetch)
|
||||||
startNormalPolling({ immediate: false });
|
startNormalPolling({ immediate: false });
|
||||||
@@ -215,7 +173,6 @@ export const ServerProvider: React.FC<{ children: React.ReactNode }> = ({ childr
|
|||||||
// If data format is not as expected, set to empty array
|
// If data format is not as expected, set to empty array
|
||||||
console.error('Invalid server data format:', data);
|
console.error('Invalid server data format:', data);
|
||||||
setServers([]);
|
setServers([]);
|
||||||
setPagination(null);
|
|
||||||
setIsInitialLoading(false);
|
setIsInitialLoading(false);
|
||||||
// Initialization successful but data is empty, start normal polling (skip immediate)
|
// Initialization successful but data is empty, start normal polling (skip immediate)
|
||||||
startNormalPolling({ immediate: false });
|
startNormalPolling({ immediate: false });
|
||||||
@@ -270,7 +227,7 @@ export const ServerProvider: React.FC<{ children: React.ReactNode }> = ({ childr
|
|||||||
return () => {
|
return () => {
|
||||||
clearTimer();
|
clearTimer();
|
||||||
};
|
};
|
||||||
}, [refreshKey, t, isInitialLoading, startNormalPolling, currentPage, serversPerPage]);
|
}, [refreshKey, t, isInitialLoading, startNormalPolling]);
|
||||||
|
|
||||||
// Manually trigger refresh (always refreshes)
|
// Manually trigger refresh (always refreshes)
|
||||||
const triggerRefresh = useCallback(() => {
|
const triggerRefresh = useCallback(() => {
|
||||||
@@ -426,28 +383,12 @@ export const ServerProvider: React.FC<{ children: React.ReactNode }> = ({ childr
|
|||||||
[t, triggerRefresh],
|
[t, triggerRefresh],
|
||||||
);
|
);
|
||||||
|
|
||||||
// Handle page change
|
|
||||||
const handlePageChange = useCallback((page: number) => {
|
|
||||||
setCurrentPage(page);
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
// Handle servers per page change
|
|
||||||
const handleServersPerPageChange = useCallback((limit: number) => {
|
|
||||||
setServersPerPage(limit);
|
|
||||||
setCurrentPage(1); // Reset to first page when changing page size
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const value: ServerContextType = {
|
const value: ServerContextType = {
|
||||||
servers,
|
servers,
|
||||||
error,
|
error,
|
||||||
setError,
|
setError,
|
||||||
isLoading: isInitialLoading,
|
isLoading: isInitialLoading,
|
||||||
fetchAttempts,
|
fetchAttempts,
|
||||||
pagination,
|
|
||||||
currentPage,
|
|
||||||
serversPerPage,
|
|
||||||
setCurrentPage: handlePageChange,
|
|
||||||
setServersPerPage: handleServersPerPageChange,
|
|
||||||
triggerRefresh,
|
triggerRefresh,
|
||||||
refreshIfNeeded,
|
refreshIfNeeded,
|
||||||
handleServerAdd,
|
handleServerAdd,
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ import EditServerForm from '@/components/EditServerForm';
|
|||||||
import { useServerData } from '@/hooks/useServerData';
|
import { useServerData } from '@/hooks/useServerData';
|
||||||
import DxtUploadForm from '@/components/DxtUploadForm';
|
import DxtUploadForm from '@/components/DxtUploadForm';
|
||||||
import JSONImportForm from '@/components/JSONImportForm';
|
import JSONImportForm from '@/components/JSONImportForm';
|
||||||
import Pagination from '@/components/ui/Pagination';
|
|
||||||
|
|
||||||
const ServersPage: React.FC = () => {
|
const ServersPage: React.FC = () => {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
@@ -18,11 +17,6 @@ const ServersPage: React.FC = () => {
|
|||||||
error,
|
error,
|
||||||
setError,
|
setError,
|
||||||
isLoading,
|
isLoading,
|
||||||
pagination,
|
|
||||||
currentPage,
|
|
||||||
serversPerPage,
|
|
||||||
setCurrentPage,
|
|
||||||
setServersPerPage,
|
|
||||||
handleServerAdd,
|
handleServerAdd,
|
||||||
handleServerEdit,
|
handleServerEdit,
|
||||||
handleServerRemove,
|
handleServerRemove,
|
||||||
@@ -157,7 +151,6 @@ const ServersPage: React.FC = () => {
|
|||||||
<p className="text-gray-600">{t('app.noServers')}</p>
|
<p className="text-gray-600">{t('app.noServers')}</p>
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<>
|
|
||||||
<div className="space-y-6">
|
<div className="space-y-6">
|
||||||
{servers.map((server, index) => (
|
{servers.map((server, index) => (
|
||||||
<ServerCard
|
<ServerCard
|
||||||
@@ -171,52 +164,6 @@ const ServersPage: React.FC = () => {
|
|||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="flex items-center mb-4">
|
|
||||||
<div className="flex-[2] text-sm text-gray-500">
|
|
||||||
{pagination ? (
|
|
||||||
t('common.showing', {
|
|
||||||
start: (pagination.page - 1) * pagination.limit + 1,
|
|
||||||
end: Math.min(pagination.page * pagination.limit, pagination.total),
|
|
||||||
total: pagination.total
|
|
||||||
})
|
|
||||||
) : (
|
|
||||||
t('common.showing', {
|
|
||||||
start: 1,
|
|
||||||
end: servers.length,
|
|
||||||
total: servers.length
|
|
||||||
})
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
<div className="flex-[4] flex justify-center">
|
|
||||||
{pagination && pagination.totalPages > 1 && (
|
|
||||||
<Pagination
|
|
||||||
currentPage={currentPage}
|
|
||||||
totalPages={pagination.totalPages}
|
|
||||||
onPageChange={setCurrentPage}
|
|
||||||
disabled={isLoading}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
<div className="flex-[2] flex items-center justify-end space-x-2">
|
|
||||||
<label htmlFor="perPage" className="text-sm text-gray-600">
|
|
||||||
{t('common.itemsPerPage')}:
|
|
||||||
</label>
|
|
||||||
<select
|
|
||||||
id="perPage"
|
|
||||||
value={serversPerPage}
|
|
||||||
onChange={(e) => setServersPerPage(Number(e.target.value))}
|
|
||||||
disabled={isLoading}
|
|
||||||
className="border rounded p-1 text-sm btn-secondary outline-none disabled:opacity-50 disabled:cursor-not-allowed"
|
|
||||||
>
|
|
||||||
<option value={5}>5</option>
|
|
||||||
<option value={10}>10</option>
|
|
||||||
<option value={20}>20</option>
|
|
||||||
<option value={50}>50</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</>
|
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{editingServer && (
|
{editingServer && (
|
||||||
|
|||||||
@@ -105,17 +105,6 @@ export interface Prompt {
|
|||||||
enabled?: boolean;
|
enabled?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Proxychains4 configuration for STDIO servers (Linux/macOS only)
|
|
||||||
export interface ProxychainsConfig {
|
|
||||||
enabled?: boolean; // Enable/disable proxychains4 proxy routing
|
|
||||||
type?: 'socks4' | 'socks5' | 'http'; // Proxy protocol type
|
|
||||||
host?: string; // Proxy server hostname or IP address
|
|
||||||
port?: number; // Proxy server port
|
|
||||||
username?: string; // Proxy authentication username (optional)
|
|
||||||
password?: string; // Proxy authentication password (optional)
|
|
||||||
configPath?: string; // Path to custom proxychains4 configuration file (optional)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Server config types
|
// Server config types
|
||||||
export interface ServerConfig {
|
export interface ServerConfig {
|
||||||
type?: 'stdio' | 'sse' | 'streamable-http' | 'openapi';
|
type?: 'stdio' | 'sse' | 'streamable-http' | 'openapi';
|
||||||
@@ -134,8 +123,6 @@ export interface ServerConfig {
|
|||||||
resetTimeoutOnProgress?: boolean; // Reset timeout on progress notifications
|
resetTimeoutOnProgress?: boolean; // Reset timeout on progress notifications
|
||||||
maxTotalTimeout?: number; // Maximum total timeout in milliseconds
|
maxTotalTimeout?: number; // Maximum total timeout in milliseconds
|
||||||
}; // MCP request options configuration
|
}; // MCP request options configuration
|
||||||
// Proxychains4 proxy configuration for STDIO servers (Linux/macOS only, Windows not supported)
|
|
||||||
proxy?: ProxychainsConfig;
|
|
||||||
// OAuth authentication for upstream MCP servers
|
// OAuth authentication for upstream MCP servers
|
||||||
oauth?: {
|
oauth?: {
|
||||||
clientId?: string; // OAuth client ID
|
clientId?: string; // OAuth client ID
|
||||||
|
|||||||
@@ -248,10 +248,6 @@
|
|||||||
"wechat": "WeChat",
|
"wechat": "WeChat",
|
||||||
"discord": "Discord",
|
"discord": "Discord",
|
||||||
"required": "Required",
|
"required": "Required",
|
||||||
"itemsPerPage": "Items per page",
|
|
||||||
"showing": "Showing {{start}}-{{end}} of {{total}}",
|
|
||||||
"previous": "Previous",
|
|
||||||
"next": "Next",
|
|
||||||
"secret": "Secret",
|
"secret": "Secret",
|
||||||
"default": "Default",
|
"default": "Default",
|
||||||
"value": "Value",
|
"value": "Value",
|
||||||
|
|||||||
@@ -248,10 +248,6 @@
|
|||||||
"github": "GitHub",
|
"github": "GitHub",
|
||||||
"wechat": "WeChat",
|
"wechat": "WeChat",
|
||||||
"discord": "Discord",
|
"discord": "Discord",
|
||||||
"itemsPerPage": "Éléments par page",
|
|
||||||
"showing": "Affichage de {{start}}-{{end}} sur {{total}}",
|
|
||||||
"previous": "Précédent",
|
|
||||||
"next": "Suivant",
|
|
||||||
"required": "Requis",
|
"required": "Requis",
|
||||||
"secret": "Secret",
|
"secret": "Secret",
|
||||||
"default": "Défaut",
|
"default": "Défaut",
|
||||||
|
|||||||
@@ -248,10 +248,6 @@
|
|||||||
"github": "GitHub",
|
"github": "GitHub",
|
||||||
"wechat": "WeChat",
|
"wechat": "WeChat",
|
||||||
"discord": "Discord",
|
"discord": "Discord",
|
||||||
"itemsPerPage": "Sayfa başına öğe",
|
|
||||||
"showing": "{{total}} öğeden {{start}}-{{end}} gösteriliyor",
|
|
||||||
"previous": "Önceki",
|
|
||||||
"next": "Sonraki",
|
|
||||||
"required": "Gerekli",
|
"required": "Gerekli",
|
||||||
"secret": "Gizli",
|
"secret": "Gizli",
|
||||||
"default": "Varsayılan",
|
"default": "Varsayılan",
|
||||||
|
|||||||
@@ -248,10 +248,6 @@
|
|||||||
"dismiss": "忽略",
|
"dismiss": "忽略",
|
||||||
"github": "GitHub",
|
"github": "GitHub",
|
||||||
"wechat": "微信",
|
"wechat": "微信",
|
||||||
"itemsPerPage": "每页显示",
|
|
||||||
"showing": "显示第 {{start}}-{{end}} 条,共 {{total}} 条",
|
|
||||||
"previous": "上一页",
|
|
||||||
"next": "下一页",
|
|
||||||
"discord": "Discord",
|
"discord": "Discord",
|
||||||
"required": "必填",
|
"required": "必填",
|
||||||
"secret": "敏感",
|
"secret": "敏感",
|
||||||
|
|||||||
@@ -46,7 +46,7 @@
|
|||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@apidevtools/swagger-parser": "^12.0.0",
|
"@apidevtools/swagger-parser": "^12.0.0",
|
||||||
"@modelcontextprotocol/sdk": "^1.25.1",
|
"@modelcontextprotocol/sdk": "^1.20.2",
|
||||||
"@node-oauth/oauth2-server": "^5.2.1",
|
"@node-oauth/oauth2-server": "^5.2.1",
|
||||||
"@types/adm-zip": "^0.5.7",
|
"@types/adm-zip": "^0.5.7",
|
||||||
"@types/bcrypt": "^6.0.0",
|
"@types/bcrypt": "^6.0.0",
|
||||||
@@ -57,7 +57,7 @@
|
|||||||
"bcrypt": "^6.0.0",
|
"bcrypt": "^6.0.0",
|
||||||
"bcryptjs": "^3.0.2",
|
"bcryptjs": "^3.0.2",
|
||||||
"cors": "^2.8.5",
|
"cors": "^2.8.5",
|
||||||
"dotenv": "^17.2.3",
|
"dotenv": "^16.6.1",
|
||||||
"dotenv-expand": "^12.0.2",
|
"dotenv-expand": "^12.0.2",
|
||||||
"express": "^4.21.2",
|
"express": "^4.21.2",
|
||||||
"express-validator": "^7.3.1",
|
"express-validator": "^7.3.1",
|
||||||
@@ -108,7 +108,7 @@
|
|||||||
"jest-environment-node": "^30.0.5",
|
"jest-environment-node": "^30.0.5",
|
||||||
"jest-mock-extended": "4.0.0",
|
"jest-mock-extended": "4.0.0",
|
||||||
"lucide-react": "^0.552.0",
|
"lucide-react": "^0.552.0",
|
||||||
"next": "^16.1.1",
|
"next": "^15.5.0",
|
||||||
"postcss": "^8.5.6",
|
"postcss": "^8.5.6",
|
||||||
"prettier": "^3.6.2",
|
"prettier": "^3.6.2",
|
||||||
"react": "19.2.1",
|
"react": "19.2.1",
|
||||||
|
|||||||
425
pnpm-lock.yaml
generated
425
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
@@ -7,7 +7,6 @@ import {
|
|||||||
BatchCreateServersResponse,
|
BatchCreateServersResponse,
|
||||||
BatchServerResult,
|
BatchServerResult,
|
||||||
ServerConfig,
|
ServerConfig,
|
||||||
ServerInfo,
|
|
||||||
} from '../types/index.js';
|
} from '../types/index.js';
|
||||||
import {
|
import {
|
||||||
getServersInfo,
|
getServersInfo,
|
||||||
@@ -25,66 +24,13 @@ import { createSafeJSON } from '../utils/serialization.js';
|
|||||||
import { cloneDefaultOAuthServerConfig } from '../constants/oauthServerDefaults.js';
|
import { cloneDefaultOAuthServerConfig } from '../constants/oauthServerDefaults.js';
|
||||||
import { getServerDao, getGroupDao, getSystemConfigDao } from '../dao/DaoFactory.js';
|
import { getServerDao, getGroupDao, getSystemConfigDao } from '../dao/DaoFactory.js';
|
||||||
import { getBearerKeyDao } from '../dao/DaoFactory.js';
|
import { getBearerKeyDao } from '../dao/DaoFactory.js';
|
||||||
import { UserContextService } from '../services/userContextService.js';
|
|
||||||
|
|
||||||
export const getAllServers = async (req: Request, res: Response): Promise<void> => {
|
export const getAllServers = async (_: Request, res: Response): Promise<void> => {
|
||||||
try {
|
try {
|
||||||
// Parse pagination parameters from query string
|
const serversInfo = await getServersInfo();
|
||||||
const page = req.query.page ? parseInt(req.query.page as string, 10) : 1;
|
|
||||||
const limit = req.query.limit ? parseInt(req.query.limit as string, 10) : undefined;
|
|
||||||
|
|
||||||
// Validate pagination parameters
|
|
||||||
if (page < 1) {
|
|
||||||
res.status(400).json({
|
|
||||||
success: false,
|
|
||||||
message: 'Page number must be greater than 0',
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (limit !== undefined && (limit < 1 || limit > 1000)) {
|
|
||||||
res.status(400).json({
|
|
||||||
success: false,
|
|
||||||
message: 'Limit must be between 1 and 1000',
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get current user for filtering
|
|
||||||
const currentUser = UserContextService.getInstance().getCurrentUser();
|
|
||||||
const isAdmin = !currentUser || currentUser.isAdmin;
|
|
||||||
|
|
||||||
// Get servers info with pagination if limit is specified
|
|
||||||
let serversInfo: Omit<ServerInfo, 'client' | 'transport'>[];
|
|
||||||
let pagination = undefined;
|
|
||||||
|
|
||||||
if (limit !== undefined) {
|
|
||||||
// Use DAO layer pagination with proper filtering
|
|
||||||
const serverDao = getServerDao();
|
|
||||||
const paginatedResult = isAdmin
|
|
||||||
? await serverDao.findAllPaginated(page, limit)
|
|
||||||
: await serverDao.findByOwnerPaginated(currentUser!.username, page, limit);
|
|
||||||
|
|
||||||
// Get runtime info for paginated servers
|
|
||||||
serversInfo = await getServersInfo(page, limit, currentUser);
|
|
||||||
|
|
||||||
pagination = {
|
|
||||||
page: paginatedResult.page,
|
|
||||||
limit: paginatedResult.limit,
|
|
||||||
total: paginatedResult.total,
|
|
||||||
totalPages: paginatedResult.totalPages,
|
|
||||||
hasNextPage: paginatedResult.page < paginatedResult.totalPages,
|
|
||||||
hasPrevPage: paginatedResult.page > 1,
|
|
||||||
};
|
|
||||||
} else {
|
|
||||||
// No pagination, get all servers (will be filtered by mcpService)
|
|
||||||
serversInfo = await getServersInfo();
|
|
||||||
}
|
|
||||||
|
|
||||||
const response: ApiResponse = {
|
const response: ApiResponse = {
|
||||||
success: true,
|
success: true,
|
||||||
data: createSafeJSON(serversInfo),
|
data: createSafeJSON(serversInfo),
|
||||||
...(pagination && { pagination }),
|
|
||||||
};
|
};
|
||||||
res.json(response);
|
res.json(response);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@@ -618,9 +564,10 @@ export const updateServer = async (req: Request, res: Response): Promise<void> =
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
console.error('Failed to update server:', error);
|
||||||
res.status(500).json({
|
res.status(500).json({
|
||||||
success: false,
|
success: false,
|
||||||
message: 'Internal server error',
|
message: error instanceof Error ? error.message : 'Internal server error',
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import { UserConfigDao, UserConfigDaoImpl } from './UserConfigDao.js';
|
|||||||
import { OAuthClientDao, OAuthClientDaoImpl } from './OAuthClientDao.js';
|
import { OAuthClientDao, OAuthClientDaoImpl } from './OAuthClientDao.js';
|
||||||
import { OAuthTokenDao, OAuthTokenDaoImpl } from './OAuthTokenDao.js';
|
import { OAuthTokenDao, OAuthTokenDaoImpl } from './OAuthTokenDao.js';
|
||||||
import { BearerKeyDao, BearerKeyDaoImpl } from './BearerKeyDao.js';
|
import { BearerKeyDao, BearerKeyDaoImpl } from './BearerKeyDao.js';
|
||||||
|
import { ToolCallActivityDao } from './ToolCallActivityDao.js';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* DAO Factory interface for creating DAO instances
|
* DAO Factory interface for creating DAO instances
|
||||||
@@ -19,6 +20,7 @@ export interface DaoFactory {
|
|||||||
getOAuthClientDao(): OAuthClientDao;
|
getOAuthClientDao(): OAuthClientDao;
|
||||||
getOAuthTokenDao(): OAuthTokenDao;
|
getOAuthTokenDao(): OAuthTokenDao;
|
||||||
getBearerKeyDao(): BearerKeyDao;
|
getBearerKeyDao(): BearerKeyDao;
|
||||||
|
getToolCallActivityDao(): ToolCallActivityDao | null; // Only available in DB mode
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -106,6 +108,11 @@ export class JsonFileDaoFactory implements DaoFactory {
|
|||||||
return this.bearerKeyDao;
|
return this.bearerKeyDao;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getToolCallActivityDao(): ToolCallActivityDao | null {
|
||||||
|
// Tool call activity is only available in DB mode
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Reset all cached DAO instances (useful for testing)
|
* Reset all cached DAO instances (useful for testing)
|
||||||
*/
|
*/
|
||||||
@@ -194,3 +201,14 @@ export function getOAuthTokenDao(): OAuthTokenDao {
|
|||||||
export function getBearerKeyDao(): BearerKeyDao {
|
export function getBearerKeyDao(): BearerKeyDao {
|
||||||
return getDaoFactory().getBearerKeyDao();
|
return getDaoFactory().getBearerKeyDao();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function getToolCallActivityDao(): ToolCallActivityDao | null {
|
||||||
|
return getDaoFactory().getToolCallActivityDao();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if the application is using database mode
|
||||||
|
*/
|
||||||
|
export function isUsingDatabase(): boolean {
|
||||||
|
return getDaoFactory().getToolCallActivityDao() !== null;
|
||||||
|
}
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import {
|
|||||||
OAuthClientDao,
|
OAuthClientDao,
|
||||||
OAuthTokenDao,
|
OAuthTokenDao,
|
||||||
BearerKeyDao,
|
BearerKeyDao,
|
||||||
|
ToolCallActivityDao,
|
||||||
} from './index.js';
|
} from './index.js';
|
||||||
import { UserDaoDbImpl } from './UserDaoDbImpl.js';
|
import { UserDaoDbImpl } from './UserDaoDbImpl.js';
|
||||||
import { ServerDaoDbImpl } from './ServerDaoDbImpl.js';
|
import { ServerDaoDbImpl } from './ServerDaoDbImpl.js';
|
||||||
@@ -17,6 +18,7 @@ import { UserConfigDaoDbImpl } from './UserConfigDaoDbImpl.js';
|
|||||||
import { OAuthClientDaoDbImpl } from './OAuthClientDaoDbImpl.js';
|
import { OAuthClientDaoDbImpl } from './OAuthClientDaoDbImpl.js';
|
||||||
import { OAuthTokenDaoDbImpl } from './OAuthTokenDaoDbImpl.js';
|
import { OAuthTokenDaoDbImpl } from './OAuthTokenDaoDbImpl.js';
|
||||||
import { BearerKeyDaoDbImpl } from './BearerKeyDaoDbImpl.js';
|
import { BearerKeyDaoDbImpl } from './BearerKeyDaoDbImpl.js';
|
||||||
|
import { ToolCallActivityDaoDbImpl } from './ToolCallActivityDao.js';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Database-backed DAO factory implementation
|
* Database-backed DAO factory implementation
|
||||||
@@ -32,6 +34,7 @@ export class DatabaseDaoFactory implements DaoFactory {
|
|||||||
private oauthClientDao: OAuthClientDao | null = null;
|
private oauthClientDao: OAuthClientDao | null = null;
|
||||||
private oauthTokenDao: OAuthTokenDao | null = null;
|
private oauthTokenDao: OAuthTokenDao | null = null;
|
||||||
private bearerKeyDao: BearerKeyDao | null = null;
|
private bearerKeyDao: BearerKeyDao | null = null;
|
||||||
|
private toolCallActivityDao: ToolCallActivityDao | null = null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get singleton instance
|
* Get singleton instance
|
||||||
@@ -103,6 +106,13 @@ export class DatabaseDaoFactory implements DaoFactory {
|
|||||||
return this.bearerKeyDao!;
|
return this.bearerKeyDao!;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getToolCallActivityDao(): ToolCallActivityDao | null {
|
||||||
|
if (!this.toolCallActivityDao) {
|
||||||
|
this.toolCallActivityDao = new ToolCallActivityDaoDbImpl();
|
||||||
|
}
|
||||||
|
return this.toolCallActivityDao;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Reset all cached DAO instances (useful for testing)
|
* Reset all cached DAO instances (useful for testing)
|
||||||
*/
|
*/
|
||||||
@@ -115,5 +125,6 @@ export class DatabaseDaoFactory implements DaoFactory {
|
|||||||
this.oauthClientDao = null;
|
this.oauthClientDao = null;
|
||||||
this.oauthTokenDao = null;
|
this.oauthTokenDao = null;
|
||||||
this.bearerKeyDao = null;
|
this.bearerKeyDao = null;
|
||||||
|
this.toolCallActivityDao = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,31 +2,10 @@ import { ServerConfig } from '../types/index.js';
|
|||||||
import { BaseDao } from './base/BaseDao.js';
|
import { BaseDao } from './base/BaseDao.js';
|
||||||
import { JsonFileBaseDao } from './base/JsonFileBaseDao.js';
|
import { JsonFileBaseDao } from './base/JsonFileBaseDao.js';
|
||||||
|
|
||||||
/**
|
|
||||||
* Pagination result interface
|
|
||||||
*/
|
|
||||||
export interface PaginatedResult<T> {
|
|
||||||
data: T[];
|
|
||||||
total: number;
|
|
||||||
page: number;
|
|
||||||
limit: number;
|
|
||||||
totalPages: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Server DAO interface with server-specific operations
|
* Server DAO interface with server-specific operations
|
||||||
*/
|
*/
|
||||||
export interface ServerDao extends BaseDao<ServerConfigWithName, string> {
|
export interface ServerDao extends BaseDao<ServerConfigWithName, string> {
|
||||||
/**
|
|
||||||
* Find all servers with pagination
|
|
||||||
*/
|
|
||||||
findAllPaginated(page: number, limit: number): Promise<PaginatedResult<ServerConfigWithName>>;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Find servers by owner with pagination
|
|
||||||
*/
|
|
||||||
findByOwnerPaginated(owner: string, page: number, limit: number): Promise<PaginatedResult<ServerConfigWithName>>;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Find servers by owner
|
* Find servers by owner
|
||||||
*/
|
*/
|
||||||
@@ -197,61 +176,6 @@ export class ServerDaoImpl extends JsonFileBaseDao implements ServerDao {
|
|||||||
return servers.length;
|
return servers.length;
|
||||||
}
|
}
|
||||||
|
|
||||||
async findAllPaginated(page: number, limit: number): Promise<PaginatedResult<ServerConfigWithName>> {
|
|
||||||
const allServers = await this.getAll();
|
|
||||||
// Sort: enabled servers first, then by creation time
|
|
||||||
const sortedServers = allServers.sort((a, b) => {
|
|
||||||
const aEnabled = a.enabled !== false;
|
|
||||||
const bEnabled = b.enabled !== false;
|
|
||||||
if (aEnabled !== bEnabled) {
|
|
||||||
return aEnabled ? -1 : 1;
|
|
||||||
}
|
|
||||||
return 0; // Keep original order for same enabled status
|
|
||||||
});
|
|
||||||
|
|
||||||
const total = sortedServers.length;
|
|
||||||
const totalPages = Math.ceil(total / limit);
|
|
||||||
const startIndex = (page - 1) * limit;
|
|
||||||
const endIndex = startIndex + limit;
|
|
||||||
const data = sortedServers.slice(startIndex, endIndex);
|
|
||||||
|
|
||||||
return {
|
|
||||||
data,
|
|
||||||
total,
|
|
||||||
page,
|
|
||||||
limit,
|
|
||||||
totalPages,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
async findByOwnerPaginated(owner: string, page: number, limit: number): Promise<PaginatedResult<ServerConfigWithName>> {
|
|
||||||
const allServers = await this.getAll();
|
|
||||||
const filteredServers = allServers.filter((server) => server.owner === owner);
|
|
||||||
// Sort: enabled servers first, then by creation time
|
|
||||||
const sortedServers = filteredServers.sort((a, b) => {
|
|
||||||
const aEnabled = a.enabled !== false;
|
|
||||||
const bEnabled = b.enabled !== false;
|
|
||||||
if (aEnabled !== bEnabled) {
|
|
||||||
return aEnabled ? -1 : 1;
|
|
||||||
}
|
|
||||||
return 0; // Keep original order for same enabled status
|
|
||||||
});
|
|
||||||
|
|
||||||
const total = sortedServers.length;
|
|
||||||
const totalPages = Math.ceil(total / limit);
|
|
||||||
const startIndex = (page - 1) * limit;
|
|
||||||
const endIndex = startIndex + limit;
|
|
||||||
const data = sortedServers.slice(startIndex, endIndex);
|
|
||||||
|
|
||||||
return {
|
|
||||||
data,
|
|
||||||
total,
|
|
||||||
page,
|
|
||||||
limit,
|
|
||||||
totalPages,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
async findByOwner(owner: string): Promise<ServerConfigWithName[]> {
|
async findByOwner(owner: string): Promise<ServerConfigWithName[]> {
|
||||||
const servers = await this.getAll();
|
const servers = await this.getAll();
|
||||||
return servers.filter((server) => server.owner === owner);
|
return servers.filter((server) => server.owner === owner);
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { ServerDao, ServerConfigWithName, PaginatedResult } from './index.js';
|
import { ServerDao, ServerConfigWithName } from './index.js';
|
||||||
import { ServerRepository } from '../db/repositories/ServerRepository.js';
|
import { ServerRepository } from '../db/repositories/ServerRepository.js';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -16,32 +16,6 @@ export class ServerDaoDbImpl implements ServerDao {
|
|||||||
return servers.map((s) => this.mapToServerConfig(s));
|
return servers.map((s) => this.mapToServerConfig(s));
|
||||||
}
|
}
|
||||||
|
|
||||||
async findAllPaginated(page: number, limit: number): Promise<PaginatedResult<ServerConfigWithName>> {
|
|
||||||
const { data, total } = await this.repository.findAllPaginated(page, limit);
|
|
||||||
const totalPages = Math.ceil(total / limit);
|
|
||||||
|
|
||||||
return {
|
|
||||||
data: data.map((s) => this.mapToServerConfig(s)),
|
|
||||||
total,
|
|
||||||
page,
|
|
||||||
limit,
|
|
||||||
totalPages,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
async findByOwnerPaginated(owner: string, page: number, limit: number): Promise<PaginatedResult<ServerConfigWithName>> {
|
|
||||||
const { data, total } = await this.repository.findByOwnerPaginated(owner, page, limit);
|
|
||||||
const totalPages = Math.ceil(total / limit);
|
|
||||||
|
|
||||||
return {
|
|
||||||
data: data.map((s) => this.mapToServerConfig(s)),
|
|
||||||
total,
|
|
||||||
page,
|
|
||||||
limit,
|
|
||||||
totalPages,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
async findById(name: string): Promise<ServerConfigWithName | null> {
|
async findById(name: string): Promise<ServerConfigWithName | null> {
|
||||||
const server = await this.repository.findByName(name);
|
const server = await this.repository.findByName(name);
|
||||||
return server ? this.mapToServerConfig(server) : null;
|
return server ? this.mapToServerConfig(server) : null;
|
||||||
@@ -64,7 +38,6 @@ export class ServerDaoDbImpl implements ServerDao {
|
|||||||
prompts: entity.prompts,
|
prompts: entity.prompts,
|
||||||
options: entity.options,
|
options: entity.options,
|
||||||
oauth: entity.oauth,
|
oauth: entity.oauth,
|
||||||
proxy: entity.proxy,
|
|
||||||
openapi: entity.openapi,
|
openapi: entity.openapi,
|
||||||
});
|
});
|
||||||
return this.mapToServerConfig(server);
|
return this.mapToServerConfig(server);
|
||||||
@@ -89,7 +62,6 @@ export class ServerDaoDbImpl implements ServerDao {
|
|||||||
prompts: entity.prompts,
|
prompts: entity.prompts,
|
||||||
options: entity.options,
|
options: entity.options,
|
||||||
oauth: entity.oauth,
|
oauth: entity.oauth,
|
||||||
proxy: entity.proxy,
|
|
||||||
openapi: entity.openapi,
|
openapi: entity.openapi,
|
||||||
});
|
});
|
||||||
return server ? this.mapToServerConfig(server) : null;
|
return server ? this.mapToServerConfig(server) : null;
|
||||||
@@ -168,7 +140,6 @@ export class ServerDaoDbImpl implements ServerDao {
|
|||||||
prompts?: Record<string, { enabled: boolean; description?: string }>;
|
prompts?: Record<string, { enabled: boolean; description?: string }>;
|
||||||
options?: Record<string, any>;
|
options?: Record<string, any>;
|
||||||
oauth?: Record<string, any>;
|
oauth?: Record<string, any>;
|
||||||
proxy?: Record<string, any>;
|
|
||||||
openapi?: Record<string, any>;
|
openapi?: Record<string, any>;
|
||||||
}): ServerConfigWithName {
|
}): ServerConfigWithName {
|
||||||
return {
|
return {
|
||||||
@@ -187,7 +158,6 @@ export class ServerDaoDbImpl implements ServerDao {
|
|||||||
prompts: server.prompts,
|
prompts: server.prompts,
|
||||||
options: server.options,
|
options: server.options,
|
||||||
oauth: server.oauth,
|
oauth: server.oauth,
|
||||||
proxy: server.proxy,
|
|
||||||
openapi: server.openapi,
|
openapi: server.openapi,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
186
src/dao/ToolCallActivityDao.ts
Normal file
186
src/dao/ToolCallActivityDao.ts
Normal file
@@ -0,0 +1,186 @@
|
|||||||
|
import {
|
||||||
|
IToolCallActivity,
|
||||||
|
IToolCallActivitySearchParams,
|
||||||
|
IToolCallActivityPage,
|
||||||
|
IToolCallActivityStats,
|
||||||
|
} from '../types/index.js';
|
||||||
|
import { ToolCallActivityRepository } from '../db/repositories/ToolCallActivityRepository.js';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tool Call Activity DAO interface (DB mode only)
|
||||||
|
*/
|
||||||
|
export interface ToolCallActivityDao {
|
||||||
|
/**
|
||||||
|
* Create a new tool call activity
|
||||||
|
*/
|
||||||
|
create(activity: Omit<IToolCallActivity, 'id' | 'createdAt'>): Promise<IToolCallActivity>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find activity by ID
|
||||||
|
*/
|
||||||
|
findById(id: string): Promise<IToolCallActivity | null>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update an existing activity
|
||||||
|
*/
|
||||||
|
update(id: string, updates: Partial<IToolCallActivity>): Promise<IToolCallActivity | null>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Delete an activity
|
||||||
|
*/
|
||||||
|
delete(id: string): Promise<boolean>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find activities with pagination and filtering
|
||||||
|
*/
|
||||||
|
findWithPagination(
|
||||||
|
page: number,
|
||||||
|
pageSize: number,
|
||||||
|
params?: IToolCallActivitySearchParams,
|
||||||
|
): Promise<IToolCallActivityPage>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get recent activities
|
||||||
|
*/
|
||||||
|
findRecent(limit: number): Promise<IToolCallActivity[]>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get activity statistics
|
||||||
|
*/
|
||||||
|
getStats(): Promise<IToolCallActivityStats>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Delete old activities (cleanup)
|
||||||
|
*/
|
||||||
|
deleteOlderThan(date: Date): Promise<number>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Count total activities
|
||||||
|
*/
|
||||||
|
count(): Promise<number>;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Database-backed implementation of ToolCallActivityDao
|
||||||
|
*/
|
||||||
|
export class ToolCallActivityDaoDbImpl implements ToolCallActivityDao {
|
||||||
|
private repository: ToolCallActivityRepository;
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
this.repository = new ToolCallActivityRepository();
|
||||||
|
}
|
||||||
|
|
||||||
|
async create(activity: Omit<IToolCallActivity, 'id' | 'createdAt'>): Promise<IToolCallActivity> {
|
||||||
|
const created = await this.repository.create({
|
||||||
|
serverName: activity.serverName,
|
||||||
|
toolName: activity.toolName,
|
||||||
|
keyId: activity.keyId,
|
||||||
|
keyName: activity.keyName,
|
||||||
|
status: activity.status,
|
||||||
|
request: activity.request,
|
||||||
|
response: activity.response,
|
||||||
|
errorMessage: activity.errorMessage,
|
||||||
|
durationMs: activity.durationMs,
|
||||||
|
clientIp: activity.clientIp,
|
||||||
|
sessionId: activity.sessionId,
|
||||||
|
groupName: activity.groupName,
|
||||||
|
});
|
||||||
|
return this.mapToInterface(created);
|
||||||
|
}
|
||||||
|
|
||||||
|
async findById(id: string): Promise<IToolCallActivity | null> {
|
||||||
|
const activity = await this.repository.findById(id);
|
||||||
|
return activity ? this.mapToInterface(activity) : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
async update(
|
||||||
|
id: string,
|
||||||
|
updates: Partial<IToolCallActivity>,
|
||||||
|
): Promise<IToolCallActivity | null> {
|
||||||
|
const updated = await this.repository.update(id, {
|
||||||
|
serverName: updates.serverName,
|
||||||
|
toolName: updates.toolName,
|
||||||
|
keyId: updates.keyId,
|
||||||
|
keyName: updates.keyName,
|
||||||
|
status: updates.status,
|
||||||
|
request: updates.request,
|
||||||
|
response: updates.response,
|
||||||
|
errorMessage: updates.errorMessage,
|
||||||
|
durationMs: updates.durationMs,
|
||||||
|
clientIp: updates.clientIp,
|
||||||
|
sessionId: updates.sessionId,
|
||||||
|
groupName: updates.groupName,
|
||||||
|
});
|
||||||
|
return updated ? this.mapToInterface(updated) : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
async delete(id: string): Promise<boolean> {
|
||||||
|
return await this.repository.delete(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
async findWithPagination(
|
||||||
|
page: number = 1,
|
||||||
|
pageSize: number = 20,
|
||||||
|
params: IToolCallActivitySearchParams = {},
|
||||||
|
): Promise<IToolCallActivityPage> {
|
||||||
|
const result = await this.repository.findWithPagination(page, pageSize, params);
|
||||||
|
return {
|
||||||
|
items: result.items.map((item) => this.mapToInterface(item)),
|
||||||
|
total: result.total,
|
||||||
|
page: result.page,
|
||||||
|
pageSize: result.pageSize,
|
||||||
|
totalPages: result.totalPages,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async findRecent(limit: number = 10): Promise<IToolCallActivity[]> {
|
||||||
|
const activities = await this.repository.findRecent(limit);
|
||||||
|
return activities.map((activity) => this.mapToInterface(activity));
|
||||||
|
}
|
||||||
|
|
||||||
|
async getStats(): Promise<IToolCallActivityStats> {
|
||||||
|
return await this.repository.getStats();
|
||||||
|
}
|
||||||
|
|
||||||
|
async deleteOlderThan(date: Date): Promise<number> {
|
||||||
|
return await this.repository.deleteOlderThan(date);
|
||||||
|
}
|
||||||
|
|
||||||
|
async count(): Promise<number> {
|
||||||
|
return await this.repository.count();
|
||||||
|
}
|
||||||
|
|
||||||
|
private mapToInterface(activity: {
|
||||||
|
id: string;
|
||||||
|
serverName: string;
|
||||||
|
toolName: string;
|
||||||
|
keyId?: string;
|
||||||
|
keyName?: string;
|
||||||
|
status: 'pending' | 'success' | 'error';
|
||||||
|
request?: string;
|
||||||
|
response?: string;
|
||||||
|
errorMessage?: string;
|
||||||
|
durationMs?: number;
|
||||||
|
clientIp?: string;
|
||||||
|
sessionId?: string;
|
||||||
|
groupName?: string;
|
||||||
|
createdAt: Date;
|
||||||
|
}): IToolCallActivity {
|
||||||
|
return {
|
||||||
|
id: activity.id,
|
||||||
|
serverName: activity.serverName,
|
||||||
|
toolName: activity.toolName,
|
||||||
|
keyId: activity.keyId,
|
||||||
|
keyName: activity.keyName,
|
||||||
|
status: activity.status,
|
||||||
|
request: activity.request,
|
||||||
|
response: activity.response,
|
||||||
|
errorMessage: activity.errorMessage,
|
||||||
|
durationMs: activity.durationMs,
|
||||||
|
clientIp: activity.clientIp,
|
||||||
|
sessionId: activity.sessionId,
|
||||||
|
groupName: activity.groupName,
|
||||||
|
createdAt: activity.createdAt,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -9,6 +9,7 @@ export * from './UserConfigDao.js';
|
|||||||
export * from './OAuthClientDao.js';
|
export * from './OAuthClientDao.js';
|
||||||
export * from './OAuthTokenDao.js';
|
export * from './OAuthTokenDao.js';
|
||||||
export * from './BearerKeyDao.js';
|
export * from './BearerKeyDao.js';
|
||||||
|
export * from './ToolCallActivityDao.js';
|
||||||
|
|
||||||
// Export database implementations
|
// Export database implementations
|
||||||
export * from './UserDaoDbImpl.js';
|
export * from './UserDaoDbImpl.js';
|
||||||
|
|||||||
@@ -59,9 +59,6 @@ export class Server {
|
|||||||
@Column({ type: 'simple-json', nullable: true })
|
@Column({ type: 'simple-json', nullable: true })
|
||||||
oauth?: Record<string, any>;
|
oauth?: Record<string, any>;
|
||||||
|
|
||||||
@Column({ type: 'simple-json', nullable: true })
|
|
||||||
proxy?: Record<string, any>;
|
|
||||||
|
|
||||||
@Column({ type: 'simple-json', nullable: true })
|
@Column({ type: 'simple-json', nullable: true })
|
||||||
openapi?: Record<string, any>;
|
openapi?: Record<string, any>;
|
||||||
|
|
||||||
|
|||||||
62
src/db/entities/ToolCallActivity.ts
Normal file
62
src/db/entities/ToolCallActivity.ts
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
import {
|
||||||
|
Entity,
|
||||||
|
Column,
|
||||||
|
PrimaryGeneratedColumn,
|
||||||
|
CreateDateColumn,
|
||||||
|
Index,
|
||||||
|
} from 'typeorm';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tool call activity entity for logging tool invocations (DB mode only)
|
||||||
|
*/
|
||||||
|
@Entity({ name: 'tool_call_activities' })
|
||||||
|
export class ToolCallActivity {
|
||||||
|
@PrimaryGeneratedColumn('uuid')
|
||||||
|
id: string;
|
||||||
|
|
||||||
|
@Index()
|
||||||
|
@Column({ type: 'varchar', length: 255, name: 'server_name' })
|
||||||
|
serverName: string;
|
||||||
|
|
||||||
|
@Index()
|
||||||
|
@Column({ type: 'varchar', length: 255, name: 'tool_name' })
|
||||||
|
toolName: string;
|
||||||
|
|
||||||
|
@Index()
|
||||||
|
@Column({ type: 'varchar', length: 255, name: 'key_id', nullable: true })
|
||||||
|
keyId?: string;
|
||||||
|
|
||||||
|
@Column({ type: 'varchar', length: 255, name: 'key_name', nullable: true })
|
||||||
|
keyName?: string;
|
||||||
|
|
||||||
|
@Index()
|
||||||
|
@Column({ type: 'varchar', length: 50, default: 'pending' })
|
||||||
|
status: 'pending' | 'success' | 'error';
|
||||||
|
|
||||||
|
@Column({ type: 'text', nullable: true })
|
||||||
|
request?: string;
|
||||||
|
|
||||||
|
@Column({ type: 'text', nullable: true })
|
||||||
|
response?: string;
|
||||||
|
|
||||||
|
@Column({ type: 'text', name: 'error_message', nullable: true })
|
||||||
|
errorMessage?: string;
|
||||||
|
|
||||||
|
@Column({ type: 'int', name: 'duration_ms', nullable: true })
|
||||||
|
durationMs?: number;
|
||||||
|
|
||||||
|
@Column({ type: 'varchar', length: 100, name: 'client_ip', nullable: true })
|
||||||
|
clientIp?: string;
|
||||||
|
|
||||||
|
@Column({ type: 'varchar', length: 255, name: 'session_id', nullable: true })
|
||||||
|
sessionId?: string;
|
||||||
|
|
||||||
|
@Column({ type: 'varchar', length: 255, name: 'group_name', nullable: true })
|
||||||
|
groupName?: string;
|
||||||
|
|
||||||
|
@Index()
|
||||||
|
@CreateDateColumn({ name: 'created_at', type: 'timestamp' })
|
||||||
|
createdAt: Date;
|
||||||
|
}
|
||||||
|
|
||||||
|
export default ToolCallActivity;
|
||||||
@@ -7,6 +7,7 @@ import UserConfig from './UserConfig.js';
|
|||||||
import OAuthClient from './OAuthClient.js';
|
import OAuthClient from './OAuthClient.js';
|
||||||
import OAuthToken from './OAuthToken.js';
|
import OAuthToken from './OAuthToken.js';
|
||||||
import BearerKey from './BearerKey.js';
|
import BearerKey from './BearerKey.js';
|
||||||
|
import ToolCallActivity from './ToolCallActivity.js';
|
||||||
|
|
||||||
// Export all entities
|
// Export all entities
|
||||||
export default [
|
export default [
|
||||||
@@ -19,6 +20,7 @@ export default [
|
|||||||
OAuthClient,
|
OAuthClient,
|
||||||
OAuthToken,
|
OAuthToken,
|
||||||
BearerKey,
|
BearerKey,
|
||||||
|
ToolCallActivity,
|
||||||
];
|
];
|
||||||
|
|
||||||
// Export individual entities for direct use
|
// Export individual entities for direct use
|
||||||
@@ -32,4 +34,5 @@ export {
|
|||||||
OAuthClient,
|
OAuthClient,
|
||||||
OAuthToken,
|
OAuthToken,
|
||||||
BearerKey,
|
BearerKey,
|
||||||
|
ToolCallActivity,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -69,41 +69,6 @@ export class ServerRepository {
|
|||||||
return await this.repository.count();
|
return await this.repository.count();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Find servers with pagination
|
|
||||||
*/
|
|
||||||
async findAllPaginated(page: number, limit: number): Promise<{ data: Server[]; total: number }> {
|
|
||||||
const skip = (page - 1) * limit;
|
|
||||||
const [data, total] = await this.repository.findAndCount({
|
|
||||||
order: {
|
|
||||||
enabled: 'DESC', // Enabled servers first
|
|
||||||
createdAt: 'ASC' // Then by creation time
|
|
||||||
},
|
|
||||||
skip,
|
|
||||||
take: limit,
|
|
||||||
});
|
|
||||||
|
|
||||||
return { data, total };
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Find servers by owner with pagination
|
|
||||||
*/
|
|
||||||
async findByOwnerPaginated(owner: string, page: number, limit: number): Promise<{ data: Server[]; total: number }> {
|
|
||||||
const skip = (page - 1) * limit;
|
|
||||||
const [data, total] = await this.repository.findAndCount({
|
|
||||||
where: { owner },
|
|
||||||
order: {
|
|
||||||
enabled: 'DESC', // Enabled servers first
|
|
||||||
createdAt: 'ASC' // Then by creation time
|
|
||||||
},
|
|
||||||
skip,
|
|
||||||
take: limit,
|
|
||||||
});
|
|
||||||
|
|
||||||
return { data, total };
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Find servers by owner
|
* Find servers by owner
|
||||||
*/
|
*/
|
||||||
|
|||||||
200
src/db/repositories/ToolCallActivityRepository.ts
Normal file
200
src/db/repositories/ToolCallActivityRepository.ts
Normal file
@@ -0,0 +1,200 @@
|
|||||||
|
import { Repository, FindOptionsWhere, ILike, Between } from 'typeorm';
|
||||||
|
import { ToolCallActivity } from '../entities/ToolCallActivity.js';
|
||||||
|
import { getAppDataSource } from '../connection.js';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Search parameters for filtering tool call activities
|
||||||
|
*/
|
||||||
|
export interface ToolCallActivitySearchParams {
|
||||||
|
serverName?: string;
|
||||||
|
toolName?: string;
|
||||||
|
keyId?: string;
|
||||||
|
status?: 'pending' | 'success' | 'error';
|
||||||
|
groupName?: string;
|
||||||
|
startDate?: Date;
|
||||||
|
endDate?: Date;
|
||||||
|
searchQuery?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Pagination result for tool call activities
|
||||||
|
*/
|
||||||
|
export interface ToolCallActivityPage {
|
||||||
|
items: ToolCallActivity[];
|
||||||
|
total: number;
|
||||||
|
page: number;
|
||||||
|
pageSize: number;
|
||||||
|
totalPages: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Repository for ToolCallActivity entity
|
||||||
|
*/
|
||||||
|
export class ToolCallActivityRepository {
|
||||||
|
private repository: Repository<ToolCallActivity>;
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
this.repository = getAppDataSource().getRepository(ToolCallActivity);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new tool call activity
|
||||||
|
*/
|
||||||
|
async create(
|
||||||
|
activity: Omit<ToolCallActivity, 'id' | 'createdAt'>,
|
||||||
|
): Promise<ToolCallActivity> {
|
||||||
|
const newActivity = this.repository.create(activity);
|
||||||
|
return await this.repository.save(newActivity);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find activity by ID
|
||||||
|
*/
|
||||||
|
async findById(id: string): Promise<ToolCallActivity | null> {
|
||||||
|
return await this.repository.findOne({ where: { id } });
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update an existing activity
|
||||||
|
*/
|
||||||
|
async update(
|
||||||
|
id: string,
|
||||||
|
updates: Partial<ToolCallActivity>,
|
||||||
|
): Promise<ToolCallActivity | null> {
|
||||||
|
const activity = await this.findById(id);
|
||||||
|
if (!activity) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
const updated = this.repository.merge(activity, updates);
|
||||||
|
return await this.repository.save(updated);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Delete an activity
|
||||||
|
*/
|
||||||
|
async delete(id: string): Promise<boolean> {
|
||||||
|
const result = await this.repository.delete({ id });
|
||||||
|
return (result.affected ?? 0) > 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find activities with pagination and filtering
|
||||||
|
*/
|
||||||
|
async findWithPagination(
|
||||||
|
page: number = 1,
|
||||||
|
pageSize: number = 20,
|
||||||
|
params: ToolCallActivitySearchParams = {},
|
||||||
|
): Promise<ToolCallActivityPage> {
|
||||||
|
const where: FindOptionsWhere<ToolCallActivity>[] = [];
|
||||||
|
const baseWhere: FindOptionsWhere<ToolCallActivity> = {};
|
||||||
|
|
||||||
|
// Add filters
|
||||||
|
if (params.serverName) {
|
||||||
|
baseWhere.serverName = params.serverName;
|
||||||
|
}
|
||||||
|
if (params.toolName) {
|
||||||
|
baseWhere.toolName = params.toolName;
|
||||||
|
}
|
||||||
|
if (params.keyId) {
|
||||||
|
baseWhere.keyId = params.keyId;
|
||||||
|
}
|
||||||
|
if (params.status) {
|
||||||
|
baseWhere.status = params.status;
|
||||||
|
}
|
||||||
|
if (params.groupName) {
|
||||||
|
baseWhere.groupName = params.groupName;
|
||||||
|
}
|
||||||
|
if (params.startDate && params.endDate) {
|
||||||
|
baseWhere.createdAt = Between(params.startDate, params.endDate);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle search query - search across multiple fields
|
||||||
|
if (params.searchQuery) {
|
||||||
|
const searchPattern = `%${params.searchQuery}%`;
|
||||||
|
where.push(
|
||||||
|
{ ...baseWhere, serverName: ILike(searchPattern) },
|
||||||
|
{ ...baseWhere, toolName: ILike(searchPattern) },
|
||||||
|
{ ...baseWhere, keyName: ILike(searchPattern) },
|
||||||
|
{ ...baseWhere, groupName: ILike(searchPattern) },
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
where.push(baseWhere);
|
||||||
|
}
|
||||||
|
|
||||||
|
const [items, total] = await this.repository.findAndCount({
|
||||||
|
where: where.length > 0 ? where : undefined,
|
||||||
|
order: { createdAt: 'DESC' },
|
||||||
|
skip: (page - 1) * pageSize,
|
||||||
|
take: pageSize,
|
||||||
|
});
|
||||||
|
|
||||||
|
return {
|
||||||
|
items,
|
||||||
|
total,
|
||||||
|
page,
|
||||||
|
pageSize,
|
||||||
|
totalPages: Math.ceil(total / pageSize),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get recent activities
|
||||||
|
*/
|
||||||
|
async findRecent(limit: number = 10): Promise<ToolCallActivity[]> {
|
||||||
|
return await this.repository.find({
|
||||||
|
order: { createdAt: 'DESC' },
|
||||||
|
take: limit,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get activity statistics
|
||||||
|
*/
|
||||||
|
async getStats(): Promise<{
|
||||||
|
total: number;
|
||||||
|
success: number;
|
||||||
|
error: number;
|
||||||
|
pending: number;
|
||||||
|
avgDurationMs: number;
|
||||||
|
}> {
|
||||||
|
const stats = await this.repository
|
||||||
|
.createQueryBuilder('activity')
|
||||||
|
.select([
|
||||||
|
'COUNT(*) as total',
|
||||||
|
'SUM(CASE WHEN status = \'success\' THEN 1 ELSE 0 END) as success',
|
||||||
|
'SUM(CASE WHEN status = \'error\' THEN 1 ELSE 0 END) as error',
|
||||||
|
'SUM(CASE WHEN status = \'pending\' THEN 1 ELSE 0 END) as pending',
|
||||||
|
'AVG(duration_ms) as avgDurationMs',
|
||||||
|
])
|
||||||
|
.getRawOne();
|
||||||
|
|
||||||
|
return {
|
||||||
|
total: parseInt(stats?.total || '0', 10),
|
||||||
|
success: parseInt(stats?.success || '0', 10),
|
||||||
|
error: parseInt(stats?.error || '0', 10),
|
||||||
|
pending: parseInt(stats?.pending || '0', 10),
|
||||||
|
avgDurationMs: parseFloat(stats?.avgDurationMs || '0'),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Delete old activities (cleanup)
|
||||||
|
*/
|
||||||
|
async deleteOlderThan(date: Date): Promise<number> {
|
||||||
|
const result = await this.repository
|
||||||
|
.createQueryBuilder()
|
||||||
|
.delete()
|
||||||
|
.where('created_at < :date', { date })
|
||||||
|
.execute();
|
||||||
|
return result.affected ?? 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Count total activities
|
||||||
|
*/
|
||||||
|
async count(): Promise<number> {
|
||||||
|
return await this.repository.count();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default ToolCallActivityRepository;
|
||||||
@@ -7,6 +7,7 @@ import { UserConfigRepository } from './UserConfigRepository.js';
|
|||||||
import { OAuthClientRepository } from './OAuthClientRepository.js';
|
import { OAuthClientRepository } from './OAuthClientRepository.js';
|
||||||
import { OAuthTokenRepository } from './OAuthTokenRepository.js';
|
import { OAuthTokenRepository } from './OAuthTokenRepository.js';
|
||||||
import { BearerKeyRepository } from './BearerKeyRepository.js';
|
import { BearerKeyRepository } from './BearerKeyRepository.js';
|
||||||
|
import { ToolCallActivityRepository } from './ToolCallActivityRepository.js';
|
||||||
|
|
||||||
// Export all repositories
|
// Export all repositories
|
||||||
export {
|
export {
|
||||||
@@ -19,4 +20,5 @@ export {
|
|||||||
OAuthClientRepository,
|
OAuthClientRepository,
|
||||||
OAuthTokenRepository,
|
OAuthTokenRepository,
|
||||||
BearerKeyRepository,
|
BearerKeyRepository,
|
||||||
|
ToolCallActivityRepository,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,6 +1,4 @@
|
|||||||
import os from 'os';
|
import os from 'os';
|
||||||
import path from 'path';
|
|
||||||
import fs from 'fs';
|
|
||||||
import { Server } from '@modelcontextprotocol/sdk/server/index.js';
|
import { Server } from '@modelcontextprotocol/sdk/server/index.js';
|
||||||
import {
|
import {
|
||||||
CallToolRequestSchema,
|
CallToolRequestSchema,
|
||||||
@@ -17,7 +15,7 @@ import {
|
|||||||
StreamableHTTPClientTransportOptions,
|
StreamableHTTPClientTransportOptions,
|
||||||
} from '@modelcontextprotocol/sdk/client/streamableHttp.js';
|
} from '@modelcontextprotocol/sdk/client/streamableHttp.js';
|
||||||
import { createFetchWithProxy, getProxyConfigFromEnv } from './proxy.js';
|
import { createFetchWithProxy, getProxyConfigFromEnv } from './proxy.js';
|
||||||
import { ServerInfo, ServerConfig, Tool, ProxychainsConfig } from '../types/index.js';
|
import { ServerInfo, ServerConfig, Tool } from '../types/index.js';
|
||||||
import { expandEnvVars, replaceEnvVars, getNameSeparator } from '../config/index.js';
|
import { expandEnvVars, replaceEnvVars, getNameSeparator } from '../config/index.js';
|
||||||
import config from '../config/index.js';
|
import config from '../config/index.js';
|
||||||
import { getGroup } from './sseService.js';
|
import { getGroup } from './sseService.js';
|
||||||
@@ -34,150 +32,6 @@ const servers: { [sessionId: string]: Server } = {};
|
|||||||
|
|
||||||
import { setupClientKeepAlive } from './keepAliveService.js';
|
import { setupClientKeepAlive } from './keepAliveService.js';
|
||||||
|
|
||||||
/**
|
|
||||||
* Check if proxychains4 is available on the system (Linux/macOS only).
|
|
||||||
* Returns the path to proxychains4 if found, null otherwise.
|
|
||||||
*/
|
|
||||||
const findProxychains4 = (): string | null => {
|
|
||||||
// Windows is not supported
|
|
||||||
if (process.platform === 'win32') {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Common proxychains4 binary paths
|
|
||||||
const possiblePaths = [
|
|
||||||
'/usr/bin/proxychains4',
|
|
||||||
'/usr/local/bin/proxychains4',
|
|
||||||
'/opt/homebrew/bin/proxychains4', // macOS Homebrew ARM
|
|
||||||
'/usr/local/Cellar/proxychains-ng/*/bin/proxychains4', // macOS Homebrew Intel
|
|
||||||
];
|
|
||||||
|
|
||||||
for (const p of possiblePaths) {
|
|
||||||
if (fs.existsSync(p)) {
|
|
||||||
return p;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Try to find in PATH
|
|
||||||
const pathEnv = process.env.PATH || '';
|
|
||||||
const pathDirs = pathEnv.split(path.delimiter);
|
|
||||||
for (const dir of pathDirs) {
|
|
||||||
const fullPath = path.join(dir, 'proxychains4');
|
|
||||||
if (fs.existsSync(fullPath)) {
|
|
||||||
return fullPath;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Generate a temporary proxychains4 configuration file.
|
|
||||||
* Returns the path to the generated config file.
|
|
||||||
*/
|
|
||||||
const generateProxychainsConfig = (
|
|
||||||
serverName: string,
|
|
||||||
proxyConfig: ProxychainsConfig,
|
|
||||||
): string | null => {
|
|
||||||
// If a custom config path is provided, use it directly
|
|
||||||
if (proxyConfig.configPath) {
|
|
||||||
if (fs.existsSync(proxyConfig.configPath)) {
|
|
||||||
return proxyConfig.configPath;
|
|
||||||
}
|
|
||||||
console.warn(
|
|
||||||
`[${serverName}] Custom proxychains config not found: ${proxyConfig.configPath}`,
|
|
||||||
);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Validate required fields
|
|
||||||
if (!proxyConfig.host || !proxyConfig.port) {
|
|
||||||
console.warn(`[${serverName}] Proxy host and port are required for proxychains4`);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const proxyType = proxyConfig.type || 'socks5';
|
|
||||||
const proxyLine = proxyConfig.username && proxyConfig.password
|
|
||||||
? `${proxyType} ${proxyConfig.host} ${proxyConfig.port} ${proxyConfig.username} ${proxyConfig.password}`
|
|
||||||
: `${proxyType} ${proxyConfig.host} ${proxyConfig.port}`;
|
|
||||||
|
|
||||||
const configContent = `# Proxychains4 configuration for MCP server: ${serverName}
|
|
||||||
# Generated by MCPHub
|
|
||||||
|
|
||||||
strict_chain
|
|
||||||
proxy_dns
|
|
||||||
remote_dns_subnet 224
|
|
||||||
tcp_read_time_out 15000
|
|
||||||
tcp_connect_time_out 8000
|
|
||||||
|
|
||||||
[ProxyList]
|
|
||||||
${proxyLine}
|
|
||||||
`;
|
|
||||||
|
|
||||||
// Create temp directory if needed
|
|
||||||
const tempDir = path.join(os.tmpdir(), 'mcphub-proxychains');
|
|
||||||
if (!fs.existsSync(tempDir)) {
|
|
||||||
fs.mkdirSync(tempDir, { recursive: true });
|
|
||||||
}
|
|
||||||
|
|
||||||
// Write config file
|
|
||||||
const configPath = path.join(tempDir, `${serverName.replace(/[^a-zA-Z0-9-_]/g, '_')}.conf`);
|
|
||||||
fs.writeFileSync(configPath, configContent, 'utf-8');
|
|
||||||
console.log(`[${serverName}] Generated proxychains4 config: ${configPath}`);
|
|
||||||
|
|
||||||
return configPath;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Wrap a command with proxychains4 if proxy is configured and available.
|
|
||||||
* Returns modified command and args if proxychains4 is used, original values otherwise.
|
|
||||||
*/
|
|
||||||
const wrapWithProxychains = (
|
|
||||||
serverName: string,
|
|
||||||
command: string,
|
|
||||||
args: string[],
|
|
||||||
proxyConfig?: ProxychainsConfig,
|
|
||||||
): { command: string; args: string[] } => {
|
|
||||||
// Skip if proxy is not enabled or not configured
|
|
||||||
if (!proxyConfig?.enabled) {
|
|
||||||
return { command, args };
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check platform - Windows is not supported
|
|
||||||
if (process.platform === 'win32') {
|
|
||||||
console.warn(
|
|
||||||
`[${serverName}] proxychains4 proxy is not supported on Windows, ignoring proxy configuration`,
|
|
||||||
);
|
|
||||||
return { command, args };
|
|
||||||
}
|
|
||||||
|
|
||||||
// Find proxychains4 binary
|
|
||||||
const proxychains4Path = findProxychains4();
|
|
||||||
if (!proxychains4Path) {
|
|
||||||
console.warn(
|
|
||||||
`[${serverName}] proxychains4 not found on system, install it with: apt install proxychains4 (Debian/Ubuntu) or brew install proxychains-ng (macOS)`,
|
|
||||||
);
|
|
||||||
return { command, args };
|
|
||||||
}
|
|
||||||
|
|
||||||
// Generate or get config file
|
|
||||||
const configPath = generateProxychainsConfig(serverName, proxyConfig);
|
|
||||||
if (!configPath) {
|
|
||||||
console.warn(`[${serverName}] Failed to setup proxychains4 configuration, skipping proxy`);
|
|
||||||
return { command, args };
|
|
||||||
}
|
|
||||||
|
|
||||||
// Wrap command with proxychains4
|
|
||||||
console.log(
|
|
||||||
`[${serverName}] Using proxychains4 proxy: ${proxyConfig.type || 'socks5'}://${proxyConfig.host}:${proxyConfig.port}`,
|
|
||||||
);
|
|
||||||
|
|
||||||
return {
|
|
||||||
command: proxychains4Path,
|
|
||||||
args: ['-f', configPath, command, ...args],
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
export const initUpstreamServers = async (): Promise<void> => {
|
export const initUpstreamServers = async (): Promise<void> => {
|
||||||
// Initialize OAuth clients for servers with dynamic registration
|
// Initialize OAuth clients for servers with dynamic registration
|
||||||
await initializeAllOAuthClients();
|
await initializeAllOAuthClients();
|
||||||
@@ -355,19 +209,11 @@ export const createTransportFromConfig = async (name: string, conf: ServerConfig
|
|||||||
env['npm_config_registry'] = systemConfig.install.npmRegistry;
|
env['npm_config_registry'] = systemConfig.install.npmRegistry;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Apply proxychains4 wrapper if proxy is configured (Linux/macOS only)
|
// Expand environment variables in command
|
||||||
const { command: finalCommand, args: finalArgs } = wrapWithProxychains(
|
|
||||||
name,
|
|
||||||
conf.command,
|
|
||||||
replaceEnvVars(conf.args) as string[],
|
|
||||||
conf.proxy,
|
|
||||||
);
|
|
||||||
|
|
||||||
// Create STDIO transport with potentially wrapped command
|
|
||||||
transport = new StdioClientTransport({
|
transport = new StdioClientTransport({
|
||||||
cwd: os.homedir(),
|
cwd: os.homedir(),
|
||||||
command: finalCommand,
|
command: conf.command,
|
||||||
args: finalArgs,
|
args: replaceEnvVars(conf.args) as string[],
|
||||||
env: env,
|
env: env,
|
||||||
stderr: 'pipe',
|
stderr: 'pipe',
|
||||||
});
|
});
|
||||||
@@ -772,20 +618,10 @@ export const registerAllTools = async (isInit: boolean, serverName?: string): Pr
|
|||||||
};
|
};
|
||||||
|
|
||||||
// Get all server information
|
// Get all server information
|
||||||
export const getServersInfo = async (
|
export const getServersInfo = async (): Promise<Omit<ServerInfo, 'client' | 'transport'>[]> => {
|
||||||
page?: number,
|
const allServers: ServerConfigWithName[] = await getServerDao().findAll();
|
||||||
limit?: number,
|
|
||||||
user?: any,
|
|
||||||
): Promise<Omit<ServerInfo, 'client' | 'transport'>[]> => {
|
|
||||||
const dataService = getDataService();
|
const dataService = getDataService();
|
||||||
|
|
||||||
// Get paginated or all server configurations from DAO
|
|
||||||
// If pagination is used with a non-admin user, filtering is already done at DAO level
|
|
||||||
const isPaginated = limit !== undefined && page !== undefined;
|
|
||||||
const allServers: ServerConfigWithName[] = isPaginated
|
|
||||||
? (await getServerDao().findAllPaginated(page, limit)).data
|
|
||||||
: await getServerDao().findAll();
|
|
||||||
|
|
||||||
// Ensure that servers recently added via DAO but not yet initialized in serverInfos
|
// Ensure that servers recently added via DAO but not yet initialized in serverInfos
|
||||||
// are still visible in the servers list. This avoids a race condition where
|
// are still visible in the servers list. This avoids a race condition where
|
||||||
// a POST /api/servers immediately followed by GET /api/servers would not
|
// a POST /api/servers immediately followed by GET /api/servers would not
|
||||||
@@ -793,19 +629,10 @@ export const getServersInfo = async (
|
|||||||
const combinedServerInfos: ServerInfo[] = [...serverInfos];
|
const combinedServerInfos: ServerInfo[] = [...serverInfos];
|
||||||
const existingNames = new Set(combinedServerInfos.map((s) => s.name));
|
const existingNames = new Set(combinedServerInfos.map((s) => s.name));
|
||||||
|
|
||||||
// Create a set of server names we're interested in (for pagination)
|
|
||||||
const requestedServerNames = new Set(allServers.map((s) => s.name));
|
|
||||||
|
|
||||||
// Filter serverInfos to only include requested servers if pagination is used
|
|
||||||
const filteredServerInfos = isPaginated
|
|
||||||
? combinedServerInfos.filter((s) => requestedServerNames.has(s.name))
|
|
||||||
: combinedServerInfos;
|
|
||||||
|
|
||||||
// Add servers from DAO that don't have runtime info yet
|
|
||||||
for (const server of allServers) {
|
for (const server of allServers) {
|
||||||
if (!existingNames.has(server.name)) {
|
if (!existingNames.has(server.name)) {
|
||||||
const isEnabled = server.enabled === undefined ? true : server.enabled;
|
const isEnabled = server.enabled === undefined ? true : server.enabled;
|
||||||
filteredServerInfos.push({
|
combinedServerInfos.push({
|
||||||
name: server.name,
|
name: server.name,
|
||||||
owner: server.owner,
|
owner: server.owner,
|
||||||
// Newly created servers that are enabled should appear as "connecting"
|
// Newly created servers that are enabled should appear as "connecting"
|
||||||
@@ -821,16 +648,12 @@ export const getServersInfo = async (
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Apply user filtering only when NOT using pagination (pagination already filtered at DAO level)
|
const filterServerInfos: ServerInfo[] = dataService.filterData
|
||||||
// Or when no pagination parameters provided (backward compatibility)
|
? dataService.filterData(combinedServerInfos)
|
||||||
const shouldApplyUserFilter = !isPaginated;
|
: combinedServerInfos;
|
||||||
const filterServerInfos: ServerInfo[] = shouldApplyUserFilter && dataService.filterData
|
|
||||||
? dataService.filterData(filteredServerInfos, user)
|
|
||||||
: filteredServerInfos;
|
|
||||||
|
|
||||||
const infos = filterServerInfos
|
const infos = filterServerInfos.map(
|
||||||
.filter((info) => requestedServerNames.has(info.name)) // Only include requested servers
|
({ name, status, tools, prompts, createTime, error, oauth }) => {
|
||||||
.map(({ name, status, tools, prompts, createTime, error, oauth }) => {
|
|
||||||
const serverConfig = allServers.find((server) => server.name === name);
|
const serverConfig = allServers.find((server) => server.name === name);
|
||||||
const enabled = serverConfig ? serverConfig.enabled !== false : true;
|
const enabled = serverConfig ? serverConfig.enabled !== false : true;
|
||||||
|
|
||||||
@@ -869,8 +692,12 @@ export const getServersInfo = async (
|
|||||||
}
|
}
|
||||||
: undefined,
|
: undefined,
|
||||||
};
|
};
|
||||||
|
},
|
||||||
|
);
|
||||||
|
infos.sort((a, b) => {
|
||||||
|
if (a.enabled === b.enabled) return 0;
|
||||||
|
return a.enabled ? -1 : 1;
|
||||||
});
|
});
|
||||||
// Sorting is now handled at DAO layer for consistent pagination results
|
|
||||||
return infos;
|
return infos;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -270,17 +270,6 @@ export interface McpSettings {
|
|||||||
bearerKeys?: BearerKey[]; // Bearer authentication keys (multi-key configuration)
|
bearerKeys?: BearerKey[]; // Bearer authentication keys (multi-key configuration)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Proxychains4 configuration for STDIO servers (Linux/macOS only)
|
|
||||||
export interface ProxychainsConfig {
|
|
||||||
enabled?: boolean; // Enable/disable proxychains4 proxy routing
|
|
||||||
type?: 'socks4' | 'socks5' | 'http'; // Proxy protocol type
|
|
||||||
host?: string; // Proxy server hostname or IP address
|
|
||||||
port?: number; // Proxy server port
|
|
||||||
username?: string; // Proxy authentication username (optional)
|
|
||||||
password?: string; // Proxy authentication password (optional)
|
|
||||||
configPath?: string; // Path to custom proxychains4 configuration file (optional, overrides above settings)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Configuration details for an individual server
|
// Configuration details for an individual server
|
||||||
export interface ServerConfig {
|
export interface ServerConfig {
|
||||||
type?: 'stdio' | 'sse' | 'streamable-http' | 'openapi'; // Type of server
|
type?: 'stdio' | 'sse' | 'streamable-http' | 'openapi'; // Type of server
|
||||||
@@ -296,8 +285,6 @@ export interface ServerConfig {
|
|||||||
tools?: Record<string, { enabled: boolean; description?: string }>; // Tool-specific configurations with enable/disable state and custom descriptions
|
tools?: Record<string, { enabled: boolean; description?: string }>; // Tool-specific configurations with enable/disable state and custom descriptions
|
||||||
prompts?: Record<string, { enabled: boolean; description?: string }>; // Prompt-specific configurations with enable/disable state and custom descriptions
|
prompts?: Record<string, { enabled: boolean; description?: string }>; // Prompt-specific configurations with enable/disable state and custom descriptions
|
||||||
options?: Partial<Pick<RequestOptions, 'timeout' | 'resetTimeoutOnProgress' | 'maxTotalTimeout'>>; // MCP request options configuration
|
options?: Partial<Pick<RequestOptions, 'timeout' | 'resetTimeoutOnProgress' | 'maxTotalTimeout'>>; // MCP request options configuration
|
||||||
// Proxychains4 proxy configuration for STDIO servers (Linux/macOS only, Windows not supported)
|
|
||||||
proxy?: ProxychainsConfig;
|
|
||||||
// OAuth authentication for upstream MCP servers
|
// OAuth authentication for upstream MCP servers
|
||||||
oauth?: {
|
oauth?: {
|
||||||
// Static client configuration (traditional OAuth flow)
|
// Static client configuration (traditional OAuth flow)
|
||||||
@@ -494,3 +481,51 @@ export interface BatchCreateGroupsResponse {
|
|||||||
failureCount: number; // Number of groups that failed
|
failureCount: number; // Number of groups that failed
|
||||||
results: BatchGroupResult[]; // Detailed results for each group
|
results: BatchGroupResult[]; // Detailed results for each group
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Tool call activity interface for logging tool invocations (DB mode only)
|
||||||
|
export interface IToolCallActivity {
|
||||||
|
id?: string;
|
||||||
|
serverName: string;
|
||||||
|
toolName: string;
|
||||||
|
keyId?: string;
|
||||||
|
keyName?: string;
|
||||||
|
status: 'pending' | 'success' | 'error';
|
||||||
|
request?: string;
|
||||||
|
response?: string;
|
||||||
|
errorMessage?: string;
|
||||||
|
durationMs?: number;
|
||||||
|
clientIp?: string;
|
||||||
|
sessionId?: string;
|
||||||
|
groupName?: string;
|
||||||
|
createdAt?: Date;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Tool call activity search parameters
|
||||||
|
export interface IToolCallActivitySearchParams {
|
||||||
|
serverName?: string;
|
||||||
|
toolName?: string;
|
||||||
|
keyId?: string;
|
||||||
|
status?: 'pending' | 'success' | 'error';
|
||||||
|
groupName?: string;
|
||||||
|
startDate?: Date;
|
||||||
|
endDate?: Date;
|
||||||
|
searchQuery?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Tool call activity pagination result
|
||||||
|
export interface IToolCallActivityPage {
|
||||||
|
items: IToolCallActivity[];
|
||||||
|
total: number;
|
||||||
|
page: number;
|
||||||
|
pageSize: number;
|
||||||
|
totalPages: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Tool call activity statistics
|
||||||
|
export interface IToolCallActivityStats {
|
||||||
|
total: number;
|
||||||
|
success: number;
|
||||||
|
error: number;
|
||||||
|
pending: number;
|
||||||
|
avgDurationMs: number;
|
||||||
|
}
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ export interface SmartRoutingConfig {
|
|||||||
*
|
*
|
||||||
* Priority order for each setting:
|
* Priority order for each setting:
|
||||||
* 1. Specific environment variables (ENABLE_SMART_ROUTING, SMART_ROUTING_ENABLED, etc.)
|
* 1. Specific environment variables (ENABLE_SMART_ROUTING, SMART_ROUTING_ENABLED, etc.)
|
||||||
* 2. Generic environment variables (OPENAI_API_KEY, DB_URL, etc.)
|
* 2. Generic environment variables (OPENAI_API_KEY, DATABASE_URL, etc.)
|
||||||
* 3. Settings configuration (systemConfig.smartRouting)
|
* 3. Settings configuration (systemConfig.smartRouting)
|
||||||
* 4. Default values
|
* 4. Default values
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import 'reflect-metadata';
|
|||||||
Object.assign(process.env, {
|
Object.assign(process.env, {
|
||||||
NODE_ENV: 'test',
|
NODE_ENV: 'test',
|
||||||
JWT_SECRET: 'test-jwt-secret-key',
|
JWT_SECRET: 'test-jwt-secret-key',
|
||||||
DB_URL: 'sqlite::memory:',
|
DATABASE_URL: 'sqlite::memory:',
|
||||||
});
|
});
|
||||||
|
|
||||||
// Mock moduleDir to avoid import.meta parsing issues in Jest
|
// Mock moduleDir to avoid import.meta parsing issues in Jest
|
||||||
|
|||||||
Reference in New Issue
Block a user