mongodb-mcp-server 0.3.0 → 0.3.1-prerelease.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/common/atlas/accessListUtils.d.ts +2 -1
- package/dist/cjs/common/atlas/accessListUtils.d.ts.map +1 -1
- package/dist/cjs/common/atlas/accessListUtils.js +4 -1
- package/dist/cjs/common/atlas/accessListUtils.js.map +1 -1
- package/dist/cjs/common/config.d.ts +9 -0
- package/dist/cjs/common/config.d.ts.map +1 -1
- package/dist/cjs/common/config.js +101 -0
- package/dist/cjs/common/config.js.map +1 -1
- package/dist/cjs/common/connectionErrorHandler.d.ts +18 -0
- package/dist/cjs/common/connectionErrorHandler.d.ts.map +1 -0
- package/dist/cjs/common/connectionErrorHandler.js +70 -0
- package/dist/cjs/common/connectionErrorHandler.js.map +1 -0
- package/dist/cjs/common/connectionManager.d.ts +36 -10
- package/dist/cjs/common/connectionManager.d.ts.map +1 -1
- package/dist/cjs/common/connectionManager.js +59 -45
- package/dist/cjs/common/connectionManager.js.map +1 -1
- package/dist/cjs/common/errors.d.ts +5 -4
- package/dist/cjs/common/errors.d.ts.map +1 -1
- package/dist/cjs/common/errors.js +1 -0
- package/dist/cjs/common/errors.js.map +1 -1
- package/dist/cjs/common/exportsManager.d.ts +1 -1
- package/dist/cjs/common/exportsManager.d.ts.map +1 -1
- package/dist/cjs/common/keychain.d.ts +22 -0
- package/dist/cjs/common/keychain.d.ts.map +1 -0
- package/dist/cjs/common/keychain.js +36 -0
- package/dist/cjs/common/keychain.js.map +1 -0
- package/dist/cjs/common/logger.d.ts +10 -3
- package/dist/cjs/common/logger.d.ts.map +1 -1
- package/dist/cjs/common/logger.js +19 -11
- package/dist/cjs/common/logger.js.map +1 -1
- package/dist/cjs/common/packageInfo.js +1 -1
- package/dist/cjs/common/packageInfo.js.map +1 -1
- package/dist/cjs/common/session.d.ts +4 -1
- package/dist/cjs/common/session.d.ts.map +1 -1
- package/dist/cjs/common/session.js +6 -5
- package/dist/cjs/common/session.js.map +1 -1
- package/dist/cjs/helpers/connectionOptions.js +3 -6
- package/dist/cjs/helpers/connectionOptions.js.map +1 -1
- package/dist/cjs/index.js +8 -3
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/lib.d.ts +8 -4
- package/dist/cjs/lib.d.ts.map +1 -1
- package/dist/cjs/lib.js +12 -5
- package/dist/cjs/lib.js.map +1 -1
- package/dist/cjs/server.d.ts +4 -1
- package/dist/cjs/server.d.ts.map +1 -1
- package/dist/cjs/server.js +19 -5
- package/dist/cjs/server.js.map +1 -1
- package/dist/cjs/telemetry/eventCache.d.ts +11 -4
- package/dist/cjs/telemetry/eventCache.d.ts.map +1 -1
- package/dist/cjs/telemetry/eventCache.js +13 -6
- package/dist/cjs/telemetry/eventCache.js.map +1 -1
- package/dist/cjs/telemetry/telemetry.d.ts +9 -2
- package/dist/cjs/telemetry/telemetry.d.ts.map +1 -1
- package/dist/cjs/telemetry/telemetry.js +79 -42
- package/dist/cjs/telemetry/telemetry.js.map +1 -1
- package/dist/cjs/telemetry/types.d.ts +48 -0
- package/dist/cjs/telemetry/types.d.ts.map +1 -1
- package/dist/cjs/tools/atlas/connect/connectCluster.d.ts.map +1 -1
- package/dist/cjs/tools/atlas/connect/connectCluster.js +49 -25
- package/dist/cjs/tools/atlas/connect/connectCluster.js.map +1 -1
- package/dist/cjs/tools/atlas/create/createDBUser.d.ts.map +1 -1
- package/dist/cjs/tools/atlas/create/createDBUser.js +4 -0
- package/dist/cjs/tools/atlas/create/createDBUser.js.map +1 -1
- package/dist/cjs/tools/atlas/read/listProjects.js +1 -1
- package/dist/cjs/tools/atlas/read/listProjects.js.map +1 -1
- package/dist/cjs/tools/mongodb/mongodbTool.d.ts.map +1 -1
- package/dist/cjs/tools/mongodb/mongodbTool.js +11 -52
- package/dist/cjs/tools/mongodb/mongodbTool.js.map +1 -1
- package/dist/cjs/tools/mongodb/read/aggregate.d.ts +1 -0
- package/dist/cjs/tools/mongodb/read/aggregate.d.ts.map +1 -1
- package/dist/cjs/tools/mongodb/read/aggregate.js +12 -0
- package/dist/cjs/tools/mongodb/read/aggregate.js.map +1 -1
- package/dist/cjs/tools/tool.d.ts.map +1 -1
- package/dist/cjs/tools/tool.js +11 -5
- package/dist/cjs/tools/tool.js.map +1 -1
- package/dist/cjs/transports/base.d.ts +17 -5
- package/dist/cjs/transports/base.d.ts.map +1 -1
- package/dist/cjs/transports/base.js +21 -9
- package/dist/cjs/transports/base.js.map +1 -1
- package/dist/cjs/transports/stdio.d.ts +2 -4
- package/dist/cjs/transports/stdio.d.ts.map +1 -1
- package/dist/cjs/transports/stdio.js +6 -6
- package/dist/cjs/transports/stdio.js.map +1 -1
- package/dist/cjs/transports/streamableHttp.d.ts +2 -4
- package/dist/cjs/transports/streamableHttp.d.ts.map +1 -1
- package/dist/cjs/transports/streamableHttp.js +9 -9
- package/dist/cjs/transports/streamableHttp.js.map +1 -1
- package/dist/esm/common/atlas/accessListUtils.d.ts +2 -1
- package/dist/esm/common/atlas/accessListUtils.d.ts.map +1 -1
- package/dist/esm/common/atlas/accessListUtils.js +4 -1
- package/dist/esm/common/atlas/accessListUtils.js.map +1 -1
- package/dist/esm/common/config.d.ts +9 -0
- package/dist/esm/common/config.d.ts.map +1 -1
- package/dist/esm/common/config.js +98 -0
- package/dist/esm/common/config.js.map +1 -1
- package/dist/esm/common/connectionErrorHandler.d.ts +18 -0
- package/dist/esm/common/connectionErrorHandler.d.ts.map +1 -0
- package/dist/esm/common/connectionErrorHandler.js +66 -0
- package/dist/esm/common/connectionErrorHandler.js.map +1 -0
- package/dist/esm/common/connectionManager.d.ts +36 -10
- package/dist/esm/common/connectionManager.d.ts.map +1 -1
- package/dist/esm/common/connectionManager.js +54 -39
- package/dist/esm/common/connectionManager.js.map +1 -1
- package/dist/esm/common/errors.d.ts +5 -4
- package/dist/esm/common/errors.d.ts.map +1 -1
- package/dist/esm/common/errors.js +1 -0
- package/dist/esm/common/errors.js.map +1 -1
- package/dist/esm/common/exportsManager.d.ts +1 -1
- package/dist/esm/common/exportsManager.d.ts.map +1 -1
- package/dist/esm/common/keychain.d.ts +22 -0
- package/dist/esm/common/keychain.d.ts.map +1 -0
- package/dist/esm/common/keychain.js +31 -0
- package/dist/esm/common/keychain.js.map +1 -0
- package/dist/esm/common/logger.d.ts +10 -3
- package/dist/esm/common/logger.d.ts.map +1 -1
- package/dist/esm/common/logger.js +19 -11
- package/dist/esm/common/logger.js.map +1 -1
- package/dist/esm/common/packageInfo.js +1 -1
- package/dist/esm/common/packageInfo.js.map +1 -1
- package/dist/esm/common/session.d.ts +4 -1
- package/dist/esm/common/session.d.ts.map +1 -1
- package/dist/esm/common/session.js +6 -5
- package/dist/esm/common/session.js.map +1 -1
- package/dist/esm/helpers/connectionOptions.js +1 -1
- package/dist/esm/helpers/connectionOptions.js.map +1 -1
- package/dist/esm/index.js +9 -4
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/lib.d.ts +8 -4
- package/dist/esm/lib.d.ts.map +1 -1
- package/dist/esm/lib.js +5 -2
- package/dist/esm/lib.js.map +1 -1
- package/dist/esm/server.d.ts +4 -1
- package/dist/esm/server.d.ts.map +1 -1
- package/dist/esm/server.js +20 -6
- package/dist/esm/server.js.map +1 -1
- package/dist/esm/telemetry/eventCache.d.ts +11 -4
- package/dist/esm/telemetry/eventCache.d.ts.map +1 -1
- package/dist/esm/telemetry/eventCache.js +13 -6
- package/dist/esm/telemetry/eventCache.js.map +1 -1
- package/dist/esm/telemetry/telemetry.d.ts +9 -2
- package/dist/esm/telemetry/telemetry.d.ts.map +1 -1
- package/dist/esm/telemetry/telemetry.js +79 -42
- package/dist/esm/telemetry/telemetry.js.map +1 -1
- package/dist/esm/telemetry/types.d.ts +48 -0
- package/dist/esm/telemetry/types.d.ts.map +1 -1
- package/dist/esm/tools/atlas/connect/connectCluster.d.ts.map +1 -1
- package/dist/esm/tools/atlas/connect/connectCluster.js +49 -25
- package/dist/esm/tools/atlas/connect/connectCluster.js.map +1 -1
- package/dist/esm/tools/atlas/create/createDBUser.d.ts.map +1 -1
- package/dist/esm/tools/atlas/create/createDBUser.js +4 -0
- package/dist/esm/tools/atlas/create/createDBUser.js.map +1 -1
- package/dist/esm/tools/atlas/read/listProjects.js +1 -1
- package/dist/esm/tools/atlas/read/listProjects.js.map +1 -1
- package/dist/esm/tools/mongodb/mongodbTool.d.ts.map +1 -1
- package/dist/esm/tools/mongodb/mongodbTool.js +11 -52
- package/dist/esm/tools/mongodb/mongodbTool.js.map +1 -1
- package/dist/esm/tools/mongodb/read/aggregate.d.ts +1 -0
- package/dist/esm/tools/mongodb/read/aggregate.d.ts.map +1 -1
- package/dist/esm/tools/mongodb/read/aggregate.js +12 -0
- package/dist/esm/tools/mongodb/read/aggregate.js.map +1 -1
- package/dist/esm/tools/tool.d.ts.map +1 -1
- package/dist/esm/tools/tool.js +11 -5
- package/dist/esm/tools/tool.js.map +1 -1
- package/dist/esm/transports/base.d.ts +17 -5
- package/dist/esm/transports/base.d.ts.map +1 -1
- package/dist/esm/transports/base.js +21 -9
- package/dist/esm/transports/base.js.map +1 -1
- package/dist/esm/transports/stdio.d.ts +2 -4
- package/dist/esm/transports/stdio.d.ts.map +1 -1
- package/dist/esm/transports/stdio.js +6 -6
- package/dist/esm/transports/stdio.js.map +1 -1
- package/dist/esm/transports/streamableHttp.d.ts +2 -4
- package/dist/esm/transports/streamableHttp.d.ts.map +1 -1
- package/dist/esm/transports/streamableHttp.js +9 -9
- package/dist/esm/transports/streamableHttp.js.map +1 -1
- package/package.json +21 -20
|
@@ -6,6 +6,7 @@ const mongodbTool_js_1 = require("../mongodbTool.js");
|
|
|
6
6
|
const tool_js_1 = require("../../tool.js");
|
|
7
7
|
const indexCheck_js_1 = require("../../../helpers/indexCheck.js");
|
|
8
8
|
const bson_1 = require("bson");
|
|
9
|
+
const errors_js_1 = require("../../../common/errors.js");
|
|
9
10
|
exports.AggregateArgs = {
|
|
10
11
|
pipeline: zod_1.z.array(zod_1.z.object({}).passthrough()).describe("An array of aggregation stages to execute"),
|
|
11
12
|
};
|
|
@@ -22,6 +23,7 @@ class AggregateTool extends mongodbTool_js_1.MongoDBToolBase {
|
|
|
22
23
|
}
|
|
23
24
|
async execute({ database, collection, pipeline, }) {
|
|
24
25
|
const provider = await this.ensureConnected();
|
|
26
|
+
this.assertOnlyUsesPermittedStages(pipeline);
|
|
25
27
|
// Check if aggregate operation uses an index if enabled
|
|
26
28
|
if (this.config.indexCheck) {
|
|
27
29
|
await (0, indexCheck_js_1.checkIndexUsage)(provider, database, collection, "aggregate", async () => {
|
|
@@ -35,6 +37,16 @@ class AggregateTool extends mongodbTool_js_1.MongoDBToolBase {
|
|
|
35
37
|
content: (0, tool_js_1.formatUntrustedData)(`The aggregation resulted in ${documents.length} documents.`, documents.length > 0 ? bson_1.EJSON.stringify(documents) : undefined),
|
|
36
38
|
};
|
|
37
39
|
}
|
|
40
|
+
assertOnlyUsesPermittedStages(pipeline) {
|
|
41
|
+
if (!this.config.readOnly) {
|
|
42
|
+
return;
|
|
43
|
+
}
|
|
44
|
+
for (const stage of pipeline) {
|
|
45
|
+
if (stage.$out || stage.$merge) {
|
|
46
|
+
throw new errors_js_1.MongoDBError(errors_js_1.ErrorCodes.ForbiddenWriteOperation, "In readOnly mode you can not run pipelines with $out or $merge stages.");
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
}
|
|
38
50
|
}
|
|
39
51
|
exports.AggregateTool = AggregateTool;
|
|
40
52
|
//# sourceMappingURL=aggregate.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggregate.js","sourceRoot":"","sources":["../../../../../src/tools/mongodb/read/aggregate.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,sDAAqE;AAErE,2CAAoD;AACpD,kEAAiE;AACjE,+BAA6B;
|
|
1
|
+
{"version":3,"file":"aggregate.js","sourceRoot":"","sources":["../../../../../src/tools/mongodb/read/aggregate.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,sDAAqE;AAErE,2CAAoD;AACpD,kEAAiE;AACjE,+BAA6B;AAC7B,yDAAqE;AAExD,QAAA,aAAa,GAAG;IACzB,QAAQ,EAAE,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,QAAQ,CAAC,2CAA2C,CAAC;CACtG,CAAC;AAEF,MAAa,aAAc,SAAQ,gCAAe;IAAlD;;QACW,SAAI,GAAG,WAAW,CAAC;QAChB,gBAAW,GAAG,iDAAiD,CAAC;QAChE,cAAS,GAAG;YAClB,GAAG,gCAAe;YAClB,GAAG,qBAAa;SACnB,CAAC;QACK,kBAAa,GAAkB,MAAM,CAAC;IA4CjD,CAAC;IA1Ca,KAAK,CAAC,OAAO,CAAC,EACpB,QAAQ,EACR,UAAU,EACV,QAAQ,GACsB;QAC9B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAE9C,IAAI,CAAC,6BAA6B,CAAC,QAAQ,CAAC,CAAC;QAE7C,wDAAwD;QACxD,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YACzB,MAAM,IAAA,+BAAe,EAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,KAAK,IAAI,EAAE;gBAC1E,OAAO,QAAQ;qBACV,SAAS,CAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;qBAC1E,OAAO,CAAC,cAAc,CAAC,CAAC;YACjC,CAAC,CAAC,CAAC;QACP,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC;QAErF,OAAO;YACH,OAAO,EAAE,IAAA,6BAAmB,EACxB,+BAA+B,SAAS,CAAC,MAAM,aAAa,EAC5D,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAK,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAChE;SACJ,CAAC;IACN,CAAC;IAEO,6BAA6B,CAAC,QAAmC;QACrE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YACxB,OAAO;QACX,CAAC;QAED,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;YAC3B,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;gBAC7B,MAAM,IAAI,wBAAY,CAClB,sBAAU,CAAC,uBAAuB,EAClC,wEAAwE,CAC3E,CAAC;YACN,CAAC;QACL,CAAC;IACL,CAAC;CACJ;AAnDD,sCAmDC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../../src/tools/tool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,CAAC,EAAE,YAAY,EAAE,MAAM,KAAK,CAAC;AAC3C,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,QAAQ,EAAE,MAAM,KAAK,CAAC;AACtD,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAC5F,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;AAE3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C,MAAM,MAAM,QAAQ,CAAC,IAAI,SAAS,WAAW,IAAI,CAAC,CAAC,gBAAgB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;AAEpF,MAAM,MAAM,aAAa,GAAG,UAAU,GAAG,MAAM,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC;AAC7F,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,OAAO,CAAC;AAC/C,MAAM,MAAM,qBAAqB,GAAG;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,8BAAsB,QAAQ;IA2CtB,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO;IACnC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU;IACrC,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS;IA5C3C,SAAgB,IAAI,EAAE,MAAM,CAAC;IAE7B,SAAgB,QAAQ,EAAE,YAAY,CAAC;IAEvC,SAAgB,aAAa,EAAE,aAAa,CAAC;IAE7C,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAEvC,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,WAAW,CAAC;IAE1C,SAAS,KAAK,WAAW,IAAI,eAAe,CA2B3C;IAED,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,YAAY,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;gBAGtF,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,SAAS;IAGpC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;
|
|
1
|
+
{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../../src/tools/tool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,CAAC,EAAE,YAAY,EAAE,MAAM,KAAK,CAAC;AAC3C,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,QAAQ,EAAE,MAAM,KAAK,CAAC;AACtD,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAC5F,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;AAE3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C,MAAM,MAAM,QAAQ,CAAC,IAAI,SAAS,WAAW,IAAI,CAAC,CAAC,gBAAgB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;AAEpF,MAAM,MAAM,aAAa,GAAG,UAAU,GAAG,MAAM,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC;AAC7F,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,OAAO,CAAC;AAC/C,MAAM,MAAM,qBAAqB,GAAG;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,8BAAsB,QAAQ;IA2CtB,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO;IACnC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU;IACrC,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS;IA5C3C,SAAgB,IAAI,EAAE,MAAM,CAAC;IAE7B,SAAgB,QAAQ,EAAE,YAAY,CAAC;IAEvC,SAAgB,aAAa,EAAE,aAAa,CAAC;IAE7C,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAEvC,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,WAAW,CAAC;IAE1C,SAAS,KAAK,WAAW,IAAI,eAAe,CA2B3C;IAED,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,YAAY,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;gBAGtF,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,SAAS;IAGpC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAmFxC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,YAAY,CAAA;KAAE,KAAK,IAAI,CAAC;IAG1G,SAAS,CAAC,aAAa,IAAI,OAAO;IA6BlC,SAAS,CAAC,WAAW,CACjB,KAAK,EAAE,OAAO,EAEd,IAAI,EAAE,QAAQ,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,GACtC,OAAO,CAAC,cAAc,CAAC,GAAG,cAAc;IAY3C,SAAS,CAAC,QAAQ,CAAC,wBAAwB,CACvC,GAAG,IAAI,EAAE,UAAU,CAAC,YAAY,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,GACzD,qBAAqB;IAExB;;;;;OAKG;IACH,OAAO,CAAC,aAAa;CAgCxB;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,CA2BxG"}
|
package/dist/cjs/tools/tool.js
CHANGED
|
@@ -49,7 +49,13 @@ class ToolBase {
|
|
|
49
49
|
noRedaction: true,
|
|
50
50
|
});
|
|
51
51
|
const result = await this.execute(...args);
|
|
52
|
-
|
|
52
|
+
this.emitToolEvent(startTime, result, ...args);
|
|
53
|
+
this.session.logger.debug({
|
|
54
|
+
id: logger_js_1.LogId.toolExecute,
|
|
55
|
+
context: "tool",
|
|
56
|
+
message: `Executed tool ${this.name}`,
|
|
57
|
+
noRedaction: true,
|
|
58
|
+
});
|
|
53
59
|
return result;
|
|
54
60
|
}
|
|
55
61
|
catch (error) {
|
|
@@ -59,7 +65,7 @@ class ToolBase {
|
|
|
59
65
|
message: `Error executing ${this.name}: ${error}`,
|
|
60
66
|
});
|
|
61
67
|
const toolResult = await this.handleError(error, args[0]);
|
|
62
|
-
|
|
68
|
+
this.emitToolEvent(startTime, toolResult, ...args);
|
|
63
69
|
return toolResult;
|
|
64
70
|
}
|
|
65
71
|
};
|
|
@@ -104,7 +110,7 @@ class ToolBase {
|
|
|
104
110
|
verifyAllowed() {
|
|
105
111
|
let errorClarification;
|
|
106
112
|
// Check read-only mode first
|
|
107
|
-
if (this.config.readOnly && !["read", "metadata"].includes(this.operationType)) {
|
|
113
|
+
if (this.config.readOnly && !["read", "metadata", "connect"].includes(this.operationType)) {
|
|
108
114
|
errorClarification = `read-only mode is enabled, its operation type, \`${this.operationType}\`,`;
|
|
109
115
|
}
|
|
110
116
|
else if (this.config.disabledTools.includes(this.category)) {
|
|
@@ -147,7 +153,7 @@ class ToolBase {
|
|
|
147
153
|
* @param result - Whether the command succeeded or failed
|
|
148
154
|
* @param args - The arguments passed to the tool
|
|
149
155
|
*/
|
|
150
|
-
|
|
156
|
+
emitToolEvent(startTime, result, ...args) {
|
|
151
157
|
if (!this.telemetry.isTelemetryEnabled()) {
|
|
152
158
|
return;
|
|
153
159
|
}
|
|
@@ -170,7 +176,7 @@ class ToolBase {
|
|
|
170
176
|
if (metadata?.projectId) {
|
|
171
177
|
event.properties.project_id = metadata.projectId;
|
|
172
178
|
}
|
|
173
|
-
|
|
179
|
+
this.telemetry.emitEvents([event]);
|
|
174
180
|
}
|
|
175
181
|
}
|
|
176
182
|
exports.ToolBase = ToolBase;
|
|
@@ -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,14 +1,26 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { UserConfig } from "../common/config.js";
|
|
2
2
|
import { Server } from "../server.js";
|
|
3
3
|
import type { LoggerBase } from "../common/logger.js";
|
|
4
4
|
import { DeviceId } from "../helpers/deviceId.js";
|
|
5
|
+
import { type ConnectionManagerFactoryFn } from "../common/connectionManager.js";
|
|
6
|
+
import { type ConnectionErrorHandler } from "../common/connectionErrorHandler.js";
|
|
7
|
+
import type { CommonProperties } from "../telemetry/types.js";
|
|
8
|
+
export type TransportRunnerConfig = {
|
|
9
|
+
userConfig: UserConfig;
|
|
10
|
+
createConnectionManager?: ConnectionManagerFactoryFn;
|
|
11
|
+
connectionErrorHandler?: ConnectionErrorHandler;
|
|
12
|
+
additionalLoggers?: LoggerBase[];
|
|
13
|
+
telemetryProperties?: Partial<CommonProperties>;
|
|
14
|
+
};
|
|
5
15
|
export declare abstract class TransportRunnerBase {
|
|
6
|
-
protected readonly userConfig: UserConfig;
|
|
7
|
-
private readonly driverOptions;
|
|
8
16
|
logger: LoggerBase;
|
|
9
17
|
deviceId: DeviceId;
|
|
10
|
-
protected
|
|
11
|
-
|
|
18
|
+
protected readonly userConfig: UserConfig;
|
|
19
|
+
private readonly createConnectionManager;
|
|
20
|
+
private readonly connectionErrorHandler;
|
|
21
|
+
private readonly telemetryProperties;
|
|
22
|
+
protected constructor({ userConfig, createConnectionManager, connectionErrorHandler, additionalLoggers, telemetryProperties, }: TransportRunnerConfig);
|
|
23
|
+
protected setupServer(): Promise<Server>;
|
|
12
24
|
abstract start(): Promise<void>;
|
|
13
25
|
abstract closeTransport(): Promise<void>;
|
|
14
26
|
close(): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../src/transports/base.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../src/transports/base.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAItC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGtD,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAElD,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,MAAM,MAAM,qBAAqB,GAAG;IAChC,UAAU,EAAE,UAAU,CAAC;IACvB,uBAAuB,CAAC,EAAE,0BAA0B,CAAC;IACrD,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;IAChD,iBAAiB,CAAC,EAAE,UAAU,EAAE,CAAC;IACjC,mBAAmB,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;CACnD,CAAC;AAEF,8BAAsB,mBAAmB;IAC9B,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;IAC1B,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAC1C,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAA6B;IACrE,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAyB;IAChE,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA4B;IAEhE,SAAS,aAAa,EAClB,UAAU,EACV,uBAAoD,EACpD,sBAAsD,EACtD,iBAAsB,EACtB,mBAAwB,GAC3B,EAAE,qBAAqB;cA4BR,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IA6C9C,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;CAO/B"}
|
|
@@ -8,34 +8,42 @@ const telemetry_js_1 = require("../telemetry/telemetry.js");
|
|
|
8
8
|
const mcp_js_1 = require("@modelcontextprotocol/sdk/server/mcp.js");
|
|
9
9
|
const logger_js_1 = require("../common/logger.js");
|
|
10
10
|
const exportsManager_js_1 = require("../common/exportsManager.js");
|
|
11
|
-
const connectionManager_js_1 = require("../common/connectionManager.js");
|
|
12
11
|
const deviceId_js_1 = require("../helpers/deviceId.js");
|
|
12
|
+
const keychain_js_1 = require("../common/keychain.js");
|
|
13
|
+
const connectionManager_js_1 = require("../common/connectionManager.js");
|
|
14
|
+
const connectionErrorHandler_js_1 = require("../common/connectionErrorHandler.js");
|
|
13
15
|
class TransportRunnerBase {
|
|
14
|
-
constructor(userConfig,
|
|
16
|
+
constructor({ userConfig, createConnectionManager = connectionManager_js_1.createMCPConnectionManager, connectionErrorHandler = connectionErrorHandler_js_1.connectionErrorHandler, additionalLoggers = [], telemetryProperties = {}, }) {
|
|
15
17
|
this.userConfig = userConfig;
|
|
16
|
-
this.
|
|
18
|
+
this.createConnectionManager = createConnectionManager;
|
|
19
|
+
this.connectionErrorHandler = connectionErrorHandler;
|
|
20
|
+
this.telemetryProperties = telemetryProperties;
|
|
17
21
|
const loggers = [...additionalLoggers];
|
|
18
22
|
if (this.userConfig.loggers.includes("stderr")) {
|
|
19
|
-
loggers.push(new logger_js_1.ConsoleLogger());
|
|
23
|
+
loggers.push(new logger_js_1.ConsoleLogger(keychain_js_1.Keychain.root));
|
|
20
24
|
}
|
|
21
25
|
if (this.userConfig.loggers.includes("disk")) {
|
|
22
26
|
loggers.push(new logger_js_1.DiskLogger(this.userConfig.logPath, (err) => {
|
|
23
27
|
// If the disk logger fails to initialize, we log the error to stderr and exit
|
|
24
28
|
console.error("Error initializing disk logger:", err);
|
|
25
29
|
process.exit(1);
|
|
26
|
-
}));
|
|
30
|
+
}, keychain_js_1.Keychain.root));
|
|
27
31
|
}
|
|
28
32
|
this.logger = new logger_js_1.CompositeLogger(...loggers);
|
|
29
33
|
this.deviceId = deviceId_js_1.DeviceId.create(this.logger);
|
|
30
34
|
}
|
|
31
|
-
setupServer() {
|
|
35
|
+
async setupServer() {
|
|
32
36
|
const mcpServer = new mcp_js_1.McpServer({
|
|
33
37
|
name: packageInfo_js_1.packageInfo.mcpServerName,
|
|
34
38
|
version: packageInfo_js_1.packageInfo.version,
|
|
35
39
|
});
|
|
36
40
|
const logger = new logger_js_1.CompositeLogger(this.logger);
|
|
37
41
|
const exportsManager = exportsManager_js_1.ExportsManager.init(this.userConfig, logger);
|
|
38
|
-
const connectionManager =
|
|
42
|
+
const connectionManager = await this.createConnectionManager({
|
|
43
|
+
logger,
|
|
44
|
+
userConfig: this.userConfig,
|
|
45
|
+
deviceId: this.deviceId,
|
|
46
|
+
});
|
|
39
47
|
const session = new session_js_1.Session({
|
|
40
48
|
apiBaseUrl: this.userConfig.apiBaseUrl,
|
|
41
49
|
apiClientId: this.userConfig.apiClientId,
|
|
@@ -43,18 +51,22 @@ class TransportRunnerBase {
|
|
|
43
51
|
logger,
|
|
44
52
|
exportsManager,
|
|
45
53
|
connectionManager,
|
|
54
|
+
keychain: keychain_js_1.Keychain.root,
|
|
55
|
+
});
|
|
56
|
+
const telemetry = telemetry_js_1.Telemetry.create(session, this.userConfig, this.deviceId, {
|
|
57
|
+
commonProperties: this.telemetryProperties,
|
|
46
58
|
});
|
|
47
|
-
const telemetry = telemetry_js_1.Telemetry.create(session, this.userConfig, this.deviceId);
|
|
48
59
|
const result = new server_js_1.Server({
|
|
49
60
|
mcpServer,
|
|
50
61
|
session,
|
|
51
62
|
telemetry,
|
|
52
63
|
userConfig: this.userConfig,
|
|
64
|
+
connectionErrorHandler: this.connectionErrorHandler,
|
|
53
65
|
});
|
|
54
66
|
// We need to create the MCP logger after the server is constructed
|
|
55
67
|
// because it needs the server instance
|
|
56
68
|
if (this.userConfig.loggers.includes("mcp")) {
|
|
57
|
-
logger.addLogger(new logger_js_1.McpLogger(result));
|
|
69
|
+
logger.addLogger(new logger_js_1.McpLogger(result, keychain_js_1.Keychain.root));
|
|
58
70
|
}
|
|
59
71
|
return result;
|
|
60
72
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/transports/base.ts"],"names":[],"mappings":";;;AACA,6DAAuD;AACvD,4CAAsC;AACtC,qDAA+C;AAC/C,4DAAsD;AACtD,oEAAoE;AAEpE,mDAA4F;AAC5F,mEAA6D;AAC7D,
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/transports/base.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
import type { LoggerBase } from "../common/logger.js";
|
|
2
|
-
import { TransportRunnerBase } from "./base.js";
|
|
3
1
|
import type { JSONRPCMessage } from "@modelcontextprotocol/sdk/types.js";
|
|
4
2
|
import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
|
|
5
|
-
import
|
|
3
|
+
import { TransportRunnerBase, type TransportRunnerConfig } from "./base.js";
|
|
6
4
|
export declare class EJsonReadBuffer {
|
|
7
5
|
private _buffer?;
|
|
8
6
|
append(chunk: Buffer): void;
|
|
@@ -12,7 +10,7 @@ export declare class EJsonReadBuffer {
|
|
|
12
10
|
export declare function createStdioTransport(): StdioServerTransport;
|
|
13
11
|
export declare class StdioRunner extends TransportRunnerBase {
|
|
14
12
|
private server;
|
|
15
|
-
constructor(
|
|
13
|
+
constructor(config: TransportRunnerConfig);
|
|
16
14
|
start(): Promise<void>;
|
|
17
15
|
closeTransport(): Promise<void>;
|
|
18
16
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stdio.d.ts","sourceRoot":"","sources":["../../../src/transports/stdio.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"stdio.d.ts","sourceRoot":"","sources":["../../../src/transports/stdio.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AAGjF,OAAO,EAAE,mBAAmB,EAAE,KAAK,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAI5E,qBAAa,eAAe;IACxB,OAAO,CAAC,OAAO,CAAC,CAAS;IAEzB,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAI3B,WAAW,IAAI,cAAc,GAAG,IAAI;IAiBpC,KAAK,IAAI,IAAI;CAGhB;AAQD,wBAAgB,oBAAoB,IAAI,oBAAoB,CAK3D;AAED,qBAAa,WAAY,SAAQ,mBAAmB;IAChD,OAAO,CAAC,MAAM,CAAqB;gBAEvB,MAAM,EAAE,qBAAqB;IAInC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBtB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;CAGxC"}
|
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.StdioRunner = exports.EJsonReadBuffer = void 0;
|
|
4
4
|
exports.createStdioTransport = createStdioTransport;
|
|
5
|
-
const logger_js_1 = require("../common/logger.js");
|
|
6
|
-
const base_js_1 = require("./base.js");
|
|
7
|
-
const types_js_1 = require("@modelcontextprotocol/sdk/types.js");
|
|
8
5
|
const bson_1 = require("bson");
|
|
6
|
+
const types_js_1 = require("@modelcontextprotocol/sdk/types.js");
|
|
9
7
|
const stdio_js_1 = require("@modelcontextprotocol/sdk/server/stdio.js");
|
|
8
|
+
const logger_js_1 = require("../common/logger.js");
|
|
9
|
+
const base_js_1 = require("./base.js");
|
|
10
10
|
// This is almost a copy of ReadBuffer from @modelcontextprotocol/sdk
|
|
11
11
|
// but it uses EJSON.parse instead of JSON.parse to handle BSON types
|
|
12
12
|
class EJsonReadBuffer {
|
|
@@ -43,12 +43,12 @@ function createStdioTransport() {
|
|
|
43
43
|
return server;
|
|
44
44
|
}
|
|
45
45
|
class StdioRunner extends base_js_1.TransportRunnerBase {
|
|
46
|
-
constructor(
|
|
47
|
-
super(
|
|
46
|
+
constructor(config) {
|
|
47
|
+
super(config);
|
|
48
48
|
}
|
|
49
49
|
async start() {
|
|
50
50
|
try {
|
|
51
|
-
this.server = this.setupServer();
|
|
51
|
+
this.server = await this.setupServer();
|
|
52
52
|
const transport = createStdioTransport();
|
|
53
53
|
await this.server.connect(transport);
|
|
54
54
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stdio.js","sourceRoot":"","sources":["../../../src/transports/stdio.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"stdio.js","sourceRoot":"","sources":["../../../src/transports/stdio.ts"],"names":[],"mappings":";;;AA6CA,oDAKC;AAlDD,+BAA6B;AAE7B,iEAA0E;AAC1E,wEAAiF;AACjF,mDAA4C;AAE5C,uCAA4E;AAE5E,qEAAqE;AACrE,qEAAqE;AACrE,MAAa,eAAe;IAGxB,MAAM,CAAC,KAAa;QAChB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAC/E,CAAC;IAED,WAAW;QACP,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;YACf,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACxE,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;QAEhD,uEAAuE;QACvE,OAAO,+BAAoB,CAAC,KAAK,CAAC,YAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,KAAK;QACD,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;IAC7B,CAAC;CACJ;AA3BD,0CA2BC;AAED,6FAA6F;AAC7F,mFAAmF;AACnF,2FAA2F;AAC3F,EAAE;AACF,yGAAyG;AACzG,iCAAiC;AACjC,SAAgB,oBAAoB;IAChC,MAAM,MAAM,GAAG,IAAI,+BAAoB,EAAE,CAAC;IAC1C,MAAM,CAAC,aAAa,CAAC,GAAG,IAAI,eAAe,EAAE,CAAC;IAE9C,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,MAAa,WAAY,SAAQ,6BAAmB;IAGhD,YAAY,MAA6B;QACrC,KAAK,CAAC,MAAM,CAAC,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,KAAK;QACP,IAAI,CAAC;YACD,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;YAEvC,MAAM,SAAS,GAAG,oBAAoB,EAAE,CAAC;YAEzC,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACzC,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACtB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;gBAClB,EAAE,EAAE,iBAAK,CAAC,kBAAkB;gBAC5B,OAAO,EAAE,QAAQ;gBACjB,OAAO,EAAE,+BAA+B,KAAe,EAAE;aAC5D,CAAC,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC;IACL,CAAC;IAED,KAAK,CAAC,cAAc;QAChB,MAAM,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC;IAC/B,CAAC;CACJ;AA3BD,kCA2BC"}
|
|
@@ -1,11 +1,9 @@
|
|
|
1
|
-
import { TransportRunnerBase } from "./base.js";
|
|
2
|
-
import type { DriverOptions, UserConfig } from "../common/config.js";
|
|
3
|
-
import type { LoggerBase } from "../common/logger.js";
|
|
1
|
+
import { TransportRunnerBase, type TransportRunnerConfig } from "./base.js";
|
|
4
2
|
export declare class StreamableHttpRunner extends TransportRunnerBase {
|
|
5
3
|
private httpServer;
|
|
6
4
|
private sessionStore;
|
|
5
|
+
constructor(config: TransportRunnerConfig);
|
|
7
6
|
get serverAddress(): string;
|
|
8
|
-
constructor(userConfig: UserConfig, driverOptions: DriverOptions, additionalLoggers?: LoggerBase[]);
|
|
9
7
|
start(): Promise<void>;
|
|
10
8
|
closeTransport(): Promise<void>;
|
|
11
9
|
private withErrorHandling;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streamableHttp.d.ts","sourceRoot":"","sources":["../../../src/transports/streamableHttp.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"streamableHttp.d.ts","sourceRoot":"","sources":["../../../src/transports/streamableHttp.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,mBAAmB,EAAE,KAAK,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAQ5E,qBAAa,oBAAqB,SAAQ,mBAAmB;IACzD,OAAO,CAAC,UAAU,CAA0B;IAC5C,OAAO,CAAC,YAAY,CAAgB;gBAExB,MAAM,EAAE,qBAAqB;IAIzC,IAAW,aAAa,IAAI,MAAM,CAUjC;IAEK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA8KtB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAerC,OAAO,CAAC,iBAAiB;CAqB5B"}
|
|
@@ -5,18 +5,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.StreamableHttpRunner = void 0;
|
|
7
7
|
const express_1 = __importDefault(require("express"));
|
|
8
|
+
const crypto_1 = require("crypto");
|
|
8
9
|
const streamableHttp_js_1 = require("@modelcontextprotocol/sdk/server/streamableHttp.js");
|
|
9
10
|
const types_js_1 = require("@modelcontextprotocol/sdk/types.js");
|
|
10
|
-
const base_js_1 = require("./base.js");
|
|
11
11
|
const logger_js_1 = require("../common/logger.js");
|
|
12
|
-
const crypto_1 = require("crypto");
|
|
13
12
|
const sessionStore_js_1 = require("../common/sessionStore.js");
|
|
13
|
+
const base_js_1 = require("./base.js");
|
|
14
14
|
const JSON_RPC_ERROR_CODE_PROCESSING_REQUEST_FAILED = -32000;
|
|
15
15
|
const JSON_RPC_ERROR_CODE_SESSION_ID_REQUIRED = -32001;
|
|
16
16
|
const JSON_RPC_ERROR_CODE_SESSION_ID_INVALID = -32002;
|
|
17
17
|
const JSON_RPC_ERROR_CODE_SESSION_NOT_FOUND = -32003;
|
|
18
18
|
const JSON_RPC_ERROR_CODE_INVALID_REQUEST = -32004;
|
|
19
19
|
class StreamableHttpRunner extends base_js_1.TransportRunnerBase {
|
|
20
|
+
constructor(config) {
|
|
21
|
+
super(config);
|
|
22
|
+
}
|
|
20
23
|
get serverAddress() {
|
|
21
24
|
const result = this.httpServer?.address();
|
|
22
25
|
if (typeof result === "string") {
|
|
@@ -27,9 +30,6 @@ class StreamableHttpRunner extends base_js_1.TransportRunnerBase {
|
|
|
27
30
|
}
|
|
28
31
|
throw new Error("Server is not started yet");
|
|
29
32
|
}
|
|
30
|
-
constructor(userConfig, driverOptions, additionalLoggers = []) {
|
|
31
|
-
super(userConfig, driverOptions, additionalLoggers);
|
|
32
|
-
}
|
|
33
33
|
async start() {
|
|
34
34
|
const app = (0, express_1.default)();
|
|
35
35
|
this.sessionStore = new sessionStore_js_1.SessionStore(this.userConfig.idleTimeoutMs, this.userConfig.notificationTimeoutMs, this.logger);
|
|
@@ -96,7 +96,7 @@ class StreamableHttpRunner extends base_js_1.TransportRunnerBase {
|
|
|
96
96
|
});
|
|
97
97
|
return;
|
|
98
98
|
}
|
|
99
|
-
const server = this.setupServer();
|
|
99
|
+
const server = await this.setupServer();
|
|
100
100
|
let keepAliveLoop;
|
|
101
101
|
const transport = new streamableHttp_js_1.StreamableHTTPServerTransport({
|
|
102
102
|
sessionIdGenerator: () => (0, crypto_1.randomUUID)().toString(),
|
|
@@ -107,7 +107,7 @@ class StreamableHttpRunner extends base_js_1.TransportRunnerBase {
|
|
|
107
107
|
// eslint-disable-next-line @typescript-eslint/no-misused-promises
|
|
108
108
|
keepAliveLoop = setInterval(async () => {
|
|
109
109
|
try {
|
|
110
|
-
|
|
110
|
+
server.session.logger.debug({
|
|
111
111
|
id: logger_js_1.LogId.streamableHttpTransportKeepAlive,
|
|
112
112
|
context: "streamableHttpTransport",
|
|
113
113
|
message: "Sending ping",
|
|
@@ -121,7 +121,7 @@ class StreamableHttpRunner extends base_js_1.TransportRunnerBase {
|
|
|
121
121
|
catch (err) {
|
|
122
122
|
try {
|
|
123
123
|
failedPings++;
|
|
124
|
-
|
|
124
|
+
server.session.logger.warning({
|
|
125
125
|
id: logger_js_1.LogId.streamableHttpTransportKeepAliveFailure,
|
|
126
126
|
context: "streamableHttpTransport",
|
|
127
127
|
message: `Error sending ping (attempt #${failedPings}): ${err instanceof Error ? err.message : String(err)}`,
|
|
@@ -146,7 +146,7 @@ class StreamableHttpRunner extends base_js_1.TransportRunnerBase {
|
|
|
146
146
|
this.logger.error({
|
|
147
147
|
id: logger_js_1.LogId.streamableHttpTransportSessionCloseFailure,
|
|
148
148
|
context: "streamableHttpTransport",
|
|
149
|
-
message: `Error closing session: ${error instanceof Error ? error.message : String(error)}`,
|
|
149
|
+
message: `Error closing session ${sessionId}: ${error instanceof Error ? error.message : String(error)}`,
|
|
150
150
|
});
|
|
151
151
|
}
|
|
152
152
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streamableHttp.js","sourceRoot":"","sources":["../../../src/transports/streamableHttp.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA8B;AAE9B,0FAAmG;AACnG,iEAAyE;AACzE,
|
|
1
|
+
{"version":3,"file":"streamableHttp.js","sourceRoot":"","sources":["../../../src/transports/streamableHttp.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ export declare function makeCurrentIpAccessListEntry(apiClient: ApiClient, proje
|
|
|
10
10
|
* If the IP is already present, this is a no-op.
|
|
11
11
|
* @param apiClient The Atlas API client instance
|
|
12
12
|
* @param projectId The Atlas project ID
|
|
13
|
+
* @returns Promise<boolean> - true if a new IP access list entry was created, false if it already existed
|
|
13
14
|
*/
|
|
14
|
-
export declare function ensureCurrentIpInAccessList(apiClient: ApiClient, projectId: string): Promise<
|
|
15
|
+
export declare function ensureCurrentIpInAccessList(apiClient: ApiClient, projectId: string): Promise<boolean>;
|
|
15
16
|
//# sourceMappingURL=accessListUtils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accessListUtils.d.ts","sourceRoot":"","sources":["../../../../src/common/atlas/accessListUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAIhD,eAAO,MAAM,2BAA2B,sDAAsD,CAAC;AAE/F,wBAAsB,4BAA4B,CAC9C,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,MAAoC,GAC9C,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAOlE;AAED
|
|
1
|
+
{"version":3,"file":"accessListUtils.d.ts","sourceRoot":"","sources":["../../../../src/common/atlas/accessListUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAIhD,eAAO,MAAM,2BAA2B,sDAAsD,CAAC;AAE/F,wBAAsB,4BAA4B,CAC9C,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,MAAoC,GAC9C,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAOlE;AAED;;;;;;GAMG;AACH,wBAAsB,2BAA2B,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CA8B3G"}
|
|
@@ -14,6 +14,7 @@ export async function makeCurrentIpAccessListEntry(apiClient, projectId, comment
|
|
|
14
14
|
* If the IP is already present, this is a no-op.
|
|
15
15
|
* @param apiClient The Atlas API client instance
|
|
16
16
|
* @param projectId The Atlas project ID
|
|
17
|
+
* @returns Promise<boolean> - true if a new IP access list entry was created, false if it already existed
|
|
17
18
|
*/
|
|
18
19
|
export async function ensureCurrentIpInAccessList(apiClient, projectId) {
|
|
19
20
|
const entry = await makeCurrentIpAccessListEntry(apiClient, projectId, DEFAULT_ACCESS_LIST_COMMENT);
|
|
@@ -27,6 +28,7 @@ export async function ensureCurrentIpInAccessList(apiClient, projectId) {
|
|
|
27
28
|
context: "accessListUtils",
|
|
28
29
|
message: `IP access list created: ${JSON.stringify(entry)}`,
|
|
29
30
|
});
|
|
31
|
+
return true;
|
|
30
32
|
}
|
|
31
33
|
catch (err) {
|
|
32
34
|
if (err instanceof ApiClientError && err.response?.status === 409) {
|
|
@@ -36,7 +38,7 @@ export async function ensureCurrentIpInAccessList(apiClient, projectId) {
|
|
|
36
38
|
context: "accessListUtils",
|
|
37
39
|
message: `IP address ${entry.ipAddress} is already present in the access list for project ${projectId}.`,
|
|
38
40
|
});
|
|
39
|
-
return;
|
|
41
|
+
return false;
|
|
40
42
|
}
|
|
41
43
|
apiClient.logger.warning({
|
|
42
44
|
id: LogId.atlasIpAccessListAddFailure,
|
|
@@ -44,5 +46,6 @@ export async function ensureCurrentIpInAccessList(apiClient, projectId) {
|
|
|
44
46
|
message: `Error adding IP access list: ${err instanceof Error ? err.message : String(err)}`,
|
|
45
47
|
});
|
|
46
48
|
}
|
|
49
|
+
return false;
|
|
47
50
|
}
|
|
48
51
|
//# sourceMappingURL=accessListUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accessListUtils.js","sourceRoot":"","sources":["../../../../src/common/atlas/accessListUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,MAAM,CAAC,MAAM,2BAA2B,GAAG,mDAAmD,CAAC;AAE/F,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAC9C,SAAoB,EACpB,SAAiB,EACjB,UAAkB,2BAA2B;IAE7C,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,SAAS,CAAC,SAAS,EAAE,CAAC;IAC3D,OAAO;QACH,OAAO,EAAE,SAAS;QAClB,SAAS,EAAE,kBAAkB;QAC7B,OAAO;KACV,CAAC;AACN,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"accessListUtils.js","sourceRoot":"","sources":["../../../../src/common/atlas/accessListUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,MAAM,CAAC,MAAM,2BAA2B,GAAG,mDAAmD,CAAC;AAE/F,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAC9C,SAAoB,EACpB,SAAiB,EACjB,UAAkB,2BAA2B;IAE7C,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,SAAS,CAAC,SAAS,EAAE,CAAC;IAC3D,OAAO;QACH,OAAO,EAAE,SAAS;QAClB,SAAS,EAAE,kBAAkB;QAC7B,OAAO;KACV,CAAC;AACN,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAAC,SAAoB,EAAE,SAAiB;IACrF,MAAM,KAAK,GAAG,MAAM,4BAA4B,CAAC,SAAS,EAAE,SAAS,EAAE,2BAA2B,CAAC,CAAC;IACpG,IAAI,CAAC;QACD,MAAM,SAAS,CAAC,yBAAyB,CAAC;YACtC,MAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE;YACxC,IAAI,EAAE,CAAC,KAAK,CAAC;SAChB,CAAC,CAAC;QACH,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC;YACnB,EAAE,EAAE,KAAK,CAAC,sBAAsB;YAChC,OAAO,EAAE,iBAAiB;YAC1B,OAAO,EAAE,2BAA2B,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;SAC9D,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IAChB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,IAAI,GAAG,YAAY,cAAc,IAAI,GAAG,CAAC,QAAQ,EAAE,MAAM,KAAK,GAAG,EAAE,CAAC;YAChE,+CAA+C;YAC/C,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC;gBACnB,EAAE,EAAE,KAAK,CAAC,sBAAsB;gBAChC,OAAO,EAAE,iBAAiB;gBAC1B,OAAO,EAAE,cAAc,KAAK,CAAC,SAAS,sDAAsD,SAAS,GAAG;aAC3G,CAAC,CAAC;YACH,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC;YACrB,EAAE,EAAE,KAAK,CAAC,2BAA2B;YACrC,OAAO,EAAE,iBAAiB;YAC1B,OAAO,EAAE,gCAAgC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;SAC9F,CAAC,CAAC;IACP,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC"}
|
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
import type { CliOptions, ConnectionInfo } from "@mongosh/arg-parser";
|
|
2
|
+
export declare function validateConfigKey(key: string): {
|
|
3
|
+
valid: boolean;
|
|
4
|
+
suggestion?: string;
|
|
5
|
+
};
|
|
2
6
|
export interface UserConfig extends CliOptions {
|
|
3
7
|
apiBaseUrl: string;
|
|
4
8
|
apiClientId?: string;
|
|
@@ -25,6 +29,11 @@ export declare const config: UserConfig;
|
|
|
25
29
|
export type DriverOptions = ConnectionInfo["driverOptions"];
|
|
26
30
|
export declare const defaultDriverOptions: DriverOptions;
|
|
27
31
|
export declare const driverOptions: Omit<DevtoolsConnectOptions, "productName" | "productDocsLink">;
|
|
32
|
+
export declare function warnAboutDeprecatedOrUnknownCliArgs(args: Record<string, unknown>, { warn, exit }: {
|
|
33
|
+
warn: (msg: string) => void;
|
|
34
|
+
exit: (status: number) => void | never;
|
|
35
|
+
}): void;
|
|
36
|
+
export declare function registerKnownSecretsInRootKeychain(userConfig: Partial<UserConfig>): void;
|
|
28
37
|
export declare function setupUserConfig({ cli, env, defaults, }: {
|
|
29
38
|
cli: string[];
|
|
30
39
|
env: Record<string, unknown>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/common/config.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/common/config.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAkGtE,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,CA6BtF;AAaD,MAAM,WAAW,UAAW,SAAQ,UAAU;IAC1C,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,SAAS,GAAG,UAAU,CAAC;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,uBAAuB,EAAE,MAAM,CAAC;IAChC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC7B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE,OAAO,GAAG,MAAM,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,OAAO,EAAE,KAAK,CAAC,QAAQ,GAAG,MAAM,GAAG,KAAK,CAAC,CAAC;IAC1C,aAAa,EAAE,MAAM,CAAC;IACtB,qBAAqB,EAAE,MAAM,CAAC;CACjC;AAED,eAAO,MAAM,iBAAiB,EAAE,UAiB/B,CAAC;AAEF,eAAO,MAAM,MAAM,YAIjB,CAAC;AAQH,MAAM,MAAM,aAAa,GAAG,cAAc,CAAC,eAAe,CAAC,CAAC;AAC5D,eAAO,MAAM,oBAAoB,EAAE,aAWlC,CAAC;AAEF,eAAO,MAAM,aAAa,iEAGxB,CAAC;AAkHH,wBAAgB,mCAAmC,CAC/C,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAAC,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,GAAG,KAAK,CAAA;CAAE,GACxF,IAAI,CAsCN;AAyBD,wBAAgB,kCAAkC,CAAC,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,IAAI,CAqBxF;AAED,wBAAgB,eAAe,CAAC,EAC5B,GAAG,EACH,GAAG,EACH,QAAQ,GACX,EAAE;IACC,GAAG,EAAE,MAAM,EAAE,CAAC;IACd,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7B,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;CACjC,GAAG,UAAU,CA+Cb;AAED,wBAAgB,iBAAiB,CAAC,EAC9B,MAAM,EACN,QAAQ,GACX,EAAE;IACC,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;CACpC,GAAG,aAAa,CAMhB"}
|