@himanshusinghs/mongodb-mcp-server 1.5.1-prerelease.3 → 1.5.1-prerelease.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/dist/cjs/common/session.d.ts +6 -3
- package/dist/cjs/common/session.d.ts.map +1 -1
- package/dist/cjs/common/session.js +2 -12
- package/dist/cjs/common/session.js.map +1 -1
- package/dist/cjs/server.d.ts +1 -5
- package/dist/cjs/server.d.ts.map +1 -1
- package/dist/cjs/server.js +1 -2
- package/dist/cjs/server.js.map +1 -1
- package/dist/cjs/tools/mongodb/mongodbTool.js +2 -2
- package/dist/cjs/tools/mongodb/mongodbTool.js.map +1 -1
- package/dist/cjs/tools/tool.d.ts +9 -2
- package/dist/cjs/tools/tool.d.ts.map +1 -1
- package/dist/cjs/tools/tool.js +2 -2
- package/dist/cjs/tools/tool.js.map +1 -1
- package/dist/cjs/transports/base.d.ts +5 -15
- package/dist/cjs/transports/base.d.ts.map +1 -1
- package/dist/cjs/transports/base.js +28 -39
- package/dist/cjs/transports/base.js.map +1 -1
- package/dist/cjs/transports/dryModeRunner.js +1 -1
- package/dist/cjs/transports/dryModeRunner.js.map +1 -1
- package/dist/cjs/transports/interfaces/common.d.ts +80 -0
- package/dist/cjs/transports/interfaces/common.d.ts.map +1 -0
- package/dist/cjs/transports/interfaces/common.js +3 -0
- package/dist/cjs/transports/interfaces/common.js.map +1 -0
- package/dist/cjs/transports/interfaces/index.d.ts +4 -0
- package/dist/cjs/transports/interfaces/index.d.ts.map +1 -0
- package/dist/cjs/transports/interfaces/index.js +3 -0
- package/dist/cjs/transports/interfaces/index.js.map +1 -0
- package/dist/cjs/transports/interfaces/legacy.d.ts +100 -0
- package/dist/cjs/transports/interfaces/legacy.d.ts.map +1 -0
- package/dist/cjs/transports/interfaces/legacy.js +3 -0
- package/dist/cjs/transports/interfaces/legacy.js.map +1 -0
- package/dist/cjs/transports/interfaces/v1.d.ts +6 -0
- package/dist/cjs/transports/interfaces/v1.d.ts.map +1 -0
- package/dist/cjs/transports/interfaces/v1.js +3 -0
- package/dist/cjs/transports/interfaces/v1.js.map +1 -0
- package/dist/cjs/transports/runnerConfigs/commonConfig.d.ts +85 -0
- package/dist/cjs/transports/runnerConfigs/commonConfig.d.ts.map +1 -0
- package/dist/cjs/transports/runnerConfigs/commonConfig.js +3 -0
- package/dist/cjs/transports/runnerConfigs/commonConfig.js.map +1 -0
- package/dist/cjs/transports/runnerConfigs/index.d.ts +6 -0
- package/dist/cjs/transports/runnerConfigs/index.d.ts.map +1 -0
- package/dist/cjs/transports/runnerConfigs/index.js +3 -0
- package/dist/cjs/transports/runnerConfigs/index.js.map +1 -0
- package/dist/cjs/transports/runnerConfigs/legacy.d.ts +100 -0
- package/dist/cjs/transports/runnerConfigs/legacy.d.ts.map +1 -0
- package/dist/cjs/transports/runnerConfigs/legacy.js +3 -0
- package/dist/cjs/transports/runnerConfigs/legacy.js.map +1 -0
- package/dist/cjs/transports/runnerConfigs/v1.d.ts +22 -0
- package/dist/cjs/transports/runnerConfigs/v1.d.ts.map +1 -0
- package/dist/cjs/transports/runnerConfigs/v1.js +3 -0
- package/dist/cjs/transports/runnerConfigs/v1.js.map +1 -0
- package/dist/cjs/transports/streamableHttp.d.ts.map +1 -1
- package/dist/cjs/transports/streamableHttp.js +20 -9
- package/dist/cjs/transports/streamableHttp.js.map +1 -1
- package/dist/esm/common/session.d.ts +6 -3
- package/dist/esm/common/session.d.ts.map +1 -1
- package/dist/esm/common/session.js +2 -12
- package/dist/esm/common/session.js.map +1 -1
- package/dist/esm/server.d.ts +1 -5
- package/dist/esm/server.d.ts.map +1 -1
- package/dist/esm/server.js +1 -2
- package/dist/esm/server.js.map +1 -1
- package/dist/esm/tools/mongodb/mongodbTool.js +2 -2
- package/dist/esm/tools/mongodb/mongodbTool.js.map +1 -1
- package/dist/esm/tools/tool.d.ts +9 -2
- package/dist/esm/tools/tool.d.ts.map +1 -1
- package/dist/esm/tools/tool.js +2 -2
- package/dist/esm/tools/tool.js.map +1 -1
- package/dist/esm/transports/base.d.ts +5 -15
- package/dist/esm/transports/base.d.ts.map +1 -1
- package/dist/esm/transports/base.js +28 -39
- package/dist/esm/transports/base.js.map +1 -1
- package/dist/esm/transports/dryModeRunner.js +1 -1
- package/dist/esm/transports/dryModeRunner.js.map +1 -1
- package/dist/esm/transports/interfaces/common.d.ts +80 -0
- package/dist/esm/transports/interfaces/common.d.ts.map +1 -0
- package/dist/esm/transports/interfaces/common.js +2 -0
- package/dist/esm/transports/interfaces/common.js.map +1 -0
- package/dist/esm/transports/interfaces/index.d.ts +4 -0
- package/dist/esm/transports/interfaces/index.d.ts.map +1 -0
- package/dist/esm/transports/interfaces/index.js +2 -0
- package/dist/esm/transports/interfaces/index.js.map +1 -0
- package/dist/esm/transports/interfaces/legacy.d.ts +100 -0
- package/dist/esm/transports/interfaces/legacy.d.ts.map +1 -0
- package/dist/esm/transports/interfaces/legacy.js +2 -0
- package/dist/esm/transports/interfaces/legacy.js.map +1 -0
- package/dist/esm/transports/interfaces/v1.d.ts +6 -0
- package/dist/esm/transports/interfaces/v1.d.ts.map +1 -0
- package/dist/esm/transports/interfaces/v1.js +2 -0
- package/dist/esm/transports/interfaces/v1.js.map +1 -0
- package/dist/esm/transports/runnerConfigs/commonConfig.d.ts +85 -0
- package/dist/esm/transports/runnerConfigs/commonConfig.d.ts.map +1 -0
- package/dist/esm/transports/runnerConfigs/commonConfig.js +2 -0
- package/dist/esm/transports/runnerConfigs/commonConfig.js.map +1 -0
- package/dist/esm/transports/runnerConfigs/index.d.ts +6 -0
- package/dist/esm/transports/runnerConfigs/index.d.ts.map +1 -0
- package/dist/esm/transports/runnerConfigs/index.js +2 -0
- package/dist/esm/transports/runnerConfigs/index.js.map +1 -0
- package/dist/esm/transports/runnerConfigs/legacy.d.ts +100 -0
- package/dist/esm/transports/runnerConfigs/legacy.d.ts.map +1 -0
- package/dist/esm/transports/runnerConfigs/legacy.js +2 -0
- package/dist/esm/transports/runnerConfigs/legacy.js.map +1 -0
- package/dist/esm/transports/runnerConfigs/v1.d.ts +22 -0
- package/dist/esm/transports/runnerConfigs/v1.d.ts.map +1 -0
- package/dist/esm/transports/runnerConfigs/v1.js +2 -0
- package/dist/esm/transports/runnerConfigs/v1.js.map +1 -0
- package/dist/esm/transports/streamableHttp.d.ts.map +1 -1
- package/dist/esm/transports/streamableHttp.js +20 -9
- package/dist/esm/transports/streamableHttp.js.map +1 -1
- package/package.json +2 -2
|
@@ -10,6 +10,7 @@ import type { Client } from "@mongodb-js/atlas-local";
|
|
|
10
10
|
import type { Keychain } from "./keychain.js";
|
|
11
11
|
import type { VectorSearchEmbeddingsManager } from "./search/vectorSearchEmbeddingsManager.js";
|
|
12
12
|
import { type UserConfig } from "../common/config/userConfig.js";
|
|
13
|
+
import { type ConnectionErrorHandler } from "./connectionErrorHandler.js";
|
|
13
14
|
export interface SessionOptions {
|
|
14
15
|
userConfig: UserConfig;
|
|
15
16
|
logger: CompositeLogger;
|
|
@@ -17,8 +18,9 @@ export interface SessionOptions {
|
|
|
17
18
|
connectionManager: ConnectionManager;
|
|
18
19
|
keychain: Keychain;
|
|
19
20
|
atlasLocalClient?: Client;
|
|
21
|
+
connectionErrorHandler: ConnectionErrorHandler;
|
|
20
22
|
vectorSearchEmbeddingsManager: VectorSearchEmbeddingsManager;
|
|
21
|
-
apiClient
|
|
23
|
+
apiClient: ApiClient;
|
|
22
24
|
}
|
|
23
25
|
export type SessionEvents = {
|
|
24
26
|
connect: [];
|
|
@@ -31,9 +33,10 @@ export declare class Session extends EventEmitter<SessionEvents> {
|
|
|
31
33
|
readonly sessionId: string;
|
|
32
34
|
readonly exportsManager: ExportsManager;
|
|
33
35
|
readonly connectionManager: ConnectionManager;
|
|
34
|
-
readonly apiClient
|
|
36
|
+
readonly apiClient: ApiClient;
|
|
35
37
|
readonly atlasLocalClient?: Client;
|
|
36
38
|
readonly keychain: Keychain;
|
|
39
|
+
readonly connectionErrorHandler: ConnectionErrorHandler;
|
|
37
40
|
readonly vectorSearchEmbeddingsManager: VectorSearchEmbeddingsManager;
|
|
38
41
|
mcpClient?: {
|
|
39
42
|
name?: string;
|
|
@@ -41,7 +44,7 @@ export declare class Session extends EventEmitter<SessionEvents> {
|
|
|
41
44
|
title?: string;
|
|
42
45
|
};
|
|
43
46
|
logger: CompositeLogger;
|
|
44
|
-
constructor({ userConfig, logger, connectionManager, exportsManager, keychain, atlasLocalClient, vectorSearchEmbeddingsManager, apiClient, }: SessionOptions);
|
|
47
|
+
constructor({ userConfig, logger, connectionManager, exportsManager, keychain, atlasLocalClient, connectionErrorHandler, vectorSearchEmbeddingsManager, apiClient, }: SessionOptions);
|
|
45
48
|
setMcpClient(mcpClient: Implementation | undefined): void;
|
|
46
49
|
disconnect(): Promise<void>;
|
|
47
50
|
close(): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/common/session.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/common/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,32 +5,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.Session = void 0;
|
|
7
7
|
const bson_1 = require("bson");
|
|
8
|
-
const apiClient_js_1 = require("./atlas/apiClient.js");
|
|
9
8
|
const logger_js_1 = require("./logger.js");
|
|
10
9
|
const events_1 = __importDefault(require("events"));
|
|
11
10
|
const errors_js_1 = require("./errors.js");
|
|
12
11
|
const arg_parser_1 = require("@mongosh/arg-parser");
|
|
13
12
|
class Session extends events_1.default {
|
|
14
|
-
constructor({ userConfig, logger, connectionManager, exportsManager, keychain, atlasLocalClient, vectorSearchEmbeddingsManager, apiClient, }) {
|
|
13
|
+
constructor({ userConfig, logger, connectionManager, exportsManager, keychain, atlasLocalClient, connectionErrorHandler, vectorSearchEmbeddingsManager, apiClient, }) {
|
|
15
14
|
super();
|
|
16
15
|
this.sessionId = new bson_1.ObjectId().toString();
|
|
17
16
|
this.userConfig = userConfig;
|
|
18
17
|
this.keychain = keychain;
|
|
19
18
|
this.logger = logger;
|
|
20
19
|
this.apiClient = apiClient;
|
|
21
|
-
// Create default API client if not provided in the constructor and Atlas tools are enabled (credentials are provided)
|
|
22
|
-
if (!this.apiClient && userConfig.apiClientId && userConfig.apiClientSecret) {
|
|
23
|
-
this.apiClient = (0, apiClient_js_1.createAtlasApiClient)({
|
|
24
|
-
baseUrl: userConfig.apiBaseUrl,
|
|
25
|
-
credentials: {
|
|
26
|
-
clientId: userConfig.apiClientId,
|
|
27
|
-
clientSecret: userConfig.apiClientSecret,
|
|
28
|
-
},
|
|
29
|
-
}, logger);
|
|
30
|
-
}
|
|
31
20
|
this.atlasLocalClient = atlasLocalClient;
|
|
32
21
|
this.exportsManager = exportsManager;
|
|
33
22
|
this.connectionManager = connectionManager;
|
|
23
|
+
this.connectionErrorHandler = connectionErrorHandler;
|
|
34
24
|
this.vectorSearchEmbeddingsManager = vectorSearchEmbeddingsManager;
|
|
35
25
|
this.connectionManager.events.on("connection-success", () => this.emit("connect"));
|
|
36
26
|
this.connectionManager.events.on("connection-time-out", (error) => this.emit("connection-error", error));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/common/session.ts"],"names":[],"mappings":";;;;;;AAAA,+BAAgC;
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/common/session.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/server.d.ts
CHANGED
|
@@ -5,7 +5,6 @@ import type { LogLevel } from "./common/logger.js";
|
|
|
5
5
|
import type { Telemetry } from "./telemetry/telemetry.js";
|
|
6
6
|
import type { UserConfig } from "./common/config/userConfig.js";
|
|
7
7
|
import type { ToolBase, ToolCategory, ToolClass } from "./tools/tool.js";
|
|
8
|
-
import { type ConnectionErrorHandler } from "./common/connectionErrorHandler.js";
|
|
9
8
|
import type { Elicitation } from "./elicitation.js";
|
|
10
9
|
import type { UIRegistry } from "./ui/registry/index.js";
|
|
11
10
|
export interface ServerOptions {
|
|
@@ -14,7 +13,6 @@ export interface ServerOptions {
|
|
|
14
13
|
mcpServer: McpServer;
|
|
15
14
|
telemetry: Telemetry;
|
|
16
15
|
elicitation: Elicitation;
|
|
17
|
-
connectionErrorHandler: ConnectionErrorHandler;
|
|
18
16
|
uiRegistry?: UIRegistry;
|
|
19
17
|
/**
|
|
20
18
|
* Custom tool constructors to register with the server.
|
|
@@ -41,7 +39,6 @@ export interface ServerOptions {
|
|
|
41
39
|
* mcpServer: myMcpServer,
|
|
42
40
|
* telemetry: myTelemetry,
|
|
43
41
|
* elicitation: myElicitation,
|
|
44
|
-
* connectionErrorHandler: myConnectionErrorHandler,
|
|
45
42
|
* tools: [...AllTools, CustomTool],
|
|
46
43
|
* });
|
|
47
44
|
* ```
|
|
@@ -56,13 +53,12 @@ export declare class Server {
|
|
|
56
53
|
readonly elicitation: Elicitation;
|
|
57
54
|
private readonly toolConstructors;
|
|
58
55
|
readonly tools: ToolBase[];
|
|
59
|
-
readonly connectionErrorHandler: ConnectionErrorHandler;
|
|
60
56
|
readonly uiRegistry?: UIRegistry;
|
|
61
57
|
private _mcpLogLevel;
|
|
62
58
|
get mcpLogLevel(): LogLevel;
|
|
63
59
|
private readonly startTime;
|
|
64
60
|
private readonly subscriptions;
|
|
65
|
-
constructor({ session, mcpServer, userConfig, telemetry,
|
|
61
|
+
constructor({ session, mcpServer, userConfig, telemetry, elicitation, tools, uiRegistry }: ServerOptions);
|
|
66
62
|
connect(transport: Transport): Promise<void>;
|
|
67
63
|
close(): Promise<void>;
|
|
68
64
|
sendResourceListChanged(): void;
|
package/dist/cjs/server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAE/E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAUhE,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGzE,OAAO,
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAE/E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAUhE,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,WAAW,aAAa;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,UAAU,CAAC;IACvB,SAAS,EAAE,SAAS,CAAC;IACrB,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4BG;IACH,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC;CACvB;AAED,qBAAa,MAAM;IACf,SAAgB,OAAO,EAAE,OAAO,CAAC;IACjC,SAAgB,SAAS,EAAE,SAAS,CAAC;IACrC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,SAAgB,UAAU,EAAE,UAAU,CAAC;IACvC,SAAgB,WAAW,EAAE,WAAW,CAAC;IACzC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAc;IAC/C,SAAgB,KAAK,EAAE,QAAQ,EAAE,CAAM;IACvC,SAAgB,UAAU,CAAC,EAAE,UAAU,CAAC;IAExC,OAAO,CAAC,YAAY,CAAqB;IAEzC,IAAW,WAAW,IAAI,QAAQ,CAEjC;IAED,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAqB;gBAEvC,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,aAAa;IAWlG,OAAO,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IA6F5C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAMrB,uBAAuB,IAAI,IAAI;IAI/B,uBAAuB,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO;IAIpD,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAY7C,OAAO,CAAC,wBAAwB;IAgCzB,aAAa,IAAI,IAAI;IAiBrB,iBAAiB,IAAI,IAAI;YAOlB,cAAc;YAoDd,+BAA+B;CAmBhD"}
|
package/dist/cjs/server.js
CHANGED
|
@@ -11,7 +11,7 @@ class Server {
|
|
|
11
11
|
get mcpLogLevel() {
|
|
12
12
|
return this._mcpLogLevel;
|
|
13
13
|
}
|
|
14
|
-
constructor({ session, mcpServer, userConfig, telemetry,
|
|
14
|
+
constructor({ session, mcpServer, userConfig, telemetry, elicitation, tools, uiRegistry }) {
|
|
15
15
|
this.tools = [];
|
|
16
16
|
this._mcpLogLevel = "debug";
|
|
17
17
|
this.subscriptions = new Set();
|
|
@@ -21,7 +21,6 @@ class Server {
|
|
|
21
21
|
this.mcpServer = mcpServer;
|
|
22
22
|
this.userConfig = userConfig;
|
|
23
23
|
this.elicitation = elicitation;
|
|
24
|
-
this.connectionErrorHandler = connectionErrorHandler;
|
|
25
24
|
this.toolConstructors = tools ?? index_js_1.AllTools;
|
|
26
25
|
this.uiRegistry = uiRegistry;
|
|
27
26
|
}
|
package/dist/cjs/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":";;;AAGA,2DAAqD;AAErD,kDAAsD;AAMtD,iEAK4C;AAE5C,yEAA0E;AAC1E,4DAAsD;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,11 +44,11 @@ class MongoDBToolBase extends tool_js_1.ToolBase {
|
|
|
44
44
|
case errors_js_1.ErrorCodes.NotConnectedToMongoDB:
|
|
45
45
|
case errors_js_1.ErrorCodes.MisconfiguredConnectionString: {
|
|
46
46
|
const connectionError = error;
|
|
47
|
-
const outcome = this.
|
|
47
|
+
const outcome = this.session.connectionErrorHandler(connectionError, {
|
|
48
48
|
availableTools: this.server?.tools ?? [],
|
|
49
49
|
connectionState: this.session.connectionManager.currentConnectionState,
|
|
50
50
|
});
|
|
51
|
-
if (outcome
|
|
51
|
+
if (outcome.errorHandled) {
|
|
52
52
|
return outcome.result;
|
|
53
53
|
}
|
|
54
54
|
return super.handleError(error, args);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mongodbTool.js","sourceRoot":"","sources":["../../../../src/tools/mongodb/mongodbTool.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,wCAAsC;AAGtC,sDAAkE;AAClE,sDAA+C;AAIlC,QAAA,eAAe,GAAG;IAC3B,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,eAAe,CAAC;IAC9C,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,iBAAiB,CAAC;CACrD,CAAC;AAEF,MAAsB,eAAgB,SAAQ,kBAAQ;IAIxC,KAAK,CAAC,eAAe;QAC3B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,CAAC;YACrC,IAAI,IAAI,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC;gBACrC,MAAM,IAAI,wBAAY,CAClB,sBAAU,CAAC,qBAAqB,EAChC,2CAA2C,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,WAAW,gCAAgC,CAC5H,CAAC;YACN,CAAC;YAED,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC;gBAC/B,IAAI,CAAC;oBACD,MAAM,IAAI,CAAC,OAAO,CAAC,6BAA6B,EAAE,CAAC;gBACvD,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACb,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;wBACtB,EAAE,EAAE,iBAAK,CAAC,qBAAqB;wBAC/B,OAAO,EAAE,aAAa;wBACtB,OAAO,EAAE,sFAAsF,KAAe,EAAE;qBACnH,CAAC,CAAC;oBACH,MAAM,IAAI,wBAAY,CAAC,sBAAU,CAAC,6BAA6B,EAAE,2BAA2B,CAAC,CAAC;gBAClG,CAAC;YACL,CAAC;QACL,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,CAAC;YACrC,MAAM,IAAI,wBAAY,CAAC,sBAAU,CAAC,qBAAqB,EAAE,0BAA0B,CAAC,CAAC;QACzF,CAAC;QAED,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC;IACxC,CAAC;IAEM,QAAQ,CAAC,MAAc;QAC1B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,OAAO,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC;IAES,WAAW,CACjB,KAAc,EACd,IAAqC;QAErC,IAAI,KAAK,YAAY,wBAAY,EAAE,CAAC;YAChC,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;gBACjB,KAAK,sBAAU,CAAC,qBAAqB,CAAC;gBACtC,KAAK,sBAAU,CAAC,6BAA6B,CAAC,CAAC,CAAC;oBAC5C,MAAM,eAAe,GAAG,KAEvB,CAAC;oBACF,MAAM,OAAO,GAAG,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"mongodbTool.js","sourceRoot":"","sources":["../../../../src/tools/mongodb/mongodbTool.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/tools/tool.d.ts
CHANGED
|
@@ -14,6 +14,13 @@ export type ToolArgs<T extends ZodRawShape> = {
|
|
|
14
14
|
};
|
|
15
15
|
export type ToolExecutionContext = {
|
|
16
16
|
signal: AbortSignal;
|
|
17
|
+
/**
|
|
18
|
+
* Request context object available only when running atop
|
|
19
|
+
* StreamableHttpTransport.
|
|
20
|
+
*/
|
|
21
|
+
requestInfo?: {
|
|
22
|
+
headers?: Record<string, string>;
|
|
23
|
+
};
|
|
17
24
|
};
|
|
18
25
|
/**
|
|
19
26
|
* The type of operation the tool performs. This is used when evaluating if a tool is allowed to run based on
|
|
@@ -334,9 +341,9 @@ export declare abstract class ToolBase {
|
|
|
334
341
|
* }
|
|
335
342
|
* ```
|
|
336
343
|
*/
|
|
337
|
-
protected abstract execute(args: ToolArgs<typeof this.argsShape>, { signal }: ToolExecutionContext): Promise<CallToolResult>;
|
|
344
|
+
protected abstract execute(args: ToolArgs<typeof this.argsShape>, { signal, requestInfo }: ToolExecutionContext): Promise<CallToolResult>;
|
|
338
345
|
/** This is used internally by the server to invoke the tool. It can also be run manually to call the tool directly. */
|
|
339
|
-
invoke(args: ToolArgs<typeof this.argsShape>, { signal }: ToolExecutionContext): Promise<CallToolResult>;
|
|
346
|
+
invoke(args: ToolArgs<typeof this.argsShape>, { signal, requestInfo }: ToolExecutionContext): Promise<CallToolResult>;
|
|
340
347
|
/**
|
|
341
348
|
* Get the confirmation message shown to users when this tool requires
|
|
342
349
|
* explicit approval.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../../src/tools/tool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,KAAK,CAAC;AAEvC,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAC1F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,qBAAqB,EAAa,MAAM,uBAAuB,CAAC;AAClG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAK1D,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,WAAW,IAAI;KACzC,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IAC/B,MAAM,EAAE,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../../src/tools/tool.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/tools/tool.js
CHANGED
|
@@ -148,7 +148,7 @@ class ToolBase {
|
|
|
148
148
|
};
|
|
149
149
|
}
|
|
150
150
|
/** This is used internally by the server to invoke the tool. It can also be run manually to call the tool directly. */
|
|
151
|
-
async invoke(args, { signal }) {
|
|
151
|
+
async invoke(args, { signal, requestInfo }) {
|
|
152
152
|
let startTime = Date.now();
|
|
153
153
|
try {
|
|
154
154
|
if (this.requiresConfirmation()) {
|
|
@@ -179,7 +179,7 @@ class ToolBase {
|
|
|
179
179
|
message: `Executing tool ${this.name}`,
|
|
180
180
|
noRedaction: true,
|
|
181
181
|
});
|
|
182
|
-
const toolCallResult = await this.execute(args, { signal });
|
|
182
|
+
const toolCallResult = await this.execute(args, { signal, requestInfo });
|
|
183
183
|
const result = await this.appendUIResource(toolCallResult);
|
|
184
184
|
this.emitToolEvent(args, { startTime, result });
|
|
185
185
|
this.session.logger.debug({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool.js","sourceRoot":"","sources":["../../../src/tools/tool.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"tool.js","sourceRoot":"","sources":["../../../src/tools/tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
import type { UserConfig } from "../common/config/userConfig.js";
|
|
2
2
|
import { Server, type ServerOptions } from "../server.js";
|
|
3
|
-
import { Session } from "../common/session.js";
|
|
4
3
|
import type { LoggerBase } from "../common/logger.js";
|
|
5
|
-
import { DeviceId } from "../helpers/deviceId.js";
|
|
6
4
|
import { type ConnectionManagerFactoryFn } from "../common/connectionManager.js";
|
|
7
5
|
import { type ConnectionErrorHandler } from "../common/connectionErrorHandler.js";
|
|
8
6
|
import type { CommonProperties } from "../telemetry/types.js";
|
|
@@ -173,21 +171,13 @@ export type TransportRunnerConfig = {
|
|
|
173
171
|
* differently and outside of MongoDB MCP server.
|
|
174
172
|
*/
|
|
175
173
|
createApiClient?: ApiClientFactoryFn;
|
|
176
|
-
extendSession?: (session: Session, requestContext?: RequestContext) => void;
|
|
177
174
|
};
|
|
178
175
|
export declare abstract class TransportRunnerBase {
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
private
|
|
183
|
-
|
|
184
|
-
private readonly createAtlasLocalClient;
|
|
185
|
-
private readonly telemetryProperties;
|
|
186
|
-
private readonly tools?;
|
|
187
|
-
private readonly createSessionConfig?;
|
|
188
|
-
private readonly createApiClient;
|
|
189
|
-
private readonly extendSession;
|
|
190
|
-
protected constructor({ userConfig, createConnectionManager, connectionErrorHandler, createAtlasLocalClient, additionalLoggers, telemetryProperties, tools, createSessionConfig, createApiClient, extendSession, }: TransportRunnerConfig);
|
|
176
|
+
protected readonly runnerConfig: TransportRunnerConfig;
|
|
177
|
+
get logger(): LoggerBase;
|
|
178
|
+
private _logger;
|
|
179
|
+
private deviceId;
|
|
180
|
+
protected constructor(runnerConfig: TransportRunnerConfig);
|
|
191
181
|
protected setupServer(request?: RequestContext, { serverOptions, }?: {
|
|
192
182
|
serverOptions?: Pick<ServerOptions, "uiRegistry">;
|
|
193
183
|
}): Promise<Server>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../src/transports/base.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAEjE,OAAO,EAAE,MAAM,EAAE,KAAK,aAAa,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../src/transports/base.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAEjE,OAAO,EAAE,MAAM,EAAE,KAAK,aAAa,EAAE,MAAM,cAAc,CAAC;AAI1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAKtD,OAAO,EAA8B,KAAK,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAC7G,OAAO,EACH,KAAK,sBAAsB,EAE9B,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAGzE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAIvE,MAAM,MAAM,cAAc,GAAG;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC,CAAC;IACxD,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC,CAAC;CACzD,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,KAAK,qBAAqB,GAAG,CAAC,OAAO,EAAE;IACnC,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,CAAC,EAAE,cAAc,CAAC;CAC5B,KAAK,OAAO,CAAC,UAAU,CAAC,GAAG,UAAU,CAAC;AAEvC;;;;;;;;;;;;;;GAcG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAChC;;;;;;;;;;;;;;;OAeG;IACH,UAAU,EAAE,UAAU,CAAC;IAEvB;;;;;;;OAOG;IACH,uBAAuB,CAAC,EAAE,0BAA0B,CAAC;IAErD;;;;;;;;;;OAUG;IACH,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;IAEhD;;;;OAIG;IACH,sBAAsB,CAAC,EAAE,yBAAyB,CAAC;IAEnD;;;;;;;OAOG;IACH,iBAAiB,CAAC,EAAE,UAAU,EAAE,CAAC;IAEjC;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAEhD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAsCG;IACH,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC;IAEpB;;;;;;;;;;;;;OAaG;IACH,mBAAmB,CAAC,EAAE,qBAAqB,CAAC;IAE5C;;;;;;;OAOG;IACH,eAAe,CAAC,EAAE,kBAAkB,CAAC;CACxC,CAAC;AAEF,8BAAsB,mBAAmB;IAOf,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,qBAAqB;IAN5E,IAAW,MAAM,IAAI,UAAU,CAE9B;IACD,OAAO,CAAC,OAAO,CAAkB;IACjC,OAAO,CAAC,QAAQ,CAAW;IAE3B,SAAS,aAAgC,YAAY,EAAE,qBAAqB;cAyB5D,WAAW,CACvB,OAAO,CAAC,EAAE,cAAc,EACxB,EACI,aAAa,GAChB,GAAE;QACC,aAAa,CAAC,EAAE,IAAI,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;KAChD,GACP,OAAO,CAAC,MAAM,CAAC;IA0FlB,QAAQ,CAAC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAE/B,QAAQ,CAAC,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAElC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ5B,OAAO,CAAC,MAAM,CAAC,eAAe;CAiBjC"}
|
|
@@ -51,39 +51,32 @@ const vectorSearchEmbeddingsManager_js_1 = require("../common/search/vectorSearc
|
|
|
51
51
|
const configOverrides_js_1 = require("../common/config/configOverrides.js");
|
|
52
52
|
const apiClient_js_1 = require("../common/atlas/apiClient.js");
|
|
53
53
|
class TransportRunnerBase {
|
|
54
|
-
|
|
55
|
-
this.
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
this.
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
this.createSessionConfig = createSessionConfig;
|
|
62
|
-
this.createApiClient = createApiClient;
|
|
63
|
-
this.extendSession = extendSession;
|
|
64
|
-
const loggers = [...additionalLoggers];
|
|
65
|
-
if (this.userConfig.loggers.includes("stderr")) {
|
|
54
|
+
get logger() {
|
|
55
|
+
return this._logger;
|
|
56
|
+
}
|
|
57
|
+
constructor(runnerConfig) {
|
|
58
|
+
this.runnerConfig = runnerConfig;
|
|
59
|
+
const loggers = [...(runnerConfig.additionalLoggers ?? [])];
|
|
60
|
+
if (runnerConfig.userConfig.loggers.includes("stderr")) {
|
|
66
61
|
loggers.push(new logger_js_1.ConsoleLogger(keychain_js_1.Keychain.root));
|
|
67
62
|
}
|
|
68
|
-
if (
|
|
69
|
-
loggers.push(new logger_js_1.DiskLogger(
|
|
63
|
+
if (runnerConfig.userConfig.loggers.includes("disk")) {
|
|
64
|
+
loggers.push(new logger_js_1.DiskLogger(runnerConfig.userConfig.logPath, (err) => {
|
|
70
65
|
// If the disk logger fails to initialize, we log the error to stderr and exit
|
|
71
66
|
// eslint-disable-next-line no-console
|
|
72
67
|
console.error("Error initializing disk logger:", err);
|
|
73
68
|
process.exit(1);
|
|
74
69
|
}, keychain_js_1.Keychain.root));
|
|
75
70
|
}
|
|
76
|
-
this.
|
|
71
|
+
this._logger = new logger_js_1.CompositeLogger(...loggers);
|
|
77
72
|
this.deviceId = deviceId_js_1.DeviceId.create(this.logger);
|
|
78
73
|
}
|
|
79
74
|
async setupServer(request, { serverOptions, } = {}) {
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
userConfig
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
userConfig = (0, configOverrides_js_1.applyConfigOverrides)({ baseConfig: this.userConfig, request });
|
|
86
|
-
}
|
|
75
|
+
const { tools, createSessionConfig, telemetryProperties = {}, createConnectionManager = connectionManager_js_1.createMCPConnectionManager, connectionErrorHandler = connectionErrorHandler_js_1.connectionErrorHandler, createAtlasLocalClient = atlasLocal_js_1.defaultCreateAtlasLocalClient, createApiClient = apiClient_js_1.createAtlasApiClient, } = this.runnerConfig;
|
|
76
|
+
const userConfig = (await createSessionConfig?.({
|
|
77
|
+
userConfig: this.runnerConfig.userConfig,
|
|
78
|
+
request,
|
|
79
|
+
})) ?? (0, configOverrides_js_1.applyConfigOverrides)({ baseConfig: this.runnerConfig.userConfig, request });
|
|
87
80
|
const mcpServer = new mcp_js_1.McpServer({
|
|
88
81
|
name: packageInfo_js_1.packageInfo.mcpServerName,
|
|
89
82
|
version: packageInfo_js_1.packageInfo.version,
|
|
@@ -92,35 +85,32 @@ class TransportRunnerBase {
|
|
|
92
85
|
});
|
|
93
86
|
const logger = new logger_js_1.CompositeLogger(this.logger);
|
|
94
87
|
const exportsManager = exportsManager_js_1.ExportsManager.init(userConfig, logger);
|
|
95
|
-
const connectionManager = await
|
|
88
|
+
const connectionManager = await createConnectionManager({
|
|
96
89
|
logger,
|
|
97
90
|
userConfig,
|
|
98
91
|
deviceId: this.deviceId,
|
|
99
92
|
});
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
requestContext: request,
|
|
109
|
-
}, logger);
|
|
110
|
-
}
|
|
93
|
+
const apiClient = createApiClient({
|
|
94
|
+
baseUrl: userConfig.apiBaseUrl,
|
|
95
|
+
credentials: {
|
|
96
|
+
clientId: userConfig.apiClientId,
|
|
97
|
+
clientSecret: userConfig.apiClientSecret,
|
|
98
|
+
},
|
|
99
|
+
requestContext: request,
|
|
100
|
+
}, logger);
|
|
111
101
|
const session = new session_js_1.Session({
|
|
112
102
|
userConfig,
|
|
113
|
-
atlasLocalClient: await
|
|
103
|
+
atlasLocalClient: await createAtlasLocalClient({ logger }),
|
|
114
104
|
logger,
|
|
115
105
|
exportsManager,
|
|
116
106
|
connectionManager,
|
|
117
107
|
keychain: keychain_js_1.Keychain.root,
|
|
108
|
+
connectionErrorHandler,
|
|
118
109
|
vectorSearchEmbeddingsManager: new vectorSearchEmbeddingsManager_js_1.VectorSearchEmbeddingsManager(userConfig, connectionManager),
|
|
119
110
|
apiClient,
|
|
120
111
|
});
|
|
121
|
-
this.extendSession?.(session, request);
|
|
122
112
|
const telemetry = telemetry_js_1.Telemetry.create(session, userConfig, this.deviceId, {
|
|
123
|
-
commonProperties:
|
|
113
|
+
commonProperties: telemetryProperties,
|
|
124
114
|
});
|
|
125
115
|
const elicitation = new elicitation_js_1.Elicitation({ server: mcpServer.server });
|
|
126
116
|
let uiRegistry = serverOptions?.uiRegistry;
|
|
@@ -133,9 +123,8 @@ class TransportRunnerBase {
|
|
|
133
123
|
session,
|
|
134
124
|
telemetry,
|
|
135
125
|
userConfig,
|
|
136
|
-
connectionErrorHandler: this.connectionErrorHandler,
|
|
137
126
|
elicitation,
|
|
138
|
-
tools
|
|
127
|
+
tools,
|
|
139
128
|
uiRegistry,
|
|
140
129
|
});
|
|
141
130
|
// We need to create the MCP logger after the server is constructed
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/transports/base.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,6DAAuD;AACvD,4CAA0D;AAC1D,qDAA+C;AAC/C,4DAAsD;AACtD,oEAAoE;AAEpE,mDAA4F;AAC5F,mEAA6D;AAC7D,wDAAkD;AAClD,uDAAiD;AACjD,yEAA6G;AAC7G,mFAG6C;AAE7C,sDAAgD;AAEhD,2DAAwE;AACxE,wGAAkG;AAElG,4EAA2E;AAE3E,+DAAoE;
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/transports/base.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,7 @@ class DryRunModeRunner extends base_js_1.TransportRunnerBase {
|
|
|
20
20
|
}
|
|
21
21
|
dumpConfig() {
|
|
22
22
|
this.consoleLogger.log("Configuration:");
|
|
23
|
-
this.consoleLogger.log(JSON.stringify(this.userConfig, null, 2));
|
|
23
|
+
this.consoleLogger.log(JSON.stringify(this.runnerConfig.userConfig, null, 2));
|
|
24
24
|
}
|
|
25
25
|
dumpTools() {
|
|
26
26
|
const tools = this.server?.tools
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dryModeRunner.js","sourceRoot":"","sources":["../../../src/transports/dryModeRunner.ts"],"names":[],"mappings":";;;AAAA,iEAA2D;AAC3D,uCAA4E;AAY5E,MAAa,gBAAiB,SAAQ,6BAAmB;IAIrD,YAAY,EAAE,MAAM,EAAE,GAAG,qBAAqB,EAA0B;QACpE,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAC7B,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC;IAChC,CAAC;IAEQ,KAAK,CAAC,KAAK;QAChB,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACvC,MAAM,SAAS,GAAG,IAAI,wCAAiB,EAAE,CAAC;QAE1C,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACrC,IAAI,CAAC,UAAU,EAAE,CAAC;QAClB,IAAI,CAAC,SAAS,EAAE,CAAC;IACrB,CAAC;IAEQ,KAAK,CAAC,cAAc;QACzB,MAAM,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC;IAC/B,CAAC;IAEO,UAAU;QACd,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QACzC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"dryModeRunner.js","sourceRoot":"","sources":["../../../src/transports/dryModeRunner.ts"],"names":[],"mappings":";;;AAAA,iEAA2D;AAC3D,uCAA4E;AAY5E,MAAa,gBAAiB,SAAQ,6BAAmB;IAIrD,YAAY,EAAE,MAAM,EAAE,GAAG,qBAAqB,EAA0B;QACpE,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAC7B,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC;IAChC,CAAC;IAEQ,KAAK,CAAC,KAAK;QAChB,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACvC,MAAM,SAAS,GAAG,IAAI,wCAAiB,EAAE,CAAC;QAE1C,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACrC,IAAI,CAAC,UAAU,EAAE,CAAC;QAClB,IAAI,CAAC,SAAS,EAAE,CAAC;IACrB,CAAC;IAEQ,KAAK,CAAC,cAAc;QACzB,MAAM,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC;IAC/B,CAAC;IAEO,UAAU;QACd,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QACzC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAClF,CAAC;IAEO,SAAS;QACb,MAAM,KAAK,GACP,IAAI,CAAC,MAAM,EAAE,KAAK;aACb,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;aAClC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACZ,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,QAAQ,EAAE,IAAI,CAAC,QAAQ;SAC1B,CAAC,CAAC,IAAI,EAAE,CAAC;QAClB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QACzC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAC3D,CAAC;CACJ;AAtCD,4CAsCC"}
|