Compare commits

...

19 Commits

Author SHA1 Message Date
samanhappy
e2c5cc8ed1 fix: refine sessionId handling in handleMcpPostRequest for initialization requests (#138)
Co-authored-by: samanhappy@qq.com <my6051199>
2025-05-28 23:25:21 +08:00
samanhappy
b0a65cc6d0 fix: streamline sessionId handling in handleMcpPostRequest (#137)
Co-authored-by: samanhappy@qq.com <my6051199>
2025-05-28 22:15:14 +08:00
samanhappy
e019c9e8b3 fix: simplify server status labels in English and Chinese locales (#128) 2025-05-28 18:20:43 +08:00
samanhappy
39b69bf550 fix: improve sessionId validation and error handling in handleSseMessage (#134) 2025-05-28 14:30:35 +08:00
samanhappy
a1047321d1 feat: introduce runtime path (#132) 2025-05-27 18:34:23 +08:00
samanhappy
268ce5cce6 feat: Refactor API URL handling and add base path support (#131) 2025-05-27 16:11:35 +08:00
samanhappy
37bb3414c8 feat: add VITE_BASE_PATH environment variable and update routing in App component (#130) 2025-05-27 13:08:41 +08:00
samanhappy
c3e1fa1eee Update asset paths to use relative URLs (#129) 2025-05-27 11:55:50 +08:00
samanhappy
edfbdb7123 fix: update README and README.zh.md for clarity and consistency (#124) 2025-05-25 21:32:46 +08:00
samanhappy
9e5c2b5525 feat: introduce auto routing (#122) 2025-05-25 21:09:47 +08:00
samanhappy
27b7e766af fix: downgrade express and @types/express to compatible versions (#119) 2025-05-22 15:14:05 +08:00
dependabot[bot]
9c55f63bb1 chore(deps-dev): bump @types/node from 20.17.28 to 22.15.21 (#114)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-05-22 14:57:56 +08:00
dependabot[bot]
b1674cc630 chore(deps): bump express and @types/express (#113)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-05-22 14:56:06 +08:00
dependabot[bot]
3570232ccc chore(deps-dev): bump tailwind-merge from 3.1.0 to 3.3.0 (#112)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-05-22 14:54:29 +08:00
dependabot[bot]
f50bb08816 chore(deps-dev): bump @tailwindcss/postcss from 4.1.3 to 4.1.7 (#115)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-05-22 14:54:03 +08:00
dependabot[bot]
721674e7eb chore(deps-dev): bump @radix-ui/react-slot from 1.1.2 to 1.2.3 (#116)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-05-22 14:53:50 +08:00
samanhappy
1337eeed84 Update dependabot.yml (#111) 2025-05-21 09:39:56 +08:00
samanhappy
b14be9955b Create dependabot.yml (#110) 2025-05-21 09:37:39 +08:00
samanhappy
da45d49a5e feat: Bump Vite to v6 and update esbuild (#109)
Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
2025-05-21 09:34:24 +08:00
54 changed files with 4832 additions and 1352 deletions

11
.github/dependabot.yml vendored Normal file
View File

@@ -0,0 +1,11 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
version: 2
updates:
- package-ecosystem: "npm" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "monthly"

View File

@@ -18,20 +18,23 @@ RUN npm install -g pnpm
ARG REQUEST_TIMEOUT=60000
ENV REQUEST_TIMEOUT=$REQUEST_TIMEOUT
ARG BASE_PATH=""
ENV BASE_PATH=$BASE_PATH
ENV PNPM_HOME=/usr/local/share/pnpm
ENV PATH=$PNPM_HOME:$PATH
RUN mkdir -p $PNPM_HOME && \
pnpm add -g @amap/amap-maps-mcp-server @playwright/mcp@latest tavily-mcp@latest @modelcontextprotocol/server-github @modelcontextprotocol/server-slack
pnpm add -g @amap/amap-maps-mcp-server @playwright/mcp@latest tavily-mcp@latest @modelcontextprotocol/server-github @modelcontextprotocol/server-slack
ARG INSTALL_EXT=false
RUN if [ "$INSTALL_EXT" = "true" ]; then \
ARCH=$(uname -m); \
if [ "$ARCH" = "x86_64" ]; then \
npx -y playwright install --with-deps chrome; \
else \
echo "Skipping Chrome installation on non-amd64 architecture: $ARCH"; \
fi; \
fi
ARCH=$(uname -m); \
if [ "$ARCH" = "x86_64" ]; then \
npx -y playwright install --with-deps chrome; \
else \
echo "Skipping Chrome installation on non-amd64 architecture: $ARCH"; \
fi; \
fi
RUN uv tool install mcp-server-fetch

View File

@@ -1,14 +1,14 @@
# MCPHub: Your Ultimate MCP Server Hub
# MCPHub: The Unified Hub for Model Context Protocol (MCP) Servers
English | [中文版](README.zh.md)
MCPHub is a unified management platform that aggregates multiple MCP (Model Context Protocol) servers into separate Streamable HTTP (SSE) endpoints for different scenarios by group. It streamlines your AI tool integrations through an intuitive interface and robust protocol handling.
MCPHub makes it easy to manage and scale multiple MCP (Model Context Protocol) servers by organizing them into flexible Streamable HTTP (SSE) endpoints—supporting access to all servers, individual servers, or logical server groups.
![Dashboard Preview](assets/dashboard.png)
## 🚀 Features
- **Out-of-the-Box MCP Server Support**: Seamlessly integrate popular servers like `amap-maps`, `playwright`, `fetch`, `slack`, and more.
- **Broadened MCP Server Support**: Seamlessly integrate any MCP server with minimal configuration.
- **Centralized Dashboard**: Monitor real-time status and performance metrics from one sleek web UI.
- **Flexible Protocol Handling**: Full compatibility with both stdio and SSE MCP protocols.
- **Hot-Swappable Configuration**: Add, remove, or update MCP servers on the fly — no downtime required.
@@ -18,7 +18,7 @@ MCPHub is a unified management platform that aggregates multiple MCP (Model Cont
## 🔧 Quick Start
### Optional Configuration
### Configuration
Create a `mcp_settings.json` file to customize your server settings:
@@ -48,23 +48,10 @@ Create a `mcp_settings.json` file to customize your server settings:
"SLACK_TEAM_ID": "your-team-id"
}
}
},
"users": [
{
"username": "admin",
"password": "$2b$10$Vt7krIvjNgyN67LXqly0uOcTpN0LI55cYRbcKC71pUDAP0nJ7RPa.",
"isAdmin": true
}
]
}
}
```
> **Note**: Default credentials are `admin` / `admin123`. Passwords are securely hashed with bcrypt. Generate a new hash with:
>
> ```bash
> npx bcryptjs your-password
> ```
### Docker Deployment
**Recommended**: Mount your custom config:
@@ -109,6 +96,31 @@ This endpoint provides a unified streamable HTTP interface for all your MCP serv
- Easily integrate with various AI clients and tools
- Use the same endpoint for all servers, simplifying your integration process
**Smart Routing (Experimental)**:
Smart Routing is MCPHub's intelligent tool discovery system that uses vector semantic search to automatically find the most relevant tools for any given task.
```
http://localhost:3000/mcp/$smart
```
**How it Works:**
1. **Tool Indexing**: All MCP tools are automatically converted to vector embeddings and stored in PostgreSQL with pgvector
2. **Semantic Search**: User queries are converted to vectors and matched against tool embeddings using cosine similarity
3. **Intelligent Filtering**: Dynamic thresholds ensure relevant results without noise
4. **Precise Execution**: Found tools can be directly executed with proper parameter validation
**Setup Requirements:**
![Smart Routing](assets/smart-routing.png)
To enable Smart Routing, you need:
- PostgreSQL with pgvector extension
- OpenAI API key (or compatible embedding service)
- Enable Smart Routing in MCPHub settings
**Group-Specific Endpoints (Recommended)**:
![Group Management](assets/group.png)
@@ -144,6 +156,12 @@ Connect AI clients (e.g., Claude Desktop, Cursor, DeepChat, etc.) via:
http://localhost:3000/sse
```
For smart routing, use:
```
http://localhost:3000/sse/$smart
```
For targeted access to specific server groups, use the group-based SSE endpoint:
```

View File

@@ -2,13 +2,13 @@
[English Version](README.md) | 中文版
MCPHub 是一个统一的 MCPModel Context Protocol,模型上下文协议)服务器聚合平台,可以根据场景将多个服务器聚合到不同的流式 HTTPSSE端点。它通过直观的界面和强大的协议处理能力简化了您的 AI 工具集成流程
MCPHub 通过将多个 MCPModel Context Protocol)服务器组织为灵活的流式 HTTPSSE端点简化了管理与扩展工作。系统支持按需访问全部服务器、单个服务器或按场景分组的服务器集合
![控制面板预览](assets/dashboard.zh.png)
## 🚀 功能亮点
- **开箱即用的 MCP 服务器支持**:无缝集成 `amap-maps``playwright``fetch``slack` 等常见服务器
- **广泛的 MCP 服务器支持**:无缝集成任何 MCP 服务器,配置简单
- **集中式管理控制台**:在一个简洁的 Web UI 中实时监控所有服务器的状态和性能指标。
- **灵活的协议兼容**:完全支持 stdio 和 SSE 两种 MCP 协议。
- **热插拔式配置**:在运行时动态添加、移除或更新服务器配置,无需停机。
@@ -18,7 +18,7 @@ MCPHub 是一个统一的 MCPModel Context Protocol模型上下文协议
## 🔧 快速开始
### 可选配置
### 配置
通过创建 `mcp_settings.json` 自定义服务器设置:
@@ -48,23 +48,10 @@ MCPHub 是一个统一的 MCPModel Context Protocol模型上下文协议
"SLACK_TEAM_ID": "your-team-id"
}
}
},
"users": [
{
"username": "admin",
"password": "$2b$10$Vt7krIvjNgyN67LXqly0uOcTpN0LI55cYRbcKC71pUDAP0nJ7RPa.",
"isAdmin": true
}
]
}
}
```
> **提示**:默认用户名/密码为 `admin` / `admin123`。密码已通过 bcrypt 安全哈希。生成新密码哈希:
>
> ```bash
> npx bcryptjs your-password
> ```
### Docker 部署
**推荐**:挂载自定义配置:
@@ -109,6 +96,31 @@ http://localhost:3000/mcp
- 轻松与各种 AI 客户端和工具集成
- 对所有服务器使用相同的端点,简化集成过程
**智能路由(实验性功能)**
智能路由是 MCPHub 的智能工具发现系统,使用向量语义搜索自动为任何给定任务找到最相关的工具。
```
http://localhost:3000/mcp/$smart
```
**工作原理:**
1. **工具索引**:所有 MCP 工具自动转换为向量嵌入并存储在 PostgreSQL 与 pgvector 中
2. **语义搜索**:用户查询转换为向量并使用余弦相似度与工具嵌入匹配
3. **智能筛选**:动态阈值确保相关结果且无噪声
4. **精确执行**:找到的工具可以直接执行并进行适当的参数验证
**设置要求:**
![智能路由](assets/smart-routing.zh.png)
为了启用智能路由,您需要:
- 支持 pgvector 扩展的 PostgreSQL
- OpenAI API 密钥(或兼容的嵌入服务)
- 在 MCPHub 设置中启用智能路由
**基于分组的 HTTP 端点(推荐)**
![分组](assets/group.zh.png)
要针对特定服务器分组进行访问,请使用基于分组的 HTTP 端点:
@@ -144,6 +156,12 @@ http://localhost:3000/mcp/{server}
http://localhost:3000/sse
```
要启用智能路由,请使用:
```
http://localhost:3000/sse/$smart
```
要针对特定服务器分组进行访问,请使用基于分组的 SSE 端点:
```

BIN
assets/smart-routing.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

BIN
assets/smart-routing.zh.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

271
doc/smart-routing.md Normal file
View File

@@ -0,0 +1,271 @@
# 智能工具发现精准调用MCPHub 智能路由重新定义 AI 工具选择
## 概述
在现代 AI 应用中,随着 MCP 服务器数量的快速增长和工具种类的日益丰富如何从数百个可用工具中快速找到最适合当前任务的工具成为了一个日益突出的挑战。传统方式下AI 助手要么被迫处理所有可用工具的庞大列表,导致 token 消耗激增和响应延迟要么依赖开发者手动分组缺乏灵活性和智能化。MCPHub 的智能路由功能基于向量语义搜索技术,实现了自然语言驱动的工具发现与精准推荐,让 AI 助手能够像人类专家一样,根据任务描述智能地选择最合适的工具组合,大幅提升工作效率和用户体验。
## 智能路由是什么
### 技术原理
智能路由是 MCPHub 的核心创新功能,它基于现代向量语义搜索技术,将每个 MCP 工具的描述、参数和功能特征转换为高维向量表示。当用户提出任务需求时,系统将需求同样转换为向量,通过计算向量间的余弦相似度,快速定位最相关的工具集合。这种方法不依赖精确的关键词匹配,而是理解语义层面的相关性,能够处理自然语言的模糊性和多样性。
### 核心组件
**向量嵌入引擎**:支持 OpenAI text-embedding-3-small、BGE-M3 等多种主流嵌入模型,将工具描述转换为 1536 维或 1024 维向量表示,捕获工具功能的语义特征。
**PostgreSQL + pgvector 数据库**:采用业界领先的向量数据库解决方案,支持高效的向量索引和相似度搜索,能够在毫秒级时间内从大量工具中找到最相关的候选。
**动态阈值算法**根据查询复杂度和具体程度自动调整相似度阈值确保既不遗漏相关工具也不引入无关噪声。简单查询使用较低阈值0.2获得更多样化结果具体查询使用较高阈值0.4)确保精确匹配。
**两步工作流**`search_tools` 负责工具发现,`call_tool` 负责工具执行,清晰分离发现和执行逻辑,提供更好的可控性和调试体验。
## 为什么要使用智能路由
### 1. 解决工具选择的认知负荷
- **信息过载问题**:当 MCP 服务器数量超过 10 个、工具总数超过 100 个时AI 助手面临严重的信息过载,难以在合理时间内做出最优选择。
- **智能路由优势**:通过语义搜索将候选工具缩减到 5-10 个最相关的选项,让 AI 助手能够专注于理解和使用最合适的工具,而不是被迫处理庞大的工具清单。
### 2. 大幅降低 Token 消耗
- **传统方式的成本**:向 AI 模型传递完整的工具列表会消耗大量 token特别是当工具描述详细时单次请求可能消耗数千 token。
- **智能路由的效益**:只传递最相关的工具信息,通常可以将工具相关的 token 消耗降低 70-90%,显著减少 API 调用成本,特别是在频繁交互的场景中。
### 3. 提升工具使用的准确性
- **语义理解能力**:智能路由能够理解"图片处理"、"数据分析"、"文档转换"等抽象概念,将其映射到具体的工具实现,避免了传统关键词匹配的局限性。
- **上下文感知**:考虑工具的输入输出模式和使用场景,推荐最适合当前任务流程的工具组合。
![智能路由工作原理](../assets/smart-routing-flow.png)
## 如何使用智能路由
### 配置智能路由
#### 1. 数据库配置
智能路由需要 PostgreSQL 数据库支持 pgvector 扩展:
```bash
# 使用 Docker 快速启动支持 pgvector 的 PostgreSQL
docker run --name mcphub-postgres \
-e POSTGRES_DB=mcphub \
-e POSTGRES_USER=mcphub \
-e POSTGRES_PASSWORD=your_password \
-p 5432:5432 \
-d pgvector/pgvector:pg16
```
#### 2. 在 MCPHub 控制台配置智能路由
访问 MCPHub 设置页面http://localhost:3000/settings在"智能路由配置"部分填写:
- **数据库 URL**`postgresql://mcphub:your_password@localhost:5432/mcphub`
- **OpenAI API Key**:您的 OpenAI API 密钥
- **API Base URL**:可选,默认为 `https://api.openai.com/v1`
- **嵌入模型**:推荐使用 `text-embedding-3-small`1536 维,性价比最佳)
![智能路由配置界面](../assets/smart-routing-config.png)
#### 3. 启用智能路由
配置完成后,开启"启用智能路由"开关。系统将自动:
- 为所有已连接的 MCP 服务器工具生成向量嵌入
- 建立向量索引以支持快速搜索
- 在后续新增工具时自动更新向量数据库
### 智能工具发现的使用方式
启用智能路由后MCPHub 会自动提供两个核心工具:
#### search_tools - 智能工具搜索
```typescript
// 使用示例
{
"name": "search_tools",
"arguments": {
"query": "help me process images and resize them", // 自然语言查询
"limit": 10 // 返回结果数量
}
}
```
**查询策略建议**
- **宽泛查询**:使用较高的 limit20-30如"数据处理工具"
- **精确查询**:使用较低的 limit5-10如"将 PNG 图片转换为 WebP 格式"
- **分步查询**:复杂任务可以分解为多个具体查询
#### call_tool - 精准工具执行
```typescript
// 使用示例
{
"name": "call_tool",
"arguments": {
"toolName": "image_resize", // 从 search_tools 结果中获取的工具名
"arguments": { // 根据工具的 inputSchema 提供参数
"input_path": "/path/to/image.png",
"width": 800,
"height": 600
}
}
}
```
### 实际应用场景演示
#### 场景 1图像处理工作流
```markdown
用户请求:我需要批量处理一些产品图片,调整大小并转换格式
AI 工作流:
1. search_tools("image processing batch resize convert format")
→ 返回image_batch_processor, format_converter, image_optimizer
2. call_tool("image_batch_processor", {...})
→ 执行批量图像处理
```
#### 场景 2数据分析任务
```markdown
用户请求:分析这个 CSV 文件的销售数据,生成可视化图表
AI 工作流:
1. search_tools("CSV data analysis visualization charts")
→ 返回csv_analyzer, chart_generator, statistics_calculator
2. call_tool("csv_analyzer", {"file_path": "sales.csv"})
3. call_tool("chart_generator", {"data": analysis_result})
```
#### 场景 3文档处理流水线
```markdown
用户请求:将 Word 文档转换为 PDF然后提取其中的文本内容
AI 工作流:
1. search_tools("document conversion Word to PDF")
→ 返回doc_converter, pdf_generator
2. call_tool("doc_converter", {"input": "document.docx", "output_format": "pdf"})
3. search_tools("PDF text extraction")
→ 返回pdf_text_extractor, ocr_processor
4. call_tool("pdf_text_extractor", {"pdf_path": "document.pdf"})
```
### 高级配置选项
#### 多模型支持
智能路由支持多种嵌入模型,可根据需求选择:
```json
{
"embeddingModel": "text-embedding-3-small", // OpenAI1536维平衡性能和成本
"embeddingModel": "text-embedding-3-large", // OpenAI3072维最高精度
"embeddingModel": "bge-m3" // 开源模型1024维支持多语言
}
```
#### 自定义 API 端点
支持使用自建的嵌入服务或其他 OpenAI 兼容的 API
```json
{
"openaiApiBaseUrl": "https://your-api-endpoint.com/v1",
"openaiApiKey": "your-custom-api-key"
}
```
## 性能优化与最佳实践
### 查询优化策略
**分层查询**:对于复杂任务,使用从宽泛到具体的查询策略:
```
1. 宽泛查询:"文档处理工具" (limit: 20)
2. 具体查询:"PDF 转 Word 转换器" (limit: 5)
```
**上下文相关性**:在查询中包含任务上下文信息:
```
search_tools("为电商网站批量压缩产品图片")
较好search_tools("图片压缩工具")
```
**动态调整**:根据返回结果质量动态调整查询词和限制数量。
### 数据库性能调优
**索引优化**:智能路由自动创建最优的向量索引:
```sql
CREATE INDEX idx_vector_embeddings_embedding
ON vector_embeddings USING ivfflat (embedding vector_cosine_ops)
WITH (lists = 100);
```
**内存配置**:对于大规模部署,建议增加 PostgreSQL 内存配置:
```
shared_buffers = 256MB
effective_cache_size = 1GB
work_mem = 64MB
```
### 监控与调试
**相似度阈值监控**:观察搜索结果的相似度分数,调整阈值以获得最佳效果。
**查询效果分析**:定期检查常用查询的返回结果,优化工具描述以提高搜索准确性。
## 智能路由的技术优势
### 语义理解能力
与传统的关键词匹配相比,智能路由能够理解:
- **同义词和近义词**"图片"和"图像"、"转换"和"变换"
- **上下层级概念**"数据可视化"包含"图表生成"、"统计图绘制"等
- **任务意图推理**"我要做一个数据报告"自动关联数据分析、图表生成、文档创建等工具
### 多语言支持
智能路由支持中英文混合查询,能够处理:
```
search_tools("图片 resize 和 format conversion")
search_tools("将文档转换为 PDF 格式")
search_tools("image processing and 格式转换")
```
### 容错能力
具备一定的容错能力,能够处理:
- 拼写错误:自动纠正常见拼写错误
- 模糊描述:从不完整的描述中推导完整意图
- 领域术语:理解特定领域的专业术语
## 结语
MCPHub 的智能路由功能代表着 MCP 生态系统向智能化方向发展的重要一步。通过引入向量语义搜索技术,它不仅解决了工具数量激增带来的选择困难,更为 AI 助手提供了类似人类专家的工具发现和选择能力。
随着 MCP 服务器生态的不断丰富,智能路由将成为连接用户需求与丰富工具资源的关键桥梁。它让开发者无需担心工具管理的复杂性,让用户享受到更加智能和高效的 AI 助手体验。
未来,我们还将继续优化智能路由的算法,引入更多先进的 AI 技术,如基于强化学习的工具推荐、多模态工具理解等,为 MCP 生态系统注入更强的智能化动力。
智能路由不仅仅是一个技术功能,更是 MCPHub 对于"让 AI 工具使用变得简单而智能"这一愿景的具体实现。在这个工具爆炸的时代,智能路由让我们重新定义了 AI 与工具的交互方式。
项目地址https://github.com/samanhappy/mcphub
![智能路由架构图](../assets/smart-routing-architecture.png)

BIN
frontend/favicon.ico Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

View File

@@ -12,17 +12,19 @@ import GroupsPage from './pages/GroupsPage';
import SettingsPage from './pages/SettingsPage';
import MarketPage from './pages/MarketPage';
import LogsPage from './pages/LogsPage';
import { getBasePath } from './utils/runtime';
function App() {
const basename = getBasePath();
return (
<ThemeProvider>
<AuthProvider>
<ToastProvider>
<Router>
<Router basename={basename}>
<Routes>
{/* 公共路由 */}
<Route path="/login" element={<LoginPage />} />
{/* 受保护的路由,使用 MainLayout 作为布局容器 */}
<Route element={<ProtectedRoute />}>
<Route element={<MainLayout />}>
@@ -35,7 +37,7 @@ function App() {
<Route path="/settings" element={<SettingsPage />} />
</Route>
</Route>
{/* 未匹配的路由重定向到首页 */}
<Route path="*" element={<Navigate to="/" />} />
</Routes>

View File

@@ -1,6 +1,7 @@
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
import ServerForm from './ServerForm'
import { getApiUrl } from '../utils/runtime';
interface AddServerFormProps {
onAdd: () => void
@@ -20,7 +21,7 @@ const AddServerForm = ({ onAdd }: AddServerFormProps) => {
try {
setError(null)
const token = localStorage.getItem('mcphub_token');
const response = await fetch('/api/servers', {
const response = await fetch(getApiUrl('/servers'), {
method: 'POST',
headers: {
'Content-Type': 'application/json',
@@ -68,7 +69,7 @@ const AddServerForm = ({ onAdd }: AddServerFormProps) => {
<div>
<button
onClick={toggleModal}
className="w-full bg-blue-500 hover:bg-blue-600 text-white font-medium py-2 px-4 rounded"
className="w-full bg-blue-100 text-blue-800 rounded hover:bg-blue-200 py-2 px-4"
>
{t('server.addServer')}
</button>

View File

@@ -1,6 +1,7 @@
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
import { Server } from '@/types'
import { getApiUrl } from '../utils/runtime'
import ServerForm from './ServerForm'
interface EditServerFormProps {
@@ -17,7 +18,7 @@ const EditServerForm = ({ server, onEdit, onCancel }: EditServerFormProps) => {
try {
setError(null)
const token = localStorage.getItem('mcphub_token');
const response = await fetch(`/api/servers/${server.name}`, {
const response = await fetch(getApiUrl(`/servers/${server.name}`), {
method: 'PUT',
headers: {
'Content-Type': 'application/json',

View File

@@ -14,14 +14,14 @@ const DeleteDialog = ({ isOpen, onClose, onConfirm, serverName, isGroup = false
if (!isOpen) return null
return (
<div className="fixed inset-0 bg-black bg-opacity-30 z-50 flex items-center justify-center p-4">
<div className="fixed inset-0 bg-black/50 bg-opacity-30 z-50 flex items-center justify-center p-4">
<div className="bg-white rounded-lg shadow-lg max-w-md w-full">
<div className="p-6">
<h3 className="text-lg font-medium text-gray-900 mb-3">
{isGroup ? t('groups.confirmDelete') : t('server.confirmDelete')}
</h3>
<p className="text-gray-500 mb-6">
{isGroup
{isGroup
? t('groups.deleteWarning', { name: serverName })
: t('server.deleteWarning', { name: serverName })}
</p>

View File

@@ -32,7 +32,7 @@ const SponsorDialog: React.FC<SponsorDialogProps> = ({ open, onOpenChange }) =>
<div className="flex flex-col items-center justify-center py-4">
{i18n.language === 'zh' ? (
<img
src="/assets/reward.png"
src="./assets/reward.png"
alt={t('sponsor.rewardAlt')}
className="max-w-full h-auto"
style={{ maxHeight: '400px' }}

View File

@@ -31,7 +31,7 @@ const WeChatDialog: React.FC<WeChatDialogProps> = ({ open, onOpenChange }) => {
<div className="flex flex-col items-center justify-center py-4">
<img
src="/assets/wexin.png"
src="./assets/wexin.png"
alt={t('wechat.qrCodeAlt')}
className="max-w-full h-auto"
style={{ maxHeight: '400px' }}

View File

@@ -1,4 +1,4 @@
import React, { createContext, useContext, useState, ReactNode } from 'react';
import React, { createContext, useContext, useState, ReactNode, useCallback } from 'react';
import Toast, { ToastType } from '@/components/ui/Toast';
interface ToastContextProps {
@@ -32,18 +32,18 @@ export const ToastProvider: React.FC<ToastProviderProps> = ({ children }) => {
duration: 3000,
});
const showToast = (message: string, type: ToastType = 'info', duration: number = 3000) => {
const showToast = useCallback((message: string, type: ToastType = 'info', duration: number = 3000) => {
setToast({
message,
type,
visible: true,
duration,
});
};
}, []);
const hideToast = () => {
const hideToast = useCallback(() => {
setToast((prev) => ({ ...prev, visible: false }));
};
}, []);
return (
<ToastContext.Provider value={{ showToast }}>

View File

@@ -1,6 +1,7 @@
import { useState, useEffect, useCallback } from 'react';
import { useTranslation } from 'react-i18next';
import { Group, ApiResponse } from '@/types';
import { getApiUrl } from '../utils/runtime';
export const useGroupData = () => {
const { t } = useTranslation();
@@ -13,25 +14,25 @@ export const useGroupData = () => {
try {
setLoading(true);
const token = localStorage.getItem('mcphub_token');
const response = await fetch('/api/groups', {
const response = await fetch(getApiUrl('/groups'), {
headers: {
'x-auth-token': token || ''
}
'x-auth-token': token || '',
},
});
if (!response.ok) {
throw new Error(`Status: ${response.status}`);
}
const data: ApiResponse<Group[]> = await response.json();
if (data && data.success && Array.isArray(data.data)) {
setGroups(data.data);
} else {
console.error('Invalid group data format:', data);
setGroups([]);
}
setError(null);
} catch (err) {
console.error('Error fetching groups:', err);
@@ -44,29 +45,29 @@ export const useGroupData = () => {
// Trigger a refresh of the groups data
const triggerRefresh = useCallback(() => {
setRefreshKey(prev => prev + 1);
setRefreshKey((prev) => prev + 1);
}, []);
// Create a new group with server associations
const createGroup = async (name: string, description?: string, servers: string[] = []) => {
try {
const token = localStorage.getItem('mcphub_token');
const response = await fetch('/api/groups', {
const response = await fetch(getApiUrl('/groups'), {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'x-auth-token': token || ''
'x-auth-token': token || '',
},
body: JSON.stringify({ name, description, servers }),
});
const result: ApiResponse<Group> = await response.json();
if (!response.ok) {
setError(result.message || t('groups.createError'));
return null;
}
triggerRefresh();
return result.data || null;
} catch (err) {
@@ -76,25 +77,28 @@ export const useGroupData = () => {
};
// Update an existing group with server associations
const updateGroup = async (id: string, data: { name?: string; description?: string; servers?: string[] }) => {
const updateGroup = async (
id: string,
data: { name?: string; description?: string; servers?: string[] },
) => {
try {
const token = localStorage.getItem('mcphub_token');
const response = await fetch(`/api/groups/${id}`, {
const response = await fetch(getApiUrl(`/groups/${id}`), {
method: 'PUT',
headers: {
'Content-Type': 'application/json',
'x-auth-token': token || ''
'x-auth-token': token || '',
},
body: JSON.stringify(data),
});
const result: ApiResponse<Group> = await response.json();
if (!response.ok) {
setError(result.message || t('groups.updateError'));
return null;
}
triggerRefresh();
return result.data || null;
} catch (err) {
@@ -107,22 +111,22 @@ export const useGroupData = () => {
const updateGroupServers = async (groupId: string, servers: string[]) => {
try {
const token = localStorage.getItem('mcphub_token');
const response = await fetch(`/api/groups/${groupId}/servers/batch`, {
const response = await fetch(getApiUrl(`/groups/${groupId}/servers/batch`), {
method: 'PUT',
headers: {
'Content-Type': 'application/json',
'x-auth-token': token || ''
'x-auth-token': token || '',
},
body: JSON.stringify({ servers }),
});
const result: ApiResponse<Group> = await response.json();
if (!response.ok) {
setError(result.message || t('groups.updateError'));
return null;
}
triggerRefresh();
return result.data || null;
} catch (err) {
@@ -135,20 +139,20 @@ export const useGroupData = () => {
const deleteGroup = async (id: string) => {
try {
const token = localStorage.getItem('mcphub_token');
const response = await fetch(`/api/groups/${id}`, {
const response = await fetch(getApiUrl(`/groups/${id}`), {
method: 'DELETE',
headers: {
'x-auth-token': token || ''
}
'x-auth-token': token || '',
},
});
const result = await response.json();
if (!response.ok) {
setError(result.message || t('groups.deleteError'));
return false;
}
triggerRefresh();
return true;
} catch (err) {
@@ -161,22 +165,22 @@ export const useGroupData = () => {
const addServerToGroup = async (groupId: string, serverName: string) => {
try {
const token = localStorage.getItem('mcphub_token');
const response = await fetch(`/api/groups/${groupId}/servers`, {
const response = await fetch(getApiUrl(`/groups/${groupId}/servers`), {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'x-auth-token': token || ''
'x-auth-token': token || '',
},
body: JSON.stringify({ serverName }),
});
const result: ApiResponse<Group> = await response.json();
if (!response.ok) {
setError(result.message || t('groups.serverAddError'));
return null;
}
triggerRefresh();
return result.data || null;
} catch (err) {
@@ -189,20 +193,20 @@ export const useGroupData = () => {
const removeServerFromGroup = async (groupId: string, serverName: string) => {
try {
const token = localStorage.getItem('mcphub_token');
const response = await fetch(`/api/groups/${groupId}/servers/${serverName}`, {
const response = await fetch(getApiUrl(`/groups/${groupId}/servers/${serverName}`), {
method: 'DELETE',
headers: {
'x-auth-token': token || ''
}
'x-auth-token': token || '',
},
});
const result: ApiResponse<Group> = await response.json();
if (!response.ok) {
setError(result.message || t('groups.serverRemoveError'));
return null;
}
triggerRefresh();
return result.data || null;
} catch (err) {
@@ -227,6 +231,6 @@ export const useGroupData = () => {
updateGroupServers,
deleteGroup,
addServerToGroup,
removeServerFromGroup
removeServerFromGroup,
};
};
};

View File

@@ -1,6 +1,7 @@
import { useState, useEffect, useCallback } from 'react';
import { useTranslation } from 'react-i18next';
import { MarketServer, ApiResponse } from '@/types';
import { getApiUrl } from '../utils/runtime';
export const useMarketData = () => {
const { t } = useTranslation();
@@ -15,7 +16,7 @@ export const useMarketData = () => {
const [error, setError] = useState<string | null>(null);
const [currentServer, setCurrentServer] = useState<MarketServer | null>(null);
const [installedServers, setInstalledServers] = useState<string[]>([]);
// Pagination states
const [currentPage, setCurrentPage] = useState(1);
const [serversPerPage, setServersPerPage] = useState(9);
@@ -26,18 +27,18 @@ export const useMarketData = () => {
try {
setLoading(true);
const token = localStorage.getItem('mcphub_token');
const response = await fetch('/api/market/servers', {
const response = await fetch(getApiUrl('/market/servers'), {
headers: {
'x-auth-token': token || ''
}
'x-auth-token': token || '',
},
});
if (!response.ok) {
throw new Error(`Status: ${response.status}`);
}
const data: ApiResponse<MarketServer[]> = await response.json();
if (data && data.success && Array.isArray(data.data)) {
setAllServers(data.data);
// Apply pagination to the fetched data
@@ -55,44 +56,50 @@ export const useMarketData = () => {
}, [t]);
// Apply pagination to data
const applyPagination = useCallback((data: MarketServer[], page: number, itemsPerPage = serversPerPage) => {
const totalItems = data.length;
const calculatedTotalPages = Math.ceil(totalItems / itemsPerPage);
setTotalPages(calculatedTotalPages);
const applyPagination = useCallback(
(data: MarketServer[], page: number, itemsPerPage = serversPerPage) => {
const totalItems = data.length;
const calculatedTotalPages = Math.ceil(totalItems / itemsPerPage);
setTotalPages(calculatedTotalPages);
// Ensure current page is valid
const validPage = Math.max(1, Math.min(page, calculatedTotalPages));
if (validPage !== page) {
setCurrentPage(validPage);
}
// Ensure current page is valid
const validPage = Math.max(1, Math.min(page, calculatedTotalPages));
if (validPage !== page) {
setCurrentPage(validPage);
}
const startIndex = (validPage - 1) * itemsPerPage;
const paginatedServers = data.slice(startIndex, startIndex + itemsPerPage);
setServers(paginatedServers);
}, [serversPerPage]);
const startIndex = (validPage - 1) * itemsPerPage;
const paginatedServers = data.slice(startIndex, startIndex + itemsPerPage);
setServers(paginatedServers);
},
[serversPerPage],
);
// Change page
const changePage = useCallback((page: number) => {
setCurrentPage(page);
applyPagination(allServers, page, serversPerPage);
}, [allServers, applyPagination, serversPerPage]);
const changePage = useCallback(
(page: number) => {
setCurrentPage(page);
applyPagination(allServers, page, serversPerPage);
},
[allServers, applyPagination, serversPerPage],
);
// Fetch all categories
const fetchCategories = useCallback(async () => {
try {
const token = localStorage.getItem('mcphub_token');
const response = await fetch('/api/market/categories', {
const response = await fetch(getApiUrl('/market/categories'), {
headers: {
'x-auth-token': token || ''
}
'x-auth-token': token || '',
},
});
if (!response.ok) {
throw new Error(`Status: ${response.status}`);
}
const data: ApiResponse<string[]> = await response.json();
if (data && data.success && Array.isArray(data.data)) {
setCategories(data.data);
} else {
@@ -107,18 +114,18 @@ export const useMarketData = () => {
const fetchTags = useCallback(async () => {
try {
const token = localStorage.getItem('mcphub_token');
const response = await fetch('/api/market/tags', {
const response = await fetch(getApiUrl('/market/tags'), {
headers: {
'x-auth-token': token || ''
}
'x-auth-token': token || '',
},
});
if (!response.ok) {
throw new Error(`Status: ${response.status}`);
}
const data: ApiResponse<string[]> = await response.json();
if (data && data.success && Array.isArray(data.data)) {
setTags(data.data);
} else {
@@ -130,178 +137,196 @@ export const useMarketData = () => {
}, []);
// Fetch server by name
const fetchServerByName = useCallback(async (name: string) => {
try {
setLoading(true);
const token = localStorage.getItem('mcphub_token');
const response = await fetch(`/api/market/servers/${name}`, {
headers: {
'x-auth-token': token || ''
const fetchServerByName = useCallback(
async (name: string) => {
try {
setLoading(true);
const token = localStorage.getItem('mcphub_token');
const response = await fetch(getApiUrl(`/market/servers/${name}`), {
headers: {
'x-auth-token': token || '',
},
});
if (!response.ok) {
throw new Error(`Status: ${response.status}`);
}
});
if (!response.ok) {
throw new Error(`Status: ${response.status}`);
}
const data: ApiResponse<MarketServer> = await response.json();
if (data && data.success && data.data) {
setCurrentServer(data.data);
return data.data;
} else {
console.error('Invalid server data format:', data);
setError(t('market.serverNotFound'));
const data: ApiResponse<MarketServer> = await response.json();
if (data && data.success && data.data) {
setCurrentServer(data.data);
return data.data;
} else {
console.error('Invalid server data format:', data);
setError(t('market.serverNotFound'));
return null;
}
} catch (err) {
console.error(`Error fetching server ${name}:`, err);
setError(err instanceof Error ? err.message : String(err));
return null;
} finally {
setLoading(false);
}
} catch (err) {
console.error(`Error fetching server ${name}:`, err);
setError(err instanceof Error ? err.message : String(err));
return null;
} finally {
setLoading(false);
}
}, [t]);
},
[t],
);
// Search servers by query
const searchServers = useCallback(async (query: string) => {
try {
setLoading(true);
setSearchQuery(query);
if (!query.trim()) {
// Fetch fresh data from server instead of just applying pagination
fetchMarketServers();
return;
}
const token = localStorage.getItem('mcphub_token');
const response = await fetch(`/api/market/servers/search?query=${encodeURIComponent(query)}`, {
headers: {
'x-auth-token': token || ''
const searchServers = useCallback(
async (query: string) => {
try {
setLoading(true);
setSearchQuery(query);
if (!query.trim()) {
// Fetch fresh data from server instead of just applying pagination
fetchMarketServers();
return;
}
});
if (!response.ok) {
throw new Error(`Status: ${response.status}`);
const token = localStorage.getItem('mcphub_token');
const response = await fetch(
getApiUrl(`/market/servers/search?query=${encodeURIComponent(query)}`),
{
headers: {
'x-auth-token': token || '',
},
},
);
if (!response.ok) {
throw new Error(`Status: ${response.status}`);
}
const data: ApiResponse<MarketServer[]> = await response.json();
if (data && data.success && Array.isArray(data.data)) {
setAllServers(data.data);
setCurrentPage(1);
applyPagination(data.data, 1);
} else {
console.error('Invalid search results format:', data);
setError(t('market.searchError'));
}
} catch (err) {
console.error('Error searching servers:', err);
setError(err instanceof Error ? err.message : String(err));
} finally {
setLoading(false);
}
const data: ApiResponse<MarketServer[]> = await response.json();
if (data && data.success && Array.isArray(data.data)) {
setAllServers(data.data);
setCurrentPage(1);
applyPagination(data.data, 1);
} else {
console.error('Invalid search results format:', data);
setError(t('market.searchError'));
}
} catch (err) {
console.error('Error searching servers:', err);
setError(err instanceof Error ? err.message : String(err));
} finally {
setLoading(false);
}
}, [t, allServers, applyPagination, fetchMarketServers]);
},
[t, allServers, applyPagination, fetchMarketServers],
);
// Filter servers by category
const filterByCategory = useCallback(async (category: string) => {
try {
setLoading(true);
setSelectedCategory(category);
setSelectedTag(''); // Reset tag filter when filtering by category
if (!category) {
fetchMarketServers();
return;
}
const token = localStorage.getItem('mcphub_token');
const response = await fetch(`/api/market/categories/${encodeURIComponent(category)}`, {
headers: {
'x-auth-token': token || ''
const filterByCategory = useCallback(
async (category: string) => {
try {
setLoading(true);
setSelectedCategory(category);
setSelectedTag(''); // Reset tag filter when filtering by category
if (!category) {
fetchMarketServers();
return;
}
});
if (!response.ok) {
throw new Error(`Status: ${response.status}`);
const token = localStorage.getItem('mcphub_token');
const response = await fetch(
getApiUrl(`/market/categories/${encodeURIComponent(category)}`),
{
headers: {
'x-auth-token': token || '',
},
},
);
if (!response.ok) {
throw new Error(`Status: ${response.status}`);
}
const data: ApiResponse<MarketServer[]> = await response.json();
if (data && data.success && Array.isArray(data.data)) {
setAllServers(data.data);
setCurrentPage(1);
applyPagination(data.data, 1);
} else {
console.error('Invalid category filter results format:', data);
setError(t('market.filterError'));
}
} catch (err) {
console.error('Error filtering servers by category:', err);
setError(err instanceof Error ? err.message : String(err));
} finally {
setLoading(false);
}
const data: ApiResponse<MarketServer[]> = await response.json();
if (data && data.success && Array.isArray(data.data)) {
setAllServers(data.data);
setCurrentPage(1);
applyPagination(data.data, 1);
} else {
console.error('Invalid category filter results format:', data);
setError(t('market.filterError'));
}
} catch (err) {
console.error('Error filtering servers by category:', err);
setError(err instanceof Error ? err.message : String(err));
} finally {
setLoading(false);
}
}, [t, fetchMarketServers, applyPagination]);
},
[t, fetchMarketServers, applyPagination],
);
// Filter servers by tag
const filterByTag = useCallback(async (tag: string) => {
try {
setLoading(true);
setSelectedTag(tag);
setSelectedCategory(''); // Reset category filter when filtering by tag
if (!tag) {
fetchMarketServers();
return;
}
const token = localStorage.getItem('mcphub_token');
const response = await fetch(`/api/market/tags/${encodeURIComponent(tag)}`, {
headers: {
'x-auth-token': token || ''
const filterByTag = useCallback(
async (tag: string) => {
try {
setLoading(true);
setSelectedTag(tag);
setSelectedCategory(''); // Reset category filter when filtering by tag
if (!tag) {
fetchMarketServers();
return;
}
});
if (!response.ok) {
throw new Error(`Status: ${response.status}`);
const token = localStorage.getItem('mcphub_token');
const response = await fetch(getApiUrl(`/market/tags/${encodeURIComponent(tag)}`), {
headers: {
'x-auth-token': token || '',
},
});
if (!response.ok) {
throw new Error(`Status: ${response.status}`);
}
const data: ApiResponse<MarketServer[]> = await response.json();
if (data && data.success && Array.isArray(data.data)) {
setAllServers(data.data);
setCurrentPage(1);
applyPagination(data.data, 1);
} else {
console.error('Invalid tag filter results format:', data);
setError(t('market.tagFilterError'));
}
} catch (err) {
console.error('Error filtering servers by tag:', err);
setError(err instanceof Error ? err.message : String(err));
} finally {
setLoading(false);
}
const data: ApiResponse<MarketServer[]> = await response.json();
if (data && data.success && Array.isArray(data.data)) {
setAllServers(data.data);
setCurrentPage(1);
applyPagination(data.data, 1);
} else {
console.error('Invalid tag filter results format:', data);
setError(t('market.tagFilterError'));
}
} catch (err) {
console.error('Error filtering servers by tag:', err);
setError(err instanceof Error ? err.message : String(err));
} finally {
setLoading(false);
}
}, [t, fetchMarketServers, applyPagination]);
},
[t, fetchMarketServers, applyPagination],
);
// Fetch installed servers
const fetchInstalledServers = useCallback(async () => {
try {
const token = localStorage.getItem('mcphub_token');
const response = await fetch('/api/servers', {
const response = await fetch(getApiUrl('/servers'), {
headers: {
'x-auth-token': token || ''
}
'x-auth-token': token || '',
},
});
if (!response.ok) {
throw new Error(`Status: ${response.status}`);
}
const data = await response.json();
if (data && data.success && Array.isArray(data.data)) {
// Extract server names
const installedServerNames = data.data.map((server: any) => server.name);
@@ -313,64 +338,77 @@ export const useMarketData = () => {
}, []);
// Check if a server is already installed
const isServerInstalled = useCallback((serverName: string) => {
return installedServers.includes(serverName);
}, [installedServers]);
const isServerInstalled = useCallback(
(serverName: string) => {
return installedServers.includes(serverName);
},
[installedServers],
);
// Install server to the local environment
const installServer = useCallback(async (server: MarketServer) => {
try {
const installType = server.installations?.npm ? 'npm' : Object.keys(server.installations || {}).length > 0 ? Object.keys(server.installations)[0] : null;
if (!installType || !server.installations?.[installType]) {
setError(t('market.noInstallationMethod'));
const installServer = useCallback(
async (server: MarketServer) => {
try {
const installType = server.installations?.npm
? 'npm'
: Object.keys(server.installations || {}).length > 0
? Object.keys(server.installations)[0]
: null;
if (!installType || !server.installations?.[installType]) {
setError(t('market.noInstallationMethod'));
return false;
}
const installation = server.installations[installType];
// Prepare server configuration
const serverConfig = {
name: server.name,
config: {
command: installation.command,
args: installation.args,
env: installation.env || {},
},
};
// Call the createServer API
const token = localStorage.getItem('mcphub_token');
const response = await fetch(getApiUrl('/servers'), {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'x-auth-token': token || '',
},
body: JSON.stringify(serverConfig),
});
if (!response.ok) {
const errorData = await response.json();
throw new Error(errorData.message || `Status: ${response.status}`);
}
// Update installed servers list after successful installation
await fetchInstalledServers();
return true;
} catch (err) {
console.error('Error installing server:', err);
setError(err instanceof Error ? err.message : String(err));
return false;
}
const installation = server.installations[installType];
// Prepare server configuration
const serverConfig = {
name: server.name,
config: {
command: installation.command,
args: installation.args,
env: installation.env || {}
}
};
// Call the createServer API
const token = localStorage.getItem('mcphub_token');
const response = await fetch('/api/servers', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'x-auth-token': token || ''
},
body: JSON.stringify(serverConfig),
});
if (!response.ok) {
const errorData = await response.json();
throw new Error(errorData.message || `Status: ${response.status}`);
}
// Update installed servers list after successful installation
await fetchInstalledServers();
return true;
} catch (err) {
console.error('Error installing server:', err);
setError(err instanceof Error ? err.message : String(err));
return false;
}
}, [t, fetchInstalledServers]);
},
[t, fetchInstalledServers],
);
// Change servers per page
const changeServersPerPage = useCallback((perPage: number) => {
setServersPerPage(perPage);
setCurrentPage(1);
applyPagination(allServers, 1, perPage);
}, [allServers, applyPagination]);
const changeServersPerPage = useCallback(
(perPage: number) => {
setServersPerPage(perPage);
setCurrentPage(1);
applyPagination(allServers, 1, perPage);
},
[allServers, applyPagination],
);
// Load initial data
useEffect(() => {
@@ -405,6 +443,6 @@ export const useMarketData = () => {
changePage,
changeServersPerPage,
// Installed servers methods
isServerInstalled
isServerInstalled,
};
};
};

View File

@@ -1,18 +1,19 @@
import { useState, useEffect, useRef, useCallback } from 'react';
import { useTranslation } from 'react-i18next';
import { Server, ApiResponse } from '@/types';
import { getApiUrl } from '../utils/runtime';
// Configuration options
const CONFIG = {
// Initialization phase configuration
startup: {
maxAttempts: 60, // Maximum number of attempts during initialization
pollingInterval: 3000 // Polling interval during initialization (3 seconds)
maxAttempts: 60, // Maximum number of attempts during initialization
pollingInterval: 3000, // Polling interval during initialization (3 seconds)
},
// Normal operation phase configuration
normal: {
pollingInterval: 10000 // Polling interval during normal operation (10 seconds)
}
pollingInterval: 10000, // Polling interval during normal operation (10 seconds)
},
};
export const useServerData = () => {
@@ -22,7 +23,7 @@ export const useServerData = () => {
const [refreshKey, setRefreshKey] = useState(0);
const [isInitialLoading, setIsInitialLoading] = useState(true);
const [fetchAttempts, setFetchAttempts] = useState(0);
// Timer reference for polling
const intervalRef = useRef<NodeJS.Timeout | null>(null);
// Track current attempt count to avoid dependency cycles
@@ -40,17 +41,17 @@ export const useServerData = () => {
const startNormalPolling = useCallback(() => {
// Ensure no other timers are running
clearTimer();
const fetchServers = async () => {
try {
const token = localStorage.getItem('mcphub_token');
const response = await fetch('/api/servers', {
const response = await fetch(getApiUrl('/servers'), {
headers: {
'x-auth-token': token || ''
}
'x-auth-token': token || '',
},
});
const data = await response.json();
if (data && data.success && Array.isArray(data.data)) {
setServers(data.data);
} else if (data && Array.isArray(data)) {
@@ -59,29 +60,29 @@ export const useServerData = () => {
console.error('Invalid server data format:', data);
setServers([]);
}
// Reset error state
setError(null);
} catch (err) {
console.error('Error fetching servers during normal polling:', err);
// Use friendly error message
if (!navigator.onLine) {
setError(t('errors.network'));
} else if (err instanceof TypeError && (
err.message.includes('NetworkError') ||
err.message.includes('Failed to fetch')
)) {
} else if (
err instanceof TypeError &&
(err.message.includes('NetworkError') || err.message.includes('Failed to fetch'))
) {
setError(t('errors.serverConnection'));
} else {
setError(t('errors.serverFetch'));
}
}
};
// Execute immediately
fetchServers();
// Set up regular polling
intervalRef.current = setInterval(fetchServers, CONFIG.normal.pollingInterval);
}, [t]);
@@ -92,18 +93,18 @@ export const useServerData = () => {
attemptsRef.current = 0;
setFetchAttempts(0);
}
// Initialization phase request function
const fetchInitialData = async () => {
try {
const token = localStorage.getItem('mcphub_token');
const response = await fetch('/api/servers', {
const response = await fetch(getApiUrl('/servers'), {
headers: {
'x-auth-token': token || ''
}
'x-auth-token': token || '',
},
});
const data = await response.json();
// Handle API response wrapper object, extract data field
if (data && data.success && Array.isArray(data.data)) {
setServers(data.data);
@@ -131,17 +132,17 @@ export const useServerData = () => {
// Increment attempt count, use ref to avoid triggering effect rerun
attemptsRef.current += 1;
console.error(`Initial loading attempt ${attemptsRef.current} failed:`, err);
// Update state for display
setFetchAttempts(attemptsRef.current);
// Set appropriate error message
if (!navigator.onLine) {
setError(t('errors.network'));
} else {
setError(t('errors.initialStartup'));
}
// If maximum attempt count is exceeded, give up initialization and switch to normal polling
if (attemptsRef.current >= CONFIG.startup.maxAttempts) {
console.log('Maximum startup attempts reached, switching to normal polling');
@@ -151,19 +152,19 @@ export const useServerData = () => {
// Switch to normal polling mode
startNormalPolling();
}
return false;
}
};
// On component mount, set appropriate polling based on current state
if (isInitialLoading) {
// Ensure no other timers are running
clearTimer();
// Execute initial request immediately
fetchInitialData();
// Set polling interval for initialization phase
intervalRef.current = setInterval(fetchInitialData, CONFIG.startup.pollingInterval);
console.log(`Started initial polling with interval: ${CONFIG.startup.pollingInterval}ms`);
@@ -171,7 +172,7 @@ export const useServerData = () => {
// Initialization completed, start normal polling
startNormalPolling();
}
// Cleanup function
return () => {
clearTimer();
@@ -182,35 +183,35 @@ export const useServerData = () => {
const triggerRefresh = () => {
// Clear current timer
clearTimer();
// If in initialization phase, reset initialization state
if (isInitialLoading) {
setIsInitialLoading(true);
attemptsRef.current = 0;
setFetchAttempts(0);
}
// Change in refreshKey will trigger useEffect to run again
setRefreshKey(prevKey => prevKey + 1);
setRefreshKey((prevKey) => prevKey + 1);
};
// Server related operations
const handleServerAdd = () => {
setRefreshKey(prevKey => prevKey + 1);
setRefreshKey((prevKey) => prevKey + 1);
};
const handleServerEdit = async (server: Server) => {
try {
// Fetch settings to get the full server config before editing
const token = localStorage.getItem('mcphub_token');
const response = await fetch(`/api/settings`, {
const response = await fetch(getApiUrl('/settings'), {
headers: {
'x-auth-token': token || ''
}
'x-auth-token': token || '',
},
});
const settingsData: ApiResponse<{ mcpServers: Record<string, any> }> = await response.json();
if (
settingsData &&
settingsData.success &&
@@ -240,11 +241,11 @@ export const useServerData = () => {
const handleServerRemove = async (serverName: string) => {
try {
const token = localStorage.getItem('mcphub_token');
const response = await fetch(`/api/servers/${serverName}`, {
const response = await fetch(getApiUrl(`/servers/${serverName}`), {
method: 'DELETE',
headers: {
'x-auth-token': token || ''
}
'x-auth-token': token || '',
},
});
const result = await response.json();
@@ -253,7 +254,7 @@ export const useServerData = () => {
return false;
}
setRefreshKey(prevKey => prevKey + 1);
setRefreshKey((prevKey) => prevKey + 1);
return true;
} catch (err) {
setError(t('errors.general') + ': ' + (err instanceof Error ? err.message : String(err)));
@@ -264,11 +265,11 @@ export const useServerData = () => {
const handleServerToggle = async (server: Server, enabled: boolean) => {
try {
const token = localStorage.getItem('mcphub_token');
const response = await fetch(`/api/servers/${server.name}/toggle`, {
const response = await fetch(getApiUrl(`/servers/${server.name}/toggle`), {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'x-auth-token': token || ''
'x-auth-token': token || '',
},
body: JSON.stringify({ enabled }),
});
@@ -282,7 +283,7 @@ export const useServerData = () => {
}
// Update the UI immediately to reflect the change
setRefreshKey(prevKey => prevKey + 1);
setRefreshKey((prevKey) => prevKey + 1);
return true;
} catch (err) {
console.error('Error toggling server:', err);
@@ -301,6 +302,6 @@ export const useServerData = () => {
handleServerAdd,
handleServerEdit,
handleServerRemove,
handleServerToggle
handleServerToggle,
};
};
};

View File

@@ -2,6 +2,7 @@ import { useState, useCallback, useEffect } from 'react';
import { useTranslation } from 'react-i18next';
import { ApiResponse } from '@/types';
import { useToast } from '@/contexts/ToastContext';
import { getApiUrl } from '../utils/runtime';
// Define types for the settings data
interface RoutingConfig {
@@ -16,10 +17,19 @@ interface InstallConfig {
npmRegistry: string;
}
interface SmartRoutingConfig {
enabled: boolean;
dbUrl: string;
openaiApiBaseUrl: string;
openaiApiKey: string;
openaiApiEmbeddingModel: string;
}
interface SystemSettings {
systemConfig?: {
routing?: RoutingConfig;
install?: InstallConfig;
smartRouting?: SmartRoutingConfig;
};
}
@@ -47,6 +57,14 @@ export const useSettingsData = () => {
npmRegistry: '',
});
const [smartRoutingConfig, setSmartRoutingConfig] = useState<SmartRoutingConfig>({
enabled: false,
dbUrl: '',
openaiApiBaseUrl: '',
openaiApiKey: '',
openaiApiEmbeddingModel: '',
});
const [loading, setLoading] = useState(false);
const [error, setError] = useState<string | null>(null);
const [refreshKey, setRefreshKey] = useState(0);
@@ -63,7 +81,7 @@ export const useSettingsData = () => {
try {
const token = localStorage.getItem('mcphub_token');
const response = await fetch('/api/settings', {
const response = await fetch(getApiUrl('/settings'), {
headers: {
'x-auth-token': token || '',
},
@@ -89,14 +107,25 @@ export const useSettingsData = () => {
npmRegistry: data.data.systemConfig.install.npmRegistry || '',
});
}
if (data.success && data.data?.systemConfig?.smartRouting) {
setSmartRoutingConfig({
enabled: data.data.systemConfig.smartRouting.enabled ?? false,
dbUrl: data.data.systemConfig.smartRouting.dbUrl || '',
openaiApiBaseUrl: data.data.systemConfig.smartRouting.openaiApiBaseUrl || '',
openaiApiKey: data.data.systemConfig.smartRouting.openaiApiKey || '',
openaiApiEmbeddingModel:
data.data.systemConfig.smartRouting.openaiApiEmbeddingModel || '',
});
}
} catch (error) {
console.error('Failed to fetch settings:', error);
setError(error instanceof Error ? error.message : 'Failed to fetch settings');
// 使用一个稳定的 showToast 引用,避免将其加入依赖数组
showToast(t('errors.failedToFetchSettings'));
} finally {
setLoading(false);
}
}, [t, showToast]);
}, [t]); // 移除 showToast 依赖
// Update routing configuration
const updateRoutingConfig = async <T extends keyof RoutingConfig>(
@@ -108,7 +137,7 @@ export const useSettingsData = () => {
try {
const token = localStorage.getItem('mcphub_token');
const response = await fetch('/api/system-config', {
const response = await fetch(getApiUrl('/system-config'), {
method: 'PUT',
headers: {
'Content-Type': 'application/json',
@@ -155,7 +184,7 @@ export const useSettingsData = () => {
try {
const token = localStorage.getItem('mcphub_token');
const response = await fetch('/api/system-config', {
const response = await fetch(getApiUrl('/system-config'), {
method: 'PUT',
headers: {
'Content-Type': 'application/json',
@@ -195,6 +224,107 @@ export const useSettingsData = () => {
}
};
// Update smart routing configuration
const updateSmartRoutingConfig = async <T extends keyof SmartRoutingConfig>(
key: T,
value: SmartRoutingConfig[T],
) => {
setLoading(true);
setError(null);
try {
const token = localStorage.getItem('mcphub_token');
const response = await fetch(getApiUrl('/system-config'), {
method: 'PUT',
headers: {
'Content-Type': 'application/json',
'x-auth-token': token || '',
},
body: JSON.stringify({
smartRouting: {
[key]: value,
},
}),
});
if (!response.ok) {
const errorData = await response.json();
throw new Error(errorData.message || `HTTP error! Status: ${response.status}`);
}
const data = await response.json();
if (data.success) {
setSmartRoutingConfig({
...smartRoutingConfig,
[key]: value,
});
showToast(t('settings.systemConfigUpdated'));
return true;
} else {
showToast(data.message || t('errors.failedToUpdateSmartRoutingConfig'));
return false;
}
} catch (error) {
console.error('Failed to update smart routing config:', error);
const errorMessage =
error instanceof Error ? error.message : 'Failed to update smart routing config';
setError(errorMessage);
showToast(errorMessage);
return false;
} finally {
setLoading(false);
}
};
// Update multiple smart routing configuration fields at once
const updateSmartRoutingConfigBatch = async (updates: Partial<SmartRoutingConfig>) => {
setLoading(true);
setError(null);
try {
const token = localStorage.getItem('mcphub_token');
const response = await fetch(getApiUrl('/system-config'), {
method: 'PUT',
headers: {
'Content-Type': 'application/json',
'x-auth-token': token || '',
},
body: JSON.stringify({
smartRouting: updates,
}),
});
if (!response.ok) {
const errorData = await response.json();
throw new Error(errorData.message || `HTTP error! Status: ${response.status}`);
}
const data = await response.json();
if (data.success) {
setSmartRoutingConfig({
...smartRoutingConfig,
...updates,
});
showToast(t('settings.systemConfigUpdated'));
return true;
} else {
showToast(data.message || t('errors.failedToUpdateSmartRoutingConfig'));
return false;
}
} catch (error) {
console.error('Failed to update smart routing config:', error);
const errorMessage =
error instanceof Error ? error.message : 'Failed to update smart routing config';
setError(errorMessage);
showToast(errorMessage);
return false;
} finally {
setLoading(false);
}
};
// Fetch settings when the component mounts or refreshKey changes
useEffect(() => {
fetchSettings();
@@ -213,6 +343,7 @@ export const useSettingsData = () => {
tempRoutingConfig,
setTempRoutingConfig,
installConfig,
smartRoutingConfig,
loading,
error,
setError,
@@ -220,5 +351,7 @@ export const useSettingsData = () => {
fetchSettings,
updateRoutingConfig,
updateInstallConfig,
updateSmartRoutingConfig,
updateSmartRoutingConfigBatch,
};
};

View File

@@ -125,7 +125,8 @@
"initialStartup": "The server might be starting up. Please wait a moment as this process can take some time on first launch...",
"serverInstall": "Failed to install server",
"failedToFetchSettings": "Failed to fetch settings",
"failedToUpdateRouteConfig": "Failed to update route configuration"
"failedToUpdateRouteConfig": "Failed to update route configuration",
"failedToUpdateSmartRoutingConfig": "Failed to update smart routing configuration"
},
"common": {
"processing": "Processing...",
@@ -152,10 +153,10 @@
"pages": {
"dashboard": {
"title": "Dashboard",
"totalServers": "Total Servers",
"onlineServers": "Online Servers",
"offlineServers": "Offline Servers",
"connectingServers": "Connecting Servers",
"totalServers": "Total",
"onlineServers": "Online",
"offlineServers": "Offline",
"connectingServers": "Connecting",
"recentServers": "Recent Servers"
},
"servers": {
@@ -170,8 +171,9 @@
"account": "Account Settings",
"password": "Change Password",
"appearance": "Appearance",
"routeConfig": "Security Configuration",
"installConfig": "Installation Configuration"
"routeConfig": "Security",
"installConfig": "Installation",
"smartRouting": "Smart Routing"
},
"market": {
"title": "Server Market - (Data from mcpm.sh)"
@@ -277,7 +279,20 @@
"npmRegistry": "NPM Registry URL",
"npmRegistryDescription": "Set npm_config_registry environment variable for NPM package installation",
"npmRegistryPlaceholder": "e.g. https://registry.npmjs.org/",
"installConfig": "Installation Configuration",
"systemConfigUpdated": "System configuration updated successfully"
"installConfig": "Installation",
"systemConfigUpdated": "System configuration updated successfully",
"enableSmartRouting": "Enable Smart Routing",
"enableSmartRoutingDescription": "Enable smart routing feature to search the most suitable tool based on input (using $smart group name)",
"dbUrl": "PostgreSQL URL (with pgvector support)",
"dbUrlPlaceholder": "e.g. postgresql://user:password@localhost:5432/dbname",
"openaiApiBaseUrl": "OpenAI API Base URL",
"openaiApiBaseUrlPlaceholder": "https://api.openai.com/v1",
"openaiApiKey": "OpenAI API Key",
"openaiApiKeyPlaceholder": "Enter OpenAI API key",
"openaiApiEmbeddingModel": "OpenAI Embedding Model",
"openaiApiEmbeddingModelPlaceholder": "text-embedding-3-small",
"smartRoutingConfigUpdated": "Smart routing configuration updated successfully",
"smartRoutingRequiredFields": "Database URL and OpenAI API Key are required to enable smart routing",
"smartRoutingValidationError": "Please fill in the required fields before enabling Smart Routing: {{fields}}"
}
}

View File

@@ -126,7 +126,8 @@
"serverInstall": "安装服务器失败",
"failedToFetchSettings": "获取设置失败",
"failedToUpdateSystemConfig": "更新系统配置失败",
"failedToUpdateRouteConfig": "更新路由配置失败"
"failedToUpdateRouteConfig": "更新路由配置失败",
"failedToUpdateSmartRoutingConfig": "更新智能路由配置失败"
},
"common": {
"processing": "处理中...",
@@ -153,10 +154,10 @@
"pages": {
"dashboard": {
"title": "仪表盘",
"totalServers": "服务器总数",
"onlineServers": "在线服务器",
"offlineServers": "离线服务器",
"connectingServers": "连接中服务",
"totalServers": "总数",
"onlineServers": "在线",
"offlineServers": "离线",
"connectingServers": "连接中",
"recentServers": "最近的服务器"
},
"servers": {
@@ -169,7 +170,8 @@
"password": "修改密码",
"appearance": "外观",
"routeConfig": "安全配置",
"installConfig": "安装配置"
"installConfig": "安装",
"smartRouting": "智能路由"
},
"groups": {
"title": "分组管理"
@@ -279,6 +281,20 @@
"npmRegistryDescription": "设置 npm_config_registry 环境变量,用于 NPM 包安装",
"npmRegistryPlaceholder": "例如: https://registry.npmmirror.com/",
"installConfig": "安装配置",
"systemConfigUpdated": "系统配置更新成功"
"systemConfigUpdated": "系统配置更新成功",
"enableSmartRouting": "启用智能路由",
"enableSmartRoutingDescription": "开启智能路由功能,根据输入自动搜索最合适的工具(使用 $smart 分组)",
"dbUrl": "PostgreSQL 连接地址(支持 pgvector",
"dbUrlPlaceholder": "例如: postgresql://user:password@localhost:5432/dbname",
"openaiApiBaseUrl": "OpenAI API 基础地址",
"openaiApiBaseUrlPlaceholder": "https://api.openai.com/v1",
"openaiApiKey": "OpenAI API 密钥",
"openaiApiKeyDescription": "用于访问 OpenAI API 的密钥",
"openaiApiKeyPlaceholder": "请输入 OpenAI API 密钥",
"openaiApiEmbeddingModel": "OpenAI 嵌入模型",
"openaiApiEmbeddingModelPlaceholder": "text-embedding-3-small",
"smartRoutingConfigUpdated": "智能路由配置更新成功",
"smartRoutingRequiredFields": "启用智能路由需要填写数据库连接地址和 OpenAI API 密钥",
"smartRoutingValidationError": "启用智能路由前请先填写必要字段:{{fields}}"
}
}

View File

@@ -1,12 +1,45 @@
import React from 'react'
import ReactDOM from 'react-dom/client'
import App from './App'
import './index.css'
import React from 'react';
import ReactDOM from 'react-dom/client';
import App from './App';
import './index.css';
// Import the i18n configuration
import './i18n'
import './i18n';
import { loadRuntimeConfig } from './utils/runtime';
ReactDOM.createRoot(document.getElementById('root')!).render(
<React.StrictMode>
<App />
</React.StrictMode>,
)
// Load runtime configuration before starting the app
async function initializeApp() {
try {
console.log('Loading runtime configuration...');
const config = await loadRuntimeConfig();
console.log('Runtime configuration loaded:', config);
// Store config in window object
window.__MCPHUB_CONFIG__ = config;
// Start React app
ReactDOM.createRoot(document.getElementById('root')!).render(
<React.StrictMode>
<App />
</React.StrictMode>,
);
} catch (error) {
console.error('Failed to initialize app:', error);
// Fallback: start app with default config
console.log('Starting app with default configuration...');
window.__MCPHUB_CONFIG__ = {
basePath: '',
version: 'dev',
name: 'mcphub',
};
ReactDOM.createRoot(document.getElementById('root')!).render(
<React.StrictMode>
<App />
</React.StrictMode>,
);
}
}
// Initialize the app
initializeApp();

View File

@@ -10,16 +10,16 @@ import { useServerData } from '@/hooks/useServerData';
const ServersPage: React.FC = () => {
const { t } = useTranslation();
const navigate = useNavigate();
const {
servers,
error,
setError,
isLoading,
handleServerAdd,
handleServerEdit,
handleServerRemove,
const {
servers,
error,
setError,
isLoading,
handleServerAdd,
handleServerEdit,
handleServerRemove,
handleServerToggle,
triggerRefresh
triggerRefresh
} = useServerData();
const [editingServer, setEditingServer] = useState<Server | null>(null);
const [isRefreshing, setIsRefreshing] = useState(false);
@@ -54,7 +54,7 @@ const ServersPage: React.FC = () => {
<div className="flex space-x-4">
<button
onClick={() => navigate('/market')}
className="px-4 py-2 bg-emerald-100 text-emerald-800 rounded hover:bg-emerald-200 flex items-center"
className="px-4 py-2 bg-blue-100 text-blue-800 rounded hover:bg-blue-200 flex items-center"
>
<svg xmlns="http://www.w3.org/2000/svg" className="h-4 w-4 mr-2" viewBox="0 0 20 20" fill="currentColor">
<path d="M3 1a1 1 0 000 2h1.22l.305 1.222a.997.997 0 00.01.042l1.358 5.43-.893.892C3.74 11.846 4.632 14 6.414 14H15a1 1 0 000-2H6.414l1-1H14a1 1 0 00.894-.553l3-6A1 1 0 0017 3H6.28l-.31-1.243A1 1 0 005 1H3z" />

View File

@@ -26,14 +26,29 @@ const SettingsPage: React.FC = () => {
npmRegistry: '',
});
const [tempSmartRoutingConfig, setTempSmartRoutingConfig] = useState<{
dbUrl: string;
openaiApiBaseUrl: string;
openaiApiKey: string;
openaiApiEmbeddingModel: string;
}>({
dbUrl: '',
openaiApiBaseUrl: '',
openaiApiKey: '',
openaiApiEmbeddingModel: '',
});
const {
routingConfig,
tempRoutingConfig,
setTempRoutingConfig,
installConfig: savedInstallConfig,
smartRoutingConfig,
loading,
updateRoutingConfig,
updateInstallConfig
updateInstallConfig,
updateSmartRoutingConfig,
updateSmartRoutingConfigBatch
} = useSettingsData();
// Update local installConfig when savedInstallConfig changes
@@ -43,13 +58,26 @@ const SettingsPage: React.FC = () => {
}
}, [savedInstallConfig]);
// Update local tempSmartRoutingConfig when smartRoutingConfig changes
useEffect(() => {
if (smartRoutingConfig) {
setTempSmartRoutingConfig({
dbUrl: smartRoutingConfig.dbUrl || '',
openaiApiBaseUrl: smartRoutingConfig.openaiApiBaseUrl || '',
openaiApiKey: smartRoutingConfig.openaiApiKey || '',
openaiApiEmbeddingModel: smartRoutingConfig.openaiApiEmbeddingModel || '',
});
}
}, [smartRoutingConfig]);
const [sectionsVisible, setSectionsVisible] = useState({
routingConfig: false,
installConfig: false,
smartRoutingConfig: false,
password: false
});
const toggleSection = (section: 'routingConfig' | 'installConfig' | 'password') => {
const toggleSection = (section: 'routingConfig' | 'installConfig' | 'smartRoutingConfig' | 'password') => {
setSectionsVisible(prev => ({
...prev,
[section]: !prev[section]
@@ -91,6 +119,59 @@ const SettingsPage: React.FC = () => {
await updateInstallConfig(key, installConfig[key]);
};
const handleSmartRoutingConfigChange = (key: 'dbUrl' | 'openaiApiBaseUrl' | 'openaiApiKey' | 'openaiApiEmbeddingModel', value: string) => {
setTempSmartRoutingConfig({
...tempSmartRoutingConfig,
[key]: value
});
};
const saveSmartRoutingConfig = async (key: 'dbUrl' | 'openaiApiBaseUrl' | 'openaiApiKey' | 'openaiApiEmbeddingModel') => {
await updateSmartRoutingConfig(key, tempSmartRoutingConfig[key]);
};
const handleSmartRoutingEnabledChange = async (value: boolean) => {
// If enabling Smart Routing, validate required fields and save any unsaved changes
if (value) {
const currentDbUrl = tempSmartRoutingConfig.dbUrl || smartRoutingConfig.dbUrl;
const currentOpenaiApiKey = tempSmartRoutingConfig.openaiApiKey || smartRoutingConfig.openaiApiKey;
if (!currentDbUrl || !currentOpenaiApiKey) {
const missingFields = [];
if (!currentDbUrl) missingFields.push(t('settings.dbUrl'));
if (!currentOpenaiApiKey) missingFields.push(t('settings.openaiApiKey'));
showToast(t('settings.smartRoutingValidationError', {
fields: missingFields.join(', ')
}));
return;
}
// Prepare updates object with unsaved changes and enabled status
const updates: any = { enabled: value };
// Check for unsaved changes and include them in the batch update
if (tempSmartRoutingConfig.dbUrl !== smartRoutingConfig.dbUrl) {
updates.dbUrl = tempSmartRoutingConfig.dbUrl;
}
if (tempSmartRoutingConfig.openaiApiBaseUrl !== smartRoutingConfig.openaiApiBaseUrl) {
updates.openaiApiBaseUrl = tempSmartRoutingConfig.openaiApiBaseUrl;
}
if (tempSmartRoutingConfig.openaiApiKey !== smartRoutingConfig.openaiApiKey) {
updates.openaiApiKey = tempSmartRoutingConfig.openaiApiKey;
}
if (tempSmartRoutingConfig.openaiApiEmbeddingModel !== smartRoutingConfig.openaiApiEmbeddingModel) {
updates.openaiApiEmbeddingModel = tempSmartRoutingConfig.openaiApiEmbeddingModel;
}
// Save all changes in a single batch update
await updateSmartRoutingConfigBatch(updates);
} else {
// If disabling, just update the enabled status
await updateSmartRoutingConfig('enabled', value);
}
};
const handlePasswordChangeSuccess = () => {
setTimeout(() => {
navigate('/');
@@ -133,6 +214,131 @@ const SettingsPage: React.FC = () => {
</div>
</div>
{/* Smart Routing Configuration Settings */}
<div className="bg-white shadow rounded-lg py-4 px-6 mb-6">
<div
className="flex justify-between items-center cursor-pointer"
onClick={() => toggleSection('smartRoutingConfig')}
>
<h2 className="font-semibold text-gray-800">{t('pages.settings.smartRouting')}</h2>
<span className="text-gray-500">
{sectionsVisible.smartRoutingConfig ? '▼' : '►'}
</span>
</div>
{sectionsVisible.smartRoutingConfig && (
<div className="space-y-4 mt-4">
<div className="flex items-center justify-between p-3 bg-gray-50 rounded-md">
<div>
<h3 className="font-medium text-gray-700">{t('settings.enableSmartRouting')}</h3>
<p className="text-sm text-gray-500">{t('settings.enableSmartRoutingDescription')}</p>
</div>
<Switch
disabled={loading}
checked={smartRoutingConfig.enabled}
onCheckedChange={(checked) => handleSmartRoutingEnabledChange(checked)}
/>
</div>
<div className="p-3 bg-gray-50 rounded-md">
<div className="mb-2">
<h3 className="font-medium text-gray-700">
<span className="text-red-500 px-1">*</span>{t('settings.dbUrl')}
</h3>
</div>
<div className="flex items-center gap-3">
<input
type="text"
value={tempSmartRoutingConfig.dbUrl}
onChange={(e) => handleSmartRoutingConfigChange('dbUrl', e.target.value)}
placeholder={t('settings.dbUrlPlaceholder')}
className="flex-1 mt-1 block w-full py-2 px-3 border rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm border-gray-300"
disabled={loading}
/>
<button
onClick={() => saveSmartRoutingConfig('dbUrl')}
disabled={loading}
className="mt-1 px-4 py-2 bg-blue-600 hover:bg-blue-700 text-white rounded-md text-sm font-medium disabled:opacity-50"
>
{t('common.save')}
</button>
</div>
</div>
<div className="p-3 bg-gray-50 rounded-md">
<div className="mb-2">
<h3 className="font-medium text-gray-700">
<span className="text-red-500 px-1">*</span>{t('settings.openaiApiKey')}
</h3>
</div>
<div className="flex items-center gap-3">
<input
type="password"
value={tempSmartRoutingConfig.openaiApiKey}
onChange={(e) => handleSmartRoutingConfigChange('openaiApiKey', e.target.value)}
placeholder={t('settings.openaiApiKeyPlaceholder')}
className="flex-1 mt-1 block w-full py-2 px-3 border rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm border-gray-300"
disabled={loading}
/>
<button
onClick={() => saveSmartRoutingConfig('openaiApiKey')}
disabled={loading}
className="mt-1 px-4 py-2 bg-blue-600 hover:bg-blue-700 text-white rounded-md text-sm font-medium disabled:opacity-50"
>
{t('common.save')}
</button>
</div>
</div>
<div className="p-3 bg-gray-50 rounded-md">
<div className="mb-2">
<h3 className="font-medium text-gray-700">{t('settings.openaiApiBaseUrl')}</h3>
</div>
<div className="flex items-center gap-3">
<input
type="text"
value={tempSmartRoutingConfig.openaiApiBaseUrl}
onChange={(e) => handleSmartRoutingConfigChange('openaiApiBaseUrl', e.target.value)}
placeholder={t('settings.openaiApiBaseUrlPlaceholder')}
className="flex-1 mt-1 block w-full py-2 px-3 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm"
disabled={loading}
/>
<button
onClick={() => saveSmartRoutingConfig('openaiApiBaseUrl')}
disabled={loading}
className="mt-1 px-4 py-2 bg-blue-600 hover:bg-blue-700 text-white rounded-md text-sm font-medium disabled:opacity-50"
>
{t('common.save')}
</button>
</div>
</div>
<div className="p-3 bg-gray-50 rounded-md">
<div className="mb-2">
<h3 className="font-medium text-gray-700">{t('settings.openaiApiEmbeddingModel')}</h3>
</div>
<div className="flex items-center gap-3">
<input
type="text"
value={tempSmartRoutingConfig.openaiApiEmbeddingModel}
onChange={(e) => handleSmartRoutingConfigChange('openaiApiEmbeddingModel', e.target.value)}
placeholder={t('settings.openaiApiEmbeddingModelPlaceholder')}
className="flex-1 mt-1 block w-full py-2 px-3 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm"
disabled={loading}
/>
<button
onClick={() => saveSmartRoutingConfig('openaiApiEmbeddingModel')}
disabled={loading}
className="mt-1 px-4 py-2 bg-blue-600 hover:bg-blue-700 text-white rounded-md text-sm font-medium disabled:opacity-50"
>
{t('common.save')}
</button>
</div>
</div>
</div>
)}
</div>
{/* Route Configuration Settings */}
<div className="bg-white shadow rounded-lg py-4 px-6 mb-6">
<div
@@ -296,7 +502,7 @@ const SettingsPage: React.FC = () => {
</div>
)}
</div>
</div>
</div >
);
};

View File

@@ -1,7 +1,10 @@
import { AuthResponse, LoginCredentials, RegisterCredentials, ChangePasswordCredentials } from '../types';
// Base URL for API requests
const API_URL = '';
import {
AuthResponse,
LoginCredentials,
RegisterCredentials,
ChangePasswordCredentials,
} from '../types';
import { getApiUrl } from '../utils/runtime';
// Token key in localStorage
const TOKEN_KEY = 'mcphub_token';
@@ -24,7 +27,8 @@ export const removeToken = (): void => {
// Login user
export const login = async (credentials: LoginCredentials): Promise<AuthResponse> => {
try {
const response = await fetch(`${API_URL}/auth/login`, {
console.log(getApiUrl('/auth/login'));
const response = await fetch(getApiUrl('/auth/login'), {
method: 'POST',
headers: {
'Content-Type': 'application/json',
@@ -33,11 +37,11 @@ export const login = async (credentials: LoginCredentials): Promise<AuthResponse
});
const data: AuthResponse = await response.json();
if (data.success && data.token) {
setToken(data.token);
}
return data;
} catch (error) {
console.error('Login error:', error);
@@ -51,7 +55,7 @@ export const login = async (credentials: LoginCredentials): Promise<AuthResponse
// Register user
export const register = async (credentials: RegisterCredentials): Promise<AuthResponse> => {
try {
const response = await fetch(`${API_URL}/auth/register`, {
const response = await fetch(getApiUrl('/auth/register'), {
method: 'POST',
headers: {
'Content-Type': 'application/json',
@@ -60,11 +64,11 @@ export const register = async (credentials: RegisterCredentials): Promise<AuthRe
});
const data: AuthResponse = await response.json();
if (data.success && data.token) {
setToken(data.token);
}
return data;
} catch (error) {
console.error('Register error:', error);
@@ -78,16 +82,16 @@ export const register = async (credentials: RegisterCredentials): Promise<AuthRe
// Get current user
export const getCurrentUser = async (): Promise<AuthResponse> => {
const token = getToken();
if (!token) {
return {
success: false,
message: 'No authentication token',
};
}
try {
const response = await fetch(`${API_URL}/auth/user`, {
const response = await fetch(getApiUrl('/auth/user'), {
method: 'GET',
headers: {
'x-auth-token': token,
@@ -105,18 +109,20 @@ export const getCurrentUser = async (): Promise<AuthResponse> => {
};
// Change password
export const changePassword = async (credentials: ChangePasswordCredentials): Promise<AuthResponse> => {
export const changePassword = async (
credentials: ChangePasswordCredentials,
): Promise<AuthResponse> => {
const token = getToken();
if (!token) {
return {
success: false,
message: 'No authentication token',
};
}
try {
const response = await fetch(`${API_URL}/auth/change-password`, {
const response = await fetch(getApiUrl('/auth/change-password'), {
method: 'POST',
headers: {
'Content-Type': 'application/json',
@@ -138,4 +144,4 @@ export const changePassword = async (credentials: ChangePasswordCredentials): Pr
// Logout user
export const logout = (): void => {
removeToken();
};
};

View File

@@ -1,5 +1,6 @@
import { useEffect, useState } from 'react';
import { getToken } from './authService'; // Import getToken function
import { getApiUrl } from '../utils/runtime';
export interface LogEntry {
timestamp: number;
@@ -18,18 +19,18 @@ export const fetchLogs = async (): Promise<LogEntry[]> => {
throw new Error('Authentication token not found. Please log in.');
}
const response = await fetch('/api/logs', {
const response = await fetch(getApiUrl('/logs'), {
headers: {
'x-auth-token': token
}
'x-auth-token': token,
},
});
const result = await response.json();
if (!result.success) {
throw new Error(result.error || 'Failed to fetch logs');
}
return result.data;
} catch (error) {
console.error('Error fetching logs:', error);
@@ -46,15 +47,15 @@ export const clearLogs = async (): Promise<void> => {
throw new Error('Authentication token not found. Please log in.');
}
const response = await fetch('/api/logs', {
const response = await fetch(getApiUrl('/logs'), {
method: 'DELETE',
headers: {
'x-auth-token': token
}
'x-auth-token': token,
},
});
const result = await response.json();
if (!result.success) {
throw new Error(result.error || 'Failed to clear logs');
}
@@ -90,19 +91,19 @@ export const useLogs = () => {
}
// Connect to SSE endpoint with auth token in URL
eventSource = new EventSource(`/api/logs/stream?token=${token}`);
eventSource = new EventSource(getApiUrl(`/logs/stream?token=${token}`));
eventSource.onmessage = (event) => {
if (!isMounted) return;
try {
const data = JSON.parse(event.data);
if (data.type === 'initial') {
setLogs(data.logs);
setLoading(false);
} else if (data.type === 'log') {
setLogs(prevLogs => [...prevLogs, data.log]);
setLogs((prevLogs) => [...prevLogs, data.log]);
}
} catch (err) {
console.error('Error parsing SSE message:', err);
@@ -111,13 +112,13 @@ export const useLogs = () => {
eventSource.onerror = () => {
if (!isMounted) return;
if (eventSource) {
eventSource.close();
// Attempt to reconnect after a delay
setTimeout(connectToLogStream, 5000);
}
setError(new Error('Connection to log stream lost, attempting to reconnect...'));
};
} catch (err) {
@@ -149,4 +150,4 @@ export const useLogs = () => {
};
return { logs, loading, error, clearLogs: clearAllLogs };
};
};

View File

@@ -0,0 +1,15 @@
// Global runtime configuration interface
export interface RuntimeConfig {
basePath: string;
version: string;
name: string;
}
// Extend Window interface to include runtime config
declare global {
interface Window {
__MCPHUB_CONFIG__?: RuntimeConfig;
}
}
export {};

28
frontend/src/utils/api.ts Normal file
View File

@@ -0,0 +1,28 @@
/**
* API utility functions for constructing URLs with proper base path support
*
* @deprecated Use functions from utils/runtime.ts instead for runtime configuration support
*/
import { getApiBaseUrl as getRuntimeApiBaseUrl, getApiUrl as getRuntimeApiUrl } from './runtime';
/**
* Get the API base URL including base path and /api prefix
* @returns The complete API base URL
* @deprecated Use getApiBaseUrl from utils/runtime.ts instead
*/
export const getApiBaseUrl = (): string => {
console.warn('getApiBaseUrl from utils/api.ts is deprecated, use utils/runtime.ts instead');
return getRuntimeApiBaseUrl();
};
/**
* Construct a full API URL with the given endpoint
* @param endpoint - The API endpoint (should start with /, e.g., '/auth/login')
* @returns The complete API URL
* @deprecated Use getApiUrl from utils/runtime.ts instead
*/
export const getApiUrl = (endpoint: string): string => {
console.warn('getApiUrl from utils/api.ts is deprecated, use utils/runtime.ts instead');
return getRuntimeApiUrl(endpoint);
};

View File

@@ -0,0 +1,105 @@
import type { RuntimeConfig } from '../types/runtime';
/**
* Get runtime configuration from window object
*/
export const getRuntimeConfig = (): RuntimeConfig => {
return (
window.__MCPHUB_CONFIG__ || {
basePath: '',
version: 'dev',
name: 'mcphub',
}
);
};
/**
* Get the base path from runtime configuration
*/
export const getBasePath = (): string => {
const config = getRuntimeConfig();
const basePath = config.basePath || '';
// Ensure the path starts with / if it's not empty and doesn't already start with /
if (basePath && !basePath.startsWith('/')) {
return '/' + basePath;
}
return basePath;
};
/**
* Get the API base URL including base path and /api prefix
*/
export const getApiBaseUrl = (): string => {
const basePath = getBasePath();
// Always append /api to the base path for API endpoints
return basePath + '/api';
};
/**
* Construct a full API URL with the given endpoint
*/
export const getApiUrl = (endpoint: string): string => {
const baseUrl = getApiBaseUrl();
// Ensure endpoint starts with /
const normalizedEndpoint = endpoint.startsWith('/') ? endpoint : '/' + endpoint;
return baseUrl + normalizedEndpoint;
};
/**
* Load runtime configuration from server
*/
export const loadRuntimeConfig = async (): Promise<RuntimeConfig> => {
try {
// For initial config load, we need to determine the correct path
// Try different possible paths based on current location
const currentPath = window.location.pathname;
const possibleConfigPaths = [
// If we're already on a subpath, try to use it
currentPath.replace(/\/[^\/]*$/, '') + '/config',
// Try root config
'/config',
// Try with potential base paths
...(currentPath.includes('/')
? [currentPath.split('/')[1] ? `/${currentPath.split('/')[1]}/config` : '/config']
: ['/config']),
];
for (const configPath of possibleConfigPaths) {
try {
const response = await fetch(configPath, {
method: 'GET',
headers: {
Accept: 'application/json',
'Cache-Control': 'no-cache',
},
});
if (response.ok) {
const data = await response.json();
if (data.success && data.data) {
return data.data;
}
}
} catch (error) {
// Continue to next path
console.debug(`Failed to load config from ${configPath}:`, error);
}
}
// Fallback to default config
console.warn('Could not load runtime config from server, using defaults');
return {
basePath: '',
version: 'dev',
name: 'mcphub',
};
} catch (error) {
console.error('Error loading runtime config:', error);
return {
basePath: '',
version: 'dev',
name: 'mcphub',
};
}
};

View File

@@ -8,8 +8,13 @@ import { readFileSync } from 'fs';
// Get package.json version
const packageJson = JSON.parse(readFileSync(path.resolve(__dirname, '../package.json'), 'utf-8'));
// For runtime configuration, we'll always use relative paths
// BASE_PATH will be determined at runtime
const basePath = '';
// https://vitejs.dev/config/
export default defineConfig({
base: './', // Always use relative paths for runtime configuration
plugins: [react(), tailwindcss()],
resolve: {
alias: {
@@ -18,6 +23,7 @@ export default defineConfig({
},
define: {
// Make package version available as global variable
// BASE_PATH will be loaded at runtime
'import.meta.env.PACKAGE_VERSION': JSON.stringify(packageJson.version),
},
build: {
@@ -25,11 +31,11 @@ export default defineConfig({
},
server: {
proxy: {
'/api': {
[`${basePath}/api`]: {
target: 'http://localhost:3000',
changeOrigin: true,
},
'/auth': {
[`${basePath}/auth`]: {
target: 'http://localhost:3000',
changeOrigin: true,
},

72
nginx.conf.example Normal file
View File

@@ -0,0 +1,72 @@
# Nginx configuration example for MCPHub with subpath routing
# This example shows how to deploy MCPHub under a subpath like /mcphub
server {
listen 80;
server_name your-domain.com;
# MCPHub under /mcphub subpath
location /mcphub/ {
# Remove the subpath prefix before forwarding to MCPHub
rewrite ^/mcphub/(.*)$ /$1 break;
proxy_pass http://mcphub:3000/;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade';
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_cache_bypass $http_upgrade;
# Important: Disable buffering for SSE connections
proxy_buffering off;
proxy_cache off;
# Support for Server-Sent Events (SSE)
proxy_read_timeout 24h;
proxy_send_timeout 24h;
}
# Alternative configuration if you want to keep the subpath in the backend
# In this case, set BASE_PATH=/mcphub
# location /mcphub/ {
# proxy_pass http://mcphub:3000/mcphub/;
# proxy_http_version 1.1;
# proxy_set_header Upgrade $http_upgrade;
# proxy_set_header Connection 'upgrade';
# proxy_set_header Host $host;
# proxy_set_header X-Real-IP $remote_addr;
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# proxy_set_header X-Forwarded-Proto $scheme;
# proxy_cache_bypass $http_upgrade;
#
# # Important: Disable buffering for SSE connections
# proxy_buffering off;
# proxy_cache off;
#
# # Support for Server-Sent Events (SSE)
# proxy_read_timeout 24h;
# proxy_send_timeout 24h;
# }
}
# Docker Compose example with subpath
# version: '3.8'
# services:
# mcphub:
# image: samanhappy/mcphub
# environment:
# - BASE_PATH=/mcphub
# volumes:
# - ./mcp_settings.json:/app/mcp_settings.json
#
# nginx:
# image: nginx:alpine
# ports:
# - "80:80"
# volumes:
# - ./nginx.conf:/etc/nginx/conf.d/default.conf
# depends_on:
# - mcphub

View File

@@ -42,11 +42,19 @@
"license": "ISC",
"dependencies": {
"@modelcontextprotocol/sdk": "^1.11.1",
"@types/pg": "^8.15.2",
"bcryptjs": "^3.0.2",
"dotenv": "^16.3.1",
"express": "^4.18.2",
"dotenv-expand": "^12.0.2",
"express": "^4.21.2",
"express-validator": "^7.2.1",
"jsonwebtoken": "^9.0.2",
"openai": "^4.103.0",
"pg": "^8.16.0",
"pgvector": "^0.2.1",
"postgres": "^3.4.7",
"reflect-metadata": "^0.2.2",
"typeorm": "^0.3.24",
"uuid": "^11.1.0"
},
"devDependencies": {
@@ -54,18 +62,18 @@
"@radix-ui/react-slot": "^1.1.2",
"@shadcn/ui": "^0.0.4",
"@tailwindcss/postcss": "^4.1.3",
"@tailwindcss/vite": "^4.1.3",
"@tailwindcss/vite": "^4.1.7",
"@types/bcryptjs": "^3.0.0",
"@types/express": "^4.17.21",
"@types/jest": "^29.5.5",
"@types/jsonwebtoken": "^9.0.9",
"@types/node": "^20.8.2",
"@types/node": "^22.15.21",
"@types/react": "^19.0.12",
"@types/react-dom": "^19.0.4",
"@types/uuid": "^10.0.0",
"@typescript-eslint/eslint-plugin": "^6.7.4",
"@typescript-eslint/parser": "^6.7.4",
"@vitejs/plugin-react": "^4.2.1",
"@vitejs/plugin-react": "^4.4.1",
"autoprefixer": "^10.4.21",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
@@ -89,11 +97,11 @@
"ts-node-dev": "^2.0.0",
"tsx": "^4.7.0",
"typescript": "^5.2.2",
"vite": "^5.4.18",
"vite": "^6.3.5",
"zod": "^3.24.2"
},
"engines": {
"node": ">=16.0.0"
"node": "^18.0.0 || >=20.0.0"
},
"packageManager": "pnpm@10.10.0+sha256.fa0f513aa8191764d2b6b432420788c270f07b4f999099b65bb2010eec702a30"
"packageManager": "pnpm@10.11.0+sha256.a69e9cb077da419d47d18f1dd52e207245b29cac6e076acedbeb8be3b1a67bd7"
}

2184
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@@ -10,6 +10,7 @@ const defaultConfig = {
port: process.env.PORT || 3000,
initTimeout: process.env.INIT_TIMEOUT || 300000,
timeout: process.env.REQUEST_TIMEOUT || 60000,
basePath: process.env.BASE_PATH || '',
mcpHubName: 'mcphub',
mcpHubVersion: getPackageVersion(),
};

View File

@@ -0,0 +1,30 @@
import { Request, Response } from 'express';
import config from '../config/index.js';
/**
* Get runtime configuration for frontend
*/
export const getRuntimeConfig = (req: Request, res: Response): void => {
try {
const runtimeConfig = {
basePath: config.basePath,
version: config.mcpHubVersion,
name: config.mcpHubName,
};
res.setHeader('Cache-Control', 'no-cache, no-store, must-revalidate');
res.setHeader('Pragma', 'no-cache');
res.setHeader('Expires', '0');
res.json({
success: true,
data: runtimeConfig,
});
} catch (error) {
console.error('Error getting runtime config:', error);
res.status(500).json({
success: false,
message: 'Failed to get runtime configuration',
});
}
};

View File

@@ -9,6 +9,7 @@ import {
toggleServerStatus,
} from '../services/mcpService.js';
import { loadSettings, saveSettings } from '../config/index.js';
import { syncAllServerToolsEmbeddings } from '../services/vectorSearchService.js';
export const getAllServers = (_: Request, res: Response): void => {
try {
@@ -283,7 +284,7 @@ export const toggleServer = async (req: Request, res: Response): Promise<void> =
export const updateSystemConfig = (req: Request, res: Response): void => {
try {
const { routing, install } = req.body;
const { routing, install, smartRouting } = req.body;
if (
(!routing ||
@@ -292,7 +293,13 @@ export const updateSystemConfig = (req: Request, res: Response): void => {
typeof routing.enableBearerAuth !== 'boolean' &&
typeof routing.bearerAuthKey !== 'string')) &&
(!install ||
(typeof install.pythonIndexUrl !== 'string' && typeof install.npmRegistry !== 'string'))
(typeof install.pythonIndexUrl !== 'string' && typeof install.npmRegistry !== 'string')) &&
(!smartRouting ||
(typeof smartRouting.enabled !== 'boolean' &&
typeof smartRouting.dbUrl !== 'string' &&
typeof smartRouting.openaiApiBaseUrl !== 'string' &&
typeof smartRouting.openaiApiKey !== 'string' &&
typeof smartRouting.openaiApiEmbeddingModel !== 'string'))
) {
res.status(400).json({
success: false,
@@ -314,6 +321,13 @@ export const updateSystemConfig = (req: Request, res: Response): void => {
pythonIndexUrl: '',
npmRegistry: '',
},
smartRouting: {
enabled: false,
dbUrl: '',
openaiApiBaseUrl: '',
openaiApiKey: '',
openaiApiEmbeddingModel: '',
},
};
}
@@ -333,6 +347,16 @@ export const updateSystemConfig = (req: Request, res: Response): void => {
};
}
if (!settings.systemConfig.smartRouting) {
settings.systemConfig.smartRouting = {
enabled: false,
dbUrl: '',
openaiApiBaseUrl: '',
openaiApiKey: '',
openaiApiEmbeddingModel: '',
};
}
if (routing) {
if (typeof routing.enableGlobalRoute === 'boolean') {
settings.systemConfig.routing.enableGlobalRoute = routing.enableGlobalRoute;
@@ -360,12 +384,77 @@ export const updateSystemConfig = (req: Request, res: Response): void => {
}
}
// Track smartRouting state and configuration changes
const wasSmartRoutingEnabled = settings.systemConfig.smartRouting.enabled || false;
const previousSmartRoutingConfig = { ...settings.systemConfig.smartRouting };
let needsSync = false;
if (smartRouting) {
if (typeof smartRouting.enabled === 'boolean') {
// If enabling Smart Routing, validate required fields
if (smartRouting.enabled) {
const currentDbUrl = smartRouting.dbUrl || settings.systemConfig.smartRouting.dbUrl;
const currentOpenaiApiKey =
smartRouting.openaiApiKey || settings.systemConfig.smartRouting.openaiApiKey;
if (!currentDbUrl || !currentOpenaiApiKey) {
const missingFields = [];
if (!currentDbUrl) missingFields.push('Database URL');
if (!currentOpenaiApiKey) missingFields.push('OpenAI API Key');
res.status(400).json({
success: false,
message: `Smart Routing requires the following fields: ${missingFields.join(', ')}`,
});
return;
}
}
settings.systemConfig.smartRouting.enabled = smartRouting.enabled;
}
if (typeof smartRouting.dbUrl === 'string') {
settings.systemConfig.smartRouting.dbUrl = smartRouting.dbUrl;
}
if (typeof smartRouting.openaiApiBaseUrl === 'string') {
settings.systemConfig.smartRouting.openaiApiBaseUrl = smartRouting.openaiApiBaseUrl;
}
if (typeof smartRouting.openaiApiKey === 'string') {
settings.systemConfig.smartRouting.openaiApiKey = smartRouting.openaiApiKey;
}
if (typeof smartRouting.openaiApiEmbeddingModel === 'string') {
settings.systemConfig.smartRouting.openaiApiEmbeddingModel =
smartRouting.openaiApiEmbeddingModel;
}
// Check if we need to sync embeddings
const isNowEnabled = settings.systemConfig.smartRouting.enabled || false;
const hasConfigChanged =
previousSmartRoutingConfig.dbUrl !== settings.systemConfig.smartRouting.dbUrl ||
previousSmartRoutingConfig.openaiApiBaseUrl !==
settings.systemConfig.smartRouting.openaiApiBaseUrl ||
previousSmartRoutingConfig.openaiApiKey !==
settings.systemConfig.smartRouting.openaiApiKey ||
previousSmartRoutingConfig.openaiApiEmbeddingModel !==
settings.systemConfig.smartRouting.openaiApiEmbeddingModel;
// Sync if: first time enabling OR smart routing is enabled and any config changed
needsSync = (!wasSmartRoutingEnabled && isNowEnabled) || (isNowEnabled && hasConfigChanged);
}
if (saveSettings(settings)) {
res.json({
success: true,
data: settings.systemConfig,
message: 'System configuration updated successfully',
});
// If smart routing configuration changed, sync all existing server tools
if (needsSync) {
console.log('SmartRouting configuration changed - syncing all existing server tools...');
// Run sync asynchronously to avoid blocking the response
syncAllServerToolsEmbeddings().catch((error) => {
console.error('Failed to sync server tools embeddings:', error);
});
}
} else {
res.status(500).json({
success: false,

318
src/db/connection.ts Normal file
View File

@@ -0,0 +1,318 @@
import 'reflect-metadata'; // Ensure reflect-metadata is imported here too
import { DataSource, DataSourceOptions } from 'typeorm';
import dotenv from 'dotenv';
import dotenvExpand from 'dotenv-expand';
import path from 'path';
import { fileURLToPath } from 'url';
import entities from './entities/index.js';
import { registerPostgresVectorType } from './types/postgresVectorType.js';
import { VectorEmbeddingSubscriber } from './subscribers/VectorEmbeddingSubscriber.js';
import { loadSettings } from '../config/index.js';
// Get database URL from smart routing config or fallback to environment variable
const getDatabaseUrl = (): string => {
try {
const settings = loadSettings();
const smartRouting = settings.systemConfig?.smartRouting;
// Use smart routing dbUrl if smart routing is enabled and dbUrl is configured
if (smartRouting?.enabled && smartRouting?.dbUrl) {
console.log('Using smart routing database URL');
return smartRouting.dbUrl;
}
} catch (error) {
console.warn(
'Failed to load settings for smart routing database URL, falling back to environment variable:',
error,
);
}
return '';
};
// Default database configuration
const defaultConfig: DataSourceOptions = {
type: 'postgres',
url: getDatabaseUrl(),
synchronize: true,
entities: entities,
subscribers: [VectorEmbeddingSubscriber],
};
// AppDataSource is the TypeORM data source
let AppDataSource = new DataSource(defaultConfig);
// Function to create a new DataSource with updated configuration
export const updateDataSourceConfig = (): DataSource => {
const newConfig: DataSourceOptions = {
...defaultConfig,
url: getDatabaseUrl(),
};
// If the configuration has changed, we need to create a new DataSource
const currentUrl = (AppDataSource.options as any).url;
if (currentUrl !== newConfig.url) {
console.log('Database URL configuration changed, updating DataSource...');
AppDataSource = new DataSource(newConfig);
}
return AppDataSource;
};
// Get the current AppDataSource instance
export const getAppDataSource = (): DataSource => {
return AppDataSource;
};
// Reconnect database with updated configuration
export const reconnectDatabase = async (): Promise<DataSource> => {
try {
// Close existing connection if it exists
if (AppDataSource.isInitialized) {
console.log('Closing existing database connection...');
await AppDataSource.destroy();
}
// Update configuration and reconnect
AppDataSource = updateDataSourceConfig();
return await initializeDatabase();
} catch (error) {
console.error('Error during database reconnection:', error);
throw error;
}
};
// Initialize database connection
export const initializeDatabase = async (): Promise<DataSource> => {
try {
// Update configuration before initializing
AppDataSource = updateDataSourceConfig();
if (!AppDataSource.isInitialized) {
console.log('Initializing database connection...');
await AppDataSource.initialize();
// Register the vector type with TypeORM
registerPostgresVectorType(AppDataSource);
// Create pgvector extension if it doesn't exist
await AppDataSource.query('CREATE EXTENSION IF NOT EXISTS vector;').catch((err) => {
console.warn('Failed to create vector extension:', err.message);
console.warn('Vector functionality may not be available.');
});
// Set up vector column and index with a more direct approach
try {
// First, create the extension
await AppDataSource.query(`CREATE EXTENSION IF NOT EXISTS vector;`);
// Check if table exists first
const tableExists = await AppDataSource.query(`
SELECT EXISTS (
SELECT FROM information_schema.tables
WHERE table_schema = 'public'
AND table_name = 'vector_embeddings'
);
`);
if (tableExists[0].exists) {
// Add pgvector support via raw SQL commands
console.log('Configuring vector support for embeddings table...');
// Step 1: Drop any existing index on the column
try {
await AppDataSource.query(`DROP INDEX IF EXISTS idx_vector_embeddings_embedding;`);
} catch (dropError: any) {
console.warn('Note: Could not drop existing index:', dropError.message);
}
// Step 2: Alter column type to vector (if it's not already)
try {
// Check column type first
const columnType = await AppDataSource.query(`
SELECT data_type FROM information_schema.columns
WHERE table_schema = 'public' AND table_name = 'vector_embeddings'
AND column_name = 'embedding';
`);
if (columnType.length > 0 && columnType[0].data_type !== 'vector') {
await AppDataSource.query(`
ALTER TABLE vector_embeddings
ALTER COLUMN embedding TYPE vector USING embedding::vector;
`);
console.log('Vector embedding column type updated successfully.');
}
} catch (alterError: any) {
console.warn('Could not alter embedding column type:', alterError.message);
console.warn('Will try to recreate the table later.');
}
// Step 3: Try to create appropriate indices
try {
// First, let's check if there are any records to determine the dimensions
const records = await AppDataSource.query(`
SELECT dimensions FROM vector_embeddings LIMIT 1;
`);
let dimensions = 1536; // Default to common OpenAI embedding size
if (records && records.length > 0 && records[0].dimensions) {
dimensions = records[0].dimensions;
console.log(`Found vector dimension from existing data: ${dimensions}`);
} else {
console.log(`Using default vector dimension: ${dimensions} (no existing data found)`);
}
// Set the vector dimensions explicitly only if table has data
if (records && records.length > 0) {
await AppDataSource.query(`
ALTER TABLE vector_embeddings
ALTER COLUMN embedding TYPE vector(${dimensions});
`);
// Now try to create the index
await AppDataSource.query(`
CREATE INDEX IF NOT EXISTS idx_vector_embeddings_embedding
ON vector_embeddings USING ivfflat (embedding vector_cosine_ops) WITH (lists = 100);
`);
console.log('Created IVFFlat index for vector similarity search.');
} else {
console.log(
'No existing vector data found, skipping index creation - will be handled by vector service.',
);
}
} catch (indexError: any) {
console.warn('IVFFlat index creation failed:', indexError.message);
console.warn('Trying alternative index type...');
try {
// Try HNSW index instead
await AppDataSource.query(`
CREATE INDEX IF NOT EXISTS idx_vector_embeddings_embedding
ON vector_embeddings USING hnsw (embedding vector_cosine_ops);
`);
console.log('Created HNSW index for vector similarity search.');
} catch (hnswError: any) {
// Final fallback to simpler index type
console.warn('HNSW index creation failed too. Using simple L2 distance index.');
try {
// Create a basic GIN index as last resort
await AppDataSource.query(`
CREATE INDEX IF NOT EXISTS idx_vector_embeddings_embedding
ON vector_embeddings USING gin (embedding);
`);
console.log('Created GIN index for basic vector lookups.');
} catch (ginError: any) {
console.warn('All index creation attempts failed:', ginError.message);
console.warn('Vector search will be slower without an optimized index.');
}
}
}
} else {
console.log(
'Vector embeddings table does not exist yet - will configure after schema sync.',
);
}
} catch (error: any) {
console.warn('Could not set up vector column/index:', error.message);
console.warn('Will attempt again after schema synchronization.');
}
console.log('Database connection established successfully.');
// Run one final setup check after schema synchronization is done
if (defaultConfig.synchronize) {
setTimeout(async () => {
try {
console.log('Running final vector configuration check...');
// Try setup again with the same code from above
const tableExists = await AppDataSource.query(`
SELECT EXISTS (
SELECT FROM information_schema.tables
WHERE table_schema = 'public'
AND table_name = 'vector_embeddings'
);
`);
if (tableExists[0].exists) {
console.log('Vector embeddings table found, checking configuration...');
// Get the dimension size first
try {
// Try to get dimensions from an existing record
const records = await AppDataSource.query(`
SELECT dimensions FROM vector_embeddings LIMIT 1;
`);
// Only proceed if we have existing data, otherwise let vector service handle it
if (records && records.length > 0 && records[0].dimensions) {
const dimensions = records[0].dimensions;
console.log(`Found vector dimension from database: ${dimensions}`);
// Ensure column type is vector with explicit dimensions
await AppDataSource.query(`
ALTER TABLE vector_embeddings
ALTER COLUMN embedding TYPE vector(${dimensions});
`);
console.log('Vector embedding column type updated in final check.');
// One more attempt at creating the index with dimensions
try {
// Drop existing index if any
await AppDataSource.query(`
DROP INDEX IF EXISTS idx_vector_embeddings_embedding;
`);
// Create new index with proper dimensions
await AppDataSource.query(`
CREATE INDEX idx_vector_embeddings_embedding
ON vector_embeddings USING ivfflat (embedding vector_cosine_ops) WITH (lists = 100);
`);
console.log('Created IVFFlat index in final check.');
} catch (indexError: any) {
console.warn(
'Final index creation attempt did not succeed:',
indexError.message,
);
console.warn('Using basic lookup without vector index.');
}
} else {
console.log(
'No existing vector data found, vector dimensions will be configured by vector service.',
);
}
} catch (setupError: any) {
console.warn('Vector setup in final check failed:', setupError.message);
}
}
} catch (error: any) {
console.warn('Post-initialization vector setup failed:', error.message);
}
}, 3000); // Give synchronize some time to complete
}
}
return AppDataSource;
} catch (error) {
console.error('Error during database initialization:', error);
throw error;
}
};
// Get database connection status
export const isDatabaseConnected = (): boolean => {
return AppDataSource.isInitialized;
};
// Close database connection
export const closeDatabase = async (): Promise<void> => {
if (AppDataSource.isInitialized) {
await AppDataSource.destroy();
console.log('Database connection closed.');
}
};
// Export AppDataSource for backward compatibility
export { AppDataSource };
export default getAppDataSource;

View File

@@ -0,0 +1,46 @@
import {
Entity,
PrimaryGeneratedColumn,
Column,
CreateDateColumn,
UpdateDateColumn,
} from 'typeorm';
@Entity({ name: 'vector_embeddings' })
export class VectorEmbedding {
@PrimaryGeneratedColumn('uuid')
id: string;
@Column({ type: 'varchar' })
content_type: string; // 'market_server', 'tool', 'documentation', etc.
@Column({ type: 'varchar' })
content_id: string; // Reference ID to the original content
@Column('text')
text_content: string; // The text that was embedded
@Column('simple-json')
metadata: Record<string, any>; // Additional metadata about the embedding
@Column({
type: 'float',
array: true,
nullable: true,
})
embedding: number[]; // The vector embedding - will be converted to vector type after table creation
@Column({ type: 'int' })
dimensions: number; // Dimensionality of the embedding vector
@Column({ type: 'varchar' })
model: string; // Model used to create the embedding
@CreateDateColumn({ name: 'created_at', type: 'timestamp' })
createdAt: Date;
@UpdateDateColumn({ name: 'updated_at', type: 'timestamp' })
updatedAt: Date;
}
export default VectorEmbedding;

7
src/db/entities/index.ts Normal file
View File

@@ -0,0 +1,7 @@
import { VectorEmbedding } from './VectorEmbedding.js';
// Export all entities
export default [VectorEmbedding];
// Export individual entities for direct use
export { VectorEmbedding };

33
src/db/index.ts Normal file
View File

@@ -0,0 +1,33 @@
import { initializeDatabase, closeDatabase, isDatabaseConnected } from './connection.js';
import * as repositories from './repositories/index.js';
/**
* Initialize the database module
*/
export async function initializeDbModule(): Promise<boolean> {
try {
// Connect to the database
await initializeDatabase();
return true;
} catch (error) {
console.error('Failed to initialize database module:', error);
return false;
}
}
/**
* Get the repository factory for a database entity type
* @param entityType The type of entity to get a repository for
*/
export function getRepositoryFactory(entityType: 'vectorEmbeddings') {
// Return the appropriate repository based on entity type
switch (entityType) {
case 'vectorEmbeddings':
return () => new repositories.VectorEmbeddingRepository();
default:
throw new Error(`Unknown entity type: ${entityType}`);
}
}
// Re-export everything from the database module
export { initializeDatabase, closeDatabase, isDatabaseConnected, repositories };

View File

@@ -0,0 +1,69 @@
import { Repository, EntityTarget, ObjectLiteral } from 'typeorm';
import { getAppDataSource } from '../connection.js';
/**
* Base repository class with common CRUD operations
*/
export class BaseRepository<T extends ObjectLiteral> {
protected readonly repository: Repository<T>;
constructor(entityClass: EntityTarget<T>) {
this.repository = getAppDataSource().getRepository(entityClass);
}
/**
* Get repository access
*/
getRepository(): Repository<T> {
return this.repository;
}
/**
* Find all entities
*/
async findAll(): Promise<T[]> {
return this.repository.find();
}
/**
* Find entity by ID
* @param id Entity ID
*/
async findById(id: string | number): Promise<T | null> {
return this.repository.findOneBy({ id } as any);
}
/**
* Save or update an entity
* @param entity Entity to save
*/
async save(entity: Partial<T>): Promise<T> {
return this.repository.save(entity as any);
}
/**
* Save multiple entities
* @param entities Array of entities to save
*/
async saveMany(entities: Partial<T>[]): Promise<T[]> {
return this.repository.save(entities as any[]);
}
/**
* Delete an entity by ID
* @param id Entity ID
*/
async delete(id: string | number): Promise<boolean> {
const result = await this.repository.delete(id);
return result.affected !== null && result.affected !== undefined && result.affected > 0;
}
/**
* Count total entities
*/
async count(): Promise<number> {
return this.repository.count();
}
}
export default BaseRepository;

View File

@@ -0,0 +1,219 @@
import { VectorEmbedding } from '../entities/VectorEmbedding.js';
import BaseRepository from './BaseRepository.js';
import { getAppDataSource } from '../connection.js';
export class VectorEmbeddingRepository extends BaseRepository<VectorEmbedding> {
constructor() {
super(VectorEmbedding);
}
/**
* Find by content type and ID
* @param contentType Content type
* @param contentId Content ID
*/
async findByContentIdentity(
contentType: string,
contentId: string,
): Promise<VectorEmbedding | null> {
return this.repository.findOneBy({
content_type: contentType,
content_id: contentId,
});
}
/**
* Create or update an embedding for content
* @param contentType Content type
* @param contentId Content ID
* @param textContent Text content to embed
* @param embedding Vector embedding
* @param metadata Additional metadata
* @param model Model used to create the embedding
*/
async saveEmbedding(
contentType: string,
contentId: string,
textContent: string,
embedding: number[],
metadata: Record<string, any> = {},
model = 'default',
): Promise<VectorEmbedding> {
// Check if embedding exists
let vectorEmbedding = await this.findByContentIdentity(contentType, contentId);
if (!vectorEmbedding) {
vectorEmbedding = new VectorEmbedding();
vectorEmbedding.content_type = contentType;
vectorEmbedding.content_id = contentId;
}
// Update properties
vectorEmbedding.text_content = textContent;
vectorEmbedding.embedding = embedding;
vectorEmbedding.dimensions = embedding.length;
vectorEmbedding.metadata = metadata;
vectorEmbedding.model = model;
// For raw SQL operations where our subscriber might not be called
// Ensure the embedding is properly formatted for postgres
const rawEmbedding = this.formatEmbeddingForPgVector(embedding);
if (rawEmbedding) {
(vectorEmbedding as any).embedding = rawEmbedding;
}
return this.save(vectorEmbedding);
}
/**
* Search for similar embeddings using cosine similarity
* @param embedding Vector embedding to search against
* @param limit Maximum number of results (default: 10)
* @param threshold Similarity threshold (default: 0.7)
* @param contentTypes Optional content types to filter by
*/
async searchSimilar(
embedding: number[],
limit = 10,
threshold = 0.7,
contentTypes?: string[],
): Promise<Array<{ embedding: VectorEmbedding; similarity: number }>> {
try {
// Try using vector similarity operator first
try {
// Build query with vector operators
let query = getAppDataSource()
.createQueryBuilder()
.select('vector_embedding.*')
.addSelect(`1 - (vector_embedding.embedding <=> :embedding) AS similarity`)
.from(VectorEmbedding, 'vector_embedding')
.where(`1 - (vector_embedding.embedding <=> :embedding) > :threshold`)
.orderBy('similarity', 'DESC')
.limit(limit)
.setParameter(
'embedding',
Array.isArray(embedding) ? `[${embedding.join(',')}]` : embedding,
)
.setParameter('threshold', threshold);
// Add content type filter if provided
if (contentTypes && contentTypes.length > 0) {
query = query
.andWhere('vector_embedding.content_type IN (:...contentTypes)')
.setParameter('contentTypes', contentTypes);
}
// Execute query
const results = await query.getRawMany();
// Return results if successful
return results.map((row) => ({
embedding: this.mapRawToEntity(row),
similarity: parseFloat(row.similarity),
}));
} catch (vectorError) {
console.warn(
'Vector similarity search failed, falling back to basic filtering:',
vectorError,
);
// Fallback to just getting the records by content type
let query = this.repository.createQueryBuilder('vector_embedding');
// Add content type filter if provided
if (contentTypes && contentTypes.length > 0) {
query = query
.where('vector_embedding.content_type IN (:...contentTypes)')
.setParameter('contentTypes', contentTypes);
}
// Limit results
query = query.take(limit);
// Execute query
const results = await query.getMany();
// Return results with a placeholder similarity
return results.map((entity) => ({
embedding: entity,
similarity: 0.5, // Placeholder similarity
}));
}
} catch (error) {
console.error('Error during vector search:', error);
return [];
}
}
/**
* Search by text using vector similarity
* @param text Text to search for
* @param getEmbeddingFunc Function to convert text to embedding
* @param limit Maximum number of results
* @param threshold Similarity threshold
* @param contentTypes Optional content types to filter by
*/
async searchByText(
text: string,
getEmbeddingFunc: (text: string) => Promise<number[]>,
limit = 10,
threshold = 0.7,
contentTypes?: string[],
): Promise<Array<{ embedding: VectorEmbedding; similarity: number }>> {
try {
// Get embedding for the search text
const embedding = await getEmbeddingFunc(text);
// Search by embedding
return this.searchSimilar(embedding, limit, threshold, contentTypes);
} catch (error) {
console.error('Error searching by text:', error);
return [];
}
}
/**
* Map raw database result to entity
* @param raw Raw database result
*/
private mapRawToEntity(raw: any): VectorEmbedding {
const entity = new VectorEmbedding();
entity.id = raw.id;
entity.content_type = raw.content_type;
entity.content_id = raw.content_id;
entity.text_content = raw.text_content;
entity.metadata = raw.metadata;
entity.embedding = raw.embedding;
entity.dimensions = raw.dimensions;
entity.model = raw.model;
entity.createdAt = raw.created_at;
entity.updatedAt = raw.updated_at;
return entity;
}
/**
* Format embedding array for pgvector
* @param embedding Array of embedding values
* @returns Properly formatted vector string for pgvector
*/
private formatEmbeddingForPgVector(embedding: number[] | string): string | null {
if (!embedding) return null;
// If it's already a string and starts with '[', assume it's formatted
if (typeof embedding === 'string') {
if (embedding.startsWith('[') && embedding.endsWith(']')) {
return embedding;
}
return `[${embedding}]`;
}
// Format array as proper pgvector string
if (Array.isArray(embedding)) {
return `[${embedding.join(',')}]`;
}
return null;
}
}
export default VectorEmbeddingRepository;

View File

@@ -0,0 +1,4 @@
import VectorEmbeddingRepository from './VectorEmbeddingRepository.js';
// Export all repositories
export { VectorEmbeddingRepository };

View File

@@ -0,0 +1,53 @@
import { EntitySubscriberInterface, EventSubscriber, InsertEvent, UpdateEvent } from 'typeorm';
import { VectorEmbedding } from '../entities/VectorEmbedding.js';
/**
* A subscriber to format vector embeddings before saving to database
*/
@EventSubscriber()
export class VectorEmbeddingSubscriber implements EntitySubscriberInterface<VectorEmbedding> {
/**
* Indicates that this subscriber only listens to VectorEmbedding events
*/
listenTo() {
return VectorEmbedding;
}
/**
* Called before entity insertion
*/
beforeInsert(event: InsertEvent<VectorEmbedding>) {
this.formatEmbedding(event.entity);
}
/**
* Called before entity update
*/
beforeUpdate(event: UpdateEvent<VectorEmbedding>) {
if (event.entity && event.entity.embedding) {
this.formatEmbedding(event.entity as VectorEmbedding);
}
}
/**
* Format embedding as a proper vector string
*/
private formatEmbedding(entity: VectorEmbedding | undefined) {
if (!entity || !entity.embedding || !Array.isArray(entity.embedding)) {
return;
}
// If the embedding is already a string, don't process it
if (typeof entity.embedding === 'string') {
return;
}
// Format array as proper pgvector string
// Ensure the string starts with '[' and ends with ']' as required by pgvector
const vectorString = `[${entity.embedding.join(',')}]`;
// Store the string directly (TypeORM will handle conversion)
// We need to use 'as any' because the type is declared as number[] but we're setting a string
(entity as any).embedding = vectorString;
}
}

View File

@@ -0,0 +1,38 @@
import { DataSource } from 'typeorm';
/**
* Register the PostgreSQL vector type with TypeORM
* @param dataSource TypeORM data source
*/
export function registerPostgresVectorType(dataSource: DataSource): void {
// Skip if not postgres
if (dataSource.driver.options.type !== 'postgres') {
return;
}
// Get the postgres driver
const pgDriver = dataSource.driver;
// Add 'vector' to the list of supported column types
if (pgDriver.supportedDataTypes) {
pgDriver.supportedDataTypes.push('vector' as any);
}
// Override the normalization for the vector type
if ((pgDriver as any).dataTypeDefaults) {
(pgDriver as any).dataTypeDefaults['vector'] = {
type: 'vector',
};
}
// Override the column type resolver to prevent it from converting vector to other types
const originalColumnTypeResolver = (pgDriver as any).columnTypeResolver;
if (originalColumnTypeResolver) {
(pgDriver as any).columnTypeResolver = (column: any) => {
if (column.type === 'vector') {
return 'vector';
}
return originalColumnTypeResolver(column);
};
}
}

View File

@@ -1,3 +1,4 @@
import 'reflect-metadata';
import AppServer from './server.js';
const appServer = new AppServer();

View File

@@ -5,6 +5,7 @@ import { dirname } from 'path';
import fs from 'fs';
import { auth } from './auth.js';
import { initializeDefaultUser } from '../models/User.js';
import config from '../config/index.js';
// Create __dirname equivalent for ES modules
const __filename = fileURLToPath(import.meta.url);
@@ -17,13 +18,13 @@ const findFrontendPath = (): string => {
if (fs.existsSync(devPath)) {
return path.join(dirname(__dirname), 'frontend', 'dist');
}
// Try npm/npx installed path (remove /dist directory)
const npmPath = path.join(dirname(dirname(__dirname)), 'frontend', 'dist', 'index.html');
if (fs.existsSync(npmPath)) {
return path.join(dirname(dirname(__dirname)), 'frontend', 'dist');
}
// If none of the above paths exist, return the most reasonable default path and log a warning
console.warn('Warning: Could not locate frontend files. Using default path.');
return path.join(dirname(__dirname), 'frontend', 'dist');
@@ -32,10 +33,10 @@ const findFrontendPath = (): string => {
const frontendPath = findFrontendPath();
export const errorHandler = (
err: Error,
_req: Request,
res: Response,
_next: NextFunction
err: Error,
_req: Request,
res: Response,
_next: NextFunction,
): void => {
console.error('Unhandled error:', err);
res.status(500).json({
@@ -46,10 +47,16 @@ export const errorHandler = (
export const initMiddlewares = (app: express.Application): void => {
// Serve static files from the dynamically determined frontend path
app.use(express.static(frontendPath));
// Note: Static files will be handled by the server directly, not here
app.use((req, res, next) => {
if (req.path !== '/sse' && req.path !== '/messages') {
const basePath = config.basePath;
// Only apply JSON parsing for API and auth routes, not for SSE or message endpoints
if (
req.path !== `${basePath}/sse` &&
!req.path.startsWith(`${basePath}/sse/`) &&
req.path !== `${basePath}/messages`
) {
express.json()(req, res, next);
} else {
next();
@@ -57,16 +64,18 @@ export const initMiddlewares = (app: express.Application): void => {
});
// Initialize default admin user if no users exist
initializeDefaultUser().catch(err => {
initializeDefaultUser().catch((err) => {
console.error('Error initializing default user:', err);
});
// Protect all API routes with authentication middleware
app.use('/api', auth);
app.get('/', (_req: Request, res: Response) => {
// Serve the frontend application
res.sendFile(path.join(frontendPath, 'index.html'));
// Protect API routes with authentication middleware, but exclude auth endpoints
app.use(`${config.basePath}/api`, (req, res, next) => {
// Skip authentication for login and register endpoints
if (req.path === '/auth/login' || req.path === '/auth/register') {
next();
} else {
auth(req, res, next);
}
});
app.use(errorHandler);

View File

@@ -1,5 +1,6 @@
import express from 'express';
import { check } from 'express-validator';
import config from '../config/index.js';
import {
getAllServers,
getAllSettings,
@@ -7,7 +8,7 @@ import {
updateServer,
deleteServer,
toggleServer,
updateSystemConfig
updateSystemConfig,
} from '../controllers/serverController.js';
import {
getGroups,
@@ -18,7 +19,7 @@ import {
addServerToExistingGroup,
removeServerFromExistingGroup,
getGroupServers,
updateGroupServersBatch
updateGroupServersBatch,
} from '../controllers/groupController.js';
import {
getAllMarketServers,
@@ -27,19 +28,11 @@ import {
getAllMarketTags,
searchMarketServersByQuery,
getMarketServersByCategory,
getMarketServersByTag
getMarketServersByTag,
} from '../controllers/marketController.js';
import {
login,
register,
getCurrentUser,
changePassword
} from '../controllers/authController.js';
import {
getAllLogs,
clearLogs,
streamLogs
} from '../controllers/logController.js';
import { login, register, getCurrentUser, changePassword } from '../controllers/authController.js';
import { getAllLogs, clearLogs, streamLogs } from '../controllers/logController.js';
import { getRuntimeConfig } from '../controllers/configController.js';
import { auth } from '../middlewares/auth.js';
const router = express.Router();
@@ -53,7 +46,7 @@ export const initRoutes = (app: express.Application): void => {
router.delete('/servers/:name', deleteServer);
router.post('/servers/:name/toggle', toggleServer);
router.put('/system-config', updateSystemConfig);
// Group management routes
router.get('/groups', getGroups);
router.get('/groups/:id', getGroup);
@@ -65,7 +58,7 @@ export const initRoutes = (app: express.Application): void => {
router.get('/groups/:id/servers', getGroupServers);
// New route for batch updating servers in a group
router.put('/groups/:id/servers/batch', updateGroupServersBatch);
// Market routes
router.get('/market/servers', getAllMarketServers);
router.get('/market/servers/search', searchMarketServersByQuery);
@@ -74,33 +67,48 @@ export const initRoutes = (app: express.Application): void => {
router.get('/market/categories/:category', getMarketServersByCategory);
router.get('/market/tags', getAllMarketTags);
router.get('/market/tags/:tag', getMarketServersByTag);
// Log routes
router.get('/logs', getAllLogs);
router.delete('/logs', clearLogs);
router.get('/logs/stream', streamLogs);
// Auth routes (these will NOT be protected by auth middleware)
app.post('/auth/login', [
check('username', 'Username is required').not().isEmpty(),
check('password', 'Password is required').not().isEmpty(),
], login);
app.post('/auth/register', [
check('username', 'Username is required').not().isEmpty(),
check('password', 'Password must be at least 6 characters').isLength({ min: 6 }),
], register);
app.get('/auth/user', auth, getCurrentUser);
// Add change password route
app.post('/auth/change-password', [
auth,
check('currentPassword', 'Current password is required').not().isEmpty(),
check('newPassword', 'New password must be at least 6 characters').isLength({ min: 6 }),
], changePassword);
app.use('/api', router);
// Auth routes - move to router instead of app directly
router.post(
'/auth/login',
[
check('username', 'Username is required').not().isEmpty(),
check('password', 'Password is required').not().isEmpty(),
],
login,
);
router.post(
'/auth/register',
[
check('username', 'Username is required').not().isEmpty(),
check('password', 'Password must be at least 6 characters').isLength({ min: 6 }),
],
register,
);
router.get('/auth/user', auth, getCurrentUser);
// Add change password route
router.post(
'/auth/change-password',
[
auth,
check('currentPassword', 'Current password is required').not().isEmpty(),
check('newPassword', 'New password must be at least 6 characters').isLength({ min: 6 }),
],
changePassword,
);
// Runtime configuration endpoint (no auth required for frontend initialization)
app.get(`${config.basePath}/config`, getRuntimeConfig);
app.use(`${config.basePath}/api`, router);
};
export default router;

View File

@@ -22,10 +22,12 @@ export class AppServer {
private app: express.Application;
private port: number | string;
private frontendPath: string | null = null;
private basePath: string;
constructor() {
this.app = express();
this.port = config.port;
this.basePath = config.basePath;
}
async initialize(): Promise<void> {
@@ -40,11 +42,11 @@ export class AppServer {
initUpstreamServers()
.then(() => {
console.log('MCP server initialized successfully');
this.app.get('/sse/:group?', (req, res) => handleSseConnection(req, res));
this.app.post('/messages', handleSseMessage);
this.app.post('/mcp/:group?', handleMcpPostRequest);
this.app.get('/mcp/:group?', handleMcpOtherRequest);
this.app.delete('/mcp/:group?', handleMcpOtherRequest);
this.app.get(`${this.basePath}/sse/:group?`, (req, res) => handleSseConnection(req, res));
this.app.post(`${this.basePath}/messages`, handleSseMessage);
this.app.post(`${this.basePath}/mcp/:group?`, handleMcpPostRequest);
this.app.get(`${this.basePath}/mcp/:group?`, handleMcpOtherRequest);
this.app.delete(`${this.basePath}/mcp/:group?`, handleMcpOtherRequest);
})
.catch((error) => {
console.error('Error initializing MCP server:', error);
@@ -66,17 +68,26 @@ export class AppServer {
if (this.frontendPath) {
console.log(`Serving frontend from: ${this.frontendPath}`);
this.app.use(express.static(this.frontendPath));
// Serve static files with base path
this.app.use(this.basePath, express.static(this.frontendPath));
// Add the wildcard route for SPA
// Add the wildcard route for SPA with base path
if (fs.existsSync(path.join(this.frontendPath, 'index.html'))) {
this.app.get('*', (_req, res) => {
this.app.get(`${this.basePath}/*`, (_req, res) => {
res.sendFile(path.join(this.frontendPath!, 'index.html'));
});
// Also handle root redirect if base path is set
if (this.basePath) {
this.app.get('/', (_req, res) => {
res.redirect(this.basePath);
});
}
}
} else {
console.warn('Frontend dist directory not found. Server will run without frontend.');
this.app.get('/', (_req, res) => {
const rootPath = this.basePath || '/';
this.app.get(rootPath, (_req, res) => {
res
.status(404)
.send('Frontend not found. MCPHub API is running, but the UI is not available.');

View File

@@ -9,6 +9,7 @@ import { loadSettings, saveSettings, expandEnvVars } from '../config/index.js';
import config from '../config/index.js';
import { getGroup } from './sseService.js';
import { getServersInGroup } from './groupService.js';
import { saveToolsAsVectorEmbeddings, searchToolsByVector } from './vectorSearchService.js';
const servers: { [sessionId: string]: Server } = {};
@@ -99,14 +100,21 @@ export const initializeClientsFromSettings = (isInit: boolean): ServerInfo[] =>
// Add UV_DEFAULT_INDEX from settings if available (for Python packages)
const settings = loadSettings(); // Add UV_DEFAULT_INDEX from settings if available (for Python packages)
if (settings.systemConfig?.install?.pythonIndexUrl && conf.command === 'uvx') {
if (
settings.systemConfig?.install?.pythonIndexUrl &&
(conf.command === 'uvx' || conf.command === 'uv' || conf.command === 'python')
) {
env['UV_DEFAULT_INDEX'] = settings.systemConfig.install.pythonIndexUrl;
}
// Add npm_config_registry from settings if available (for NPM packages)
if (
settings.systemConfig?.install?.npmRegistry &&
(conf.command === 'npm' || conf.command === 'npx')
(conf.command === 'npm' ||
conf.command === 'npx' ||
conf.command === 'pnpm' ||
conf.command === 'yarn' ||
conf.command === 'node')
) {
env['npm_config_registry'] = settings.systemConfig.install.npmRegistry;
}
@@ -168,6 +176,22 @@ export const initializeClientsFromSettings = (isInit: boolean): ServerInfo[] =>
}));
serverInfo.status = 'connected';
serverInfo.error = null;
// Save tools as vector embeddings for search (only when smart routing is enabled)
if (serverInfo.tools.length > 0) {
try {
const settings = loadSettings();
const smartRoutingEnabled = settings.systemConfig?.smartRouting?.enabled || false;
if (smartRoutingEnabled) {
console.log(
`Smart routing enabled - saving vector embeddings for server ${name}`,
);
saveToolsAsVectorEmbeddings(name, serverInfo.tools);
}
} catch (vectorError) {
console.warn(`Failed to save vector embeddings for server ${name}:`, vectorError);
}
}
})
.catch((error) => {
console.error(
@@ -258,7 +282,6 @@ export const addServer = async (
return { success: false, message: 'Failed to save settings' };
}
registerAllTools(false);
return { success: true, message: 'Server added successfully' };
} catch (error) {
console.error(`Failed to add server: ${name}`, error);
@@ -369,6 +392,74 @@ const handleListToolsRequest = async (_: any, extra: any) => {
const sessionId = extra.sessionId || '';
const group = getGroup(sessionId);
console.log(`Handling ListToolsRequest for group: ${group}`);
// Special handling for $smart group to return special tools
if (group === '$smart') {
return {
tools: [
{
name: 'search_tools',
description: (() => {
// Get info about available servers
const availableServers = serverInfos.filter(
(server) => server.status === 'connected' && server.enabled !== false,
);
// Create simple server information with only server names
const serversList = availableServers
.map((server) => {
return `${server.name}`;
})
.join(', ');
return `STEP 1 of 2: Use this tool FIRST to discover and search for relevant tools across all available servers. This tool and call_tool work together as a two-step process: 1) search_tools to find what you need, 2) call_tool to execute it.
For optimal results, use specific queries matching your exact needs. Call this tool multiple times with different queries for different parts of complex tasks. Example queries: "image generation tools", "code review tools", "data analysis", "translation capabilities", etc. Results are sorted by relevance using vector similarity.
After finding relevant tools, you MUST use the call_tool to actually execute them. The search_tools only finds tools - it doesn't execute them.
Available servers: ${serversList}`;
})(),
inputSchema: {
type: 'object',
properties: {
query: {
type: 'string',
description:
'The search query to find relevant tools. Be specific and descriptive about the task you want to accomplish.',
},
limit: {
type: 'integer',
description:
'Maximum number of results to return. Use higher values (20-30) for broad searches and lower values (5-10) for specific searches.',
default: 10,
},
},
required: ['query'],
},
},
{
name: 'call_tool',
description:
"STEP 2 of 2: Use this tool AFTER search_tools to actually execute/invoke any tool you found. This is the execution step - search_tools finds tools, call_tool runs them.\n\nWorkflow: search_tools → examine results → call_tool with the chosen tool name and required arguments.\n\nIMPORTANT: Always check the tool's inputSchema from search_tools results before invoking to ensure you provide the correct arguments. The search results will show you exactly what parameters each tool expects.",
inputSchema: {
type: 'object',
properties: {
toolName: {
type: 'string',
description: 'The exact name of the tool to invoke (from search_tools results)',
},
arguments: {
type: 'object',
description:
'The arguments to pass to the tool based on its inputSchema (optional if tool requires no arguments)',
},
},
required: ['toolName'],
},
},
],
};
}
const allServerInfos = serverInfos.filter((serverInfo) => {
if (serverInfo.enabled === false) return false;
if (!group) return true;
@@ -392,6 +483,143 @@ const handleListToolsRequest = async (_: any, extra: any) => {
const handleCallToolRequest = async (request: any, extra: any) => {
console.log(`Handling CallToolRequest for tool: ${request.params.name}`);
try {
// Special handling for agent group tools
if (request.params.name === 'search_tools') {
const { query, limit = 10 } = request.params.arguments || {};
if (!query || typeof query !== 'string') {
throw new Error('Query parameter is required and must be a string');
}
const limitNum = Math.min(Math.max(parseInt(String(limit)) || 10, 1), 100);
// Dynamically adjust threshold based on query characteristics
let thresholdNum = 0.3; // Default threshold
// For more general queries, use a lower threshold to get more diverse results
if (query.length < 10 || query.split(' ').length <= 2) {
thresholdNum = 0.2;
}
// For very specific queries, use a higher threshold for more precise results
if (query.length > 30 || query.includes('specific') || query.includes('exact')) {
thresholdNum = 0.4;
}
console.log(`Using similarity threshold: ${thresholdNum} for query: "${query}"`);
const servers = undefined; // No server filtering
const searchResults = await searchToolsByVector(query, limitNum, thresholdNum, servers);
console.log(`Search results: ${JSON.stringify(searchResults)}`);
// Find actual tool information from serverInfos by serverName and toolName
const tools = searchResults.map((result) => {
// Find the server in serverInfos
const server = serverInfos.find(
(serverInfo) =>
serverInfo.name === result.serverName &&
serverInfo.status === 'connected' &&
serverInfo.enabled !== false,
);
if (server && server.tools && server.tools.length > 0) {
// Find the tool in server.tools
const actualTool = server.tools.find((tool) => tool.name === result.toolName);
if (actualTool) {
// Return the actual tool info from serverInfos
return actualTool;
}
}
// Fallback to search result if server or tool not found
return {
name: result.toolName,
description: result.description || '',
inputSchema: result.inputSchema || {},
};
});
// Add usage guidance to the response
const response = {
tools,
metadata: {
query: query,
threshold: thresholdNum,
totalResults: tools.length,
guideline:
tools.length > 0
? "Found relevant tools. If these tools don't match exactly what you need, try another search with more specific keywords."
: 'No tools found. Try broadening your search or using different keywords.',
nextSteps:
tools.length > 0
? 'To use a tool, call call_tool with the toolName and required arguments.'
: 'Consider searching for related capabilities or more general terms.',
},
};
// Return in the same format as handleListToolsRequest
return {
content: [
{
type: 'text',
text: JSON.stringify(response),
},
],
};
}
// Special handling for call_tool
if (request.params.name === 'call_tool') {
const { toolName, arguments: toolArgs = {} } = request.params.arguments || {};
if (!toolName) {
throw new Error('toolName parameter is required');
}
// arguments parameter is now optional
let targetServerInfo: ServerInfo | undefined;
// Find the first server that has this tool
targetServerInfo = serverInfos.find(
(serverInfo) =>
serverInfo.status === 'connected' &&
serverInfo.enabled !== false &&
serverInfo.tools.some((tool) => tool.name === toolName),
);
if (!targetServerInfo) {
throw new Error(`No available servers found with tool: ${toolName}`);
}
// Check if the tool exists on the server
const toolExists = targetServerInfo.tools.some((tool) => tool.name === toolName);
if (!toolExists) {
throw new Error(`Tool '${toolName}' not found on server '${targetServerInfo.name}'`);
}
// Call the tool on the target server
const client = targetServerInfo.client;
if (!client) {
throw new Error(`Client not found for server: ${targetServerInfo.name}`);
}
// Use toolArgs if it has properties, otherwise fallback to request.params.arguments
const finalArgs =
toolArgs && Object.keys(toolArgs).length > 0 ? toolArgs : request.params.arguments || {};
console.log(
`Invoking tool '${toolName}' on server '${targetServerInfo.name}' with arguments: ${JSON.stringify(finalArgs)}`,
);
const result = await client.callTool({
name: toolName,
arguments: finalArgs,
});
console.log(`Tool invocation result: ${JSON.stringify(result)}`);
return result;
}
// Regular tool handling
const serverInfo = getServerByTool(request.params.name);
if (!serverInfo) {
throw new Error(`Server not found: ${request.params.name}`);

View File

@@ -81,16 +81,28 @@ export const handleSseMessage = async (req: Request, res: Response): Promise<voi
}
const sessionId = req.query.sessionId as string;
const { transport, group } = transports[sessionId];
// Validate sessionId
if (!sessionId) {
console.error('Missing sessionId in query parameters');
res.status(400).send('Missing sessionId parameter');
return;
}
// Check if transport exists before destructuring
const transportData = transports[sessionId];
if (!transportData) {
console.warn(`No transport found for sessionId: ${sessionId}`);
res.status(400).send('No transport found for sessionId');
return;
}
const { transport, group } = transportData;
req.params.group = group;
req.query.group = group;
console.log(`Received message for sessionId: ${sessionId} in group: ${group}`);
if (transport) {
await (transport as SSEServerTransport).handlePostMessage(req, res);
} else {
console.error(`No transport found for sessionId: ${sessionId}`);
res.status(400).send('No transport found for sessionId');
}
await (transport as SSEServerTransport).handlePostMessage(req, res);
};
export const handleMcpPostRequest = async (req: Request, res: Response): Promise<void> => {

View File

@@ -0,0 +1,706 @@
import { getRepositoryFactory } from '../db/index.js';
import { VectorEmbeddingRepository } from '../db/repositories/index.js';
import { ToolInfo } from '../types/index.js';
import { getAppDataSource, initializeDatabase } from '../db/connection.js';
import { loadSettings } from '../config/index.js';
import OpenAI from 'openai';
// Get OpenAI configuration from smartRouting settings or fallback to environment variables
const getOpenAIConfig = () => {
try {
const settings = loadSettings();
const smartRouting = settings.systemConfig?.smartRouting;
return {
apiKey: smartRouting?.openaiApiKey || process.env.OPENAI_API_KEY,
baseURL:
smartRouting?.openaiApiBaseUrl ||
process.env.OPENAI_API_BASE_URL ||
'https://api.openai.com/v1',
embeddingModel:
smartRouting?.openaiApiEmbeddingModel ||
process.env.OPENAI_API_EMBEDDING_MODEL ||
'text-embedding-3-small',
};
} catch (error) {
console.warn(
'Failed to load smartRouting settings, falling back to environment variables:',
error,
);
return {
apiKey: '',
baseURL: 'https://api.openai.com/v1',
embeddingModel: 'text-embedding-3-small',
};
}
};
// Environment variables for embedding configuration
const EMBEDDING_ENV = {
// The embedding model to use - default to OpenAI but allow BAAI/BGE models
MODEL: process.env.EMBEDDING_MODEL || getOpenAIConfig().embeddingModel,
// Detect if using a BGE model from the environment variable
IS_BGE_MODEL: !!(process.env.EMBEDDING_MODEL && process.env.EMBEDDING_MODEL.includes('bge')),
};
// Constants for embedding models
const EMBEDDING_DIMENSIONS = 1536; // OpenAI's text-embedding-3-small outputs 1536 dimensions
const BGE_DIMENSIONS = 1024; // BAAI/bge-m3 outputs 1024 dimensions
const FALLBACK_DIMENSIONS = 100; // Fallback implementation uses 100 dimensions
// Get dimensions for a model
const getDimensionsForModel = (model: string): number => {
if (model.includes('bge-m3')) {
return BGE_DIMENSIONS;
} else if (model.includes('text-embedding-3')) {
return EMBEDDING_DIMENSIONS;
} else if (model === 'fallback' || model === 'simple-hash') {
return FALLBACK_DIMENSIONS;
}
// Default to OpenAI dimensions
return EMBEDDING_DIMENSIONS;
};
// Initialize the OpenAI client with smartRouting configuration
const getOpenAIClient = () => {
const config = getOpenAIConfig();
return new OpenAI({
apiKey: config.apiKey, // Get API key from smartRouting settings or environment variables
baseURL: config.baseURL, // Get base URL from smartRouting settings or fallback to default
});
};
/**
* Generate text embedding using OpenAI's embedding model
*
* NOTE: embeddings are 1536 dimensions by default.
* If you previously used the fallback implementation (100 dimensions),
* you may need to rebuild your vector database indices after switching.
*
* @param text Text to generate embeddings for
* @returns Promise with vector embedding as number array
*/
async function generateEmbedding(text: string): Promise<number[]> {
try {
const config = getOpenAIConfig();
const openai = getOpenAIClient();
// Check if API key is configured
if (!openai.apiKey) {
console.warn('OpenAI API key is not configured. Using fallback embedding method.');
return generateFallbackEmbedding(text);
}
// Truncate text if it's too long (OpenAI has token limits)
const truncatedText = text.length > 8000 ? text.substring(0, 8000) : text;
// Call OpenAI's embeddings API
const response = await openai.embeddings.create({
model: config.embeddingModel, // Modern model with better performance
input: truncatedText,
});
// Return the embedding
return response.data[0].embedding;
} catch (error) {
console.error('Error generating embedding:', error);
console.warn('Falling back to simple embedding method');
return generateFallbackEmbedding(text);
}
}
/**
* Fallback embedding function using a simple approach when OpenAI API is unavailable
* @param text Text to generate embeddings for
* @returns Vector embedding as number array
*/
function generateFallbackEmbedding(text: string): number[] {
const words = text.toLowerCase().split(/\s+/);
const vocabulary = [
'search',
'find',
'get',
'fetch',
'retrieve',
'query',
'map',
'location',
'weather',
'file',
'directory',
'email',
'message',
'send',
'create',
'update',
'delete',
'browser',
'web',
'page',
'click',
'navigate',
'screenshot',
'automation',
'database',
'table',
'record',
'insert',
'select',
'schema',
'data',
'image',
'photo',
'video',
'media',
'upload',
'download',
'convert',
'text',
'document',
'pdf',
'excel',
'word',
'format',
'parse',
'api',
'rest',
'http',
'request',
'response',
'json',
'xml',
'time',
'date',
'calendar',
'schedule',
'reminder',
'clock',
'math',
'calculate',
'number',
'sum',
'average',
'statistics',
'user',
'account',
'login',
'auth',
'permission',
'role',
];
// Create vector with fallback dimensions
const vector = new Array(FALLBACK_DIMENSIONS).fill(0);
words.forEach((word) => {
const index = vocabulary.indexOf(word);
if (index >= 0 && index < vector.length) {
vector[index] += 1;
}
// Add some randomness based on word hash
const hash = word.split('').reduce((a, b) => a + b.charCodeAt(0), 0);
vector[hash % vector.length] += 0.1;
});
// Normalize the vector
const magnitude = Math.sqrt(vector.reduce((sum, val) => sum + val * val, 0));
if (magnitude > 0) {
return vector.map((val) => val / magnitude);
}
return vector;
}
/**
* Save tool information as vector embeddings
* @param serverName Server name
* @param tools Array of tools to save
*/
export const saveToolsAsVectorEmbeddings = async (
serverName: string,
tools: ToolInfo[],
): Promise<void> => {
try {
const config = getOpenAIConfig();
const vectorRepository = getRepositoryFactory(
'vectorEmbeddings',
)() as VectorEmbeddingRepository;
for (const tool of tools) {
// Create searchable text from tool information
const searchableText = [
tool.name,
tool.description,
// Include input schema properties if available
...(tool.inputSchema && typeof tool.inputSchema === 'object'
? Object.keys(tool.inputSchema).filter((key) => key !== 'type' && key !== 'properties')
: []),
// Include schema property names if available
...(tool.inputSchema &&
tool.inputSchema.properties &&
typeof tool.inputSchema.properties === 'object'
? Object.keys(tool.inputSchema.properties)
: []),
]
.filter(Boolean)
.join(' ');
try {
// Generate embedding
const embedding = await generateEmbedding(searchableText);
// Check database compatibility before saving
await checkDatabaseVectorDimensions(embedding.length);
// Save embedding
await vectorRepository.saveEmbedding(
'tool',
`${serverName}:${tool.name}`,
searchableText,
embedding,
{
serverName,
toolName: tool.name,
description: tool.description,
inputSchema: tool.inputSchema,
},
config.embeddingModel, // Store the model used for this embedding
);
} catch (toolError) {
console.error(`Error processing tool ${tool.name} for server ${serverName}:`, toolError);
// Continue with the next tool rather than failing the whole batch
}
}
console.log(`Saved ${tools.length} tool embeddings for server: ${serverName}`);
} catch (error) {
console.error(`Error saving tool embeddings for server ${serverName}:`, error);
}
};
/**
* Search for tools using vector similarity
* @param query Search query text
* @param limit Maximum number of results to return
* @param threshold Similarity threshold (0-1)
* @param serverNames Optional array of server names to filter by
*/
export const searchToolsByVector = async (
query: string,
limit: number = 10,
threshold: number = 0.7,
serverNames?: string[],
): Promise<
Array<{
serverName: string;
toolName: string;
description: string;
inputSchema: any;
similarity: number;
searchableText: string;
}>
> => {
try {
const vectorRepository = getRepositoryFactory(
'vectorEmbeddings',
)() as VectorEmbeddingRepository;
// Search by text using vector similarity
const results = await vectorRepository.searchByText(
query,
generateEmbedding,
limit,
threshold,
['tool'],
);
// Filter by server names if provided
let filteredResults = results;
if (serverNames && serverNames.length > 0) {
filteredResults = results.filter((result) => {
if (typeof result.embedding.metadata === 'string') {
try {
const parsedMetadata = JSON.parse(result.embedding.metadata);
return serverNames.includes(parsedMetadata.serverName);
} catch (error) {
return false;
}
}
return false;
});
}
// Transform results to a more useful format
return filteredResults.map((result) => {
// Check if we have metadata as a string that needs to be parsed
if (result.embedding?.metadata && typeof result.embedding.metadata === 'string') {
try {
// Parse the metadata string as JSON
const parsedMetadata = JSON.parse(result.embedding.metadata);
if (parsedMetadata.serverName && parsedMetadata.toolName) {
// We have properly structured metadata
return {
serverName: parsedMetadata.serverName,
toolName: parsedMetadata.toolName,
description: parsedMetadata.description || '',
inputSchema: parsedMetadata.inputSchema || {},
similarity: result.similarity,
searchableText: result.embedding.text_content,
};
}
} catch (error) {
console.error('Error parsing metadata string:', error);
// Fall through to the extraction logic below
}
}
// Extract tool info from text_content if metadata is not available or parsing failed
const textContent = result.embedding?.text_content || '';
// Extract toolName (first word of text_content)
const toolNameMatch = textContent.match(/^(\S+)/);
const toolName = toolNameMatch ? toolNameMatch[1] : '';
// Extract serverName from toolName if it follows the pattern "serverName_toolPart"
const serverNameMatch = toolName.match(/^([^_]+)_/);
const serverName = serverNameMatch ? serverNameMatch[1] : 'unknown';
// Extract description (everything after the first word)
const description = textContent.replace(/^\S+\s*/, '').trim();
return {
serverName,
toolName,
description,
inputSchema: {},
similarity: result.similarity,
searchableText: textContent,
};
});
} catch (error) {
console.error('Error searching tools by vector:', error);
return [];
}
};
/**
* Get all available tools in vector database
* @param serverNames Optional array of server names to filter by
*/
export const getAllVectorizedTools = async (
serverNames?: string[],
): Promise<
Array<{
serverName: string;
toolName: string;
description: string;
inputSchema: any;
}>
> => {
try {
const config = getOpenAIConfig();
const vectorRepository = getRepositoryFactory(
'vectorEmbeddings',
)() as VectorEmbeddingRepository;
// Try to determine what dimension our database is using
let dimensionsToUse = getDimensionsForModel(config.embeddingModel); // Default based on the model selected
try {
const result = await getAppDataSource().query(`
SELECT atttypmod as dimensions
FROM pg_attribute
WHERE attrelid = 'vector_embeddings'::regclass
AND attname = 'embedding'
`);
if (result && result.length > 0 && result[0].dimensions) {
const rawValue = result[0].dimensions;
if (rawValue === -1) {
// No type modifier specified
dimensionsToUse = getDimensionsForModel(config.embeddingModel);
} else {
// For this version of pgvector, atttypmod stores the dimension value directly
dimensionsToUse = rawValue;
}
}
} catch (error: any) {
console.warn('Could not determine vector dimensions from database:', error?.message);
}
// Get all tool embeddings
const results = await vectorRepository.searchSimilar(
new Array(dimensionsToUse).fill(0), // Zero vector with dimensions matching the database
1000, // Large limit
-1, // No threshold (get all)
['tool'],
);
// Filter by server names if provided
let filteredResults = results;
if (serverNames && serverNames.length > 0) {
filteredResults = results.filter((result) => {
if (typeof result.embedding.metadata === 'string') {
try {
const parsedMetadata = JSON.parse(result.embedding.metadata);
return serverNames.includes(parsedMetadata.serverName);
} catch (error) {
return false;
}
}
return false;
});
}
// Transform results
return filteredResults.map((result) => {
if (typeof result.embedding.metadata === 'string') {
try {
const parsedMetadata = JSON.parse(result.embedding.metadata);
return {
serverName: parsedMetadata.serverName,
toolName: parsedMetadata.toolName,
description: parsedMetadata.description,
inputSchema: parsedMetadata.inputSchema,
};
} catch (error) {
console.error('Error parsing metadata string:', error);
return {
serverName: 'unknown',
toolName: 'unknown',
description: '',
inputSchema: {},
};
}
}
return {
serverName: 'unknown',
toolName: 'unknown',
description: '',
inputSchema: {},
};
});
} catch (error) {
console.error('Error getting all vectorized tools:', error);
return [];
}
};
/**
* Remove tool embeddings for a server
* @param serverName Server name
*/
export const removeServerToolEmbeddings = async (serverName: string): Promise<void> => {
try {
const vectorRepository = getRepositoryFactory(
'vectorEmbeddings',
)() as VectorEmbeddingRepository;
// Note: This would require adding a delete method to VectorEmbeddingRepository
// For now, we'll log that this functionality needs to be implemented
console.log(`TODO: Remove tool embeddings for server: ${serverName}`);
} catch (error) {
console.error(`Error removing tool embeddings for server ${serverName}:`, error);
}
};
/**
* Sync all server tools embeddings when smart routing is first enabled
* This function will scan all currently connected servers and save their tools as vector embeddings
*/
export const syncAllServerToolsEmbeddings = async (): Promise<void> => {
try {
console.log('Starting synchronization of all server tools embeddings...');
// Import getServersInfo to get all server information
const { getServersInfo } = await import('./mcpService.js');
const servers = getServersInfo();
let totalToolsSynced = 0;
let serversSynced = 0;
for (const server of servers) {
if (server.status === 'connected' && server.tools && server.tools.length > 0) {
try {
console.log(`Syncing tools for server: ${server.name} (${server.tools.length} tools)`);
await saveToolsAsVectorEmbeddings(server.name, server.tools);
totalToolsSynced += server.tools.length;
serversSynced++;
} catch (error) {
console.error(`Failed to sync tools for server ${server.name}:`, error);
}
} else if (server.status === 'connected' && (!server.tools || server.tools.length === 0)) {
console.log(`Server ${server.name} is connected but has no tools to sync`);
} else {
console.log(`Skipping server ${server.name} (status: ${server.status})`);
}
}
console.log(
`Smart routing tools sync completed: synced ${totalToolsSynced} tools from ${serversSynced} servers`,
);
} catch (error) {
console.error('Error during smart routing tools synchronization:', error);
throw error;
}
};
/**
* Check database vector dimensions and ensure compatibility
* @param dimensionsNeeded The number of dimensions required
* @returns Promise that resolves when check is complete
*/
async function checkDatabaseVectorDimensions(dimensionsNeeded: number): Promise<void> {
try {
// First check if database is initialized
if (!getAppDataSource().isInitialized) {
console.info('Database not initialized, initializing...');
await initializeDatabase();
}
// Check current vector dimension in the database
// First try to get vector type info directly
let vectorTypeInfo;
try {
vectorTypeInfo = await getAppDataSource().query(`
SELECT
atttypmod,
format_type(atttypid, atttypmod) as formatted_type
FROM pg_attribute
WHERE attrelid = 'vector_embeddings'::regclass
AND attname = 'embedding'
`);
} catch (error) {
console.warn('Could not get vector type info, falling back to atttypmod query');
}
// Fallback to original query
const result = await getAppDataSource().query(`
SELECT atttypmod as dimensions
FROM pg_attribute
WHERE attrelid = 'vector_embeddings'::regclass
AND attname = 'embedding'
`);
let currentDimensions = 0;
// Parse dimensions from result
if (result && result.length > 0 && result[0].dimensions) {
if (vectorTypeInfo && vectorTypeInfo.length > 0) {
// Try to extract dimensions from formatted type like "vector(1024)"
const match = vectorTypeInfo[0].formatted_type?.match(/vector\((\d+)\)/);
if (match) {
currentDimensions = parseInt(match[1]);
}
}
// If we couldn't extract from formatted type, use the atttypmod value directly
if (currentDimensions === 0) {
const rawValue = result[0].dimensions;
if (rawValue === -1) {
// No type modifier specified
currentDimensions = 0;
} else {
// For this version of pgvector, atttypmod stores the dimension value directly
currentDimensions = rawValue;
}
}
}
// Also check the dimensions stored in actual records for validation
try {
const recordCheck = await getAppDataSource().query(`
SELECT dimensions, model, COUNT(*) as count
FROM vector_embeddings
GROUP BY dimensions, model
ORDER BY count DESC
LIMIT 5
`);
if (recordCheck && recordCheck.length > 0) {
// If we couldn't determine dimensions from schema, use the most common dimension from records
if (currentDimensions === 0 && recordCheck[0].dimensions) {
currentDimensions = recordCheck[0].dimensions;
}
}
} catch (error) {
console.warn('Could not check dimensions from actual records:', error);
}
// If no dimensions are set or they don't match what we need, handle the mismatch
if (currentDimensions === 0 || currentDimensions !== dimensionsNeeded) {
console.log(
`Vector dimensions mismatch: database=${currentDimensions}, needed=${dimensionsNeeded}`,
);
if (currentDimensions === 0) {
console.log('Setting up vector dimensions for the first time...');
} else {
console.log('Dimension mismatch detected. Clearing existing incompatible vector data...');
// Clear all existing vector embeddings with mismatched dimensions
await clearMismatchedVectorData(dimensionsNeeded);
}
// Drop any existing indices first
await getAppDataSource().query(`DROP INDEX IF EXISTS idx_vector_embeddings_embedding;`);
// Alter the column type with the new dimensions
await getAppDataSource().query(`
ALTER TABLE vector_embeddings
ALTER COLUMN embedding TYPE vector(${dimensionsNeeded});
`);
// Create a new index with better error handling
try {
await getAppDataSource().query(`
CREATE INDEX idx_vector_embeddings_embedding
ON vector_embeddings USING ivfflat (embedding vector_cosine_ops) WITH (lists = 100);
`);
} catch (indexError: any) {
// If the index already exists (code 42P07) or there's a duplicate key constraint (code 23505),
// it's not a critical error as the index is already there
if (indexError.code === '42P07' || indexError.code === '23505') {
console.log('Index already exists, continuing...');
} else {
console.warn('Warning: Failed to create index, but continuing:', indexError.message);
}
}
console.log(`Successfully configured vector dimensions to ${dimensionsNeeded}`);
}
} catch (error: any) {
console.error('Error checking/updating vector dimensions:', error);
throw new Error(`Vector dimension check failed: ${error?.message || 'Unknown error'}`);
}
}
/**
* Clear vector embeddings with mismatched dimensions
* @param expectedDimensions The expected dimensions
* @returns Promise that resolves when cleanup is complete
*/
async function clearMismatchedVectorData(expectedDimensions: number): Promise<void> {
try {
console.log(
`Clearing vector embeddings with dimensions different from ${expectedDimensions}...`,
);
// Delete all embeddings that don't match the expected dimensions
await getAppDataSource().query(
`
DELETE FROM vector_embeddings
WHERE dimensions != $1
`,
[expectedDimensions],
);
console.log('Successfully cleared mismatched vector embeddings');
} catch (error: any) {
console.error('Error clearing mismatched vector data:', error);
throw error;
}
}

View File

@@ -90,6 +90,13 @@ export interface McpSettings {
pythonIndexUrl?: string; // Python package repository URL (UV_DEFAULT_INDEX)
npmRegistry?: string; // NPM registry URL (npm_config_registry)
};
smartRouting?: {
enabled?: boolean; // Controls whether smart routing is enabled
dbUrl?: string; // Database URL for smart routing
openaiApiBaseUrl?: string; // OpenAI API base URL
openaiApiKey?: string; // OpenAI API key
openaiApiEmbeddingModel?: string; // OpenAI API embedding model
};
// Add other system configuration sections here in the future
};
}

View File

@@ -10,7 +10,10 @@
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true,
"resolveJsonModule": true,
"sourceMap": true
"sourceMap": true,
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"strictPropertyInitialization": false
},
"include": ["src/**/*"],
"exclude": ["node_modules", "**/*.test.ts", "dist"]