@1mcp/agent 0.35.0-beta.2 → 0.35.0-beta.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +5 -2
- package/build/admin/assets/{admin-console-CbHHoqLr.js → admin-console-BOl7XR0p.js} +2 -2
- package/build/admin/assets/{admin-console-C5_zD_qW.css → admin-console-Bbil6BQU.css} +1 -1
- package/build/admin/index.html +2 -2
- package/build/auth/oauthAuthorizationFlow.d.ts +2 -2
- package/build/auth/oauthAuthorizationFlow.d.ts.map +1 -1
- package/build/auth/oauthAuthorizationFlow.js +1 -1
- package/build/auth/oauthAuthorizationFlow.js.map +1 -1
- package/build/auth/sdkOAuthServerProvider.d.ts +4 -3
- package/build/auth/sdkOAuthServerProvider.d.ts.map +1 -1
- package/build/auth/sdkOAuthServerProvider.js +132 -17
- package/build/auth/sdkOAuthServerProvider.js.map +1 -1
- package/build/auth/sessionTypes.d.ts +40 -5
- package/build/auth/sessionTypes.d.ts.map +1 -1
- package/build/auth/sessionTypes.js +33 -1
- package/build/auth/sessionTypes.js.map +1 -1
- package/build/auth/storage/fileStorageService.d.ts +18 -1
- package/build/auth/storage/fileStorageService.d.ts.map +1 -1
- package/build/auth/storage/fileStorageService.js +253 -3
- package/build/auth/storage/fileStorageService.js.map +1 -1
- package/build/auth/storage/oauthStorageService.d.ts +4 -1
- package/build/auth/storage/oauthStorageService.d.ts.map +1 -1
- package/build/auth/storage/oauthStorageService.js +8 -1
- package/build/auth/storage/oauthStorageService.js.map +1 -1
- package/build/auth/storage/refreshTokenFamilyRepository.d.ts +36 -0
- package/build/auth/storage/refreshTokenFamilyRepository.d.ts.map +1 -0
- package/build/auth/storage/refreshTokenFamilyRepository.js +167 -0
- package/build/auth/storage/refreshTokenFamilyRepository.js.map +1 -0
- package/build/auth/storage/sessionRepository.d.ts +14 -1
- package/build/auth/storage/sessionRepository.d.ts.map +1 -1
- package/build/auth/storage/sessionRepository.js +32 -9
- package/build/auth/storage/sessionRepository.js.map +1 -1
- package/build/commands/inspect/inspect.d.ts.map +1 -1
- package/build/commands/inspect/inspect.js +2 -9
- package/build/commands/inspect/inspect.js.map +1 -1
- package/build/commands/inspect/inspectUtils.d.ts +4 -0
- package/build/commands/inspect/inspectUtils.d.ts.map +1 -1
- package/build/commands/inspect/inspectUtils.js +12 -0
- package/build/commands/inspect/inspectUtils.js.map +1 -1
- package/build/commands/instructions/instructionsUtils.d.ts +2 -0
- package/build/commands/instructions/instructionsUtils.d.ts.map +1 -1
- package/build/commands/instructions/instructionsUtils.js +7 -3
- package/build/commands/instructions/instructionsUtils.js.map +1 -1
- package/build/commands/run/run.d.ts.map +1 -1
- package/build/commands/run/run.js +86 -7
- package/build/commands/run/run.js.map +1 -1
- package/build/commands/serve/asyncLoadingOptions.d.ts +30 -0
- package/build/commands/serve/asyncLoadingOptions.d.ts.map +1 -0
- package/build/commands/serve/asyncLoadingOptions.js +34 -0
- package/build/commands/serve/asyncLoadingOptions.js.map +1 -0
- package/build/commands/serve/index.d.ts +4 -1
- package/build/commands/serve/index.d.ts.map +1 -1
- package/build/commands/serve/index.js +14 -15
- package/build/commands/serve/index.js.map +1 -1
- package/build/commands/serve/serve.d.ts +2 -1
- package/build/commands/serve/serve.d.ts.map +1 -1
- package/build/commands/serve/serve.js +17 -8
- package/build/commands/serve/serve.js.map +1 -1
- package/build/commands/serve/serveBackground.d.ts.map +1 -1
- package/build/commands/serve/serveBackground.js +1 -0
- package/build/commands/serve/serveBackground.js.map +1 -1
- package/build/commands/shared/apiClient.d.ts +1 -1
- package/build/commands/shared/apiClient.d.ts.map +1 -1
- package/build/commands/shared/apiClient.js +2 -2
- package/build/commands/shared/apiClient.js.map +1 -1
- package/build/commands/shared/clientSurfaceAttachment.d.ts +3 -1
- package/build/commands/shared/clientSurfaceAttachment.d.ts.map +1 -1
- package/build/commands/shared/clientSurfaceAttachment.js +14 -4
- package/build/commands/shared/clientSurfaceAttachment.js.map +1 -1
- package/build/commands/shared/commandRunner.d.ts +1 -0
- package/build/commands/shared/commandRunner.d.ts.map +1 -1
- package/build/commands/shared/commandRunner.js +10 -2
- package/build/commands/shared/commandRunner.js.map +1 -1
- package/build/commands/shared/filterSelectionQuery.d.ts +8 -0
- package/build/commands/shared/filterSelectionQuery.d.ts.map +1 -0
- package/build/commands/shared/filterSelectionQuery.js +12 -0
- package/build/commands/shared/filterSelectionQuery.js.map +1 -0
- package/build/commands/shared/inspectApiSchemas.d.ts +83 -0
- package/build/commands/shared/inspectApiSchemas.d.ts.map +1 -0
- package/build/commands/shared/inspectApiSchemas.js +40 -0
- package/build/commands/shared/inspectApiSchemas.js.map +1 -0
- package/build/commands/shared/serveTargetResolver.d.ts.map +1 -1
- package/build/commands/shared/serveTargetResolver.js +19 -8
- package/build/commands/shared/serveTargetResolver.js.map +1 -1
- package/build/commands/wait/index.d.ts +3 -0
- package/build/commands/wait/index.d.ts.map +1 -0
- package/build/commands/wait/index.js +20 -0
- package/build/commands/wait/index.js.map +1 -0
- package/build/commands/wait/wait.d.ts +39 -0
- package/build/commands/wait/wait.d.ts.map +1 -0
- package/build/commands/wait/wait.js +161 -0
- package/build/commands/wait/wait.js.map +1 -0
- package/build/config/configLoader.d.ts.map +1 -1
- package/build/config/configLoader.js +12 -0
- package/build/config/configLoader.js.map +1 -1
- package/build/constants/auth.d.ts +10 -1
- package/build/constants/auth.d.ts.map +1 -1
- package/build/constants/auth.js +11 -1
- package/build/constants/auth.js.map +1 -1
- package/build/constants/mcp.d.ts +7 -1
- package/build/constants/mcp.d.ts.map +1 -1
- package/build/constants/mcp.js +9 -1
- package/build/constants/mcp.js.map +1 -1
- package/build/core/capabilities/capabilityAggregator.d.ts.map +1 -1
- package/build/core/capabilities/capabilityAggregator.js +10 -9
- package/build/core/capabilities/capabilityAggregator.js.map +1 -1
- package/build/core/capabilities/capabilityCatalog.d.ts +6 -5
- package/build/core/capabilities/capabilityCatalog.d.ts.map +1 -1
- package/build/core/capabilities/capabilityCatalog.js +36 -23
- package/build/core/capabilities/capabilityCatalog.js.map +1 -1
- package/build/core/capabilities/capabilityVisibility.d.ts +12 -0
- package/build/core/capabilities/capabilityVisibility.d.ts.map +1 -0
- package/build/core/capabilities/capabilityVisibility.js +13 -0
- package/build/core/capabilities/capabilityVisibility.js.map +1 -0
- package/build/core/capabilities/internalCapabilitiesProvider.d.ts +2 -1
- package/build/core/capabilities/internalCapabilitiesProvider.d.ts.map +1 -1
- package/build/core/capabilities/internalCapabilitiesProvider.js +2 -2
- package/build/core/capabilities/internalCapabilitiesProvider.js.map +1 -1
- package/build/core/capabilities/lazyLoadingOrchestrator.d.ts +5 -23
- package/build/core/capabilities/lazyLoadingOrchestrator.d.ts.map +1 -1
- package/build/core/capabilities/lazyLoadingOrchestrator.js +25 -44
- package/build/core/capabilities/lazyLoadingOrchestrator.js.map +1 -1
- package/build/core/capabilities/metaToolProvider.d.ts +6 -21
- package/build/core/capabilities/metaToolProvider.d.ts.map +1 -1
- package/build/core/capabilities/metaToolProvider.js +18 -70
- package/build/core/capabilities/metaToolProvider.js.map +1 -1
- package/build/core/capabilities/toolRegistry.d.ts +5 -1
- package/build/core/capabilities/toolRegistry.d.ts.map +1 -1
- package/build/core/capabilities/toolRegistry.js +11 -3
- package/build/core/capabilities/toolRegistry.js.map +1 -1
- package/build/core/client/clientManager.d.ts +9 -0
- package/build/core/client/clientManager.d.ts.map +1 -1
- package/build/core/client/clientManager.js +82 -0
- package/build/core/client/clientManager.js.map +1 -1
- package/build/core/client/recreateHttpTransportOptions.d.ts +14 -0
- package/build/core/client/recreateHttpTransportOptions.d.ts.map +1 -0
- package/build/core/client/recreateHttpTransportOptions.js +2 -0
- package/build/core/client/recreateHttpTransportOptions.js.map +1 -0
- package/build/core/client/transportRecreator.d.ts +8 -1
- package/build/core/client/transportRecreator.d.ts.map +1 -1
- package/build/core/client/transportRecreator.js +11 -2
- package/build/core/client/transportRecreator.js.map +1 -1
- package/build/core/instructions/templateTypes.d.ts +2 -2
- package/build/core/instructions/templateTypes.d.ts.map +1 -1
- package/build/core/protocol/requestHandlerUtils.d.ts +3 -0
- package/build/core/protocol/requestHandlerUtils.d.ts.map +1 -1
- package/build/core/protocol/requestHandlerUtils.js +23 -7
- package/build/core/protocol/requestHandlerUtils.js.map +1 -1
- package/build/core/protocol/toolRequestHandlers.d.ts.map +1 -1
- package/build/core/protocol/toolRequestHandlers.js +13 -13
- package/build/core/protocol/toolRequestHandlers.js.map +1 -1
- package/build/core/runtime/runtimeIdentityService.d.ts +1 -0
- package/build/core/runtime/runtimeIdentityService.d.ts.map +1 -1
- package/build/core/runtime/runtimeIdentityService.js +4 -1
- package/build/core/runtime/runtimeIdentityService.js.map +1 -1
- package/build/core/server/clientInstanceFactory.d.ts.map +1 -1
- package/build/core/server/clientInstanceFactory.js +12 -3
- package/build/core/server/clientInstanceFactory.js.map +1 -1
- package/build/core/server/connectionManager.d.ts +0 -6
- package/build/core/server/connectionManager.d.ts.map +1 -1
- package/build/core/server/connectionManager.js +0 -39
- package/build/core/server/connectionManager.js.map +1 -1
- package/build/core/server/connectionResolver.d.ts.map +1 -1
- package/build/core/server/connectionResolver.js +35 -1
- package/build/core/server/connectionResolver.js.map +1 -1
- package/build/core/types/transport.d.ts +2 -0
- package/build/core/types/transport.d.ts.map +1 -1
- package/build/core/types/transport.js +18 -5
- package/build/core/types/transport.js.map +1 -1
- package/build/domains/backend-logs/backendLogBroker.d.ts +47 -0
- package/build/domains/backend-logs/backendLogBroker.d.ts.map +1 -0
- package/build/domains/backend-logs/backendLogBroker.js +249 -0
- package/build/domains/backend-logs/backendLogBroker.js.map +1 -0
- package/build/domains/backend-logs/backendLogProjection.d.ts +9 -0
- package/build/domains/backend-logs/backendLogProjection.d.ts.map +1 -0
- package/build/domains/backend-logs/backendLogProjection.js +40 -0
- package/build/domains/backend-logs/backendLogProjection.js.map +1 -0
- package/build/domains/backend-logs/backendLogRuntime.d.ts +4 -0
- package/build/domains/backend-logs/backendLogRuntime.d.ts.map +1 -0
- package/build/domains/backend-logs/backendLogRuntime.js +11 -0
- package/build/domains/backend-logs/backendLogRuntime.js.map +1 -0
- package/build/domains/backend-logs/backendLogSanitizer.d.ts +2 -0
- package/build/domains/backend-logs/backendLogSanitizer.d.ts.map +1 -0
- package/build/domains/backend-logs/backendLogSanitizer.js +30 -0
- package/build/domains/backend-logs/backendLogSanitizer.js.map +1 -0
- package/build/domains/backend-logs/backendLogSource.d.ts +8 -0
- package/build/domains/backend-logs/backendLogSource.d.ts.map +1 -0
- package/build/domains/backend-logs/backendLogSource.js +22 -0
- package/build/domains/backend-logs/backendLogSource.js.map +1 -0
- package/build/domains/backend-logs/backendLogTypes.d.ts +49 -0
- package/build/domains/backend-logs/backendLogTypes.d.ts.map +1 -0
- package/build/domains/backend-logs/backendLogTypes.js +2 -0
- package/build/domains/backend-logs/backendLogTypes.js.map +1 -0
- package/build/domains/runtime-targets/runtimeIdentityVerification.d.ts +8 -1
- package/build/domains/runtime-targets/runtimeIdentityVerification.d.ts.map +1 -1
- package/build/domains/runtime-targets/runtimeIdentityVerification.js +62 -3
- package/build/domains/runtime-targets/runtimeIdentityVerification.js.map +1 -1
- package/build/domains/runtime-targets/runtimeProbe.d.ts +34 -0
- package/build/domains/runtime-targets/runtimeProbe.d.ts.map +1 -0
- package/build/domains/runtime-targets/runtimeProbe.js +71 -0
- package/build/domains/runtime-targets/runtimeProbe.js.map +1 -0
- package/build/index.d.ts.map +1 -1
- package/build/index.js +3 -0
- package/build/index.js.map +1 -1
- package/build/transport/http/routes/adminRoutes.d.ts +2 -0
- package/build/transport/http/routes/adminRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/adminRoutes.js +159 -17
- package/build/transport/http/routes/adminRoutes.js.map +1 -1
- package/build/transport/http/routes/inspectHelpers.d.ts +11 -4
- package/build/transport/http/routes/inspectHelpers.d.ts.map +1 -1
- package/build/transport/http/routes/inspectHelpers.js +21 -2
- package/build/transport/http/routes/inspectHelpers.js.map +1 -1
- package/build/transport/http/routes/inspectRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/inspectRoutes.js +55 -4
- package/build/transport/http/routes/inspectRoutes.js.map +1 -1
- package/build/transport/http/routes/toolRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/toolRoutes.js +37 -29
- package/build/transport/http/routes/toolRoutes.js.map +1 -1
- package/build/transport/http/server.d.ts.map +1 -1
- package/build/transport/http/server.js +3 -1
- package/build/transport/http/server.js.map +1 -1
- package/build/transport/managedStdioStderr.d.ts +17 -1
- package/build/transport/managedStdioStderr.d.ts.map +1 -1
- package/build/transport/managedStdioStderr.js +129 -5
- package/build/transport/managedStdioStderr.js.map +1 -1
- package/build/transport/managedStdioStderrOptions.d.ts +2 -0
- package/build/transport/managedStdioStderrOptions.d.ts.map +1 -1
- package/build/transport/restartableStdioTransport.js +1 -1
- package/build/transport/restartableStdioTransport.js.map +1 -1
- package/build/transport/transportFactory.d.ts +6 -2
- package/build/transport/transportFactory.d.ts.map +1 -1
- package/build/transport/transportFactory.js +43 -15
- package/build/transport/transportFactory.js.map +1 -1
- package/build/types/serverStatus.d.ts +3 -0
- package/build/types/serverStatus.d.ts.map +1 -0
- package/build/types/serverStatus.js +13 -0
- package/build/types/serverStatus.js.map +1 -0
- package/build/utils/validation/urlDetection.d.ts +12 -9
- package/build/utils/validation/urlDetection.d.ts.map +1 -1
- package/build/utils/validation/urlDetection.js +233 -31
- package/build/utils/validation/urlDetection.js.map +1 -1
- package/package.json +4 -3
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/wait/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAElC,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,IAAI,GAAG,IAAI,CAsBlD"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { runCliCommand } from '../../commands/shared/commandRunner.js';
|
|
2
|
+
import { globalOptions } from '../../globalOptions.js';
|
|
3
|
+
export function setupWaitCommand(yargs) {
|
|
4
|
+
return yargs.command('wait [server]', 'Wait for configured static MCP servers to become connected and available', (commandYargs) => commandYargs
|
|
5
|
+
.options(globalOptions || {})
|
|
6
|
+
.positional('server', { describe: 'Configured static server to wait for', type: 'string' })
|
|
7
|
+
.option('url', { alias: 'u', describe: 'Override auto-detected 1MCP server URL', type: 'string' })
|
|
8
|
+
.option('context', { describe: 'Use a named Runtime Target Context', type: 'string' })
|
|
9
|
+
.option('preset', { alias: 'p', describe: 'Filter the running server with a preset', type: 'string' })
|
|
10
|
+
.option('tag-filter', { alias: 'f', describe: 'Apply an advanced tag filter expression', type: 'string' })
|
|
11
|
+
.option('tags', { describe: 'Apply simple comma-separated tags', type: 'array', string: true })
|
|
12
|
+
.option('timeout', { describe: 'Maximum wait time in milliseconds', type: 'number', default: 30_000 })
|
|
13
|
+
.option('format', { describe: 'Output format', type: 'string', choices: ['toon', 'text', 'json'] })
|
|
14
|
+
.example('$0 wait', 'Wait for all matching configured static servers')
|
|
15
|
+
.example('$0 wait filesystem --timeout 60000', 'Wait for one configured static server'), async (argv) => {
|
|
16
|
+
const { waitCommand } = await import('./wait.js');
|
|
17
|
+
await runCliCommand(argv, waitCommand);
|
|
18
|
+
});
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/wait/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAItD,MAAM,UAAU,gBAAgB,CAAC,KAAW;IAC1C,OAAO,KAAK,CAAC,OAAO,CAClB,eAAe,EACf,0EAA0E,EAC1E,CAAC,YAAY,EAAE,EAAE,CACf,YAAY;SACT,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC;SAC5B,UAAU,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,sCAAsC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;SAC1F,MAAM,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,wCAAwC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;SACjG,MAAM,CAAC,SAAS,EAAE,EAAE,QAAQ,EAAE,oCAAoC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;SACrF,MAAM,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,yCAAyC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;SACrG,MAAM,CAAC,YAAY,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,yCAAyC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;SACzG,MAAM,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,mCAAmC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;SAC9F,MAAM,CAAC,SAAS,EAAE,EAAE,QAAQ,EAAE,mCAAmC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;SACrG,MAAM,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;SAClG,OAAO,CAAC,SAAS,EAAE,iDAAiD,CAAC;SACrE,OAAO,CAAC,oCAAoC,EAAE,uCAAuC,CAAC,EAC3F,KAAK,EAAE,IAAI,EAAE,EAAE;QACb,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC;QAClD,MAAM,aAAa,CAAC,IAAyC,EAAE,WAAW,CAAC,CAAC;IAC9E,CAAC,CACF,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import { type ClientSurfaceAttachmentContext } from '../../commands/shared/clientSurfaceAttachment.js';
|
|
2
|
+
import { type InspectServerSummary } from '../../commands/shared/inspectApiSchemas.js';
|
|
3
|
+
import type { GlobalOptions } from '../../globalOptions.js';
|
|
4
|
+
export interface WaitCommandOptions extends GlobalOptions {
|
|
5
|
+
server?: string;
|
|
6
|
+
url?: string;
|
|
7
|
+
context?: string;
|
|
8
|
+
preset?: string;
|
|
9
|
+
filter?: string;
|
|
10
|
+
tags?: string[];
|
|
11
|
+
'tag-filter'?: string;
|
|
12
|
+
timeout?: number;
|
|
13
|
+
format?: 'toon' | 'text' | 'json';
|
|
14
|
+
}
|
|
15
|
+
interface WaitResult {
|
|
16
|
+
kind: 'wait';
|
|
17
|
+
servers: InspectServerSummary[];
|
|
18
|
+
waitedMs: number;
|
|
19
|
+
}
|
|
20
|
+
export declare class WaitCommandError extends Error {
|
|
21
|
+
readonly code: string;
|
|
22
|
+
readonly recoveryCommand: string;
|
|
23
|
+
readonly details?: unknown | undefined;
|
|
24
|
+
constructor(code: string, message: string, recoveryCommand: string, details?: unknown | undefined);
|
|
25
|
+
}
|
|
26
|
+
export declare function waitCommand(options: WaitCommandOptions): Promise<void>;
|
|
27
|
+
export declare function waitForServers(context: ClientSurfaceAttachmentContext<WaitCommandOptions>, timeout: number): Promise<{
|
|
28
|
+
status: 'success';
|
|
29
|
+
value: WaitResult;
|
|
30
|
+
} | {
|
|
31
|
+
status: 'auth_required';
|
|
32
|
+
message: string;
|
|
33
|
+
} | {
|
|
34
|
+
status: 'error';
|
|
35
|
+
message: string;
|
|
36
|
+
}>;
|
|
37
|
+
export declare function selectWaitServers(servers: InspectServerSummary[], target?: string): InspectServerSummary[];
|
|
38
|
+
export {};
|
|
39
|
+
//# sourceMappingURL=wait.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"wait.d.ts","sourceRoot":"","sources":["../../../src/commands/wait/wait.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,8BAA8B,EAGpC,MAAM,iDAAiD,CAAC;AAEzD,OAAO,EAA8B,KAAK,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AAElH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAI3D,MAAM,WAAW,kBAAmB,SAAQ,aAAa;IACvD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;CACnC;AAqBD,UAAU,UAAU;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,oBAAoB,EAAE,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,gBAAiB,SAAQ,KAAK;aAEvB,IAAI,EAAE,MAAM;aAEZ,eAAe,EAAE,MAAM;aACvB,OAAO,CAAC,EAAE,OAAO;gBAHjB,IAAI,EAAE,MAAM,EAC5B,OAAO,EAAE,MAAM,EACC,eAAe,EAAE,MAAM,EACvB,OAAO,CAAC,EAAE,OAAO,YAAA;CAKpC;AAED,wBAAsB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmD5E;AAMD,wBAAsB,cAAc,CAClC,OAAO,EAAE,8BAA8B,CAAC,kBAAkB,CAAC,EAC3D,OAAO,EAAE,MAAM,GACd,OAAO,CACN;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,UAAU,CAAA;CAAE,GACxC;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAC5C;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CACvC,CA8CA;AAYD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,oBAAoB,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,oBAAoB,EAAE,CAkB1G"}
|
|
@@ -0,0 +1,161 @@
|
|
|
1
|
+
import { encode } from '@toon-format/toon';
|
|
2
|
+
import { ApiClient } from '../../commands/shared/apiClient.js';
|
|
3
|
+
import { attachReusableClientSurface, formatClientSurfaceAuthRequiredMessage, getClientSurfaceAuthRecoveryCommand, } from '../../commands/shared/clientSurfaceAttachment.js';
|
|
4
|
+
import { buildFilterSelectionQuery } from '../../commands/shared/filterSelectionQuery.js';
|
|
5
|
+
import { inspectServersResultSchema } from '../../commands/shared/inspectApiSchemas.js';
|
|
6
|
+
import { API_INSPECT_ENDPOINT } from '../../constants/api.js';
|
|
7
|
+
import { z } from 'zod';
|
|
8
|
+
const waitCommandOptionsSchema = z
|
|
9
|
+
.object({
|
|
10
|
+
server: z.string().optional(),
|
|
11
|
+
url: z.string().optional(),
|
|
12
|
+
context: z.string().optional(),
|
|
13
|
+
preset: z.string().optional(),
|
|
14
|
+
filter: z.string().optional(),
|
|
15
|
+
tags: z.array(z.string()).optional(),
|
|
16
|
+
'tag-filter': z.string().optional(),
|
|
17
|
+
timeout: z.number().finite().optional(),
|
|
18
|
+
format: z.enum(['toon', 'text', 'json']).optional(),
|
|
19
|
+
config: z.string().optional(),
|
|
20
|
+
'config-dir': z.string().optional(),
|
|
21
|
+
'cli-session-cache-path': z.string().optional(),
|
|
22
|
+
'log-level': z.enum(['debug', 'info', 'warn', 'error']).optional(),
|
|
23
|
+
'log-file': z.string().optional(),
|
|
24
|
+
})
|
|
25
|
+
.passthrough();
|
|
26
|
+
export class WaitCommandError extends Error {
|
|
27
|
+
code;
|
|
28
|
+
recoveryCommand;
|
|
29
|
+
details;
|
|
30
|
+
constructor(code, message, recoveryCommand, details) {
|
|
31
|
+
super(message);
|
|
32
|
+
this.code = code;
|
|
33
|
+
this.recoveryCommand = recoveryCommand;
|
|
34
|
+
this.details = details;
|
|
35
|
+
this.name = 'WaitCommandError';
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
export async function waitCommand(options) {
|
|
39
|
+
const parsedOptions = waitCommandOptionsSchema.safeParse(options);
|
|
40
|
+
if (!parsedOptions.success) {
|
|
41
|
+
if (parsedOptions.error.issues.some((issue) => issue.path[0] === 'timeout')) {
|
|
42
|
+
throwInvalidTimeout();
|
|
43
|
+
}
|
|
44
|
+
throw new WaitCommandError('validation_options', `Invalid wait options: ${parsedOptions.error.issues[0]?.message ?? 'validation failed'}`, '1mcp wait', { issues: parsedOptions.error.issues });
|
|
45
|
+
}
|
|
46
|
+
const normalizedOptions = parsedOptions.data;
|
|
47
|
+
const timeout = normalizedOptions.timeout ?? 30_000;
|
|
48
|
+
if (!Number.isFinite(timeout) || timeout <= 0) {
|
|
49
|
+
throwInvalidTimeout();
|
|
50
|
+
}
|
|
51
|
+
const attachment = await attachReusableClientSurface({
|
|
52
|
+
clientSurface: 'wait',
|
|
53
|
+
version: 'wait',
|
|
54
|
+
options: normalizedOptions,
|
|
55
|
+
alwaysTryRest: true,
|
|
56
|
+
rest: (context) => waitForServers(context, timeout),
|
|
57
|
+
// `wait` deliberately has no MCP fallback: /api/v1/inspect is the
|
|
58
|
+
// authenticated client-facing status contract and MCP cannot report the
|
|
59
|
+
// loading states needed to decide whether it is safe to invoke a tool.
|
|
60
|
+
mcp: async () => ({ status: 'error', message: 'The running 1MCP server does not support /api/v1/inspect.' }),
|
|
61
|
+
});
|
|
62
|
+
if (attachment.status === 'auth_required') {
|
|
63
|
+
throw new WaitCommandError('auth_required', attachment.message, getClientSurfaceAuthRecoveryCommand({
|
|
64
|
+
baseUrl: attachment.baseUrl,
|
|
65
|
+
options: normalizedOptions,
|
|
66
|
+
target: attachment.target,
|
|
67
|
+
}));
|
|
68
|
+
}
|
|
69
|
+
if (attachment.status !== 'success') {
|
|
70
|
+
throw new WaitCommandError('server_status_unavailable', attachment.message, '1mcp inspect');
|
|
71
|
+
}
|
|
72
|
+
const output = formatWaitOutput(attachment.value, normalizedOptions.format ?? 'toon');
|
|
73
|
+
if (output.length > 0) {
|
|
74
|
+
process.stdout.write(`${output}\n`);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
function throwInvalidTimeout() {
|
|
78
|
+
throw new WaitCommandError('validation_timeout', '--timeout must be a positive number of milliseconds.', '1mcp wait');
|
|
79
|
+
}
|
|
80
|
+
export async function waitForServers(context, timeout) {
|
|
81
|
+
const apiClient = new ApiClient({
|
|
82
|
+
baseUrl: context.baseUrl,
|
|
83
|
+
bearerToken: context.bearerToken,
|
|
84
|
+
sessionId: context.sessionId,
|
|
85
|
+
context: context.context,
|
|
86
|
+
});
|
|
87
|
+
const startedAt = Date.now();
|
|
88
|
+
const deadline = startedAt + timeout;
|
|
89
|
+
let lastServers = [];
|
|
90
|
+
while (true) {
|
|
91
|
+
const remaining = deadline - Date.now();
|
|
92
|
+
if (remaining <= 0) {
|
|
93
|
+
throwWaitTimeout(timeout, context.options.server, lastServers);
|
|
94
|
+
}
|
|
95
|
+
const response = await apiClient.get(API_INSPECT_ENDPOINT, buildFilterSelectionQuery(context.options), {
|
|
96
|
+
timeout: remaining,
|
|
97
|
+
});
|
|
98
|
+
if (response.status === 401 || response.status === 403) {
|
|
99
|
+
return { status: 'auth_required', message: formatClientSurfaceAuthRequiredMessage(context) };
|
|
100
|
+
}
|
|
101
|
+
if (Date.now() >= deadline) {
|
|
102
|
+
throwWaitTimeout(timeout, context.options.server, lastServers);
|
|
103
|
+
}
|
|
104
|
+
if (!response.ok) {
|
|
105
|
+
return { status: 'error', message: response.error ?? 'Invalid response from /api/v1/inspect.' };
|
|
106
|
+
}
|
|
107
|
+
const parsed = inspectServersResultSchema.safeParse(response.data);
|
|
108
|
+
if (!parsed.success) {
|
|
109
|
+
return { status: 'error', message: 'Invalid response from /api/v1/inspect.' };
|
|
110
|
+
}
|
|
111
|
+
const selected = selectWaitServers(parsed.data.servers, context.options.server);
|
|
112
|
+
lastServers = selected;
|
|
113
|
+
throwForTerminalState(selected, context.options.server);
|
|
114
|
+
if (selected.every((server) => server.status === 'connected' && server.available)) {
|
|
115
|
+
return {
|
|
116
|
+
status: 'success',
|
|
117
|
+
value: { kind: 'wait', servers: selected, waitedMs: Date.now() - startedAt },
|
|
118
|
+
};
|
|
119
|
+
}
|
|
120
|
+
await delay(Math.min(250, Math.max(deadline - Date.now(), 1)));
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
function throwWaitTimeout(timeout, server, servers) {
|
|
124
|
+
const target = server ?? 'all configured servers';
|
|
125
|
+
throw new WaitCommandError('server_wait_timeout', `Timed out after ${timeout}ms waiting for ${target}.`, server ? `1mcp wait ${server}` : '1mcp wait', { status: 'timeout', servers });
|
|
126
|
+
}
|
|
127
|
+
export function selectWaitServers(servers, target) {
|
|
128
|
+
if (target) {
|
|
129
|
+
const server = servers.find((candidate) => candidate.server === target);
|
|
130
|
+
if (!server) {
|
|
131
|
+
throw new WaitCommandError('server_not_found', `Server '${target}' was not found.`, `1mcp inspect ${target}`);
|
|
132
|
+
}
|
|
133
|
+
if (!server.loadTracked) {
|
|
134
|
+
throw new WaitCommandError('server_not_load_tracked', `Server '${target}' is not a tracked static startup server.`, `1mcp inspect ${target}`, { server });
|
|
135
|
+
}
|
|
136
|
+
return [server];
|
|
137
|
+
}
|
|
138
|
+
return servers.filter((server) => server.loadTracked);
|
|
139
|
+
}
|
|
140
|
+
function throwForTerminalState(servers, requestedServer) {
|
|
141
|
+
const terminal = servers.find((server) => ['failed', 'cancelled', 'awaiting_oauth', 'disconnected', 'error', 'unknown'].includes(server.status));
|
|
142
|
+
if (!terminal)
|
|
143
|
+
return;
|
|
144
|
+
if (terminal.status === 'awaiting_oauth') {
|
|
145
|
+
throw new WaitCommandError('server_awaiting_oauth', `Server '${terminal.server}' requires OAuth authorization.`, `1mcp inspect ${terminal.server}`, { server: terminal });
|
|
146
|
+
}
|
|
147
|
+
throw new WaitCommandError('server_unavailable', `Server '${terminal.server}' is ${terminal.status}.`, `1mcp mcp restart ${requestedServer ?? terminal.server}`, { server: terminal });
|
|
148
|
+
}
|
|
149
|
+
function formatWaitOutput(result, format) {
|
|
150
|
+
if (format === 'json')
|
|
151
|
+
return JSON.stringify(result, null, 2);
|
|
152
|
+
if (format === 'toon')
|
|
153
|
+
return encode(result);
|
|
154
|
+
if (result.servers.length === 0)
|
|
155
|
+
return 'No matching tracked static servers.';
|
|
156
|
+
return result.servers.map((server) => `${server.server}: ${server.status}`).join('\n');
|
|
157
|
+
}
|
|
158
|
+
function delay(milliseconds) {
|
|
159
|
+
return new Promise((resolve) => setTimeout(resolve, milliseconds));
|
|
160
|
+
}
|
|
161
|
+
//# sourceMappingURL=wait.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../../src/commands/wait/wait.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configLoader.d.ts","sourceRoot":"","sources":["../../src/config/configLoader.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,iBAAiB,EAEjB,qBAAqB,EAErB,eAAe,EAEhB,MAAM,8BAA8B,CAAC;AAgBtC,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACzC,YAAY,EAAE,qBAAqB,CAAC;IACpC,SAAS,EAAE,iBAAiB,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC5C,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAClD,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,OAAO,CAAC;CACzB;AAED,UAAU,mBAAmB;IAC3B,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,UAAU,uBAAuB;IAC/B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;
|
|
1
|
+
{"version":3,"file":"configLoader.d.ts","sourceRoot":"","sources":["../../src/config/configLoader.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,iBAAiB,EAEjB,qBAAqB,EAErB,eAAe,EAEhB,MAAM,8BAA8B,CAAC;AAgBtC,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACzC,YAAY,EAAE,qBAAqB,CAAC;IACpC,SAAS,EAAE,iBAAiB,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC5C,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAClD,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,OAAO,CAAC;CACzB;AAED,UAAU,mBAAmB;IAC3B,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,UAAU,uBAAuB;IAC/B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAkFD,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,iBAAiB,CAmB7E;AAED,qBAAa,YAAY;IACvB,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,YAAY,CAAK;gBAEb,cAAc,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,mBAAmB;IAOlE,OAAO,CAAC,kBAAkB;IAkBnB,iBAAiB,IAAI,MAAM;IAI3B,iBAAiB,IAAI,OAAO;IAuBnC,OAAO,CAAC,mBAAmB;IAmCpB,aAAa,IAAI,OAAO;IAIxB,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,eAAe;IAQ1E,oBAAoB,CAAC,MAAM,EAAE,OAAO,GAAG,qBAAqB;IAQ5D,iBAAiB,CAAC,MAAM,EAAE,OAAO,GAAG,iBAAiB;IAQrD,aAAa,IAAI,iBAAiB;IAWlC,qBAAqB,IAAI,iBAAiB;IAK1C,gBAAgB,CAAC,OAAO,CAAC,EAAE,uBAAuB,GAAG,eAAe;IAiFpE,mCAAmC,IAAI,eAAe;IAItD,6BAA6B,IAAI,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;IAIhE,kBAAkB,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;IAUrG,gBAAgB,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,MAAM,EAAE;IAa5E,eAAe,IAAI,OAAO;CAIlC"}
|
|
@@ -38,6 +38,17 @@ function warnIfLegacyAppConfig(rawConfig, configFilePath) {
|
|
|
38
38
|
logger.warn(`The "app" key in mcp.json is deprecated. Please move your app settings to ${tomlPath}. ` +
|
|
39
39
|
`The "app" key in mcp.json will be ignored.`);
|
|
40
40
|
}
|
|
41
|
+
function warnForLegacyLazyLoadingConfig(rawConfig, tomlPath) {
|
|
42
|
+
if (!rawConfig || typeof rawConfig !== 'object') {
|
|
43
|
+
return;
|
|
44
|
+
}
|
|
45
|
+
const lazyLoading = rawConfig.lazyLoading;
|
|
46
|
+
if (!lazyLoading || typeof lazyLoading !== 'object' || !('mode' in lazyLoading)) {
|
|
47
|
+
return;
|
|
48
|
+
}
|
|
49
|
+
logger.warn(`The [lazyLoading].mode setting in ${tomlPath} is deprecated and ignored. ` +
|
|
50
|
+
'Lazy loading is controlled only by [lazyLoading] enabled = true. Remove mode because it does not change runtime behavior.');
|
|
51
|
+
}
|
|
41
52
|
function warnForUnknownGlobalConfigKeys(rawGlobal) {
|
|
42
53
|
const unknownGlobalKeys = getUnknownGlobalConfigKeys(rawGlobal);
|
|
43
54
|
if (unknownGlobalKeys.length === 0) {
|
|
@@ -64,6 +75,7 @@ export function loadAppConfigFromTomlPath(tomlPath) {
|
|
|
64
75
|
}
|
|
65
76
|
const raw = fs.readFileSync(tomlPath, 'utf8');
|
|
66
77
|
const parsed = parseToml(raw);
|
|
78
|
+
warnForLegacyLazyLoadingConfig(parsed, tomlPath);
|
|
67
79
|
return applicationConfigSchema.parse(parsed);
|
|
68
80
|
}
|
|
69
81
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configLoader.js","sourceRoot":"","sources":["../../src/config/configLoader.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"configLoader.js","sourceRoot":"","sources":["../../src/config/configLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,0BAA0B,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AACvG,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxE,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAEL,uBAAuB,EAEvB,2BAA2B,EAE3B,qBAAqB,GACtB,MAAM,8BAA8B,CAAC;AACtC,OAAO,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AA+BlC,MAAM,uBAAuB,GAAG,sCAAsC,CAAC;AACvE,MAAM,4BAA4B,GAAG,qBAAqB,CAAC,MAAM,CAAC;IAChE,GAAG,EAAE,CAAC;SACH,MAAM,EAAE;SACR,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE;QACnG,OAAO,EAAE,aAAa;KACvB,CAAC;SACD,QAAQ,EAAE;CACd,CAAC,CAAC;AAEH,SAAS,eAAe,CAAC,KAAe;IACtC,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC7F,CAAC;AAED,SAAS,yBAAyB,CAAC,OAAe,EAAE,KAAc;IAChE,IAAI,KAAK,YAAY,QAAQ,EAAE,CAAC;QAC9B,OAAO,GAAG,OAAO,KAAK,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;IACjD,CAAC;IAED,OAAO,GAAG,OAAO,KAAK,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;AACjF,CAAC;AAED,SAAS,qBAAqB,CAAC,SAAkB,EAAE,cAAsB;IACvE,IAAI,CAAC,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;QAChD,OAAO;IACT,CAAC;IAED,MAAM,SAAS,GAAG,SAAoC,CAAC;IACvD,IAAI,SAAS,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;QAChC,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,aAAa,CAAC,CAAC;IACxE,MAAM,CAAC,IAAI,CACT,6EAA6E,QAAQ,IAAI;QACvF,4CAA4C,CAC/C,CAAC;AACJ,CAAC;AAED,SAAS,8BAA8B,CAAC,SAAkB,EAAE,QAAgB;IAC1E,IAAI,CAAC,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;QAChD,OAAO;IACT,CAAC;IAED,MAAM,WAAW,GAAI,SAAqC,CAAC,WAAW,CAAC;IACvE,IAAI,CAAC,WAAW,IAAI,OAAO,WAAW,KAAK,QAAQ,IAAI,CAAC,CAAC,MAAM,IAAI,WAAW,CAAC,EAAE,CAAC;QAChF,OAAO;IACT,CAAC;IAED,MAAM,CAAC,IAAI,CACT,qCAAqC,QAAQ,8BAA8B;QACzE,2HAA2H,CAC9H,CAAC;AACJ,CAAC;AAED,SAAS,8BAA8B,CAAC,SAAkB;IACxD,MAAM,iBAAiB,GAAG,0BAA0B,CAAC,SAAS,CAAC,CAAC;IAChE,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnC,OAAO;IACT,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,gEAAgE,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC9G,CAAC;AAED,SAAS,yBAAyB,CAAC,UAAmB;IACpD,IAAI,CAAC,UAAU,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;QAClD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,iBAAiB,GAAoC,EAAE,CAAC;IAE9D,KAAK,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QACpE,IAAI,YAAY,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE,CAAC;YACrD,iBAAiB,CAAC,UAAU,CAAC,GAAG,YAA+B,CAAC;QAClE,CAAC;IACH,CAAC;IAED,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,QAAgB;IACxD,IAAI,CAAC;QACH,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7B,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC9C,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;QAC9B,8BAA8B,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACjD,OAAO,uBAAuB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,QAAQ,EAAE,CAAC;YAC9B,MAAM,CAAC,KAAK,CAAC,uDAAuD,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAChG,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,KAAK,CACV,yCAAyC,QAAQ,KAAK,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAC/G,CAAC;QACJ,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,MAAM,OAAO,YAAY;IACf,cAAc,CAAS;IACvB,YAAY,GAAG,CAAC,CAAC;IAEzB,YAAY,cAAuB,EAAE,OAA6B;QAChE,IAAI,CAAC,cAAc,GAAG,cAAc,IAAI,mBAAmB,EAAE,CAAC;QAC9D,IAAI,OAAO,EAAE,kBAAkB,KAAK,KAAK,EAAE,CAAC;YAC1C,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC5B,CAAC;IACH,CAAC;IAEO,kBAAkB;QACxB,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACpD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC9B,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC7C,MAAM,CAAC,IAAI,CAAC,6BAA6B,SAAS,EAAE,CAAC,CAAC;YACxD,CAAC;YAED,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC;gBACxC,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC/E,MAAM,CAAC,IAAI,CAAC,gCAAgC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;YACrE,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,mCAAmC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC1G,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAEM,iBAAiB;QACtB,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAEM,iBAAiB;QACtB,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAC/C,MAAM,eAAe,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YAE9C,IAAI,eAAe,KAAK,IAAI,CAAC,YAAY,EAAE,CAAC;gBAC1C,IAAI,CAAC,YAAY,GAAG,eAAe,CAAC;gBACpC,OAAO,IAAI,CAAC;YACd,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,yEAAyE;YACzE,4EAA4E;YAC5E,MAAM,SAAS,GAAI,KAAwB,CAAC,IAAI,CAAC;YACjD,IAAI,SAAS,KAAK,QAAQ,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;gBACrD,MAAM,CAAC,KAAK,CAAC,2CAA2C,IAAI,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC,CAAC;gBAC7F,OAAO,KAAK,CAAC;YACf,CAAC;YACD,MAAM,CAAC,IAAI,CAAC,2CAA2C,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YACjH,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAEO,mBAAmB;QACzB,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAC/C,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YAC3C,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;YACjC,MAAM,aAAa,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;YACnE,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAA4B,CAAC;YACpE,IAAI,cAAc,GAAG,KAAK,CAAC;YAE3B,yDAAyD;YACzD,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,CAAC,SAAS,IAAI,MAAM,CAAC,EAAE,CAAC;gBACnE,MAAM,CAAC,OAAO,GAAG,qBAAqB,CAAC;gBACvC,cAAc,GAAG,IAAI,CAAC;gBAEtB,qDAAqD;gBACrD,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;oBACb,OAAO,EAAE,yDAAyD;oBAClE,IAAI,EAAE;wBACJ,UAAU,EAAE,IAAI,CAAC,cAAc;wBAC/B,SAAS,EAAE,qBAAqB;qBACjC;iBACF,CAAC,CAAC,CAAC;YACN,CAAC;YAED,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,CAAC;QAClD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,OAAO,GAAG,sCAAsC,IAAI,CAAC,cAAc,MAAM,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YACxI,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE;gBACpB,UAAU,EAAE,IAAI,CAAC,cAAc;gBAC/B,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;aAC7F,CAAC,CAAC;YACH,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAEM,aAAa;QAClB,OAAO,IAAI,CAAC,mBAAmB,EAAE,CAAC,MAAM,CAAC;IAC3C,CAAC;IAEM,oBAAoB,CAAC,UAAkB,EAAE,MAAe;QAC7D,IAAI,CAAC;YACH,OAAO,4BAA4B,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACpD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,qCAAqC,UAAU,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;QACxG,CAAC;IACH,CAAC;IAEM,oBAAoB,CAAC,MAAe;QACzC,IAAI,CAAC;YACH,OAAO,2BAA2B,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACnD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,8BAA8B,EAAE,KAAK,CAAC,CAAC,CAAC;QACpF,CAAC;IACH,CAAC;IAEM,iBAAiB,CAAC,MAAe;QACtC,IAAI,CAAC;YACH,OAAO,uBAAuB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC/C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,2BAA2B,EAAE,KAAK,CAAC,CAAC,CAAC;QACjF,CAAC;IACH,CAAC;IAEM,aAAa;QAClB,gDAAgD;QAChD,IAAI,CAAC;YACH,qBAAqB,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QACnE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,yCAAyC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAClH,CAAC;QAED,OAAO,IAAI,CAAC,qBAAqB,EAAE,CAAC;IACtC,CAAC;IAEM,qBAAqB;QAC1B,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,aAAa,CAAC,CAAC;QAC7E,OAAO,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC7C,CAAC;IAEM,gBAAgB,CAAC,OAAiC;QACvD,IAAI,SAA8B,CAAC;QACnC,IAAI,CAAC;YACH,SAAS,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACzC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,QAAQ,GAAG,qCAAqC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/G,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;QAC9C,CAAC;QAED,MAAM,eAAe,GAAG,SAAS,CAAC,MAAM,CAAC;QAEzC,IAAI,CAAC,eAAe,IAAI,OAAO,eAAe,KAAK,QAAQ,EAAE,CAAC;YAC5D,MAAM,QAAQ,GAAG,8BAA8B,CAAC;YAChD,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC5B,CAAC;QAED,MAAM,SAAS,GAAG,eAA0C,CAAC;QAC7D,MAAM,SAAS,GAAG,SAAS,CAAC,cAAc,CAAC;QAC3C,8BAA8B,CAAC,SAAS,CAAC,CAAC;QAC1C,IAAI,YAAY,GAA0B,EAAE,CAAC;QAC7C,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC5B,IAAI,CAAC;gBACH,YAAY,GAAG,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;YACtD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,IAAI,CACT,kDAAkD,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAC3G,CAAC;YACJ,CAAC;QACH,CAAC;QAED,qBAAqB,CAAC,SAAS,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QACtD,MAAM,SAAS,GAAG,OAAO,EAAE,gBAAgB,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAE1F,MAAM,UAAU,GAAG,yBAAyB,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QACnE,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACpG,MAAM,gBAAgB,GAAoC,EAAE,CAAC;QAE7D,KAAK,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;YACpE,IAAI,CAAC;gBACH,gFAAgF;gBAChF,qEAAqE;gBACrE,MAAM,qBAAqB,GAAG,IAAI,CAAC,oBAAoB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;gBAClF,MAAM,YAAY,GAAG,0BAA0B,CAAC,YAAY,EAAE,qBAAqB,CAAC,CAAC;gBACrF,gBAAgB,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;gBACnF,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;oBACb,OAAO,EAAE,uCAAuC,UAAU,EAAE;oBAC5D,IAAI,EAAE,EAAE,UAAU,EAAE;iBACrB,CAAC,CAAC,CAAC;YACN,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,KAAK,CAAC,oCAAoC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC7G,CAAC;QACH,CAAC;QAED,MAAM,kBAAkB,GAAa,EAAE,CAAC;QACxC,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACvD,IAAI,mBAAmB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;gBACxC,kBAAkB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBACpC,OAAO,gBAAgB,CAAC,UAAU,CAAC,CAAC;YACtC,CAAC;QACH,CAAC;QAED,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClC,MAAM,CAAC,IAAI,CACT,YAAY,kBAAkB,CAAC,MAAM,0DAA0D,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAC/H,CAAC;QACJ,CAAC;QAED,OAAO;YACL,SAAS,EAAE,SAAS,CAAC,MAAiC;YACtD,eAAe,EAAE,SAAS;YAC1B,YAAY;YACZ,SAAS;YACT,UAAU;YACV,gBAAgB;YAChB,YAAY,EAAE,SAAS,CAAC,YAAY;YACpC,cAAc,EAAE,SAAS,CAAC,cAAc;SACzC,CAAC;IACJ,CAAC;IAEM,mCAAmC;QACxC,OAAO,IAAI,CAAC,gBAAgB,EAAE,CAAC;IACjC,CAAC;IAEM,6BAA6B;QAClC,OAAO,IAAI,CAAC,mCAAmC,EAAE,CAAC,gBAAgB,CAAC;IACrE,CAAC;IAEM,kBAAkB,CAAC,eAAgD;QACxE,MAAM,QAAQ,GAAoC,EAAE,CAAC;QACrD,KAAK,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC;YACzE,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;gBAC3B,QAAQ,CAAC,UAAU,CAAC,GAAG,YAAY,CAAC;YACtC,CAAC;QACH,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,gBAAgB,CAAC,eAAgD;QACtE,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;QAE/B,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;YAC1D,IAAI,YAAY,CAAC,QAAQ;gBAAE,SAAS;YACpC,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACzC,KAAK,MAAM,GAAG,IAAI,YAAY,CAAC,IAAI;oBAAE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACrD,CAAC;QACH,CAAC;QAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;IACjC,CAAC;IAEM,eAAe;QACpB,MAAM,WAAW,GAAG,kBAAkB,CAAC,WAAW,EAAE,CAAC;QACrD,OAAO,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,YAAY,CAAC;IAClD,CAAC;CACF"}
|
|
@@ -30,6 +30,15 @@ export declare const AUTH_CONFIG: {
|
|
|
30
30
|
TTL_MS: number;
|
|
31
31
|
ID_PREFIX: string;
|
|
32
32
|
};
|
|
33
|
+
REFRESH_FAMILY: {
|
|
34
|
+
TTL_MS: number;
|
|
35
|
+
ID_PREFIX: string;
|
|
36
|
+
FILE_PREFIX: string;
|
|
37
|
+
LOOKUP_ID_PREFIX: string;
|
|
38
|
+
LOOKUP_FILE_PREFIX: string;
|
|
39
|
+
TOKEN_PREFIX: string;
|
|
40
|
+
SUBDIR: string;
|
|
41
|
+
};
|
|
33
42
|
STREAMABLE_SESSION: {
|
|
34
43
|
TTL_MS: number;
|
|
35
44
|
ID_PREFIX: string;
|
|
@@ -76,7 +85,7 @@ export declare const STORAGE_SUBDIRS: {
|
|
|
76
85
|
readonly TRANSPORT: "transport";
|
|
77
86
|
};
|
|
78
87
|
export declare const FILE_PREFIX_MAPPING: {
|
|
79
|
-
readonly SERVER: readonly ["session_", "auth_code_", "auth_request_"];
|
|
88
|
+
readonly SERVER: readonly ["session_", "auth_code_", "auth_request_", "refresh_family_", "refresh_lookup_"];
|
|
80
89
|
readonly CLIENT: readonly ["oauth_", "cli_", "tok_", "ver_", "sta_"];
|
|
81
90
|
readonly TRANSPORT: readonly ["streamable_session_"];
|
|
82
91
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/constants/auth.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,eAAO,MAAM,WAAW
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/constants/auth.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkGvB,CAAC;AAGF,eAAO,MAAM,eAAe;;;;CAIlB,CAAC;AAGX,eAAO,MAAM,mBAAmB;;;;CAItB,CAAC;AAGX,eAAO,MAAM,iBAAiB;;;;;;;;CAM7B,CAAC"}
|
package/build/constants/auth.js
CHANGED
|
@@ -37,6 +37,16 @@ export const AUTH_CONFIG = {
|
|
|
37
37
|
TTL_MS: 24 * 60 * 60 * 1000, // 24 hours
|
|
38
38
|
ID_PREFIX: 'tk-',
|
|
39
39
|
},
|
|
40
|
+
// OAuth refresh token families
|
|
41
|
+
REFRESH_FAMILY: {
|
|
42
|
+
TTL_MS: 30 * 24 * 60 * 60 * 1000, // 30 days, fixed at family creation
|
|
43
|
+
ID_PREFIX: 'rf-',
|
|
44
|
+
FILE_PREFIX: 'refresh_family_',
|
|
45
|
+
LOOKUP_ID_PREFIX: 'rtl-',
|
|
46
|
+
LOOKUP_FILE_PREFIX: 'refresh_lookup_',
|
|
47
|
+
TOKEN_PREFIX: 'rt-',
|
|
48
|
+
SUBDIR: 'server',
|
|
49
|
+
},
|
|
40
50
|
// Streamable HTTP sessions
|
|
41
51
|
STREAMABLE_SESSION: {
|
|
42
52
|
TTL_MS: 24 * 60 * 60 * 1000, // 24 hours
|
|
@@ -89,7 +99,7 @@ export const STORAGE_SUBDIRS = {
|
|
|
89
99
|
};
|
|
90
100
|
// File prefix mapping for migration logic
|
|
91
101
|
export const FILE_PREFIX_MAPPING = {
|
|
92
|
-
SERVER: ['session_', 'auth_code_', 'auth_request_'],
|
|
102
|
+
SERVER: ['session_', 'auth_code_', 'auth_request_', 'refresh_family_', 'refresh_lookup_'],
|
|
93
103
|
CLIENT: ['oauth_', 'cli_', 'tok_', 'ver_', 'sta_'],
|
|
94
104
|
TRANSPORT: ['streamable_session_'],
|
|
95
105
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/constants/auth.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,sCAAsC;AACtC,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,6BAA6B;IAC7B,MAAM,EAAE;QACN,eAAe,EAAE,KAAK;QAEtB,6BAA6B;QAC7B,OAAO,EAAE;YACP,GAAG,EAAE,UAAU;YACf,cAAc,EAAE,OAAO;SACxB;QAED,qBAAqB;QACrB,OAAO,EAAE;YACP,WAAW,EAAE,EAAE,GAAG,EAAE,EAAE,WAAW;YACjC,SAAS,EAAE,OAAO;YAClB,WAAW,EAAE,UAAU;YACvB,MAAM,EAAE,QAAQ;SACjB;QAED,4DAA4D;QAC5D,SAAS,EAAE;YACT,MAAM,EAAE,EAAE,GAAG,IAAI,EAAE,WAAW;YAC9B,SAAS,EAAE,OAAO;YAClB,WAAW,EAAE,YAAY;YACzB,MAAM,EAAE,QAAQ;SACjB;QAED,6DAA6D;QAC7D,YAAY,EAAE;YACZ,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,aAAa;YACrC,SAAS,EAAE,OAAO,EAAE,uCAAuC;YAC3D,WAAW,EAAE,eAAe;YAC5B,MAAM,EAAE,QAAQ;SACjB;QAED,eAAe;QACf,KAAK,EAAE;YACL,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,WAAW;YACxC,SAAS,EAAE,KAAK;SACjB;QAED,2BAA2B;QAC3B,kBAAkB,EAAE;YAClB,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,WAAW;YACxC,SAAS,EAAE,SAAS;YACpB,WAAW,EAAE,qBAAqB;YAClC,MAAM,EAAE,WAAW;YAEnB,uDAAuD;YACvD,WAAW,EAAE;gBACX,QAAQ,EAAE,GAAG,EAAE,2BAA2B;gBAC1C,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI,EAAE,qBAAqB;gBACjD,iBAAiB,EAAE,EAAE,GAAG,IAAI,EAAE,6BAA6B;aAC5D;SACF;QAED,oBAAoB;QACpB,MAAM,EAAE;YACN,SAAS,EAAE,SAAS;YACpB,WAAW,EAAE,cAAc;YAC3B,MAAM,EAAE,QAAQ;SACjB;KACF;IAED,6BAA6B;IAC7B,MAAM,EAAE;QACN,KAAK,EAAE;YACL,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,UAAU;YAC5C,oBAAoB,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,aAAa;YACnD,YAAY,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,aAAa;YAC3C,4BAA4B,EAAE,IAAI,EAAE,SAAS;YAC7C,qBAAqB,EAAE,iBAAiB;YACxC,cAAc,EAAE,EAAE;SACnB;QACD,OAAO,EAAE;YACP,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,UAAU;YAC5C,SAAS,EAAE,QAAQ;YACnB,WAAW,EAAE,EAAE;YACf,MAAM,EAAE,QAAQ;SACjB;QACD,QAAQ,EAAE;YACR,MAAM,EAAE,MAAM;YACd,MAAM,EAAE,MAAM;YACd,QAAQ,EAAE,MAAM;YAChB,KAAK,EAAE,MAAM;SACd;KACF;CACF,CAAC;AAEF,qCAAqC;AACrC,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,SAAS,EAAE,WAAW;CACd,CAAC;AAEX,0CAA0C;AAC1C,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,MAAM,EAAE,CAAC,UAAU,EAAE,YAAY,EAAE,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/constants/auth.ts"],"names":[],"mappings":"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"}
|
package/build/constants/mcp.d.ts
CHANGED
|
@@ -6,7 +6,13 @@ export declare const MCP_CONFIG_FILE = "mcp.json";
|
|
|
6
6
|
export declare const APP_CONFIG_FILE = "config.toml";
|
|
7
7
|
export declare const MCP_INSTRUCTIONS_TEMPLATE_FILE = "instructions-template.md";
|
|
8
8
|
export declare const MCP_SERVER_NAME = "1mcp";
|
|
9
|
-
export declare const MCP_SERVER_VERSION = "0.35.0-beta.
|
|
9
|
+
export declare const MCP_SERVER_VERSION = "0.35.0-beta.3";
|
|
10
|
+
export declare const MCP_PROJECT_METADATA: {
|
|
11
|
+
readonly repository: "https://github.com/1mcp-app/agent";
|
|
12
|
+
readonly documentation: "https://docs.1mcp.app";
|
|
13
|
+
readonly issues: "https://github.com/1mcp-app/agent/issues";
|
|
14
|
+
readonly license: "Apache-2.0";
|
|
15
|
+
};
|
|
10
16
|
export declare const MCP_URI_SEPARATOR = "_1mcp_";
|
|
11
17
|
/**
|
|
12
18
|
* Default maximum number of MCP servers to load concurrently
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp.d.ts","sourceRoot":"","sources":["../../src/constants/mcp.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAG5F,eAAO,MAAM,eAAe,aAAa,CAAC;AAC1C,eAAO,MAAM,eAAe,gBAAgB,CAAC;AAC7C,eAAO,MAAM,8BAA8B,6BAA6B,CAAC;AACzE,eAAO,MAAM,eAAe,SAAS,CAAC;AACtC,eAAO,MAAM,kBAAkB,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"mcp.d.ts","sourceRoot":"","sources":["../../src/constants/mcp.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAG5F,eAAO,MAAM,eAAe,aAAa,CAAC;AAC1C,eAAO,MAAM,eAAe,gBAAgB,CAAC;AAC7C,eAAO,MAAM,8BAA8B,6BAA6B,CAAC;AACzE,eAAO,MAAM,eAAe,SAAS,CAAC;AACtC,eAAO,MAAM,kBAAkB,kBAAkB,CAAC;AAIlD,eAAO,MAAM,oBAAoB;;;;;CAKvB,CAAC;AAEX,eAAO,MAAM,iBAAiB,WAAW,CAAC;AAE1C;;GAEG;AACH,eAAO,MAAM,4BAA4B,IAAI,CAAC;AAE9C,eAAO,MAAM,uBAAuB,EAAE,kBAYrC,CAAC;AAEF,eAAO,MAAM,uBAAuB,EAAE,kBAMrC,CAAC"}
|
package/build/constants/mcp.js
CHANGED
|
@@ -3,7 +3,15 @@ export const MCP_CONFIG_FILE = 'mcp.json';
|
|
|
3
3
|
export const APP_CONFIG_FILE = 'config.toml';
|
|
4
4
|
export const MCP_INSTRUCTIONS_TEMPLATE_FILE = 'instructions-template.md';
|
|
5
5
|
export const MCP_SERVER_NAME = '1mcp';
|
|
6
|
-
export const MCP_SERVER_VERSION = '0.35.0-beta.
|
|
6
|
+
export const MCP_SERVER_VERSION = '0.35.0-beta.3';
|
|
7
|
+
// Compiled with every artifact so Admin Console metadata does not depend on
|
|
8
|
+
// package.json being adjacent to the runtime entrypoint.
|
|
9
|
+
export const MCP_PROJECT_METADATA = {
|
|
10
|
+
repository: 'https://github.com/1mcp-app/agent',
|
|
11
|
+
documentation: 'https://docs.1mcp.app',
|
|
12
|
+
issues: 'https://github.com/1mcp-app/agent/issues',
|
|
13
|
+
license: 'Apache-2.0',
|
|
14
|
+
};
|
|
7
15
|
export const MCP_URI_SEPARATOR = '_1mcp_';
|
|
8
16
|
/**
|
|
9
17
|
* Default maximum number of MCP servers to load concurrently
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../src/constants/mcp.ts"],"names":[],"mappings":"AAKA,gBAAgB;AAChB,MAAM,CAAC,MAAM,eAAe,GAAG,UAAU,CAAC;AAC1C,MAAM,CAAC,MAAM,eAAe,GAAG,aAAa,CAAC;AAC7C,MAAM,CAAC,MAAM,8BAA8B,GAAG,0BAA0B,CAAC;AACzE,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC;AACtC,MAAM,CAAC,MAAM,kBAAkB,GAAG,eAAe,CAAC;AAElD,MAAM,CAAC,MAAM,iBAAiB,GAAG,QAAQ,CAAC;AAE1C;;GAEG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,CAAC;AAE9C,MAAM,CAAC,MAAM,uBAAuB,GAAuB;IACzD,WAAW,EAAE,EAAE;IACf,SAAS,EAAE;QACT,WAAW,EAAE,IAAI;KAClB;IACD,KAAK,EAAE;QACL,WAAW,EAAE,IAAI;KAClB;IACD,OAAO,EAAE;QACP,WAAW,EAAE,IAAI;KAClB;IACD,OAAO,EAAE,EAAE;CACZ,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAuB;IACzD,KAAK,EAAE;QACL,WAAW,EAAE,KAAK;KACnB;IACD,QAAQ,EAAE,EAAE;IACZ,WAAW,EAAE,EAAE;CAChB,CAAC"}
|
|
1
|
+
{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../src/constants/mcp.ts"],"names":[],"mappings":"AAKA,gBAAgB;AAChB,MAAM,CAAC,MAAM,eAAe,GAAG,UAAU,CAAC;AAC1C,MAAM,CAAC,MAAM,eAAe,GAAG,aAAa,CAAC;AAC7C,MAAM,CAAC,MAAM,8BAA8B,GAAG,0BAA0B,CAAC;AACzE,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC;AACtC,MAAM,CAAC,MAAM,kBAAkB,GAAG,eAAe,CAAC;AAElD,4EAA4E;AAC5E,yDAAyD;AACzD,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,UAAU,EAAE,mCAAmC;IAC/C,aAAa,EAAE,uBAAuB;IACtC,MAAM,EAAE,0CAA0C;IAClD,OAAO,EAAE,YAAY;CACb,CAAC;AAEX,MAAM,CAAC,MAAM,iBAAiB,GAAG,QAAQ,CAAC;AAE1C;;GAEG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,CAAC;AAE9C,MAAM,CAAC,MAAM,uBAAuB,GAAuB;IACzD,WAAW,EAAE,EAAE;IACf,SAAS,EAAE;QACT,WAAW,EAAE,IAAI;KAClB;IACD,KAAK,EAAE;QACL,WAAW,EAAE,IAAI;KAClB;IACD,OAAO,EAAE;QACP,WAAW,EAAE,IAAI;KAClB;IACD,OAAO,EAAE,EAAE;CACZ,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAuB;IACzD,KAAK,EAAE;QACL,WAAW,EAAE,KAAK;KACnB;IACD,QAAQ,EAAE,EAAE;IACZ,WAAW,EAAE,EAAE;CAChB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capabilityAggregator.d.ts","sourceRoot":"","sources":["../../../src/core/capabilities/capabilityAggregator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"capabilityAggregator.d.ts","sourceRoot":"","sources":["../../../src/core/capabilities/capabilityAggregator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,EAIL,MAAM,EACN,QAAQ,EACR,IAAI,EACL,MAAM,oCAAoC,CAAC;AAK5C,OAAO,EAAgB,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAK7E;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC;IACvB,QAAQ,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAC;IAC/B,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAC3B,QAAQ,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC;IAChC,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC;CAC1B;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;IACnC,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC;IAChC,QAAQ,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,QAAQ,EAAE,sBAAsB,CAAC;IAC1C,QAAQ,CAAC,OAAO,EAAE,sBAAsB,CAAC;CAC1C;AAED;;GAEG;AACH,MAAM,WAAW,0BAA0B;IACzC,sBAAsB,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC7D,2BAA2B,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,sBAAsB,KAAK,IAAI,CAAC;CACjG;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,oBAAqB,SAAQ,YAAY;IACpD,OAAO,CAAC,aAAa,CAAsB;IAC3C,OAAO,CAAC,mBAAmB,CAAyB;IACpD,OAAO,CAAC,aAAa,CAAkB;IACvC,OAAO,CAAC,gBAAgB,CAA+B;gBAE3C,mBAAmB,EAAE,mBAAmB;IAQpD;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAU/B;;OAEG;IACI,sBAAsB,IAAI,sBAAsB;IAIvD;;;OAGG;IACU,kBAAkB,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAsB7D;;OAEG;IACU,mBAAmB,IAAI,OAAO,CAAC,sBAAsB,CAAC;IAKnE;;OAEG;YACW,yBAAyB;IAmGvC;;OAEG;YACW,aAAa;IAa3B;;OAEG;YACW,iBAAiB;IAa/B;;OAEG;YACW,eAAe;IAa7B;;OAEG;IACH,OAAO,CAAC,aAAa;IAkCrB;;OAEG;IACH,OAAO,CAAC,WAAW;IAInB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAYxB;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAY5B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAY1B;;OAEG;IACI,sBAAsB,IAAI,MAAM;CAIxC"}
|
|
@@ -4,6 +4,7 @@ import { InternalCapabilitiesProvider } from '../../core/capabilities/internalCa
|
|
|
4
4
|
import { filterDisabledTools } from '../../core/server/disabledTools.js';
|
|
5
5
|
import { ClientStatus } from '../../core/types/index.js';
|
|
6
6
|
import logger, { debugIf } from '../../logger/logger.js';
|
|
7
|
+
import { getRequestTimeout } from '../../utils/core/timeoutUtils.js';
|
|
7
8
|
/**
|
|
8
9
|
* Aggregates and tracks capabilities (tools, resources, prompts) from all ready MCP servers.
|
|
9
10
|
* Detects changes when servers come online or go offline and emits events for notification.
|
|
@@ -113,12 +114,12 @@ export class CapabilityAggregator extends EventEmitter {
|
|
|
113
114
|
// Get server capabilities to check what's supported
|
|
114
115
|
const serverCapabilities = connection.client.getServerCapabilities() || {};
|
|
115
116
|
// Build promises array based on actual capabilities
|
|
116
|
-
const promises = [this.safeListTools(serverName, connection.client)];
|
|
117
|
+
const promises = [this.safeListTools(serverName, connection.client, connection.transport)];
|
|
117
118
|
if (serverCapabilities.resources) {
|
|
118
|
-
promises.push(this.safeListResources(serverName, connection.client));
|
|
119
|
+
promises.push(this.safeListResources(serverName, connection.client, connection.transport));
|
|
119
120
|
}
|
|
120
121
|
if (serverCapabilities.prompts) {
|
|
121
|
-
promises.push(this.safeListPrompts(serverName, connection.client));
|
|
122
|
+
promises.push(this.safeListPrompts(serverName, connection.client, connection.transport));
|
|
122
123
|
}
|
|
123
124
|
// Fetch capabilities in parallel (only those supported)
|
|
124
125
|
const results = await Promise.allSettled(promises);
|
|
@@ -170,9 +171,9 @@ export class CapabilityAggregator extends EventEmitter {
|
|
|
170
171
|
/**
|
|
171
172
|
* Safely list tools from a server
|
|
172
173
|
*/
|
|
173
|
-
async safeListTools(serverName, client) {
|
|
174
|
+
async safeListTools(serverName, client, transport) {
|
|
174
175
|
try {
|
|
175
|
-
return await client.listTools();
|
|
176
|
+
return await client.listTools(undefined, { timeout: getRequestTimeout(transport) });
|
|
176
177
|
}
|
|
177
178
|
catch (error) {
|
|
178
179
|
logger.warn(`Failed to list tools from ${serverName}`, { error: String(error) });
|
|
@@ -182,9 +183,9 @@ export class CapabilityAggregator extends EventEmitter {
|
|
|
182
183
|
/**
|
|
183
184
|
* Safely list resources from a server
|
|
184
185
|
*/
|
|
185
|
-
async safeListResources(serverName, client) {
|
|
186
|
+
async safeListResources(serverName, client, transport) {
|
|
186
187
|
try {
|
|
187
|
-
return await client.listResources();
|
|
188
|
+
return await client.listResources(undefined, { timeout: getRequestTimeout(transport) });
|
|
188
189
|
}
|
|
189
190
|
catch (error) {
|
|
190
191
|
logger.warn(`Failed to list resources from ${serverName}`, { error: String(error) });
|
|
@@ -194,9 +195,9 @@ export class CapabilityAggregator extends EventEmitter {
|
|
|
194
195
|
/**
|
|
195
196
|
* Safely list prompts from a server
|
|
196
197
|
*/
|
|
197
|
-
async safeListPrompts(serverName, client) {
|
|
198
|
+
async safeListPrompts(serverName, client, transport) {
|
|
198
199
|
try {
|
|
199
|
-
return await client.listPrompts();
|
|
200
|
+
return await client.listPrompts(undefined, { timeout: getRequestTimeout(transport) });
|
|
200
201
|
}
|
|
201
202
|
catch (error) {
|
|
202
203
|
logger.warn(`Failed to list prompts from ${serverName}`, { error: String(error) });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capabilityAggregator.js","sourceRoot":"","sources":["../../../src/core/capabilities/capabilityAggregator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"capabilityAggregator.js","sourceRoot":"","sources":["../../../src/core/capabilities/capabilityAggregator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { Tool } from '@modelcontextprotocol/sdk/types.js';
|
|
2
2
|
import { type TemplateHashProvider } from '../../core/server/connectionResolver.js';
|
|
3
|
-
import type
|
|
3
|
+
import { type MCPServerParams, type OutboundConnections } from '../../core/types/index.js';
|
|
4
|
+
import { type CapabilityVisibility } from './capabilityVisibility.js';
|
|
4
5
|
import { SchemaCache } from './schemaCache.js';
|
|
5
6
|
import type { ListToolsOptions, ListToolsResult as RegistryListToolsResult, ToolMetadata } from './toolRegistry.js';
|
|
6
7
|
import { ToolRegistry } from './toolRegistry.js';
|
|
@@ -47,7 +48,7 @@ export interface CapabilityCatalogDependencies {
|
|
|
47
48
|
getServerConfigs: () => Record<string, MCPServerParams>;
|
|
48
49
|
loadSchema?: (server: string, toolName: string) => Promise<Tool>;
|
|
49
50
|
refreshCapabilities?: (input: CapabilityRefreshInput) => Promise<CapabilityRefreshResult | void>;
|
|
50
|
-
|
|
51
|
+
defaultVisibility?: CapabilityVisibility;
|
|
51
52
|
templateHashProvider?: TemplateHashProvider;
|
|
52
53
|
}
|
|
53
54
|
export interface DescribeVisibleToolResult {
|
|
@@ -69,16 +70,16 @@ export declare class CapabilityCatalog {
|
|
|
69
70
|
private readonly deps;
|
|
70
71
|
private readonly connectionResolver;
|
|
71
72
|
constructor(deps: CapabilityCatalogDependencies);
|
|
72
|
-
listVisibleTools(options?: ListToolsOptions,
|
|
73
|
+
listVisibleTools(options?: ListToolsOptions, visibility?: CapabilityVisibility, queryOptions?: CapabilityCatalogQueryOptions): Promise<VisibleToolListResult>;
|
|
73
74
|
describeVisibleTool(args: {
|
|
74
75
|
server?: string;
|
|
75
76
|
toolName?: string;
|
|
76
|
-
},
|
|
77
|
+
}, visibility?: CapabilityVisibility, queryOptions?: CapabilityCatalogQueryOptions): Promise<DescribeVisibleToolResult>;
|
|
77
78
|
invokeVisibleTool(args: {
|
|
78
79
|
server?: string;
|
|
79
80
|
toolName?: string;
|
|
80
81
|
args: unknown;
|
|
81
|
-
},
|
|
82
|
+
}, visibility?: CapabilityVisibility, queryOptions?: CapabilityCatalogQueryOptions): Promise<InvokeVisibleToolResult>;
|
|
82
83
|
private resolveRefreshFacts;
|
|
83
84
|
private visibleToolRegistry;
|
|
84
85
|
private resolveVisibleToolAccess;
|