@1mcp/agent 0.26.0 → 0.27.0
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/build/application/services/configReloadService.d.ts.map +1 -1
- package/build/application/services/configReloadService.js +7 -0
- package/build/application/services/configReloadService.js.map +1 -1
- package/build/application/services/healthService.js +2 -2
- package/build/application/services/healthService.js.map +1 -1
- package/build/application/services/tokenEstimationService.d.ts.map +1 -1
- package/build/application/services/tokenEstimationService.js.map +1 -1
- package/build/auth/sdkOAuthClientProvider.js.map +1 -1
- package/build/auth/sdkOAuthServerProvider.js +3 -3
- package/build/auth/sdkOAuthServerProvider.js.map +1 -1
- package/build/auth/storage/fileStorageService.js.map +1 -1
- package/build/commands/app/consolidate.d.ts.map +1 -1
- package/build/commands/app/consolidate.js +8 -2
- package/build/commands/app/consolidate.js.map +1 -1
- package/build/commands/app/discover.d.ts.map +1 -1
- package/build/commands/app/discover.js +2 -1
- package/build/commands/app/discover.js.map +1 -1
- package/build/commands/app/restore.js +7 -4
- package/build/commands/app/restore.js.map +1 -1
- package/build/commands/mcp/tokens.d.ts.map +1 -1
- package/build/commands/mcp/tokens.js.map +1 -1
- package/build/commands/mcp/utils/configUtils.d.ts.map +1 -1
- package/build/commands/mcp/utils/configUtils.js +29 -7
- package/build/commands/mcp/utils/configUtils.js.map +1 -1
- package/build/commands/mcp/utils/doubleHyphenParser.d.ts +1 -1
- package/build/commands/mcp/utils/doubleHyphenParser.d.ts.map +1 -1
- package/build/commands/mcp/utils/doubleHyphenParser.js.map +1 -1
- package/build/commands/mcp/utils/validation.d.ts +12 -1
- package/build/commands/mcp/utils/validation.d.ts.map +1 -1
- package/build/commands/mcp/utils/validation.js.map +1 -1
- package/build/commands/preset/interactive.js.map +1 -1
- package/build/commands/serve/index.d.ts +65 -0
- package/build/commands/serve/index.d.ts.map +1 -1
- package/build/commands/serve/index.js +65 -0
- package/build/commands/serve/index.js.map +1 -1
- package/build/commands/serve/serve.d.ts +13 -0
- package/build/commands/serve/serve.d.ts.map +1 -1
- package/build/commands/serve/serve.js +28 -17
- package/build/commands/serve/serve.js.map +1 -1
- package/build/commands/shared/configUtils.d.ts.map +1 -1
- package/build/commands/shared/configUtils.js +29 -7
- package/build/commands/shared/configUtils.js.map +1 -1
- package/build/commands/shared/validation.d.ts +12 -1
- package/build/commands/shared/validation.d.ts.map +1 -1
- package/build/commands/shared/validation.js.map +1 -1
- package/build/config/envProcessor.d.ts +7 -1
- package/build/config/envProcessor.d.ts.map +1 -1
- package/build/config/envProcessor.js +17 -11
- package/build/config/envProcessor.js.map +1 -1
- package/build/config/mcpConfigManager.d.ts +0 -1
- package/build/config/mcpConfigManager.d.ts.map +1 -1
- package/build/config/mcpConfigManager.js +32 -10
- package/build/config/mcpConfigManager.js.map +1 -1
- package/build/config/projectConfigLoader.js.map +1 -1
- package/build/constants/mcp.d.ts +1 -1
- package/build/constants/mcp.js +1 -1
- package/build/core/capabilities/asyncLoadingOrchestrator.d.ts.map +1 -1
- package/build/core/capabilities/asyncLoadingOrchestrator.js +14 -11
- package/build/core/capabilities/asyncLoadingOrchestrator.js.map +1 -1
- package/build/core/capabilities/capabilityAggregator.d.ts.map +1 -1
- package/build/core/capabilities/capabilityAggregator.js.map +1 -1
- package/build/core/capabilities/capabilityManager.js.map +1 -1
- package/build/core/client/clientManager.js.map +1 -1
- package/build/core/instructions/templateHelpers.js +3 -3
- package/build/core/instructions/templateHelpers.js.map +1 -1
- package/build/core/instructions/templateValidator.d.ts.map +1 -1
- package/build/core/instructions/templateValidator.js +2 -2
- package/build/core/instructions/templateValidator.js.map +1 -1
- package/build/core/loading/mcpLoadingManager.d.ts +1 -2
- package/build/core/loading/mcpLoadingManager.d.ts.map +1 -1
- package/build/core/loading/mcpLoadingManager.js +3 -2
- package/build/core/loading/mcpLoadingManager.js.map +1 -1
- package/build/core/notifications/notificationManager.d.ts.map +1 -1
- package/build/core/notifications/notificationManager.js +7 -0
- package/build/core/notifications/notificationManager.js.map +1 -1
- package/build/core/protocol/requestHandlers.js.map +1 -1
- package/build/core/server/agentConfig.d.ts +46 -114
- package/build/core/server/agentConfig.d.ts.map +1 -1
- package/build/core/server/agentConfig.js +101 -158
- package/build/core/server/agentConfig.js.map +1 -1
- package/build/core/server/pidFileManager.js +1 -1
- package/build/core/server/pidFileManager.js.map +1 -1
- package/build/core/server/serverManager.js.map +1 -1
- package/build/core/tools/handlers/searchHandler.d.ts +4 -1
- package/build/core/tools/handlers/searchHandler.d.ts.map +1 -1
- package/build/core/tools/handlers/searchHandler.js +8 -6
- package/build/core/tools/handlers/searchHandler.js.map +1 -1
- package/build/domains/backup/backupManager.d.ts.map +1 -1
- package/build/domains/backup/backupManager.js +52 -5
- package/build/domains/backup/backupManager.js.map +1 -1
- package/build/domains/discovery/appDiscovery.d.ts +3 -3
- package/build/domains/discovery/appDiscovery.d.ts.map +1 -1
- package/build/domains/discovery/appDiscovery.js +45 -25
- package/build/domains/discovery/appDiscovery.js.map +1 -1
- package/build/domains/discovery/appPresets.d.ts.map +1 -1
- package/build/domains/discovery/appPresets.js +10 -2
- package/build/domains/discovery/appPresets.js.map +1 -1
- package/build/domains/preset/manager/presetManager.d.ts.map +1 -1
- package/build/domains/preset/manager/presetManager.js +19 -7
- package/build/domains/preset/manager/presetManager.js.map +1 -1
- package/build/domains/preset/parsers/tagQueryEvaluator.d.ts +6 -2
- package/build/domains/preset/parsers/tagQueryEvaluator.d.ts.map +1 -1
- package/build/domains/preset/parsers/tagQueryEvaluator.js +12 -9
- package/build/domains/preset/parsers/tagQueryEvaluator.js.map +1 -1
- package/build/domains/preset/parsers/tagQueryParser.d.ts.map +1 -1
- package/build/domains/preset/parsers/tagQueryParser.js +1 -4
- package/build/domains/preset/parsers/tagQueryParser.js.map +1 -1
- package/build/domains/preset/services/presetNotificationService.d.ts +1 -1
- package/build/domains/preset/services/presetNotificationService.d.ts.map +1 -1
- package/build/domains/preset/services/presetNotificationService.js.map +1 -1
- package/build/domains/preset/types/presetTypes.d.ts +1 -1
- package/build/domains/preset/types/presetTypes.d.ts.map +1 -1
- package/build/domains/registry/cacheManager.d.ts +1 -1
- package/build/domains/registry/cacheManager.d.ts.map +1 -1
- package/build/domains/registry/cacheManager.js +1 -1
- package/build/domains/registry/cacheManager.js.map +1 -1
- package/build/domains/registry/mcpRegistryClient.d.ts.map +1 -1
- package/build/domains/registry/mcpRegistryClient.js +10 -6
- package/build/domains/registry/mcpRegistryClient.js.map +1 -1
- package/build/domains/registry/searchFiltering.d.ts.map +1 -1
- package/build/domains/registry/searchFiltering.js.map +1 -1
- package/build/domains/registry/types.d.ts +5 -10
- package/build/domains/registry/types.d.ts.map +1 -1
- package/build/logger/logger.d.ts +3 -3
- package/build/logger/logger.d.ts.map +1 -1
- package/build/logger/logger.js.map +1 -1
- package/build/logger/mcpLoggingEnhancer.d.ts.map +1 -1
- package/build/logger/mcpLoggingEnhancer.js +50 -13
- package/build/logger/mcpLoggingEnhancer.js.map +1 -1
- package/build/logger/secureLogger.d.ts +5 -5
- package/build/logger/secureLogger.d.ts.map +1 -1
- package/build/logger/secureLogger.js +14 -5
- package/build/logger/secureLogger.js.map +1 -1
- package/build/server.d.ts.map +1 -1
- package/build/server.js +7 -4
- package/build/server.js.map +1 -1
- package/build/transport/http/middlewares/httpRequestLogger.d.ts.map +1 -1
- package/build/transport/http/middlewares/httpRequestLogger.js +12 -6
- package/build/transport/http/middlewares/httpRequestLogger.js.map +1 -1
- package/build/transport/http/middlewares/scopeAuthMiddleware.d.ts +31 -0
- package/build/transport/http/middlewares/scopeAuthMiddleware.d.ts.map +1 -1
- package/build/transport/http/middlewares/scopeAuthMiddleware.js +78 -19
- package/build/transport/http/middlewares/scopeAuthMiddleware.js.map +1 -1
- package/build/transport/http/middlewares/securityMiddleware.d.ts.map +1 -1
- package/build/transport/http/middlewares/securityMiddleware.js +15 -11
- package/build/transport/http/middlewares/securityMiddleware.js.map +1 -1
- package/build/transport/http/restorableStreamableTransport.d.ts +1 -1
- package/build/transport/http/restorableStreamableTransport.d.ts.map +1 -1
- package/build/transport/http/restorableStreamableTransport.js +19 -4
- package/build/transport/http/restorableStreamableTransport.js.map +1 -1
- package/build/transport/http/routes/healthRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/healthRoutes.js +9 -9
- package/build/transport/http/routes/healthRoutes.js.map +1 -1
- package/build/transport/http/routes/oauthRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/oauthRoutes.js +54 -23
- package/build/transport/http/routes/oauthRoutes.js.map +1 -1
- package/build/transport/http/routes/sseRoutes.d.ts +2 -2
- package/build/transport/http/routes/sseRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/sseRoutes.js.map +1 -1
- package/build/transport/http/routes/streamableHttpRoutes.d.ts +2 -2
- package/build/transport/http/routes/streamableHttpRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/streamableHttpRoutes.js +7 -1
- package/build/transport/http/routes/streamableHttpRoutes.js.map +1 -1
- package/build/transport/http/server.js +7 -7
- package/build/transport/http/server.js.map +1 -1
- package/build/transport/http/storage/streamableSessionRepository.d.ts +1 -0
- package/build/transport/http/storage/streamableSessionRepository.d.ts.map +1 -1
- package/build/transport/http/storage/streamableSessionRepository.js +107 -16
- package/build/transport/http/storage/streamableSessionRepository.js.map +1 -1
- package/build/transport/restartableStdioTransport.d.ts +1 -1
- package/build/transport/restartableStdioTransport.d.ts.map +1 -1
- package/build/transport/restartableStdioTransport.js.map +1 -1
- package/build/transport/stdioProxyTransport.d.ts.map +1 -1
- package/build/transport/stdioProxyTransport.js +8 -2
- package/build/transport/stdioProxyTransport.js.map +1 -1
- package/build/transport/transportFactory.js +1 -1
- package/build/transport/transportFactory.js.map +1 -1
- package/build/utils/core/errorHandling.d.ts +3 -3
- package/build/utils/core/errorHandling.d.ts.map +1 -1
- package/build/utils/core/errorHandling.js +3 -1
- package/build/utils/core/errorHandling.js.map +1 -1
- package/build/utils/core/errorTypes.d.ts +4 -4
- package/build/utils/core/errorTypes.d.ts.map +1 -1
- package/build/utils/core/errorTypes.js +10 -0
- package/build/utils/core/errorTypes.js.map +1 -1
- package/build/utils/ui/interactiveSelector.d.ts.map +1 -1
- package/build/utils/ui/interactiveSelector.js +165 -37
- package/build/utils/ui/interactiveSelector.js.map +1 -1
- package/build/utils/ui/urlGenerator.d.ts.map +1 -1
- package/build/utils/ui/urlGenerator.js +11 -4
- package/build/utils/ui/urlGenerator.js.map +1 -1
- package/build/utils/validation/sanitization.d.ts +1 -1
- package/build/utils/validation/sanitization.d.ts.map +1 -1
- package/build/utils/validation/sanitization.js +2 -0
- package/build/utils/validation/sanitization.js.map +1 -1
- package/build/utils/validation/urlDetection.d.ts.map +1 -1
- package/build/utils/validation/urlDetection.js +1 -1
- package/build/utils/validation/urlDetection.js.map +1 -1
- package/build/utils/validation/validationHelpers.d.ts +4 -4
- package/build/utils/validation/validationHelpers.d.ts.map +1 -1
- package/build/utils/validation/validationHelpers.js +34 -25
- package/build/utils/validation/validationHelpers.js.map +1 -1
- package/package.json +3 -3
|
@@ -19,8 +19,8 @@ export function createOAuthRoutes(oauthProvider, loadingManager) {
|
|
|
19
19
|
const createOAuthLimiter = () => {
|
|
20
20
|
const serverConfig = AgentConfigManager.getInstance();
|
|
21
21
|
return rateLimit({
|
|
22
|
-
windowMs: serverConfig.
|
|
23
|
-
max: serverConfig.
|
|
22
|
+
windowMs: serverConfig.get('rateLimit').windowMs,
|
|
23
|
+
max: serverConfig.get('rateLimit').max,
|
|
24
24
|
standardHeaders: true,
|
|
25
25
|
legacyHeaders: false,
|
|
26
26
|
message: RATE_LIMIT_CONFIG.OAUTH.MESSAGE,
|
|
@@ -69,7 +69,8 @@ export function createOAuthRoutes(oauthProvider, loadingManager) {
|
|
|
69
69
|
}
|
|
70
70
|
catch (error) {
|
|
71
71
|
logger.error('Error serving OAuth dashboard:', error);
|
|
72
|
-
|
|
72
|
+
const errorResponse = { error: 'Internal server error' };
|
|
73
|
+
res.status(500).json(errorResponse);
|
|
73
74
|
}
|
|
74
75
|
});
|
|
75
76
|
/**
|
|
@@ -81,7 +82,8 @@ export function createOAuthRoutes(oauthProvider, loadingManager) {
|
|
|
81
82
|
const serverManager = ServerManager.current;
|
|
82
83
|
const clientInfo = serverManager.getClient(serverName);
|
|
83
84
|
if (!clientInfo) {
|
|
84
|
-
|
|
85
|
+
const errorResponse = { error: 'Service not found' };
|
|
86
|
+
res.status(404).json(errorResponse);
|
|
85
87
|
return;
|
|
86
88
|
}
|
|
87
89
|
if (clientInfo.authorizationUrl) {
|
|
@@ -100,14 +102,16 @@ export function createOAuthRoutes(oauthProvider, loadingManager) {
|
|
|
100
102
|
return;
|
|
101
103
|
}
|
|
102
104
|
else {
|
|
103
|
-
|
|
105
|
+
const errorResponse = { error: 'Failed to generate OAuth URL' };
|
|
106
|
+
res.status(500).json(errorResponse);
|
|
104
107
|
return;
|
|
105
108
|
}
|
|
106
109
|
}
|
|
107
110
|
}
|
|
108
111
|
catch (error) {
|
|
109
112
|
logger.error(`Error starting OAuth for ${req.params.serverName}:`, error);
|
|
110
|
-
|
|
113
|
+
const errorResponse = { error: 'Failed to start OAuth flow' };
|
|
114
|
+
res.status(500).json(errorResponse);
|
|
111
115
|
}
|
|
112
116
|
};
|
|
113
117
|
router.get('/authorize/:serverName', authorizeHandler);
|
|
@@ -157,16 +161,19 @@ export function createOAuthRoutes(oauthProvider, loadingManager) {
|
|
|
157
161
|
const serverManager = ServerManager.current;
|
|
158
162
|
const clientInfo = serverManager.getClient(serverName);
|
|
159
163
|
if (!clientInfo) {
|
|
160
|
-
|
|
164
|
+
const errorResponse = { error: 'Service not found' };
|
|
165
|
+
res.status(404).json(errorResponse);
|
|
161
166
|
return;
|
|
162
167
|
}
|
|
163
168
|
// Clear existing OAuth data and restart flow
|
|
164
169
|
await restartOAuthFlow(serverName);
|
|
165
|
-
|
|
170
|
+
const successResponse = { success: 'true', message: 'OAuth flow restarted' };
|
|
171
|
+
res.json(successResponse);
|
|
166
172
|
}
|
|
167
173
|
catch (error) {
|
|
168
174
|
logger.error(`Error restarting OAuth for ${serverName}:`, error);
|
|
169
|
-
|
|
175
|
+
const errorResponse = { error: 'Failed to restart OAuth flow' };
|
|
176
|
+
res.status(500).json(errorResponse);
|
|
170
177
|
}
|
|
171
178
|
};
|
|
172
179
|
router.post('/restart/:serverName', restartHandler);
|
|
@@ -175,32 +182,39 @@ export function createOAuthRoutes(oauthProvider, loadingManager) {
|
|
|
175
182
|
*/
|
|
176
183
|
const consentHandler = async (req, res) => {
|
|
177
184
|
try {
|
|
178
|
-
|
|
185
|
+
// Extract and validate request body parameters
|
|
186
|
+
const body = req.body;
|
|
187
|
+
const auth_request_id = body.auth_request_id;
|
|
188
|
+
const action = body.action;
|
|
189
|
+
const scopes = body.scopes;
|
|
179
190
|
// Validate required fields
|
|
180
191
|
if (!auth_request_id || !action) {
|
|
181
|
-
|
|
192
|
+
const errorResponse = {
|
|
182
193
|
error: 'invalid_request',
|
|
183
194
|
error_description: 'Missing required parameters',
|
|
184
|
-
}
|
|
195
|
+
};
|
|
196
|
+
res.status(400).json(errorResponse);
|
|
185
197
|
return;
|
|
186
198
|
}
|
|
187
199
|
// Use the OAuth provider's storage service to ensure consistent storage directory
|
|
188
200
|
const authRequest = oauthProvider.oauthStorage.getAuthorizationRequest(auth_request_id);
|
|
189
201
|
if (!authRequest) {
|
|
190
|
-
|
|
202
|
+
const errorResponse = {
|
|
191
203
|
error: 'invalid_request',
|
|
192
204
|
error_description: 'Invalid or expired authorization request',
|
|
193
|
-
}
|
|
205
|
+
};
|
|
206
|
+
res.status(400).json(errorResponse);
|
|
194
207
|
return;
|
|
195
208
|
}
|
|
196
209
|
// Get client data using the OAuth provider's storage service
|
|
197
210
|
const clientKey = `${AUTH_CONFIG.CLIENT.PREFIXES.CLIENT}${authRequest.clientId}`;
|
|
198
211
|
const client = oauthProvider.oauthStorage.clientDataRepository.get(clientKey);
|
|
199
212
|
if (!client) {
|
|
200
|
-
|
|
213
|
+
const errorResponse = {
|
|
201
214
|
error: 'invalid_client',
|
|
202
215
|
error_description: 'Client not found',
|
|
203
|
-
}
|
|
216
|
+
};
|
|
217
|
+
res.status(400).json(errorResponse);
|
|
204
218
|
return;
|
|
205
219
|
}
|
|
206
220
|
// Client validation passed - we have a valid client
|
|
@@ -212,14 +226,29 @@ export function createOAuthRoutes(oauthProvider, loadingManager) {
|
|
|
212
226
|
}
|
|
213
227
|
if (action === 'approve') {
|
|
214
228
|
// User approved the authorization
|
|
215
|
-
|
|
229
|
+
let selectedScopes;
|
|
230
|
+
if (Array.isArray(scopes)) {
|
|
231
|
+
// Ensure all items are strings
|
|
232
|
+
selectedScopes = scopes.filter((scope) => typeof scope === 'string');
|
|
233
|
+
}
|
|
234
|
+
else if (typeof scopes === 'string') {
|
|
235
|
+
selectedScopes = [scopes];
|
|
236
|
+
}
|
|
237
|
+
else if (scopes) {
|
|
238
|
+
// Handle other types by converting to string
|
|
239
|
+
selectedScopes = [String(scopes)];
|
|
240
|
+
}
|
|
241
|
+
else {
|
|
242
|
+
selectedScopes = [];
|
|
243
|
+
}
|
|
216
244
|
// Validate selected scopes
|
|
217
245
|
const validation = validateScopes(selectedScopes);
|
|
218
246
|
if (!validation.isValid) {
|
|
219
|
-
|
|
247
|
+
const errorResponse = {
|
|
220
248
|
error: 'invalid_scope',
|
|
221
249
|
error_description: `Invalid scopes: ${validation.errors.join(', ')}`,
|
|
222
|
-
}
|
|
250
|
+
};
|
|
251
|
+
res.status(400).json(errorResponse);
|
|
223
252
|
return;
|
|
224
253
|
}
|
|
225
254
|
// Use the service layer for approval processing
|
|
@@ -228,17 +257,19 @@ export function createOAuthRoutes(oauthProvider, loadingManager) {
|
|
|
228
257
|
return;
|
|
229
258
|
}
|
|
230
259
|
// Invalid action
|
|
231
|
-
|
|
260
|
+
const errorResponse = {
|
|
232
261
|
error: 'invalid_request',
|
|
233
262
|
error_description: 'Invalid action',
|
|
234
|
-
}
|
|
263
|
+
};
|
|
264
|
+
res.status(400).json(errorResponse);
|
|
235
265
|
}
|
|
236
266
|
catch (error) {
|
|
237
267
|
logger.error('Error handling consent form:', error);
|
|
238
|
-
|
|
268
|
+
const errorResponse = {
|
|
239
269
|
error: 'server_error',
|
|
240
270
|
error_description: 'Internal server error',
|
|
241
|
-
}
|
|
271
|
+
};
|
|
272
|
+
res.status(500).json(errorResponse);
|
|
242
273
|
}
|
|
243
274
|
};
|
|
244
275
|
router.post('/consent', sensitiveOperationLimiter, consentHandler);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauthRoutes.js","sourceRoot":"","sources":["../../../../src/transport/http/routes/oauthRoutes.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"oauthRoutes.js","sourceRoot":"","sources":["../../../../src/transport/http/routes/oauthRoutes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AsyncLoadingOrchestrator } from '../../../core/capabilities/asyncLoadingOrchestrator.js';
|
|
2
2
|
import { ServerManager } from '../../../core/server/serverManager.js';
|
|
3
|
-
import { Router } from 'express';
|
|
4
|
-
export declare function setupSseRoutes(router: Router, serverManager: ServerManager, authMiddleware:
|
|
3
|
+
import { RequestHandler, Router } from 'express';
|
|
4
|
+
export declare function setupSseRoutes(router: Router, serverManager: ServerManager, authMiddleware: RequestHandler, availabilityMiddleware?: RequestHandler, asyncOrchestrator?: AsyncLoadingOrchestrator, customTemplate?: string): void;
|
|
5
5
|
//# sourceMappingURL=sseRoutes.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sseRoutes.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/routes/sseRoutes.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,wBAAwB,EAAE,MAAM,oDAAoD,CAAC;AAC9F,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAYlE,OAAO,
|
|
1
|
+
{"version":3,"file":"sseRoutes.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/routes/sseRoutes.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,wBAAwB,EAAE,MAAM,oDAAoD,CAAC;AAC9F,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAYlE,OAAO,EAAW,cAAc,EAAY,MAAM,EAAE,MAAM,SAAS,CAAC;AAEpE,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,aAAa,EAC5B,cAAc,EAAE,cAAc,EAC9B,sBAAsB,CAAC,EAAE,cAAc,EACvC,iBAAiB,CAAC,EAAE,wBAAwB,EAC5C,cAAc,CAAC,EAAE,MAAM,GACtB,IAAI,CA8FN"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sseRoutes.js","sourceRoot":"","sources":["../../../../src/transport/http/routes/sseRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAE/D,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,MAAM,MAAM,uBAAuB,CAAC;AAC3C,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,WAAW,EACX,gBAAgB,GACjB,MAAM,wDAAwD,CAAC;AAChE,OAAO,aAAa,MAAM,kDAAkD,CAAC;AAI7E,MAAM,UAAU,cAAc,CAC5B,MAAc,EACd,aAA4B,EAC5B,
|
|
1
|
+
{"version":3,"file":"sseRoutes.js","sourceRoot":"","sources":["../../../../src/transport/http/routes/sseRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAE/D,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,MAAM,MAAM,uBAAuB,CAAC;AAC3C,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,WAAW,EACX,gBAAgB,GACjB,MAAM,wDAAwD,CAAC;AAChE,OAAO,aAAa,MAAM,kDAAkD,CAAC;AAI7E,MAAM,UAAU,cAAc,CAC5B,MAAc,EACd,aAA4B,EAC5B,cAA8B,EAC9B,sBAAuC,EACvC,iBAA4C,EAC5C,cAAuB;IAEvB,MAAM,WAAW,GAAG,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;IAEpD,0CAA0C;IAC1C,IAAI,sBAAsB,EAAE,CAAC;QAC3B,WAAW,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;IAC3C,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,YAAY,EAAE,GAAG,WAAW,EAAE,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;QAC7E,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,IAAI,kBAAkB,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC;YAEjE,mEAAmE;YACnE,MAAM,IAAI,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;YACnC,MAAM,aAAa,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;YAC5C,MAAM,aAAa,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;YAC5C,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;YAClC,MAAM,UAAU,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;YAEtC,iDAAiD;YACjD,MAAM,aAAa,CAAC,gBAAgB,CAAC,SAAS,EAAE,SAAS,CAAC,SAAS,EAAE;gBACnE,IAAI;gBACJ,aAAa;gBACb,aAAa;gBACb,QAAQ;gBACR,UAAU;gBACV,gBAAgB,EAAE,GAAG,CAAC,KAAK,CAAC,UAAU,KAAK,MAAM;gBACjD,cAAc;aACf,CAAC,CAAC;YAEH,wDAAwD;YACxD,IAAI,iBAAiB,EAAE,CAAC;gBACtB,MAAM,iBAAiB,GAAG,aAAa,CAAC,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;gBACvE,IAAI,iBAAiB,EAAE,CAAC;oBACtB,iBAAiB,CAAC,uBAAuB,CAAC,iBAAiB,CAAC,CAAC;oBAC7D,MAAM,CAAC,KAAK,CAAC,2DAA2D,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC;gBACjG,CAAC;YACH,CAAC;YAED,SAAS,CAAC,OAAO,GAAG,GAAG,EAAE;gBACvB,aAAa,CAAC,mBAAmB,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;gBACvD,qDAAqD;YACvD,CAAC,CAAC;YAEF,SAAS,CAAC,OAAO,GAAG,CAAC,KAAK,EAAE,EAAE;gBAC5B,MAAM,CAAC,KAAK,CAAC,mCAAmC,SAAS,CAAC,SAAS,GAAG,EAAE,KAAK,CAAC,CAAC;gBAC/E,MAAM,MAAM,GAAG,aAAa,CAAC,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;gBAC5D,IAAI,MAAM,EAAE,CAAC;oBACX,MAAM,CAAC,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC;oBACnC,MAAM,CAAC,SAAS,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;gBAC/E,CAAC;YACH,CAAC,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC;YAC7C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QACxB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,GAAG,WAAW,EAAE,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;QACnF,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,SAAmB,CAAC;YAChD,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACnB,KAAK,EAAE;wBACL,IAAI,EAAE,SAAS,CAAC,aAAa;wBAC7B,OAAO,EAAE,uCAAuC;qBACjD;iBACF,CAAC,CAAC;gBACH,OAAO;YACT,CAAC;YAED,MAAM,SAAS,GAAG,aAAa,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;YAExD,IAAI,SAAS,YAAY,kBAAkB,EAAE,CAAC;gBAC5C,MAAM,SAAS,CAAC,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;gBACtD,OAAO;YACT,CAAC;YAED,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACnB,KAAK,EAAE;oBACL,IAAI,EAAE,SAAS,CAAC,aAAa;oBAC7B,OAAO,EAAE,qBAAqB;iBAC/B;aACF,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAC;YAC/C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACnB,KAAK,EAAE;oBACL,IAAI,EAAE,SAAS,CAAC,aAAa;oBAC7B,OAAO,EAAE,uBAAuB;iBACjC;aACF,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { AsyncLoadingOrchestrator } from '../../../core/capabilities/asyncLoadingOrchestrator.js';
|
|
2
2
|
import { ServerManager } from '../../../core/server/serverManager.js';
|
|
3
3
|
import { StreamableSessionRepository } from '../../../transport/http/storage/streamableSessionRepository.js';
|
|
4
|
-
import { Router } from 'express';
|
|
5
|
-
export declare function setupStreamableHttpRoutes(router: Router, serverManager: ServerManager, sessionRepository: StreamableSessionRepository, authMiddleware:
|
|
4
|
+
import { RequestHandler, Router } from 'express';
|
|
5
|
+
export declare function setupStreamableHttpRoutes(router: Router, serverManager: ServerManager, sessionRepository: StreamableSessionRepository, authMiddleware: RequestHandler, availabilityMiddleware?: RequestHandler, asyncOrchestrator?: AsyncLoadingOrchestrator, customTemplate?: string): void;
|
|
6
6
|
//# sourceMappingURL=streamableHttpRoutes.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streamableHttpRoutes.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/routes/streamableHttpRoutes.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,wBAAwB,EAAE,MAAM,oDAAoD,CAAC;AAC9F,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAYlE,OAAO,EAAE,2BAA2B,EAAE,MAAM,4DAA4D,CAAC;AAEzG,OAAO,
|
|
1
|
+
{"version":3,"file":"streamableHttpRoutes.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/routes/streamableHttpRoutes.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,wBAAwB,EAAE,MAAM,oDAAoD,CAAC;AAC9F,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAYlE,OAAO,EAAE,2BAA2B,EAAE,MAAM,4DAA4D,CAAC;AAEzG,OAAO,EAAW,cAAc,EAAY,MAAM,EAAE,MAAM,SAAS,CAAC;AA6EpE,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,aAAa,EAC5B,iBAAiB,EAAE,2BAA2B,EAC9C,cAAc,EAAE,cAAc,EAC9B,sBAAsB,CAAC,EAAE,cAAc,EACvC,iBAAiB,CAAC,EAAE,wBAAwB,EAC5C,cAAc,CAAC,EAAE,MAAM,GACtB,IAAI,CA0LN"}
|
|
@@ -28,7 +28,13 @@ async function restoreSession(sessionId, serverManager, sessionRepository, async
|
|
|
28
28
|
// Mark the transport as initialized for restored session
|
|
29
29
|
// The wrapper class safely handles the SDK's internal _initialized flag
|
|
30
30
|
transport.markAsInitialized();
|
|
31
|
-
|
|
31
|
+
// Safely set sessionId if possible
|
|
32
|
+
try {
|
|
33
|
+
transport.sessionId = sessionId;
|
|
34
|
+
}
|
|
35
|
+
catch (error) {
|
|
36
|
+
logger.warn('Could not set sessionId on restored transport:', error);
|
|
37
|
+
}
|
|
32
38
|
// Reconnect with the original configuration
|
|
33
39
|
await serverManager.connectTransport(transport, sessionId, config);
|
|
34
40
|
// Initialize notifications for async loading if enabled
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streamableHttpRoutes.js","sourceRoot":"","sources":["../../../../src/transport/http/routes/streamableHttpRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AACnG,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAE/D,OAAO,EAAE,WAAW,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAG1E,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,MAAM,MAAM,uBAAuB,CAAC;AAC3C,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,WAAW,EACX,gBAAgB,GACjB,MAAM,wDAAwD,CAAC;AAChE,OAAO,aAAa,MAAM,kDAAkD,CAAC;AAC7E,OAAO,EAAE,uCAAuC,EAAE,MAAM,sDAAsD,CAAC;AAK/G;;;GAGG;AACH,KAAK,UAAU,cAAc,CAC3B,SAAiB,EACjB,aAA4B,EAC5B,iBAA8C,EAC9C,iBAA4C;IAE5C,IAAI,CAAC;QACH,8CAA8C;QAC9C,MAAM,WAAW,GAAG,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACrD,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,CAAC,KAAK,CAAC,mCAAmC,SAAS,EAAE,CAAC,CAAC;YAC7D,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,MAAM,GAAG,WAAW,CAAC;QAE3B,MAAM,CAAC,IAAI,CAAC,iCAAiC,SAAS,EAAE,CAAC,CAAC;QAE1D,wEAAwE;QACxE,MAAM,SAAS,GAAG,IAAI,uCAAuC,CAAC;YAC5D,kBAAkB,EAAE,GAAG,EAAE,CAAC,SAAS;SACpC,CAAC,CAAC;QAEH,yDAAyD;QACzD,wEAAwE;QACxE,SAAS,CAAC,iBAAiB,EAAE,CAAC;QAC9B,
|
|
1
|
+
{"version":3,"file":"streamableHttpRoutes.js","sourceRoot":"","sources":["../../../../src/transport/http/routes/streamableHttpRoutes.ts"],"names":[],"mappings":"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"}
|
|
@@ -59,9 +59,9 @@ export class ExpressServer {
|
|
|
59
59
|
this.customTemplate = customTemplate;
|
|
60
60
|
this.configManager = AgentConfigManager.getInstance();
|
|
61
61
|
// Configure trust proxy setting before any middleware
|
|
62
|
-
this.app.set('trust proxy', this.configManager.
|
|
62
|
+
this.app.set('trust proxy', this.configManager.get('trustProxy'));
|
|
63
63
|
// Initialize OAuth provider with custom session storage path if configured
|
|
64
|
-
const sessionStoragePath = this.configManager.
|
|
64
|
+
const sessionStoragePath = this.configManager.get('auth').sessionStoragePath;
|
|
65
65
|
this.oauthProvider = new SDKOAuthServerProvider(sessionStoragePath);
|
|
66
66
|
// Initialize streamable session repository with 'transport' subdirectory
|
|
67
67
|
const fileStorageService = new FileStorageService(sessionStoragePath, STORAGE_SUBDIRS.TRANSPORT);
|
|
@@ -81,7 +81,7 @@ export class ExpressServer {
|
|
|
81
81
|
*/
|
|
82
82
|
setupMiddleware() {
|
|
83
83
|
// Conditionally apply enhanced security middleware (must be first if enabled)
|
|
84
|
-
if (this.configManager.
|
|
84
|
+
if (this.configManager.get('features').enhancedSecurity) {
|
|
85
85
|
this.app.use(...setupSecurityMiddleware());
|
|
86
86
|
}
|
|
87
87
|
// Add HTTP request logging middleware (early in the stack for complete coverage)
|
|
@@ -106,8 +106,8 @@ export class ExpressServer {
|
|
|
106
106
|
// Setup OAuth routes using SDK's mcpAuthRouter
|
|
107
107
|
const issuerUrl = new URL(this.configManager.getUrl());
|
|
108
108
|
const rateLimitConfig = {
|
|
109
|
-
windowMs: this.configManager.
|
|
110
|
-
max: this.configManager.
|
|
109
|
+
windowMs: this.configManager.get('rateLimit').windowMs,
|
|
110
|
+
max: this.configManager.get('rateLimit').max,
|
|
111
111
|
message: RATE_LIMIT_CONFIG.OAUTH.MESSAGE,
|
|
112
112
|
standardHeaders: true,
|
|
113
113
|
legacyHeaders: false,
|
|
@@ -152,7 +152,7 @@ export class ExpressServer {
|
|
|
152
152
|
setupSseRoutes(router, this.serverManager, scopeAuthMiddleware, availabilityMiddleware, this.asyncOrchestrator, this.customTemplate);
|
|
153
153
|
this.app.use(router);
|
|
154
154
|
// Log authentication status
|
|
155
|
-
if (this.configManager.
|
|
155
|
+
if (this.configManager.get('features').auth) {
|
|
156
156
|
logger.info('Authentication enabled - OAuth 2.1 endpoints available via SDK');
|
|
157
157
|
}
|
|
158
158
|
else {
|
|
@@ -171,7 +171,7 @@ export class ExpressServer {
|
|
|
171
171
|
start() {
|
|
172
172
|
const { port, host } = this.configManager.getConfig();
|
|
173
173
|
this.app.listen(port, host, () => {
|
|
174
|
-
const authStatus = this.configManager.
|
|
174
|
+
const authStatus = this.configManager.get('features').auth ? 'with authentication' : 'without authentication';
|
|
175
175
|
logger.info(`Server is running on port ${port} with HTTP/SSE and Streamable HTTP transport ${authStatus}`);
|
|
176
176
|
logger.info(`📋 OAuth Management Dashboard: ${this.configManager.getUrl()}/oauth`);
|
|
177
177
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/transport/http/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iDAAiD,CAAC;AAEhF,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAErE,OAAO,MAAM,MAAM,uBAAuB,CAAC;AAE3C,OAAO,UAAU,MAAM,aAAa,CAAC;AACrC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,OAAO,MAAM,SAAS,CAAC;AAG9B,OAAO,YAAY,MAAM,+BAA+B,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,+BAA+B,EAAE,MAAM,4CAA4C,CAAC;AAC7F,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;AACjF,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAC1D,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAC;AAEvF;;;;;;;;;;;;GAYG;AACH,MAAM,OAAO,aAAa;IAChB,GAAG,CAAsB;IACzB,aAAa,CAAgB;IAC7B,cAAc,CAAqB;IACnC,iBAAiB,CAA4B;IAC7C,aAAa,CAAyB;IACtC,aAAa,CAAqB;IAClC,cAAc,CAAU;IACxB,2BAA2B,CAA8B;IAEjE;;;;;;;;;;OAUG;IACH,YACE,aAA4B,EAC5B,cAAkC,EAClC,iBAA4C,EAC5C,cAAuB;QAEvB,IAAI,CAAC,GAAG,GAAG,OAAO,EAAE,CAAC;QAErB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,aAAa,GAAG,kBAAkB,CAAC,WAAW,EAAE,CAAC;QAEtD,sDAAsD;QACtD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/transport/http/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streamableSessionRepository.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/storage/streamableSessionRepository.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"streamableSessionRepository.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/storage/streamableSessionRepository.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAG7E,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AAKnE;;;;;;;;;GASG;AACH,qBAAa,2BAA2B;IAa1B,OAAO,CAAC,OAAO;IAX3B,OAAO,CAAC,gBAAgB,CAA6B;IACrD,OAAO,CAAC,eAAe,CAA6B;IACpD,OAAO,CAAC,aAAa,CAA6B;IAClD,OAAO,CAAC,eAAe,CAAqB;IAG5C,OAAO,CAAC,gBAAgB,CAA4C;IAGpE,OAAO,CAAC,aAAa,CAA+C;gBAEhD,OAAO,EAAE,kBAAkB;IAI/C;;OAEG;IACH,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,uBAAuB,GAAG,IAAI;IA2BhE;;OAEG;IACH,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,uBAAuB,GAAG,IAAI;IAgEtD;;;;;OAKG;IACH,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAiCrC;;OAEG;IACH,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAsBlC;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAkC5B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAuB1B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAU1B;;OAEG;IACI,iBAAiB,IAAI,IAAI;CAUjC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { AUTH_CONFIG } from '../../../constants.js';
|
|
2
|
+
import { AgentConfigManager } from '../../../core/server/agentConfig.js';
|
|
2
3
|
import logger from '../../../logger/logger.js';
|
|
3
4
|
/**
|
|
4
5
|
* Repository for streamable HTTP session operations
|
|
@@ -17,6 +18,8 @@ export class StreamableSessionRepository {
|
|
|
17
18
|
lastAccessTimes = new Map();
|
|
18
19
|
requestCounts = new Map();
|
|
19
20
|
dirtySessionIds = new Set();
|
|
21
|
+
// In-memory session store (used when persistence is disabled or as cache)
|
|
22
|
+
inMemorySessions = new Map();
|
|
20
23
|
// Background flush
|
|
21
24
|
flushInterval = null;
|
|
22
25
|
constructor(storage) {
|
|
@@ -39,22 +42,70 @@ export class StreamableSessionRepository {
|
|
|
39
42
|
createdAt: Date.now(),
|
|
40
43
|
lastAccessedAt: Date.now(),
|
|
41
44
|
};
|
|
42
|
-
|
|
43
|
-
|
|
45
|
+
// Always store in memory
|
|
46
|
+
this.inMemorySessions.set(sessionId, sessionData);
|
|
47
|
+
// Conditionally persist to disk
|
|
48
|
+
const agentConfig = AgentConfigManager.getInstance();
|
|
49
|
+
if (agentConfig.get('features').sessionPersistence) {
|
|
50
|
+
this.storage.writeData(AUTH_CONFIG.SERVER.STREAMABLE_SESSION.FILE_PREFIX, sessionId, sessionData);
|
|
51
|
+
logger.info(`Created streamable session with persistence: ${sessionId}`);
|
|
52
|
+
}
|
|
53
|
+
else {
|
|
54
|
+
logger.info(`Created streamable session (memory-only): ${sessionId}`);
|
|
55
|
+
}
|
|
44
56
|
}
|
|
45
57
|
/**
|
|
46
58
|
* Retrieves a session by ID and returns the configuration
|
|
47
59
|
*/
|
|
48
60
|
get(sessionId) {
|
|
49
|
-
|
|
61
|
+
// Check in-memory store first
|
|
62
|
+
let sessionData = this.inMemorySessions.get(sessionId);
|
|
63
|
+
// If not in memory and persistence is enabled, try reading from disk
|
|
64
|
+
if (!sessionData) {
|
|
65
|
+
const agentConfig = AgentConfigManager.getInstance();
|
|
66
|
+
if (agentConfig.get('features').sessionPersistence) {
|
|
67
|
+
const diskData = this.storage.readData(AUTH_CONFIG.SERVER.STREAMABLE_SESSION.FILE_PREFIX, sessionId);
|
|
68
|
+
// Cache in memory if found
|
|
69
|
+
if (diskData) {
|
|
70
|
+
sessionData = diskData;
|
|
71
|
+
this.inMemorySessions.set(sessionId, diskData);
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
}
|
|
50
75
|
if (!sessionData) {
|
|
51
76
|
return null;
|
|
52
77
|
}
|
|
53
|
-
// Parse JSON fields back to objects
|
|
78
|
+
// Parse JSON fields back to objects with proper error handling
|
|
79
|
+
let tagExpression;
|
|
80
|
+
if (sessionData.tagExpression) {
|
|
81
|
+
try {
|
|
82
|
+
const parsed = JSON.parse(sessionData.tagExpression);
|
|
83
|
+
// Validate that the parsed object conforms to TagExpression interface
|
|
84
|
+
if (parsed && typeof parsed === 'object' && 'type' in parsed) {
|
|
85
|
+
tagExpression = parsed;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
catch (error) {
|
|
89
|
+
logger.warn(`Failed to parse tagExpression for session ${sessionId}:`, error);
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
let tagQuery;
|
|
93
|
+
if (sessionData.tagQuery) {
|
|
94
|
+
try {
|
|
95
|
+
const parsed = JSON.parse(sessionData.tagQuery);
|
|
96
|
+
// Validate that the parsed object conforms to TagQuery interface
|
|
97
|
+
if (parsed && typeof parsed === 'object') {
|
|
98
|
+
tagQuery = parsed;
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
catch (error) {
|
|
102
|
+
logger.warn(`Failed to parse tagQuery for session ${sessionId}:`, error);
|
|
103
|
+
}
|
|
104
|
+
}
|
|
54
105
|
const config = {
|
|
55
106
|
tags: sessionData.tags,
|
|
56
|
-
tagExpression
|
|
57
|
-
tagQuery
|
|
107
|
+
tagExpression,
|
|
108
|
+
tagQuery,
|
|
58
109
|
tagFilterMode: sessionData.tagFilterMode,
|
|
59
110
|
presetName: sessionData.presetName,
|
|
60
111
|
enablePagination: sessionData.enablePagination,
|
|
@@ -75,11 +126,23 @@ export class StreamableSessionRepository {
|
|
|
75
126
|
const count = (this.requestCounts.get(sessionId) || 0) + 1;
|
|
76
127
|
this.requestCounts.set(sessionId, count);
|
|
77
128
|
this.dirtySessionIds.add(sessionId);
|
|
78
|
-
//
|
|
129
|
+
// Update in-memory session data
|
|
130
|
+
const sessionData = this.inMemorySessions.get(sessionId);
|
|
131
|
+
if (sessionData) {
|
|
132
|
+
sessionData.lastAccessedAt = now;
|
|
133
|
+
sessionData.expires = now + AUTH_CONFIG.SERVER.STREAMABLE_SESSION.TTL_MS;
|
|
134
|
+
}
|
|
135
|
+
// Check if persistence is enabled
|
|
136
|
+
const agentConfig = AgentConfigManager.getInstance();
|
|
137
|
+
if (!agentConfig.get('features').sessionPersistence) {
|
|
138
|
+
return;
|
|
139
|
+
}
|
|
140
|
+
// Check dual triggers: N requests OR M minutes (using configurable values)
|
|
79
141
|
const lastPersist = this.lastPersistTimes.get(sessionId) || 0;
|
|
80
142
|
const timeSince = now - lastPersist;
|
|
81
|
-
const
|
|
82
|
-
|
|
143
|
+
const persistRequests = agentConfig.get('sessionPersistence').persistRequests;
|
|
144
|
+
const persistIntervalMs = agentConfig.get('sessionPersistence').persistIntervalMinutes * 60 * 1000;
|
|
145
|
+
if (count >= persistRequests || timeSince >= persistIntervalMs) {
|
|
83
146
|
this.persistSessionAccess(sessionId, now);
|
|
84
147
|
}
|
|
85
148
|
}
|
|
@@ -92,17 +155,38 @@ export class StreamableSessionRepository {
|
|
|
92
155
|
this.lastAccessTimes.delete(sessionId);
|
|
93
156
|
this.requestCounts.delete(sessionId);
|
|
94
157
|
this.dirtySessionIds.delete(sessionId);
|
|
95
|
-
|
|
96
|
-
if
|
|
97
|
-
|
|
158
|
+
this.inMemorySessions.delete(sessionId);
|
|
159
|
+
// Delete from disk if persistence is enabled
|
|
160
|
+
const agentConfig = AgentConfigManager.getInstance();
|
|
161
|
+
if (agentConfig.get('features').sessionPersistence) {
|
|
162
|
+
const result = this.storage.deleteData(AUTH_CONFIG.SERVER.STREAMABLE_SESSION.FILE_PREFIX, sessionId);
|
|
163
|
+
if (result) {
|
|
164
|
+
logger.info(`Deleted streamable session: ${sessionId}`);
|
|
165
|
+
}
|
|
166
|
+
return result;
|
|
167
|
+
}
|
|
168
|
+
else {
|
|
169
|
+
logger.info(`Deleted streamable session from memory: ${sessionId}`);
|
|
170
|
+
return true;
|
|
98
171
|
}
|
|
99
|
-
return result;
|
|
100
172
|
}
|
|
101
173
|
/**
|
|
102
174
|
* Persists session access to disk and resets counters
|
|
103
175
|
*/
|
|
104
176
|
persistSessionAccess(sessionId, accessTime) {
|
|
105
|
-
|
|
177
|
+
// Check if persistence is enabled (defensive check)
|
|
178
|
+
const agentConfig = AgentConfigManager.getInstance();
|
|
179
|
+
if (!agentConfig.get('features').sessionPersistence) {
|
|
180
|
+
return;
|
|
181
|
+
}
|
|
182
|
+
// Get session data from in-memory store or disk
|
|
183
|
+
let sessionData = this.inMemorySessions.get(sessionId);
|
|
184
|
+
if (!sessionData) {
|
|
185
|
+
const diskData = this.storage.readData(AUTH_CONFIG.SERVER.STREAMABLE_SESSION.FILE_PREFIX, sessionId);
|
|
186
|
+
if (diskData) {
|
|
187
|
+
sessionData = diskData;
|
|
188
|
+
}
|
|
189
|
+
}
|
|
106
190
|
if (sessionData) {
|
|
107
191
|
sessionData.lastAccessedAt = accessTime;
|
|
108
192
|
// Extend expiration on access
|
|
@@ -119,6 +203,11 @@ export class StreamableSessionRepository {
|
|
|
119
203
|
* Flushes all dirty sessions to disk
|
|
120
204
|
*/
|
|
121
205
|
flushDirtySessions() {
|
|
206
|
+
// Check if persistence is enabled
|
|
207
|
+
const agentConfig = AgentConfigManager.getInstance();
|
|
208
|
+
if (!agentConfig.get('features').sessionPersistence) {
|
|
209
|
+
return;
|
|
210
|
+
}
|
|
122
211
|
if (this.dirtySessionIds.size === 0) {
|
|
123
212
|
return;
|
|
124
213
|
}
|
|
@@ -135,10 +224,12 @@ export class StreamableSessionRepository {
|
|
|
135
224
|
* Starts periodic background flush of dirty sessions
|
|
136
225
|
*/
|
|
137
226
|
startPeriodicFlush() {
|
|
138
|
-
|
|
227
|
+
// Get flush interval from config
|
|
228
|
+
const agentConfig = AgentConfigManager.getInstance();
|
|
229
|
+
const flushIntervalMs = agentConfig.get('sessionPersistence').backgroundFlushSeconds * 1000;
|
|
139
230
|
this.flushInterval = setInterval(() => {
|
|
140
231
|
this.flushDirtySessions();
|
|
141
|
-
},
|
|
232
|
+
}, flushIntervalMs);
|
|
142
233
|
}
|
|
143
234
|
/**
|
|
144
235
|
* Stops periodic flush and performs final flush of all dirty sessions
|