@apify/mcpc 0.1.11-beta.3 → 0.1.11-beta.5
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/CHANGELOG.md +77 -3
- package/README.md +232 -201
- package/dist/bridge/index.js +240 -43
- package/dist/bridge/index.js.map +1 -1
- package/dist/cli/commands/auth.d.ts +2 -0
- package/dist/cli/commands/auth.d.ts.map +1 -1
- package/dist/cli/commands/auth.js +11 -1
- package/dist/cli/commands/auth.js.map +1 -1
- package/dist/cli/commands/logging.d.ts.map +1 -1
- package/dist/cli/commands/logging.js +1 -4
- package/dist/cli/commands/logging.js.map +1 -1
- package/dist/cli/commands/sessions.d.ts +3 -1
- package/dist/cli/commands/sessions.d.ts.map +1 -1
- package/dist/cli/commands/sessions.js +179 -141
- package/dist/cli/commands/sessions.js.map +1 -1
- package/dist/cli/commands/tasks.d.ts +5 -0
- package/dist/cli/commands/tasks.d.ts.map +1 -0
- package/dist/cli/commands/tasks.js +53 -0
- package/dist/cli/commands/tasks.js.map +1 -0
- package/dist/cli/commands/tools.d.ts +2 -0
- package/dist/cli/commands/tools.d.ts.map +1 -1
- package/dist/cli/commands/tools.js +158 -12
- package/dist/cli/commands/tools.js.map +1 -1
- package/dist/cli/commands/x402.d.ts.map +1 -1
- package/dist/cli/commands/x402.js +20 -6
- package/dist/cli/commands/x402.js.map +1 -1
- package/dist/cli/helpers.d.ts +2 -6
- package/dist/cli/helpers.d.ts.map +1 -1
- package/dist/cli/helpers.js +27 -185
- package/dist/cli/helpers.js.map +1 -1
- package/dist/cli/index.js +437 -204
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/output.d.ts +7 -3
- package/dist/cli/output.d.ts.map +1 -1
- package/dist/cli/output.js +135 -16
- package/dist/cli/output.js.map +1 -1
- package/dist/cli/parser.d.ts +11 -8
- package/dist/cli/parser.d.ts.map +1 -1
- package/dist/cli/parser.js +89 -65
- package/dist/cli/parser.js.map +1 -1
- package/dist/cli/shell.d.ts.map +1 -1
- package/dist/cli/shell.js +30 -3
- package/dist/cli/shell.js.map +1 -1
- package/dist/core/mcp-client.d.ts +17 -3
- package/dist/core/mcp-client.d.ts.map +1 -1
- package/dist/core/mcp-client.js +236 -3
- package/dist/core/mcp-client.js.map +1 -1
- package/dist/core/transports.d.ts.map +1 -1
- package/dist/core/transports.js +3 -0
- package/dist/core/transports.js.map +1 -1
- package/dist/lib/auth/keychain.d.ts.map +1 -1
- package/dist/lib/auth/keychain.js +51 -19
- package/dist/lib/auth/keychain.js.map +1 -1
- package/dist/lib/auth/oauth-flow.d.ts +4 -1
- package/dist/lib/auth/oauth-flow.d.ts.map +1 -1
- package/dist/lib/auth/oauth-flow.js +108 -16
- package/dist/lib/auth/oauth-flow.js.map +1 -1
- package/dist/lib/auth/oauth-provider.d.ts +5 -0
- package/dist/lib/auth/oauth-provider.d.ts.map +1 -1
- package/dist/lib/auth/oauth-provider.js +16 -1
- package/dist/lib/auth/oauth-provider.js.map +1 -1
- package/dist/lib/auth/oauth-utils.d.ts.map +1 -1
- package/dist/lib/auth/oauth-utils.js +3 -2
- package/dist/lib/auth/oauth-utils.js.map +1 -1
- package/dist/lib/bridge-client.d.ts +1 -1
- package/dist/lib/bridge-client.d.ts.map +1 -1
- package/dist/lib/bridge-client.js +18 -4
- package/dist/lib/bridge-client.js.map +1 -1
- package/dist/lib/bridge-manager.d.ts +1 -0
- package/dist/lib/bridge-manager.d.ts.map +1 -1
- package/dist/lib/bridge-manager.js +39 -17
- package/dist/lib/bridge-manager.js.map +1 -1
- package/dist/lib/errors.js +2 -2
- package/dist/lib/errors.js.map +1 -1
- package/dist/lib/file-lock.d.ts.map +1 -1
- package/dist/lib/file-lock.js +4 -2
- package/dist/lib/file-lock.js.map +1 -1
- package/dist/lib/proxy.d.ts +6 -0
- package/dist/lib/proxy.d.ts.map +1 -0
- package/dist/lib/proxy.js +13 -0
- package/dist/lib/proxy.js.map +1 -0
- package/dist/lib/session-client.d.ts +16 -3
- package/dist/lib/session-client.d.ts.map +1 -1
- package/dist/lib/session-client.js +121 -15
- package/dist/lib/session-client.js.map +1 -1
- package/dist/lib/sessions.d.ts.map +1 -1
- package/dist/lib/sessions.js +9 -4
- package/dist/lib/sessions.js.map +1 -1
- package/dist/lib/types.d.ts +37 -6
- package/dist/lib/types.d.ts.map +1 -1
- package/dist/lib/types.js +2 -0
- package/dist/lib/types.js.map +1 -1
- package/dist/lib/utils.d.ts +0 -2
- package/dist/lib/utils.d.ts.map +1 -1
- package/dist/lib/utils.js +1 -19
- package/dist/lib/utils.js.map +1 -1
- package/dist/lib/x402/fetch-middleware.d.ts.map +1 -1
- package/dist/lib/x402/fetch-middleware.js +41 -8
- package/dist/lib/x402/fetch-middleware.js.map +1 -1
- package/docs/TODOs.md +87 -35
- package/package.json +2 -2
- package/renovate.json +2 -1
package/dist/core/mcp-client.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Client as SDKClient } from '@modelcontextprotocol/sdk/client/index.js';
|
|
2
|
+
import { CallToolResultSchema } from '@modelcontextprotocol/sdk/types.js';
|
|
2
3
|
import { createNoOpLogger } from '../lib/logger.js';
|
|
3
4
|
import { ServerError, NetworkError, isShutdownError } from '../lib/errors.js';
|
|
4
5
|
function getRootCauseMessage(error) {
|
|
@@ -8,6 +9,18 @@ function getRootCauseMessage(error) {
|
|
|
8
9
|
}
|
|
9
10
|
return current.message;
|
|
10
11
|
}
|
|
12
|
+
function taskToUpdate(task) {
|
|
13
|
+
const update = {
|
|
14
|
+
taskId: task.taskId,
|
|
15
|
+
status: task.status,
|
|
16
|
+
createdAt: task.createdAt,
|
|
17
|
+
lastUpdatedAt: task.lastUpdatedAt,
|
|
18
|
+
};
|
|
19
|
+
if (task.statusMessage) {
|
|
20
|
+
update.statusMessage = task.statusMessage;
|
|
21
|
+
}
|
|
22
|
+
return update;
|
|
23
|
+
}
|
|
11
24
|
export class McpClient {
|
|
12
25
|
client;
|
|
13
26
|
logger;
|
|
@@ -16,6 +29,7 @@ export class McpClient {
|
|
|
16
29
|
transport;
|
|
17
30
|
hasConnected = false;
|
|
18
31
|
requestTimeout;
|
|
32
|
+
cachedTools = null;
|
|
19
33
|
constructor(clientInfo, options = {}) {
|
|
20
34
|
this.logger = options.logger || createNoOpLogger();
|
|
21
35
|
if (options.requestTimeout !== undefined) {
|
|
@@ -33,6 +47,9 @@ export class McpClient {
|
|
|
33
47
|
this.logger.log(this.hasConnected ? 'error' : 'debug', 'Client error:', error);
|
|
34
48
|
};
|
|
35
49
|
}
|
|
50
|
+
setRequestTimeout(timeoutMs) {
|
|
51
|
+
this.requestTimeout = timeoutMs;
|
|
52
|
+
}
|
|
36
53
|
getRequestOptions() {
|
|
37
54
|
return this.requestTimeout ? { timeout: this.requestTimeout } : undefined;
|
|
38
55
|
}
|
|
@@ -143,13 +160,37 @@ export class McpClient {
|
|
|
143
160
|
});
|
|
144
161
|
}
|
|
145
162
|
}
|
|
146
|
-
async
|
|
163
|
+
async listAllTools(options) {
|
|
164
|
+
if (!options?.refreshCache && this.cachedTools) {
|
|
165
|
+
return { tools: this.cachedTools };
|
|
166
|
+
}
|
|
167
|
+
const allTools = [];
|
|
168
|
+
let cursor = undefined;
|
|
169
|
+
do {
|
|
170
|
+
const result = await this.listTools(cursor);
|
|
171
|
+
allTools.push(...result.tools);
|
|
172
|
+
cursor = result.nextCursor;
|
|
173
|
+
} while (cursor);
|
|
174
|
+
this.cachedTools = allTools;
|
|
175
|
+
return { tools: allTools };
|
|
176
|
+
}
|
|
177
|
+
getCachedTools() {
|
|
178
|
+
return this.cachedTools;
|
|
179
|
+
}
|
|
180
|
+
invalidateToolsCache() {
|
|
181
|
+
this.cachedTools = null;
|
|
182
|
+
}
|
|
183
|
+
async callTool(name, args, meta) {
|
|
147
184
|
try {
|
|
148
185
|
this.logger.debug(`Calling tool: ${name}`, args);
|
|
149
|
-
const
|
|
186
|
+
const callParams = {
|
|
150
187
|
name,
|
|
151
188
|
arguments: args || {},
|
|
152
|
-
}
|
|
189
|
+
};
|
|
190
|
+
if (meta) {
|
|
191
|
+
callParams._meta = meta;
|
|
192
|
+
}
|
|
193
|
+
const result = (await this.client.callTool(callParams, undefined, this.getRequestOptions()));
|
|
153
194
|
this.logger.debug(`Tool ${name} completed`);
|
|
154
195
|
return result;
|
|
155
196
|
}
|
|
@@ -270,6 +311,198 @@ export class McpClient {
|
|
|
270
311
|
});
|
|
271
312
|
}
|
|
272
313
|
}
|
|
314
|
+
supportsTasksForToolCall() {
|
|
315
|
+
const capabilities = this.client.getServerCapabilities();
|
|
316
|
+
return !!capabilities?.tasks?.requests?.tools?.call;
|
|
317
|
+
}
|
|
318
|
+
async callToolWithTask(name, args, onUpdate, meta) {
|
|
319
|
+
try {
|
|
320
|
+
this.logger.debug(`Calling tool with task: ${name}`, args);
|
|
321
|
+
let currentTaskId;
|
|
322
|
+
let currentStatus = 'working';
|
|
323
|
+
const onprogress = onUpdate
|
|
324
|
+
? (progress) => {
|
|
325
|
+
if (!currentTaskId)
|
|
326
|
+
return;
|
|
327
|
+
this.logger.debug(`Task ${currentTaskId} progress: ${progress.progress}/${progress.total ?? '?'}${progress.message ? ` - ${progress.message}` : ''}`);
|
|
328
|
+
const update = {
|
|
329
|
+
taskId: currentTaskId,
|
|
330
|
+
status: currentStatus,
|
|
331
|
+
};
|
|
332
|
+
if (progress.message) {
|
|
333
|
+
update.progressMessage = progress.message;
|
|
334
|
+
}
|
|
335
|
+
update.progress = progress.progress;
|
|
336
|
+
if (progress.total !== undefined) {
|
|
337
|
+
update.progressTotal = progress.total;
|
|
338
|
+
}
|
|
339
|
+
onUpdate(update);
|
|
340
|
+
}
|
|
341
|
+
: undefined;
|
|
342
|
+
const requestOptions = { ...this.getRequestOptions(), task: {} };
|
|
343
|
+
if (onprogress) {
|
|
344
|
+
requestOptions.onprogress = onprogress;
|
|
345
|
+
}
|
|
346
|
+
const callParams = {
|
|
347
|
+
name,
|
|
348
|
+
arguments: args || {},
|
|
349
|
+
};
|
|
350
|
+
if (meta) {
|
|
351
|
+
callParams._meta = meta;
|
|
352
|
+
}
|
|
353
|
+
const stream = this.client.experimental.tasks.callToolStream(callParams, CallToolResultSchema, requestOptions);
|
|
354
|
+
let result;
|
|
355
|
+
for await (const message of stream) {
|
|
356
|
+
switch (message.type) {
|
|
357
|
+
case 'taskCreated':
|
|
358
|
+
this.logger.debug(`Task created: ${message.task.taskId}`);
|
|
359
|
+
currentTaskId = message.task.taskId;
|
|
360
|
+
currentStatus = message.task.status;
|
|
361
|
+
onUpdate?.(taskToUpdate(message.task));
|
|
362
|
+
break;
|
|
363
|
+
case 'taskStatus':
|
|
364
|
+
this.logger.debug(`Task ${message.task.taskId} status: ${message.task.status}`);
|
|
365
|
+
currentTaskId = message.task.taskId;
|
|
366
|
+
currentStatus = message.task.status;
|
|
367
|
+
onUpdate?.(taskToUpdate(message.task));
|
|
368
|
+
break;
|
|
369
|
+
case 'result':
|
|
370
|
+
this.logger.debug(`Task completed with result for tool ${name}`);
|
|
371
|
+
result = message.result;
|
|
372
|
+
break;
|
|
373
|
+
case 'error':
|
|
374
|
+
this.logger.error(`Task error for tool ${name}:`, message.error);
|
|
375
|
+
throw new ServerError(`Tool ${name} task failed: ${message.error.message}`, {
|
|
376
|
+
originalError: message.error,
|
|
377
|
+
});
|
|
378
|
+
}
|
|
379
|
+
}
|
|
380
|
+
if (!result) {
|
|
381
|
+
throw new ServerError(`Tool ${name} task completed without a result`);
|
|
382
|
+
}
|
|
383
|
+
return result;
|
|
384
|
+
}
|
|
385
|
+
catch (error) {
|
|
386
|
+
if (error instanceof ServerError)
|
|
387
|
+
throw error;
|
|
388
|
+
this.logger.error(`Failed to call tool ${name} with task:`, error);
|
|
389
|
+
throw new ServerError(`Failed to call tool ${name} with task: ${error.message}`, {
|
|
390
|
+
originalError: error,
|
|
391
|
+
});
|
|
392
|
+
}
|
|
393
|
+
}
|
|
394
|
+
async callToolDetached(name, args, meta) {
|
|
395
|
+
try {
|
|
396
|
+
this.logger.debug(`Calling tool detached: ${name}`, args);
|
|
397
|
+
const callParams = {
|
|
398
|
+
name,
|
|
399
|
+
arguments: args || {},
|
|
400
|
+
};
|
|
401
|
+
if (meta) {
|
|
402
|
+
callParams._meta = meta;
|
|
403
|
+
}
|
|
404
|
+
const stream = this.client.experimental.tasks.callToolStream(callParams, CallToolResultSchema, { ...this.getRequestOptions(), task: {} });
|
|
405
|
+
for await (const message of stream) {
|
|
406
|
+
if (message.type === 'taskCreated') {
|
|
407
|
+
this.logger.debug(`Task created (detached): ${message.task.taskId}`);
|
|
408
|
+
const update = taskToUpdate(message.task);
|
|
409
|
+
return update;
|
|
410
|
+
}
|
|
411
|
+
if (message.type === 'error') {
|
|
412
|
+
throw new ServerError(`Tool ${name} task failed: ${message.error.message}`, {
|
|
413
|
+
originalError: message.error,
|
|
414
|
+
});
|
|
415
|
+
}
|
|
416
|
+
}
|
|
417
|
+
throw new ServerError(`Tool ${name} task stream ended without creating a task`);
|
|
418
|
+
}
|
|
419
|
+
catch (error) {
|
|
420
|
+
if (error instanceof ServerError)
|
|
421
|
+
throw error;
|
|
422
|
+
this.logger.error(`Failed to call tool ${name} detached:`, error);
|
|
423
|
+
throw new ServerError(`Failed to call tool ${name} detached: ${error.message}`, {
|
|
424
|
+
originalError: error,
|
|
425
|
+
});
|
|
426
|
+
}
|
|
427
|
+
}
|
|
428
|
+
async pollTask(taskId, onUpdate) {
|
|
429
|
+
const POLL_INTERVAL_MS = 2000;
|
|
430
|
+
try {
|
|
431
|
+
this.logger.debug(`Polling task: ${taskId}`);
|
|
432
|
+
while (true) {
|
|
433
|
+
const task = await this.getTask(taskId);
|
|
434
|
+
const update = {
|
|
435
|
+
taskId: task.taskId,
|
|
436
|
+
status: task.status,
|
|
437
|
+
...(task.statusMessage != null ? { statusMessage: task.statusMessage } : {}),
|
|
438
|
+
createdAt: task.createdAt,
|
|
439
|
+
lastUpdatedAt: task.lastUpdatedAt,
|
|
440
|
+
};
|
|
441
|
+
onUpdate?.(update);
|
|
442
|
+
if (task.status === 'completed' ||
|
|
443
|
+
task.status === 'failed' ||
|
|
444
|
+
task.status === 'cancelled') {
|
|
445
|
+
if (task.status === 'completed') {
|
|
446
|
+
return {
|
|
447
|
+
content: [{ type: 'text', text: task.statusMessage || 'Task completed' }],
|
|
448
|
+
};
|
|
449
|
+
}
|
|
450
|
+
throw new ServerError(`Task ${taskId} ${task.status}: ${task.statusMessage || 'no details'}`);
|
|
451
|
+
}
|
|
452
|
+
await new Promise((resolve) => setTimeout(resolve, POLL_INTERVAL_MS));
|
|
453
|
+
}
|
|
454
|
+
}
|
|
455
|
+
catch (error) {
|
|
456
|
+
if (error instanceof ServerError)
|
|
457
|
+
throw error;
|
|
458
|
+
this.logger.error(`Failed to poll task ${taskId}:`, error);
|
|
459
|
+
throw new ServerError(`Failed to poll task ${taskId}: ${error.message}`, {
|
|
460
|
+
originalError: error,
|
|
461
|
+
});
|
|
462
|
+
}
|
|
463
|
+
}
|
|
464
|
+
async listTasks(cursor) {
|
|
465
|
+
try {
|
|
466
|
+
this.logger.debug('Listing tasks...', cursor ? { cursor } : {});
|
|
467
|
+
const result = await this.client.experimental.tasks.listTasks(cursor, this.getRequestOptions());
|
|
468
|
+
this.logger.debug(`Found ${result.tasks.length} tasks`);
|
|
469
|
+
return result;
|
|
470
|
+
}
|
|
471
|
+
catch (error) {
|
|
472
|
+
this.logger.error('Failed to list tasks:', error);
|
|
473
|
+
throw new ServerError(`Failed to list tasks: ${error.message}`, {
|
|
474
|
+
originalError: error,
|
|
475
|
+
});
|
|
476
|
+
}
|
|
477
|
+
}
|
|
478
|
+
async getTask(taskId) {
|
|
479
|
+
try {
|
|
480
|
+
this.logger.debug(`Getting task: ${taskId}`);
|
|
481
|
+
const result = await this.client.experimental.tasks.getTask(taskId, this.getRequestOptions());
|
|
482
|
+
this.logger.debug(`Task ${taskId} status: ${result.status}`);
|
|
483
|
+
return result;
|
|
484
|
+
}
|
|
485
|
+
catch (error) {
|
|
486
|
+
this.logger.error(`Failed to get task ${taskId}:`, error);
|
|
487
|
+
throw new ServerError(`Failed to get task ${taskId}: ${error.message}`, {
|
|
488
|
+
originalError: error,
|
|
489
|
+
});
|
|
490
|
+
}
|
|
491
|
+
}
|
|
492
|
+
async cancelTask(taskId) {
|
|
493
|
+
try {
|
|
494
|
+
this.logger.debug(`Cancelling task: ${taskId}`);
|
|
495
|
+
const result = await this.client.experimental.tasks.cancelTask(taskId, this.getRequestOptions());
|
|
496
|
+
this.logger.debug(`Task ${taskId} cancelled`);
|
|
497
|
+
return result;
|
|
498
|
+
}
|
|
499
|
+
catch (error) {
|
|
500
|
+
this.logger.error(`Failed to cancel task ${taskId}:`, error);
|
|
501
|
+
throw new ServerError(`Failed to cancel task ${taskId}: ${error.message}`, {
|
|
502
|
+
originalError: error,
|
|
503
|
+
});
|
|
504
|
+
}
|
|
505
|
+
}
|
|
273
506
|
getSDKClient() {
|
|
274
507
|
return this.client;
|
|
275
508
|
}
|
|
@@ -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":"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"}
|
|
@@ -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,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAC1F,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;
|
|
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,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAC1F,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;AAOpD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,qBAAqB,GAAG,SAAS,CAY7E;AAKD,wBAAgB,6BAA6B,CAC3C,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,oCAAyC,GACjD,SAAS,CA+CX;AAKD,MAAM,WAAW,sBAAsB;IAIrC,YAAY,CAAC,EAAE,mBAAmB,CAAC;IAMnC,YAAY,CAAC,EAAE,MAAM,CAAC;IAMtB,WAAW,CAAC,EAAE,SAAS,CAAC;CACzB;AAKD,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,YAAY,EACpB,OAAO,GAAE,sBAA2B,GACnC,SAAS,CA+DX"}
|
package/dist/core/transports.js
CHANGED
|
@@ -4,6 +4,7 @@ import { StdioClientTransport, } from '@modelcontextprotocol/sdk/client/stdio.js
|
|
|
4
4
|
import { StreamableHTTPClientTransport, } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
|
|
5
5
|
import { createLogger, getVerbose } from '../lib/logger.js';
|
|
6
6
|
import { ClientError } from '../lib/errors.js';
|
|
7
|
+
import { proxyFetch } from '../lib/proxy.js';
|
|
7
8
|
export function createStdioTransport(config) {
|
|
8
9
|
const logger = createLogger('StdioTransport');
|
|
9
10
|
logger.debug('Creating stdio transport', { command: config.command, args: config.args });
|
|
@@ -26,9 +27,11 @@ export function createStreamableHttpTransport(url, options = {}) {
|
|
|
26
27
|
reconnectionDelayGrowFactor: 2,
|
|
27
28
|
maxRetries: 10,
|
|
28
29
|
};
|
|
30
|
+
const fetchFn = options.fetch ?? proxyFetch;
|
|
29
31
|
const transport = new StreamableHTTPClientTransport(new URL(url), {
|
|
30
32
|
reconnectionOptions: defaultReconnectionOptions,
|
|
31
33
|
...options,
|
|
34
|
+
fetch: fetchFn,
|
|
32
35
|
});
|
|
33
36
|
const hasAuthProvider = !!transport._authProvider;
|
|
34
37
|
logger.debug('Transport created, authProvider attached:', hasAuthProvider);
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"transports.js","sourceRoot":"","sources":["../../src/core/transports.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keychain.d.ts","sourceRoot":"","sources":["../../../src/lib/auth/keychain.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"keychain.d.ts","sourceRoot":"","sources":["../../../src/lib/auth/keychain.ts"],"names":[],"mappings":"AA+KA,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAsBD,wBAAsB,4BAA4B,CAChD,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,eAAe,GACtB,OAAO,CAAC,IAAI,CAAC,CAGf;AAGD,wBAAsB,2BAA2B,CAC/C,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CAMtC;AAGD,wBAAsB,6BAA6B,CACjD,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,OAAO,CAAC,CAGlB;AAGD,wBAAsB,2BAA2B,CAC/C,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,IAAI,CAAC,CAGf;AAGD,wBAAsB,0BAA0B,CAC9C,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAMrC;AAGD,wBAAsB,4BAA4B,CAChD,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,OAAO,CAAC,CAGlB;AAGD,wBAAsB,2BAA2B,CAC/C,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9B,OAAO,CAAC,IAAI,CAAC,CAGf;AAGD,wBAAsB,0BAA0B,CAC9C,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC,CAM7C;AAGD,wBAAsB,4BAA4B,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAGxF;AAGD,wBAAsB,6BAA6B,CACjD,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC,CAGf;AAGD,wBAAsB,4BAA4B,CAChD,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAG7B;AAGD,wBAAsB,8BAA8B,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAG1F"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Entry } from '@napi-rs/keyring';
|
|
2
1
|
import { readFile, writeFile } from 'fs/promises';
|
|
3
2
|
import { join } from 'path';
|
|
3
|
+
import chalk from 'chalk';
|
|
4
4
|
import { createLogger, getJsonMode } from '../logger.js';
|
|
5
5
|
import { getServerHost, getMcpcHome } from '../utils.js';
|
|
6
6
|
import { withFileLock } from '../file-lock.js';
|
|
@@ -35,34 +35,66 @@ async function fileDelete(account) {
|
|
|
35
35
|
});
|
|
36
36
|
}
|
|
37
37
|
let keychainAvailable = null;
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
38
|
+
let _entryPromise = null;
|
|
39
|
+
function getEntry() {
|
|
40
|
+
if (_entryPromise === null) {
|
|
41
|
+
_entryPromise = import('@napi-rs/keyring').then((m) => m.Entry);
|
|
42
|
+
}
|
|
43
|
+
return _entryPromise;
|
|
44
|
+
}
|
|
45
|
+
async function probeKeychain(EntryClass) {
|
|
46
|
+
const probeAccount = `__mcpc_probe_${Date.now()}_${Math.random().toString(36).slice(2)}__`;
|
|
41
47
|
try {
|
|
42
|
-
const
|
|
43
|
-
|
|
44
|
-
|
|
48
|
+
const entry = new EntryClass(SERVICE_NAME, probeAccount);
|
|
49
|
+
const probeValue = `probe-${Date.now()}`;
|
|
50
|
+
entry.setPassword(probeValue);
|
|
51
|
+
const readBack = entry.getPassword();
|
|
52
|
+
entry.deletePassword();
|
|
53
|
+
return readBack === probeValue;
|
|
45
54
|
}
|
|
46
|
-
catch
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
return
|
|
55
|
+
catch {
|
|
56
|
+
return false;
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
let _probePromise = null;
|
|
60
|
+
async function ensureProbed() {
|
|
61
|
+
if (keychainAvailable !== null)
|
|
62
|
+
return;
|
|
63
|
+
if (_probePromise === null) {
|
|
64
|
+
_probePromise = (async () => {
|
|
65
|
+
try {
|
|
66
|
+
const EntryClass = await getEntry();
|
|
67
|
+
keychainAvailable = await probeKeychain(EntryClass);
|
|
68
|
+
}
|
|
69
|
+
catch {
|
|
70
|
+
keychainAvailable = false;
|
|
71
|
+
}
|
|
72
|
+
if (!keychainAvailable && !getJsonMode()) {
|
|
73
|
+
logger.warn(chalk.red(`OS keychain unavailable, ` +
|
|
74
|
+
`falling back to file-based credential storage (${credentialsPath()}). ` +
|
|
75
|
+
`Install a keyring daemon (e.g. gnome-keyring or kwallet) for better security.`));
|
|
76
|
+
}
|
|
77
|
+
})();
|
|
54
78
|
}
|
|
79
|
+
return _probePromise;
|
|
80
|
+
}
|
|
81
|
+
async function withKeychain(keychainOp, fallback) {
|
|
82
|
+
await ensureProbed();
|
|
83
|
+
if (keychainAvailable === false)
|
|
84
|
+
return fallback();
|
|
85
|
+
const EntryClass = await getEntry();
|
|
86
|
+
return keychainOp(EntryClass);
|
|
55
87
|
}
|
|
56
88
|
function keychainSet(account, value) {
|
|
57
|
-
return withKeychain(() => {
|
|
58
|
-
new
|
|
89
|
+
return withKeychain((EntryClass) => {
|
|
90
|
+
new EntryClass(SERVICE_NAME, account).setPassword(value);
|
|
59
91
|
}, () => fileSet(account, value));
|
|
60
92
|
}
|
|
61
93
|
function keychainGet(account) {
|
|
62
|
-
return withKeychain(() => new
|
|
94
|
+
return withKeychain((EntryClass) => new EntryClass(SERVICE_NAME, account).getPassword() ?? null, () => fileGet(account));
|
|
63
95
|
}
|
|
64
96
|
function keychainDelete(account) {
|
|
65
|
-
return withKeychain(() => new
|
|
97
|
+
return withKeychain((EntryClass) => new EntryClass(SERVICE_NAME, account).deletePassword(), () => fileDelete(account));
|
|
66
98
|
}
|
|
67
99
|
async function keychainGetParsed(account, label) {
|
|
68
100
|
const raw = await keychainGet(account);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keychain.js","sourceRoot":"","sources":["../../../src/lib/auth/keychain.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"keychain.js","sourceRoot":"","sources":["../../../src/lib/auth/keychain.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,5 +3,8 @@ export interface OAuthFlowResult {
|
|
|
3
3
|
profile: AuthProfile;
|
|
4
4
|
success: boolean;
|
|
5
5
|
}
|
|
6
|
-
export declare function performOAuthFlow(serverUrl: string, profileName: string, scope?: string
|
|
6
|
+
export declare function performOAuthFlow(serverUrl: string, profileName: string, scope?: string, clientCredentials?: {
|
|
7
|
+
clientId?: string;
|
|
8
|
+
clientSecret?: string;
|
|
9
|
+
}): Promise<OAuthFlowResult>;
|
|
7
10
|
//# sourceMappingURL=oauth-flow.d.ts.map
|
|
@@ -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":"AAgBA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAwG/C,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,WAAW,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;CAClB;AAyPD,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,MAAM,EACd,iBAAiB,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,GAC/D,OAAO,CAAC,eAAe,CAAC,CAgL1B"}
|