@agent-deck/backend 1.1.4 → 1.1.6
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/dist/.tsbuildinfo +1 -1
- package/dist/config/oauth-redirect.d.ts +18 -0
- package/dist/config/oauth-redirect.d.ts.map +1 -0
- package/dist/config/oauth-redirect.js +57 -0
- package/dist/config/oauth-redirect.js.map +1 -0
- package/dist/config/shared-oauth-apps.d.ts +18 -0
- package/dist/config/shared-oauth-apps.d.ts.map +1 -0
- package/dist/config/shared-oauth-apps.js +35 -0
- package/dist/config/shared-oauth-apps.js.map +1 -0
- package/dist/data/default-mcp-services.d.ts +14 -0
- package/dist/data/default-mcp-services.d.ts.map +1 -0
- package/dist/data/default-mcp-services.js +52 -0
- package/dist/data/default-mcp-services.js.map +1 -0
- package/dist/data/oauth-provider-guides.d.ts +35 -0
- package/dist/data/oauth-provider-guides.d.ts.map +1 -0
- package/dist/data/oauth-provider-guides.js +298 -0
- package/dist/data/oauth-provider-guides.js.map +1 -0
- package/dist/data/seed-default-services.d.ts +3 -0
- package/dist/data/seed-default-services.d.ts.map +1 -0
- package/dist/data/seed-default-services.js +14 -0
- package/dist/data/seed-default-services.js.map +1 -0
- package/dist/lib/mcp-connection-error.d.ts +4 -0
- package/dist/lib/mcp-connection-error.d.ts.map +1 -0
- package/dist/lib/mcp-connection-error.js +45 -0
- package/dist/lib/mcp-connection-error.js.map +1 -0
- package/dist/lib/mcp-oauth-discovery.d.ts +16 -0
- package/dist/lib/mcp-oauth-discovery.d.ts.map +1 -0
- package/dist/lib/mcp-oauth-discovery.js +161 -0
- package/dist/lib/mcp-oauth-discovery.js.map +1 -0
- package/dist/lib/oauth-token-response.d.ts +11 -0
- package/dist/lib/oauth-token-response.d.ts.map +1 -0
- package/dist/lib/oauth-token-response.js +48 -0
- package/dist/lib/oauth-token-response.js.map +1 -0
- package/dist/lib/pkce.d.ts +7 -0
- package/dist/lib/pkce.d.ts.map +1 -0
- package/dist/lib/pkce.js +11 -0
- package/dist/lib/pkce.js.map +1 -0
- package/dist/mcp-server.d.ts +4 -3
- package/dist/mcp-server.d.ts.map +1 -1
- package/dist/mcp-server.js +128 -32
- package/dist/mcp-server.js.map +1 -1
- package/dist/mcp-session-binding.d.ts +29 -0
- package/dist/mcp-session-binding.d.ts.map +1 -0
- package/dist/mcp-session-binding.js +74 -0
- package/dist/mcp-session-binding.js.map +1 -0
- package/dist/models/database.d.ts +1 -0
- package/dist/models/database.d.ts.map +1 -1
- package/dist/models/database.js +4 -0
- package/dist/models/database.js.map +1 -1
- package/dist/routes/oauth.d.ts.map +1 -1
- package/dist/routes/oauth.js +85 -48
- package/dist/routes/oauth.js.map +1 -1
- package/dist/server/index.d.ts.map +1 -1
- package/dist/server/index.js +6 -0
- package/dist/server/index.js.map +1 -1
- package/dist/services/collection-warning-service.d.ts.map +1 -1
- package/dist/services/collection-warning-service.js +1 -5
- package/dist/services/collection-warning-service.js.map +1 -1
- package/dist/services/config-manager.d.ts.map +1 -1
- package/dist/services/config-manager.js +5 -5
- package/dist/services/config-manager.js.map +1 -1
- package/dist/services/mcp-client-manager.d.ts.map +1 -1
- package/dist/services/mcp-client-manager.js +6 -1
- package/dist/services/mcp-client-manager.js.map +1 -1
- package/dist/services/mcp-discovery-service.d.ts +1 -0
- package/dist/services/mcp-discovery-service.d.ts.map +1 -1
- package/dist/services/mcp-discovery-service.js +2 -79
- package/dist/services/mcp-discovery-service.js.map +1 -1
- package/dist/services/oauth-connect-service.d.ts +26 -0
- package/dist/services/oauth-connect-service.d.ts.map +1 -0
- package/dist/services/oauth-connect-service.js +129 -0
- package/dist/services/oauth-connect-service.js.map +1 -0
- package/dist/services/oauth-manager.d.ts.map +1 -1
- package/dist/services/oauth-manager.js +74 -70
- package/dist/services/oauth-manager.js.map +1 -1
- package/dist/services/service-manager.d.ts +2 -0
- package/dist/services/service-manager.d.ts.map +1 -1
- package/dist/services/service-manager.js +22 -3
- package/dist/services/service-manager.js.map +1 -1
- package/package.json +4 -4
- package/static-ui/assets/AgentDeckLogo3-CEDxeHlz.png +0 -0
- package/static-ui/assets/index-CPNBMDJn.js +354 -0
- package/static-ui/assets/index-Df5pC3f-.css +1 -0
- package/static-ui/favicon.png +0 -0
- package/static-ui/index.html +2 -2
- package/static-ui/assets/AgentDeckLogo2-z3pVqJJ3.png +0 -0
- package/static-ui/assets/index-BMpKtwqp.js +0 -339
- package/static-ui/assets/index-BnA3AsqY.css +0 -1
package/dist/routes/oauth.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.registerOAuthRoutes = registerOAuthRoutes;
|
|
4
|
-
const mcp_discovery_service_1 = require("../services/mcp-discovery-service");
|
|
5
4
|
const paths_1 = require("../lib/paths");
|
|
5
|
+
const oauth_connect_service_1 = require("../services/oauth-connect-service");
|
|
6
6
|
async function registerOAuthRoutes(fastify) {
|
|
7
7
|
// Discover OAuth configuration for a service
|
|
8
8
|
fastify.get('/:serviceId/discover', async (request, reply) => {
|
|
@@ -30,66 +30,83 @@ async function registerOAuthRoutes(fastify) {
|
|
|
30
30
|
return reply.status(500).send(response);
|
|
31
31
|
}
|
|
32
32
|
});
|
|
33
|
-
//
|
|
34
|
-
fastify.
|
|
33
|
+
// OAuth setup guide + discovery for a service
|
|
34
|
+
fastify.get('/:serviceId/setup', async (request, reply) => {
|
|
35
35
|
try {
|
|
36
|
-
const
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
36
|
+
const { guide, discovery } = await (0, oauth_connect_service_1.getOAuthSetupInfo)(fastify.db, request.params.serviceId);
|
|
37
|
+
const response = {
|
|
38
|
+
success: true,
|
|
39
|
+
data: {
|
|
40
|
+
guide,
|
|
41
|
+
oauth: discovery.oauth,
|
|
42
|
+
},
|
|
43
|
+
};
|
|
44
|
+
return reply.send(response);
|
|
45
|
+
}
|
|
46
|
+
catch (error) {
|
|
47
|
+
const response = {
|
|
48
|
+
success: false,
|
|
49
|
+
error: error instanceof Error ? error.message : 'Unknown error',
|
|
50
|
+
};
|
|
51
|
+
return reply.status(400).send(response);
|
|
52
|
+
}
|
|
53
|
+
});
|
|
54
|
+
// Connect OAuth (auto-register or manual client credentials)
|
|
55
|
+
fastify.post('/:serviceId/connect', async (request, reply) => {
|
|
56
|
+
try {
|
|
57
|
+
const result = await (0, oauth_connect_service_1.startOAuthConnect)(fastify.db, fastify.oauthManager, request.params.serviceId, request.body ?? {});
|
|
58
|
+
if (!result.success) {
|
|
48
59
|
const response = {
|
|
49
60
|
success: false,
|
|
50
|
-
error:
|
|
61
|
+
error: result.error,
|
|
62
|
+
data: {
|
|
63
|
+
needsCredentials: result.needsCredentials,
|
|
64
|
+
setupMode: result.setupMode,
|
|
65
|
+
guide: result.guide,
|
|
66
|
+
},
|
|
51
67
|
};
|
|
52
|
-
return reply.status(400).send(response);
|
|
68
|
+
return reply.status(result.needsCredentials || result.setupMode === 'unavailable' ? 400 : 400).send(response);
|
|
53
69
|
}
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
70
|
+
const response = {
|
|
71
|
+
success: true,
|
|
72
|
+
data: {
|
|
73
|
+
authorizationUrl: result.authorizationUrl,
|
|
74
|
+
state: result.state,
|
|
75
|
+
mode: result.mode,
|
|
76
|
+
},
|
|
77
|
+
};
|
|
78
|
+
return reply.send(response);
|
|
79
|
+
}
|
|
80
|
+
catch (error) {
|
|
81
|
+
const response = {
|
|
82
|
+
success: false,
|
|
83
|
+
error: error instanceof Error ? error.message : 'Unknown error',
|
|
84
|
+
};
|
|
85
|
+
return reply.status(400).send(response);
|
|
86
|
+
}
|
|
87
|
+
});
|
|
88
|
+
// Auto-register OAuth application and initiate flow (legacy alias)
|
|
89
|
+
fastify.post('/:serviceId/auto-setup', async (request, reply) => {
|
|
90
|
+
try {
|
|
91
|
+
const result = await (0, oauth_connect_service_1.startOAuthConnect)(fastify.db, fastify.oauthManager, request.params.serviceId, request.body ?? {});
|
|
92
|
+
if (!result.success) {
|
|
66
93
|
const response = {
|
|
67
94
|
success: false,
|
|
68
|
-
error:
|
|
69
|
-
data:
|
|
95
|
+
error: result.error,
|
|
96
|
+
data: {
|
|
97
|
+
needsCredentials: result.needsCredentials,
|
|
98
|
+
setupMode: result.setupMode,
|
|
99
|
+
guide: result.guide,
|
|
100
|
+
},
|
|
70
101
|
};
|
|
71
102
|
return reply.status(400).send(response);
|
|
72
103
|
}
|
|
73
|
-
// Update service with OAuth credentials
|
|
74
|
-
await fastify.db.updateService(request.params.serviceId, {
|
|
75
|
-
oauthClientId: registration.clientId,
|
|
76
|
-
oauthClientSecret: registration.clientSecret,
|
|
77
|
-
oauthAuthorizationUrl: oauthConfig.authorizationUrl,
|
|
78
|
-
oauthTokenUrl: oauthConfig.tokenUrl,
|
|
79
|
-
oauthRedirectUri: oauthConfig.redirectUri,
|
|
80
|
-
oauthScope: oauthConfig.scope,
|
|
81
|
-
});
|
|
82
|
-
// Initiate OAuth flow
|
|
83
|
-
const { authorizationUrl, state } = await fastify.oauthManager.initiateOAuthFlow({
|
|
84
|
-
serviceId: request.params.serviceId,
|
|
85
|
-
redirectUri: `http://localhost:8000/api/oauth/callback`,
|
|
86
|
-
});
|
|
87
104
|
const response = {
|
|
88
105
|
success: true,
|
|
89
106
|
data: {
|
|
90
|
-
authorizationUrl,
|
|
91
|
-
state,
|
|
92
|
-
|
|
107
|
+
authorizationUrl: result.authorizationUrl,
|
|
108
|
+
state: result.state,
|
|
109
|
+
mode: result.mode,
|
|
93
110
|
message: 'OAuth application registered and authorization flow initiated',
|
|
94
111
|
},
|
|
95
112
|
};
|
|
@@ -153,6 +170,24 @@ async function registerOAuthRoutes(fastify) {
|
|
|
153
170
|
state,
|
|
154
171
|
});
|
|
155
172
|
fastify.collectionWarningService.clearCache(serviceId);
|
|
173
|
+
try {
|
|
174
|
+
await fastify.serviceManager.discoverServiceTools(serviceId);
|
|
175
|
+
fastify.broadcastServiceUpdate({
|
|
176
|
+
serviceId,
|
|
177
|
+
health: 'healthy',
|
|
178
|
+
isConnected: true,
|
|
179
|
+
lastPing: new Date().toISOString(),
|
|
180
|
+
});
|
|
181
|
+
}
|
|
182
|
+
catch (error) {
|
|
183
|
+
fastify.log.warn(`OAuth succeeded but post-auth tool discovery failed for ${serviceId}: ${error}`);
|
|
184
|
+
fastify.broadcastServiceUpdate({
|
|
185
|
+
serviceId,
|
|
186
|
+
health: 'unknown',
|
|
187
|
+
isConnected: false,
|
|
188
|
+
lastPing: new Date().toISOString(),
|
|
189
|
+
});
|
|
190
|
+
}
|
|
156
191
|
const dashboardOrigin = (0, paths_1.resolveDashboardOrigin)();
|
|
157
192
|
return reply.redirect(`${dashboardOrigin}/oauth/callback?success=true&serviceId=${serviceId}`);
|
|
158
193
|
}
|
|
@@ -220,11 +255,13 @@ async function registerOAuthRoutes(fastify) {
|
|
|
220
255
|
}
|
|
221
256
|
const isExpired = await fastify.oauthManager.isTokenExpired(request.params.serviceId);
|
|
222
257
|
const hasToken = !!service.oauthAccessToken;
|
|
258
|
+
const authenticated = hasToken && !isExpired;
|
|
223
259
|
const response = {
|
|
224
260
|
success: true,
|
|
225
261
|
data: {
|
|
226
262
|
hasToken,
|
|
227
263
|
isExpired,
|
|
264
|
+
authenticated,
|
|
228
265
|
hasRefreshToken: !!service.oauthRefreshToken,
|
|
229
266
|
expiresAt: service.oauthTokenExpiresAt,
|
|
230
267
|
},
|
package/dist/routes/oauth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../src/routes/oauth.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../src/routes/oauth.ts"],"names":[],"mappings":";;AAoCA,kDAyTC;AApVD,wCAAsD;AACtD,6EAAyF;AA0BlF,KAAK,UAAU,mBAAmB,CAAC,OAAwB;IAChE,6CAA6C;IAC7C,OAAO,CAAC,GAAG,CAAmB,sBAAsB,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QAC7E,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACtE,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM,QAAQ,GAAgB;oBAC5B,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,mBAAmB;iBAC3B,CAAC;gBAEF,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC1C,CAAC;YAED,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAExE,MAAM,QAAQ,GAAsC;gBAClD,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,SAAS;aAChB,CAAC;YAEF,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,QAAQ,GAAgB;gBAC5B,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe;aAChE,CAAC;YAEF,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,8CAA8C;IAC9C,OAAO,CAAC,GAAG,CAAmB,mBAAmB,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QAC1E,IAAI,CAAC;YACH,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,MAAM,IAAA,yCAAiB,EAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC3F,MAAM,QAAQ,GAAgB;gBAC5B,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE;oBACJ,KAAK;oBACL,KAAK,EAAE,SAAS,CAAC,KAAK;iBACvB;aACF,CAAC;YACF,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,QAAQ,GAAgB;gBAC5B,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe;aAChE,CAAC;YACF,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,6DAA6D;IAC7D,OAAO,CAAC,IAAI,CAAsB,qBAAqB,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QAChF,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAA,yCAAiB,EACpC,OAAO,CAAC,EAAE,EACV,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,MAAM,CAAC,SAAS,EACxB,OAAO,CAAC,IAAI,IAAI,EAAE,CACnB,CAAC;YAEF,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;gBACpB,MAAM,QAAQ,GAAgB;oBAC5B,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,MAAM,CAAC,KAAK;oBACnB,IAAI,EAAE;wBACJ,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;wBACzC,SAAS,EAAE,MAAM,CAAC,SAAS;wBAC3B,KAAK,EAAE,MAAM,CAAC,KAAK;qBACpB;iBACF,CAAC;gBACF,OAAO,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,gBAAgB,IAAI,MAAM,CAAC,SAAS,KAAK,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAChH,CAAC;YAED,MAAM,QAAQ,GAAgB;gBAC5B,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE;oBACJ,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;oBACzC,KAAK,EAAE,MAAM,CAAC,KAAK;oBACnB,IAAI,EAAE,MAAM,CAAC,IAAI;iBAClB;aACF,CAAC;YACF,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,QAAQ,GAAgB;gBAC5B,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe;aAChE,CAAC;YACF,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,mEAAmE;IACnE,OAAO,CAAC,IAAI,CAAsB,wBAAwB,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QACnF,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAA,yCAAiB,EACpC,OAAO,CAAC,EAAE,EACV,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,MAAM,CAAC,SAAS,EACxB,OAAO,CAAC,IAAI,IAAI,EAAE,CACnB,CAAC;YAEF,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;gBACpB,MAAM,QAAQ,GAAgB;oBAC5B,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,MAAM,CAAC,KAAK;oBACnB,IAAI,EAAE;wBACJ,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;wBACzC,SAAS,EAAE,MAAM,CAAC,SAAS;wBAC3B,KAAK,EAAE,MAAM,CAAC,KAAK;qBACpB;iBACF,CAAC;gBACF,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC1C,CAAC;YAED,MAAM,QAAQ,GAAgB;gBAC5B,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE;oBACJ,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;oBACzC,KAAK,EAAE,MAAM,CAAC,KAAK;oBACnB,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,OAAO,EAAE,+DAA+D;iBACzE;aACF,CAAC;YACF,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,QAAQ,GAAgB;gBAC5B,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe;aAChE,CAAC;YACF,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,0CAA0C;IAC1C,OAAO,CAAC,GAAG,CAAmB,uBAAuB,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QAC9E,IAAI,CAAC;YACH,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAE,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,iBAAiB,CAAC;gBAC/E,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS;gBACnC,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,WAAW;aACvC,CAAC,CAAC;YAEH,MAAM,QAAQ,GAAgB;gBAC5B,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE;oBACJ,gBAAgB;oBAChB,KAAK;iBACN;aACF,CAAC;YAEF,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,QAAQ,GAAgB;gBAC5B,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe;aAChE,CAAC;YAEF,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,4DAA4D;IAC5D,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QAChD,IAAI,CAAC;YACH,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAwC,CAAC;YAEzE,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBACpB,MAAM,QAAQ,GAAgB;oBAC5B,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,+CAA+C;iBACvD,CAAC;gBACF,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC1C,CAAC;YAED,oEAAoE;YACpE,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAE5D,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,MAAM,QAAQ,GAAgB;oBAC5B,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,gCAAgC;iBACxC,CAAC;gBACF,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC1C,CAAC;YAED,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,mBAAmB,CAAC;gBAC3D,SAAS;gBACT,IAAI;gBACJ,KAAK;aACN,CAAC,CAAC;YAEH,OAAO,CAAC,wBAAwB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YAEvD,IAAI,CAAC;gBACH,MAAM,OAAO,CAAC,cAAc,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;gBAC7D,OAAO,CAAC,sBAAsB,CAAC;oBAC7B,SAAS;oBACT,MAAM,EAAE,SAAS;oBACjB,WAAW,EAAE,IAAI;oBACjB,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;iBACnC,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,2DAA2D,SAAS,KAAK,KAAK,EAAE,CAAC,CAAC;gBACnG,OAAO,CAAC,sBAAsB,CAAC;oBAC7B,SAAS;oBACT,MAAM,EAAE,SAAS;oBACjB,WAAW,EAAE,KAAK;oBAClB,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;iBACnC,CAAC,CAAC;YACL,CAAC;YAED,MAAM,eAAe,GAAG,IAAA,8BAAsB,GAAE,CAAC;YACjD,OAAO,KAAK,CAAC,QAAQ,CAAC,GAAG,eAAe,0CAA0C,SAAS,EAAE,CAAC,CAAC;QACjG,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,uBAAuB,CAAC;YACtF,MAAM,eAAe,GAAG,IAAA,8BAAsB,GAAE,CAAC;YACjD,OAAO,KAAK,CAAC,QAAQ,CACnB,GAAG,eAAe,uCAAuC,kBAAkB,CAAC,YAAY,CAAC,EAAE,CAC5F,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,0DAA0D;IAC1D,OAAO,CAAC,GAAG,CAAuB,sBAAsB,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QACjF,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,mBAAmB,CAAC;gBAC3D,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS;gBACnC,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI;gBACxB,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,KAAK;aAC3B,CAAC,CAAC;YAEH,MAAM,QAAQ,GAA4B;gBACxC,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,KAAK;gBACX,OAAO,EAAE,iCAAiC;aAC3C,CAAC;YAEF,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,QAAQ,GAAgB;gBAC5B,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe;aAChE,CAAC;YAEF,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,sBAAsB;IACtB,OAAO,CAAC,IAAI,CAAsB,qBAAqB,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QAChF,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,iBAAiB,CAAC;gBACzD,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS;gBACnC,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC,YAAY;aACxC,CAAC,CAAC;YAEH,MAAM,QAAQ,GAA4B;gBACxC,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,KAAK;gBACX,OAAO,EAAE,oCAAoC;aAC9C,CAAC;YAEF,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,QAAQ,GAAgB;gBAC5B,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe;aAChE,CAAC;YAEF,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,iCAAiC;IACjC,OAAO,CAAC,GAAG,CAAmB,oBAAoB,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QAC3E,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACtE,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM,QAAQ,GAAgB;oBAC5B,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,mBAAmB;iBAC3B,CAAC;gBAEF,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC1C,CAAC;YAED,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACtF,MAAM,QAAQ,GAAG,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC;YAC5C,MAAM,aAAa,GAAG,QAAQ,IAAI,CAAC,SAAS,CAAC;YAE7C,MAAM,QAAQ,GAAgB;gBAC5B,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE;oBACJ,QAAQ;oBACR,SAAS;oBACT,aAAa;oBACb,eAAe,EAAE,CAAC,CAAC,OAAO,CAAC,iBAAiB;oBAC5C,SAAS,EAAE,OAAO,CAAC,mBAAmB;iBACvC;aACF,CAAC;YAEF,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,QAAQ,GAAgB;gBAC5B,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe;aAChE,CAAC;YAEF,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAUzD,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACvF,OAAO,EAAqB,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAEhE,OAAO,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AAElF,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAUzD,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACvF,OAAO,EAAqB,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAEhE,OAAO,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AAElF,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAIhE,wBAAsB,YAAY,qUAqGjC;AAGD,OAAO,QAAQ,SAAS,CAAC;IACvB,UAAU,eAAe;QACvB,EAAE,EAAE,eAAe,CAAC;QACpB,cAAc,EAAE,cAAc,CAAC;QAC/B,SAAS,EAAE,gBAAgB,CAAC;QAC5B,YAAY,EAAE,YAAY,CAAC;QAC3B,iBAAiB,EAAE,iBAAiB,CAAC;QACrC,eAAe,EAAE,eAAe,CAAC;QACjC,wBAAwB,EAAE,wBAAwB,CAAC;QACnD,sBAAsB,EAAE,CAAC,MAAM,EAAE,mBAAmB,KAAK,IAAI,CAAC;QAC9D,mBAAmB,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;QAClD,cAAc,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,IAAI,CAAC;KACrD;CACF"}
|
package/dist/server/index.js
CHANGED
|
@@ -29,6 +29,7 @@ const collection_warning_service_1 = require("../services/collection-warning-ser
|
|
|
29
29
|
const collection_1 = require("../routes/collection");
|
|
30
30
|
const playbook_manager_1 = require("../playbooks/playbook-manager");
|
|
31
31
|
const version_1 = require("../lib/version");
|
|
32
|
+
const seed_default_services_1 = require("../data/seed-default-services");
|
|
32
33
|
async function createServer() {
|
|
33
34
|
const fastify = (0, fastify_1.default)({
|
|
34
35
|
logger: {
|
|
@@ -45,9 +46,14 @@ async function createServer() {
|
|
|
45
46
|
const databasePath = (0, paths_1.resolveDatabasePath)();
|
|
46
47
|
console.log(`📁 Database: ${databasePath}`);
|
|
47
48
|
const db = new database_1.DatabaseManager(databasePath);
|
|
49
|
+
const seededCount = await (0, seed_default_services_1.seedDefaultServicesIfEmpty)(db);
|
|
50
|
+
if (seededCount > 0) {
|
|
51
|
+
console.log(`Seeded ${seededCount} default MCP service cards`);
|
|
52
|
+
}
|
|
48
53
|
const mcpClient = new mcp_client_manager_1.MCPClientManager();
|
|
49
54
|
const oauthManager = new oauth_manager_1.OAuthManager(db);
|
|
50
55
|
const serviceManager = new service_manager_1.ServiceManager(db, mcpClient, oauthManager);
|
|
56
|
+
void serviceManager.backfillMissingIcons();
|
|
51
57
|
const credentialManager = new vault_1.CredentialManager(db, (0, vault_1.createSecretStore)());
|
|
52
58
|
const playbookManager = new playbook_manager_1.PlaybookManager(db);
|
|
53
59
|
const collectionWarningService = new collection_warning_service_1.CollectionWarningService();
|
package/dist/server/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collection-warning-service.d.ts","sourceRoot":"","sources":["../../src/services/collection-warning-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,qBAAqB,EAC1B,KAAK,qBAAqB,EAC1B,KAAK,UAAU,EACf,KAAK,QAAQ,EACb,KAAK,OAAO,EACb,MAAM,oBAAoB,CAAC;AAG5B,MAAM,MAAM,yBAAyB,GAAG;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;IAC9C,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,EAAE,CAAC,CAAC;IAClD,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,EAAE,CAAC,CAAC;IACrD,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,EAAE,CAAC,CAAC;CACpD,CAAC;AAIF,qBAAa,wBAAwB;IACnC,OAAO,CAAC,gBAAgB,CAA6B;IACrD,OAAO,CAAC,kBAAkB,CAA+D;IAEzF,OAAO,CAAC,WAAW;YAUL,kBAAkB;IAmChC,OAAO,CAAC,gBAAgB;
|
|
1
|
+
{"version":3,"file":"collection-warning-service.d.ts","sourceRoot":"","sources":["../../src/services/collection-warning-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,qBAAqB,EAC1B,KAAK,qBAAqB,EAC1B,KAAK,UAAU,EACf,KAAK,QAAQ,EACb,KAAK,OAAO,EACb,MAAM,oBAAoB,CAAC;AAG5B,MAAM,MAAM,yBAAyB,GAAG;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;IAC9C,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,EAAE,CAAC,CAAC;IAClD,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,EAAE,CAAC,CAAC;IACrD,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,EAAE,CAAC,CAAC;CACpD,CAAC;AAIF,qBAAa,wBAAwB;IACnC,OAAO,CAAC,gBAAgB,CAA6B;IACrD,OAAO,CAAC,kBAAkB,CAA+D;IAEzF,OAAO,CAAC,WAAW;YAUL,kBAAkB;IAmChC,OAAO,CAAC,gBAAgB;IAoBlB,SAAS,CACb,QAAQ,EAAE,OAAO,EAAE,EACnB,WAAW,EAAE,UAAU,EAAE,EACzB,SAAS,EAAE,QAAQ,EAAE,GACpB,OAAO,CAAC,yBAAyB,CAAC;IA+DrC,UAAU,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;CAOrC"}
|
|
@@ -50,11 +50,7 @@ class CollectionWarningService {
|
|
|
50
50
|
if (service.type !== 'mcp') {
|
|
51
51
|
return false;
|
|
52
52
|
}
|
|
53
|
-
|
|
54
|
-
const hasAuthHeader = Boolean(service.headers?.Authorization);
|
|
55
|
-
if (hasToken &&
|
|
56
|
-
hasAuthHeader &&
|
|
57
|
-
!(0, shared_1.isOAuthTokenExpiringSoon)(service.oauthTokenExpiresAt)) {
|
|
53
|
+
if ((0, shared_1.isOAuthSessionValid)(service)) {
|
|
58
54
|
return false;
|
|
59
55
|
}
|
|
60
56
|
if (service.oauthClientId ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collection-warning-service.js","sourceRoot":"","sources":["../../src/services/collection-warning-service.ts"],"names":[],"mappings":";;;AAAA,+CAW4B;AAC5B,mEAA8D;AAU9D,MAAM,kBAAkB,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAEzC,MAAa,wBAAwB;IAC3B,gBAAgB,GAAG,IAAI,2CAAmB,EAAE,CAAC;IAC7C,kBAAkB,GAAG,IAAI,GAAG,EAAoD,CAAC;IAEjF,WAAW;QACjB,OAAO;YACL,cAAc,EAAE,CAAC;YACjB,aAAa,EAAE,CAAC;YAChB,iBAAiB,EAAE,CAAC;YACpB,yBAAyB,EAAE,CAAC;YAC5B,qBAAqB,EAAE,CAAC;SACzB,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,OAAgB;QAC/C,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IACE,OAAO,CAAC,aAAa;YACrB,OAAO,CAAC,qBAAqB;YAC7B,OAAO,CAAC,aAAa,EACrB,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACvD,IAAI,MAAM,IAAI,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;YAC5C,OAAO,MAAM,CAAC,QAAQ,CAAC;QACzB,CAAC;QAED,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAC3E,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC;YAC1C,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE;gBACtC,QAAQ;gBACR,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,kBAAkB;aAC3C,CAAC,CAAC;YACH,OAAO,QAAQ,CAAC;QAClB,CAAC;QAAC,MAAM,CAAC;YACP,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE;gBACtC,QAAQ,EAAE,KAAK;gBACf,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,kBAAkB;aAC3C,CAAC,CAAC;YACH,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAEO,gBAAgB,CAAC,OAAgB;QACvC,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC;QACf,CAAC;QAED,
|
|
1
|
+
{"version":3,"file":"collection-warning-service.js","sourceRoot":"","sources":["../../src/services/collection-warning-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-manager.d.ts","sourceRoot":"","sources":["../../src/services/config-manager.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"config-manager.d.ts","sourceRoot":"","sources":["../../src/services/config-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,kBAAkB,EAEnB,MAAM,oBAAoB,CAAC;AAe5B,qBAAa,aAAa;IACxB;;OAEG;IACH,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,kBAAkB;IAYtD;;OAEG;IACH,kBAAkB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,kBAAkB,EAAE;IAsBtE;;OAEG;IACH,yBAAyB,CAAC,MAAM,EAAE,oBAAoB,GAAG,IAAI;IAI7D;;OAEG;IACH,sBAAsB,IAAI,kBAAkB;IAuB5C;;OAEG;IACH,cAAc,CAAC,QAAQ,EAAE,kBAAkB,GAAG,MAAM;IAIpD;;OAEG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAUvC;;OAEG;IACH,mBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;CAczE"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ConfigManager = void 0;
|
|
4
|
+
const shared_1 = require("@agent-deck/shared");
|
|
4
5
|
const zod_1 = require("zod");
|
|
5
6
|
// Validation schemas
|
|
6
7
|
const LocalMCPServerConfigSchema = zod_1.z.object({
|
|
@@ -18,15 +19,14 @@ class ConfigManager {
|
|
|
18
19
|
*/
|
|
19
20
|
parseManifest(jsonContent) {
|
|
20
21
|
try {
|
|
21
|
-
const
|
|
22
|
-
|
|
23
|
-
return validated;
|
|
22
|
+
const normalized = (0, shared_1.parseLocalMcpManifestJson)(jsonContent);
|
|
23
|
+
return MCPServersManifestSchema.parse(normalized);
|
|
24
24
|
}
|
|
25
25
|
catch (error) {
|
|
26
26
|
if (error instanceof zod_1.z.ZodError) {
|
|
27
27
|
throw new Error(`Invalid manifest format: ${error.errors.map(e => e.message).join(', ')}`);
|
|
28
28
|
}
|
|
29
|
-
throw
|
|
29
|
+
throw error instanceof Error ? error : new Error('Failed to parse local MCP manifest');
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
32
|
/**
|
|
@@ -39,7 +39,7 @@ class ConfigManager {
|
|
|
39
39
|
name,
|
|
40
40
|
type: 'local-mcp',
|
|
41
41
|
url: `local://${name}`, // Use a local URL scheme for local servers
|
|
42
|
-
description: `Local MCP server: ${config.command} ${config.args.join(' ')}`,
|
|
42
|
+
description: `Local MCP server: ${config.command} ${(config.args ?? []).join(' ')}`,
|
|
43
43
|
cardColor: '#92E4DD', // Cyan for local MCP servers
|
|
44
44
|
localCommand: config.command,
|
|
45
45
|
localArgs: config.args,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-manager.js","sourceRoot":"","sources":["../../src/services/config-manager.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"config-manager.js","sourceRoot":"","sources":["../../src/services/config-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-client-manager.d.ts","sourceRoot":"","sources":["../../src/services/mcp-client-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"mcp-client-manager.d.ts","sourceRoot":"","sources":["../../src/services/mcp-client-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAa1D,UAAU,WAAW;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,kBAAkB,CAAwB;;YAMpC,SAAS;IAuFjB,aAAa,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IA8CvD,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAyB3E,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAuC3D,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAuBhE,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAuBhD,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC;IAyB/F,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAe/B"}
|
|
@@ -5,6 +5,7 @@ const index_js_1 = require("@modelcontextprotocol/sdk/client/index.js");
|
|
|
5
5
|
const sse_js_1 = require("@modelcontextprotocol/sdk/client/sse.js");
|
|
6
6
|
const streamableHttp_js_1 = require("@modelcontextprotocol/sdk/client/streamableHttp.js");
|
|
7
7
|
const local_mcp_server_manager_1 = require("./local-mcp-server-manager");
|
|
8
|
+
const mcp_connection_error_1 = require("../lib/mcp-connection-error");
|
|
8
9
|
class MCPClientManager {
|
|
9
10
|
clients = new Map();
|
|
10
11
|
localServerManager;
|
|
@@ -67,6 +68,10 @@ class MCPClientManager {
|
|
|
67
68
|
console.log(`✅ Connected to MCP service ${service.url} using StreamableHTTP transport`);
|
|
68
69
|
}
|
|
69
70
|
catch (streamableError) {
|
|
71
|
+
const streamableMessage = (0, mcp_connection_error_1.extractMcpErrorMessage)(streamableError);
|
|
72
|
+
if (streamableMessage) {
|
|
73
|
+
throw new Error(streamableMessage);
|
|
74
|
+
}
|
|
70
75
|
console.log(`⚠️ StreamableHTTP failed for ${service.url}, trying SSE transport:`, streamableError);
|
|
71
76
|
try {
|
|
72
77
|
// Fallback to SSE transport (legacy approach)
|
|
@@ -78,7 +83,7 @@ class MCPClientManager {
|
|
|
78
83
|
console.error(`❌ Both StreamableHTTP and SSE failed for ${service.url}`);
|
|
79
84
|
console.error(`StreamableHTTP error:`, streamableError);
|
|
80
85
|
console.error(`SSE error:`, sseError);
|
|
81
|
-
throw new Error(
|
|
86
|
+
throw new Error((0, mcp_connection_error_1.formatMcpConnectionError)(streamableError, sseError));
|
|
82
87
|
}
|
|
83
88
|
}
|
|
84
89
|
this.clients.set(clientKey, client);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-client-manager.js","sourceRoot":"","sources":["../../src/services/mcp-client-manager.ts"],"names":[],"mappings":";;;AACA,wEAAmE;AACnE,oEAA6E;AAC7E,0FAAmG;AACnG,yEAAmE;
|
|
1
|
+
{"version":3,"file":"mcp-client-manager.js","sourceRoot":"","sources":["../../src/services/mcp-client-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-discovery-service.d.ts","sourceRoot":"","sources":["../../src/services/mcp-discovery-service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mcp-discovery-service.d.ts","sourceRoot":"","sources":["../../src/services/mcp-discovery-service.ts"],"names":[],"mappings":"AAEA,UAAU,kBAAkB;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,GAAG,EAAE,CAAC;IACb,YAAY,EAAE;QACZ,uBAAuB,EAAE,OAAO,CAAC;QACjC,qBAAqB,EAAE,OAAO,CAAC;KAChC,CAAC;IACF,KAAK,EAAE;QACL,QAAQ,EAAE,OAAO,CAAC;QAClB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;QAC3B,sBAAsB,CAAC,EAAE,MAAM,EAAE,CAAC;QAClC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,2BAA2B,CAAC,EAAE,OAAO,CAAC;QACtC,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED,qBAAa,mBAAmB;IACxB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;YAuCjD,iBAAiB;YA0CjB,uBAAuB;CAGtC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.MCPDiscoveryService = void 0;
|
|
4
|
+
const mcp_oauth_discovery_1 = require("../lib/mcp-oauth-discovery");
|
|
4
5
|
class MCPDiscoveryService {
|
|
5
6
|
async discoverService(url) {
|
|
6
7
|
const result = {
|
|
@@ -79,85 +80,7 @@ class MCPDiscoveryService {
|
|
|
79
80
|
return result;
|
|
80
81
|
}
|
|
81
82
|
async detectOAuthRequirements(url) {
|
|
82
|
-
|
|
83
|
-
required: false,
|
|
84
|
-
};
|
|
85
|
-
try {
|
|
86
|
-
// Check for OAuth metadata endpoints
|
|
87
|
-
const baseUrl = new URL(url);
|
|
88
|
-
// Try OAuth Protected Resource metadata (RFC 9449)
|
|
89
|
-
const prUrl = `${baseUrl.origin}/.well-known/oauth-protected-resource`;
|
|
90
|
-
try {
|
|
91
|
-
const response = await fetch(prUrl);
|
|
92
|
-
if (response.ok) {
|
|
93
|
-
const data = await response.json();
|
|
94
|
-
oauthInfo.required = true;
|
|
95
|
-
oauthInfo.resourceName = data.resource_name;
|
|
96
|
-
oauthInfo.scopesSupported = data.scopes_supported || [];
|
|
97
|
-
oauthInfo.bearerMethodsSupported = data.bearer_methods_supported || [];
|
|
98
|
-
// Check for authorization servers
|
|
99
|
-
const authServers = data.authorization_servers || [];
|
|
100
|
-
if (authServers.length > 0) {
|
|
101
|
-
const asUrl = authServers[0];
|
|
102
|
-
const asResponse = await fetch(`${asUrl}/.well-known/oauth-authorization-server`);
|
|
103
|
-
if (asResponse.ok) {
|
|
104
|
-
const asData = await asResponse.json();
|
|
105
|
-
oauthInfo.authorizationUrl = asData.authorization_endpoint;
|
|
106
|
-
oauthInfo.tokenUrl = asData.token_endpoint;
|
|
107
|
-
oauthInfo.issuer = asData.issuer;
|
|
108
|
-
}
|
|
109
|
-
}
|
|
110
|
-
return oauthInfo;
|
|
111
|
-
}
|
|
112
|
-
}
|
|
113
|
-
catch (error) {
|
|
114
|
-
// Ignore errors for this endpoint
|
|
115
|
-
}
|
|
116
|
-
// Try OAuth Authorization Server metadata
|
|
117
|
-
const asUrl = `${baseUrl.origin}/.well-known/oauth-authorization-server`;
|
|
118
|
-
try {
|
|
119
|
-
const response = await fetch(asUrl);
|
|
120
|
-
if (response.ok) {
|
|
121
|
-
const data = await response.json();
|
|
122
|
-
oauthInfo.required = true;
|
|
123
|
-
oauthInfo.authorizationUrl = data.authorization_endpoint;
|
|
124
|
-
oauthInfo.tokenUrl = data.token_endpoint;
|
|
125
|
-
oauthInfo.issuer = data.issuer;
|
|
126
|
-
oauthInfo.scopesSupported = data.scopes_supported || [];
|
|
127
|
-
return oauthInfo;
|
|
128
|
-
}
|
|
129
|
-
}
|
|
130
|
-
catch (error) {
|
|
131
|
-
// Ignore errors for this endpoint
|
|
132
|
-
}
|
|
133
|
-
// Check for WWW-Authenticate header
|
|
134
|
-
try {
|
|
135
|
-
const response = await fetch(url, {
|
|
136
|
-
method: 'GET',
|
|
137
|
-
headers: {
|
|
138
|
-
'Accept': 'application/json, text/event-stream',
|
|
139
|
-
},
|
|
140
|
-
});
|
|
141
|
-
const wwwAuth = response.headers.get('www-authenticate');
|
|
142
|
-
if (wwwAuth && wwwAuth.toLowerCase().includes('oauth')) {
|
|
143
|
-
oauthInfo.required = true;
|
|
144
|
-
// Extract URLs from WWW-Authenticate header
|
|
145
|
-
const urlRegex = /https?:\/\/[^\s,;\"]+/g;
|
|
146
|
-
const urls = wwwAuth.match(urlRegex) || [];
|
|
147
|
-
if (urls.length > 0) {
|
|
148
|
-
oauthInfo.authorizationUrl = urls[0];
|
|
149
|
-
}
|
|
150
|
-
return oauthInfo;
|
|
151
|
-
}
|
|
152
|
-
}
|
|
153
|
-
catch (error) {
|
|
154
|
-
// Ignore errors for this check
|
|
155
|
-
}
|
|
156
|
-
}
|
|
157
|
-
catch (error) {
|
|
158
|
-
oauthInfo.error = error instanceof Error ? error.message : 'OAuth detection failed';
|
|
159
|
-
}
|
|
160
|
-
return oauthInfo;
|
|
83
|
+
return (0, mcp_oauth_discovery_1.discoverMcpOAuthRequirements)(url);
|
|
161
84
|
}
|
|
162
85
|
}
|
|
163
86
|
exports.MCPDiscoveryService = MCPDiscoveryService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-discovery-service.js","sourceRoot":"","sources":["../../src/services/mcp-discovery-service.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"mcp-discovery-service.js","sourceRoot":"","sources":["../../src/services/mcp-discovery-service.ts"],"names":[],"mappings":";;;AAAA,oEAA0E;AA4B1E,MAAa,mBAAmB;IAC9B,KAAK,CAAC,eAAe,CAAC,GAAW;QAC/B,MAAM,MAAM,GAAuB;YACjC,OAAO,EAAE,KAAK;YACd,cAAc,EAAE,MAAM;YACtB,GAAG;YACH,WAAW,EAAE,CAAC;YACd,KAAK,EAAE,EAAE;YACT,YAAY,EAAE;gBACZ,uBAAuB,EAAE,KAAK;gBAC9B,qBAAqB,EAAE,KAAK;aAC7B;YACD,KAAK,EAAE;gBACL,QAAQ,EAAE,KAAK;aAChB;YACD,MAAM,EAAE,SAAS;YACjB,KAAK,EAAE,IAAI;SACZ,CAAC;QAEF,IAAI,CAAC;YACH,sCAAsC;YACtC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC;YAC1D,MAAM,CAAC,KAAK,GAAG,SAAS,CAAC;YAEzB,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;gBACvB,uDAAuD;gBACvD,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;gBACtB,MAAM,CAAC,MAAM,GAAG,gBAAgB,CAAC;gBACjC,OAAO,MAAM,CAAC;YAChB,CAAC;YAED,wCAAwC;YACxC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;YACtD,OAAO,WAAW,CAAC;QACrB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC;YACxE,OAAO,MAAM,CAAC;QAChB,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,GAAW;QACzC,MAAM,MAAM,GAAuB;YACjC,OAAO,EAAE,KAAK;YACd,cAAc,EAAE,MAAM;YACtB,GAAG;YACH,WAAW,EAAE,CAAC;YACd,KAAK,EAAE,EAAE;YACT,YAAY,EAAE;gBACZ,uBAAuB,EAAE,KAAK;gBAC9B,qBAAqB,EAAE,KAAK;aAC7B;YACD,KAAK,EAAE;gBACL,QAAQ,EAAE,KAAK;aAChB;YACD,MAAM,EAAE,SAAS;YACjB,KAAK,EAAE,IAAI;SACZ,CAAC;QAEF,IAAI,CAAC;YACH,iEAAiE;YACjE,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;gBAChC,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE;oBACP,QAAQ,EAAE,qCAAqC;iBAChD;aACF,CAAC,CAAC;YAEH,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC;gBAChB,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;gBACtB,MAAM,CAAC,MAAM,GAAG,SAAS,CAAC;gBAC1B,MAAM,CAAC,YAAY,CAAC,uBAAuB,GAAG,IAAI,CAAC;gBACnD,MAAM,CAAC,YAAY,CAAC,qBAAqB,GAAG,IAAI,CAAC;YACnD,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,KAAK,GAAG,QAAQ,QAAQ,CAAC,MAAM,KAAK,QAAQ,CAAC,UAAU,EAAE,CAAC;YACnE,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,mBAAmB,CAAC;QAC9E,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,uBAAuB,CAAC,GAAW;QAC/C,OAAO,IAAA,kDAA4B,EAAC,GAAG,CAAC,CAAC;IAC3C,CAAC;CACF;AArFD,kDAqFC"}
|