mongodb-mcp-server 2.1.0 → 2.1.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.
Files changed (57) hide show
  1. package/dist/cjs/common/atlas/cluster.d.ts +1 -0
  2. package/dist/cjs/common/atlas/cluster.d.ts.map +1 -1
  3. package/dist/cjs/common/atlas/cluster.js +2 -0
  4. package/dist/cjs/common/atlas/cluster.js.map +1 -1
  5. package/dist/cjs/common/connectionInfo.d.ts +20 -5
  6. package/dist/cjs/common/connectionInfo.d.ts.map +1 -1
  7. package/dist/cjs/common/connectionInfo.js.map +1 -1
  8. package/dist/cjs/common/packageInfo.js +1 -1
  9. package/dist/cjs/telemetry/eventCache.d.ts +9 -15
  10. package/dist/cjs/telemetry/eventCache.d.ts.map +1 -1
  11. package/dist/cjs/telemetry/eventCache.js +3 -13
  12. package/dist/cjs/telemetry/eventCache.js.map +1 -1
  13. package/dist/cjs/telemetry/telemetry.d.ts +31 -12
  14. package/dist/cjs/telemetry/telemetry.d.ts.map +1 -1
  15. package/dist/cjs/telemetry/telemetry.js +56 -14
  16. package/dist/cjs/telemetry/telemetry.js.map +1 -1
  17. package/dist/cjs/telemetry/types.d.ts +3 -0
  18. package/dist/cjs/telemetry/types.d.ts.map +1 -1
  19. package/dist/cjs/tools/atlas/connect/connectCluster.d.ts.map +1 -1
  20. package/dist/cjs/tools/atlas/connect/connectCluster.js +4 -3
  21. package/dist/cjs/tools/atlas/connect/connectCluster.js.map +1 -1
  22. package/dist/cjs/tools/atlas/read/listClusters.d.ts +3 -0
  23. package/dist/cjs/tools/atlas/read/listClusters.d.ts.map +1 -1
  24. package/dist/cjs/tools/atlas/read/listClusters.js +1 -0
  25. package/dist/cjs/tools/atlas/read/listClusters.js.map +1 -1
  26. package/dist/cjs/tools/tool.d.ts.map +1 -1
  27. package/dist/cjs/tools/tool.js +3 -1
  28. package/dist/cjs/tools/tool.js.map +1 -1
  29. package/dist/esm/common/atlas/cluster.d.ts +1 -0
  30. package/dist/esm/common/atlas/cluster.d.ts.map +1 -1
  31. package/dist/esm/common/atlas/cluster.js +2 -0
  32. package/dist/esm/common/atlas/cluster.js.map +1 -1
  33. package/dist/esm/common/connectionInfo.d.ts +20 -5
  34. package/dist/esm/common/connectionInfo.d.ts.map +1 -1
  35. package/dist/esm/common/connectionInfo.js.map +1 -1
  36. package/dist/esm/common/packageInfo.js +1 -1
  37. package/dist/esm/telemetry/eventCache.d.ts +9 -15
  38. package/dist/esm/telemetry/eventCache.d.ts.map +1 -1
  39. package/dist/esm/telemetry/eventCache.js +3 -13
  40. package/dist/esm/telemetry/eventCache.js.map +1 -1
  41. package/dist/esm/telemetry/telemetry.d.ts +31 -12
  42. package/dist/esm/telemetry/telemetry.d.ts.map +1 -1
  43. package/dist/esm/telemetry/telemetry.js +56 -14
  44. package/dist/esm/telemetry/telemetry.js.map +1 -1
  45. package/dist/esm/telemetry/types.d.ts +3 -0
  46. package/dist/esm/telemetry/types.d.ts.map +1 -1
  47. package/dist/esm/tools/atlas/connect/connectCluster.d.ts.map +1 -1
  48. package/dist/esm/tools/atlas/connect/connectCluster.js +4 -3
  49. package/dist/esm/tools/atlas/connect/connectCluster.js.map +1 -1
  50. package/dist/esm/tools/atlas/read/listClusters.d.ts +3 -0
  51. package/dist/esm/tools/atlas/read/listClusters.d.ts.map +1 -1
  52. package/dist/esm/tools/atlas/read/listClusters.js +1 -0
  53. package/dist/esm/tools/atlas/read/listClusters.js.map +1 -1
  54. package/dist/esm/tools/tool.d.ts.map +1 -1
  55. package/dist/esm/tools/tool.js +3 -1
  56. package/dist/esm/tools/tool.js.map +1 -1
  57. package/package.json +3 -3
