@samanhappy/mcphub 1.0.10 → 1.0.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.fr.md +1 -0
- package/README.md +3 -0
- package/README.zh.md +1 -0
- package/dist/cli/commands/tools.js +4 -0
- package/dist/cli/commands/tools.js.map +1 -1
- package/dist/controllers/contextCostController.js +24 -0
- package/dist/controllers/contextCostController.js.map +1 -0
- package/dist/controllers/discoveryController.js +203 -0
- package/dist/controllers/discoveryController.js.map +1 -0
- package/dist/controllers/oauthCallbackController.js +3 -8
- package/dist/controllers/oauthCallbackController.js.map +1 -1
- package/dist/controllers/serverController.js +51 -1
- package/dist/controllers/serverController.js.map +1 -1
- package/dist/dao/SystemConfigDaoDbImpl.js +6 -0
- package/dist/dao/SystemConfigDaoDbImpl.js.map +1 -1
- package/dist/db/entities/SystemConfig.js +8 -0
- package/dist/db/entities/SystemConfig.js.map +1 -1
- package/dist/db/repositories/SystemConfigRepository.js +2 -0
- package/dist/db/repositories/SystemConfigRepository.js.map +1 -1
- package/dist/routes/index.js +16 -0
- package/dist/routes/index.js.map +1 -1
- package/dist/services/contextCostService.js +101 -0
- package/dist/services/contextCostService.js.map +1 -0
- package/dist/services/groupService.js +1 -1
- package/dist/services/groupService.js.map +1 -1
- package/dist/services/hostedRuntimeCatalogService.js +2 -1
- package/dist/services/hostedRuntimeCatalogService.js.map +1 -1
- package/dist/services/mcpService.js +266 -104
- package/dist/services/mcpService.js.map +1 -1
- package/dist/services/openApiGeneratorService.js +5 -4
- package/dist/services/openApiGeneratorService.js.map +1 -1
- package/dist/services/smartRoutingService.js +63 -30
- package/dist/services/smartRoutingService.js.map +1 -1
- package/dist/services/toolResultCompressionService.js +360 -0
- package/dist/services/toolResultCompressionService.js.map +1 -0
- package/dist/services/vectorSearchService.js +3 -1
- package/dist/services/vectorSearchService.js.map +1 -1
- package/dist/utils/mcpApps.js +43 -0
- package/dist/utils/mcpApps.js.map +1 -0
- package/dist/utils/migration.js +2 -0
- package/dist/utils/migration.js.map +1 -1
- package/dist/utils/serialization.js +17 -1
- package/dist/utils/serialization.js.map +1 -1
- package/dist/utils/smartRouting.js +6 -0
- package/dist/utils/smartRouting.js.map +1 -1
- package/dist/utils/tokenCost.js +71 -0
- package/dist/utils/tokenCost.js.map +1 -0
- package/frontend/dist/assets/{ActivityPage-RTpGLfzM.js → ActivityPage-BPfkCkM3.js} +2 -2
- package/frontend/dist/assets/{ActivityPage-RTpGLfzM.js.map → ActivityPage-BPfkCkM3.js.map} +1 -1
- package/frontend/dist/assets/{ConfirmDialog-CxlizGia.js → ConfirmDialog-Cag_haxr.js} +2 -2
- package/frontend/dist/assets/{ConfirmDialog-CxlizGia.js.map → ConfirmDialog-Cag_haxr.js.map} +1 -1
- package/frontend/dist/assets/Dashboard-BvEkS4H1.js +2 -0
- package/frontend/dist/assets/Dashboard-BvEkS4H1.js.map +1 -0
- package/frontend/dist/assets/{DeleteDialog-DRbWonMu.js → DeleteDialog-BBfJpiiD.js} +2 -2
- package/frontend/dist/assets/{DeleteDialog-DRbWonMu.js.map → DeleteDialog-BBfJpiiD.js.map} +1 -1
- package/frontend/dist/assets/{EndpointCopy-BtPORuga.js → EndpointCopy-KhSo4Y6F.js} +2 -2
- package/frontend/dist/assets/{EndpointCopy-BtPORuga.js.map → EndpointCopy-KhSo4Y6F.js.map} +1 -1
- package/frontend/dist/assets/GroupsPage-CLkFTxqd.js +33 -0
- package/frontend/dist/assets/GroupsPage-CLkFTxqd.js.map +1 -0
- package/frontend/dist/assets/{LoginPage-Nks21Yj0.js → LoginPage-lM-z_O3X.js} +2 -2
- package/frontend/dist/assets/{LoginPage-Nks21Yj0.js.map → LoginPage-lM-z_O3X.js.map} +1 -1
- package/frontend/dist/assets/{LogsPage-CoupcpK1.js → LogsPage-CS9OFma4.js} +2 -2
- package/frontend/dist/assets/LogsPage-CS9OFma4.js.map +1 -0
- package/frontend/dist/assets/{MarketPage-PwkvXlle.js → MarketPage-9LSDiVvR.js} +2 -2
- package/frontend/dist/assets/{MarketPage-PwkvXlle.js.map → MarketPage-9LSDiVvR.js.map} +1 -1
- package/frontend/dist/assets/{Pagination-BFi-X7qY.js → Pagination-DBAu79mv.js} +2 -2
- package/frontend/dist/assets/{Pagination-BFi-X7qY.js.map → Pagination-DBAu79mv.js.map} +1 -1
- package/frontend/dist/assets/{PromptsPage-DQiX0bAK.js → PromptsPage-CPFRMMgV.js} +2 -2
- package/frontend/dist/assets/{PromptsPage-DQiX0bAK.js.map → PromptsPage-CPFRMMgV.js.map} +1 -1
- package/frontend/dist/assets/{ResourcesPage-Dltmu_Ze.js → ResourcesPage-DJ_7k1MF.js} +2 -2
- package/frontend/dist/assets/{ResourcesPage-Dltmu_Ze.js.map → ResourcesPage-DJ_7k1MF.js.map} +1 -1
- package/frontend/dist/assets/ServersPage-BtPOdp4X.js +37 -0
- package/frontend/dist/assets/ServersPage-BtPOdp4X.js.map +1 -0
- package/frontend/dist/assets/SettingsPage-CyYl7pb8.js +12 -0
- package/frontend/dist/assets/SettingsPage-CyYl7pb8.js.map +1 -0
- package/frontend/dist/assets/{StatusDot-BRb7WUcz.js → StatusDot-CZZGigtR.js} +2 -2
- package/frontend/dist/assets/{StatusDot-BRb7WUcz.js.map → StatusDot-CZZGigtR.js.map} +1 -1
- package/frontend/dist/assets/{ToggleGroup-tIqxkae6.js → ToggleGroup-C24CNPSz.js} +2 -2
- package/frontend/dist/assets/{ToggleGroup-tIqxkae6.js.map → ToggleGroup-C24CNPSz.js.map} +1 -1
- package/frontend/dist/assets/{UsersPage-DNMaUcUn.js → UsersPage-CLXhNpvg.js} +2 -2
- package/frontend/dist/assets/{UsersPage-DNMaUcUn.js.map → UsersPage-CLXhNpvg.js.map} +1 -1
- package/frontend/dist/assets/contextCost-mvvSAnFv.js +2 -0
- package/frontend/dist/assets/contextCost-mvvSAnFv.js.map +1 -0
- package/frontend/dist/assets/{framework-vendor-BUhDPOUZ.js → framework-vendor-DeqnZ0v6.js} +5 -5
- package/frontend/dist/assets/{framework-vendor-BUhDPOUZ.js.map → framework-vendor-DeqnZ0v6.js.map} +1 -1
- package/frontend/dist/assets/i18n-vendor-DP1IRITP.js +10 -0
- package/frontend/dist/assets/i18n-vendor-DP1IRITP.js.map +1 -0
- package/frontend/dist/assets/{icons-vendor-CKgJB3SC.js → icons-vendor-IYX_ppgH.js} +2 -2
- package/frontend/dist/assets/{icons-vendor-CKgJB3SC.js.map → icons-vendor-IYX_ppgH.js.map} +1 -1
- package/frontend/dist/assets/{index-B9E3ygVt.css → index-D8V2fxz_.css} +1 -1
- package/frontend/dist/assets/index-DRcTlhkb.js +3 -0
- package/frontend/dist/assets/index-DRcTlhkb.js.map +1 -0
- package/frontend/dist/assets/{resourceService-BuhqcwTn.js → resourceService-jx5dJGUy.js} +2 -2
- package/frontend/dist/assets/{resourceService-BuhqcwTn.js.map → resourceService-jx5dJGUy.js.map} +1 -1
- package/frontend/dist/assets/useSettingsData-B4hMPWdK.js +2 -0
- package/frontend/dist/assets/{useSettingsData-iQpBXEjX.js.map → useSettingsData-B4hMPWdK.js.map} +1 -1
- package/frontend/dist/assets/{variableDetection-GTKqOf1F.js → variableDetection-Dnh8qFpO.js} +2 -2
- package/frontend/dist/assets/{variableDetection-GTKqOf1F.js.map → variableDetection-Dnh8qFpO.js.map} +1 -1
- package/frontend/dist/index.html +5 -5
- package/package.json +8 -8
- package/frontend/dist/assets/Dashboard-KV-zezVb.js +0 -2
- package/frontend/dist/assets/Dashboard-KV-zezVb.js.map +0 -1
- package/frontend/dist/assets/GroupsPage-BhNYw74w.js +0 -33
- package/frontend/dist/assets/GroupsPage-BhNYw74w.js.map +0 -1
- package/frontend/dist/assets/LogsPage-CoupcpK1.js.map +0 -1
- package/frontend/dist/assets/ServersPage-CcbF8dGi.js +0 -37
- package/frontend/dist/assets/ServersPage-CcbF8dGi.js.map +0 -1
- package/frontend/dist/assets/SettingsPage-BbRB2fCw.js +0 -12
- package/frontend/dist/assets/SettingsPage-BbRB2fCw.js.map +0 -1
- package/frontend/dist/assets/i18n-vendor-Kbr87Ofu.js +0 -2
- package/frontend/dist/assets/i18n-vendor-Kbr87Ofu.js.map +0 -1
- package/frontend/dist/assets/index-C6LZBP3G.js +0 -3
- package/frontend/dist/assets/index-C6LZBP3G.js.map +0 -1
- package/frontend/dist/assets/useServerData-C9R1u5V4.js +0 -2
- package/frontend/dist/assets/useServerData-C9R1u5V4.js.map +0 -1
- package/frontend/dist/assets/useSettingsData-iQpBXEjX.js +0 -2
package/README.fr.md
CHANGED
|
@@ -17,6 +17,7 @@ MCPHub facilite la gestion et la mise à l'échelle de plusieurs serveurs MCP (M
|
|
|
17
17
|
- **Routage flexible** - Accédez à tous les serveurs, groupes spécifiques ou serveurs individuels via HTTP/SSE
|
|
18
18
|
- **Visibilité granulaire par groupe** - Contrôlez indépendamment la visibilité des Tools, Prompts et Resources de chaque serveur dans un groupe
|
|
19
19
|
- **Routage intelligent** - Découverte d'outils propulsée par IA utilisant la recherche sémantique vectorielle ([En savoir plus](https://docs.mcphub.app/features/smart-routing))
|
|
20
|
+
- **Compression des résultats d'outils** - Réduisez automatiquement les grands résultats texte avant qu'ils n'atteignent les clients
|
|
20
21
|
- **Configuration à chaud** - Ajoutez, supprimez ou mettez à jour les serveurs sans temps d'arrêt
|
|
21
22
|
- **Support OAuth 2.0** - Modes client et serveur pour une authentification sécurisée ([En savoir plus](https://docs.mcphub.app/features/oauth))
|
|
22
23
|
- **Connexion Sociale** - Support de connexion GitHub et Google via Better Auth (nécessite le mode Base de données)
|
package/README.md
CHANGED
|
@@ -17,6 +17,8 @@ MCPHub makes it easy to manage and scale multiple MCP (Model Context Protocol) s
|
|
|
17
17
|
- **Flexible Routing** - Access all servers, specific groups, or individual servers via HTTP/SSE
|
|
18
18
|
- **Granular Group Visibility** - Control Tool, Prompt, and Resource visibility independently for each server inside a group
|
|
19
19
|
- **Smart Routing** - AI-powered tool discovery using vector semantic search ([Learn more](https://docs.mcphub.app/features/smart-routing))
|
|
20
|
+
- **MCP Apps Proxy** - Transparently forward interactive MCP Apps on single-server routes ([Learn more](https://docs.mcphub.app/features/mcp-apps))
|
|
21
|
+
- **Tool Result Compression** - Transparently reduce large text tool outputs before they reach clients
|
|
20
22
|
- **Hot-Swappable Config** - Add, remove, or update servers without downtime
|
|
21
23
|
- **OAuth 2.0 Support** - Both client and server modes for secure authentication ([Learn more](https://docs.mcphub.app/features/oauth))
|
|
22
24
|
- **Social Login** - Seamless GitHub and Google login support with Better Auth integration (requires Database Mode)
|
|
@@ -112,6 +114,7 @@ It also speaks the public marketplace API (`mcphub discover`, `mcphub install ..
|
|
|
112
114
|
| [Database Mode](https://docs.mcphub.app/configuration/database-configuration) | PostgreSQL setup for production |
|
|
113
115
|
| [OAuth](https://docs.mcphub.app/features/oauth) | OAuth 2.0 client and server setup |
|
|
114
116
|
| [Smart Routing](https://docs.mcphub.app/features/smart-routing) | AI-powered tool discovery |
|
|
117
|
+
| [MCP Apps](https://docs.mcphub.app/features/mcp-apps) | Interactive Apps transparent proxy |
|
|
115
118
|
| [CLI Guide](https://docs.mcphub.app/features/cli) | Manage and call the hub from a terminal |
|
|
116
119
|
| [Docker Setup](https://docs.mcphub.app/configuration/docker-setup) | Docker deployment guide |
|
|
117
120
|
|
package/README.zh.md
CHANGED
|
@@ -17,6 +17,7 @@ MCPHub 通过将多个 MCP(Model Context Protocol)服务器组织为灵活
|
|
|
17
17
|
- **灵活路由** - 通过 HTTP/SSE 访问所有服务器、特定分组或单个服务器
|
|
18
18
|
- **细粒度分组可见性** - 在分组中可独立控制每个服务器的 Tool、Prompt 与 Resource 是否对外暴露
|
|
19
19
|
- **智能路由** - 基于向量语义搜索的 AI 工具发现 ([了解更多](https://docs.mcphub.app/zh/features/smart-routing))
|
|
20
|
+
- **工具结果压缩** - 在返回客户端前透明压缩大型文本工具输出
|
|
20
21
|
- **热插拔配置** - 无需停机即可添加、移除或更新服务器
|
|
21
22
|
- **OAuth 2.0 支持** - 客户端和服务端模式,实现安全认证 ([了解更多](https://docs.mcphub.app/zh/features/oauth))
|
|
22
23
|
- **社交一键登录** - 通过 Better Auth 集成支持 GitHub 和 Google 快捷登录(需启用数据库模式)
|
|
@@ -2,6 +2,7 @@ import { CliUsageError } from '../errors.js';
|
|
|
2
2
|
import { buildClient, resolveTarget } from '../context.js';
|
|
3
3
|
import { extractFlags } from '../parse-args.js';
|
|
4
4
|
import { bold, dim, printJson, printLine, printTable } from '../output.js';
|
|
5
|
+
import { isAppOnlyTool } from '../../utils/mcpApps.js';
|
|
5
6
|
// `tools` is the agent-friendly index for `call`: it answers "what can I call,
|
|
6
7
|
// what params does it take, where does it live" in one place, without making
|
|
7
8
|
// callers post-process `servers list` responses.
|
|
@@ -25,6 +26,9 @@ async function fetchFlatTools(client) {
|
|
|
25
26
|
const out = [];
|
|
26
27
|
for (const s of servers) {
|
|
27
28
|
for (const t of (s.tools ?? [])) {
|
|
29
|
+
if (isAppOnlyTool(t)) {
|
|
30
|
+
continue;
|
|
31
|
+
}
|
|
28
32
|
out.push({
|
|
29
33
|
server: s.name,
|
|
30
34
|
serverStatus: s.status,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../../src/cli/commands/tools.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAe,WAAW,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../../src/cli/commands/tools.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { getServerCosts, getGroupCosts } from '../services/contextCostService.js';
|
|
2
|
+
export const getServerCostsHandler = async (_req, res) => {
|
|
3
|
+
try {
|
|
4
|
+
const data = await getServerCosts();
|
|
5
|
+
const response = { success: true, data };
|
|
6
|
+
res.json(response);
|
|
7
|
+
}
|
|
8
|
+
catch (error) {
|
|
9
|
+
console.error('Failed to get server context footprint:', error);
|
|
10
|
+
res.status(500).json({ success: false, message: 'Failed to get server context footprint' });
|
|
11
|
+
}
|
|
12
|
+
};
|
|
13
|
+
export const getGroupCostsHandler = async (_req, res) => {
|
|
14
|
+
try {
|
|
15
|
+
const data = await getGroupCosts();
|
|
16
|
+
const response = { success: true, data };
|
|
17
|
+
res.json(response);
|
|
18
|
+
}
|
|
19
|
+
catch (error) {
|
|
20
|
+
console.error('Failed to get group context footprint:', error);
|
|
21
|
+
res.status(500).json({ success: false, message: 'Failed to get group context footprint' });
|
|
22
|
+
}
|
|
23
|
+
};
|
|
24
|
+
//# sourceMappingURL=contextCostController.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"contextCostController.js","sourceRoot":"","sources":["../../src/controllers/contextCostController.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAElF,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,EAAE,IAAa,EAAE,GAAa,EAAiB,EAAE;IACzF,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,cAAc,EAAE,CAAC;QACpC,MAAM,QAAQ,GAAgB,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;QACtD,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,yCAAyC,EAAE,KAAK,CAAC,CAAC;QAChE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,wCAAwC,EAAE,CAAC,CAAC;IAC9F,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,EAAE,IAAa,EAAE,GAAa,EAAiB,EAAE;IACxF,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,aAAa,EAAE,CAAC;QACnC,MAAM,QAAQ,GAAgB,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;QACtD,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,wCAAwC,EAAE,KAAK,CAAC,CAAC;QAC/D,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,uCAAuC,EAAE,CAAC,CAAC;IAC7F,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -0,0 +1,203 @@
|
|
|
1
|
+
import config, { loadSettings } from '../config/index.js';
|
|
2
|
+
import { getMarketServers, getMarketServerByName, searchMarketServers, getMarketCategories, getMarketTags, } from '../services/marketService.js';
|
|
3
|
+
// Preference order when no explicit installation type is requested.
|
|
4
|
+
const INSTALLATION_PREFERENCE = ['npm', 'uvx', 'pip', 'docker', 'binary'];
|
|
5
|
+
const isDiscoveryEnabled = () => {
|
|
6
|
+
try {
|
|
7
|
+
return loadSettings().systemConfig?.discovery?.enabled === true;
|
|
8
|
+
}
|
|
9
|
+
catch {
|
|
10
|
+
return false;
|
|
11
|
+
}
|
|
12
|
+
};
|
|
13
|
+
// When discovery is disabled we return 404 (not 401) so unauthenticated callers
|
|
14
|
+
// cannot probe whether the feature even exists on a given mcphub instance.
|
|
15
|
+
const ensureEnabled = (res) => {
|
|
16
|
+
if (!isDiscoveryEnabled()) {
|
|
17
|
+
res.status(404).json({ success: false, message: 'Not found' });
|
|
18
|
+
return false;
|
|
19
|
+
}
|
|
20
|
+
return true;
|
|
21
|
+
};
|
|
22
|
+
const applyFilters = (servers, filters) => {
|
|
23
|
+
let result = servers;
|
|
24
|
+
if (filters.category) {
|
|
25
|
+
result = result.filter((s) => s.categories?.includes(filters.category));
|
|
26
|
+
}
|
|
27
|
+
if (filters.tag) {
|
|
28
|
+
result = result.filter((s) => s.tags?.includes(filters.tag));
|
|
29
|
+
}
|
|
30
|
+
const total = result.length;
|
|
31
|
+
if (typeof filters.limit === 'number' && filters.limit > 0) {
|
|
32
|
+
result = result.slice(0, filters.limit);
|
|
33
|
+
}
|
|
34
|
+
return { results: result, total };
|
|
35
|
+
};
|
|
36
|
+
const pickInstallation = (installations, preferred) => {
|
|
37
|
+
if (!installations)
|
|
38
|
+
return null;
|
|
39
|
+
const keys = Object.keys(installations);
|
|
40
|
+
if (keys.length === 0)
|
|
41
|
+
return null;
|
|
42
|
+
// If caller explicitly requested a type, return it or nothing — never silently
|
|
43
|
+
// substitute a different installer, since that would break automated installs.
|
|
44
|
+
if (preferred) {
|
|
45
|
+
return installations[preferred]
|
|
46
|
+
? { type: preferred, installation: installations[preferred] }
|
|
47
|
+
: null;
|
|
48
|
+
}
|
|
49
|
+
for (const key of INSTALLATION_PREFERENCE) {
|
|
50
|
+
if (installations[key]) {
|
|
51
|
+
return { type: key, installation: installations[key] };
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
return { type: keys[0], installation: installations[keys[0]] };
|
|
55
|
+
};
|
|
56
|
+
export const listDiscoveryServers = (req, res) => {
|
|
57
|
+
if (!ensureEnabled(res))
|
|
58
|
+
return;
|
|
59
|
+
try {
|
|
60
|
+
const { search, category, tag, limit } = req.query;
|
|
61
|
+
const base = typeof search === 'string' && search.trim()
|
|
62
|
+
? searchMarketServers(search)
|
|
63
|
+
: Object.values(getMarketServers());
|
|
64
|
+
const limitNum = typeof limit === 'string' ? parseInt(limit, 10) : NaN;
|
|
65
|
+
const { results, total } = applyFilters(base, {
|
|
66
|
+
category: typeof category === 'string' && category ? category : undefined,
|
|
67
|
+
tag: typeof tag === 'string' && tag ? tag : undefined,
|
|
68
|
+
limit: !Number.isNaN(limitNum) ? limitNum : undefined,
|
|
69
|
+
});
|
|
70
|
+
const response = {
|
|
71
|
+
success: true,
|
|
72
|
+
data: { total, servers: results },
|
|
73
|
+
};
|
|
74
|
+
res.json(response);
|
|
75
|
+
}
|
|
76
|
+
catch (error) {
|
|
77
|
+
res.status(500).json({ success: false, message: 'Failed to list discovery servers' });
|
|
78
|
+
}
|
|
79
|
+
};
|
|
80
|
+
export const getDiscoveryServer = (req, res) => {
|
|
81
|
+
if (!ensureEnabled(res))
|
|
82
|
+
return;
|
|
83
|
+
try {
|
|
84
|
+
const { name } = req.params;
|
|
85
|
+
if (!name) {
|
|
86
|
+
res.status(400).json({ success: false, message: 'Server name is required' });
|
|
87
|
+
return;
|
|
88
|
+
}
|
|
89
|
+
const server = getMarketServerByName(name);
|
|
90
|
+
if (!server) {
|
|
91
|
+
res.status(404).json({ success: false, message: 'Server not found' });
|
|
92
|
+
return;
|
|
93
|
+
}
|
|
94
|
+
const response = { success: true, data: server };
|
|
95
|
+
res.json(response);
|
|
96
|
+
}
|
|
97
|
+
catch (error) {
|
|
98
|
+
res.status(500).json({ success: false, message: 'Failed to get discovery server' });
|
|
99
|
+
}
|
|
100
|
+
};
|
|
101
|
+
// Returns a ready-to-paste `mcpServers` snippet compatible with the common
|
|
102
|
+
// MCP client config format (Claude Desktop, OpenClaw `openclaw.json`, Cursor,
|
|
103
|
+
// etc.). Callers can request a specific installation type via ?type=npm|docker|...
|
|
104
|
+
// and the response includes the documented `arguments` so the consumer knows
|
|
105
|
+
// which env vars to fill in.
|
|
106
|
+
export const getDiscoveryServerInstall = (req, res) => {
|
|
107
|
+
if (!ensureEnabled(res))
|
|
108
|
+
return;
|
|
109
|
+
try {
|
|
110
|
+
const { name } = req.params;
|
|
111
|
+
if (!name) {
|
|
112
|
+
res.status(400).json({ success: false, message: 'Server name is required' });
|
|
113
|
+
return;
|
|
114
|
+
}
|
|
115
|
+
const server = getMarketServerByName(name);
|
|
116
|
+
if (!server) {
|
|
117
|
+
res.status(404).json({ success: false, message: 'Server not found' });
|
|
118
|
+
return;
|
|
119
|
+
}
|
|
120
|
+
const preferred = typeof req.query.type === 'string' ? req.query.type : undefined;
|
|
121
|
+
const picked = pickInstallation(server.installations, preferred);
|
|
122
|
+
if (!picked) {
|
|
123
|
+
res.status(404).json({
|
|
124
|
+
success: false,
|
|
125
|
+
message: preferred
|
|
126
|
+
? `Server has no '${preferred}' installation method`
|
|
127
|
+
: 'Server has no installation method',
|
|
128
|
+
});
|
|
129
|
+
return;
|
|
130
|
+
}
|
|
131
|
+
const { installation, type } = picked;
|
|
132
|
+
const snippet = {
|
|
133
|
+
command: installation.command,
|
|
134
|
+
args: installation.args,
|
|
135
|
+
};
|
|
136
|
+
if (installation.env && Object.keys(installation.env).length > 0) {
|
|
137
|
+
snippet.env = installation.env;
|
|
138
|
+
}
|
|
139
|
+
const response = {
|
|
140
|
+
success: true,
|
|
141
|
+
data: {
|
|
142
|
+
name: server.name,
|
|
143
|
+
installationType: type,
|
|
144
|
+
availableTypes: Object.keys(server.installations || {}),
|
|
145
|
+
mcpServers: { [server.name]: snippet },
|
|
146
|
+
arguments: server.arguments || {},
|
|
147
|
+
},
|
|
148
|
+
};
|
|
149
|
+
res.json(response);
|
|
150
|
+
}
|
|
151
|
+
catch (error) {
|
|
152
|
+
res.status(500).json({ success: false, message: 'Failed to build install snippet' });
|
|
153
|
+
}
|
|
154
|
+
};
|
|
155
|
+
export const listDiscoveryCategories = (_req, res) => {
|
|
156
|
+
if (!ensureEnabled(res))
|
|
157
|
+
return;
|
|
158
|
+
try {
|
|
159
|
+
const response = { success: true, data: getMarketCategories() };
|
|
160
|
+
res.json(response);
|
|
161
|
+
}
|
|
162
|
+
catch (error) {
|
|
163
|
+
res.status(500).json({ success: false, message: 'Failed to list categories' });
|
|
164
|
+
}
|
|
165
|
+
};
|
|
166
|
+
export const listDiscoveryTags = (_req, res) => {
|
|
167
|
+
if (!ensureEnabled(res))
|
|
168
|
+
return;
|
|
169
|
+
try {
|
|
170
|
+
const response = { success: true, data: getMarketTags() };
|
|
171
|
+
res.json(response);
|
|
172
|
+
}
|
|
173
|
+
catch (error) {
|
|
174
|
+
res.status(500).json({ success: false, message: 'Failed to list tags' });
|
|
175
|
+
}
|
|
176
|
+
};
|
|
177
|
+
// Well-known autodiscovery: lets external clients learn the discovery API
|
|
178
|
+
// surface of this mcphub instance in a single request.
|
|
179
|
+
export const getMarketplaceWellKnown = (_req, res) => {
|
|
180
|
+
if (!ensureEnabled(res))
|
|
181
|
+
return;
|
|
182
|
+
try {
|
|
183
|
+
const base = config.basePath || '';
|
|
184
|
+
const total = Object.keys(getMarketServers()).length;
|
|
185
|
+
res.json({
|
|
186
|
+
name: 'mcphub-marketplace',
|
|
187
|
+
version: '0.1',
|
|
188
|
+
hub: { name: config.mcpHubName, version: config.mcpHubVersion },
|
|
189
|
+
endpoints: {
|
|
190
|
+
servers: `${base}/discovery/servers`,
|
|
191
|
+
server: `${base}/discovery/servers/{name}`,
|
|
192
|
+
install: `${base}/discovery/servers/{name}/install`,
|
|
193
|
+
categories: `${base}/discovery/categories`,
|
|
194
|
+
tags: `${base}/discovery/tags`,
|
|
195
|
+
},
|
|
196
|
+
total_servers: total,
|
|
197
|
+
});
|
|
198
|
+
}
|
|
199
|
+
catch (error) {
|
|
200
|
+
res.status(500).json({ success: false, message: 'Failed to fetch marketplace metadata' });
|
|
201
|
+
}
|
|
202
|
+
};
|
|
203
|
+
//# sourceMappingURL=discoveryController.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"discoveryController.js","sourceRoot":"","sources":["../../src/controllers/discoveryController.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,EAAE,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EACL,gBAAgB,EAChB,qBAAqB,EACrB,mBAAmB,EACnB,mBAAmB,EACnB,aAAa,GACd,MAAM,8BAA8B,CAAC;AAGtC,oEAAoE;AACpE,MAAM,uBAAuB,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAE1E,MAAM,kBAAkB,GAAG,GAAY,EAAE;IACvC,IAAI,CAAC;QACH,OAAO,YAAY,EAAE,CAAC,YAAY,EAAE,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;IAClE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC,CAAC;AAEF,gFAAgF;AAChF,2EAA2E;AAC3E,MAAM,aAAa,GAAG,CAAC,GAAa,EAAW,EAAE;IAC/C,IAAI,CAAC,kBAAkB,EAAE,EAAE,CAAC;QAC1B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;QAC/D,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CACnB,OAAuB,EACvB,OAA4D,EAChB,EAAE;IAC9C,IAAI,MAAM,GAAG,OAAO,CAAC;IACrB,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,QAAQ,CAAC,OAAO,CAAC,QAAS,CAAC,CAAC,CAAC;IAC3E,CAAC;IACD,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QAChB,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAI,CAAC,CAAC,CAAC;IAChE,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC;IAC5B,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,QAAQ,IAAI,OAAO,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC;QAC3D,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAC1C,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;AACpC,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CACvB,aAAmE,EACnE,SAAkB,EAC+C,EAAE;IACnE,IAAI,CAAC,aAAa;QAAE,OAAO,IAAI,CAAC;IAChC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACxC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAEnC,+EAA+E;IAC/E,+EAA+E;IAC/E,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,aAAa,CAAC,SAAS,CAAC;YAC7B,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,CAAC,SAAS,CAAC,EAAE;YAC7D,CAAC,CAAC,IAAI,CAAC;IACX,CAAC;IACD,KAAK,MAAM,GAAG,IAAI,uBAAuB,EAAE,CAAC;QAC1C,IAAI,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC;QACzD,CAAC;IACH,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AACjE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,GAAY,EAAE,GAAa,EAAQ,EAAE;IACxE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC;QAAE,OAAO;IAChC,IAAI,CAAC;QACH,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;QACnD,MAAM,IAAI,GACR,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,EAAE;YACzC,CAAC,CAAC,mBAAmB,CAAC,MAAM,CAAC;YAC7B,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC;QAExC,MAAM,QAAQ,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QACvE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,YAAY,CAAC,IAAI,EAAE;YAC5C,QAAQ,EAAE,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;YACzE,GAAG,EAAE,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS;YACrD,KAAK,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;SACtD,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAgB;YAC5B,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE;SAClC,CAAC;QACF,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,kCAAkC,EAAE,CAAC,CAAC;IACxF,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,GAAY,EAAE,GAAa,EAAQ,EAAE;IACtE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC;QAAE,OAAO;IAChC,IAAI,CAAC;QACH,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,yBAAyB,EAAE,CAAC,CAAC;YAC7E,OAAO;QACT,CAAC;QACD,MAAM,MAAM,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,kBAAkB,EAAE,CAAC,CAAC;YACtE,OAAO;QACT,CAAC;QACD,MAAM,QAAQ,GAAgB,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAC9D,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,gCAAgC,EAAE,CAAC,CAAC;IACtF,CAAC;AACH,CAAC,CAAC;AAEF,2EAA2E;AAC3E,8EAA8E;AAC9E,mFAAmF;AACnF,6EAA6E;AAC7E,6BAA6B;AAC7B,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,GAAY,EAAE,GAAa,EAAQ,EAAE;IAC7E,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC;QAAE,OAAO;IAChC,IAAI,CAAC;QACH,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,yBAAyB,EAAE,CAAC,CAAC;YAC7E,OAAO;QACT,CAAC;QACD,MAAM,MAAM,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,kBAAkB,EAAE,CAAC,CAAC;YACtE,OAAO;QACT,CAAC;QACD,MAAM,SAAS,GAAG,OAAO,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;QAClF,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;QACjE,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACnB,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,SAAS;oBAChB,CAAC,CAAC,kBAAkB,SAAS,uBAAuB;oBACpD,CAAC,CAAC,mCAAmC;aACxC,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QACD,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;QACtC,MAAM,OAAO,GAA4B;YACvC,OAAO,EAAE,YAAY,CAAC,OAAO;YAC7B,IAAI,EAAE,YAAY,CAAC,IAAI;SACxB,CAAC;QACF,IAAI,YAAY,CAAC,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACjE,OAAO,CAAC,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC;QACjC,CAAC;QACD,MAAM,QAAQ,GAAgB;YAC5B,OAAO,EAAE,IAAI;YACb,IAAI,EAAE;gBACJ,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,gBAAgB,EAAE,IAAI;gBACtB,cAAc,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,EAAE,CAAC;gBACvD,UAAU,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE;gBACtC,SAAS,EAAE,MAAM,CAAC,SAAS,IAAI,EAAE;aAClC;SACF,CAAC;QACF,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,iCAAiC,EAAE,CAAC,CAAC;IACvF,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,IAAa,EAAE,GAAa,EAAQ,EAAE;IAC5E,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC;QAAE,OAAO;IAChC,IAAI,CAAC;QACH,MAAM,QAAQ,GAAgB,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,mBAAmB,EAAE,EAAE,CAAC;QAC7E,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,2BAA2B,EAAE,CAAC,CAAC;IACjF,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,IAAa,EAAE,GAAa,EAAQ,EAAE;IACtE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC;QAAE,OAAO;IAChC,IAAI,CAAC;QACH,MAAM,QAAQ,GAAgB,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE,CAAC;QACvE,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,qBAAqB,EAAE,CAAC,CAAC;IAC3E,CAAC;AACH,CAAC,CAAC;AAEF,0EAA0E;AAC1E,uDAAuD;AACvD,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,IAAa,EAAE,GAAa,EAAQ,EAAE;IAC5E,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC;QAAE,OAAO;IAChC,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC;QACnC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC,MAAM,CAAC;QACrD,GAAG,CAAC,IAAI,CAAC;YACP,IAAI,EAAE,oBAAoB;YAC1B,OAAO,EAAE,KAAK;YACd,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,aAAa,EAAE;YAC/D,SAAS,EAAE;gBACT,OAAO,EAAE,GAAG,IAAI,oBAAoB;gBACpC,MAAM,EAAE,GAAG,IAAI,2BAA2B;gBAC1C,OAAO,EAAE,GAAG,IAAI,mCAAmC;gBACnD,UAAU,EAAE,GAAG,IAAI,uBAAuB;gBAC1C,IAAI,EAAE,GAAG,IAAI,iBAAiB;aAC/B;YACD,aAAa,EAAE,KAAK;SACrB,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,sCAAsC,EAAE,CAAC,CAAC;IAC5F,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -14,8 +14,8 @@
|
|
|
14
14
|
* - Exchange the code for tokens using PKCE
|
|
15
15
|
* - Save tokens via our OAuthClientProvider.saveTokens()
|
|
16
16
|
*/
|
|
17
|
-
import { getServerByName, getServerByOAuthState, createTransportFromConfig, } from '../services/mcpService.js';
|
|
18
|
-
import {
|
|
17
|
+
import { getServerByName, getServerByOAuthState, createTransportFromConfig, updateServerToolsCache, } from '../services/mcpService.js';
|
|
18
|
+
import { replaceEnvVars } from '../config/index.js';
|
|
19
19
|
import { loadServerConfig } from '../services/oauthSettingsStore.js';
|
|
20
20
|
/**
|
|
21
21
|
* Basic HTML escaping helper to prevent XSS in generated pages.
|
|
@@ -260,12 +260,7 @@ export const handleOAuthCallback = async (req, res) => {
|
|
|
260
260
|
serverName: serverInfo.name,
|
|
261
261
|
});
|
|
262
262
|
const toolsResult = await serverInfo.client.listTools({}, serverInfo.options);
|
|
263
|
-
|
|
264
|
-
serverInfo.tools = toolsResult.tools.map((tool) => ({
|
|
265
|
-
name: `${serverInfo.name}${separator}${tool.name}`,
|
|
266
|
-
description: tool.description || '',
|
|
267
|
-
inputSchema: tool.inputSchema || {},
|
|
268
|
-
}));
|
|
263
|
+
updateServerToolsCache(serverInfo, toolsResult.tools);
|
|
269
264
|
console.log('Listed tools after OAuth callback', {
|
|
270
265
|
serverName: serverInfo.name,
|
|
271
266
|
toolCount: serverInfo.tools.length,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauthCallbackController.js","sourceRoot":"","sources":["../../src/controllers/oauthCallbackController.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"oauthCallbackController.js","sourceRoot":"","sources":["../../src/controllers/oauthCallbackController.ts"],"names":[],"mappings":"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"}
|
|
@@ -207,6 +207,14 @@ export const getAllSettings = async (req, res) => {
|
|
|
207
207
|
else if (!systemConfig.smartRouting.dbUrl) {
|
|
208
208
|
systemConfig.smartRouting.dbUrl = dbUrlEnv ? '${DB_URL}' : '';
|
|
209
209
|
}
|
|
210
|
+
if (!systemConfig.toolResultCompression) {
|
|
211
|
+
systemConfig.toolResultCompression = {
|
|
212
|
+
enabled: false,
|
|
213
|
+
minTokens: 2000,
|
|
214
|
+
maxOutputTokens: 1200,
|
|
215
|
+
strategy: 'auto',
|
|
216
|
+
};
|
|
217
|
+
}
|
|
210
218
|
const settings = {
|
|
211
219
|
users,
|
|
212
220
|
mcpServers,
|
|
@@ -975,7 +983,7 @@ export const resetToolDescription = async (req, res) => {
|
|
|
975
983
|
};
|
|
976
984
|
export const updateSystemConfig = async (req, res) => {
|
|
977
985
|
try {
|
|
978
|
-
const { routing, install, smartRouting, mcpRouter, nameSeparator, enableSessionRebuild, oauthServer, auth, } = req.body;
|
|
986
|
+
const { routing, install, smartRouting, toolResultCompression, mcpRouter, nameSeparator, enableSessionRebuild, oauthServer, auth, } = req.body;
|
|
979
987
|
const hasRoutingUpdate = routing &&
|
|
980
988
|
(typeof routing.enableGlobalRoute === 'boolean' ||
|
|
981
989
|
typeof routing.enableGroupNameRoute === 'boolean' ||
|
|
@@ -1005,6 +1013,11 @@ export const updateSystemConfig = async (req, res) => {
|
|
|
1005
1013
|
typeof smartRouting.progressiveDisclosure === 'boolean' ||
|
|
1006
1014
|
typeof smartRouting.embeddingMaxTokens === 'number' ||
|
|
1007
1015
|
smartRouting.embeddingMaxTokens === null);
|
|
1016
|
+
const hasToolResultCompressionUpdate = toolResultCompression &&
|
|
1017
|
+
(typeof toolResultCompression.enabled === 'boolean' ||
|
|
1018
|
+
typeof toolResultCompression.minTokens === 'number' ||
|
|
1019
|
+
typeof toolResultCompression.maxOutputTokens === 'number' ||
|
|
1020
|
+
typeof toolResultCompression.strategy === 'string');
|
|
1008
1021
|
const hasMcpRouterUpdate = mcpRouter &&
|
|
1009
1022
|
(typeof mcpRouter.apiKey === 'string' ||
|
|
1010
1023
|
typeof mcpRouter.referer === 'string' ||
|
|
@@ -1042,6 +1055,7 @@ export const updateSystemConfig = async (req, res) => {
|
|
|
1042
1055
|
if (!hasRoutingUpdate &&
|
|
1043
1056
|
!hasInstallUpdate &&
|
|
1044
1057
|
!hasSmartRoutingUpdate &&
|
|
1058
|
+
!hasToolResultCompressionUpdate &&
|
|
1045
1059
|
!hasMcpRouterUpdate &&
|
|
1046
1060
|
!hasNameSeparatorUpdate &&
|
|
1047
1061
|
!hasSessionRebuildUpdate &&
|
|
@@ -1085,6 +1099,12 @@ export const updateSystemConfig = async (req, res) => {
|
|
|
1085
1099
|
azureOpenaiApiVersion: '',
|
|
1086
1100
|
azureOpenaiEmbeddingDeployment: '',
|
|
1087
1101
|
},
|
|
1102
|
+
toolResultCompression: {
|
|
1103
|
+
enabled: false,
|
|
1104
|
+
minTokens: 2000,
|
|
1105
|
+
maxOutputTokens: 1200,
|
|
1106
|
+
strategy: 'auto',
|
|
1107
|
+
},
|
|
1088
1108
|
mcpRouter: {
|
|
1089
1109
|
apiKey: '',
|
|
1090
1110
|
referer: 'https://www.mcphub.app',
|
|
@@ -1130,6 +1150,14 @@ export const updateSystemConfig = async (req, res) => {
|
|
|
1130
1150
|
azureOpenaiEmbeddingDeployment: '',
|
|
1131
1151
|
};
|
|
1132
1152
|
}
|
|
1153
|
+
if (!systemConfig.toolResultCompression) {
|
|
1154
|
+
systemConfig.toolResultCompression = {
|
|
1155
|
+
enabled: false,
|
|
1156
|
+
minTokens: 2000,
|
|
1157
|
+
maxOutputTokens: 1200,
|
|
1158
|
+
strategy: 'auto',
|
|
1159
|
+
};
|
|
1160
|
+
}
|
|
1133
1161
|
if (!systemConfig.mcpRouter) {
|
|
1134
1162
|
systemConfig.mcpRouter = {
|
|
1135
1163
|
apiKey: '',
|
|
@@ -1347,6 +1375,28 @@ export const updateSystemConfig = async (req, res) => {
|
|
|
1347
1375
|
systemConfig.mcpRouter.baseUrl = mcpRouter.baseUrl;
|
|
1348
1376
|
}
|
|
1349
1377
|
}
|
|
1378
|
+
if (toolResultCompression) {
|
|
1379
|
+
const target = systemConfig.toolResultCompression;
|
|
1380
|
+
if (typeof toolResultCompression.enabled === 'boolean') {
|
|
1381
|
+
target.enabled = toolResultCompression.enabled;
|
|
1382
|
+
}
|
|
1383
|
+
if (typeof toolResultCompression.minTokens === 'number' &&
|
|
1384
|
+
Number.isFinite(toolResultCompression.minTokens) &&
|
|
1385
|
+
toolResultCompression.minTokens > 0) {
|
|
1386
|
+
target.minTokens = Math.floor(toolResultCompression.minTokens);
|
|
1387
|
+
}
|
|
1388
|
+
if (typeof toolResultCompression.maxOutputTokens === 'number' &&
|
|
1389
|
+
Number.isFinite(toolResultCompression.maxOutputTokens) &&
|
|
1390
|
+
toolResultCompression.maxOutputTokens > 0) {
|
|
1391
|
+
target.maxOutputTokens = Math.floor(toolResultCompression.maxOutputTokens);
|
|
1392
|
+
}
|
|
1393
|
+
if (typeof toolResultCompression.strategy === 'string') {
|
|
1394
|
+
const normalized = toolResultCompression.strategy.trim().toLowerCase();
|
|
1395
|
+
target.strategy = ['auto', 'json', 'log', 'search', 'diff', 'text'].includes(normalized)
|
|
1396
|
+
? normalized
|
|
1397
|
+
: 'auto';
|
|
1398
|
+
}
|
|
1399
|
+
}
|
|
1350
1400
|
if (oauthServer) {
|
|
1351
1401
|
const target = systemConfig.oauthServer;
|
|
1352
1402
|
if (typeof oauthServer.enabled === 'boolean') {
|