@apify/mcpc 0.1.3 → 0.1.4
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/.claude/settings.local.json +30 -1
- package/.idea/codeStyles/Project.xml +4 -0
- package/.idea/workspace.xml +281 -277
- package/CONTRIBUTING.md +210 -0
- package/README.md +156 -367
- package/TODOs.md +27 -66
- package/dist/bridge/index.js +29 -17
- package/dist/bridge/index.js.map +1 -1
- package/dist/cli/commands/auth.d.ts.map +1 -1
- package/dist/cli/commands/auth.js +9 -4
- package/dist/cli/commands/auth.js.map +1 -1
- package/dist/cli/commands/clean.d.ts.map +1 -1
- package/dist/cli/commands/clean.js +13 -19
- package/dist/cli/commands/clean.js.map +1 -1
- package/dist/cli/commands/prompts.d.ts.map +1 -1
- package/dist/cli/commands/prompts.js +24 -1
- package/dist/cli/commands/prompts.js.map +1 -1
- package/dist/cli/commands/sessions.d.ts +5 -1
- package/dist/cli/commands/sessions.d.ts.map +1 -1
- package/dist/cli/commands/sessions.js +94 -139
- package/dist/cli/commands/sessions.js.map +1 -1
- package/dist/cli/commands/tools.d.ts.map +1 -1
- package/dist/cli/commands/tools.js +39 -1
- package/dist/cli/commands/tools.js.map +1 -1
- package/dist/cli/helpers.d.ts +2 -2
- package/dist/cli/helpers.d.ts.map +1 -1
- package/dist/cli/helpers.js +32 -68
- package/dist/cli/helpers.js.map +1 -1
- package/dist/cli/index.js +47 -13
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/output.d.ts +19 -3
- package/dist/cli/output.d.ts.map +1 -1
- package/dist/cli/output.js +370 -82
- package/dist/cli/output.js.map +1 -1
- package/dist/cli/parser.d.ts +4 -0
- package/dist/cli/parser.d.ts.map +1 -1
- package/dist/cli/parser.js +88 -1
- package/dist/cli/parser.js.map +1 -1
- package/dist/cli/shell.d.ts.map +1 -1
- package/dist/cli/shell.js +4 -5
- package/dist/cli/shell.js.map +1 -1
- package/dist/core/factory.d.ts +2 -4
- package/dist/core/factory.d.ts.map +1 -1
- package/dist/core/factory.js +2 -34
- package/dist/core/factory.js.map +1 -1
- package/dist/core/mcp-client.d.ts +2 -2
- package/dist/core/mcp-client.d.ts.map +1 -1
- package/dist/core/mcp-client.js +10 -10
- package/dist/core/mcp-client.js.map +1 -1
- package/dist/core/transports.d.ts +2 -2
- package/dist/core/transports.d.ts.map +1 -1
- package/dist/core/transports.js +36 -45
- package/dist/core/transports.js.map +1 -1
- package/dist/lib/auth/oauth-flow.d.ts.map +1 -1
- package/dist/lib/auth/oauth-flow.js +3 -0
- package/dist/lib/auth/oauth-flow.js.map +1 -1
- package/dist/lib/auth/oauth-provider.d.ts.map +1 -1
- package/dist/lib/auth/oauth-provider.js +5 -23
- package/dist/lib/auth/oauth-provider.js.map +1 -1
- package/dist/lib/auth/oauth-token-manager.d.ts.map +1 -1
- package/dist/lib/auth/oauth-token-manager.js +0 -10
- package/dist/lib/auth/oauth-token-manager.js.map +1 -1
- package/dist/lib/auth/profiles.d.ts +5 -1
- package/dist/lib/auth/profiles.d.ts.map +1 -1
- package/dist/lib/auth/profiles.js +80 -13
- package/dist/lib/auth/profiles.js.map +1 -1
- package/dist/lib/bridge-manager.d.ts +2 -2
- package/dist/lib/bridge-manager.d.ts.map +1 -1
- package/dist/lib/bridge-manager.js +18 -19
- package/dist/lib/bridge-manager.js.map +1 -1
- package/dist/lib/config.d.ts +3 -3
- package/dist/lib/config.d.ts.map +1 -1
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/logger.d.ts +5 -1
- package/dist/lib/logger.d.ts.map +1 -1
- package/dist/lib/logger.js +10 -1
- package/dist/lib/logger.js.map +1 -1
- package/dist/lib/schema-validator.d.ts +36 -0
- package/dist/lib/schema-validator.d.ts.map +1 -0
- package/dist/lib/schema-validator.js +220 -0
- package/dist/lib/schema-validator.js.map +1 -0
- package/dist/lib/session-client.d.ts +2 -2
- package/dist/lib/session-client.d.ts.map +1 -1
- package/dist/lib/session-client.js +3 -3
- package/dist/lib/session-client.js.map +1 -1
- package/dist/lib/sessions.js +1 -1
- package/dist/lib/sessions.js.map +1 -1
- package/dist/lib/types.d.ts +13 -24
- package/dist/lib/types.d.ts.map +1 -1
- package/dist/lib/types.js.map +1 -1
- package/dist/lib/utils.d.ts +2 -0
- package/dist/lib/utils.d.ts.map +1 -1
- package/dist/lib/utils.js +8 -0
- package/dist/lib/utils.js.map +1 -1
- package/docs/claude-skill/SKILL.md +2 -2
- package/package.json +12 -8
- package/TESTING.md +0 -212
package/dist/cli/parser.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { readFileSync } from 'fs';
|
|
1
|
+
import { readFileSync, existsSync } from 'fs';
|
|
2
2
|
import { ClientError, resolvePath } from '../lib/index.js';
|
|
3
3
|
function isEnvTrue(envVar) {
|
|
4
4
|
if (!envVar)
|
|
@@ -22,10 +22,82 @@ const OPTIONS_WITH_VALUES = [
|
|
|
22
22
|
'--schema',
|
|
23
23
|
'--schema-mode',
|
|
24
24
|
];
|
|
25
|
+
const KNOWN_OPTIONS = [
|
|
26
|
+
...OPTIONS_WITH_VALUES,
|
|
27
|
+
'-j',
|
|
28
|
+
'--json',
|
|
29
|
+
'-v',
|
|
30
|
+
'--version',
|
|
31
|
+
'-h',
|
|
32
|
+
'--help',
|
|
33
|
+
'--verbose',
|
|
34
|
+
'--clean',
|
|
35
|
+
'--args',
|
|
36
|
+
'--args-file',
|
|
37
|
+
];
|
|
38
|
+
const VALID_CLEAN_TYPES = ['sessions', 'profiles', 'logs', 'all'];
|
|
39
|
+
const VALID_SCHEMA_MODES = ['strict', 'compatible', 'ignore'];
|
|
25
40
|
export function optionTakesValue(arg) {
|
|
26
41
|
const optionName = arg.includes('=') ? arg.substring(0, arg.indexOf('=')) : arg;
|
|
27
42
|
return OPTIONS_WITH_VALUES.includes(optionName);
|
|
28
43
|
}
|
|
44
|
+
function isKnownOption(arg) {
|
|
45
|
+
const optionName = arg.includes('=') ? arg.substring(0, arg.indexOf('=')) : arg;
|
|
46
|
+
return KNOWN_OPTIONS.includes(optionName);
|
|
47
|
+
}
|
|
48
|
+
export function validateOptions(args) {
|
|
49
|
+
for (let i = 0; i < args.length; i++) {
|
|
50
|
+
const arg = args[i];
|
|
51
|
+
if (!arg)
|
|
52
|
+
continue;
|
|
53
|
+
if (arg.startsWith('-')) {
|
|
54
|
+
if (!isKnownOption(arg)) {
|
|
55
|
+
throw new ClientError(`Unknown option: ${arg}`);
|
|
56
|
+
}
|
|
57
|
+
if (optionTakesValue(arg) && !arg.includes('=') && i + 1 < args.length) {
|
|
58
|
+
i++;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
export function validateCleanTypes(types) {
|
|
64
|
+
for (const type of types) {
|
|
65
|
+
if (type && !VALID_CLEAN_TYPES.includes(type)) {
|
|
66
|
+
throw new ClientError(`Invalid --clean type: "${type}". Valid types are: ${VALID_CLEAN_TYPES.join(', ')}`);
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
export function validateArgValues(args) {
|
|
71
|
+
for (let i = 0; i < args.length; i++) {
|
|
72
|
+
const arg = args[i];
|
|
73
|
+
const nextArg = args[i + 1];
|
|
74
|
+
if (!arg)
|
|
75
|
+
continue;
|
|
76
|
+
if (arg === '--schema-mode' && nextArg) {
|
|
77
|
+
if (!VALID_SCHEMA_MODES.includes(nextArg)) {
|
|
78
|
+
throw new ClientError(`Invalid --schema-mode value: "${nextArg}". Valid modes are: ${VALID_SCHEMA_MODES.join(', ')}`);
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
if (arg === '--timeout' && nextArg) {
|
|
82
|
+
const timeout = parseInt(nextArg, 10);
|
|
83
|
+
if (isNaN(timeout) || timeout <= 0) {
|
|
84
|
+
throw new ClientError(`Invalid --timeout value: "${nextArg}". Must be a positive number (seconds).`);
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
if ((arg === '--config' || arg === '-c') && nextArg) {
|
|
88
|
+
const configPath = resolvePath(nextArg);
|
|
89
|
+
if (!existsSync(configPath)) {
|
|
90
|
+
throw new ClientError(`Config file not found: ${nextArg}`);
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
if (arg === '--schema' && nextArg) {
|
|
94
|
+
const schemaPath = resolvePath(nextArg);
|
|
95
|
+
if (!existsSync(schemaPath)) {
|
|
96
|
+
throw new ClientError(`Schema file not found: ${nextArg}`);
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
}
|
|
29
101
|
export function findTarget(args) {
|
|
30
102
|
for (let i = 0; i < args.length; i++) {
|
|
31
103
|
const arg = args[i];
|
|
@@ -165,4 +237,19 @@ export function loadArgsFromFile(filePath) {
|
|
|
165
237
|
throw new ClientError(`Invalid JSON in arguments file: ${error.message}`);
|
|
166
238
|
}
|
|
167
239
|
}
|
|
240
|
+
export function parseHeaderFlags(headerFlags) {
|
|
241
|
+
const headers = {};
|
|
242
|
+
if (headerFlags) {
|
|
243
|
+
for (const header of headerFlags) {
|
|
244
|
+
const colonIndex = header.indexOf(':');
|
|
245
|
+
if (colonIndex < 1) {
|
|
246
|
+
throw new ClientError(`Invalid header format: ${header}. Use "Key: Value"`);
|
|
247
|
+
}
|
|
248
|
+
const key = header.substring(0, colonIndex).trim();
|
|
249
|
+
const value = header.substring(colonIndex + 1).trim();
|
|
250
|
+
headers[key] = value;
|
|
251
|
+
}
|
|
252
|
+
}
|
|
253
|
+
return headers;
|
|
254
|
+
}
|
|
168
255
|
//# sourceMappingURL=parser.js.map
|
package/dist/cli/parser.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../src/cli/parser.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../src/cli/parser.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/shell.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell.d.ts","sourceRoot":"","sources":["../../src/cli/shell.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"shell.d.ts","sourceRoot":"","sources":["../../src/cli/shell.ts"],"names":[],"mappings":"AAkWA,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAoC9D"}
|
package/dist/cli/shell.js
CHANGED
|
@@ -88,7 +88,7 @@ function showShellHelp() {
|
|
|
88
88
|
console.log('');
|
|
89
89
|
console.log(chalk.cyan(' MCP commands:'));
|
|
90
90
|
console.log(' tools-list');
|
|
91
|
-
console.log(' tools-
|
|
91
|
+
console.log(' tools-get <name>');
|
|
92
92
|
console.log(' tools-call <name> [--args ...]');
|
|
93
93
|
console.log(' resources-list');
|
|
94
94
|
console.log(' resources-read <uri>');
|
|
@@ -115,7 +115,6 @@ async function executeCommand(ctx, line) {
|
|
|
115
115
|
}
|
|
116
116
|
if (command === 'exit' || command === 'quit') {
|
|
117
117
|
ctx.running = false;
|
|
118
|
-
console.log(chalk.dim('Goodbye!'));
|
|
119
118
|
return;
|
|
120
119
|
}
|
|
121
120
|
if (command === 'clear') {
|
|
@@ -135,10 +134,10 @@ async function executeCommand(ctx, line) {
|
|
|
135
134
|
case 'tools-list':
|
|
136
135
|
await tools.listTools(ctx.target, options);
|
|
137
136
|
break;
|
|
138
|
-
case 'tools-
|
|
137
|
+
case 'tools-get': {
|
|
139
138
|
if (args.length === 0) {
|
|
140
|
-
console.log(chalk.red('Error: tools-
|
|
141
|
-
console.log('Usage: tools-
|
|
139
|
+
console.log(chalk.red('Error: tools-get requires a tool name'));
|
|
140
|
+
console.log('Usage: tools-get <name>');
|
|
142
141
|
return;
|
|
143
142
|
}
|
|
144
143
|
await tools.getTool(ctx.target, args[0], options);
|
package/dist/cli/shell.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/cli/shell.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/cli/shell.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,WAAW,IAAI,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,KAAK,KAAK,MAAM,qBAAqB,CAAC;AAC7C,OAAO,KAAK,SAAS,MAAM,yBAAyB,CAAC;AACrD,OAAO,KAAK,OAAO,MAAM,uBAAuB,CAAC;AACjD,OAAO,KAAK,OAAO,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,MAAM,oBAAoB,GAAG,IAAI,CAAC;AAClC,MAAM,YAAY,GAAG,eAAe,CAAC;AAgBrC,KAAK,UAAU,WAAW;IACxB,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,EAAE,EAAE,YAAY,CAAC,CAAC;IAEtD,IAAI,CAAC,CAAC,MAAM,UAAU,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC;QACrC,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QACrD,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACtE,CAAC;IAAC,MAAM,CAAC;QAEP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAKD,KAAK,UAAU,WAAW,CAAC,OAAiB;IAC1C,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,EAAE,EAAE,YAAY,CAAC,CAAC;IAGtD,MAAM,KAAK,CAAC,WAAW,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAGhD,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,CAAC;IAEpD,IAAI,CAAC;QACH,MAAM,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC;IAClE,CAAC;IAAC,MAAM,CAAC;IAET,CAAC;AACH,CAAC;AAKD,SAAS,YAAY,CAAC,GAAiB,EAAE,IAAY;IACnD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IAC5B,IAAI,CAAC,OAAO,IAAI,OAAO,KAAK,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC;QAChE,OAAO;IACT,CAAC;IACD,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC5B,CAAC;AAKD,SAAS,mBAAmB,CAAC,YAA8B;IACzD,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,kBAAkB,EAAE,CAAC;IAClD,IAAI,OAAO,GAAG,EAAE,CAAC;IAEjB,QAAQ,YAAY,CAAC,MAAM,EAAE,CAAC;QAC5B,KAAK,oBAAoB;YACvB,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,SAAS,6BAA6B,CAAC,CAAC;YACnE,MAAM;QACR,KAAK,wBAAwB;YAC3B,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,SAAS,iCAAiC,CAAC,CAAC;YACvE,MAAM;QACR,KAAK,sBAAsB;YACzB,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,SAAS,+BAA+B,CAAC,CAAC;YACrE,MAAM;QACR,KAAK,mBAAmB;YACtB,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,SAAS,oBAAoB,CAAC,CAAC;YAC1D,MAAM;QACR,KAAK,UAAU;YACb,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,SAAS,eAAe,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACxF,MAAM;QACR,KAAK,iBAAiB;YACpB,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,SAAS,iBAAiB,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC1F,MAAM;QACR;YACE,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,SAAS,mBAAmB,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACvF,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACvB,CAAC;AAMD,KAAK,UAAU,yBAAyB,CAAC,GAAiB;IACxD,IAAI,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAChC,OAAO;QACT,CAAC;QAGD,GAAG,CAAC,kBAAkB,GAAG,MAAM,mBAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAG/D,GAAG,CAAC,kBAAkB,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC,YAA8B,EAAE,EAAE;YAC3E,mBAAmB,CAAC,YAAY,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;IACL,CAAC;IAAC,MAAM,CAAC;IAGT,CAAC;AACH,CAAC;AAKD,SAAS,aAAa;IACpB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,CAAC;IACjD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAC3C,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IAC9B,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;IACpC,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;IAClD,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IAClC,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;IACxC,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;IAC5C,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;IACnD,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACxB,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC;IAC5D,OAAO,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;IACpD,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;IACtD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AAClB,CAAC;AAKD,KAAK,UAAU,cAAc,CAAC,GAAiB,EAAE,IAAY;IAC3D,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAElD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO;IACT,CAAC;IAGD,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;QACvB,aAAa,EAAE,CAAC;QAChB,OAAO;IACT,CAAC;IAED,IAAI,OAAO,KAAK,MAAM,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;QAC7C,GAAG,CAAC,OAAO,GAAG,KAAK,CAAC;QACpB,OAAO;IACT,CAAC;IAED,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;QACxB,OAAO,CAAC,KAAK,EAAE,CAAC;QAChB,OAAO;IACT,CAAC;IAGD,MAAM,OAAO,GAAmB;QAC9B,UAAU,EAAE,OAAqB;QACjC,UAAU,EAAE,IAAI;KACjB,CAAC;IAEF,IAAI,CAAC;QAEH,QAAQ,OAAO,EAAE,CAAC;YAChB,KAAK,MAAM;gBACT,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBAChC,MAAM;YAER,KAAK,OAAO,CAAC;YACb,KAAK,YAAY;gBACf,MAAM,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBAC3C,MAAM;YAER,KAAK,WAAW,CAAC,CAAC,CAAC;gBACjB,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACtB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC,CAAC;oBAChE,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;oBACvC,OAAO;gBACT,CAAC;gBACD,MAAM,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAW,EAAE,OAAO,CAAC,CAAC;gBAC5D,MAAM;YACR,CAAC;YAED,KAAK,YAAY,CAAC,CAAC,CAAC;gBAClB,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACtB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC,CAAC;oBACjE,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;oBACrD,OAAO;gBACT,CAAC;gBAGD,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAW,CAAC;gBACnC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;gBACzC,MAAM,QAAQ,GAAG,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBAE1E,MAAM,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE;oBACzC,GAAG,OAAO;oBACV,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBACxC,CAAC,CAAC;gBACH,MAAM;YACR,CAAC;YAED,KAAK,WAAW,CAAC;YACjB,KAAK,gBAAgB;gBACnB,MAAM,SAAS,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBACnD,MAAM;YAER,KAAK,gBAAgB,CAAC,CAAC,CAAC;gBACtB,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACtB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC,CAAC;oBAC/D,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;oBAC3C,OAAO;gBACT,CAAC;gBACD,MAAM,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAW,EAAE,OAAO,CAAC,CAAC;gBACpE,MAAM;YACR,CAAC;YAED,KAAK,0BAA0B;gBAC7B,MAAM,SAAS,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBAC3D,MAAM;YAER,KAAK,SAAS,CAAC;YACf,KAAK,cAAc;gBACjB,MAAM,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBAC/C,MAAM;YAER,KAAK,aAAa,CAAC,CAAC,CAAC;gBACnB,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACtB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,2CAA2C,CAAC,CAAC,CAAC;oBACpE,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;oBACtD,OAAO;gBACT,CAAC;gBAGD,MAAM,UAAU,GAAG,IAAI,CAAC,CAAC,CAAW,CAAC;gBACrC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;gBACzC,MAAM,UAAU,GAAG,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBAE5E,MAAM,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE;oBAC9C,GAAG,OAAO;oBACV,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAC5C,CAAC,CAAC;gBACH,MAAM;YACR,CAAC;YAED,KAAK,mBAAmB,CAAC,CAAC,CAAC;gBACzB,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACtB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,2CAA2C,CAAC,CAAC,CAAC;oBACpE,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;oBAChD,OAAO;gBACT,CAAC;gBACD,MAAM,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAW,EAAE,OAAO,CAAC,CAAC;gBAClE,MAAM;YACR,CAAC;YAED;gBACE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,oBAAoB,OAAO,EAAE,CAAC,CAAC,CAAC;gBACtD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC5E,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC,CAAC;IACjD,CAAC;AACH,CAAC;AAKD,KAAK,UAAU,SAAS,CAAC,GAAiB;IAExC,MAAM,eAAe,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,CAAC,OAAO,EAAE,CAAC;IAE3E,MAAM,EAAE,GAAG,QAAQ,CAAC,eAAe,CAAC;QAClC,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,OAAO,EAAE,eAAe;QACxB,WAAW,EAAE,oBAAoB;QACjC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,GAAG,CAAC,MAAM,KAAK,CAAC;QAC3C,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC;IAGH,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;QAC7B,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACxB,KAAK,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;YACvC,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;gBAChB,EAAE,CAAC,MAAM,EAAE,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,EAAE,CAAC,KAAK,EAAE,CAAC;YACb,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAGH,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QACnB,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChB,EAAE,CAAC,MAAM,EAAE,CAAC;IACd,CAAC,CAAC,CAAC;IAGH,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;QAClB,GAAG,CAAC,OAAO,GAAG,KAAK,CAAC;QACpB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAGH,EAAE,CAAC,MAAM,EAAE,CAAC;IAGZ,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;QAClC,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;AACL,CAAC;AAKD,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,MAAc;IAC7C,MAAM,GAAG,GAAiB;QACxB,MAAM;QACN,OAAO,EAAE,MAAM,WAAW,EAAE;QAC5B,OAAO,EAAE,IAAI;KACd,CAAC;IAGF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,+BAA+B,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7E,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,sDAAsD,CAAC,CAAC,CAAC;IAG/E,MAAM,yBAAyB,CAAC,GAAG,CAAC,CAAC;IAGrC,MAAM,OAAO,GAAG,KAAK,IAAmB,EAAE;QACxC,MAAM,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAE/B,IAAI,GAAG,CAAC,kBAAkB,EAAE,CAAC;YAC3B,MAAM,GAAG,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAC;QACvC,CAAC;IACH,CAAC,CAAC;IAEF,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QACxB,GAAG,CAAC,OAAO,GAAG,KAAK,CAAC;IACtB,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;QACzB,GAAG,CAAC,OAAO,GAAG,KAAK,CAAC;IACtB,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,MAAM,SAAS,CAAC,GAAG,CAAC,CAAC;IACvB,CAAC;YAAS,CAAC;QACT,MAAM,OAAO,EAAE,CAAC;IAClB,CAAC;AACH,CAAC"}
|
package/dist/core/factory.d.ts
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import type { ClientCapabilities, ListChangedHandlers } from '@modelcontextprotocol/sdk/types.js';
|
|
2
2
|
import type { OAuthClientProvider } from '@modelcontextprotocol/sdk/client/auth.js';
|
|
3
3
|
import { McpClient } from './mcp-client.js';
|
|
4
|
-
import type
|
|
4
|
+
import { type ServerConfig } from '../lib/types.js';
|
|
5
5
|
export interface ClientInfo {
|
|
6
6
|
name: string;
|
|
7
7
|
version: string;
|
|
8
8
|
}
|
|
9
9
|
export interface CreateMcpClientOptions {
|
|
10
10
|
clientInfo: ClientInfo;
|
|
11
|
-
|
|
11
|
+
serverConfig: ServerConfig;
|
|
12
12
|
capabilities?: ClientCapabilities;
|
|
13
13
|
listChanged?: ListChangedHandlers;
|
|
14
14
|
authProvider?: OAuthClientProvider;
|
|
@@ -16,6 +16,4 @@ export interface CreateMcpClientOptions {
|
|
|
16
16
|
verbose?: boolean;
|
|
17
17
|
}
|
|
18
18
|
export declare function createMcpClient(options: CreateMcpClientOptions): Promise<McpClient>;
|
|
19
|
-
export declare function createStdioClient(clientInfo: ClientInfo, command: string, args?: string[], env?: Record<string, string>): Promise<McpClient>;
|
|
20
|
-
export declare function createHttpClient(clientInfo: ClientInfo, url: string, headers?: Record<string, string>, timeoutMs?: number): Promise<McpClient>;
|
|
21
19
|
//# sourceMappingURL=factory.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/core/factory.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAClG,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,EAAE,SAAS,EAAyB,MAAM,iBAAiB,CAAC;AAEnE,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/core/factory.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAClG,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,EAAE,SAAS,EAAyB,MAAM,iBAAiB,CAAC;AAEnE,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAMpD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAKD,MAAM,WAAW,sBAAsB;IAIrC,UAAU,EAAE,UAAU,CAAC;IAKvB,YAAY,EAAE,YAAY,CAAC;IAK3B,YAAY,CAAC,EAAE,kBAAkB,CAAC;IAKlC,WAAW,CAAC,EAAE,mBAAmB,CAAC;IAKlC,YAAY,CAAC,EAAE,mBAAmB,CAAC;IAMnC,WAAW,CAAC,EAAE,OAAO,CAAC;IAMtB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AA6BD,wBAAsB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,SAAS,CAAC,CAkCzF"}
|
package/dist/core/factory.js
CHANGED
|
@@ -6,7 +6,7 @@ export async function createMcpClient(options) {
|
|
|
6
6
|
const factoryLogger = createLogger('ClientFactory');
|
|
7
7
|
factoryLogger.debug('Creating MCP client', {
|
|
8
8
|
clientName: options.clientInfo.name,
|
|
9
|
-
transportType: options.
|
|
9
|
+
transportType: options.serverConfig.command ? 'stdio' : 'http',
|
|
10
10
|
hasAuthProvider: !!options.authProvider,
|
|
11
11
|
});
|
|
12
12
|
const clientOptions = {
|
|
@@ -17,41 +17,9 @@ export async function createMcpClient(options) {
|
|
|
17
17
|
const client = new McpClient(options.clientInfo, clientOptions);
|
|
18
18
|
if (autoConnect) {
|
|
19
19
|
factoryLogger.debug('Creating transport with authProvider:', !!options.authProvider);
|
|
20
|
-
const transport = createTransportFromConfig(options.
|
|
20
|
+
const transport = createTransportFromConfig(options.serverConfig, options.authProvider ? { authProvider: options.authProvider } : {});
|
|
21
21
|
await client.connect(transport);
|
|
22
22
|
}
|
|
23
23
|
return client;
|
|
24
24
|
}
|
|
25
|
-
export async function createStdioClient(clientInfo, command, args, env) {
|
|
26
|
-
const transport = {
|
|
27
|
-
type: 'stdio',
|
|
28
|
-
command,
|
|
29
|
-
};
|
|
30
|
-
if (args !== undefined) {
|
|
31
|
-
transport.args = args;
|
|
32
|
-
}
|
|
33
|
-
if (env !== undefined) {
|
|
34
|
-
transport.env = env;
|
|
35
|
-
}
|
|
36
|
-
return createMcpClient({
|
|
37
|
-
clientInfo,
|
|
38
|
-
transport,
|
|
39
|
-
});
|
|
40
|
-
}
|
|
41
|
-
export async function createHttpClient(clientInfo, url, headers, timeoutMs) {
|
|
42
|
-
const transport = {
|
|
43
|
-
type: 'http',
|
|
44
|
-
url,
|
|
45
|
-
};
|
|
46
|
-
if (headers) {
|
|
47
|
-
transport.headers = headers;
|
|
48
|
-
}
|
|
49
|
-
if (timeoutMs) {
|
|
50
|
-
transport.timeoutMs = timeoutMs;
|
|
51
|
-
}
|
|
52
|
-
return createMcpClient({
|
|
53
|
-
clientInfo,
|
|
54
|
-
transport,
|
|
55
|
-
});
|
|
56
|
-
}
|
|
57
25
|
//# sourceMappingURL=factory.js.map
|
package/dist/core/factory.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../src/core/factory.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,SAAS,EAAyB,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAE5D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AA+EhD,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,OAA+B;IACnE,MAAM,EAAE,WAAW,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;IAIvC,MAAM,aAAa,GAAG,YAAY,CAAC,eAAe,CAAC,CAAC;IAEpD,aAAa,CAAC,KAAK,CAAC,qBAAqB,EAAE;QACzC,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,IAAI;QACnC,aAAa,EAAE,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../src/core/factory.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,SAAS,EAAyB,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAE5D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AA+EhD,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,OAA+B;IACnE,MAAM,EAAE,WAAW,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;IAIvC,MAAM,aAAa,GAAG,YAAY,CAAC,eAAe,CAAC,CAAC;IAEpD,aAAa,CAAC,KAAK,CAAC,qBAAqB,EAAE;QACzC,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,IAAI;QACnC,aAAa,EAAE,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM;QAC9D,eAAe,EAAE,CAAC,CAAC,OAAO,CAAC,YAAY;KACxC,CAAC,CAAC;IAIH,MAAM,aAAa,GAAqB;QACtC,YAAY,EAAE,OAAO,CAAC,YAAY,IAAI,EAAE;QACxC,GAAG,CAAC,OAAO,CAAC,WAAW,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC;QAChE,MAAM,EAAE,YAAY,CAAC,aAAa,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;KAC7D,CAAC;IAEF,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,OAAO,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;IAGhE,IAAI,WAAW,EAAE,CAAC;QAChB,aAAa,CAAC,KAAK,CAAC,uCAAuC,EAAE,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACrF,MAAM,SAAS,GAAG,yBAAyB,CACzC,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CACnE,CAAC;QACF,MAAM,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAClC,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -2,7 +2,7 @@ import { Client as SDKClient, type ClientOptions } from '@modelcontextprotocol/s
|
|
|
2
2
|
import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
|
|
3
3
|
import type { Implementation, ListToolsResult, CallToolResult, ListResourcesResult, ListResourceTemplatesResult, ReadResourceResult, ListPromptsResult, GetPromptResult, LoggingLevel } from '@modelcontextprotocol/sdk/types.js';
|
|
4
4
|
import { type Logger } from '../lib/logger.js';
|
|
5
|
-
import type { IMcpClient,
|
|
5
|
+
import type { IMcpClient, ServerDetails } from '../lib/types.js';
|
|
6
6
|
export interface McpClientOptions extends ClientOptions {
|
|
7
7
|
logger?: Logger;
|
|
8
8
|
}
|
|
@@ -13,7 +13,7 @@ export declare class McpClient implements IMcpClient {
|
|
|
13
13
|
constructor(clientInfo: Implementation, options?: McpClientOptions);
|
|
14
14
|
connect(transport: Transport): Promise<void>;
|
|
15
15
|
close(): Promise<void>;
|
|
16
|
-
|
|
16
|
+
getServerDetails(): Promise<ServerDetails>;
|
|
17
17
|
ping(): Promise<void>;
|
|
18
18
|
listTools(cursor?: string): Promise<ListToolsResult>;
|
|
19
19
|
callTool(name: string, args?: Record<string, unknown>): Promise<CallToolResult>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-client.d.ts","sourceRoot":"","sources":["../../src/core/mcp-client.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,IAAI,SAAS,EAAE,KAAK,aAAa,EAAE,MAAM,2CAA2C,CAAC;AACpG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAC/E,OAAO,KAAK,EACV,cAAc,EACd,eAAe,EACf,cAAc,EACd,mBAAmB,EACnB,2BAA2B,EAC3B,kBAAkB,EAClB,iBAAiB,EACjB,eAAe,EACf,YAAY,EACb,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAoB,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEjE,OAAO,KAAK,EAAE,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"mcp-client.d.ts","sourceRoot":"","sources":["../../src/core/mcp-client.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,IAAI,SAAS,EAAE,KAAK,aAAa,EAAE,MAAM,2CAA2C,CAAC;AACpG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAC/E,OAAO,KAAK,EACV,cAAc,EACd,eAAe,EACf,cAAc,EACd,mBAAmB,EACnB,2BAA2B,EAC3B,kBAAkB,EAClB,iBAAiB,EACjB,eAAe,EACf,YAAY,EACb,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAoB,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEjE,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAYjE,MAAM,WAAW,gBAAiB,SAAQ,aAAa;IAIrD,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAOD,qBAAa,SAAU,YAAW,UAAU;IAC1C,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,yBAAyB,CAAC,CAAS;gBAE/B,UAAU,EAAE,cAAc,EAAE,OAAO,GAAE,gBAAqB;IAsBhE,OAAO,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAiD5C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB5B,gBAAgB,IAAI,OAAO,CAAC,aAAa,CAAC;IAiBpC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBrB,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAkBpD,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;IAqB/E,aAAa,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAkB5D,qBAAqB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAkB5E,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAkBtD,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB7C,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB/C,WAAW,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAkBxD,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC;IAqBhF,eAAe,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBzD,YAAY,IAAI,SAAS;CAG1B"}
|
package/dist/core/mcp-client.js
CHANGED
|
@@ -55,20 +55,20 @@ export class McpClient {
|
|
|
55
55
|
});
|
|
56
56
|
this.logger.debug('Connection closed');
|
|
57
57
|
}
|
|
58
|
-
|
|
59
|
-
const
|
|
60
|
-
const
|
|
58
|
+
getServerDetails() {
|
|
59
|
+
const details = {};
|
|
60
|
+
const serverInfo = this.client.getServerVersion();
|
|
61
61
|
const capabilities = this.client.getServerCapabilities();
|
|
62
62
|
const instructions = this.client.getInstructions();
|
|
63
|
-
if (
|
|
64
|
-
|
|
63
|
+
if (this.negotiatedProtocolVersion)
|
|
64
|
+
details.protocolVersion = this.negotiatedProtocolVersion;
|
|
65
65
|
if (capabilities)
|
|
66
|
-
|
|
66
|
+
details.capabilities = capabilities;
|
|
67
|
+
if (serverInfo)
|
|
68
|
+
details.serverInfo = serverInfo;
|
|
67
69
|
if (instructions)
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
info.protocolVersion = this.negotiatedProtocolVersion;
|
|
71
|
-
return Promise.resolve(info);
|
|
70
|
+
details.instructions = instructions;
|
|
71
|
+
return Promise.resolve(details);
|
|
72
72
|
}
|
|
73
73
|
async ping() {
|
|
74
74
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-client.js","sourceRoot":"","sources":["../../src/core/mcp-client.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"mcp-client.js","sourceRoot":"","sources":["../../src/core/mcp-client.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,IAAI,SAAS,EAAsB,MAAM,2CAA2C,CAAC;AAapG,OAAO,EAAE,gBAAgB,EAAe,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAyB9E,MAAM,OAAO,SAAS;IACZ,MAAM,CAAY;IAClB,MAAM,CAAS;IACf,yBAAyB,CAAU;IAE3C,YAAY,UAA0B,EAAE,UAA4B,EAAE;QACpE,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,gBAAgB,EAAE,CAAC;QAEnD,IAAI,CAAC,MAAM,GAAG,IAAI,SAAS,CAAC,UAAU,EAAE;YACtC,YAAY,EAAE,OAAO,CAAC,YAAY,IAAI,EAAE;YACxC,GAAG,OAAO;SACX,CAAC,CAAC;QAGH,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,CAAC,KAAK,EAAE,EAAE;YAE9B,IAAI,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;gBAC5D,OAAO;YACT,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;QAC5C,CAAC,CAAC;IACJ,CAAC;IAKD,KAAK,CAAC,OAAO,CAAC,SAAoB;QAChC,IAAI,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;YAGjD,SAAS,CAAC,OAAO,GAAG,CAAC,KAAK,EAAE,EAAE;gBAE5B,IAAI,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;oBAC/D,OAAO;gBACT,CAAC;gBACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC;YAC/C,CAAC,CAAC;YAEF,SAAS,CAAC,OAAO,GAAG,GAAG,EAAE;gBACvB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YACxC,CAAC,CAAC;YAEF,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAIrC,MAAM,oBAAoB,GAAG,SAAyC,CAAC;YACvE,IAAI,oBAAoB,CAAC,eAAe,EAAE,CAAC;gBACzC,IAAI,CAAC,yBAAyB,GAAG,oBAAoB,CAAC,eAAe,CAAC;gBACtE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,IAAI,CAAC,yBAAyB,EAAE,CAAC,CAAC;YACtF,CAAC;YAED,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC;YACrD,MAAM,kBAAkB,GAAG,IAAI,CAAC,MAAM,CAAC,qBAAqB,EAAE,CAAC;YAE/D,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,gBAAgB,aAAa,EAAE,IAAI,IAAI,SAAS,KAAK,aAAa,EAAE,OAAO,IAAI,SAAS,EAAE,CAC3F,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE,kBAAkB,CAAC,CAAC;QAChE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;YAC/C,MAAM,IAAI,YAAY,CACpB,oCAAqC,KAAe,CAAC,OAAO,EAAE,EAC9D,EAAE,aAAa,EAAE,KAAK,EAAE,CACzB,CAAC;QACJ,CAAC;IACH,CAAC;IAOD,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAI3C,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YAClC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACzC,CAAC;IAOD,gBAAgB;QACd,MAAM,OAAO,GAAkB,EAAE,CAAC;QAClC,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC;QAClD,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,qBAAqB,EAAE,CAAC;QACzD,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;QAEnD,IAAI,IAAI,CAAC,yBAAyB;YAAE,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,yBAAyB,CAAC;QAC7F,IAAI,YAAY;YAAE,OAAO,CAAC,YAAY,GAAG,YAAY,CAAC;QACtD,IAAI,UAAU;YAAE,OAAO,CAAC,UAAU,GAAG,UAAU,CAAC;QAChD,IAAI,YAAY;YAAE,OAAO,CAAC,YAAY,GAAG,YAAY,CAAC;QAEtD,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAKD,KAAK,CAAC,IAAI;QACR,IAAI,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;YACrC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACvC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;YACzC,MAAM,IAAI,YAAY,CACpB,gBAAiB,KAAe,CAAC,OAAO,EAAE,EAC1C,EAAE,aAAa,EAAE,KAAK,EAAE,CACzB,CAAC;QACJ,CAAC;IACH,CAAC;IAKD,KAAK,CAAC,SAAS,CAAC,MAAe;QAC7B,IAAI,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAChE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;YACvD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,MAAM,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,CAAC;YACxD,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC;YAClD,MAAM,IAAI,WAAW,CACnB,yBAA0B,KAAe,CAAC,OAAO,EAAE,EACnD,EAAE,aAAa,EAAE,KAAK,EAAE,CACzB,CAAC;QACJ,CAAC;IACH,CAAC;IAKD,KAAK,CAAC,QAAQ,CAAC,IAAY,EAAE,IAA8B;QACzD,IAAI,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC;YACjD,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;gBACzC,IAAI;gBACJ,SAAS,EAAE,IAAI,IAAI,EAAE;aACtB,CAAC,CAAmB,CAAC;YACtB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,IAAI,YAAY,CAAC,CAAC;YAC5C,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,IAAI,GAAG,EAAE,KAAK,CAAC,CAAC;YACzD,MAAM,IAAI,WAAW,CACnB,uBAAuB,IAAI,KAAM,KAAe,CAAC,OAAO,EAAE,EAC1D,EAAE,aAAa,EAAE,KAAK,EAAE,CACzB,CAAC;QACJ,CAAC;IACH,CAAC;IAKD,KAAK,CAAC,aAAa,CAAC,MAAe;QACjC,IAAI,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACpE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;YAC3D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,MAAM,CAAC,SAAS,CAAC,MAAM,YAAY,CAAC,CAAC;YAChE,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2BAA2B,EAAE,KAAK,CAAC,CAAC;YACtD,MAAM,IAAI,WAAW,CACnB,6BAA8B,KAAe,CAAC,OAAO,EAAE,EACvD,EAAE,aAAa,EAAE,KAAK,EAAE,CACzB,CAAC;QACJ,CAAC;IACH,CAAC;IAKD,KAAK,CAAC,qBAAqB,CAAC,MAAe;QACzC,IAAI,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC7E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;YACnE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,MAAM,CAAC,iBAAiB,CAAC,MAAM,qBAAqB,CAAC,CAAC;YACjF,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;YAC/D,MAAM,IAAI,WAAW,CACnB,sCAAuC,KAAe,CAAC,OAAO,EAAE,EAChE,EAAE,aAAa,EAAE,KAAK,EAAE,CACzB,CAAC;QACJ,CAAC;IACH,CAAC;IAKD,KAAK,CAAC,YAAY,CAAC,GAAW;QAC5B,IAAI,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qBAAqB,GAAG,EAAE,CAAC,CAAC;YAC9C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;YACvD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,GAAG,oBAAoB,CAAC,CAAC;YACvD,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2BAA2B,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC;YAC5D,MAAM,IAAI,WAAW,CACnB,2BAA2B,GAAG,KAAM,KAAe,CAAC,OAAO,EAAE,EAC7D,EAAE,aAAa,EAAE,KAAK,EAAE,CACzB,CAAC;QACJ,CAAC;IACH,CAAC;IAKD,KAAK,CAAC,iBAAiB,CAAC,GAAW;QACjC,IAAI,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,GAAG,EAAE,CAAC,CAAC;YACrD,MAAM,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;YAC7C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,GAAG,EAAE,CAAC,CAAC;QACrD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC;YACpE,MAAM,IAAI,WAAW,CACnB,mCAAmC,GAAG,KAAM,KAAe,CAAC,OAAO,EAAE,EACrE,EAAE,aAAa,EAAE,KAAK,EAAE,CACzB,CAAC;QACJ,CAAC;IACH,CAAC;IAKD,KAAK,CAAC,mBAAmB,CAAC,GAAW;QACnC,IAAI,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,GAAG,EAAE,CAAC,CAAC;YACzD,MAAM,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;YAC/C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,GAAG,EAAE,CAAC,CAAC;QACzD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uCAAuC,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC;YACxE,MAAM,IAAI,WAAW,CACnB,uCAAuC,GAAG,KAAM,KAAe,CAAC,OAAO,EAAE,EACzE,EAAE,aAAa,EAAE,KAAK,EAAE,CACzB,CAAC;QACJ,CAAC;IACH,CAAC;IAKD,KAAK,CAAC,WAAW,CAAC,MAAe;QAC/B,IAAI,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAClE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;YACzD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,MAAM,CAAC,OAAO,CAAC,MAAM,UAAU,CAAC,CAAC;YAC5D,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAC;YACpD,MAAM,IAAI,WAAW,CACnB,2BAA4B,KAAe,CAAC,OAAO,EAAE,EACrD,EAAE,aAAa,EAAE,KAAK,EAAE,CACzB,CAAC;QACJ,CAAC;IACH,CAAC;IAKD,KAAK,CAAC,SAAS,CAAC,IAAY,EAAE,IAA6B;QACzD,IAAI,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC;YACnD,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;gBAC1C,IAAI;gBACJ,SAAS,EAAE,IAAI;aAChB,CAAC,CAAoB,CAAC;YACvB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,IAAI,YAAY,CAAC,CAAC;YAC9C,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,IAAI,GAAG,EAAE,KAAK,CAAC,CAAC;YAC1D,MAAM,IAAI,WAAW,CACnB,wBAAwB,IAAI,KAAM,KAAe,CAAC,OAAO,EAAE,EAC3D,EAAE,aAAa,EAAE,KAAK,EAAE,CACzB,CAAC;QACJ,CAAC;IACH,CAAC;IAKD,KAAK,CAAC,eAAe,CAAC,KAAmB;QACvC,IAAI,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,KAAK,EAAE,CAAC,CAAC;YACpD,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YACzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAClD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAC;YACrD,MAAM,IAAI,WAAW,CACnB,4BAA6B,KAAe,CAAC,OAAO,EAAE,EACtD,EAAE,aAAa,EAAE,KAAK,EAAE,CACzB,CAAC;QACJ,CAAC;IACH,CAAC;IAMD,YAAY;QACV,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;CACF"}
|
|
@@ -6,11 +6,11 @@ import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
|
|
|
6
6
|
import type { OAuthClientProvider } from '@modelcontextprotocol/sdk/client/auth.js';
|
|
7
7
|
import { type StdioServerParameters } from '@modelcontextprotocol/sdk/client/stdio.js';
|
|
8
8
|
import { type StreamableHTTPClientTransportOptions } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
|
|
9
|
-
import type {
|
|
9
|
+
import type { ServerConfig } from '../lib/types.js';
|
|
10
10
|
export declare function createStdioTransport(config: StdioServerParameters): Transport;
|
|
11
11
|
export declare function createStreamableHttpTransport(url: string, options?: Omit<StreamableHTTPClientTransportOptions, 'fetch'>): Transport;
|
|
12
12
|
export interface CreateTransportOptions {
|
|
13
13
|
authProvider?: OAuthClientProvider;
|
|
14
14
|
}
|
|
15
|
-
export declare function createTransportFromConfig(config:
|
|
15
|
+
export declare function createTransportFromConfig(config: ServerConfig, options?: CreateTransportOptions): Transport;
|
|
16
16
|
//# sourceMappingURL=transports.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transports.d.ts","sourceRoot":"","sources":["../../src/core/transports.ts"],"names":[],"mappings":"AAMA,YAAY,EACV,SAAS,EACT,oBAAoB,EACpB,SAAS,GACV,MAAM,+CAA+C,CAAC;AAEvD,OAAO,EACL,oBAAoB,EACpB,KAAK,qBAAqB,EAC1B,qBAAqB,GACtB,MAAM,2CAA2C,CAAC;AAEnD,OAAO,EACL,6BAA6B,EAC7B,KAAK,oCAAoC,EACzC,KAAK,iCAAiC,EACtC,mBAAmB,GACpB,MAAM,oDAAoD,CAAC;AAG5D,YAAY,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAEpF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAC/E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,EAEL,KAAK,qBAAqB,EAC3B,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAEL,KAAK,oCAAoC,EAC1C,MAAM,oDAAoD,CAAC;AAE5D,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"transports.d.ts","sourceRoot":"","sources":["../../src/core/transports.ts"],"names":[],"mappings":"AAMA,YAAY,EACV,SAAS,EACT,oBAAoB,EACpB,SAAS,GACV,MAAM,+CAA+C,CAAC;AAEvD,OAAO,EACL,oBAAoB,EACpB,KAAK,qBAAqB,EAC1B,qBAAqB,GACtB,MAAM,2CAA2C,CAAC;AAEnD,OAAO,EACL,6BAA6B,EAC7B,KAAK,oCAAoC,EACzC,KAAK,iCAAiC,EACtC,mBAAmB,GACpB,MAAM,oDAAoD,CAAC;AAG5D,YAAY,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAEpF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAC/E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,EAEL,KAAK,qBAAqB,EAC3B,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAEL,KAAK,oCAAoC,EAC1C,MAAM,oDAAoD,CAAC;AAE5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAMpD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,qBAAqB,GAAG,SAAS,CAY7E;AAKD,wBAAgB,6BAA6B,CAC3C,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,IAAI,CAAC,oCAAoC,EAAE,OAAO,CAAM,GAChE,SAAS,CAwCX;AAKD,MAAM,WAAW,sBAAsB;IAIrC,YAAY,CAAC,EAAE,mBAAmB,CAAC;CACpC;AAKD,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,YAAY,EACpB,OAAO,GAAE,sBAA2B,GACnC,SAAS,CAiDX"}
|
package/dist/core/transports.js
CHANGED
|
@@ -7,11 +7,11 @@ import { ClientError } from '../lib/errors.js';
|
|
|
7
7
|
export function createStdioTransport(config) {
|
|
8
8
|
const logger = createLogger('StdioTransport');
|
|
9
9
|
logger.debug('Creating stdio transport', { command: config.command, args: config.args });
|
|
10
|
-
const
|
|
10
|
+
const params = {
|
|
11
11
|
...config,
|
|
12
12
|
stderr: getVerbose() ? 'inherit' : 'ignore',
|
|
13
13
|
};
|
|
14
|
-
return new StdioClientTransport(
|
|
14
|
+
return new StdioClientTransport(params);
|
|
15
15
|
}
|
|
16
16
|
export function createStreamableHttpTransport(url, options = {}) {
|
|
17
17
|
const logger = createLogger('StreamableHttpTransport');
|
|
@@ -44,52 +44,43 @@ export function createStreamableHttpTransport(url, options = {}) {
|
|
|
44
44
|
return transport;
|
|
45
45
|
}
|
|
46
46
|
export function createTransportFromConfig(config, options = {}) {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
47
|
+
if (config.command) {
|
|
48
|
+
const stdioConfig = {
|
|
49
|
+
command: config.command,
|
|
50
|
+
};
|
|
51
|
+
if (config.args !== undefined) {
|
|
52
|
+
stdioConfig.args = config.args;
|
|
53
|
+
}
|
|
54
|
+
if (config.env !== undefined) {
|
|
55
|
+
stdioConfig.env = config.env;
|
|
56
|
+
}
|
|
57
|
+
return createStdioTransport(stdioConfig);
|
|
58
|
+
}
|
|
59
|
+
if (config.url) {
|
|
60
|
+
const logger = createLogger('TransportFactory');
|
|
61
|
+
const transportOptions = {};
|
|
62
|
+
if (options.authProvider) {
|
|
63
|
+
transportOptions.authProvider = options.authProvider;
|
|
64
|
+
logger.debug('Setting authProvider on transport options');
|
|
65
|
+
logger.debug(` authProvider type: ${options.authProvider.constructor.name}`);
|
|
66
|
+
logger.debug(` authProvider has tokens method: ${typeof options.authProvider.tokens === 'function'}`);
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
69
|
+
logger.debug('No authProvider provided for HTTP transport');
|
|
70
|
+
}
|
|
71
|
+
if (config.headers !== undefined) {
|
|
72
|
+
transportOptions.requestInit = {
|
|
73
|
+
headers: config.headers,
|
|
54
74
|
};
|
|
55
|
-
if (config.args !== undefined) {
|
|
56
|
-
stdioConfig.args = config.args;
|
|
57
|
-
}
|
|
58
|
-
if (config.env !== undefined) {
|
|
59
|
-
stdioConfig.env = config.env;
|
|
60
|
-
}
|
|
61
|
-
return createStdioTransport(stdioConfig);
|
|
62
75
|
}
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
const transportOptions = {};
|
|
69
|
-
if (options.authProvider) {
|
|
70
|
-
transportOptions.authProvider = options.authProvider;
|
|
71
|
-
logger.debug('Setting authProvider on transport options');
|
|
72
|
-
logger.debug(` authProvider type: ${options.authProvider.constructor.name}`);
|
|
73
|
-
logger.debug(` authProvider has tokens method: ${typeof options.authProvider.tokens === 'function'}`);
|
|
74
|
-
}
|
|
75
|
-
else {
|
|
76
|
-
logger.debug('No authProvider provided for HTTP transport');
|
|
77
|
-
}
|
|
78
|
-
if (config.headers !== undefined) {
|
|
79
|
-
transportOptions.requestInit = {
|
|
80
|
-
headers: config.headers,
|
|
81
|
-
};
|
|
82
|
-
}
|
|
83
|
-
if (config.timeoutMs !== undefined) {
|
|
84
|
-
transportOptions.requestInit = {
|
|
85
|
-
...transportOptions.requestInit,
|
|
86
|
-
signal: AbortSignal.timeout(config.timeoutMs),
|
|
87
|
-
};
|
|
88
|
-
}
|
|
89
|
-
return createStreamableHttpTransport(config.url, transportOptions);
|
|
76
|
+
if (config.timeout !== undefined) {
|
|
77
|
+
transportOptions.requestInit = {
|
|
78
|
+
...transportOptions.requestInit,
|
|
79
|
+
signal: AbortSignal.timeout(config.timeout * 1000),
|
|
80
|
+
};
|
|
90
81
|
}
|
|
91
|
-
|
|
92
|
-
throw new ClientError(`Unknown transport type: ${config.type}`);
|
|
82
|
+
return createStreamableHttpTransport(config.url, transportOptions);
|
|
93
83
|
}
|
|
84
|
+
throw new ClientError('Invalid ServerConfig: must have either url or command');
|
|
94
85
|
}
|
|
95
86
|
//# sourceMappingURL=transports.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transports.js","sourceRoot":"","sources":["../../src/core/transports.ts"],"names":[],"mappings":"AAYA,OAAO,EACL,oBAAoB,EAEpB,qBAAqB,GACtB,MAAM,2CAA2C,CAAC;AAEnD,OAAO,EACL,6BAA6B,EAG7B,mBAAmB,GACpB,MAAM,oDAAoD,CAAC;AAO5D,OAAO,EACL,oBAAoB,GAErB,MAAM,2CAA2C,CAAC;AACnD,OAAO,EACL,6BAA6B,GAE9B,MAAM,oDAAoD,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE5D,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAK/C,MAAM,UAAU,oBAAoB,CAAC,MAA6B;IAChE,MAAM,MAAM,GAAG,YAAY,CAAC,gBAAgB,CAAC,CAAC;IAC9C,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IAIzF,MAAM,
|
|
1
|
+
{"version":3,"file":"transports.js","sourceRoot":"","sources":["../../src/core/transports.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-flow.d.ts","sourceRoot":"","sources":["../../../src/lib/auth/oauth-flow.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"oauth-flow.d.ts","sourceRoot":"","sources":["../../../src/lib/auth/oauth-flow.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAgD/C,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,WAAW,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;CAClB;AA+JD,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,eAAe,CAAC,CAuH1B"}
|
|
@@ -5,6 +5,7 @@ import { OAuthProvider } from './oauth-provider.js';
|
|
|
5
5
|
import { normalizeServerUrl } from '../utils.js';
|
|
6
6
|
import { ClientError } from '../errors.js';
|
|
7
7
|
import { createLogger } from '../logger.js';
|
|
8
|
+
import { removeKeychainOAuthClientInfo } from './keychain.js';
|
|
8
9
|
const logger = createLogger('oauth-flow');
|
|
9
10
|
const ESCAPE_KEY = '\x1b';
|
|
10
11
|
function waitForEscapeKey() {
|
|
@@ -166,6 +167,8 @@ export async function performOAuthFlow(serverUrl, profileName, scope) {
|
|
|
166
167
|
const port = await findAvailablePort(8000);
|
|
167
168
|
const redirectUrl = `http://localhost:${port}/callback`;
|
|
168
169
|
logger.debug(`Using redirect URL: ${redirectUrl}`);
|
|
170
|
+
logger.debug(`Removing existing OAuth client info for ${profileName} @ ${normalizedServerUrl}`);
|
|
171
|
+
await removeKeychainOAuthClientInfo(normalizedServerUrl, profileName);
|
|
169
172
|
const provider = new OAuthProvider({
|
|
170
173
|
serverUrl: normalizedServerUrl,
|
|
171
174
|
profileName,
|