@@ -7,6 +7,7 @@ export interface Cluster {
7
7
  provider?: string;
8
8
  region?: string;
9
9
  paused: boolean;
10
+ clusterId?: string;
10
11
  state?: "IDLE" | "CREATING" | "UPDATING" | "DELETING" | "REPAIRING";
11
12
  mongoDBVersion?: string;
12
13
  connectionStrings?: ClusterConnectionStrings;
@@ -1 +1 @@
1
- {"version":3,"file":"cluster.d.ts","sourceRoot":"","sources":["../../../../src/common/atlas/cluster.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,wBAAwB,EACxB,0BAA0B,EAC1B,8BAA8B,EACjC,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAc9E,MAAM,WAAW,OAAO;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,GAAG,WAAW,GAAG,MAAM,CAAC;IAC5C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,GAAG,UAAU,GAAG,UAAU,GAAG,UAAU,GAAG,WAAW,CAAC;IACpE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,CAAC,EAAE,wBAAwB,CAAC;IAC7C,UAAU,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CAC9B;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,8BAA8B,GAAG,OAAO,CAalF;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAkD1E;AAED,wBAAsB,cAAc,CAChC,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE,uBAAuB,GAClC,OAAO,CAAC,OAAO,CAAC,CAuClB;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAC/B,iBAAiB,EAAE,wBAAwB,EAC3C,cAAc,EAAE,UAAU,GAAG,SAAS,GAAG,iBAAiB,GAC3D,MAAM,GAAG,SAAS,CAYpB;AAED,wBAAsB,wBAAwB,CAC1C,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE,uBAAuB,GAClC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAUxB"}
1
+ {"version":3,"file":"cluster.d.ts","sourceRoot":"","sources":["../../../../src/common/atlas/cluster.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,wBAAwB,EACxB,0BAA0B,EAC1B,8BAA8B,EACjC,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAc9E,MAAM,WAAW,OAAO;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,GAAG,WAAW,GAAG,MAAM,CAAC;IAC5C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,GAAG,UAAU,GAAG,UAAU,GAAG,UAAU,GAAG,WAAW,CAAC;IACpE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,CAAC,EAAE,wBAAwB,CAAC;IAC7C,UAAU,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CAC9B;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,8BAA8B,GAAG,OAAO,CAclF;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAmD1E;AAED,wBAAsB,cAAc,CAChC,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE,uBAAuB,GAClC,OAAO,CAAC,OAAO,CAAC,CAuClB;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAC/B,iBAAiB,EAAE,wBAAwB,EAC3C,cAAc,EAAE,UAAU,GAAG,SAAS,GAAG,iBAAiB,GAC3D,MAAM,GAAG,SAAS,CAYpB;AAED,wBAAsB,wBAAwB,CAC1C,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE,uBAAuB,GAClC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAUxB"}
@@ -18,6 +18,7 @@ function extractProcessIds(connectionString) {
18
18
  function formatFlexCluster(cluster) {
19
19
  return {
20
20
  name: cluster.name,
21
+ clusterId: cluster.id,
21
22
  instanceType: "FLEX",
22
23
  instanceSize: undefined,
23
24
  provider: cluster.providerSettings?.backingProviderName,
@@ -48,6 +49,7 @@ function formatCluster(cluster) {
48
49
  const region = primaryRegionConfig?.regionName;
49
50
  return {
50
51
  name: cluster.name,
52
+ clusterId: cluster.id,
51
53
  instanceType: clusterInstanceType,
52
54
  instanceSize: clusterInstanceType === "DEDICATED" ? instanceSize : undefined,
53
55
  provider,
@@ -1 +1 @@
1
- {"version":3,"file":"cluster.js","sourceRoot":"","sources":["../../../../src/common/atlas/cluster.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cluster.js","sourceRoot":"","sources":["../../../../src/common/atlas/cluster.ts"],"names":[],"mappings":"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"}
@@ -17,15 +17,30 @@ export interface ConnectionStringInfo {
17
17
  /**
18
18
  * Atlas cluster connection info containing details about the connected Atlas cluster.
19
19
  * When provided, indicates the connection is to an Atlas cluster.
20
+ *
21
+ * The cluster's projectId, name and id are required. A host that establishes the
22
+ * connection without minting a temporary database user — via its own credential
23
+ * issuance, X.509, a pre-provisioned user, a proxy — still knows which cluster it
24
+ * connected to and needs to be able to specify it: this field is what marks a
25
+ * connection as pointing at Atlas, and leaving it unset prevents cluster
26
+ * attribution on tool telemetry, the `atlas` host type, and the ability of
27
+ * `pause-resume-cluster` to find connections to the cluster it just paused.
28
+ * Hosts that only know the cluster name should resolve the id through the Atlas
29
+ * API before connecting.
20
30
  */
21
31
  export interface AtlasClusterConnectionInfo {
22
- username: string;
32
+ /** Which Atlas cluster this connection points at. */
23
33
  projectId: string;
24
34
  clusterName: string;
25
- instanceType: "FREE" | "FLEX" | "DEDICATED";
26
- provider?: string;
27
- region?: string;
28
- expiryDate: Date;
35
+ clusterId: string;
36
+ /**
37
+ * The temporary database user backing the connection. Set only by
38
+ * `connect-cluster`, which also schedules its deletion; absent when the
39
+ * host supplied its own credentials.
40
+ */
41
+ username?: string;
42
+ /** The cluster's tier, set when the host resolved it. */
43
+ instanceType?: "FREE" | "FLEX" | "DEDICATED";
29
44
  }
30
45
  /**
31
46
  * Get metadata about the connection string including authentication type and host type.
@@ -1 +1 @@
1
- {"version":3,"file":"connectionInfo.d.ts","sourceRoot":"","sources":["../../../src/common/connectionInfo.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD;;;GAGG;AACH,MAAM,MAAM,wBAAwB,GAAG,OAAO,GAAG,OAAO,GAAG,aAAa,GAAG,SAAS,CAAC;AAErF,MAAM,MAAM,sBAAsB,GAAG,gBAAgB,GAAG,kBAAkB,CAAC;AAC3E,MAAM,MAAM,wBAAwB,GAAG,OAAO,GAAG,MAAM,GAAG,UAAU,GAAG,sBAAsB,GAAG,OAAO,CAAC;AAExG;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACjC,QAAQ,EAAE,wBAAwB,CAAC;IACnC,QAAQ,EAAE,wBAAwB,CAAC;CACtC;AAED;;;GAGG;AACH,MAAM,WAAW,0BAA0B;IACvC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,GAAG,MAAM,GAAG,WAAW,CAAC;IAC5C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,IAAI,CAAC;CACpB;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACnC,gBAAgB,EAAE,MAAM,EACxB,MAAM,EAAE,UAAU,EAClB,SAAS,CAAC,EAAE,0BAA0B,GACvC,oBAAoB,CAKtB;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,gBAAgB,EAAE,MAAM,GAAG,wBAAwB,CAU9E;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,GAAG,wBAAwB,CAmClG"}
1
+ {"version":3,"file":"connectionInfo.d.ts","sourceRoot":"","sources":["../../../src/common/connectionInfo.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD;;;GAGG;AACH,MAAM,MAAM,wBAAwB,GAAG,OAAO,GAAG,OAAO,GAAG,aAAa,GAAG,SAAS,CAAC;AAErF,MAAM,MAAM,sBAAsB,GAAG,gBAAgB,GAAG,kBAAkB,CAAC;AAC3E,MAAM,MAAM,wBAAwB,GAAG,OAAO,GAAG,MAAM,GAAG,UAAU,GAAG,sBAAsB,GAAG,OAAO,CAAC;AAExG;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACjC,QAAQ,EAAE,wBAAwB,CAAC;IACnC,QAAQ,EAAE,wBAAwB,CAAC;CACtC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,WAAW,0BAA0B;IACvC,qDAAqD;IACrD,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAElB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,yDAAyD;IACzD,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,WAAW,CAAC;CAChD;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACnC,gBAAgB,EAAE,MAAM,EACxB,MAAM,EAAE,UAAU,EAClB,SAAS,CAAC,EAAE,0BAA0B,GACvC,oBAAoB,CAKtB;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,gBAAgB,EAAE,MAAM,GAAG,wBAAwB,CAU9E;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,GAAG,wBAAwB,CAmClG"}
@@ -1 +1 @@
1
- {"version":3,"file":"connectionInfo.js","sourceRoot":"","sources":["../../../src/common/connectionInfo.ts"],"names":[],"mappings":";;AA4CA,0DASC;AAOD,kCAUC;AAQD,kCAmCC;AAjHD,2DAA0D;AAE1D,iFAAiE;AAmCjE;;;;;;GAMG;AACH,SAAgB,uBAAuB,CACnC,gBAAwB,EACxB,MAAkB,EAClB,SAAsC;IAEtC,OAAO;QACH,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,gBAAgB,CAAC;QAC/C,QAAQ,EAAE,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,gBAAgB,CAAC;KAC9E,CAAC;AACN,CAAC;AAED;;;;GAIG;AACH,SAAgB,WAAW,CAAC,gBAAwB;IAChD,IAAI,IAAA,4BAAO,EAAC,gBAAgB,CAAC,EAAE,CAAC;QAC5B,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,IAAI,IAAA,gCAAW,EAAC,gBAAgB,CAAC,EAAE,CAAC;QAChC,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAED;;;;;GAKG;AACH,SAAgB,WAAW,CAAC,MAAkB,EAAE,gBAAwB;IACpE,MAAM,UAAU,GAAG,IAAI,gDAAgB,CAAC,gBAAgB,CAAC,CAAC;IAC1D,MAAM,YAAY,GAAG,UAAU,CAAC,iBAAiB,EAAsB,CAAC;IAExE,QAAQ,YAAY,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,CAAC;QACxC,KAAK,cAAc,CAAC,CAAC,CAAC;YAClB,IAAI,MAAM,CAAC,SAAS,KAAK,OAAO,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACjD,OAAO,gBAAgB,CAAC;YAC5B,CAAC;YAED,IACI,MAAM,CAAC,SAAS,KAAK,MAAM;gBAC3B,CAAC,MAAM,CAAC,QAAQ,KAAK,WAAW,IAAI,MAAM,CAAC,QAAQ,KAAK,WAAW,CAAC;gBACpE,MAAM,CAAC,OAAO,EAChB,CAAC;gBACC,OAAO,gBAAgB,CAAC;YAC5B,CAAC;YAED,OAAO,kBAAkB,CAAC;QAC9B,CAAC;QACD,KAAK,cAAc;YACf,OAAO,OAAO,CAAC;QACnB,KAAK,QAAQ;YACT,OAAO,UAAU,CAAC;QACtB,KAAK,OAAO;YACR,IAAI,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,WAAW,EAAE,CAAC;gBACjD,OAAO,MAAM,CAAC;YAClB,CAAC;YACD,OAAO,OAAO,CAAC;QACnB,uDAAuD;QACvD,YAAY;QACZ,KAAK,IAAI,CAAC;QACV;YACI,OAAO,OAAO,CAAC;IACvB,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"connectionInfo.js","sourceRoot":"","sources":["../../../src/common/connectionInfo.ts"],"names":[],"mappings":";;AA6DA,0DASC;AAOD,kCAUC;AAQD,kCAmCC;AAlID,2DAA0D;AAE1D,iFAAiE;AAoDjE;;;;;;GAMG;AACH,SAAgB,uBAAuB,CACnC,gBAAwB,EACxB,MAAkB,EAClB,SAAsC;IAEtC,OAAO;QACH,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,gBAAgB,CAAC;QAC/C,QAAQ,EAAE,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,gBAAgB,CAAC;KAC9E,CAAC;AACN,CAAC;AAED;;;;GAIG;AACH,SAAgB,WAAW,CAAC,gBAAwB;IAChD,IAAI,IAAA,4BAAO,EAAC,gBAAgB,CAAC,EAAE,CAAC;QAC5B,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,IAAI,IAAA,gCAAW,EAAC,gBAAgB,CAAC,EAAE,CAAC;QAChC,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAED;;;;;GAKG;AACH,SAAgB,WAAW,CAAC,MAAkB,EAAE,gBAAwB;IACpE,MAAM,UAAU,GAAG,IAAI,gDAAgB,CAAC,gBAAgB,CAAC,CAAC;IAC1D,MAAM,YAAY,GAAG,UAAU,CAAC,iBAAiB,EAAsB,CAAC;IAExE,QAAQ,YAAY,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,CAAC;QACxC,KAAK,cAAc,CAAC,CAAC,CAAC;YAClB,IAAI,MAAM,CAAC,SAAS,KAAK,OAAO,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACjD,OAAO,gBAAgB,CAAC;YAC5B,CAAC;YAED,IACI,MAAM,CAAC,SAAS,KAAK,MAAM;gBAC3B,CAAC,MAAM,CAAC,QAAQ,KAAK,WAAW,IAAI,MAAM,CAAC,QAAQ,KAAK,WAAW,CAAC;gBACpE,MAAM,CAAC,OAAO,EAChB,CAAC;gBACC,OAAO,gBAAgB,CAAC;YAC5B,CAAC;YAED,OAAO,kBAAkB,CAAC;QAC9B,CAAC;QACD,KAAK,cAAc;YACf,OAAO,OAAO,CAAC;QACnB,KAAK,QAAQ;YACT,OAAO,UAAU,CAAC;QACtB,KAAK,OAAO;YACR,IAAI,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,WAAW,EAAE,CAAC;gBACjD,OAAO,MAAM,CAAC;YAClB,CAAC;YACD,OAAO,OAAO,CAAC;QACnB,uDAAuD;QACvD,YAAY;QACZ,KAAK,IAAI,CAAC;QACV;YACI,OAAO,OAAO,CAAC;IACvB,CAAC;AACL,CAAC"}
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.packageInfo = void 0;
4
4
  // This file was generated by scripts/updatePackageVersion.ts - Do not edit it manually.
5
5
  exports.packageInfo = {
6
- version: "2.1.0",
6
+ version: "2.1.1",
7
7
  mcpServerName: "MongoDB MCP Server",
8
8
  engines: {
9
9
  node: "^20.19.0 || ^22.13.0 || >= 24.0.0",
@@ -1,29 +1,23 @@
1
1
  import type { BaseEvent } from "./types.js";
2
2
  /**
3
- * Singleton class for in-memory telemetry event caching
4
- * Provides a central storage for telemetry events that couldn't be sent
3
+ * In-memory telemetry event cache. Each telemetry pipeline owns its own
4
+ * instance so events are only ever sent through the pipeline that emitted them.
5
5
  * Uses LRU cache to automatically drop oldest events when limit is exceeded
6
6
  */
7
- export declare class EventCache {
8
- private static instance;
7
+ export declare class EventCache<T extends BaseEvent = BaseEvent> {
9
8
  private static readonly MAX_EVENTS;
10
9
  private cache;
11
10
  private nextId;
12
11
  /** Current exclusive operation, if any. The next caller awaits this before starting. */
13
12
  private currentOperation;
14
13
  constructor();
15
- /**
16
- * Gets the singleton instance of EventCache
17
- * @returns The EventCache instance
18
- */
19
- static getInstance(): EventCache;
20
14
  /**
21
15
  * Gets the number of currently cached events
22
16
  */
23
17
  get size(): number;
24
18
  /**
25
19
  * Runs a callback with exclusive access to the cache so operations
26
- * are serialized across all callers (e.g. multiple Telemetry instances / sessions).
20
+ * are serialized across all callers (e.g. the send timer racing a close() flush).
27
21
  */
28
22
  private runExclusive;
29
23
  /**
@@ -32,23 +26,23 @@ export declare class EventCache {
32
26
  * are removed from the cache; otherwise they remain untouched.
33
27
  * Returns the `result` from the processor, or `undefined` if the cache was empty.
34
28
  */
35
- processOldestBatch<T>(batchSize: number, processor: (events: BaseEvent[]) => Promise<{
29
+ processOldestBatch<R>(batchSize: number, processor: (events: T[]) => Promise<{
36
30
  removeProcessed: boolean;
37
- result: T;
38
- }>): Promise<T | undefined>;
31
+ result: R;
32
+ }>): Promise<R | undefined>;
39
33
  /**
40
34
  * Gets a copy of the currently cached events along with their ids
41
35
  * @returns Array of cached BaseEvent objects
42
36
  */
43
37
  getEvents(): {
44
38
  id: number;
45
- event: BaseEvent;
39
+ event: T;
46
40
  }[];
47
41
  /**
48
42
  * Appends new events to the cache.
49
43
  * LRU cache automatically handles dropping oldest events when limit is exceeded.
50
44
  */
51
- appendEvents(events: BaseEvent[]): void;
45
+ appendEvents(events: T[]): void;
52
46
  /**
53
47
  * Removes cached events by their ids
54
48
  */
@@ -1 +1 @@
1
- {"version":3,"file":"eventCache.d.ts","sourceRoot":"","sources":["../../../src/telemetry/eventCache.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C;;;;GAIG;AACH,qBAAa,UAAU;IACnB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAa;IACpC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAQ;IAE1C,OAAO,CAAC,KAAK,CAA8B;IAC3C,OAAO,CAAC,MAAM,CAAK;IACnB,wFAAwF;IACxF,OAAO,CAAC,gBAAgB,CAA8D;;IAWtF;;;OAGG;WACW,WAAW,IAAI,UAAU;IAOvC;;OAEG;IACH,IAAW,IAAI,IAAI,MAAM,CAExB;IAED;;;OAGG;YACW,YAAY;IAoB1B;;;;;OAKG;IACU,kBAAkB,CAAC,CAAC,EAC7B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,OAAO,CAAC;QAAE,eAAe,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,CAAC,CAAA;KAAE,CAAC,GACrF,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAmBzB;;;OAGG;IACI,SAAS,IAAI;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,SAAS,CAAA;KAAE,EAAE;IAItD;;;OAGG;IACI,YAAY,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI;IAM9C;;OAEG;IACI,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI;CAK3C"}
1
+ {"version":3,"file":"eventCache.d.ts","sourceRoot":"","sources":["../../../src/telemetry/eventCache.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C;;;;GAIG;AACH,qBAAa,UAAU,CAAC,CAAC,SAAS,SAAS,GAAG,SAAS;IACnD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAQ;IAE1C,OAAO,CAAC,KAAK,CAAsB;IACnC,OAAO,CAAC,MAAM,CAAK;IACnB,wFAAwF;IACxF,OAAO,CAAC,gBAAgB,CAA8D;;IAWtF;;OAEG;IACH,IAAW,IAAI,IAAI,MAAM,CAExB;IAED;;;OAGG;YACW,YAAY;IAoB1B;;;;;OAKG;IACU,kBAAkB,CAAC,CAAC,EAC7B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,OAAO,CAAC;QAAE,eAAe,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,CAAC,CAAA;KAAE,CAAC,GAC7E,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAmBzB;;;OAGG;IACI,SAAS,IAAI;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,CAAC,CAAA;KAAE,EAAE;IAI9C;;;OAGG;IACI,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,GAAG,IAAI;IAMtC;;OAEG;IACI,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI;CAK3C"}
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.EventCache = void 0;
4
4
  const lru_cache_1 = require("lru-cache");
5
5
  /**
6
- * Singleton class for in-memory telemetry event caching
7
- * Provides a central storage for telemetry events that couldn't be sent
6
+ * In-memory telemetry event cache. Each telemetry pipeline owns its own
7
+ * instance so events are only ever sent through the pipeline that emitted them.
8
8
  * Uses LRU cache to automatically drop oldest events when limit is exceeded
9
9
  */
10
10
  class EventCache {
@@ -17,16 +17,6 @@ class EventCache {
17
17
  updateAgeOnGet: false,
18
18
  });
19
19
  }
20
- /**
21
- * Gets the singleton instance of EventCache
22
- * @returns The EventCache instance
23
- */
24
- static getInstance() {
25
- if (!EventCache.instance) {
26
- EventCache.instance = new EventCache();
27
- }
28
- return EventCache.instance;
29
- }
30
20
  /**
31
21
  * Gets the number of currently cached events
32
22
  */
@@ -35,7 +25,7 @@ class EventCache {
35
25
  }
36
26
  /**
37
27
  * Runs a callback with exclusive access to the cache so operations
38
- * are serialized across all callers (e.g. multiple Telemetry instances / sessions).
28
+ * are serialized across all callers (e.g. the send timer racing a close() flush).
39
29
  */
40
30
  async runExclusive(fn) {
41
31
  const prevOperation = this.currentOperation;
@@ -1 +1 @@
1
- {"version":3,"file":"eventCache.js","sourceRoot":"","sources":["../../../src/telemetry/eventCache.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"eventCache.js","sourceRoot":"","sources":["../../../src/telemetry/eventCache.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import type { BaseEvent, CommonProperties } from "./types.js";
1
+ import type { BaseEvent, CommonProperties, TelemetryEvent } from "./types.js";
2
2
  import type { LoggerBase } from "../common/logging/index.js";
3
3
  import type { ApiClient } from "../common/atlas/apiClient.js";
4
4
  import { EventCache } from "./eventCache.js";
@@ -34,21 +34,23 @@ export interface TelemetryConfig {
34
34
  enabled: boolean;
35
35
  /**
36
36
  * Returns the host-supplied common properties merged onto every event
37
- * (e.g. hosting mode, MCP client identity, transport). Invoked on every
38
- * send so values resolved after construction — like the client name/
39
- * version exchanged during handshake — are captured. Static properties
40
- * can simply be returned as constants from this callback.
37
+ * (e.g. hosting mode, MCP client identity, transport). Invoked when
38
+ * events are emitted, so each event carries the properties of the
39
+ * pipeline that produced it; values like the MCP client name/version
40
+ * must be available before the events that should carry them are
41
+ * emitted. Static properties can simply be returned as constants.
41
42
  *
42
43
  * Machine metadata, device id, and container environment are provided by
43
44
  * the pipeline itself and don't need to be returned here.
44
45
  */
45
46
  getCommonProperties?: () => Partial<CommonProperties>;
46
47
  /**
47
- * Optional override for the underlying event cache. Defaults to the
48
- * process-wide singleton returned by {@link EventCache.getInstance}.
49
- * Mostly useful for tests or callers that need to isolate caching.
48
+ * Optional override for the underlying event cache. Defaults to a new
49
+ * cache owned exclusively by this pipeline, so events are only ever sent
50
+ * through the pipeline (and API client) that emitted them. Holds events
51
+ * that already include this pipeline's common properties.
50
52
  */
51
- eventCache?: EventCache;
53
+ eventCache?: EventCache<TelemetryEvent<CommonProperties>>;
52
54
  }
53
55
  /** Maximum number of events sent per batch. */
54
56
  export declare const BATCH_SIZE = 32;
@@ -81,6 +83,7 @@ export declare class Telemetry {
81
83
  private readonly deviceId;
82
84
  private backoffMs;
83
85
  private readonly timer;
86
+ private closed;
84
87
  private constructor();
85
88
  /**
86
89
  * @deprecated Pass a {@link TelemetryConfig} object instead. This
@@ -89,17 +92,32 @@ export declare class Telemetry {
89
92
  */
90
93
  static create(session: Session, userConfig: UserConfig, deviceId: DeviceId, options?: {
91
94
  commonProperties?: Partial<CommonProperties>;
92
- eventCache?: EventCache;
95
+ eventCache?: EventCache<TelemetryEvent<CommonProperties>>;
93
96
  }): Telemetry;
94
97
  static create(config: TelemetryConfig): Telemetry;
95
98
  private setup;
96
99
  close(): Promise<void>;
97
100
  /**
98
- * Caches events for sending via the background timer.
101
+ * Merges the common properties into the events and caches them for
102
+ * sending via the background timer.
103
+ *
104
+ * The merge is deferred until setup has resolved `device_id` and
105
+ * `is_container_env`. Callbacks chained on an already-settled promise run
106
+ * in registration order, so events are cached in the order they were emitted.
99
107
  */
100
108
  emitEvents(events: BaseEvent[]): void;
101
109
  /**
102
- * Gets the common properties for events
110
+ * Resolves once setup has completed (or immediately if setup never ran).
111
+ * Never rejects — a failed setup must not turn emitEvents into an unhandled rejection.
112
+ */
113
+ private whenReady;
114
+ /**
115
+ * Returns common properties merged onto every event at emit time, so each
116
+ * event carries the identity of the pipeline that produced it. Defaults to
117
+ * machine metadata plus pipeline-resolved `device_id` and
118
+ * `is_container_env`, with the host-supplied properties from
119
+ * {@link TelemetryConfig.getCommonProperties} merged on top; those must be
120
+ * available before the events that should carry them are emitted.
103
121
  */
104
122
  getCommonProperties(): CommonProperties;
105
123
  /**
@@ -112,6 +130,7 @@ export declare class Telemetry {
112
130
  isTelemetryEnabled(): boolean;
113
131
  /**
114
132
  * Schedules the next send attempt. Replaces any previously scheduled send.
133
+ * No-op once close() has been called.
115
134
  */
116
135
  private scheduleSend;
117
136
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../../src/telemetry/telemetry.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../../src/telemetry/telemetry.ts"],"names":[],"mappings":"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"}
@@ -33,18 +33,19 @@ class Telemetry {
33
33
  this.events = new events_1.EventEmitter();
34
34
  this.backoffMs = exports.INITIAL_BACKOFF_MS;
35
35
  this.timer = new timer_js_1.Timer();
36
+ this.closed = false;
36
37
  this.logger = config.logger;
37
38
  this.apiClient = config.apiClient;
38
39
  this.keychain = config.keychain;
39
40
  this.enabled = config.enabled;
40
41
  this.getHostCommonProperties = config.getCommonProperties ?? (() => ({}));
41
- this.eventCache = config.eventCache ?? eventCache_js_1.EventCache.getInstance();
42
+ this.eventCache = config.eventCache ?? new eventCache_js_1.EventCache();
42
43
  this.deviceId = config.deviceId;
43
44
  this.pipelineCommonProperties = {
44
45
  ...constants_js_1.MACHINE_METADATA,
45
46
  };
46
47
  }
47
- static create(sessionOrConfig, userConfig, deviceId, { commonProperties = {}, eventCache = eventCache_js_1.EventCache.getInstance(), } = {}) {
48
+ static create(sessionOrConfig, userConfig, deviceId, { commonProperties = {}, eventCache, } = {}) {
48
49
  const config = userConfig === undefined || deviceId === undefined
49
50
  ? sessionOrConfig
50
51
  : legacyConfigFromSession(sessionOrConfig, userConfig, deviceId, {
@@ -72,27 +73,70 @@ class Telemetry {
72
73
  this.scheduleSend();
73
74
  }
74
75
  async close() {
76
+ // Set before cancelling so that a setup() still in flight cannot schedule a new send afterwards.
77
+ this.closed = true;
75
78
  this.timer.cancel();
79
+ // The whole close is best-effort and bounded by CLOSE_TIMEOUT_MS: waiting for
80
+ // setup (so events emitted before it finished make it into the cache) and the
81
+ // final flush share the same budget, so a hung setup cannot block shutdown.
82
+ const signal = AbortSignal.timeout(CLOSE_TIMEOUT_MS);
83
+ await Promise.race([
84
+ this.whenReady(),
85
+ new Promise((resolve) => signal.addEventListener("abort", () => resolve(), { once: true })),
86
+ ]);
76
87
  this.logger.debug({
77
88
  id: index_js_1.LogId.telemetryClose,
78
89
  message: `Closing telemetry, attempting to flush up to ${exports.BATCH_SIZE} of ${this.eventCache.size} remaining events`,
79
90
  context: "telemetry",
80
91
  });
81
- // Best-effort: send one final batch before closing, bounded by CLOSE_TIMEOUT_MS
82
- await this.sendBatch({ signal: AbortSignal.timeout(CLOSE_TIMEOUT_MS) });
92
+ await this.sendBatch({ signal });
83
93
  }
84
94
  /**
85
- * Caches events for sending via the background timer.
95
+ * Merges the common properties into the events and caches them for
96
+ * sending via the background timer.
97
+ *
98
+ * The merge is deferred until setup has resolved `device_id` and
99
+ * `is_container_env`. Callbacks chained on an already-settled promise run
100
+ * in registration order, so events are cached in the order they were emitted.
86
101
  */
87
102
  emitEvents(events) {
88
103
  if (!this.isTelemetryEnabled()) {
89
104
  this.events.emit("events-skipped");
90
105
  return;
91
106
  }
92
- this.eventCache.appendEvents(events);
107
+ this.whenReady()
108
+ .then(() => {
109
+ const commonProperties = this.getCommonProperties();
110
+ this.eventCache.appendEvents(events.map((event) => ({
111
+ ...event,
112
+ properties: { ...commonProperties, ...event.properties },
113
+ })));
114
+ })
115
+ .catch((error) => {
116
+ // Telemetry must never take the process down via an unhandled rejection,
117
+ // e.g. when a getCommonProperties override throws.
118
+ this.logger.debug({
119
+ id: index_js_1.LogId.telemetryEmitFailure,
120
+ context: "telemetry",
121
+ message: `Error caching telemetry events: ${error instanceof Error ? error.message : String(error)}`,
122
+ noRedaction: true,
123
+ });
124
+ });
125
+ }
126
+ /**
127
+ * Resolves once setup has completed (or immediately if setup never ran).
128
+ * Never rejects — a failed setup must not turn emitEvents into an unhandled rejection.
129
+ */
130
+ whenReady() {
131
+ return (this.setupPromise ?? Promise.resolve()).then(() => undefined, () => undefined);
93
132
  }
94
133
  /**
95
- * Gets the common properties for events
134
+ * Returns common properties merged onto every event at emit time, so each
135
+ * event carries the identity of the pipeline that produced it. Defaults to
136
+ * machine metadata plus pipeline-resolved `device_id` and
137
+ * `is_container_env`, with the host-supplied properties from
138
+ * {@link TelemetryConfig.getCommonProperties} merged on top; those must be
139
+ * available before the events that should carry them are emitted.
96
140
  */
97
141
  getCommonProperties() {
98
142
  return {
@@ -120,8 +164,12 @@ class Telemetry {
120
164
  }
121
165
  /**
122
166
  * Schedules the next send attempt. Replaces any previously scheduled send.
167
+ * No-op once close() has been called.
123
168
  */
124
169
  scheduleSend(delayMs = exports.SEND_INTERVAL_MS) {
170
+ if (this.closed) {
171
+ return;
172
+ }
125
173
  this.timer.schedule(() => {
126
174
  void this.sendBatchAndReschedule();
127
175
  }, delayMs);
@@ -202,13 +250,7 @@ class Telemetry {
202
250
  try {
203
251
  const effectiveSignal = signal ?? AbortSignal.timeout(SEND_TIMEOUT_MS);
204
252
  const secrets = this.keychain?.allSecrets ?? [];
205
- await client.sendEvents(events.map((event) => ({
206
- ...event,
207
- properties: {
208
- ...(0, mongodb_redact_1.redact)(this.getCommonProperties(), secrets),
209
- ...(0, mongodb_redact_1.redact)(event.properties, secrets),
210
- },
211
- })), { signal: effectiveSignal });
253
+ await client.sendEvents(events.map((event) => ({ ...event, properties: (0, mongodb_redact_1.redact)(event.properties, secrets) })), { signal: effectiveSignal });
212
254
  return { status: "success" };
213
255
  }
214
256
  catch (error) {
@@ -1 +1 @@
1
- {"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../../src/telemetry/telemetry.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../../src/telemetry/telemetry.ts"],"names":[],"mappings":"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"}
@@ -191,6 +191,9 @@ export type ConnectionMetadata = AtlasMetadata & AtlasLocalToolMetadata & {
191
191
  connection_id?: string;
192
192
  connection_auth_type?: string;
193
193
  connection_host_type?: string;
194
+ /** Atlas cluster the connection points at, when it is an Atlas connection. */
195
+ cluster_name?: string;
196
+ cluster_id?: string;
194
197
  shared_tier_alerts_detected?: TelemetryBoolSet;
195
198
  shared_tier_tier?: SharedTierTier;
196
199
  shared_tier_alerts?: SharedTierMetricName[];
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/telemetry/types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/telemetry/types.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"connectCluster.d.ts","sourceRoot":"","sources":["../../../../../src/tools/atlas/connect/connectCluster.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,QAAQ,EAAE,KAAK,UAAU,EAAE,KAAK,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAE9G,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAWhD,OAAO,KAAK,EAAE,kBAAkB,EAAwC,MAAM,6BAA6B,CAAC;AAM5G,eAAO,MAAM,kBAAkB;;;;;;;;CAM9B,CAAC;AAEF,QAAA,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;CAS/B,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,0BAA0B,CAAC,CAAC,CAAC;AAE3F,qBAAa,kBAAmB,SAAQ,aAAa;IACjD,MAAM,CAAC,QAAQ,SAA2B;IACnC,WAAW,SACgM;IAClN,MAAM,CAAC,aAAa,EAAE,aAAa,CAAa;IACzC,SAAS;;;;;;;;MAAsB;IACtB,YAAY;;;;;;;;;;;;;;;;;;;;MAA8B;YAE5C,wBAAwB;YAuExB,mBAAmB;YA8BnB,gBAAgB;cA+Dd,OAAO,CACnB,EAAE,SAAS,EAAE,WAAW,EAAE,cAAc,EAAE,EAAE,QAAQ,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,EAC3E,OAAO,EAAE,oBAAoB,GAC9B,OAAO,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,YAAY,CAAC,CAAC;YA8HlC,iBAAiB;cAuCN,wBAAwB,CAC7C,IAAI,EAAE,QAAQ,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,EACrC,EAAE,MAAM,EAAE,EAAE;QAAE,MAAM,EAAE,UAAU,CAAC,OAAO,0BAA0B,CAAC,CAAA;KAAE,GACtE,OAAO,CAAC,kBAAkB,CAAC;CAwBjC"}
1
+ {"version":3,"file":"connectCluster.d.ts","sourceRoot":"","sources":["../../../../../src/tools/atlas/connect/connectCluster.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,QAAQ,EAAE,KAAK,UAAU,EAAE,KAAK,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAE9G,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAWhD,OAAO,KAAK,EAAE,kBAAkB,EAAwC,MAAM,6BAA6B,CAAC;AAM5G,eAAO,MAAM,kBAAkB;;;;;;;;CAM9B,CAAC;AAEF,QAAA,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;CAS/B,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,0BAA0B,CAAC,CAAC,CAAC;AAE3F,qBAAa,kBAAmB,SAAQ,aAAa;IACjD,MAAM,CAAC,QAAQ,SAA2B;IACnC,WAAW,SACgM;IAClN,MAAM,CAAC,aAAa,EAAE,aAAa,CAAa;IACzC,SAAS;;;;;;;;MAAsB;IACtB,YAAY;;;;;;;;;;;;;;;;;;;;MAA8B;YAE5C,wBAAwB;YAwExB,mBAAmB;YA8BnB,gBAAgB;cA+Dd,OAAO,CACnB,EAAE,SAAS,EAAE,WAAW,EAAE,cAAc,EAAE,EAAE,QAAQ,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,EAC3E,OAAO,EAAE,oBAAoB,GAC9B,OAAO,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,YAAY,CAAC,CAAC;YA8HlC,iBAAiB;cAuCN,wBAAwB,CAC7C,IAAI,EAAE,QAAQ,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,EACrC,EAAE,MAAM,EAAE,EAAE;QAAE,MAAM,EAAE,UAAU,CAAC,OAAO,0BAA0B,CAAC,CAAA;KAAE,GACtE,OAAO,CAAC,kBAAkB,CAAC;CAwBjC"}
@@ -39,6 +39,9 @@ class ConnectClusterTool extends atlasTool_js_1.AtlasToolBase {
39
39
  }
40
40
  async prepareClusterConnection(projectId, clusterName, connectionType = "standard", context) {
41
41
  const cluster = await (0, cluster_js_1.inspectCluster)(this.apiClient, projectId, clusterName, context);
42
+ if (cluster.clusterId === undefined) {
43
+ throw new Error(`Atlas did not return an id for cluster "${clusterName}" in project "${projectId}"`);
44
+ }
42
45
  if (cluster.connectionStrings === undefined) {
43
46
  throw new Error("Connection strings not available");
44
47
  }
@@ -75,10 +78,8 @@ class ConnectClusterTool extends atlasTool_js_1.AtlasToolBase {
75
78
  username,
76
79
  projectId,
77
80
  clusterName,
81
+ clusterId: cluster.clusterId,
78
82
  instanceType: cluster.instanceType,
79
- provider: cluster.provider,
80
- region: cluster.region,
81
- expiryDate,
82
83
  };
83
84
  const cn = new URL(connectionString);
84
85
  cn.username = username;