@1mcp/agent 0.22.0 → 0.22.1
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 +123 -149
- package/build/commands/app/backups.d.ts +11 -0
- package/build/commands/app/backups.d.ts.map +1 -1
- package/build/commands/app/backups.js +25 -0
- package/build/commands/app/backups.js.map +1 -1
- package/build/commands/app/consolidate.d.ts +19 -0
- package/build/commands/app/consolidate.d.ts.map +1 -1
- package/build/commands/app/consolidate.js +63 -0
- package/build/commands/app/consolidate.js.map +1 -1
- package/build/commands/app/discover.d.ts +9 -0
- package/build/commands/app/discover.d.ts.map +1 -1
- package/build/commands/app/discover.js +21 -0
- package/build/commands/app/discover.js.map +1 -1
- package/build/commands/app/index.d.ts.map +1 -1
- package/build/commands/app/index.js +12 -192
- package/build/commands/app/index.js.map +1 -1
- package/build/commands/app/list.d.ts +9 -0
- package/build/commands/app/list.d.ts.map +1 -1
- package/build/commands/app/list.js +21 -0
- package/build/commands/app/list.js.map +1 -1
- package/build/commands/app/restore.d.ts +19 -0
- package/build/commands/app/restore.d.ts.map +1 -1
- package/build/commands/app/restore.js +59 -0
- package/build/commands/app/restore.js.map +1 -1
- package/build/commands/app/status.d.ts +9 -0
- package/build/commands/app/status.d.ts.map +1 -1
- package/build/commands/app/status.js +21 -0
- package/build/commands/app/status.js.map +1 -1
- package/build/commands/mcp/add.d.ts +33 -0
- package/build/commands/mcp/add.d.ts.map +1 -1
- package/build/commands/mcp/add.js +86 -0
- package/build/commands/mcp/add.js.map +1 -1
- package/build/commands/mcp/enable.d.ts +13 -0
- package/build/commands/mcp/enable.d.ts.map +1 -1
- package/build/commands/mcp/enable.js +24 -0
- package/build/commands/mcp/enable.js.map +1 -1
- package/build/commands/mcp/index.d.ts.map +1 -1
- package/build/commands/mcp/index.js +16 -262
- package/build/commands/mcp/index.js.map +1 -1
- package/build/commands/mcp/list.d.ts +13 -0
- package/build/commands/mcp/list.d.ts.map +1 -1
- package/build/commands/mcp/list.js +35 -1
- package/build/commands/mcp/list.js.map +1 -1
- package/build/commands/mcp/remove.d.ts +9 -0
- package/build/commands/mcp/remove.d.ts.map +1 -1
- package/build/commands/mcp/remove.js +21 -0
- package/build/commands/mcp/remove.js.map +1 -1
- package/build/commands/mcp/status.d.ts +9 -0
- package/build/commands/mcp/status.d.ts.map +1 -1
- package/build/commands/mcp/status.js +23 -1
- package/build/commands/mcp/status.js.map +1 -1
- package/build/commands/mcp/tokens.d.ts +11 -1
- package/build/commands/mcp/tokens.d.ts.map +1 -1
- package/build/commands/mcp/tokens.js +31 -0
- package/build/commands/mcp/tokens.js.map +1 -1
- package/build/commands/mcp/update.d.ts +31 -0
- package/build/commands/mcp/update.d.ts.map +1 -1
- package/build/commands/mcp/update.js +72 -0
- package/build/commands/mcp/update.js.map +1 -1
- package/build/commands/preset/create.d.ts +12 -2
- package/build/commands/preset/create.d.ts.map +1 -1
- package/build/commands/preset/create.js +21 -0
- package/build/commands/preset/create.js.map +1 -1
- package/build/commands/preset/delete.d.ts +8 -2
- package/build/commands/preset/delete.d.ts.map +1 -1
- package/build/commands/preset/delete.js +10 -0
- package/build/commands/preset/delete.js.map +1 -1
- package/build/commands/preset/edit.d.ts +10 -2
- package/build/commands/preset/edit.d.ts.map +1 -1
- package/build/commands/preset/edit.js +15 -1
- package/build/commands/preset/edit.js.map +1 -1
- package/build/commands/preset/index.d.ts.map +1 -1
- package/build/commands/preset/index.js +16 -67
- package/build/commands/preset/index.js.map +1 -1
- package/build/commands/preset/interactive.d.ts +1 -2
- package/build/commands/preset/interactive.d.ts.map +1 -1
- package/build/commands/preset/list.d.ts +6 -2
- package/build/commands/preset/list.d.ts.map +1 -1
- package/build/commands/preset/list.js +6 -0
- package/build/commands/preset/list.js.map +1 -1
- package/build/commands/preset/show.d.ts +8 -2
- package/build/commands/preset/show.d.ts.map +1 -1
- package/build/commands/preset/show.js +10 -0
- package/build/commands/preset/show.js.map +1 -1
- package/build/commands/preset/test.d.ts +8 -2
- package/build/commands/preset/test.d.ts.map +1 -1
- package/build/commands/preset/test.js +10 -0
- package/build/commands/preset/test.js.map +1 -1
- package/build/commands/preset/url.d.ts +8 -2
- package/build/commands/preset/url.d.ts.map +1 -1
- package/build/commands/preset/url.js +10 -0
- package/build/commands/preset/url.js.map +1 -1
- package/build/commands/serve/index.d.ts +106 -0
- package/build/commands/serve/index.d.ts.map +1 -0
- package/build/commands/serve/index.js +143 -0
- package/build/commands/serve/index.js.map +1 -0
- package/build/commands/serve/serve.d.ts +28 -0
- package/build/commands/serve/serve.d.ts.map +1 -0
- package/build/commands/serve/serve.js +213 -0
- package/build/commands/serve/serve.js.map +1 -0
- package/build/constants.d.ts +1 -1
- package/build/constants.js +1 -1
- package/build/core/server/serverManager.d.ts.map +1 -1
- package/build/core/server/serverManager.js +3 -0
- package/build/core/server/serverManager.js.map +1 -1
- package/build/core/types/transport.d.ts +16 -77
- package/build/core/types/transport.d.ts.map +1 -1
- package/build/core/types/transport.js +2 -2
- package/build/core/types/transport.js.map +1 -1
- package/build/index.js +13 -347
- package/build/index.js.map +1 -1
- package/build/logger/logger.d.ts.map +1 -1
- package/build/logger/logger.js +4 -2
- package/build/logger/logger.js.map +1 -1
- package/build/logger/mcpLoggingEnhancer.d.ts.map +1 -1
- package/build/logger/mcpLoggingEnhancer.js +10 -6
- package/build/logger/mcpLoggingEnhancer.js.map +1 -1
- package/build/transport/transportFactory.js +1 -1
- package/build/transport/transportFactory.js.map +1 -1
- package/build/utils/configureGlobalLogger.d.ts +12 -0
- package/build/utils/configureGlobalLogger.d.ts.map +1 -0
- package/build/utils/configureGlobalLogger.js +18 -0
- package/build/utils/configureGlobalLogger.js.map +1 -0
- package/package.json +17 -18
|
@@ -0,0 +1,143 @@
|
|
|
1
|
+
import { globalOptions } from '../../globalOptions.js';
|
|
2
|
+
import { PORT, HOST } from '../../constants.js';
|
|
3
|
+
/**
|
|
4
|
+
* Serve command group entry point.
|
|
5
|
+
*
|
|
6
|
+
* Starts the 1mcp server with various transport options and configurations.
|
|
7
|
+
*/
|
|
8
|
+
// Define server options that should be available for serve commands and default command
|
|
9
|
+
export const serverOptions = {
|
|
10
|
+
transport: {
|
|
11
|
+
alias: 't',
|
|
12
|
+
describe: 'Transport type to use (stdio or http, sse is deprecated)',
|
|
13
|
+
type: 'string',
|
|
14
|
+
choices: ['stdio', 'http', 'sse'],
|
|
15
|
+
default: 'http',
|
|
16
|
+
},
|
|
17
|
+
port: {
|
|
18
|
+
alias: 'P',
|
|
19
|
+
describe: 'HTTP port to listen on, applicable when transport is http',
|
|
20
|
+
type: 'number',
|
|
21
|
+
default: PORT,
|
|
22
|
+
},
|
|
23
|
+
host: {
|
|
24
|
+
alias: 'H',
|
|
25
|
+
describe: 'HTTP host to listen on, applicable when transport is http',
|
|
26
|
+
type: 'string',
|
|
27
|
+
default: HOST,
|
|
28
|
+
},
|
|
29
|
+
'external-url': {
|
|
30
|
+
alias: 'u',
|
|
31
|
+
describe: 'External URL for the server (used for OAuth callbacks and public URLs)',
|
|
32
|
+
type: 'string',
|
|
33
|
+
default: undefined,
|
|
34
|
+
},
|
|
35
|
+
filter: {
|
|
36
|
+
alias: 'f',
|
|
37
|
+
describe: 'Filter expression for server selection (supports simple comma-separated or advanced boolean logic)',
|
|
38
|
+
type: 'string',
|
|
39
|
+
default: undefined,
|
|
40
|
+
},
|
|
41
|
+
pagination: {
|
|
42
|
+
alias: 'p',
|
|
43
|
+
describe: 'Enable pagination',
|
|
44
|
+
type: 'boolean',
|
|
45
|
+
default: false,
|
|
46
|
+
},
|
|
47
|
+
auth: {
|
|
48
|
+
describe: 'Enable authentication (OAuth 2.1) - deprecated, use --enable-auth',
|
|
49
|
+
type: 'boolean',
|
|
50
|
+
default: false,
|
|
51
|
+
},
|
|
52
|
+
'enable-auth': {
|
|
53
|
+
describe: 'Enable authentication (OAuth 2.1)',
|
|
54
|
+
type: 'boolean',
|
|
55
|
+
default: false,
|
|
56
|
+
},
|
|
57
|
+
'enable-scope-validation': {
|
|
58
|
+
describe: 'Enable tag-based scope validation',
|
|
59
|
+
type: 'boolean',
|
|
60
|
+
default: true,
|
|
61
|
+
},
|
|
62
|
+
'enable-enhanced-security': {
|
|
63
|
+
describe: 'Enable enhanced security middleware',
|
|
64
|
+
type: 'boolean',
|
|
65
|
+
default: false,
|
|
66
|
+
},
|
|
67
|
+
'session-ttl': {
|
|
68
|
+
describe: 'Session expiry time in minutes',
|
|
69
|
+
type: 'number',
|
|
70
|
+
default: 24 * 60, // 24 hours
|
|
71
|
+
},
|
|
72
|
+
'session-storage-path': {
|
|
73
|
+
describe: 'Custom session storage directory path',
|
|
74
|
+
type: 'string',
|
|
75
|
+
default: undefined,
|
|
76
|
+
},
|
|
77
|
+
'rate-limit-window': {
|
|
78
|
+
describe: 'OAuth rate limit window in minutes',
|
|
79
|
+
type: 'number',
|
|
80
|
+
default: 15,
|
|
81
|
+
},
|
|
82
|
+
'rate-limit-max': {
|
|
83
|
+
describe: 'Maximum requests per OAuth rate limit window',
|
|
84
|
+
type: 'number',
|
|
85
|
+
default: 100,
|
|
86
|
+
},
|
|
87
|
+
'trust-proxy': {
|
|
88
|
+
describe: 'Trust proxy configuration for Express.js (boolean, IP address, subnet, or preset: loopback, linklocal, uniquelocal)',
|
|
89
|
+
type: 'string',
|
|
90
|
+
default: 'loopback',
|
|
91
|
+
},
|
|
92
|
+
'health-info-level': {
|
|
93
|
+
describe: 'Health endpoint information detail level (full, basic, minimal)',
|
|
94
|
+
type: 'string',
|
|
95
|
+
choices: ['full', 'basic', 'minimal'],
|
|
96
|
+
default: 'minimal',
|
|
97
|
+
},
|
|
98
|
+
'enable-async-loading': {
|
|
99
|
+
describe: 'Enable asynchronous MCP server loading with listChanged notifications',
|
|
100
|
+
type: 'boolean',
|
|
101
|
+
default: false,
|
|
102
|
+
},
|
|
103
|
+
};
|
|
104
|
+
/**
|
|
105
|
+
* Register serve command
|
|
106
|
+
*/
|
|
107
|
+
export function setupServeCommand(yargs) {
|
|
108
|
+
return yargs.command('serve', 'Start the 1mcp server', (yargs) => {
|
|
109
|
+
return yargs
|
|
110
|
+
.options(globalOptions || {})
|
|
111
|
+
.options(serverOptions)
|
|
112
|
+
.example([
|
|
113
|
+
['$0 serve', 'Start server with HTTP transport (default)'],
|
|
114
|
+
['$0 serve --transport=stdio', 'Start server with stdio transport'],
|
|
115
|
+
['$0 serve --port=3000', 'Start HTTP server on port 3000'],
|
|
116
|
+
['$0 serve --filter="web,api"', 'Start server with filtered MCP servers'],
|
|
117
|
+
['$0 serve --enable-auth', 'Start server with OAuth authentication enabled'],
|
|
118
|
+
]).epilogue(`
|
|
119
|
+
TRANSPORT OPTIONS:
|
|
120
|
+
stdio: Use stdin/stdout for communication (for programmatic use)
|
|
121
|
+
http: Use HTTP server with SSE for web-based clients (default)
|
|
122
|
+
|
|
123
|
+
FILTERING:
|
|
124
|
+
Use --filter to limit which MCP servers are exposed:
|
|
125
|
+
• Simple: "web,api,database" (OR logic)
|
|
126
|
+
• Advanced: "web AND database" or "(web OR api) AND database"
|
|
127
|
+
|
|
128
|
+
AUTHENTICATION:
|
|
129
|
+
Use --enable-auth to enable OAuth 2.1 authentication with scope validation.
|
|
130
|
+
Configure OAuth providers in your MCP configuration file.
|
|
131
|
+
|
|
132
|
+
For more information: https://github.com/1mcp-app/agent
|
|
133
|
+
`);
|
|
134
|
+
}, async (argv) => {
|
|
135
|
+
const { configureGlobalLogger } = await import('../../utils/configureGlobalLogger.js');
|
|
136
|
+
const { serveCommand } = await import('./serve.js');
|
|
137
|
+
// Configure logger with global options and transport awareness
|
|
138
|
+
configureGlobalLogger(argv, argv.transport);
|
|
139
|
+
// Execute serve command
|
|
140
|
+
await serveCommand(argv);
|
|
141
|
+
});
|
|
142
|
+
}
|
|
143
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/serve/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
export interface ServeOptions {
|
|
2
|
+
config?: string;
|
|
3
|
+
'config-dir'?: string;
|
|
4
|
+
'log-level'?: string;
|
|
5
|
+
'log-file'?: string;
|
|
6
|
+
transport: string;
|
|
7
|
+
port: number;
|
|
8
|
+
host: string;
|
|
9
|
+
'external-url'?: string;
|
|
10
|
+
filter?: string;
|
|
11
|
+
pagination: boolean;
|
|
12
|
+
auth: boolean;
|
|
13
|
+
'enable-auth': boolean;
|
|
14
|
+
'enable-scope-validation': boolean;
|
|
15
|
+
'enable-enhanced-security': boolean;
|
|
16
|
+
'session-ttl': number;
|
|
17
|
+
'session-storage-path'?: string;
|
|
18
|
+
'rate-limit-window': number;
|
|
19
|
+
'rate-limit-max': number;
|
|
20
|
+
'trust-proxy': string;
|
|
21
|
+
'health-info-level': string;
|
|
22
|
+
'enable-async-loading': boolean;
|
|
23
|
+
}
|
|
24
|
+
/**
|
|
25
|
+
* Start the server using the specified transport.
|
|
26
|
+
*/
|
|
27
|
+
export declare function serveCommand(parsedArgv: ServeOptions): Promise<void>;
|
|
28
|
+
//# sourceMappingURL=serve.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../../../src/commands/serve/serve.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,YAAY;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,IAAI,EAAE,OAAO,CAAC;IACd,aAAa,EAAE,OAAO,CAAC;IACvB,yBAAyB,EAAE,OAAO,CAAC;IACnC,0BAA0B,EAAE,OAAO,CAAC;IACpC,aAAa,EAAE,MAAM,CAAC;IACtB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,sBAAsB,EAAE,OAAO,CAAC;CACjC;AAoED;;GAEG;AACH,wBAAsB,YAAY,CAAC,UAAU,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAgK1E"}
|
|
@@ -0,0 +1,213 @@
|
|
|
1
|
+
import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
|
|
2
|
+
import { setupServer } from '../../server.js';
|
|
3
|
+
import logger from '../../logger/logger.js';
|
|
4
|
+
import configReloadService from '../../services/configReloadService.js';
|
|
5
|
+
import { McpConfigManager } from '../../config/mcpConfigManager.js';
|
|
6
|
+
import { ExpressServer } from '../../transport/http/server.js';
|
|
7
|
+
import { AgentConfigManager } from '../../core/server/agentConfig.js';
|
|
8
|
+
import { displayLogo } from '../../utils/logo.js';
|
|
9
|
+
import { TagQueryParser } from '../../utils/tagQueryParser.js';
|
|
10
|
+
/**
|
|
11
|
+
* Set up graceful shutdown handling
|
|
12
|
+
*/
|
|
13
|
+
function setupGracefulShutdown(serverManager, loadingManager, expressServer) {
|
|
14
|
+
const shutdown = async () => {
|
|
15
|
+
logger.info('Shutting down server...');
|
|
16
|
+
// Stop the configuration reload service
|
|
17
|
+
configReloadService.stop();
|
|
18
|
+
// Shutdown loading manager if it exists
|
|
19
|
+
if (loadingManager && typeof loadingManager.shutdown === 'function') {
|
|
20
|
+
try {
|
|
21
|
+
loadingManager.shutdown();
|
|
22
|
+
logger.info('Loading manager shutdown complete');
|
|
23
|
+
}
|
|
24
|
+
catch (error) {
|
|
25
|
+
logger.error(`Error shutting down loading manager: ${error}`);
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
// Shutdown ExpressServer if it exists
|
|
29
|
+
if (expressServer) {
|
|
30
|
+
try {
|
|
31
|
+
expressServer.shutdown();
|
|
32
|
+
logger.info('ExpressServer shutdown complete');
|
|
33
|
+
}
|
|
34
|
+
catch (error) {
|
|
35
|
+
logger.error(`Error shutting down ExpressServer: ${error}`);
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
// Close all transports
|
|
39
|
+
for (const [sessionId, transport] of serverManager.getTransports().entries()) {
|
|
40
|
+
try {
|
|
41
|
+
transport?.close();
|
|
42
|
+
logger.info(`Closed transport: ${sessionId}`);
|
|
43
|
+
}
|
|
44
|
+
catch (error) {
|
|
45
|
+
logger.error(`Error closing transport ${sessionId}: ${error}`);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
// Cleanup PresetManager if it exists
|
|
49
|
+
try {
|
|
50
|
+
const PresetManager = (await import('../../utils/presetManager.js')).PresetManager;
|
|
51
|
+
const presetManager = PresetManager.getInstance();
|
|
52
|
+
if (presetManager && typeof presetManager.cleanup === 'function') {
|
|
53
|
+
await presetManager.cleanup();
|
|
54
|
+
logger.info('PresetManager cleanup complete');
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
catch (error) {
|
|
58
|
+
logger.error(`Error cleaning up PresetManager: ${error}`);
|
|
59
|
+
}
|
|
60
|
+
logger.info('Server shutdown complete');
|
|
61
|
+
process.exit(0);
|
|
62
|
+
};
|
|
63
|
+
// Handle various signals for graceful shutdown
|
|
64
|
+
process.on('SIGINT', shutdown);
|
|
65
|
+
process.on('SIGTERM', shutdown);
|
|
66
|
+
process.on('SIGHUP', shutdown);
|
|
67
|
+
}
|
|
68
|
+
/**
|
|
69
|
+
* Start the server using the specified transport.
|
|
70
|
+
*/
|
|
71
|
+
export async function serveCommand(parsedArgv) {
|
|
72
|
+
try {
|
|
73
|
+
if (parsedArgv.transport !== 'stdio' && !parsedArgv['log-file']) {
|
|
74
|
+
displayLogo();
|
|
75
|
+
}
|
|
76
|
+
McpConfigManager.getInstance(parsedArgv.config);
|
|
77
|
+
// Configure server settings from CLI arguments
|
|
78
|
+
const serverConfigManager = AgentConfigManager.getInstance();
|
|
79
|
+
// Handle backward compatibility for auth flag
|
|
80
|
+
const authEnabled = parsedArgv['enable-auth'] ?? parsedArgv['auth'] ?? false;
|
|
81
|
+
const scopeValidationEnabled = parsedArgv['enable-scope-validation'] ?? authEnabled;
|
|
82
|
+
const enhancedSecurityEnabled = parsedArgv['enable-enhanced-security'] ?? false;
|
|
83
|
+
// Handle trust proxy configuration (convert 'true'/'false' strings to boolean)
|
|
84
|
+
const trustProxyValue = parsedArgv['trust-proxy'];
|
|
85
|
+
const trustProxy = trustProxyValue === 'true' ? true : trustProxyValue === 'false' ? false : trustProxyValue;
|
|
86
|
+
serverConfigManager.updateConfig({
|
|
87
|
+
host: parsedArgv.host,
|
|
88
|
+
port: parsedArgv.port,
|
|
89
|
+
externalUrl: parsedArgv['external-url'],
|
|
90
|
+
trustProxy,
|
|
91
|
+
auth: {
|
|
92
|
+
enabled: authEnabled,
|
|
93
|
+
sessionTtlMinutes: parsedArgv['session-ttl'],
|
|
94
|
+
sessionStoragePath: parsedArgv['session-storage-path'],
|
|
95
|
+
oauthCodeTtlMs: 60 * 1000, // 1 minute
|
|
96
|
+
oauthTokenTtlMs: parsedArgv['session-ttl'] * 60 * 1000, // Convert minutes to milliseconds
|
|
97
|
+
},
|
|
98
|
+
rateLimit: {
|
|
99
|
+
windowMs: parsedArgv['rate-limit-window'] * 60 * 1000, // Convert minutes to milliseconds
|
|
100
|
+
max: parsedArgv['rate-limit-max'],
|
|
101
|
+
},
|
|
102
|
+
features: {
|
|
103
|
+
auth: authEnabled,
|
|
104
|
+
scopeValidation: scopeValidationEnabled,
|
|
105
|
+
enhancedSecurity: enhancedSecurityEnabled,
|
|
106
|
+
},
|
|
107
|
+
health: {
|
|
108
|
+
detailLevel: parsedArgv['health-info-level'],
|
|
109
|
+
},
|
|
110
|
+
...(parsedArgv['enable-async-loading'] && {
|
|
111
|
+
asyncLoading: {
|
|
112
|
+
enabled: true,
|
|
113
|
+
notifyOnServerReady: true,
|
|
114
|
+
waitForMinimumServers: 1,
|
|
115
|
+
initialLoadTimeoutMs: 30000,
|
|
116
|
+
batchNotifications: true,
|
|
117
|
+
batchDelayMs: 100,
|
|
118
|
+
},
|
|
119
|
+
}),
|
|
120
|
+
});
|
|
121
|
+
// Initialize PresetManager with config directory option before server setup
|
|
122
|
+
// This ensures the singleton is created with the correct config directory
|
|
123
|
+
const PresetManager = (await import('../../utils/presetManager.js')).PresetManager;
|
|
124
|
+
PresetManager.getInstance(parsedArgv['config-dir']);
|
|
125
|
+
// Initialize server and get server manager with custom config path if provided
|
|
126
|
+
const { serverManager, loadingManager, asyncOrchestrator } = await setupServer();
|
|
127
|
+
let expressServer;
|
|
128
|
+
switch (parsedArgv.transport) {
|
|
129
|
+
case 'stdio': {
|
|
130
|
+
// Use stdio transport
|
|
131
|
+
const transport = new StdioServerTransport();
|
|
132
|
+
// Parse and validate filter from CLI if provided
|
|
133
|
+
let tags;
|
|
134
|
+
let tagExpression;
|
|
135
|
+
let tagFilterMode = 'none';
|
|
136
|
+
if (parsedArgv.filter) {
|
|
137
|
+
try {
|
|
138
|
+
// First try to parse as advanced expression
|
|
139
|
+
tagExpression = TagQueryParser.parseAdvanced(parsedArgv.filter);
|
|
140
|
+
tagFilterMode = 'advanced';
|
|
141
|
+
// Provide simple tags for backward compat where possible
|
|
142
|
+
if (tagExpression.type === 'tag') {
|
|
143
|
+
tags = [tagExpression.value];
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
catch (_advancedError) {
|
|
147
|
+
// Fall back to simple parsing for comma-separated tags
|
|
148
|
+
try {
|
|
149
|
+
tags = TagQueryParser.parseSimple(parsedArgv.filter);
|
|
150
|
+
tagFilterMode = 'simple-or';
|
|
151
|
+
if (!tags || tags.length === 0) {
|
|
152
|
+
logger.warn('No valid tags provided, ignoring filter parameter');
|
|
153
|
+
tags = undefined;
|
|
154
|
+
tagFilterMode = 'none';
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
catch (simpleError) {
|
|
158
|
+
logger.error(`Invalid filter expression: ${simpleError instanceof Error ? simpleError.message : 'Unknown error'}`);
|
|
159
|
+
logger.error('Examples:');
|
|
160
|
+
logger.error(' --filter "web,api,database" # OR logic (comma-separated)');
|
|
161
|
+
logger.error(' --filter "web AND database" # AND logic');
|
|
162
|
+
logger.error(' --filter "(web OR api) AND database" # Complex expressions');
|
|
163
|
+
process.exit(1);
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
await serverManager.connectTransport(transport, 'stdio', {
|
|
168
|
+
tags,
|
|
169
|
+
tagExpression,
|
|
170
|
+
tagFilterMode,
|
|
171
|
+
enablePagination: parsedArgv.pagination,
|
|
172
|
+
});
|
|
173
|
+
// Initialize notifications for async loading if enabled
|
|
174
|
+
if (asyncOrchestrator) {
|
|
175
|
+
const inboundConnection = serverManager.getServer('stdio');
|
|
176
|
+
if (inboundConnection) {
|
|
177
|
+
asyncOrchestrator.initializeNotifications(inboundConnection);
|
|
178
|
+
logger.info('Async loading notifications initialized for stdio transport');
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
logger.info('Server started with stdio transport');
|
|
182
|
+
break;
|
|
183
|
+
}
|
|
184
|
+
case 'sse': {
|
|
185
|
+
logger.warning('sse option is deprecated, use http instead');
|
|
186
|
+
}
|
|
187
|
+
// eslint-disable-next-line no-fallthrough
|
|
188
|
+
case 'http': {
|
|
189
|
+
// Use HTTP/SSE transport
|
|
190
|
+
expressServer = new ExpressServer(serverManager, loadingManager, asyncOrchestrator);
|
|
191
|
+
expressServer.start();
|
|
192
|
+
break;
|
|
193
|
+
}
|
|
194
|
+
default:
|
|
195
|
+
logger.error(`Invalid transport: ${parsedArgv.transport}`);
|
|
196
|
+
process.exit(1);
|
|
197
|
+
}
|
|
198
|
+
// Set up graceful shutdown handling
|
|
199
|
+
setupGracefulShutdown(serverManager, loadingManager, expressServer);
|
|
200
|
+
// Log MCP loading progress (non-blocking)
|
|
201
|
+
loadingManager.on('loading-progress', (summary) => {
|
|
202
|
+
logger.info(`MCP loading progress: ${summary.ready}/${summary.totalServers} servers ready (${summary.loading} loading, ${summary.failed} failed)`);
|
|
203
|
+
});
|
|
204
|
+
loadingManager.on('loading-complete', (summary) => {
|
|
205
|
+
logger.info(`MCP loading complete: ${summary.ready}/${summary.totalServers} servers ready (${summary.successRate.toFixed(1)}% success rate)`);
|
|
206
|
+
});
|
|
207
|
+
}
|
|
208
|
+
catch (error) {
|
|
209
|
+
logger.error('Server error:', error);
|
|
210
|
+
process.exit(1);
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
//# sourceMappingURL=serve.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"serve.js","sourceRoot":"","sources":["../../../src/commands/serve/serve.ts"],"names":[],"mappings":"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"}
|
package/build/constants.d.ts
CHANGED
|
@@ -10,7 +10,7 @@ export declare const STREAMABLE_HTTP_ENDPOINT = "/mcp";
|
|
|
10
10
|
export declare const HEALTH_ENDPOINT = "/health";
|
|
11
11
|
export declare const MCP_CONFIG_FILE = "mcp.json";
|
|
12
12
|
export declare const MCP_SERVER_NAME = "1mcp";
|
|
13
|
-
export declare const MCP_SERVER_VERSION = "0.22.
|
|
13
|
+
export declare const MCP_SERVER_VERSION = "0.22.1";
|
|
14
14
|
export declare const MCP_URI_SEPARATOR = "_1mcp_";
|
|
15
15
|
export declare const CONFIG_DIR_NAME = "1mcp";
|
|
16
16
|
export declare const BACKUP_DIR_NAME = "backups";
|
package/build/constants.js
CHANGED
|
@@ -13,7 +13,7 @@ export const HEALTH_ENDPOINT = '/health';
|
|
|
13
13
|
// MCP constants
|
|
14
14
|
export const MCP_CONFIG_FILE = 'mcp.json';
|
|
15
15
|
export const MCP_SERVER_NAME = '1mcp';
|
|
16
|
-
export const MCP_SERVER_VERSION = '0.22.
|
|
16
|
+
export const MCP_SERVER_VERSION = '0.22.1';
|
|
17
17
|
export const MCP_URI_SEPARATOR = '_1mcp_';
|
|
18
18
|
// Global config paths
|
|
19
19
|
export const CONFIG_DIR_NAME = '1mcp';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverManager.d.ts","sourceRoot":"","sources":["../../../src/core/server/serverManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAM1E,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,uBAAuB,EACvB,gBAAgB,EAEjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAG7D,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"serverManager.d.ts","sourceRoot":"","sources":["../../../src/core/server/serverManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAM1E,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,uBAAuB,EACvB,gBAAgB,EAEjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAG7D,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAA4B;IACnD,OAAO,CAAC,YAAY,CAA6C;IACjE,OAAO,CAAC,YAAY,CAAoC;IACxD,OAAO,CAAC,kBAAkB,CAA4C;IAEtE,OAAO,CAAC,aAAa,CAA8D;IACnF,OAAO,CAAC,UAAU,CAAiC;IACnD,OAAO,CAAC,mBAAmB,CAAyC;IACpE,OAAO,CAAC,gBAAgB,CAA0B;IAElD,OAAO;WAYO,mBAAmB,CAC/B,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,EACzC,YAAY,EAAE;QAAE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,EACvD,aAAa,EAAE,mBAAmB,EAClC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GACpC,aAAa;IAOhB,WAAkB,OAAO,IAAI,aAAa,CAKzC;WAGa,aAAa,IAAI,IAAI;IAatB,gBAAgB,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;YA2BtG,iBAAiB;YA2BjB,SAAS;IAmEhB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,GAAE,OAAe,GAAG,IAAI;IAsCzE,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;IAItD,aAAa,IAAI,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC;IAUvC,mBAAmB,IAAI,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC;IAIhD,UAAU,IAAI,mBAAmB;IAIxC;;;OAGG;IACI,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS;IAI7D,wBAAwB,IAAI,MAAM;IAIlC,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS;IAI3D,qBAAqB,IAAI,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC;IAIvD,0BAA0B,CAAC,UAAU,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAI;IAKlH;;;;;OAKG;IACU,sBAAsB,CAAC,CAAC,EACnC,WAAW,EAAE,iBAAiB,EAC9B,SAAS,EAAE,CAAC,WAAW,EAAE,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC,EACzD,OAAO,GAAE,gBAAqB,GAC7B,OAAO,CAAC,CAAC,CAAC;CAQd"}
|
|
@@ -28,6 +28,9 @@ export class ServerManager {
|
|
|
28
28
|
return ServerManager.instance;
|
|
29
29
|
}
|
|
30
30
|
static get current() {
|
|
31
|
+
if (!ServerManager.instance) {
|
|
32
|
+
throw new Error('ServerManager not initialized');
|
|
33
|
+
}
|
|
31
34
|
return ServerManager.instance;
|
|
32
35
|
}
|
|
33
36
|
// Test utility method to reset singleton state
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverManager.js","sourceRoot":"","sources":["../../../src/core/server/serverManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAEnE,OAAO,MAAM,MAAM,wBAAwB,CAAC;AAC5C,OAAO,mBAAmB,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,wBAAwB,EAAE,MAAM,oCAAoC,CAAC;AAC9E,OAAO,EAAE,yBAAyB,EAAyB,MAAM,0CAA0C,CAAC;AAC5G,OAAO,EAKL,YAAY,GACb,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAErE,MAAM,OAAO,aAAa;IAChB,MAAM,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"serverManager.js","sourceRoot":"","sources":["../../../src/core/server/serverManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,102 +58,41 @@ export interface StdioTransportConfig extends BaseTransportConfig {
|
|
|
58
58
|
export declare const oAuthConfigSchema: z.ZodObject<{
|
|
59
59
|
clientId: z.ZodOptional<z.ZodString>;
|
|
60
60
|
clientSecret: z.ZodOptional<z.ZodString>;
|
|
61
|
-
scopes: z.ZodOptional<z.ZodArray<z.ZodString
|
|
61
|
+
scopes: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
62
62
|
autoRegister: z.ZodOptional<z.ZodBoolean>;
|
|
63
|
-
},
|
|
64
|
-
clientId?: string | undefined;
|
|
65
|
-
clientSecret?: string | undefined;
|
|
66
|
-
scopes?: string[] | undefined;
|
|
67
|
-
autoRegister?: boolean | undefined;
|
|
68
|
-
}, {
|
|
69
|
-
clientId?: string | undefined;
|
|
70
|
-
clientSecret?: string | undefined;
|
|
71
|
-
scopes?: string[] | undefined;
|
|
72
|
-
autoRegister?: boolean | undefined;
|
|
73
|
-
}>;
|
|
63
|
+
}, z.core.$strip>;
|
|
74
64
|
/**
|
|
75
65
|
* Zod schema for transport configuration
|
|
76
66
|
*/
|
|
77
67
|
export declare const transportConfigSchema: z.ZodObject<{
|
|
78
|
-
type: z.ZodOptional<z.ZodEnum<
|
|
68
|
+
type: z.ZodOptional<z.ZodEnum<{
|
|
69
|
+
stdio: "stdio";
|
|
70
|
+
http: "http";
|
|
71
|
+
sse: "sse";
|
|
72
|
+
streamableHttp: "streamableHttp";
|
|
73
|
+
}>>;
|
|
79
74
|
disabled: z.ZodOptional<z.ZodBoolean>;
|
|
80
75
|
timeout: z.ZodOptional<z.ZodNumber>;
|
|
81
|
-
tags: z.ZodOptional<z.ZodArray<z.ZodString
|
|
76
|
+
tags: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
82
77
|
oauth: z.ZodOptional<z.ZodObject<{
|
|
83
78
|
clientId: z.ZodOptional<z.ZodString>;
|
|
84
79
|
clientSecret: z.ZodOptional<z.ZodString>;
|
|
85
|
-
scopes: z.ZodOptional<z.ZodArray<z.ZodString
|
|
80
|
+
scopes: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
86
81
|
autoRegister: z.ZodOptional<z.ZodBoolean>;
|
|
87
|
-
},
|
|
88
|
-
clientId?: string | undefined;
|
|
89
|
-
clientSecret?: string | undefined;
|
|
90
|
-
scopes?: string[] | undefined;
|
|
91
|
-
autoRegister?: boolean | undefined;
|
|
92
|
-
}, {
|
|
93
|
-
clientId?: string | undefined;
|
|
94
|
-
clientSecret?: string | undefined;
|
|
95
|
-
scopes?: string[] | undefined;
|
|
96
|
-
autoRegister?: boolean | undefined;
|
|
97
|
-
}>>;
|
|
82
|
+
}, z.core.$strip>>;
|
|
98
83
|
url: z.ZodOptional<z.ZodString>;
|
|
99
84
|
headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
100
85
|
command: z.ZodOptional<z.ZodString>;
|
|
101
|
-
args: z.ZodOptional<z.ZodArray<z.ZodString
|
|
102
|
-
stderr: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodNumber]>>;
|
|
86
|
+
args: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
87
|
+
stderr: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
|
|
103
88
|
cwd: z.ZodOptional<z.ZodString>;
|
|
104
|
-
env: z.ZodOptional<z.ZodUnion<[z.ZodRecord<z.ZodString, z.ZodString>, z.ZodArray<z.ZodString
|
|
89
|
+
env: z.ZodOptional<z.ZodUnion<readonly [z.ZodRecord<z.ZodString, z.ZodString>, z.ZodArray<z.ZodString>]>>;
|
|
105
90
|
inheritParentEnv: z.ZodOptional<z.ZodBoolean>;
|
|
106
|
-
envFilter: z.ZodOptional<z.ZodArray<z.ZodString
|
|
91
|
+
envFilter: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
107
92
|
restartOnExit: z.ZodOptional<z.ZodBoolean>;
|
|
108
93
|
maxRestarts: z.ZodOptional<z.ZodNumber>;
|
|
109
94
|
restartDelay: z.ZodOptional<z.ZodNumber>;
|
|
110
|
-
},
|
|
111
|
-
type?: "stdio" | "http" | "sse" | "streamableHttp" | undefined;
|
|
112
|
-
url?: string | undefined;
|
|
113
|
-
headers?: Record<string, string> | undefined;
|
|
114
|
-
command?: string | undefined;
|
|
115
|
-
args?: string[] | undefined;
|
|
116
|
-
stderr?: string | number | undefined;
|
|
117
|
-
cwd?: string | undefined;
|
|
118
|
-
env?: Record<string, string> | string[] | undefined;
|
|
119
|
-
inheritParentEnv?: boolean | undefined;
|
|
120
|
-
envFilter?: string[] | undefined;
|
|
121
|
-
restartOnExit?: boolean | undefined;
|
|
122
|
-
maxRestarts?: number | undefined;
|
|
123
|
-
restartDelay?: number | undefined;
|
|
124
|
-
disabled?: boolean | undefined;
|
|
125
|
-
timeout?: number | undefined;
|
|
126
|
-
tags?: string[] | undefined;
|
|
127
|
-
oauth?: {
|
|
128
|
-
clientId?: string | undefined;
|
|
129
|
-
clientSecret?: string | undefined;
|
|
130
|
-
scopes?: string[] | undefined;
|
|
131
|
-
autoRegister?: boolean | undefined;
|
|
132
|
-
} | undefined;
|
|
133
|
-
}, {
|
|
134
|
-
type?: "stdio" | "http" | "sse" | "streamableHttp" | undefined;
|
|
135
|
-
url?: string | undefined;
|
|
136
|
-
headers?: Record<string, string> | undefined;
|
|
137
|
-
command?: string | undefined;
|
|
138
|
-
args?: string[] | undefined;
|
|
139
|
-
stderr?: string | number | undefined;
|
|
140
|
-
cwd?: string | undefined;
|
|
141
|
-
env?: Record<string, string> | string[] | undefined;
|
|
142
|
-
inheritParentEnv?: boolean | undefined;
|
|
143
|
-
envFilter?: string[] | undefined;
|
|
144
|
-
restartOnExit?: boolean | undefined;
|
|
145
|
-
maxRestarts?: number | undefined;
|
|
146
|
-
restartDelay?: number | undefined;
|
|
147
|
-
disabled?: boolean | undefined;
|
|
148
|
-
timeout?: number | undefined;
|
|
149
|
-
tags?: string[] | undefined;
|
|
150
|
-
oauth?: {
|
|
151
|
-
clientId?: string | undefined;
|
|
152
|
-
clientSecret?: string | undefined;
|
|
153
|
-
scopes?: string[] | undefined;
|
|
154
|
-
autoRegister?: boolean | undefined;
|
|
155
|
-
} | undefined;
|
|
156
|
-
}>;
|
|
95
|
+
}, z.core.$strip>;
|
|
157
96
|
/**
|
|
158
97
|
* Union type for all transport configurations
|
|
159
98
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../../src/core/types/transport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAC1E,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC;;GAEG;AACH,MAAM,WAAW,iBAAkB,SAAQ,SAAS;IAClD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,QAAQ,CAAC,KAAK,CAAC,EAAE,WAAW,CAAC;CAC9B;AAED;;GAEG;AACH,MAAM,WAAW,wBAAyB,SAAQ,mBAAmB;IACnE,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC;IAC9B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC3C;AAED;;GAEG;AACH,MAAM,WAAW,oBAAqB,SAAQ,mBAAmB;IAC/D,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IAC3C,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,EAAE,CAAC;IACjD,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IACpC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;CAChC;AAED;;GAEG;AACH,eAAO,MAAM,iBAAiB
|
|
1
|
+
{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../../src/core/types/transport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAC1E,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC;;GAEG;AACH,MAAM,WAAW,iBAAkB,SAAQ,SAAS;IAClD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,QAAQ,CAAC,KAAK,CAAC,EAAE,WAAW,CAAC;CAC9B;AAED;;GAEG;AACH,MAAM,WAAW,wBAAyB,SAAQ,mBAAmB;IACnE,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC;IAC9B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC3C;AAED;;GAEG;AACH,MAAM,WAAW,oBAAqB,SAAQ,mBAAmB;IAC/D,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IAC3C,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,EAAE,CAAC;IACjD,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IACpC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;CAChC;AAED;;GAEG;AACH,eAAO,MAAM,iBAAiB;;;;;iBAK5B,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAsBhC,CAAC;AAEH;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,wBAAwB,GAAG,oBAAoB,CAAC;AAE9E;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC"}
|
|
@@ -19,13 +19,13 @@ export const transportConfigSchema = z.object({
|
|
|
19
19
|
oauth: oAuthConfigSchema.optional(),
|
|
20
20
|
// HTTP/SSE Parameters
|
|
21
21
|
url: z.string().url().optional(),
|
|
22
|
-
headers: z.record(z.string()).optional(),
|
|
22
|
+
headers: z.record(z.string(), z.string()).optional(),
|
|
23
23
|
// StdioServerParameters fields
|
|
24
24
|
command: z.string().optional(),
|
|
25
25
|
args: z.array(z.string()).optional(),
|
|
26
26
|
stderr: z.union([z.string(), z.number()]).optional(), // Note: IOType validation is complex, keeping simple validation
|
|
27
27
|
cwd: z.string().optional(),
|
|
28
|
-
env: z.union([z.record(z.string()), z.array(z.string())]).optional(),
|
|
28
|
+
env: z.union([z.record(z.string(), z.string()), z.array(z.string())]).optional(),
|
|
29
29
|
inheritParentEnv: z.boolean().optional(),
|
|
30
30
|
envFilter: z.array(z.string()).optional(),
|
|
31
31
|
restartOnExit: z.boolean().optional(),
|