repoburg 1.3.319 → 1.3.320
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/agent-pane/backend/dist/index.js +156 -100
- package/agent-pane/backend/dist/server.js +156 -100
- package/backend/dist/src/agent-runtime/agent-runtime-event-emitter.d.ts +2 -1
- package/backend/dist/src/agent-runtime/agent-runtime-event-emitter.js +10 -0
- package/backend/dist/src/agent-runtime/agent-runtime-event-emitter.js.map +1 -1
- package/backend/dist/src/agent-runtime/agent-runtime.types.d.ts +12 -1
- package/backend/dist/src/ai-actions/ai-action-batch.service.js +6 -3
- package/backend/dist/src/ai-actions/ai-action-batch.service.js.map +1 -1
- package/backend/dist/src/app.module.js +2 -9
- package/backend/dist/src/app.module.js.map +1 -1
- package/backend/dist/src/application-state/application-state.service.d.ts +3 -4
- package/backend/dist/src/application-state/application-state.service.js +21 -25
- package/backend/dist/src/application-state/application-state.service.js.map +1 -1
- package/backend/dist/src/context-generation/context-generation.service.js +3 -0
- package/backend/dist/src/context-generation/context-generation.service.js.map +1 -1
- package/backend/dist/src/context-generation/project-guidance.d.ts +12 -0
- package/backend/dist/src/context-generation/project-guidance.js +103 -0
- package/backend/dist/src/context-generation/project-guidance.js.map +1 -0
- package/backend/dist/src/core-entities/mcp-config.entity.d.ts +3 -1
- package/backend/dist/src/core-entities/mcp-config.entity.js +17 -1
- package/backend/dist/src/core-entities/mcp-config.entity.js.map +1 -1
- package/backend/dist/src/global-config/dto/update-global-config.dto.d.ts +2 -0
- package/backend/dist/src/global-config/dto/update-global-config.dto.js +12 -0
- package/backend/dist/src/global-config/dto/update-global-config.dto.js.map +1 -1
- package/backend/dist/src/global-config/global-config.service.d.ts +2 -0
- package/backend/dist/src/global-config/global-config.service.js.map +1 -1
- package/backend/dist/src/interactive-chat/auto-compact.service.d.ts +34 -0
- package/backend/dist/src/interactive-chat/auto-compact.service.js +259 -0
- package/backend/dist/src/interactive-chat/auto-compact.service.js.map +1 -0
- package/backend/dist/src/interactive-chat/chat.module.js +2 -5
- package/backend/dist/src/interactive-chat/chat.module.js.map +1 -1
- package/backend/dist/src/interactive-chat/chat.service.d.ts +12 -4
- package/backend/dist/src/interactive-chat/chat.service.js +102 -39
- package/backend/dist/src/interactive-chat/chat.service.js.map +1 -1
- package/backend/dist/src/llm-orchestration/action-handlers/execute-code.handler.d.ts +1 -1
- package/backend/dist/src/llm-orchestration/action-handlers/execute-code.handler.js +8 -2
- package/backend/dist/src/llm-orchestration/action-handlers/execute-code.handler.js.map +1 -1
- package/backend/dist/src/llm-orchestration/action-handlers/mcp-tool-action.handler.d.ts +5 -2
- package/backend/dist/src/llm-orchestration/action-handlers/mcp-tool-action.handler.js +50 -17
- package/backend/dist/src/llm-orchestration/action-handlers/mcp-tool-action.handler.js.map +1 -1
- package/backend/dist/src/llm-orchestration/action-handlers/run-command.handler.js +9 -1
- package/backend/dist/src/llm-orchestration/action-handlers/run-command.handler.js.map +1 -1
- package/backend/dist/src/llm-orchestration/hooks/follow-up-post-execution.hook.js +8 -0
- package/backend/dist/src/llm-orchestration/hooks/follow-up-post-execution.hook.js.map +1 -1
- package/backend/dist/src/llm-orchestration/hooks/yolo-mode-post-execution.hook.js +2 -1
- package/backend/dist/src/llm-orchestration/hooks/yolo-mode-post-execution.hook.js.map +1 -1
- package/backend/dist/src/llm-orchestration/llm-orchestration.interfaces.d.ts +2 -0
- package/backend/dist/src/llm-orchestration/llm-orchestration.interfaces.js.map +1 -1
- package/backend/dist/src/llm-orchestration/llm-orchestration.module.js +0 -2
- package/backend/dist/src/llm-orchestration/llm-orchestration.module.js.map +1 -1
- package/backend/dist/src/llm-orchestration/llm-turn-processor.service.d.ts +8 -1
- package/backend/dist/src/llm-orchestration/llm-turn-processor.service.js +237 -194
- package/backend/dist/src/llm-orchestration/llm-turn-processor.service.js.map +1 -1
- package/backend/dist/src/llm-orchestration/turn-execution-plan.d.ts +18 -0
- package/backend/dist/src/llm-orchestration/turn-execution-plan.js +53 -0
- package/backend/dist/src/llm-orchestration/turn-execution-plan.js.map +1 -0
- package/backend/dist/src/llm-provider/ollama-llm.provider.d.ts +1 -0
- package/backend/dist/src/llm-provider/ollama-llm.provider.js +21 -5
- package/backend/dist/src/llm-provider/ollama-llm.provider.js.map +1 -1
- package/backend/dist/src/llm-provider/openrouter-llm.provider.d.ts +3 -0
- package/backend/dist/src/llm-provider/openrouter-llm.provider.js +8 -0
- package/backend/dist/src/llm-provider/openrouter-llm.provider.js.map +1 -1
- package/backend/dist/src/llm-responses/llm-responses.module.js +0 -4
- package/backend/dist/src/llm-responses/llm-responses.module.js.map +1 -1
- package/backend/dist/src/llm-responses/llm-responses.service.d.ts +12 -4
- package/backend/dist/src/llm-responses/llm-responses.service.js +4 -45
- package/backend/dist/src/llm-responses/llm-responses.service.js.map +1 -1
- package/backend/dist/src/main.js +4 -0
- package/backend/dist/src/main.js.map +1 -1
- package/backend/dist/src/mcp/marketplace/dto/initiate-connect.dto.d.ts +3 -1
- package/backend/dist/src/mcp/marketplace/dto/initiate-connect.dto.js +19 -0
- package/backend/dist/src/mcp/marketplace/dto/initiate-connect.dto.js.map +1 -1
- package/backend/dist/src/mcp/marketplace/marketplace.controller.js +7 -0
- package/backend/dist/src/mcp/marketplace/marketplace.controller.js.map +1 -1
- package/backend/dist/src/mcp/marketplace/marketplace.service.d.ts +9 -0
- package/backend/dist/src/mcp/marketplace/marketplace.service.js +68 -13
- package/backend/dist/src/mcp/marketplace/marketplace.service.js.map +1 -1
- package/backend/dist/src/mcp/marketplace/oauth-provider.d.ts +3 -0
- package/backend/dist/src/mcp/marketplace/oauth-provider.js.map +1 -1
- package/backend/dist/src/mcp/mcp-result.d.ts +12 -0
- package/backend/dist/src/mcp/mcp-result.js +125 -0
- package/backend/dist/src/mcp/mcp-result.js.map +1 -0
- package/backend/dist/src/mcp/mcp.service.d.ts +33 -1
- package/backend/dist/src/mcp/mcp.service.js +364 -79
- package/backend/dist/src/mcp/mcp.service.js.map +1 -1
- package/backend/dist/src/metadata-store/schemas/metadata-schemas.d.ts +3 -1
- package/backend/dist/src/metadata-store/schemas/metadata-schemas.js +11 -1
- package/backend/dist/src/metadata-store/schemas/metadata-schemas.js.map +1 -1
- package/backend/dist/src/seeding/data/shared/project-guidance-section.d.ts +1 -0
- package/backend/dist/src/seeding/data/shared/project-guidance-section.js +22 -0
- package/backend/dist/src/seeding/data/shared/project-guidance-section.js.map +1 -0
- package/backend/dist/src/seeding/data/system-prompts/default_native_tool_agent.d.ts +1 -1
- package/backend/dist/src/seeding/data/system-prompts/default_native_tool_agent.js +10 -38
- package/backend/dist/src/seeding/data/system-prompts/default_native_tool_agent.js.map +1 -1
- package/backend/dist/src/seeding/data/system-prompts/explore-codebase-agent.d.ts +1 -1
- package/backend/dist/src/seeding/data/system-prompts/explore-codebase-agent.js +3 -1
- package/backend/dist/src/seeding/data/system-prompts/explore-codebase-agent.js.map +1 -1
- package/backend/dist/src/seeding/data/system-prompts/general-purpose-agent.d.ts +1 -1
- package/backend/dist/src/seeding/data/system-prompts/general-purpose-agent.js +3 -1
- package/backend/dist/src/seeding/data/system-prompts/general-purpose-agent.js.map +1 -1
- package/backend/dist/src/session-cancellation/session-cancellation.module.d.ts +2 -0
- package/backend/dist/src/{message-bus/message-bus.module.js → session-cancellation/session-cancellation.module.js} +10 -11
- package/backend/dist/src/session-cancellation/session-cancellation.module.js.map +1 -0
- package/backend/dist/src/session-cancellation/session-cancellation.service.d.ts +13 -0
- package/backend/dist/src/session-cancellation/session-cancellation.service.js +75 -0
- package/backend/dist/src/session-cancellation/session-cancellation.service.js.map +1 -0
- package/backend/dist/src/session-inputs/session-inputs.service.js +3 -1
- package/backend/dist/src/session-inputs/session-inputs.service.js.map +1 -1
- package/backend/dist/src/sessions/sessions.module.js +0 -2
- package/backend/dist/src/sessions/sessions.module.js.map +1 -1
- package/backend/dist/src/sessions/sessions.service.d.ts +1 -3
- package/backend/dist/src/sessions/sessions.service.js +1 -5
- package/backend/dist/src/sessions/sessions.service.js.map +1 -1
- package/backend/dist/src/tool-hooks/hook-runtime.d.ts +1 -1
- package/backend/dist/src/tool-hooks/hook-runtime.js +17 -16
- package/backend/dist/src/tool-hooks/hook-runtime.js.map +1 -1
- package/backend/dist/src/utils/spawn-with-kill.d.ts +2 -0
- package/backend/dist/src/utils/spawn-with-kill.js +18 -3
- package/backend/dist/src/utils/spawn-with-kill.js.map +1 -1
- package/backend/dist/tsconfig.build.tsbuildinfo +1 -1
- package/daemon/dist/index.js +1 -17
- package/package.json +2 -8
- package/platform-cli.js +0 -316
- package/tabtape/extension/dist/build-info.json +3 -3
- package/tabtape/extension/dist/manifest.json +1 -1
- package/tabtape/ui/dist/build-info.json +3 -3
- package/backend/dist/src/llm-responses/dto/submit-llm-response.dto.d.ts +0 -9
- package/backend/dist/src/llm-responses/dto/submit-llm-response.dto.js +0 -80
- package/backend/dist/src/llm-responses/dto/submit-llm-response.dto.js.map +0 -1
- package/backend/dist/src/llm-responses/llm-responses.controller.d.ts +0 -8
- package/backend/dist/src/llm-responses/llm-responses.controller.js +0 -51
- package/backend/dist/src/llm-responses/llm-responses.controller.js.map +0 -1
- package/backend/dist/src/mcp-server/mcp-internal.controller.d.ts +0 -12
- package/backend/dist/src/mcp-server/mcp-internal.controller.js +0 -50
- package/backend/dist/src/mcp-server/mcp-internal.controller.js.map +0 -1
- package/backend/dist/src/mcp-server/mcp-server.bootstrap.d.ts +0 -2
- package/backend/dist/src/mcp-server/mcp-server.bootstrap.js +0 -166
- package/backend/dist/src/mcp-server/mcp-server.bootstrap.js.map +0 -1
- package/backend/dist/src/mcp-server/mcp-server.constants.d.ts +0 -8
- package/backend/dist/src/mcp-server/mcp-server.constants.js +0 -12
- package/backend/dist/src/mcp-server/mcp-server.constants.js.map +0 -1
- package/backend/dist/src/mcp-server/mcp-server.controller.d.ts +0 -19
- package/backend/dist/src/mcp-server/mcp-server.controller.js +0 -72
- package/backend/dist/src/mcp-server/mcp-server.controller.js.map +0 -1
- package/backend/dist/src/mcp-server/mcp-server.module.d.ts +0 -2
- package/backend/dist/src/mcp-server/mcp-server.module.js +0 -29
- package/backend/dist/src/mcp-server/mcp-server.module.js.map +0 -1
- package/backend/dist/src/mcp-server/mcp-server.process.service.d.ts +0 -23
- package/backend/dist/src/mcp-server/mcp-server.process.service.js +0 -130
- package/backend/dist/src/mcp-server/mcp-server.process.service.js.map +0 -1
- package/backend/dist/src/mcp-server/mcp-server.service.d.ts +0 -34
- package/backend/dist/src/mcp-server/mcp-server.service.js +0 -260
- package/backend/dist/src/mcp-server/mcp-server.service.js.map +0 -1
- package/backend/dist/src/message-bus/dto/submit-message.dto.d.ts +0 -4
- package/backend/dist/src/message-bus/dto/submit-message.dto.js +0 -22
- package/backend/dist/src/message-bus/dto/submit-message.dto.js.map +0 -1
- package/backend/dist/src/message-bus/message-bus.controller.d.ts +0 -13
- package/backend/dist/src/message-bus/message-bus.controller.js +0 -50
- package/backend/dist/src/message-bus/message-bus.controller.js.map +0 -1
- package/backend/dist/src/message-bus/message-bus.module.d.ts +0 -2
- package/backend/dist/src/message-bus/message-bus.module.js.map +0 -1
- package/backend/dist/src/message-bus/message-bus.service.d.ts +0 -7
- package/backend/dist/src/message-bus/message-bus.service.js +0 -32
- package/backend/dist/src/message-bus/message-bus.service.js.map +0 -1
- package/backend/dist/src/visual-editor/visual-editor.controller.d.ts +0 -14
- package/backend/dist/src/visual-editor/visual-editor.controller.js +0 -101
- package/backend/dist/src/visual-editor/visual-editor.controller.js.map +0 -1
- package/backend/dist/src/visual-editor/visual-editor.dto.d.ts +0 -5
- package/backend/dist/src/visual-editor/visual-editor.dto.js +0 -32
- package/backend/dist/src/visual-editor/visual-editor.dto.js.map +0 -1
- package/backend/dist/src/visual-editor/visual-editor.module.d.ts +0 -2
- package/backend/dist/src/visual-editor/visual-editor.module.js +0 -24
- package/backend/dist/src/visual-editor/visual-editor.module.js.map +0 -1
- package/daemon/dist/mcp-gateway.js +0 -401
- package/daemon/dist/mcp-gateway.spec.js +0 -295
- package/visual-editor-proxy/client/dist/main.js +0 -89
- package/visual-editor-proxy/client/tsconfig.json +0 -14
- package/visual-editor-proxy/dist/client/src/inspector.d.ts +0 -9
- package/visual-editor-proxy/dist/client/src/inspector.js +0 -96
- package/visual-editor-proxy/dist/client/src/inspector.js.map +0 -1
- package/visual-editor-proxy/dist/client/src/main.d.ts +0 -6
- package/visual-editor-proxy/dist/client/src/main.js +0 -108
- package/visual-editor-proxy/dist/client/src/main.js.map +0 -1
- package/visual-editor-proxy/dist/client/src/ui.d.ts +0 -6
- package/visual-editor-proxy/dist/client/src/ui.js +0 -153
- package/visual-editor-proxy/dist/client/src/ui.js.map +0 -1
- package/visual-editor-proxy/dist/src/main.d.ts +0 -1
- package/visual-editor-proxy/dist/src/main.js +0 -61
- package/visual-editor-proxy/dist/src/main.js.map +0 -1
- package/visual-editor-proxy/dist/tsconfig.tsbuildinfo +0 -1
- package/visual-editor-proxy/package.json +0 -21
- package/visual-editor-proxy/tsconfig.json +0 -21
|
@@ -5,6 +5,8 @@ import { EventsGateway } from '../../events/events.gateway';
|
|
|
5
5
|
import { McpService } from '../mcp.service';
|
|
6
6
|
import { RemoteServerCatalogEntry } from './remote-servers.catalog';
|
|
7
7
|
import { DbBackedOAuthProvider } from './oauth-provider';
|
|
8
|
+
export declare function toServerName(name: string): string;
|
|
9
|
+
export declare function customEntry(name: string, serverUrl: string): RemoteServerCatalogEntry;
|
|
8
10
|
export declare class MarketplaceService {
|
|
9
11
|
private readonly mcpConfigsStore;
|
|
10
12
|
private readonly appService;
|
|
@@ -21,10 +23,17 @@ export declare class MarketplaceService {
|
|
|
21
23
|
}>;
|
|
22
24
|
initiateConnect(marketplaceId: string, opts?: {
|
|
23
25
|
allowExistingConfig?: boolean;
|
|
26
|
+
entry?: RemoteServerCatalogEntry;
|
|
27
|
+
serverName?: string;
|
|
24
28
|
}): Promise<{
|
|
25
29
|
authUrl: string;
|
|
26
30
|
state: string;
|
|
27
31
|
}>;
|
|
32
|
+
connectByUrl(serverUrl: string, name?: string): Promise<{
|
|
33
|
+
authUrl: string;
|
|
34
|
+
state: string;
|
|
35
|
+
marketplaceId: string;
|
|
36
|
+
}>;
|
|
28
37
|
handleOAuthCallback(code: string, state: string): Promise<{
|
|
29
38
|
success: boolean;
|
|
30
39
|
serverName?: string;
|
|
@@ -14,6 +14,8 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
var MarketplaceService_1;
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
16
|
exports.MarketplaceService = void 0;
|
|
17
|
+
exports.toServerName = toServerName;
|
|
18
|
+
exports.customEntry = customEntry;
|
|
17
19
|
const common_1 = require("@nestjs/common");
|
|
18
20
|
const metadata_store_service_1 = require("../../metadata-store/metadata-store.service");
|
|
19
21
|
const metadata_store_tokens_1 = require("../../metadata-store/metadata-store.tokens");
|
|
@@ -24,6 +26,25 @@ const remote_servers_catalog_1 = require("./remote-servers.catalog");
|
|
|
24
26
|
const oauth_provider_1 = require("./oauth-provider");
|
|
25
27
|
const auth_js_1 = require("@modelcontextprotocol/sdk/client/auth.js");
|
|
26
28
|
const crypto_1 = require("crypto");
|
|
29
|
+
function toServerName(name) {
|
|
30
|
+
const slug = name
|
|
31
|
+
.toLowerCase()
|
|
32
|
+
.replace(/[^a-z0-9_-]+/g, '-')
|
|
33
|
+
.replace(/_{2,}/g, '_')
|
|
34
|
+
.replace(/^[-_]+|[-_]+$/g, '');
|
|
35
|
+
return slug || 'mcp-server';
|
|
36
|
+
}
|
|
37
|
+
function customEntry(name, serverUrl) {
|
|
38
|
+
return {
|
|
39
|
+
id: `custom:${toServerName(name)}`,
|
|
40
|
+
name,
|
|
41
|
+
description: `Remote MCP server at ${serverUrl}`,
|
|
42
|
+
serverUrl,
|
|
43
|
+
logoUrl: '',
|
|
44
|
+
category: 'Custom',
|
|
45
|
+
authType: 'oauth',
|
|
46
|
+
};
|
|
47
|
+
}
|
|
27
48
|
const mcpFetch = (input, init) => {
|
|
28
49
|
const headers = new Headers(init?.headers);
|
|
29
50
|
headers.set('Accept-Encoding', 'identity');
|
|
@@ -63,13 +84,15 @@ let MarketplaceService = MarketplaceService_1 = class MarketplaceService {
|
|
|
63
84
|
return { status: 'pending' };
|
|
64
85
|
}
|
|
65
86
|
async initiateConnect(marketplaceId, opts) {
|
|
66
|
-
const entry = (0, remote_servers_catalog_1.findCatalogEntry)(marketplaceId);
|
|
87
|
+
const entry = opts?.entry ?? (0, remote_servers_catalog_1.findCatalogEntry)(marketplaceId);
|
|
67
88
|
if (!entry) {
|
|
68
89
|
throw new common_1.NotFoundException(`Marketplace server "${marketplaceId}" not found.`);
|
|
69
90
|
}
|
|
70
|
-
const existing =
|
|
71
|
-
|
|
72
|
-
|
|
91
|
+
const existing = opts?.serverName
|
|
92
|
+
? await this.mcpConfigsStore.findOneBy({ server_name: opts.serverName })
|
|
93
|
+
: await this.mcpConfigsStore.findOneBy({
|
|
94
|
+
marketplace_id: marketplaceId,
|
|
95
|
+
});
|
|
73
96
|
if (existing && !opts?.allowExistingConfig) {
|
|
74
97
|
throw new common_1.BadRequestException(`Server "${entry.name}" is already connected.`);
|
|
75
98
|
}
|
|
@@ -79,6 +102,15 @@ let MarketplaceService = MarketplaceService_1 = class MarketplaceService {
|
|
|
79
102
|
const requiresAuth = await this.probeServerAuth(entry.serverUrl);
|
|
80
103
|
if (!requiresAuth) {
|
|
81
104
|
this.logger.log(`Server ${marketplaceId} does not require auth. Connecting directly.`);
|
|
105
|
+
if (existing && opts?.allowExistingConfig) {
|
|
106
|
+
await this.mcpService.disconnectFromServer(existing.server_name);
|
|
107
|
+
await this.mcpService.connectToServer(existing);
|
|
108
|
+
this.eventsGateway.sendToAll('mcp-marketplace-connected', {
|
|
109
|
+
marketplaceId,
|
|
110
|
+
serverName: existing.server_name,
|
|
111
|
+
});
|
|
112
|
+
return { authUrl: '', state: '' };
|
|
113
|
+
}
|
|
82
114
|
await this.finalizeDirectConnection(marketplaceId, entry);
|
|
83
115
|
return { authUrl: '', state: '' };
|
|
84
116
|
}
|
|
@@ -89,6 +121,8 @@ let MarketplaceService = MarketplaceService_1 = class MarketplaceService {
|
|
|
89
121
|
serverUrl: entry.serverUrl,
|
|
90
122
|
status: 'pending',
|
|
91
123
|
isReconnect: opts?.allowExistingConfig ?? false,
|
|
124
|
+
entry: opts?.entry,
|
|
125
|
+
serverName: opts?.serverName,
|
|
92
126
|
};
|
|
93
127
|
const provider = new oauth_provider_1.DbBackedOAuthProvider(redirectUrl, pendingState);
|
|
94
128
|
this.pendingAuths.set(state, pendingState);
|
|
@@ -113,6 +147,12 @@ let MarketplaceService = MarketplaceService_1 = class MarketplaceService {
|
|
|
113
147
|
throw new common_1.BadRequestException(`Failed to initiate OAuth: ${error.message}`);
|
|
114
148
|
}
|
|
115
149
|
}
|
|
150
|
+
async connectByUrl(serverUrl, name) {
|
|
151
|
+
const label = name?.trim() || new URL(serverUrl).hostname.split('.')[0];
|
|
152
|
+
const entry = customEntry(label, serverUrl);
|
|
153
|
+
const result = await this.initiateConnect(entry.id, { entry });
|
|
154
|
+
return { ...result, marketplaceId: entry.id };
|
|
155
|
+
}
|
|
116
156
|
async handleOAuthCallback(code, state) {
|
|
117
157
|
const pendingState = this.pendingAuths.get(state);
|
|
118
158
|
if (!pendingState) {
|
|
@@ -182,7 +222,7 @@ let MarketplaceService = MarketplaceService_1 = class MarketplaceService {
|
|
|
182
222
|
}
|
|
183
223
|
}
|
|
184
224
|
async finalizeDirectConnection(marketplaceId, entry) {
|
|
185
|
-
const serverName = entry.name
|
|
225
|
+
const serverName = toServerName(entry.name);
|
|
186
226
|
let finalServerName = serverName;
|
|
187
227
|
let counter = 1;
|
|
188
228
|
while (await this.mcpConfigsStore.findOneBy({ server_name: finalServerName })) {
|
|
@@ -196,7 +236,7 @@ let MarketplaceService = MarketplaceService_1 = class MarketplaceService {
|
|
|
196
236
|
refresh_token: null,
|
|
197
237
|
token_expires_at: null,
|
|
198
238
|
client_information: null,
|
|
199
|
-
logo_url: entry.logoUrl,
|
|
239
|
+
logo_url: entry.logoUrl || null,
|
|
200
240
|
category: entry.category,
|
|
201
241
|
marketplace_id: marketplaceId,
|
|
202
242
|
is_active: true,
|
|
@@ -210,15 +250,19 @@ let MarketplaceService = MarketplaceService_1 = class MarketplaceService {
|
|
|
210
250
|
this.logger.log(`Direct connection completed for ${marketplaceId}`);
|
|
211
251
|
}
|
|
212
252
|
async finalizeConnection(marketplaceId, pendingState) {
|
|
213
|
-
const entry = (0, remote_servers_catalog_1.findCatalogEntry)(marketplaceId);
|
|
253
|
+
const entry = pendingState.entry ?? (0, remote_servers_catalog_1.findCatalogEntry)(marketplaceId);
|
|
214
254
|
if (!entry) {
|
|
215
255
|
throw new Error(`Catalog entry not found for ${marketplaceId}`);
|
|
216
256
|
}
|
|
217
257
|
const tokens = pendingState.tokens;
|
|
218
258
|
if (pendingState.isReconnect) {
|
|
219
|
-
const existing =
|
|
220
|
-
|
|
221
|
-
|
|
259
|
+
const existing = pendingState.serverName
|
|
260
|
+
? await this.mcpConfigsStore.findOneBy({
|
|
261
|
+
server_name: pendingState.serverName,
|
|
262
|
+
})
|
|
263
|
+
: await this.mcpConfigsStore.findOneBy({
|
|
264
|
+
marketplace_id: marketplaceId,
|
|
265
|
+
});
|
|
222
266
|
if (existing) {
|
|
223
267
|
const updated = await this.mcpConfigsStore.update(existing.id, {
|
|
224
268
|
access_token: tokens.access_token,
|
|
@@ -241,7 +285,7 @@ let MarketplaceService = MarketplaceService_1 = class MarketplaceService {
|
|
|
241
285
|
return;
|
|
242
286
|
}
|
|
243
287
|
}
|
|
244
|
-
const serverName = entry.name
|
|
288
|
+
const serverName = toServerName(entry.name);
|
|
245
289
|
let finalServerName = serverName;
|
|
246
290
|
let counter = 1;
|
|
247
291
|
while (await this.mcpConfigsStore.findOneBy({ server_name: finalServerName })) {
|
|
@@ -257,7 +301,7 @@ let MarketplaceService = MarketplaceService_1 = class MarketplaceService {
|
|
|
257
301
|
? new Date(Date.now() + tokens.expires_in * 1000)
|
|
258
302
|
: null,
|
|
259
303
|
client_information: pendingState.clientInformation || null,
|
|
260
|
-
logo_url: entry.logoUrl,
|
|
304
|
+
logo_url: entry.logoUrl || null,
|
|
261
305
|
category: entry.category,
|
|
262
306
|
marketplace_id: marketplaceId,
|
|
263
307
|
is_active: true,
|
|
@@ -301,7 +345,18 @@ let MarketplaceService = MarketplaceService_1 = class MarketplaceService {
|
|
|
301
345
|
throw new common_1.NotFoundException(`MCP configuration for "${serverName}" not found.`);
|
|
302
346
|
}
|
|
303
347
|
if (!config.marketplace_id) {
|
|
304
|
-
|
|
348
|
+
if (!config.server_url ||
|
|
349
|
+
(config.transport_type !== 'streamable_http' &&
|
|
350
|
+
config.transport_type !== 'sse')) {
|
|
351
|
+
throw new common_1.BadRequestException(`Server "${serverName}" is not a remote server and cannot be authorized.`);
|
|
352
|
+
}
|
|
353
|
+
await this.mcpService.disconnectFromServer(serverName);
|
|
354
|
+
this.logger.log(`Authorizing "${serverName}" (${config.server_url}) with OAuth.`);
|
|
355
|
+
return this.initiateConnect(`custom:${serverName}`, {
|
|
356
|
+
allowExistingConfig: true,
|
|
357
|
+
entry: customEntry(serverName, config.server_url),
|
|
358
|
+
serverName,
|
|
359
|
+
});
|
|
305
360
|
}
|
|
306
361
|
await this.mcpService.disconnectFromServer(serverName);
|
|
307
362
|
this.logger.log(`Re-authorizing "${serverName}" (marketplace_id: ${config.marketplace_id}). Config kept until the flow completes.`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marketplace.service.js","sourceRoot":"","sources":["../../../../src/mcp/marketplace/marketplace.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"marketplace.service.js","sourceRoot":"","sources":["../../../../src/mcp/marketplace/marketplace.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AA+BA,oCAOC;AAGD,kCAaC;AAtDD,2CAMwB;AAExB,wFAA4E;AAC5E,sFAAmF;AACnF,mDAA+C;AAC/C,gEAA4D;AAC5D,gDAA4C;AAC5C,qEAIkC;AAClC,qDAA2E;AAE3E,sEAAgE;AAEhE,mCAAoC;AASpC,SAAgB,YAAY,CAAC,IAAY;IACvC,MAAM,IAAI,GAAG,IAAI;SACd,WAAW,EAAE;SACb,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC;SAC7B,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC;SACtB,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;IACjC,OAAO,IAAI,IAAI,YAAY,CAAC;AAC9B,CAAC;AAGD,SAAgB,WAAW,CACzB,IAAY,EACZ,SAAiB;IAEjB,OAAO;QACL,EAAE,EAAE,UAAU,YAAY,CAAC,IAAI,CAAC,EAAE;QAClC,IAAI;QACJ,WAAW,EAAE,wBAAwB,SAAS,EAAE;QAChD,SAAS;QACT,OAAO,EAAE,EAAE;QACX,QAAQ,EAAE,QAAQ;QAClB,QAAQ,EAAE,OAAO;KAClB,CAAC;AACJ,CAAC;AAED,MAAM,QAAQ,GAAiB,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;IAC7C,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC3C,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IAC3C,OAAO,KAAK,CAAC,KAAK,EAAE,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;AAC5C,CAAC,CAAC;AAgBK,IAAM,kBAAkB,0BAAxB,MAAM,kBAAkB;IAK7B,YAEE,eAA0D,EACzC,UAAsB,EACtB,aAA4B,EAC5B,UAAsB;QAHtB,oBAAe,GAAf,eAAe,CAA0B;QACzC,eAAU,GAAV,UAAU,CAAY;QACtB,kBAAa,GAAb,aAAa,CAAe;QAC5B,eAAU,GAAV,UAAU,CAAY;QATxB,WAAM,GAAG,IAAI,eAAM,CAAC,oBAAkB,CAAC,IAAI,CAAC,CAAC;QAE7C,iBAAY,GAAG,IAAI,GAAG,EAA4B,CAAC;IAQjE,CAAC;IAIJ,qBAAqB;QACnB,OAAO,+CAAsB,CAAC;IAChC,CAAC;IAED,oBAAoB,CAAC,EAAU;QAC7B,MAAM,KAAK,GAAG,IAAA,yCAAgB,EAAC,EAAE,CAAC,CAAC;QACnC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,0BAAiB,CAAC,uBAAuB,EAAE,cAAc,CAAC,CAAC;QACvE,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAMD,KAAK,CAAC,gBAAgB,CACpB,aAAqB;QAGrB,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC;YACjD,IAAI,OAAO,CAAC,aAAa,KAAK,aAAa,EAAE,CAAC;gBAC5C,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC;YAC1D,CAAC;QACH,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC;YAClD,cAAc,EAAE,aAAa;SAC9B,CAAC,CAAC;QACH,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;QACjC,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;IAC/B,CAAC;IAQD,KAAK,CAAC,eAAe,CACnB,aAAqB,EACrB,IAMC;QAKD,MAAM,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,IAAA,yCAAgB,EAAC,aAAa,CAAC,CAAC;QAC7D,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,0BAAiB,CACzB,uBAAuB,aAAa,cAAc,CACnD,CAAC;QACJ,CAAC;QAGD,MAAM,QAAQ,GAAG,IAAI,EAAE,UAAU;YAC/B,CAAC,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC;YACxE,CAAC,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC;gBACnC,cAAc,EAAE,aAAa;aAC9B,CAAC,CAAC;QACP,IAAI,QAAQ,IAAI,CAAC,IAAI,EAAE,mBAAmB,EAAE,CAAC;YAC3C,MAAM,IAAI,4BAAmB,CAC3B,WAAW,KAAK,CAAC,IAAI,yBAAyB,CAC/C,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;QACvC,MAAM,WAAW,GAAG,oBAAoB,IAAI,qBAAqB,CAAC;QAElE,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,6BAA6B,aAAa,KAAK,KAAK,CAAC,SAAS,GAAG,CAClE,CAAC;QAQF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAEjE,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,UAAU,aAAa,8CAA8C,CACtE,CAAC;YACF,IAAI,QAAQ,IAAI,IAAI,EAAE,mBAAmB,EAAE,CAAC;gBAE1C,MAAM,IAAI,CAAC,UAAU,CAAC,oBAAoB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;gBACjE,MAAM,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;gBAChD,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,2BAA2B,EAAE;oBACxD,aAAa;oBACb,UAAU,EAAE,QAAQ,CAAC,WAAW;iBACjC,CAAC,CAAC;gBACH,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;YACpC,CAAC;YACD,MAAM,IAAI,CAAC,wBAAwB,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;YAC1D,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;QACpC,CAAC;QAGD,MAAM,KAAK,GAAG,IAAA,mBAAU,GAAE,CAAC;QAC3B,MAAM,YAAY,GAAqB;YACrC,aAAa;YACb,UAAU,EAAE,KAAK;YACjB,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,MAAM,EAAE,SAAS;YACjB,WAAW,EAAE,IAAI,EAAE,mBAAmB,IAAI,KAAK;YAC/C,KAAK,EAAE,IAAI,EAAE,KAAK;YAClB,UAAU,EAAE,IAAI,EAAE,UAAU;SAC7B,CAAC;QAEF,MAAM,QAAQ,GAAG,IAAI,sCAAqB,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;QAEtE,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;QAE3C,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAA,cAAI,EAAC,QAAQ,EAAE;gBAClC,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,OAAO,EAAE,QAAQ;aAClB,CAAC,CAAC;YAEH,IAAI,MAAM,KAAK,YAAY,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;gBAEnD,MAAM,IAAI,CAAC,kBAAkB,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;gBAC3D,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC;YAChC,CAAC;YAED,IAAI,MAAM,KAAK,UAAU,IAAI,YAAY,CAAC,OAAO,EAAE,CAAC;gBAClD,OAAO,EAAE,OAAO,EAAE,YAAY,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC;YAClD,CAAC;YAED,MAAM,IAAI,KAAK,CACb,oFAAoF,CACrF,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,oCAAoC,aAAa,KAAK,KAAK,CAAC,OAAO,EAAE,CACtE,CAAC;YACF,YAAY,CAAC,MAAM,GAAG,OAAO,CAAC;YAC9B,YAAY,CAAC,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC;YACnC,MAAM,IAAI,4BAAmB,CAC3B,6BAA6B,KAAK,CAAC,OAAO,EAAE,CAC7C,CAAC;QACJ,CAAC;IACH,CAAC;IAMD,KAAK,CAAC,YAAY,CAChB,SAAiB,EACjB,IAAa;QAEb,MAAM,KAAK,GAAG,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACxE,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC5C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QAC/D,OAAO,EAAE,GAAG,MAAM,EAAE,aAAa,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;IAChD,CAAC;IAMD,KAAK,CAAC,mBAAmB,CACvB,IAAY,EACZ,KAAa;QAEb,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAClD,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+CAA+C,KAAK,EAAE,CAAC,CAAC;YACzE,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,qDAAqD;aAC7D,CAAC;QACJ,CAAC;QAED,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,YAAY,CAAC;QAClD,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,iCAAiC,aAAa,WAAW,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CACrF,CAAC;QAEF,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;QACvC,MAAM,WAAW,GAAG,oBAAoB,IAAI,qBAAqB,CAAC;QAClE,MAAM,QAAQ,GAAG,IAAI,sCAAqB,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;QAEtE,IAAI,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,IAAA,cAAI,EAAC,QAAQ,EAAE;gBAClC,SAAS;gBACT,iBAAiB,EAAE,IAAI;gBACvB,OAAO,EAAE,QAAQ;aAClB,CAAC,CAAC;YAEH,IAAI,MAAM,KAAK,YAAY,EAAE,CAAC;gBAC5B,MAAM,IAAI,KAAK,CACb,qFAAqF,CACtF,CAAC;YACJ,CAAC;YAED,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;gBACzB,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;YAC7D,CAAC;YAED,MAAM,IAAI,CAAC,kBAAkB,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;YAC3D,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC;QACtD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,6BAA6B,aAAa,KAAK,KAAK,CAAC,OAAO,EAAE,CAC/D,CAAC;YACF,YAAY,CAAC,MAAM,GAAG,OAAO,CAAC;YAC9B,YAAY,CAAC,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC;YACnC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;YAE3C,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,uBAAuB,EAAE;gBACpD,aAAa;gBACb,KAAK,EAAE,KAAK,CAAC,OAAO;aACrB,CAAC,CAAC;YAEH,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;QAClD,CAAC;IACH,CAAC;IAOO,KAAK,CAAC,eAAe,CAAC,SAAiB;QAC7C,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,SAAS,EAAE;gBAClC,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;oBAClC,MAAM,EAAE,qCAAqC;iBAC9C;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oBACnB,OAAO,EAAE,KAAK;oBACd,EAAE,EAAE,CAAC;oBACL,MAAM,EAAE,YAAY;oBACpB,MAAM,EAAE;wBACN,eAAe,EAAE,YAAY;wBAC7B,YAAY,EAAE,EAAE;wBAChB,UAAU,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,OAAO,EAAE;qBACzD;iBACF,CAAC;aACH,CAAC,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,kBAAkB,SAAS,YAAY,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;YACtE,OAAO,IAAI,CAAC,MAAM,KAAK,GAAG,CAAC;QAC7B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,yBAAyB,SAAS,KAAK,CAAC,CAAC,OAAO,2BAA2B,CAC5E,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAOO,KAAK,CAAC,wBAAwB,CACpC,aAAqB,EACrB,KAA+B;QAE/B,MAAM,UAAU,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAE5C,IAAI,eAAe,GAAG,UAAU,CAAC;QACjC,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,OACE,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,eAAe,EAAE,CAAC,EACtE,CAAC;YACD,eAAe,GAAG,GAAG,UAAU,IAAI,OAAO,EAAE,EAAE,CAAC;QACjD,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC;YACpD,WAAW,EAAE,eAAe;YAC5B,cAAc,EAAE,iBAAiB;YACjC,UAAU,EAAE,KAAK,CAAC,SAAS;YAC3B,YAAY,EAAE,IAAI;YAClB,aAAa,EAAE,IAAI;YACnB,gBAAgB,EAAE,IAAI;YACtB,kBAAkB,EAAE,IAAI;YACxB,QAAQ,EAAE,KAAK,CAAC,OAAO,IAAI,IAAI;YAC/B,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,cAAc,EAAE,aAAa;YAC7B,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,iCAAiC,aAAa,QAAQ,eAAe,GAAG,CACzE,CAAC;QAEF,MAAM,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QAEnD,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,2BAA2B,EAAE;YACxD,aAAa;YACb,UAAU,EAAE,eAAe;SAC5B,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,mCAAmC,aAAa,EAAE,CAAC,CAAC;IACtE,CAAC;IAMO,KAAK,CAAC,kBAAkB,CAC9B,aAAqB,EACrB,YAA8B;QAE9B,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,IAAI,IAAA,yCAAgB,EAAC,aAAa,CAAC,CAAC;QACpE,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,+BAA+B,aAAa,EAAE,CAAC,CAAC;QAClE,CAAC;QAED,MAAM,MAAM,GAAG,YAAY,CAAC,MAAO,CAAC;QAIpC,IAAI,YAAY,CAAC,WAAW,EAAE,CAAC;YAC7B,MAAM,QAAQ,GAAG,YAAY,CAAC,UAAU;gBACtC,CAAC,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC;oBACnC,WAAW,EAAE,YAAY,CAAC,UAAU;iBACrC,CAAC;gBACJ,CAAC,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC;oBACnC,cAAc,EAAE,aAAa;iBAC9B,CAAC,CAAC;YACP,IAAI,QAAQ,EAAE,CAAC;gBACb,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE;oBAC7D,YAAY,EAAE,MAAM,CAAC,YAAY;oBACjC,aAAa,EAAE,MAAM,CAAC,aAAa,IAAI,IAAI;oBAC3C,gBAAgB,EAAE,MAAM,CAAC,UAAU;wBACjC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;wBACjD,CAAC,CAAC,IAAI;oBACR,kBAAkB,EAAE,YAAY,CAAC,iBAAiB,IAAI,IAAI;oBAC1D,SAAS,EAAE,IAAI;iBAChB,CAAC,CAAC;gBACH,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,yBAAyB,aAAa,MAAM,QAAQ,CAAC,WAAW,qBAAqB,CACtF,CAAC;gBAEF,MAAM,IAAI,CAAC,UAAU,CAAC,oBAAoB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;gBACjE,MAAM,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;gBAE/C,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,2BAA2B,EAAE;oBACxD,aAAa;oBACb,UAAU,EAAE,QAAQ,CAAC,WAAW;iBACjC,CAAC,CAAC;gBAEH,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;gBAClD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,kCAAkC,aAAa,EAAE,CAAC,CAAC;gBACnE,OAAO;YACT,CAAC;QAEH,CAAC;QAED,MAAM,UAAU,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAG5C,IAAI,eAAe,GAAG,UAAU,CAAC;QACjC,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,OACE,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,eAAe,EAAE,CAAC,EACtE,CAAC;YACD,eAAe,GAAG,GAAG,UAAU,IAAI,OAAO,EAAE,EAAE,CAAC;QACjD,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC;YACpD,WAAW,EAAE,eAAe;YAC5B,cAAc,EAAE,iBAAiB;YACjC,UAAU,EAAE,KAAK,CAAC,SAAS;YAC3B,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,aAAa,EAAE,MAAM,CAAC,aAAa,IAAI,IAAI;YAC3C,gBAAgB,EAAE,MAAM,CAAC,UAAU;gBACjC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;gBACjD,CAAC,CAAC,IAAI;YACR,kBAAkB,EAAE,YAAY,CAAC,iBAAiB,IAAI,IAAI;YAC1D,QAAQ,EAAE,KAAK,CAAC,OAAO,IAAI,IAAI;YAC/B,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,cAAc,EAAE,aAAa;YAC7B,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,uBAAuB,aAAa,QAAQ,eAAe,GAAG,CAC/D,CAAC;QAGF,MAAM,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QAGnD,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,2BAA2B,EAAE;YACxD,aAAa;YACb,UAAU,EAAE,eAAe;SAC5B,CAAC,CAAC;QAGH,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAClD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,4BAA4B,aAAa,EAAE,CAAC,CAAC;IAC/D,CAAC;IAMD,uBAAuB,CAAC,MAAiB;QACvC,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;QACvC,MAAM,WAAW,GAAG,oBAAoB,IAAI,qBAAqB,CAAC;QAElE,MAAM,YAAY,GAAqB;YACrC,aAAa,EAAE,MAAM,CAAC,cAAc,IAAI,MAAM,CAAC,WAAW;YAC1D,UAAU,EAAE,EAAE;YACd,SAAS,EAAE,MAAM,CAAC,UAAU,IAAI,EAAE;YAClC,iBAAiB,EAAE,MAAM,CAAC,kBACe;YACzC,MAAM,EAAE,MAAM,CAAC,YAAY;gBACzB,CAAC,CAAC;oBACE,YAAY,EAAE,MAAM,CAAC,YAAY;oBACjC,UAAU,EAAE,QAAQ;oBACpB,aAAa,EAAE,MAAM,CAAC,aAAa,IAAI,SAAS;oBAChD,UAAU,EAAE,MAAM,CAAC,gBAAgB;wBACjC,CAAC,CAAC,IAAI,CAAC,KAAK,CACR,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,IAAI,CACxD;wBACH,CAAC,CAAC,SAAS;iBACd;gBACH,CAAC,CAAC,SAAS;YACb,MAAM,EAAE,SAAS;SAClB,CAAC;QAEF,OAAO,IAAI,sCAAqB,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IAC9D,CAAC;IASD,KAAK,CAAC,qBAAqB,CAAC,UAAkB;QAI5C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC;YAClD,WAAW,EAAE,UAAU;SACxB,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,0BAAiB,CACzB,0BAA0B,UAAU,cAAc,CACnD,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;YAC3B,IACE,CAAC,MAAM,CAAC,UAAU;gBAClB,CAAC,MAAM,CAAC,cAAc,KAAK,iBAAiB;oBAC1C,MAAM,CAAC,cAAc,KAAK,KAAK,CAAC,EAClC,CAAC;gBACD,MAAM,IAAI,4BAAmB,CAC3B,WAAW,UAAU,oDAAoD,CAC1E,CAAC;YACJ,CAAC;YAED,MAAM,IAAI,CAAC,UAAU,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;YACvD,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,gBAAgB,UAAU,MAAM,MAAM,CAAC,UAAU,eAAe,CACjE,CAAC;YACF,OAAO,IAAI,CAAC,eAAe,CAAC,UAAU,UAAU,EAAE,EAAE;gBAClD,mBAAmB,EAAE,IAAI;gBACzB,KAAK,EAAE,WAAW,CAAC,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC;gBACjD,UAAU;aACX,CAAC,CAAC;QACL,CAAC;QAGD,MAAM,IAAI,CAAC,UAAU,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;QAEvD,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,mBAAmB,UAAU,sBAAsB,MAAM,CAAC,cAAc,0CAA0C,CACnH,CAAC;QAEF,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,cAAc,EAAE;YACjD,mBAAmB,EAAE,IAAI;SAC1B,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AA3fY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;IAOR,WAAA,IAAA,eAAM,EAAC,IAAA,6CAAqB,EAAC,aAAa,CAAC,CAAC,CAAA;qCACX,sCAAa;QAClB,wBAAU;QACP,8BAAa;QAChB,wBAAU;GAV9B,kBAAkB,CA2f9B"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { RemoteServerCatalogEntry } from './remote-servers.catalog';
|
|
1
2
|
import type { OAuthClientProvider } from '@modelcontextprotocol/sdk/client/auth.js';
|
|
2
3
|
import type { OAuthClientMetadata, OAuthClientInformationMixed, OAuthTokens } from '@modelcontextprotocol/sdk/shared/auth.js';
|
|
3
4
|
export interface PendingAuthState {
|
|
@@ -11,6 +12,8 @@ export interface PendingAuthState {
|
|
|
11
12
|
status: 'pending' | 'connected' | 'error';
|
|
12
13
|
error?: string;
|
|
13
14
|
isReconnect?: boolean;
|
|
15
|
+
entry?: RemoteServerCatalogEntry;
|
|
16
|
+
serverName?: string;
|
|
14
17
|
}
|
|
15
18
|
export declare class DbBackedOAuthProvider implements OAuthClientProvider {
|
|
16
19
|
private readonly redirectUrlValue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-provider.js","sourceRoot":"","sources":["../../../../src/mcp/marketplace/oauth-provider.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;
|
|
1
|
+
{"version":3,"file":"oauth-provider.js","sourceRoot":"","sources":["../../../../src/mcp/marketplace/oauth-provider.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AAoDxC,MAAa,qBAAqB;IAGhC,YACmB,gBAAwB,EACxB,YAA8B;QAD9B,qBAAgB,GAAhB,gBAAgB,CAAQ;QACxB,iBAAY,GAAZ,YAAY,CAAkB;QAJhC,WAAM,GAAG,IAAI,eAAM,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;IAK9D,CAAC;IAEJ,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAED,IAAI,cAAc;QAChB,OAAO;YACL,WAAW,EAAE,qBAAqB;YAClC,aAAa,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC;YACtC,WAAW,EAAE,CAAC,oBAAoB,EAAE,eAAe,CAAC;YACpD,cAAc,EAAE,CAAC,MAAM,CAAC;YACxB,0BAA0B,EAAE,oBAAoB;SACjD,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,KAAK;QACT,OAAO,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC;IACtC,CAAC;IAED,iBAAiB;QACf,OAAO,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,qBAAqB,CACzB,iBAA8C;QAE9C,IAAI,CAAC,YAAY,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QACxD,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,sCAAsC,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,CACxE,CAAC;IACJ,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,MAAmB;QAClC,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,MAAM,CAAC;QAClC,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,0BAA0B,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,CAC5D,CAAC;IACJ,CAAC;IAOD,KAAK,CAAC,uBAAuB,CAAC,gBAAqB;QACjD,IAAI,CAAC,YAAY,CAAC,OAAO,GAAG,gBAAgB,CAAC,QAAQ,EAAE,CAAC;QACxD,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,kCAAkC,IAAI,CAAC,YAAY,CAAC,aAAa,KAAK,gBAAgB,CAAC,QAAQ,EAAE,EAAE,CACpG,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,YAAoB;QACzC,IAAI,CAAC,YAAY,CAAC,YAAY,GAAG,YAAY,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACjE,CAAC;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC;IACxC,CAAC;CACF;AAxED,sDAwEC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
export interface McpToolOutcome {
|
|
2
|
+
text: string;
|
|
3
|
+
isError: boolean;
|
|
4
|
+
}
|
|
5
|
+
export interface FormatOptions {
|
|
6
|
+
outputDir: string;
|
|
7
|
+
projectRoot: string;
|
|
8
|
+
label: string;
|
|
9
|
+
}
|
|
10
|
+
export declare function formatMcpToolResult(result: any, opts: FormatOptions): Promise<McpToolOutcome>;
|
|
11
|
+
export declare function expandEnvVars(value: string, env?: NodeJS.ProcessEnv): string;
|
|
12
|
+
export declare function expandEnvRecord(record: Record<string, string> | null | undefined, env?: NodeJS.ProcessEnv): Record<string, string>;
|
|
@@ -0,0 +1,125 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.formatMcpToolResult = formatMcpToolResult;
|
|
4
|
+
exports.expandEnvVars = expandEnvVars;
|
|
5
|
+
exports.expandEnvRecord = expandEnvRecord;
|
|
6
|
+
const fs = require("fs/promises");
|
|
7
|
+
const path = require("path");
|
|
8
|
+
const EXTENSIONS = {
|
|
9
|
+
'image/png': 'png',
|
|
10
|
+
'image/jpeg': 'jpg',
|
|
11
|
+
'image/jpg': 'jpg',
|
|
12
|
+
'image/gif': 'gif',
|
|
13
|
+
'image/webp': 'webp',
|
|
14
|
+
'image/svg+xml': 'svg',
|
|
15
|
+
'audio/wav': 'wav',
|
|
16
|
+
'audio/x-wav': 'wav',
|
|
17
|
+
'audio/mpeg': 'mp3',
|
|
18
|
+
'audio/mp3': 'mp3',
|
|
19
|
+
'audio/ogg': 'ogg',
|
|
20
|
+
'application/pdf': 'pdf',
|
|
21
|
+
'application/json': 'json',
|
|
22
|
+
'text/plain': 'txt',
|
|
23
|
+
};
|
|
24
|
+
function extensionFor(mimeType) {
|
|
25
|
+
if (!mimeType)
|
|
26
|
+
return 'bin';
|
|
27
|
+
return EXTENSIONS[mimeType.toLowerCase()] ?? 'bin';
|
|
28
|
+
}
|
|
29
|
+
let fileCounter = 0;
|
|
30
|
+
async function saveBlob(data, mimeType, opts) {
|
|
31
|
+
await fs.mkdir(opts.outputDir, { recursive: true });
|
|
32
|
+
const safeLabel = opts.label.replace(/[^a-zA-Z0-9_.-]+/g, '-').slice(0, 60);
|
|
33
|
+
const name = `${Date.now()}-${process.pid}-${++fileCounter}-${safeLabel}.${extensionFor(mimeType)}`;
|
|
34
|
+
const filePath = path.join(opts.outputDir, name);
|
|
35
|
+
await fs.writeFile(filePath, Buffer.from(data, 'base64'));
|
|
36
|
+
const relative = path.relative(opts.projectRoot, filePath);
|
|
37
|
+
return relative.startsWith('..') ? filePath : relative;
|
|
38
|
+
}
|
|
39
|
+
async function formatMcpToolResult(result, opts) {
|
|
40
|
+
const isError = result?.isError === true;
|
|
41
|
+
const parts = [];
|
|
42
|
+
const content = Array.isArray(result?.content) ? result.content : [];
|
|
43
|
+
for (const block of content) {
|
|
44
|
+
if (!block || typeof block !== 'object')
|
|
45
|
+
continue;
|
|
46
|
+
switch (block.type) {
|
|
47
|
+
case 'text':
|
|
48
|
+
if (typeof block.text === 'string')
|
|
49
|
+
parts.push(block.text);
|
|
50
|
+
break;
|
|
51
|
+
case 'image':
|
|
52
|
+
case 'audio': {
|
|
53
|
+
if (typeof block.data !== 'string')
|
|
54
|
+
break;
|
|
55
|
+
try {
|
|
56
|
+
const saved = await saveBlob(block.data, block.mimeType, opts);
|
|
57
|
+
parts.push(`[${block.type} saved to ${saved} (${block.mimeType ?? 'unknown type'})]`);
|
|
58
|
+
}
|
|
59
|
+
catch (e) {
|
|
60
|
+
parts.push(`[${block.type} (${block.mimeType ?? 'unknown type'}) could not be saved: ${e.message}]`);
|
|
61
|
+
}
|
|
62
|
+
break;
|
|
63
|
+
}
|
|
64
|
+
case 'resource': {
|
|
65
|
+
const resource = block.resource ?? {};
|
|
66
|
+
const uri = resource.uri ?? 'unknown uri';
|
|
67
|
+
if (typeof resource.text === 'string') {
|
|
68
|
+
parts.push(`[resource ${uri}]\n${resource.text}`);
|
|
69
|
+
}
|
|
70
|
+
else if (typeof resource.blob === 'string') {
|
|
71
|
+
try {
|
|
72
|
+
const saved = await saveBlob(resource.blob, resource.mimeType, opts);
|
|
73
|
+
parts.push(`[resource ${uri} saved to ${saved}]`);
|
|
74
|
+
}
|
|
75
|
+
catch (e) {
|
|
76
|
+
parts.push(`[resource ${uri} could not be saved: ${e.message}]`);
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
parts.push(`[resource ${uri}]`);
|
|
81
|
+
}
|
|
82
|
+
break;
|
|
83
|
+
}
|
|
84
|
+
case 'resource_link':
|
|
85
|
+
parts.push(`[resource link: ${block.uri}${block.name ? ` (${block.name})` : ''}${block.description ? ` — ${block.description}` : ''}]`);
|
|
86
|
+
break;
|
|
87
|
+
default:
|
|
88
|
+
parts.push(JSON.stringify(block));
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
if (parts.length === 0) {
|
|
92
|
+
if (result?.structuredContent !== undefined) {
|
|
93
|
+
parts.push(JSON.stringify(result.structuredContent, null, 2));
|
|
94
|
+
}
|
|
95
|
+
else if (result?.toolResult !== undefined) {
|
|
96
|
+
parts.push(typeof result.toolResult === 'string'
|
|
97
|
+
? result.toolResult
|
|
98
|
+
: JSON.stringify(result.toolResult, null, 2));
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
const text = parts.join('\n\n');
|
|
102
|
+
return {
|
|
103
|
+
text: text ||
|
|
104
|
+
(isError ? 'The tool reported an error.' : '(Tool produced no output)'),
|
|
105
|
+
isError,
|
|
106
|
+
};
|
|
107
|
+
}
|
|
108
|
+
function expandEnvVars(value, env = process.env) {
|
|
109
|
+
return value.replace(/\$\{([A-Za-z_][A-Za-z0-9_]*)(?::-([^}]*))?\}/g, (match, name, fallback) => {
|
|
110
|
+
const found = env[name];
|
|
111
|
+
if (found !== undefined && found !== '')
|
|
112
|
+
return found;
|
|
113
|
+
if (fallback !== undefined)
|
|
114
|
+
return fallback;
|
|
115
|
+
return match;
|
|
116
|
+
});
|
|
117
|
+
}
|
|
118
|
+
function expandEnvRecord(record, env = process.env) {
|
|
119
|
+
const out = {};
|
|
120
|
+
for (const [key, value] of Object.entries(record ?? {})) {
|
|
121
|
+
out[key] = typeof value === 'string' ? expandEnvVars(value, env) : value;
|
|
122
|
+
}
|
|
123
|
+
return out;
|
|
124
|
+
}
|
|
125
|
+
//# sourceMappingURL=mcp-result.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mcp-result.js","sourceRoot":"","sources":["../../../src/mcp/mcp-result.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,20 +4,40 @@ import { MetadataStore } from '../metadata-store/metadata-store.service';
|
|
|
4
4
|
import { McpToolsStore } from './mcp-tools.store';
|
|
5
5
|
import { LlmFunctionTool } from '../llm-provider/llm-provider.interface';
|
|
6
6
|
import { EventsGateway } from '../events/events.gateway';
|
|
7
|
+
import { McpToolOutcome } from './mcp-result';
|
|
7
8
|
export declare class McpService implements OnModuleInit, OnModuleDestroy {
|
|
8
9
|
private readonly mcpConfigsStore;
|
|
9
10
|
private readonly mcpToolsStore;
|
|
10
11
|
private readonly eventsGateway;
|
|
11
12
|
private readonly logger;
|
|
12
13
|
private readonly activeClients;
|
|
14
|
+
private readonly connecting;
|
|
15
|
+
private readonly knownServers;
|
|
16
|
+
private readonly closingServers;
|
|
17
|
+
private readonly reconnectTimers;
|
|
18
|
+
private readonly reconnectAttempts;
|
|
19
|
+
private initialConnections;
|
|
20
|
+
private destroyed;
|
|
13
21
|
private refreshInterval;
|
|
14
22
|
private static readonly REFRESH_CHECK_INTERVAL_MS;
|
|
15
23
|
private static readonly REFRESH_WINDOW_MS;
|
|
24
|
+
static CONNECT_TIMEOUT_MS: number;
|
|
25
|
+
static DEFAULT_TOOL_TIMEOUT_MS: number;
|
|
26
|
+
static MAX_RECONNECT_ATTEMPTS: number;
|
|
27
|
+
static RECONNECT_BASE_DELAY_MS: number;
|
|
16
28
|
constructor(mcpConfigsStore: MetadataStore<McpConfig>, mcpToolsStore: McpToolsStore, eventsGateway: EventsGateway);
|
|
17
29
|
onModuleInit(): Promise<void>;
|
|
30
|
+
whenReady(): Promise<void>;
|
|
18
31
|
onModuleDestroy(): Promise<void>;
|
|
32
|
+
isConnected(serverName: string): boolean;
|
|
19
33
|
connectToServer(config: McpConfig): Promise<void>;
|
|
20
34
|
private connectToStdioServer;
|
|
35
|
+
private startClient;
|
|
36
|
+
private listAllTools;
|
|
37
|
+
private handleClientClosed;
|
|
38
|
+
private scheduleReconnect;
|
|
39
|
+
private reconnect;
|
|
40
|
+
private getClient;
|
|
21
41
|
private connectToRemoteServer;
|
|
22
42
|
private persistTokens;
|
|
23
43
|
private establishRemoteConnection;
|
|
@@ -26,6 +46,7 @@ export declare class McpService implements OnModuleInit, OnModuleDestroy {
|
|
|
26
46
|
disconnectFromServer(serverName: string): Promise<void>;
|
|
27
47
|
private syncTools;
|
|
28
48
|
createMcpConfig(configJson: string): Promise<McpConfig>;
|
|
49
|
+
private parseServerConfig;
|
|
29
50
|
updateMcpConfigStatus(serverName: string, isActive: boolean): Promise<McpConfig>;
|
|
30
51
|
deleteMcpConfig(serverName: string): Promise<void>;
|
|
31
52
|
batchUpdateToolStatus(toolKeys: string[], isActive: boolean): Promise<{
|
|
@@ -33,9 +54,20 @@ export declare class McpService implements OnModuleInit, OnModuleDestroy {
|
|
|
33
54
|
}>;
|
|
34
55
|
getMcpServers(): Promise<any[]>;
|
|
35
56
|
private computeTokenStatus;
|
|
36
|
-
|
|
57
|
+
resolveToolCall(fullName: string): {
|
|
58
|
+
serverName: string;
|
|
59
|
+
toolName: string;
|
|
60
|
+
} | null;
|
|
61
|
+
private toolTimeoutFor;
|
|
62
|
+
callTool(serverName: string, toolName: string, args: any, options?: {
|
|
63
|
+
signal?: AbortSignal;
|
|
64
|
+
}): Promise<McpToolOutcome>;
|
|
65
|
+
executeMcpTool(serverName: string, toolName: string, args: any, options?: {
|
|
66
|
+
signal?: AbortSignal;
|
|
67
|
+
}): Promise<{
|
|
37
68
|
stdout: string;
|
|
38
69
|
stderr: string;
|
|
70
|
+
isError: boolean;
|
|
39
71
|
}>;
|
|
40
72
|
getMcpToolsDefinition(): Promise<string>;
|
|
41
73
|
private listActiveToolsFromActiveServers;
|