@1mcp/agent 0.39.0-beta.1 → 0.39.0-beta.2
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/admin/assets/{admin-OAuthServicesWorkspace-CcUSZCNL.js → admin-OAuthServicesWorkspace-CKPMmDQI.js} +1 -1
- package/build/admin/assets/{admin-console-fP-KT2vb.js → admin-console-CwgYre_s.js} +3 -3
- package/build/admin/index.html +1 -1
- package/build/commands/serve/cooperativeRuntime.d.ts +1 -1
- package/build/commands/serve/cooperativeRuntime.d.ts.map +1 -1
- package/build/commands/serve/cooperativeRuntime.js +74 -18
- package/build/commands/serve/cooperativeRuntime.js.map +1 -1
- package/build/commands/serve/index.d.ts +6 -0
- package/build/commands/serve/index.d.ts.map +1 -1
- package/build/commands/serve/index.js +7 -1
- package/build/commands/serve/index.js.map +1 -1
- package/build/constants/mcp.d.ts +1 -1
- package/build/constants/mcp.js +1 -1
- package/build/core/capabilities/capabilityCatalog.d.ts +3 -1
- package/build/core/capabilities/capabilityCatalog.d.ts.map +1 -1
- package/build/core/capabilities/capabilityCatalog.js +8 -8
- package/build/core/capabilities/capabilityCatalog.js.map +1 -1
- package/build/core/capabilities/capabilityManager.js +1 -1
- package/build/core/capabilities/capabilityManager.js.map +1 -1
- package/build/core/capabilities/lazyLoadingOrchestrator.d.ts +17 -2
- package/build/core/capabilities/lazyLoadingOrchestrator.d.ts.map +1 -1
- package/build/core/capabilities/lazyLoadingOrchestrator.js +53 -5
- package/build/core/capabilities/lazyLoadingOrchestrator.js.map +1 -1
- package/build/core/capabilities/metaToolProvider.d.ts +2 -2
- package/build/core/capabilities/metaToolProvider.d.ts.map +1 -1
- package/build/core/capabilities/metaToolProvider.js +11 -10
- package/build/core/capabilities/metaToolProvider.js.map +1 -1
- package/build/core/capabilities/runtimeCapabilityCatalog.d.ts +2 -0
- package/build/core/capabilities/runtimeCapabilityCatalog.d.ts.map +1 -1
- package/build/core/capabilities/runtimeCapabilityCatalog.js +15 -1
- package/build/core/capabilities/runtimeCapabilityCatalog.js.map +1 -1
- package/build/core/capabilities/toolRegistry.d.ts +3 -0
- package/build/core/capabilities/toolRegistry.d.ts.map +1 -1
- package/build/core/capabilities/toolRegistry.js +4 -0
- package/build/core/capabilities/toolRegistry.js.map +1 -1
- package/build/core/notifications/notificationManager.d.ts.map +1 -1
- package/build/core/notifications/notificationManager.js +1 -1
- package/build/core/notifications/notificationManager.js.map +1 -1
- package/build/core/server/runtimeControl.d.ts.map +1 -1
- package/build/core/server/runtimeControl.js +5 -1
- package/build/core/server/runtimeControl.js.map +1 -1
- package/build/core/server/runtimeReplacementConfig.d.ts.map +1 -1
- package/build/core/server/runtimeReplacementConfig.js +1 -0
- package/build/core/server/runtimeReplacementConfig.js.map +1 -1
- package/build/core/server/runtimeScopeOwnership.d.ts +3 -1
- package/build/core/server/runtimeScopeOwnership.d.ts.map +1 -1
- package/build/core/server/runtimeScopeOwnership.js +1 -1
- package/build/core/server/runtimeScopeOwnership.js.map +1 -1
- package/build/core/server/staleCooperativeRuntime.d.ts +13 -0
- package/build/core/server/staleCooperativeRuntime.d.ts.map +1 -0
- package/build/core/server/staleCooperativeRuntime.js +91 -0
- package/build/core/server/staleCooperativeRuntime.js.map +1 -0
- package/build/core/types/server.d.ts +6 -1
- package/build/core/types/server.d.ts.map +1 -1
- package/build/core/validation/schemaBoundary.d.ts +10 -1
- package/build/core/validation/schemaBoundary.d.ts.map +1 -1
- package/build/core/validation/schemaBoundary.js +24 -2
- package/build/core/validation/schemaBoundary.js.map +1 -1
- package/build/core/validation/schemaWorker.js +5 -1
- package/build/core/validation/schemaWorker.js.map +1 -1
- package/build/gateway/interactions/interactionRoute.d.ts.map +1 -1
- package/build/gateway/interactions/interactionRoute.js +5 -1
- package/build/gateway/interactions/interactionRoute.js.map +1 -1
- package/build/sdk/legacy/client/runtime/modernSdkClientAdapter.d.ts +7 -0
- package/build/sdk/legacy/client/runtime/modernSdkClientAdapter.d.ts.map +1 -1
- package/build/sdk/legacy/client/runtime/modernSdkClientAdapter.js +141 -0
- package/build/sdk/legacy/client/runtime/modernSdkClientAdapter.js.map +1 -1
- package/build/sdk/legacy/client/runtime/modernSubscriptions.d.ts +43 -0
- package/build/sdk/legacy/client/runtime/modernSubscriptions.d.ts.map +1 -0
- package/build/sdk/legacy/client/runtime/modernSubscriptions.js +186 -0
- package/build/sdk/legacy/client/runtime/modernSubscriptions.js.map +1 -0
- package/build/sdk/legacy/commands/serve.d.ts +1 -0
- package/build/sdk/legacy/commands/serve.d.ts.map +1 -1
- package/build/sdk/legacy/commands/serve.js.map +1 -1
- package/build/sdk/legacy/server/auth/requestAuthRevalidation.d.ts +5 -0
- package/build/sdk/legacy/server/auth/requestAuthRevalidation.d.ts.map +1 -0
- package/build/sdk/legacy/server/auth/requestAuthRevalidation.js +19 -0
- package/build/sdk/legacy/server/auth/requestAuthRevalidation.js.map +1 -0
- package/build/sdk/legacy/server/protocol/notificationHandlers.d.ts +1 -1
- package/build/sdk/legacy/server/protocol/notificationHandlers.d.ts.map +1 -1
- package/build/sdk/legacy/server/protocol/notificationHandlers.js +36 -34
- package/build/sdk/legacy/server/protocol/notificationHandlers.js.map +1 -1
- package/build/sdk/legacy/server/protocol/promptRequestHandlers.d.ts.map +1 -1
- package/build/sdk/legacy/server/protocol/promptRequestHandlers.js +6 -1
- package/build/sdk/legacy/server/protocol/promptRequestHandlers.js.map +1 -1
- package/build/sdk/legacy/server/protocol/resourceRequestHandlers.d.ts.map +1 -1
- package/build/sdk/legacy/server/protocol/resourceRequestHandlers.js +15 -13
- package/build/sdk/legacy/server/protocol/resourceRequestHandlers.js.map +1 -1
- package/build/sdk/legacy/server/protocol/resourceSubscriptions.d.ts +27 -0
- package/build/sdk/legacy/server/protocol/resourceSubscriptions.d.ts.map +1 -0
- package/build/sdk/legacy/server/protocol/resourceSubscriptions.js +594 -0
- package/build/sdk/legacy/server/protocol/resourceSubscriptions.js.map +1 -0
- package/build/sdk/legacy/server/protocol/toolRequestHandlers.d.ts.map +1 -1
- package/build/sdk/legacy/server/protocol/toolRequestHandlers.js +15 -4
- package/build/sdk/legacy/server/protocol/toolRequestHandlers.js.map +1 -1
- package/build/sdk/legacy/server/runtime/connectionManager.d.ts.map +1 -1
- package/build/sdk/legacy/server/runtime/connectionManager.js +51 -5
- package/build/sdk/legacy/server/runtime/connectionManager.js.map +1 -1
- package/build/sdk/legacy/server/runtime/legacySdkServerAdapter.d.ts +12 -0
- package/build/sdk/legacy/server/runtime/legacySdkServerAdapter.d.ts.map +1 -1
- package/build/sdk/legacy/server/runtime/legacySdkServerAdapter.js +109 -10
- package/build/sdk/legacy/server/runtime/legacySdkServerAdapter.js.map +1 -1
- package/build/sdk/legacy/server/runtime/serverManager.d.ts.map +1 -1
- package/build/sdk/legacy/server/runtime/serverManager.js +4 -1
- package/build/sdk/legacy/server/runtime/serverManager.js.map +1 -1
- package/build/sdk/legacy/transport/http/middlewares/scopeAuthMiddleware.d.ts +2 -0
- package/build/sdk/legacy/transport/http/middlewares/scopeAuthMiddleware.d.ts.map +1 -1
- package/build/sdk/legacy/transport/http/middlewares/scopeAuthMiddleware.js +8 -14
- package/build/sdk/legacy/transport/http/middlewares/scopeAuthMiddleware.js.map +1 -1
- package/build/sdk/legacy/transport/http/modernInboundLegacyBridge.d.ts +9 -0
- package/build/sdk/legacy/transport/http/modernInboundLegacyBridge.d.ts.map +1 -1
- package/build/sdk/legacy/transport/http/modernInboundLegacyBridge.js +84 -6
- package/build/sdk/legacy/transport/http/modernInboundLegacyBridge.js.map +1 -1
- package/build/transport/http/routes/modernHttpRoutes.d.ts +11 -10
- package/build/transport/http/routes/modernHttpRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/modernHttpRoutes.js +26 -3
- package/build/transport/http/routes/modernHttpRoutes.js.map +1 -1
- package/build/transport/http/routes/modernSubscriptions.d.ts +21 -0
- package/build/transport/http/routes/modernSubscriptions.d.ts.map +1 -0
- package/build/transport/http/routes/modernSubscriptions.js +425 -0
- package/build/transport/http/routes/modernSubscriptions.js.map +1 -0
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scopeAuthMiddleware.d.ts","sourceRoot":"","sources":["../../../../../../src/sdk/legacy/transport/http/middlewares/scopeAuthMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAE9E,OAAO,EAAE,aAAa,EAAE,MAAM,+CAA+C,CAAC;AAC9E,OAAO,EAAE,QAAQ,EAAE,MAAM,0CAA0C,CAAC;AAGpE,OAAO,KAAK,EAAE,QAAQ,IAAI,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAGpF,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAG1D,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,OAAO,CAAC;QAChB,UAAU,OAAO;YACf,IAAI,CAAC,EAAE,WAAW,CAAC;SACpB;QAED,UAAU,QAAQ;YAChB,MAAM,EAAE,cAAc,CAAC;SACxB;KACF;CACF;AAED;;;GAGG;AACH,MAAM,WAAW,cAAe,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAC7D,yDAAyD;IACzD,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,mDAAmD;IACnD,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,4CAA4C;IAC5C,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,sBAAsB;IACtB,aAAa,CAAC,EAAE,WAAW,GAAG,UAAU,GAAG,QAAQ,GAAG,MAAM,CAAC;IAC7D,uBAAuB;IACvB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,0BAA0B;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,0DAA0D;IAC1D,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,6BAA6B;IAC7B,IAAI,CAAC,EAAE,QAAQ,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;
|
|
1
|
+
{"version":3,"file":"scopeAuthMiddleware.d.ts","sourceRoot":"","sources":["../../../../../../src/sdk/legacy/transport/http/middlewares/scopeAuthMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAE9E,OAAO,EAAE,aAAa,EAAE,MAAM,+CAA+C,CAAC;AAC9E,OAAO,EAAE,QAAQ,EAAE,MAAM,0CAA0C,CAAC;AAGpE,OAAO,EAEL,+BAA+B,EAChC,MAAM,wDAAwD,CAAC;AAChE,OAAO,KAAK,EAAE,QAAQ,IAAI,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAGpF,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAG1D,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,OAAO,CAAC;QAChB,UAAU,OAAO;YACf,IAAI,CAAC,EAAE,WAAW,CAAC;SACpB;QAED,UAAU,QAAQ;YAChB,MAAM,EAAE,cAAc,CAAC;SACxB;KACF;CACF;AAED;;;GAGG;AACH,MAAM,WAAW,cAAe,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAC7D,yDAAyD;IACzD,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,mDAAmD;IACnD,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,4CAA4C;IAC5C,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,sBAAsB;IACtB,aAAa,CAAC,EAAE,WAAW,GAAG,UAAU,GAAG,QAAQ,GAAG,MAAM,CAAC;IAC7D,uBAAuB;IACvB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,0BAA0B;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,0DAA0D;IAC1D,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,6BAA6B;IAC7B,IAAI,CAAC,EAAE,QAAQ,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,OAAO,EAAE,+BAA+B,EAAE,CAAC;AAM3C,sGAAsG;AACtG,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,QAAQ,GAAG,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,CAE/E;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,yBAAyB,CAAC,aAAa,CAAC,EAAE,sBAAsB,UAK9D,OAAO,OAAO,QAAQ,QAAQ,YAAY,KAAG,IAAI,CAmIlE;AA6CD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,QAAQ,GAAG,MAAM,EAAE,CAaxD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,QAAQ,GAAG,aAAa,GAAG,SAAS,CAOzE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,QAAQ,GAAG,WAAW,GAAG,UAAU,GAAG,QAAQ,GAAG,MAAM,CAW5F;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAO/D;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,QAAQ,GAAG,MAAM,GAAG,SAAS,CAG/D;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAoB/D;+BA5QiB,OAAO,OAAO,QAAQ,QAAQ,YAAY,KAAG,IAAI;AA+QnE,wBAA2C"}
|
|
@@ -2,23 +2,15 @@ import { SDKOAuthServerProvider } from '../../../../../auth/sdkOAuthServerProvid
|
|
|
2
2
|
import { AgentConfigManager } from '../../../../../core/server/agentConfig.js';
|
|
3
3
|
import logger from '../../../../../logger/logger.js';
|
|
4
4
|
import { requireBearerAuth } from '../../../server/auth/middleware/bearerAuth.js';
|
|
5
|
+
import { registerRequestAuthRevalidator, revalidateLegacyRequestAuthInfo, } from '../../../server/auth/requestAuthRevalidation.js';
|
|
5
6
|
import { auditScopeOperation, hasRequiredScopes, scopesToTags } from '../../../../../utils/validation/scopeValidation.js';
|
|
6
|
-
|
|
7
|
+
export { revalidateLegacyRequestAuthInfo };
|
|
7
8
|
function normalizedGrant(clientId, scopes) {
|
|
8
9
|
return JSON.stringify([clientId, [...new Set(scopes)].sort(), [...new Set(scopesToTags(scopes))].sort()]);
|
|
9
10
|
}
|
|
10
11
|
/** Re-read the admitted grant using its original provider immediately before a continuation claim. */
|
|
11
|
-
export
|
|
12
|
-
|
|
13
|
-
if (!revalidate)
|
|
14
|
-
return false;
|
|
15
|
-
try {
|
|
16
|
-
return await revalidate();
|
|
17
|
-
}
|
|
18
|
-
catch {
|
|
19
|
-
// Credential storage and verifier errors must not leak tokens or permit a stale grant.
|
|
20
|
-
return false;
|
|
21
|
-
}
|
|
12
|
+
export function revalidateAuthInfo(auth) {
|
|
13
|
+
return revalidateLegacyRequestAuthInfo(auth);
|
|
22
14
|
}
|
|
23
15
|
/**
|
|
24
16
|
* Creates a scope validation middleware that uses the SDK's bearer auth middleware
|
|
@@ -115,7 +107,7 @@ export function createScopeAuthMiddleware(oauthProvider) {
|
|
|
115
107
|
};
|
|
116
108
|
const admittedGrant = normalizedGrant(authContext.clientId, grantedScopes);
|
|
117
109
|
const admittedExpires = authInfo.expiresAt;
|
|
118
|
-
|
|
110
|
+
const revalidate = async () => {
|
|
119
111
|
const current = await provider.verifyAccessToken(token);
|
|
120
112
|
// The native provider exposes the session repository's millisecond expiry.
|
|
121
113
|
return (typeof current.expiresAt === 'number' &&
|
|
@@ -126,7 +118,9 @@ export function createScopeAuthMiddleware(oauthProvider) {
|
|
|
126
118
|
Array.isArray(current.scopes) &&
|
|
127
119
|
current.scopes.every((scope) => typeof scope === 'string') &&
|
|
128
120
|
normalizedGrant(current.clientId, current.scopes) === admittedGrant);
|
|
129
|
-
}
|
|
121
|
+
};
|
|
122
|
+
registerRequestAuthRevalidator(authContext, revalidate);
|
|
123
|
+
registerRequestAuthRevalidator(authInfo, revalidate);
|
|
130
124
|
res.locals.auth = authContext;
|
|
131
125
|
// Provide validated tags to downstream handlers
|
|
132
126
|
// If no specific tags requested, use all granted tags
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scopeAuthMiddleware.js","sourceRoot":"","sources":["../../../../../../src/sdk/legacy/transport/http/middlewares/scopeAuthMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAE7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAGrE,OAAO,MAAM,MAAM,uBAAuB,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sDAAsD,CAAC;
|
|
1
|
+
{"version":3,"file":"scopeAuthMiddleware.js","sourceRoot":"","sources":["../../../../../../src/sdk/legacy/transport/http/middlewares/scopeAuthMiddleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,8 @@ import type { GatewayInteractionRequest } from '../../../../gateway/ports/outbou
|
|
|
6
6
|
export interface ModernInboundLegacyBridge {
|
|
7
7
|
readonly targetConnectionId: string;
|
|
8
8
|
readonly outbound: LegacyOutboundEraAdapter;
|
|
9
|
+
subscribe(uri: string, signal: AbortSignal): Promise<void>;
|
|
10
|
+
prepareSubscriptions(filter: Record<string, unknown>): Promise<Record<string, unknown>>;
|
|
9
11
|
close(): Promise<void>;
|
|
10
12
|
}
|
|
11
13
|
/**
|
|
@@ -13,6 +15,13 @@ export interface ModernInboundLegacyBridge {
|
|
|
13
15
|
* aggregate legacy server. SDK-v1 objects stay inside the legacy island.
|
|
14
16
|
*/
|
|
15
17
|
export declare function createModernInboundLegacyBridge(serverManager: ServerManager, config: InboundConnectionConfig, options?: {
|
|
18
|
+
readonly subscriptionSignal?: AbortSignal;
|
|
19
|
+
readonly subscriptionListKinds?: readonly ('tools' | 'resources' | 'prompts')[];
|
|
20
|
+
readonly subscriptionNotification?: (notification: {
|
|
21
|
+
method: string;
|
|
22
|
+
params?: Record<string, unknown>;
|
|
23
|
+
}) => void;
|
|
24
|
+
readonly subscriptionClosed?: () => void;
|
|
16
25
|
readonly capabilities?: ImmutableJsonValue;
|
|
17
26
|
readonly logLevel?: 'debug' | 'info' | 'notice' | 'warning' | 'error' | 'critical' | 'alert' | 'emergency';
|
|
18
27
|
readonly interaction?: (input: GatewayInteractionRequest) => Promise<ImmutableJsonValue>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modernInboundLegacyBridge.d.ts","sourceRoot":"","sources":["../../../../../src/sdk/legacy/transport/http/modernInboundLegacyBridge.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"modernInboundLegacyBridge.d.ts","sourceRoot":"","sources":["../../../../../src/sdk/legacy/transport/http/modernInboundLegacyBridge.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAE,wBAAwB,EAAE,MAAM,0DAA0D,CAAC;AACpG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,0CAA0C,CAAC;AAqB1F,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,QAAQ,EAAE,wBAAwB,CAAC;IAC5C,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3D,oBAAoB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACxF,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED;;;GAGG;AACH,wBAAsB,+BAA+B,CACnD,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,uBAAuB,EAC/B,OAAO,GAAE;IACP,QAAQ,CAAC,kBAAkB,CAAC,EAAE,WAAW,CAAC;IAC1C,QAAQ,CAAC,qBAAqB,CAAC,EAAE,SAAS,CAAC,OAAO,GAAG,WAAW,GAAG,SAAS,CAAC,EAAE,CAAC;IAChF,QAAQ,CAAC,wBAAwB,CAAC,EAAE,CAAC,YAAY,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,KAAK,IAAI,CAAC;IACjH,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAC;IACzC,QAAQ,CAAC,YAAY,CAAC,EAAE,kBAAkB,CAAC;IAC3C,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,QAAQ,GAAG,SAAS,GAAG,OAAO,GAAG,UAAU,GAAG,OAAO,GAAG,WAAW,CAAC;IAC3G,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,yBAAyB,KAAK,OAAO,CAAC,kBAAkB,CAAC,CAAC;CACrF,GACL,OAAO,CAAC,yBAAyB,CAAC,CAuGpC"}
|
|
@@ -1,16 +1,22 @@
|
|
|
1
1
|
import { randomUUID } from 'node:crypto';
|
|
2
2
|
import { InMemoryTransport } from '@modelcontextprotocol/sdk/inMemory.js';
|
|
3
|
+
import { FilteringService } from '../../../../core/filtering/filteringService.js';
|
|
4
|
+
import { filterConnectionsForSession } from '../../../../core/protocol/requestHandlerUtils.js';
|
|
3
5
|
import { LegacyOutboundEraAdapter } from '../../../../gateway/adapters/legacy/legacyOutboundEraAdapter.js';
|
|
4
6
|
import { toJsonValue } from '../../../contracts/index.js';
|
|
5
7
|
import { Client } from '../../client/index.js';
|
|
6
8
|
import { LegacySdkClientAdapter } from '../../client/runtime/legacySdkClientAdapter.js';
|
|
7
|
-
import {
|
|
9
|
+
import { applyModernCatalogCoverage, ensureModernSubscriptionCoverage, } from '../../client/runtime/modernSubscriptions.js';
|
|
10
|
+
import { ClientCapabilitiesSchema, CreateMessageRequestSchema, ElicitRequestSchema, ListRootsRequestSchema, PromptListChangedNotificationSchema, ResourceListChangedNotificationSchema, ResourceUpdatedNotificationSchema, ToolListChangedNotificationSchema, } from '../../types.js';
|
|
8
11
|
const LEGACY_REVISION = '2025-11-25';
|
|
9
12
|
/**
|
|
10
13
|
* Gives one modern stateless exchange a private connection to the existing
|
|
11
14
|
* aggregate legacy server. SDK-v1 objects stay inside the legacy island.
|
|
12
15
|
*/
|
|
13
16
|
export async function createModernInboundLegacyBridge(serverManager, config, options = {}) {
|
|
17
|
+
const acceptedCatalogFilter = options.subscriptionNotification
|
|
18
|
+
? await prepareCatalogFilter(serverManager, config, options.subscriptionListKinds ?? [], options.subscriptionSignal)
|
|
19
|
+
: {};
|
|
14
20
|
const connectionId = `modern-${randomUUID()}`;
|
|
15
21
|
const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
|
|
16
22
|
const capabilities = ClientCapabilitiesSchema.parse(options.capabilities ?? {});
|
|
@@ -30,16 +36,31 @@ export async function createModernInboundLegacyBridge(serverManager, config, opt
|
|
|
30
36
|
})));
|
|
31
37
|
}
|
|
32
38
|
}
|
|
39
|
+
const abortSubscription = () => {
|
|
40
|
+
void Promise.allSettled([
|
|
41
|
+
clientTransport.close(),
|
|
42
|
+
serverTransport.close(),
|
|
43
|
+
serverManager.disconnectTransport(connectionId, true),
|
|
44
|
+
]);
|
|
45
|
+
};
|
|
46
|
+
options.subscriptionSignal?.throwIfAborted();
|
|
47
|
+
options.subscriptionSignal?.addEventListener('abort', abortSubscription, { once: true });
|
|
33
48
|
const connecting = [
|
|
34
49
|
serverManager.connectTransport(serverTransport, connectionId, {
|
|
35
50
|
...config,
|
|
36
|
-
requestOnly:
|
|
51
|
+
requestOnly: !options.subscriptionNotification,
|
|
52
|
+
...(options.subscriptionNotification
|
|
53
|
+
? {
|
|
54
|
+
subscriptionListKinds: ['tools', 'resources', 'prompts'].filter((kind) => acceptedCatalogFilter[`${kind}ListChanged`] === true),
|
|
55
|
+
}
|
|
56
|
+
: {}),
|
|
37
57
|
canonicalSchemaProjection: true,
|
|
38
58
|
}),
|
|
39
59
|
client.connect(clientTransport),
|
|
40
60
|
];
|
|
41
61
|
try {
|
|
42
62
|
await Promise.all(connecting);
|
|
63
|
+
options.subscriptionSignal?.throwIfAborted();
|
|
43
64
|
// This private inbound session owns the threshold; no shared upstream logging/setLevel is sent.
|
|
44
65
|
if (options.logLevel !== undefined)
|
|
45
66
|
await client.setLoggingLevel(options.logLevel);
|
|
@@ -48,6 +69,7 @@ export async function createModernInboundLegacyBridge(serverManager, config, opt
|
|
|
48
69
|
await Promise.allSettled([clientTransport.close(), serverTransport.close()]);
|
|
49
70
|
await Promise.allSettled(connecting);
|
|
50
71
|
await serverManager.disconnectTransport(connectionId, true).catch(() => undefined);
|
|
72
|
+
options.subscriptionSignal?.removeEventListener('abort', abortSubscription);
|
|
51
73
|
throw error;
|
|
52
74
|
}
|
|
53
75
|
const legacy = new LegacySdkClientAdapter(client, clientTransport, { interactionBridge: true });
|
|
@@ -58,18 +80,74 @@ export async function createModernInboundLegacyBridge(serverManager, config, opt
|
|
|
58
80
|
await Promise.allSettled([legacy.close(), serverManager.disconnectTransport(connectionId, true)]);
|
|
59
81
|
throw error;
|
|
60
82
|
}
|
|
83
|
+
if (options.subscriptionNotification) {
|
|
84
|
+
for (const schema of [
|
|
85
|
+
ResourceUpdatedNotificationSchema,
|
|
86
|
+
ResourceListChangedNotificationSchema,
|
|
87
|
+
ToolListChangedNotificationSchema,
|
|
88
|
+
PromptListChangedNotificationSchema,
|
|
89
|
+
]) {
|
|
90
|
+
client.setNotificationHandler(schema, (notification) => options.subscriptionNotification?.(notification));
|
|
91
|
+
}
|
|
92
|
+
client.onclose = () => options.subscriptionClosed?.();
|
|
93
|
+
}
|
|
61
94
|
let closePromise;
|
|
62
95
|
return {
|
|
63
96
|
targetConnectionId: connectionId,
|
|
97
|
+
subscribe: async (uri, signal) => {
|
|
98
|
+
await client.subscribeResource({ uri }, { signal });
|
|
99
|
+
},
|
|
100
|
+
prepareSubscriptions: async () => ({ ...acceptedCatalogFilter }),
|
|
64
101
|
outbound: new LegacyOutboundEraAdapter(legacy, { era: 'legacy', revision: LEGACY_REVISION }),
|
|
65
|
-
close: () => (closePromise ??= Promise.
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
102
|
+
close: () => (closePromise ??= Promise.resolve()
|
|
103
|
+
.then(() => {
|
|
104
|
+
options.subscriptionSignal?.removeEventListener('abort', abortSubscription);
|
|
105
|
+
})
|
|
106
|
+
.then(() => Promise.allSettled([legacy.close(), serverManager.disconnectTransport(connectionId, true)]))
|
|
107
|
+
.then((results) => {
|
|
69
108
|
const failed = results.find((result) => result.status === 'rejected');
|
|
70
109
|
if (failed)
|
|
71
110
|
throw failed.reason;
|
|
72
111
|
})),
|
|
73
112
|
};
|
|
74
113
|
}
|
|
114
|
+
async function prepareCatalogFilter(serverManager, config, kinds, signal) {
|
|
115
|
+
const visible = FilteringService.getFilteredConnections(filterConnectionsForSession(serverManager.getClients(), undefined), config);
|
|
116
|
+
const accepted = {};
|
|
117
|
+
for (const [field, kind] of [
|
|
118
|
+
['toolsListChanged', 'tools'],
|
|
119
|
+
['promptsListChanged', 'prompts'],
|
|
120
|
+
['resourcesListChanged', 'resources'],
|
|
121
|
+
]) {
|
|
122
|
+
if (!kinds.includes(kind))
|
|
123
|
+
continue;
|
|
124
|
+
const providers = [...visible.values()].filter((connection) => connection.capabilities?.[kind]);
|
|
125
|
+
if (!providers.length)
|
|
126
|
+
continue;
|
|
127
|
+
let supported = true;
|
|
128
|
+
for (const connection of providers) {
|
|
129
|
+
signal?.throwIfAborted();
|
|
130
|
+
const capability = connection.capabilities?.[kind];
|
|
131
|
+
if (!capability ||
|
|
132
|
+
typeof capability !== 'object' ||
|
|
133
|
+
Array.isArray(capability) ||
|
|
134
|
+
capability.listChanged !== true) {
|
|
135
|
+
supported = false;
|
|
136
|
+
break;
|
|
137
|
+
}
|
|
138
|
+
const adapter = connection.adapter;
|
|
139
|
+
const requested = { [field]: true };
|
|
140
|
+
const honored = await ensureModernSubscriptionCoverage(adapter, requested);
|
|
141
|
+
applyModernCatalogCoverage(connection, adapter, requested, honored);
|
|
142
|
+
if (honored[field] !== true) {
|
|
143
|
+
supported = false;
|
|
144
|
+
break;
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
if (supported)
|
|
148
|
+
accepted[field] = true;
|
|
149
|
+
}
|
|
150
|
+
signal?.throwIfAborted();
|
|
151
|
+
return accepted;
|
|
152
|
+
}
|
|
75
153
|
//# sourceMappingURL=modernInboundLegacyBridge.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modernInboundLegacyBridge.js","sourceRoot":"","sources":["../../../../../src/sdk/legacy/transport/http/modernInboundLegacyBridge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;
|
|
1
|
+
{"version":3,"file":"modernInboundLegacyBridge.js","sourceRoot":"","sources":["../../../../../src/sdk/legacy/transport/http/modernInboundLegacyBridge.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { ServerManager } from '../../../core/server/serverManager.js';
|
|
2
|
+
import type { InboundConnectionConfig } from '../../../core/types/index.js';
|
|
2
3
|
import { type ImmutableJsonValue } from '../../../gateway/contracts/index.js';
|
|
3
4
|
import { GatewayDispatcher } from '../../../gateway/core/gatewayDispatcher.js';
|
|
4
5
|
import type { GatewayInteractionRequest } from '../../../gateway/ports/outboundEraAdapter.js';
|
|
@@ -6,21 +7,22 @@ import type { Request, RequestHandler, Response, Router } from 'express';
|
|
|
6
7
|
export interface ModernInboundBridge {
|
|
7
8
|
readonly targetConnectionId: string;
|
|
8
9
|
readonly outbound: NonNullable<ReturnType<ConstructorParameters<typeof GatewayDispatcher>[0]['resolveOutbound']>>;
|
|
10
|
+
subscribe?(uri: string, signal: AbortSignal): Promise<void>;
|
|
11
|
+
prepareSubscriptions?(filter: Record<string, unknown>): Promise<Record<string, unknown>>;
|
|
9
12
|
close(): Promise<void>;
|
|
10
13
|
}
|
|
11
14
|
export interface ModernHttpRequestPolicy {
|
|
12
15
|
allowsHost(host: string | undefined): boolean;
|
|
13
16
|
allowsOrigin(origin: string | undefined, host: string | undefined): boolean;
|
|
14
17
|
}
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
export type ModernInboundBridgeFactory = (serverManager: ServerManager, config: ReturnType<typeof buildConfig>, options?: {
|
|
18
|
+
export type ModernInboundBridgeFactory = (serverManager: ServerManager, config: InboundConnectionConfig, options?: {
|
|
19
|
+
subscriptionSignal?: AbortSignal;
|
|
20
|
+
subscriptionListKinds?: readonly ('tools' | 'resources' | 'prompts')[];
|
|
21
|
+
subscriptionNotification?: (notification: {
|
|
22
|
+
method: string;
|
|
23
|
+
params?: Record<string, unknown>;
|
|
24
|
+
}) => void;
|
|
25
|
+
subscriptionClosed?: () => void;
|
|
24
26
|
capabilities?: ImmutableJsonValue;
|
|
25
27
|
logLevel?: 'debug' | 'info' | 'notice' | 'warning' | 'error' | 'critical' | 'alert' | 'emergency';
|
|
26
28
|
interaction?: (input: GatewayInteractionRequest) => Promise<ImmutableJsonValue>;
|
|
@@ -31,5 +33,4 @@ export declare function bindDisconnectAbort(req: Request, res: Response): {
|
|
|
31
33
|
};
|
|
32
34
|
export declare function writeWebResponse(response: globalThis.Response, res: Response): Promise<void>;
|
|
33
35
|
export declare function setupModernHttpRoutes(router: Router, serverManager: ServerManager, middlewares: RequestHandler[], createBridge: ModernInboundBridgeFactory, requestPolicy: ModernHttpRequestPolicy, requestTimeoutMs?: number): void;
|
|
34
|
-
export {};
|
|
35
36
|
//# sourceMappingURL=modernHttpRoutes.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modernHttpRoutes.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/routes/modernHttpRoutes.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"modernHttpRoutes.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/routes/modernHttpRoutes.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AAKxE,OAAO,EAIL,KAAK,kBAAkB,EACxB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAS3E,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,0CAA0C,CAAC;AAW1F,OAAO,KAAK,EAAgB,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAiBvF,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC,UAAU,CAAC,qBAAqB,CAAC,OAAO,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;IAClH,SAAS,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5D,oBAAoB,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACzF,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED,MAAM,WAAW,uBAAuB;IACtC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;IAC9C,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;CAC7E;AAaD,MAAM,MAAM,0BAA0B,GAAG,CACvC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,uBAAuB,EAC/B,OAAO,CAAC,EAAE;IACR,kBAAkB,CAAC,EAAE,WAAW,CAAC;IACjC,qBAAqB,CAAC,EAAE,SAAS,CAAC,OAAO,GAAG,WAAW,GAAG,SAAS,CAAC,EAAE,CAAC;IACvE,wBAAwB,CAAC,EAAE,CAAC,YAAY,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,KAAK,IAAI,CAAC;IACxG,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAC;IAChC,YAAY,CAAC,EAAE,kBAAkB,CAAC;IAClC,QAAQ,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,QAAQ,GAAG,SAAS,GAAG,OAAO,GAAG,UAAU,GAAG,OAAO,GAAG,WAAW,CAAC;IAClG,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,yBAAyB,KAAK,OAAO,CAAC,kBAAkB,CAAC,CAAC;CACjF,KACE,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAwJlC,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG;IAAE,UAAU,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,MAAM,IAAI,CAAA;CAAE,CAiBrH;AAED,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA0BlG;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,cAAc,EAAE,EAC7B,YAAY,EAAE,0BAA0B,EACxC,aAAa,EAAE,uBAAuB,EACtC,gBAAgB,SAAoC,GACnD,IAAI,CAuON"}
|
|
@@ -17,6 +17,7 @@ import { withNativeInteractionRound } from '../../../gateway/interactions/intera
|
|
|
17
17
|
import { validateInteractionRequest, validateInteractionResponse, } from '../../../gateway/interactions/validateInteractionResponse.js';
|
|
18
18
|
import { getAuthInfo, getPresetName, getTagExpression, getTagFilterMode, getTagQuery, getValidatedTags, revalidateAuthInfo, } from '../middlewares/scopeAuthMiddleware.js';
|
|
19
19
|
import { createModernInteractionBinding, isModernInteractionBindingCurrent, watchModernInteractionBinding, withModernInteractionBinding, } from './modernInteractionBinding.js';
|
|
20
|
+
import { cancelModernSubscription, closeModernSubscriptions, getModernSubscriptionCapabilities, serveModernSubscription, } from './modernSubscriptions.js';
|
|
20
21
|
const DEFAULT_MODERN_REQUEST_TIMEOUT_MS = 60_000;
|
|
21
22
|
function buildConfig(req, res) {
|
|
22
23
|
return {
|
|
@@ -220,6 +221,7 @@ export function setupModernHttpRoutes(router, serverManager, middlewares, create
|
|
|
220
221
|
authorize: () => true,
|
|
221
222
|
});
|
|
222
223
|
serverManager.registerCleanup(() => interactions.close());
|
|
224
|
+
serverManager.registerCleanup(async () => closeModernSubscriptions(serverManager));
|
|
223
225
|
const rejectUnsupportedTransportMethod = async (req, res) => {
|
|
224
226
|
const request = webRequest(req);
|
|
225
227
|
const rejected = (!requestPolicy.allowsHost(req.get('host')) ? hostHeaderValidationResponse(request, []) : undefined) ??
|
|
@@ -253,14 +255,35 @@ export function setupModernHttpRoutes(router, serverManager, middlewares, create
|
|
|
253
255
|
return;
|
|
254
256
|
}
|
|
255
257
|
const config = buildConfig(req, res);
|
|
258
|
+
const method = req.body?.method;
|
|
259
|
+
if (method === 'subscriptions/listen' || method === 'notifications/cancelled') {
|
|
260
|
+
// Preserve the pinned SDK's envelope, header, version and wire validation ladder.
|
|
261
|
+
const validation = createMcpHandler(() => new Server({ name: MCP_SERVER_NAME, version: MCP_SERVER_VERSION }, { capabilities: {} }), { legacy: 'reject' });
|
|
262
|
+
try {
|
|
263
|
+
const checked = await validation.fetch(request, { parsedBody: req.body });
|
|
264
|
+
if (checked.status !== 200 && checked.status !== 202) {
|
|
265
|
+
await writeWebResponse(checked, res);
|
|
266
|
+
return;
|
|
267
|
+
}
|
|
268
|
+
await checked.body?.cancel();
|
|
269
|
+
}
|
|
270
|
+
finally {
|
|
271
|
+
await validation.close();
|
|
272
|
+
}
|
|
273
|
+
if (method === 'subscriptions/listen') {
|
|
274
|
+
await serveModernSubscription(req, res, serverManager, config, createBridge, disconnect.controller.signal);
|
|
275
|
+
}
|
|
276
|
+
else {
|
|
277
|
+
cancelModernSubscription(req, res, serverManager, config);
|
|
278
|
+
}
|
|
279
|
+
return;
|
|
280
|
+
}
|
|
256
281
|
const accepted = (req.get('accept') ?? '').split(',').map((value) => value.trim());
|
|
257
282
|
const responseMode = accepted.includes('text/event-stream') && !accepted.includes('application/json') ? 'sse' : 'auto';
|
|
258
283
|
const handler = createMcpHandler(() => {
|
|
259
284
|
const server = new Server({ name: MCP_SERVER_NAME, version: MCP_SERVER_VERSION }, {
|
|
260
285
|
capabilities: {
|
|
261
|
-
|
|
262
|
-
prompts: {},
|
|
263
|
-
resources: {},
|
|
286
|
+
...getModernSubscriptionCapabilities(serverManager, config),
|
|
264
287
|
completions: {},
|
|
265
288
|
},
|
|
266
289
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modernHttpRoutes.js","sourceRoot":"","sources":["../../../../src/transport/http/routes/modernHttpRoutes.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"modernHttpRoutes.js","sourceRoot":"","sources":["../../../../src/transport/http/routes/modernHttpRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,4BAA4B,EAC5B,eAAe,EACf,wBAAwB,EACxB,aAAa,EACb,MAAM,GAEP,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAGlG,OAAO,EAAE,uBAAuB,EAAE,MAAM,yDAAyD,CAAC;AAClG,OAAO,EAAE,+BAA+B,EAAE,MAAM,qDAAqD,CAAC;AACtG,OAAO,EAAyB,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AACzG,OAAO,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,EAEL,yBAAyB,EACzB,mBAAmB,GAEpB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AACnF,OAAO,EAAE,wBAAwB,EAAE,MAAM,sDAAsD,CAAC;AAChG,OAAO,EAAE,0BAA0B,EAAE,MAAM,+CAA+C,CAAC;AAC3F,OAAO,EACL,0BAA0B,EAC1B,2BAA2B,GAC5B,MAAM,0DAA0D,CAAC;AAElE,OAAO,EACL,WAAW,EACX,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,WAAW,EACX,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,wDAAwD,CAAC;AAIhE,OAAO,EACL,8BAA8B,EAC9B,iCAAiC,EACjC,6BAA6B,EAC7B,4BAA4B,GAC7B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,wBAAwB,EACxB,wBAAwB,EACxB,iCAAiC,EACjC,uBAAuB,GACxB,MAAM,0BAA0B,CAAC;AAElC,MAAM,iCAAiC,GAAG,MAAM,CAAC;AAejD,SAAS,WAAW,CAAC,GAAY,EAAE,GAAa;IAC9C,OAAO;QACL,IAAI,EAAE,gBAAgB,CAAC,GAAG,CAAC;QAC3B,aAAa,EAAE,gBAAgB,CAAC,GAAG,CAAC;QACpC,aAAa,EAAE,gBAAgB,CAAC,GAAG,CAAC;QACpC,QAAQ,EAAE,WAAW,CAAC,GAAG,CAAC;QAC1B,UAAU,EAAE,aAAa,CAAC,GAAG,CAAC;QAC9B,gBAAgB,EAAE,GAAG,CAAC,KAAK,CAAC,UAAU,KAAK,MAAM;KAClD,CAAC;AACJ,CAAC;AAgBD,SAAS,aAAa,CAAC,KAAyB;IAC9C,OAAO,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,uBAAuB,CAAC,MAAe;IAC9C,IACE,MAAM,KAAK,IAAI;QACf,OAAO,MAAM,KAAK,QAAQ;QAC1B,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QACrB,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,EACtD,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,cAAc,EAAE,GAAG,MAAiC,CAAC;IACvF,OAAO,cAAc,CAAC;AACxB,CAAC;AAED,SAAS,UAAU,CAAC,GAAY,EAAE,MAAoB;IACpD,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAC9B,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;QACxD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;YAAE,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;aACzE,IAAI,KAAK,KAAK,SAAS;YAAE,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACzD,CAAC;IACD,iFAAiF;IACjF,OAAO,IAAI,UAAU,CAAC,OAAO,CAAC,mBAAmB,GAAG,CAAC,WAAW,EAAE,EAAE;QAClE,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,OAAO;QACP,IAAI,EAAE,GAAG,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;QAClE,MAAM;KACP,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,eAAe,CAAC,GAAY,EAAE,IAAc,EAAE,IAAkB;IAC7E,IAAI,GAAG,CAAC,GAAG,CAAC,sBAAsB,CAAC,KAAK,wBAAwB,EAAE,CAAC;QACjE,IAAI,EAAE,CAAC;QACP,OAAO;IACT,CAAC;IACD,IAAI,MAAM,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC;QAAE,IAAI,CAAC,OAAO,CAAC,CAAC;;QAC/D,IAAI,EAAE,CAAC;AACd,CAAC;AAED,SAAS,mBAAmB,CAAC,OAAuB;IAClD,MAAM,SAAS,GAAG,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACzD,OAAO,IAAI,aAAa,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;AAC9E,CAAC;AAED,IAAI,oBAAoB,GAAG,CAAC,CAAC;AAC7B,MAAM,0BAA0B,GAAG,GAAG,CAAC;AAEvC,KAAK,UAAU,eAAe,CAC5B,MAAwB,EACxB,MAAe,EACf,MAAmB,EACnB,aAA4B,EAC5B,MAA+B,EAC/B,YAAwC,EACxC,cAAsB,EACtB,kBAA8D;IAE9D,MAAM,CAAC,cAAc,EAAE,CAAC;IACxB,MAAM,OAAO,GAAG,YAAY,CAAC,aAAa,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC;IACxE,IAAI,aAAyC,CAAC;IAC9C,MAAM,WAAW,GAAG,IAAI,OAAO,CAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE;QAC1D,aAAa,GAAG,MAAM,CAAC;IACzB,CAAC,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,GAAG,EAAE,CAAC,aAAa,CAAC,IAAI,aAAa,CAAC,CAAC,KAAK,EAAE,6BAA6B,CAAC,CAAC,CAAC;IACnG,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAC/D,MAAM,YAAY,GAAG,UAAU,CAAC,YAAY,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IACxF,YAAY,CAAC,KAAK,EAAE,CAAC;IACrB,IAAI,MAA2B,CAAC;IAChC,IAAI,CAAC;QACH,IAAI,MAAM,CAAC,OAAO;YAAE,YAAY,EAAE,CAAC;QACnC,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC;IACtD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,8EAA8E;QAC9E,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QACrE,MAAM,mBAAmB,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC,CAAC;IAC9D,CAAC;YAAS,CAAC;QACT,YAAY,CAAC,YAAY,CAAC,CAAC;QAC3B,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IACpD,CAAC;IACD,MAAM,UAAU,GAAG,IAAI,iBAAiB,CAAC;QACvC,eAAe,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;KAC1F,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,IAAI,cAAc,CAAC,UAAU,CAAC,CAAC;IAC/C,MAAM,aAAa,GAAG,UAAU,EAAE,CAAC;IACnC,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,IAAI,qBAAqB,GAAG,KAAK,CAAC;IAClC,IAAI,MAA2C,CAAC;IAChD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAoB,CAAC,OAAO,EAAE,EAAE;QACzD,MAAM,GAAG,OAAO,CAAC;IACnB,CAAC,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACrC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAExD,IAAI,CAAC;QACH,MAAM,CAAC,cAAc,EAAE,CAAC;QACxB,OAAO,MAAM,IAAI,OAAO,CAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC/D,MAAM,OAAO,GAAG,IAAI,uBAAuB,CAAC;gBAC1C,QAAQ,EAAE,wBAAwB;gBAClC,OAAO,EAAE,KAAK,IAAI,EAAE;oBAClB,IAAI,CAAC,SAAS,EAAE,CAAC;wBACf,SAAS,GAAG,IAAI,CAAC;wBACjB,OAAO;4BACL,IAAI,EAAE,SAAS;4BACf,aAAa;4BACb,SAAS,EAAE,MAAM;4BACjB,MAAM,EAAE,uBAAuB,CAAC,MAAM,CAAC;yBACxC,CAAC;oBACJ,CAAC;oBACD,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC;oBAC5B,IAAI,KAAK,KAAK,QAAQ,IAAI,CAAC,qBAAqB,EAAE,CAAC;wBACjD,qBAAqB,GAAG,IAAI,CAAC;wBAC7B,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAC;oBAC3C,CAAC;oBACD,OAAO,SAAS,CAAC;gBACnB,CAAC;gBACD,cAAc,EAAE,GAAG,EAAE,CAAC,CAAC;oBACrB,SAAS,EAAE,UAAU,UAAU,EAAE,EAAE;oBACnC,kBAAkB,EAAE,MAAM,CAAC,kBAAkB;oBAC7C,SAAS,EAAE,+BAA+B,CAAC;wBACzC,aAAa,EAAE,CAAC,MAAM,CAAC,kBAAkB,CAAC;wBAC1C,UAAU,EAAE,CAAC,8BAA8B,CAAC;qBAC7C,CAAC;oBACF,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,GAAG;oBAC7B,cAAc;iBACf,CAAC;gBACF,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;oBACvB,IAAI,aAAa,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS;wBAAE,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;yBACvE,IAAI,aAAa,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;wBAC1D,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,OAAoC,CAAC,CAAC,CAAC;oBAC1E,CAAC;;wBAAM,MAAM,CAAC,IAAI,aAAa,CAAC,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC,CAAC;oBACtE,MAAM,CAAC,MAAM,CAAC,CAAC;gBACjB,CAAC;aACF,CAAC,CAAC;YACH,KAAK,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;gBACjD,MAAM,CACJ,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,MAAM,IAAI,KAAK;oBAC5D,CAAC,CAAC,mBAAmB,CAAC,KAAuB,CAAC;oBAC9C,CAAC,CAAC,mBAAmB,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC,CAC1D,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,MAAM,CAAC,CAAC;QACf,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC3C,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,GAAY,EAAE,GAAa;IAC7D,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;IACzC,MAAM,KAAK,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IACvC,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAC3B,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACzB,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACjC,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,OAAO;QACL,UAAU;QACV,OAAO,EAAE,GAAG,EAAE;YACZ,IAAI,OAAO;gBAAE,OAAO;YACpB,OAAO,GAAG,IAAI,CAAC;YACf,GAAG,CAAC,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;YACrC,GAAG,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YACnC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC7C,CAAC;KACF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,QAA6B,EAAE,GAAa;IACjF,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC5B,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;IACtE,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QACnB,GAAG,CAAC,GAAG,EAAE,CAAC;QACV,OAAO;IACT,CAAC;IACD,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAa,CAAC,CAAC;IACxD,IAAI,0BAA0B,GAAG,KAAK,CAAC;IACvC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;QACxB,+EAA+E;QAC/E,0BAA0B,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC;IAC9C,CAAC,CAAC,CAAC;IACH,IAAI,CAAC;QACH,MAAM,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IACE,0BAA0B;YAC1B,CAAC,GAAG,CAAC,SAAS;YACd,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC;YACzB,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC;YAClB,KAAK,CAAC,IAAI,KAAK,4BAA4B,EAC3C,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,MAAc,EACd,aAA4B,EAC5B,WAA6B,EAC7B,YAAwC,EACxC,aAAsC,EACtC,gBAAgB,GAAG,iCAAiC;IAEpD,MAAM,YAAY,GAAG,IAAI,iBAAiB,CAAC;QACzC,QAAQ,EAAE,2BAA2B;QACrC,eAAe,EAAE,0BAA0B;QAC3C,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI;KACtB,CAAC,CAAC;IACH,aAAa,CAAC,eAAe,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;IAC1D,aAAa,CAAC,eAAe,CAAC,KAAK,IAAI,EAAE,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAC,CAAC;IACnF,MAAM,gCAAgC,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAiB,EAAE;QAC5F,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;QAChC,MAAM,QAAQ,GACZ,CAAC,CAAC,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,4BAA4B,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACpG,CAAC,CAAC,aAAa,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBAC9D,CAAC,CAAC,wBAAwB,CAAC,OAAO,EAAE,EAAE,CAAC;gBACvC,CAAC,CAAC,SAAS,CAAC,CAAC;QACjB,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,gBAAgB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;YACtC,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,gBAAgB,CAC9B,GAAG,EAAE,CAAC,IAAI,MAAM,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,kBAAkB,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,EACzG,EAAE,MAAM,EAAE,QAAQ,EAAE,CACrB,CAAC;QACF,IAAI,CAAC;YACH,MAAM,gBAAgB,CAAC,MAAM,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,CAAC;QAC5D,CAAC;gBAAS,CAAC;YACT,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;QACxB,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,CAAC,GAAG,CAAC,wBAAwB,EAAE,eAAe,EAAE,GAAG,WAAW,EAAE,gCAAgC,CAAC,CAAC;IACxG,MAAM,CAAC,MAAM,CAAC,wBAAwB,EAAE,eAAe,EAAE,GAAG,WAAW,EAAE,gCAAgC,CAAC,CAAC;IAC3G,MAAM,CAAC,IAAI,CAAC,wBAAwB,EAAE,eAAe,EAAE,GAAG,WAAW,EAAE,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;QAC3G,MAAM,UAAU,GAAG,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACjD,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YAC9D,MAAM,QAAQ,GACZ,CAAC,CAAC,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,4BAA4B,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBACpG,CAAC,CAAC,aAAa,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;oBAC9D,CAAC,CAAC,wBAAwB,CAAC,OAAO,EAAE,EAAE,CAAC;oBACvC,CAAC,CAAC,SAAS,CAAC,CAAC;YACjB,IAAI,QAAQ,EAAE,CAAC;gBACb,MAAM,gBAAgB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;gBACtC,OAAO;YACT,CAAC;YAED,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YACrC,MAAM,MAAM,GAAI,GAAG,CAAC,IAAoC,EAAE,MAAM,CAAC;YACjE,IAAI,MAAM,KAAK,sBAAsB,IAAI,MAAM,KAAK,yBAAyB,EAAE,CAAC;gBAC9E,kFAAkF;gBAClF,MAAM,UAAU,GAAG,gBAAgB,CACjC,GAAG,EAAE,CAAC,IAAI,MAAM,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,kBAAkB,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,EAC9F,EAAE,MAAM,EAAE,QAAQ,EAAE,CACrB,CAAC;gBACF,IAAI,CAAC;oBACH,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;oBAC1E,IAAI,OAAO,CAAC,MAAM,KAAK,GAAG,IAAI,OAAO,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;wBACrD,MAAM,gBAAgB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;wBACrC,OAAO;oBACT,CAAC;oBACD,MAAM,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;gBAC/B,CAAC;wBAAS,CAAC;oBACT,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC;gBAC3B,CAAC;gBACD,IAAI,MAAM,KAAK,sBAAsB,EAAE,CAAC;oBACtC,MAAM,uBAAuB,CAAC,GAAG,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;gBAC7G,CAAC;qBAAM,CAAC;oBACN,wBAAwB,CAAC,GAAG,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;gBAC5D,CAAC;gBACD,OAAO;YACT,CAAC;YACD,MAAM,QAAQ,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;YACnF,MAAM,YAAY,GAChB,QAAQ,CAAC,QAAQ,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;YACpG,MAAM,OAAO,GAAG,gBAAgB,CAC9B,GAAG,EAAE;gBACH,MAAM,MAAM,GAAG,IAAI,MAAM,CACvB,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,kBAAkB,EAAE,EACtD;oBACE,YAAY,EAAE;wBACZ,GAAG,iCAAiC,CAAC,aAAa,EAAE,MAAM,CAAC;wBAC3D,WAAW,EAAE,EAAE;qBAChB;iBACF,CACF,CAAC;gBACF,KAAK,MAAM,SAAS,IAAI,sBAAsB,CAAC,OAAO,EAAE,CAAC;oBACvD,MAAM,CAAC,iBAAiB,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,OAAsB,EAAE,EAAE;wBAC5E,IAAI,oBAAoB,IAAI,0BAA0B,EAAE,CAAC;4BACvD,MAAM,IAAI,aAAa,CAAC,CAAC,KAAK,EAAE,mCAAmC,EAAE;gCACnE,kBAAkB,EAAE;oCAClB,IAAI,EAAE,WAAW;oCACjB,IAAI,EAAE,oBAAoB;iCAC3B;6BACF,CAAC,CAAC;wBACL,CAAC;wBACD,oBAAoB,EAAE,CAAC;wBACvB,IAAI,CAAC;4BACH,MAAM,YAAY,GACf,OAAO,CAAC,MAAM,CAAC,QAAgD,EAAE,CAChE,4CAA4C,CAC7C,IAAI,EAAE,CAAC;4BACV,MAAM,QAAQ,GAAI,OAAO,CAAC,MAAM,CAAC,QAAgD,EAAE,CACjF,kCAAkC,CACmC,CAAC;4BACxE,MAAM,OAAO,GAAG,MAAM,8BAA8B,CAClD,aAAa,EACb,MAAM,EACN,SAAS,EACT,uBAAuB,CAAC,OAAO,CAAC,MAAM,CAAC,EACvC,WAAW,CAAC,GAAG,CAAC,EAChB,YAAY,EACZ,OAAO,CAAC,MAAM,CAAC,MAAM,CACtB,CAAC;4BACF,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;4BACnD,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;gCAC/B,IAAI,CAAC,OAAO,IAAI,OAAO,YAAY,KAAK,QAAQ;oCAC9C,MAAM,IAAI,aAAa,CAAC,CAAC,KAAK,EAAE,mCAAmC,CAAC,CAAC;gCACvE,OAAO,CAAC,MAAM,YAAY,CAAC,MAAM,CAC/B,YAAY,EACZ,OAAO,EACP,OAAO,CAAC,MAAM,CAAC,cAAc,EAC7B,OAAO,CAAC,MAAM,CAAC,MAAM,EACrB,KAAK,IAAI,EAAE,CACT,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;oCACrB,IAAI,CAAC,SAAS,CACZ,MAAM,8BAA8B,CAClC,aAAa,EACb,MAAM,EACN,SAAS,EACT,uBAAuB,CAAC,OAAO,CAAC,MAAM,CAAC,EACvC,WAAW,CAAC,GAAG,CAAC,EAChB,YAAY,EACZ,OAAO,CAAC,MAAM,CAAC,MAAM,CACtB,CACF;oCACH,CAAC,MAAM,kBAAkB,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;oCAC5C,iCAAiC,CAAC,OAAO,CAAC,CAC7C,CAAU,CAAC;4BACd,CAAC;4BACD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,gBAAgB,CAAC;4BAC/C,IAAI,OAAO,EAAE,CAAC;gCACZ,MAAM,aAAa,GAAG,KAAK,EAAE,MAAmB,EAAE,EAAE;oCAClD,MAAM,OAAO,GAAG,MAAM,8BAA8B,CAClD,aAAa,EACb,MAAM,EACN,SAAS,EACT,uBAAuB,CAAC,OAAO,CAAC,MAAM,CAAC,EACvC,WAAW,CAAC,GAAG,CAAC,EAChB,YAAY,EACZ,MAAM,CACP,CAAC;oCACF,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;wCACxD,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;wCACjC,MAAM,IAAI,aAAa,CAAC,CAAC,KAAK,EAAE,wCAAwC,CAAC,CAAC;oCAC5E,CAAC;gCACH,CAAC,CAAC;gCACF,OAAO,CAAC,MAAM,YAAY,CAAC,KAAK,CAC9B,OAAO,EACP,QAAQ,EACR,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAAE;oCAC9C,MAAM,OAAO,GAAG,6BAA6B,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;oCAC/F,IAAI,CAAC;wCACH,MAAM,aAAa,CAAC,MAAM,CAAC,CAAC;wCAC5B,OAAO,MAAM,4BAA4B,CAAC,OAAO,EAAE,GAAG,EAAE,CACtD,0BAA0B,CACxB,KAAK,EAAE,MAAM,EAAE,EAAE;4CACf,MAAM,aAAa,CAAC,MAAM,CAAC,CAAC;4CAC5B,IACE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,wBAAwB,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;gDAEtF,MAAM,IAAI,aAAa,CAAC,CAAC,KAAK,EAAE,iCAAiC,CAAC,CAAC;4CACrE,OAAO,gBAAgB,CAAC,MAAM,CAAC,CAAC;wCAClC,CAAC,EACD,GAAG,EAAE,CACH,eAAe,CACb,SAAS,EACT,OAAO,CAAC,MAAM,EACd,MAAM,EACN,aAAa,EACb,MAAM,EACN,YAAY,EACZ,QAAQ,EACR;4CACE,YAAY,EAAE,oBAAoB,CAAC,YAAY,CAAC;4CAChD,QAAQ;4CACR,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;gDAC3B,MAAM,aAAa,CAAC,MAAM,CAAC,CAAC;gDAC5B,IAAI,CAAC,wBAAwB,CAAC,YAAY,EAAE,KAAK,CAAC;oDAChD,MAAM,IAAI,aAAa,CAAC,CAAC,KAAK,EAAE,iCAAiC,CAAC,CAAC;gDACrE,OAAO,WAAW,CAAC,KAAK,CAAC,CAAC;4CAC5B,CAAC;yCACF,CACF,CACJ,CACF,CAAC;oCACJ,CAAC;4CAAS,CAAC;wCACT,OAAO,EAAE,CAAC;oCACZ,CAAC;gCACH,CAAC,EACD,OAAO,CAAC,MAAM,CAAC,MAAM,CACtB,CAAU,CAAC;4BACd,CAAC;4BACD,OAAO,CAAC,MAAM,eAAe,CAC3B,SAAS,EACT,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,MAAM,CAAC,MAAM,EACrB,aAAa,EACb,MAAM,EACN,YAAY,EACZ,IAAI,CAAC,GAAG,EAAE,GAAG,gBAAgB,CAC9B,CAAU,CAAC;wBACd,CAAC;gCAAS,CAAC;4BACT,oBAAoB,EAAE,CAAC;wBACzB,CAAC;oBACH,CAAC,CAAC,CAAC;gBACL,CAAC;gBACD,OAAO,MAAM,CAAC;YAChB,CAAC,EACD,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,CACnC,CAAC;YAEF,IAAI,CAAC;gBACH,MAAM,gBAAgB,CAAC,MAAM,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;YACtF,CAAC;oBAAS,CAAC;gBACT,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;YACxB,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,UAAU,CAAC,OAAO,EAAE,CAAC;QACvB,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import type { ServerManager } from '../../../core/server/serverManager.js';
|
|
2
|
+
import { type InboundConnectionConfig } from '../../../core/types/index.js';
|
|
3
|
+
import type { Request, Response } from 'express';
|
|
4
|
+
import type { ModernInboundBridgeFactory } from './modernHttpRoutes.js';
|
|
5
|
+
/** Discovery reflects current visible providers; listen still verifies upstream acknowledgement. */
|
|
6
|
+
export declare function getModernSubscriptionCapabilities(manager: Pick<ServerManager, 'getClients'>, config: InboundConnectionConfig): {
|
|
7
|
+
tools: {
|
|
8
|
+
listChanged?: true;
|
|
9
|
+
};
|
|
10
|
+
prompts: {
|
|
11
|
+
listChanged?: true;
|
|
12
|
+
};
|
|
13
|
+
resources: {
|
|
14
|
+
subscribe?: true | undefined;
|
|
15
|
+
listChanged?: true;
|
|
16
|
+
};
|
|
17
|
+
};
|
|
18
|
+
export declare function serveModernSubscription(req: Request, res: Response, manager: ServerManager, config: InboundConnectionConfig, createBridge: ModernInboundBridgeFactory, signal: AbortSignal): Promise<void>;
|
|
19
|
+
export declare function cancelModernSubscription(req: Request, res: Response, manager: ServerManager, config: InboundConnectionConfig): void;
|
|
20
|
+
export declare function closeModernSubscriptions(manager: ServerManager): Promise<void>;
|
|
21
|
+
//# sourceMappingURL=modernSubscriptions.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"modernSubscriptions.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/routes/modernSubscriptions.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAgB,KAAK,uBAAuB,EAA2B,MAAM,0BAA0B,CAAC;AAG/G,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAGjD,OAAO,KAAK,EAAuB,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AAgC7F,oGAAoG;AACpG,wBAAgB,iCAAiC,CAC/C,OAAO,EAAE,IAAI,CAAC,aAAa,EAAE,YAAY,CAAC,EAC1C,MAAM,EAAE,uBAAuB;;sBAemD,IAAI;;;sBAAJ,IAAI;;;;sBAAJ,IAAI;;EAgBvF;AA+SD,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,EACb,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,uBAAuB,EAC/B,YAAY,EAAE,0BAA0B,EACxC,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,IAAI,CAAC,CAkCf;AACD,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,EACb,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,uBAAuB,GAC9B,IAAI,CAQN;AACD,wBAAsB,wBAAwB,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAIpF"}
|