@himanshusinghs/mongodb-mcp-server 0.3.0 → 0.3.1-prerelease.2

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 (176) hide show
  1. package/README.md +108 -44
  2. package/dist/cjs/common/atlas/accessListUtils.d.ts +2 -1
  3. package/dist/cjs/common/atlas/accessListUtils.d.ts.map +1 -1
  4. package/dist/cjs/common/atlas/accessListUtils.js +4 -1
  5. package/dist/cjs/common/atlas/accessListUtils.js.map +1 -1
  6. package/dist/cjs/common/config.d.ts +9 -3
  7. package/dist/cjs/common/config.d.ts.map +1 -1
  8. package/dist/cjs/common/config.js +88 -5
  9. package/dist/cjs/common/config.js.map +1 -1
  10. package/dist/cjs/common/connectionErrorHandler.d.ts +18 -0
  11. package/dist/cjs/common/connectionErrorHandler.d.ts.map +1 -0
  12. package/dist/cjs/common/connectionErrorHandler.js +70 -0
  13. package/dist/cjs/common/connectionErrorHandler.js.map +1 -0
  14. package/dist/cjs/common/connectionManager.d.ts.map +1 -1
  15. package/dist/cjs/common/connectionManager.js +7 -11
  16. package/dist/cjs/common/connectionManager.js.map +1 -1
  17. package/dist/cjs/common/errors.d.ts +5 -4
  18. package/dist/cjs/common/errors.d.ts.map +1 -1
  19. package/dist/cjs/common/errors.js +1 -0
  20. package/dist/cjs/common/errors.js.map +1 -1
  21. package/dist/cjs/common/exportsManager.d.ts +1 -1
  22. package/dist/cjs/common/exportsManager.d.ts.map +1 -1
  23. package/dist/cjs/common/keychain.d.ts +22 -0
  24. package/dist/cjs/common/keychain.d.ts.map +1 -0
  25. package/dist/cjs/common/keychain.js +36 -0
  26. package/dist/cjs/common/keychain.js.map +1 -0
  27. package/dist/cjs/common/logger.d.ts +10 -2
  28. package/dist/cjs/common/logger.d.ts.map +1 -1
  29. package/dist/cjs/common/logger.js +20 -11
  30. package/dist/cjs/common/logger.js.map +1 -1
  31. package/dist/cjs/common/packageInfo.js +1 -1
  32. package/dist/cjs/common/packageInfo.js.map +1 -1
  33. package/dist/cjs/common/session.d.ts +4 -1
  34. package/dist/cjs/common/session.d.ts.map +1 -1
  35. package/dist/cjs/common/session.js +2 -1
  36. package/dist/cjs/common/session.js.map +1 -1
  37. package/dist/cjs/helpers/connectionOptions.js +3 -6
  38. package/dist/cjs/helpers/connectionOptions.js.map +1 -1
  39. package/dist/cjs/index.js +9 -2
  40. package/dist/cjs/index.js.map +1 -1
  41. package/dist/cjs/lib.d.ts +4 -1
  42. package/dist/cjs/lib.d.ts.map +1 -1
  43. package/dist/cjs/lib.js +6 -3
  44. package/dist/cjs/lib.js.map +1 -1
  45. package/dist/cjs/server.d.ts +4 -1
  46. package/dist/cjs/server.d.ts.map +1 -1
  47. package/dist/cjs/server.js +16 -5
  48. package/dist/cjs/server.js.map +1 -1
  49. package/dist/cjs/telemetry/eventCache.d.ts +11 -4
  50. package/dist/cjs/telemetry/eventCache.d.ts.map +1 -1
  51. package/dist/cjs/telemetry/eventCache.js +13 -6
  52. package/dist/cjs/telemetry/eventCache.js.map +1 -1
  53. package/dist/cjs/telemetry/telemetry.d.ts +9 -2
  54. package/dist/cjs/telemetry/telemetry.d.ts.map +1 -1
  55. package/dist/cjs/telemetry/telemetry.js +79 -42
  56. package/dist/cjs/telemetry/telemetry.js.map +1 -1
  57. package/dist/cjs/telemetry/types.d.ts +48 -0
  58. package/dist/cjs/telemetry/types.d.ts.map +1 -1
  59. package/dist/cjs/tools/atlas/connect/connectCluster.d.ts.map +1 -1
  60. package/dist/cjs/tools/atlas/connect/connectCluster.js +49 -25
  61. package/dist/cjs/tools/atlas/connect/connectCluster.js.map +1 -1
  62. package/dist/cjs/tools/atlas/create/createDBUser.d.ts.map +1 -1
  63. package/dist/cjs/tools/atlas/create/createDBUser.js +4 -0
  64. package/dist/cjs/tools/atlas/create/createDBUser.js.map +1 -1
  65. package/dist/cjs/tools/atlas/read/listProjects.js +1 -1
  66. package/dist/cjs/tools/atlas/read/listProjects.js.map +1 -1
  67. package/dist/cjs/tools/mongodb/mongodbTool.d.ts.map +1 -1
  68. package/dist/cjs/tools/mongodb/mongodbTool.js +11 -52
  69. package/dist/cjs/tools/mongodb/mongodbTool.js.map +1 -1
  70. package/dist/cjs/tools/mongodb/read/aggregate.d.ts +1 -0
  71. package/dist/cjs/tools/mongodb/read/aggregate.d.ts.map +1 -1
  72. package/dist/cjs/tools/mongodb/read/aggregate.js +12 -0
  73. package/dist/cjs/tools/mongodb/read/aggregate.js.map +1 -1
  74. package/dist/cjs/tools/tool.d.ts.map +1 -1
  75. package/dist/cjs/tools/tool.js +11 -5
  76. package/dist/cjs/tools/tool.js.map +1 -1
  77. package/dist/cjs/transports/base.d.ts +14 -3
  78. package/dist/cjs/transports/base.d.ts.map +1 -1
  79. package/dist/cjs/transports/base.js +14 -5
  80. package/dist/cjs/transports/base.js.map +1 -1
  81. package/dist/cjs/transports/stdio.d.ts +2 -5
  82. package/dist/cjs/transports/stdio.d.ts.map +1 -1
  83. package/dist/cjs/transports/stdio.js +2 -3
  84. package/dist/cjs/transports/stdio.js.map +1 -1
  85. package/dist/cjs/transports/streamableHttp.d.ts +3 -5
  86. package/dist/cjs/transports/streamableHttp.d.ts.map +1 -1
  87. package/dist/cjs/transports/streamableHttp.js +18 -6
  88. package/dist/cjs/transports/streamableHttp.js.map +1 -1
  89. package/dist/esm/common/atlas/accessListUtils.d.ts +2 -1
  90. package/dist/esm/common/atlas/accessListUtils.d.ts.map +1 -1
  91. package/dist/esm/common/atlas/accessListUtils.js +4 -1
  92. package/dist/esm/common/atlas/accessListUtils.js.map +1 -1
  93. package/dist/esm/common/config.d.ts +9 -3
  94. package/dist/esm/common/config.d.ts.map +1 -1
  95. package/dist/esm/common/config.js +85 -4
  96. package/dist/esm/common/config.js.map +1 -1
  97. package/dist/esm/common/connectionErrorHandler.d.ts +18 -0
  98. package/dist/esm/common/connectionErrorHandler.d.ts.map +1 -0
  99. package/dist/esm/common/connectionErrorHandler.js +66 -0
  100. package/dist/esm/common/connectionErrorHandler.js.map +1 -0
  101. package/dist/esm/common/connectionManager.d.ts.map +1 -1
  102. package/dist/esm/common/connectionManager.js +6 -7
  103. package/dist/esm/common/connectionManager.js.map +1 -1
  104. package/dist/esm/common/errors.d.ts +5 -4
  105. package/dist/esm/common/errors.d.ts.map +1 -1
  106. package/dist/esm/common/errors.js +1 -0
  107. package/dist/esm/common/errors.js.map +1 -1
  108. package/dist/esm/common/exportsManager.d.ts +1 -1
  109. package/dist/esm/common/exportsManager.d.ts.map +1 -1
  110. package/dist/esm/common/keychain.d.ts +22 -0
  111. package/dist/esm/common/keychain.d.ts.map +1 -0
  112. package/dist/esm/common/keychain.js +31 -0
  113. package/dist/esm/common/keychain.js.map +1 -0
  114. package/dist/esm/common/logger.d.ts +10 -2
  115. package/dist/esm/common/logger.d.ts.map +1 -1
  116. package/dist/esm/common/logger.js +20 -11
  117. package/dist/esm/common/logger.js.map +1 -1
  118. package/dist/esm/common/packageInfo.js +1 -1
  119. package/dist/esm/common/packageInfo.js.map +1 -1
  120. package/dist/esm/common/session.d.ts +4 -1
  121. package/dist/esm/common/session.d.ts.map +1 -1
  122. package/dist/esm/common/session.js +2 -1
  123. package/dist/esm/common/session.js.map +1 -1
  124. package/dist/esm/helpers/connectionOptions.js +1 -1
  125. package/dist/esm/helpers/connectionOptions.js.map +1 -1
  126. package/dist/esm/index.js +9 -2
  127. package/dist/esm/index.js.map +1 -1
  128. package/dist/esm/lib.d.ts +4 -1
  129. package/dist/esm/lib.d.ts.map +1 -1
  130. package/dist/esm/lib.js +2 -1
  131. package/dist/esm/lib.js.map +1 -1
  132. package/dist/esm/server.d.ts +4 -1
  133. package/dist/esm/server.d.ts.map +1 -1
  134. package/dist/esm/server.js +16 -5
  135. package/dist/esm/server.js.map +1 -1
  136. package/dist/esm/telemetry/eventCache.d.ts +11 -4
  137. package/dist/esm/telemetry/eventCache.d.ts.map +1 -1
  138. package/dist/esm/telemetry/eventCache.js +13 -6
  139. package/dist/esm/telemetry/eventCache.js.map +1 -1
  140. package/dist/esm/telemetry/telemetry.d.ts +9 -2
  141. package/dist/esm/telemetry/telemetry.d.ts.map +1 -1
  142. package/dist/esm/telemetry/telemetry.js +79 -42
  143. package/dist/esm/telemetry/telemetry.js.map +1 -1
  144. package/dist/esm/telemetry/types.d.ts +48 -0
  145. package/dist/esm/telemetry/types.d.ts.map +1 -1
  146. package/dist/esm/tools/atlas/connect/connectCluster.d.ts.map +1 -1
  147. package/dist/esm/tools/atlas/connect/connectCluster.js +49 -25
  148. package/dist/esm/tools/atlas/connect/connectCluster.js.map +1 -1
  149. package/dist/esm/tools/atlas/create/createDBUser.d.ts.map +1 -1
  150. package/dist/esm/tools/atlas/create/createDBUser.js +4 -0
  151. package/dist/esm/tools/atlas/create/createDBUser.js.map +1 -1
  152. package/dist/esm/tools/atlas/read/listProjects.js +1 -1
  153. package/dist/esm/tools/atlas/read/listProjects.js.map +1 -1
  154. package/dist/esm/tools/mongodb/mongodbTool.d.ts.map +1 -1
  155. package/dist/esm/tools/mongodb/mongodbTool.js +11 -52
  156. package/dist/esm/tools/mongodb/mongodbTool.js.map +1 -1
  157. package/dist/esm/tools/mongodb/read/aggregate.d.ts +1 -0
  158. package/dist/esm/tools/mongodb/read/aggregate.d.ts.map +1 -1
  159. package/dist/esm/tools/mongodb/read/aggregate.js +12 -0
  160. package/dist/esm/tools/mongodb/read/aggregate.js.map +1 -1
  161. package/dist/esm/tools/tool.d.ts.map +1 -1
  162. package/dist/esm/tools/tool.js +11 -5
  163. package/dist/esm/tools/tool.js.map +1 -1
  164. package/dist/esm/transports/base.d.ts +14 -3
  165. package/dist/esm/transports/base.d.ts.map +1 -1
  166. package/dist/esm/transports/base.js +14 -5
  167. package/dist/esm/transports/base.js.map +1 -1
  168. package/dist/esm/transports/stdio.d.ts +2 -5
  169. package/dist/esm/transports/stdio.d.ts.map +1 -1
  170. package/dist/esm/transports/stdio.js +2 -3
  171. package/dist/esm/transports/stdio.js.map +1 -1
  172. package/dist/esm/transports/streamableHttp.d.ts +3 -5
  173. package/dist/esm/transports/streamableHttp.d.ts.map +1 -1
  174. package/dist/esm/transports/streamableHttp.js +18 -6
  175. package/dist/esm/transports/streamableHttp.js.map +1 -1
  176. package/package.json +5 -4
@@ -1 +1 @@
1
- {"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/common/session.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/common/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAEhC,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGjD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,YAAY,MAAM,QAAQ,CAAC;AASlC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAqBvD,MAAM,OAAO,OAAQ,SAAQ,YAA2B;IAepD,YAAY,EACR,UAAU,EACV,WAAW,EACX,eAAe,EACf,MAAM,EACN,iBAAiB,EACjB,cAAc,EACd,QAAQ,GACK;QACb,KAAK,EAAE,CAAC;QAvBH,cAAS,GAAW,IAAI,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC;QAyBnD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,MAAM,WAAW,GACb,WAAW,IAAI,eAAe;YAC1B,CAAC,CAAC;gBACI,QAAQ,EAAE,WAAW;gBACrB,YAAY,EAAE,eAAe;aAChC;YACH,CAAC,CAAC,SAAS,CAAC;QAEpB,IAAI,CAAC,SAAS,GAAG,IAAI,SAAS,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,MAAM,CAAC,CAAC;QAC7E,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,oBAAoB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QACnF,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,qBAAqB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC,CAAC;QACzG,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,kBAAkB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;QACpF,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC,CAAC;IAC1G,CAAC;IAED,YAAY,CAAC,SAAqC;QAC9C,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;YAChD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;gBACd,EAAE,EAAE,KAAK,CAAC,kBAAkB;gBAC5B,OAAO,EAAE,SAAS;gBAClB,OAAO,EAAE,2BAA2B;aACvC,CAAC,CAAC;QACP,CAAC;QAED,IAAI,CAAC,SAAS,GAAG;YACb,IAAI,EAAE,SAAS,EAAE,IAAI,IAAI,SAAS;YAClC,OAAO,EAAE,SAAS,EAAE,OAAO,IAAI,SAAS;YACxC,KAAK,EAAE,SAAS,EAAE,KAAK,IAAI,SAAS;SACvC,CAAC;QAEF,uEAAuE;QACvE,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,IAAI,SAAS,CAAC,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,UAAU;QACZ,MAAM,YAAY,GAAG,IAAI,CAAC,qBAAqB,CAAC;QAEhD,IAAI,CAAC;YACD,MAAM,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,CAAC;QAC9C,CAAC;QAAC,OAAO,GAAY,EAAE,CAAC;YACpB,MAAM,KAAK,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;YAClE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;gBACd,EAAE,EAAE,KAAK,CAAC,wBAAwB;gBAClC,OAAO,EAAE,SAAS;gBAClB,OAAO,EAAE,mCAAmC,KAAK,CAAC,OAAO,EAAE;aAC9D,CAAC,CAAC;QACP,CAAC;QAED,IAAI,YAAY,EAAE,QAAQ,IAAI,YAAY,EAAE,SAAS,EAAE,CAAC;YACpD,KAAK,IAAI,CAAC,SAAS;iBACd,kBAAkB,CAAC;gBAChB,MAAM,EAAE;oBACJ,IAAI,EAAE;wBACF,OAAO,EAAE,YAAY,CAAC,SAAS;wBAC/B,QAAQ,EAAE,YAAY,CAAC,QAAQ;wBAC/B,YAAY,EAAE,OAAO;qBACxB;iBACJ;aACJ,CAAC;iBACD,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;gBACpB,MAAM,KAAK,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;gBAClE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;oBACd,EAAE,EAAE,KAAK,CAAC,8BAA8B;oBACxC,OAAO,EAAE,SAAS;oBAClB,OAAO,EAAE,0CAA0C,KAAK,CAAC,OAAO,EAAE;iBACrE,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;QACX,CAAC;IACL,CAAC;IAED,KAAK,CAAC,KAAK;QACP,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACxB,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QAC7B,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;QAClC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,QAA4B;QAC/C,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC;IAC1D,CAAC;IAED,IAAI,oBAAoB;QACpB,OAAO,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,GAAG,KAAK,WAAW,CAAC;IAC7E,CAAC;IAED,IAAI,eAAe;QACf,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC5B,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,sBAAkD,CAAC;YACxF,OAAO,KAAK,CAAC,eAAe,CAAC;QACjC,CAAC;QAED,MAAM,IAAI,YAAY,CAAC,UAAU,CAAC,qBAAqB,EAAE,0BAA0B,CAAC,CAAC;IACzF,CAAC;IAED,IAAI,qBAAqB;QACrB,OAAO,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,qBAAqB,CAAC;IAC/E,CAAC;CACJ"}
@@ -1,4 +1,4 @@
1
- import ConnectionString from "mongodb-connection-string-url";
1
+ import { ConnectionString } from "mongodb-connection-string-url";
2
2
  /**
3
3
  * Sets the appName parameter with the extended format: appName--deviceId--clientName
4
4
  * Only sets the appName if it's not already present in the connection string
@@ -1 +1 @@
1
- {"version":3,"file":"connectionOptions.js","sourceRoot":"","sources":["../../../src/helpers/connectionOptions.ts"],"names":[],"mappings":"AACA,OAAO,gBAAgB,MAAM,+BAA+B,CAAC;AAQ7D;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAC,EAC3C,gBAAgB,EAChB,UAAU,GAIb;IACG,MAAM,mBAAmB,GAAG,IAAI,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;IACnE,MAAM,YAAY,GAAG,mBAAmB,CAAC,iBAAiB,EAAsB,CAAC;IAEjF,+CAA+C;IAC/C,IAAI,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;QAC9B,OAAO,mBAAmB,CAAC,QAAQ,EAAE,CAAC;IAC1C,CAAC;IAED,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,IAAI,SAAS,CAAC;IAChD,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7E,MAAM,UAAU,GAAG,UAAU,CAAC,UAAU,IAAI,SAAS,CAAC;IAEtD,mEAAmE;IACnE,MAAM,eAAe,GAAG,GAAG,OAAO,KAAK,QAAQ,KAAK,UAAU,EAAE,CAAC;IAEjE,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;IAE7C,OAAO,mBAAmB,CAAC,QAAQ,EAAE,CAAC;AAC1C,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,wBAAwB,CAAC,gBAAwB,EAAE,eAAwB;IACvF,IAAI,CAAC;QACD,IAAI,gBAAgB,CAAC,gBAAgB,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC;IAChE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CACX,yCAAyC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CACpG,CAAC;IACN,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"connectionOptions.js","sourceRoot":"","sources":["../../../src/helpers/connectionOptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAQjE;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAC,EAC3C,gBAAgB,EAChB,UAAU,GAIb;IACG,MAAM,mBAAmB,GAAG,IAAI,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;IACnE,MAAM,YAAY,GAAG,mBAAmB,CAAC,iBAAiB,EAAsB,CAAC;IAEjF,+CAA+C;IAC/C,IAAI,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;QAC9B,OAAO,mBAAmB,CAAC,QAAQ,EAAE,CAAC;IAC1C,CAAC;IAED,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,IAAI,SAAS,CAAC;IAChD,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7E,MAAM,UAAU,GAAG,UAAU,CAAC,UAAU,IAAI,SAAS,CAAC;IAEtD,mEAAmE;IACnE,MAAM,eAAe,GAAG,GAAG,OAAO,KAAK,QAAQ,KAAK,UAAU,EAAE,CAAC;IAEjE,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;IAE7C,OAAO,mBAAmB,CAAC,QAAQ,EAAE,CAAC;AAC1C,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,wBAAwB,CAAC,gBAAwB,EAAE,eAAwB;IACvF,IAAI,CAAC;QACD,IAAI,gBAAgB,CAAC,gBAAgB,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC;IAChE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CACX,yCAAyC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CACpG,CAAC;IACN,CAAC;AACL,CAAC"}
package/dist/esm/index.js CHANGED
@@ -36,11 +36,18 @@ import { packageInfo } from "./common/packageInfo.js";
36
36
  import { StdioRunner } from "./transports/stdio.js";
37
37
  import { StreamableHttpRunner } from "./transports/streamableHttp.js";
38
38
  import { systemCA } from "@mongodb-js/devtools-proxy-support";
39
+ import { Keychain } from "./common/keychain.js";
39
40
  async function main() {
40
41
  systemCA().catch(() => undefined); // load system CA asynchronously as in mongosh
41
42
  assertHelpMode();
42
43
  assertVersionMode();
43
- const transportRunner = config.transport === "stdio" ? new StdioRunner(config) : new StreamableHttpRunner(config);
44
+ const transportRunner = config.transport === "stdio"
45
+ ? new StdioRunner({
46
+ userConfig: config,
47
+ })
48
+ : new StreamableHttpRunner({
49
+ userConfig: config,
50
+ });
44
51
  const shutdown = () => {
45
52
  transportRunner.logger.info({
46
53
  id: LogId.serverCloseRequested,
@@ -102,7 +109,7 @@ main().catch((error) => {
102
109
  // At this point, we may be in a very broken state, so we can't rely on the logger
103
110
  // being functional. Instead, create a brand new ConsoleLogger and log the error
104
111
  // to the console.
105
- const logger = new ConsoleLogger();
112
+ const logger = new ConsoleLogger(Keychain.root);
106
113
  logger.emergency({
107
114
  id: LogId.serverStartFailure,
108
115
  context: "server",
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
package/dist/esm/lib.d.ts CHANGED
@@ -4,6 +4,9 @@ export { defaultUserConfig, type UserConfig } from "./common/config.js";
4
4
  export { LoggerBase, type LogPayload, type LoggerType, type LogLevel } from "./common/logger.js";
5
5
  export { StreamableHttpRunner } from "./transports/streamableHttp.js";
6
6
  export { ConnectionManager, type AnyConnectionState, type ConnectionState, type ConnectionStateDisconnected, type ConnectionStateErrored, type ConnectionManagerFactoryFn, } from "./common/connectionManager.js";
7
+ export type { ConnectionErrorHandler, ConnectionErrorHandled, ConnectionErrorUnhandled, ConnectionErrorHandlerContext, } from "./common/connectionErrorHandler.js";
8
+ export { ErrorCodes } from "./common/errors.js";
7
9
  export { Telemetry } from "./telemetry/telemetry.js";
8
- export { packageInfo } from "./common/packageInfo.js";
10
+ export { Keychain, registerGlobalSecretToRedact } from "./common/keychain.js";
11
+ export type { Secret } from "./common/keychain.js";
9
12
  //# sourceMappingURL=lib.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../src/lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,KAAK,UAAU,EAAE,KAAK,UAAU,EAAE,KAAK,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACjG,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EACH,iBAAiB,EACjB,KAAK,kBAAkB,EACvB,KAAK,eAAe,EACpB,KAAK,2BAA2B,EAChC,KAAK,sBAAsB,EAC3B,KAAK,0BAA0B,GAClC,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC"}
1
+ {"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../src/lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,KAAK,UAAU,EAAE,KAAK,UAAU,EAAE,KAAK,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACjG,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EACH,iBAAiB,EACjB,KAAK,kBAAkB,EACvB,KAAK,eAAe,EACpB,KAAK,2BAA2B,EAChC,KAAK,sBAAsB,EAC3B,KAAK,0BAA0B,GAClC,MAAM,+BAA+B,CAAC;AACvC,YAAY,EACR,sBAAsB,EACtB,sBAAsB,EACtB,wBAAwB,EACxB,6BAA6B,GAChC,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AAC9E,YAAY,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC"}
package/dist/esm/lib.js CHANGED
@@ -4,6 +4,7 @@ export { defaultUserConfig } from "./common/config.js";
4
4
  export { LoggerBase } from "./common/logger.js";
5
5
  export { StreamableHttpRunner } from "./transports/streamableHttp.js";
6
6
  export { ConnectionManager, } from "./common/connectionManager.js";
7
+ export { ErrorCodes } from "./common/errors.js";
7
8
  export { Telemetry } from "./telemetry/telemetry.js";
8
- export { packageInfo } from "./common/packageInfo.js";
9
+ export { Keychain, registerGlobalSecretToRedact } from "./common/keychain.js";
9
10
  //# sourceMappingURL=lib.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"lib.js","sourceRoot":"","sources":["../../src/lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAsB,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,OAAO,EAAuB,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAmB,MAAM,oBAAoB,CAAC;AACxE,OAAO,EAAE,UAAU,EAAmD,MAAM,oBAAoB,CAAC;AACjG,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EACH,iBAAiB,GAMpB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC"}
1
+ {"version":3,"file":"lib.js","sourceRoot":"","sources":["../../src/lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAsB,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,OAAO,EAAuB,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAmB,MAAM,oBAAoB,CAAC;AACxE,OAAO,EAAE,UAAU,EAAmD,MAAM,oBAAoB,CAAC;AACjG,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EACH,iBAAiB,GAMpB,MAAM,+BAA+B,CAAC;AAOvC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC"}
@@ -5,11 +5,13 @@ import type { LogLevel } from "./common/logger.js";
5
5
  import type { Telemetry } from "./telemetry/telemetry.js";
6
6
  import type { UserConfig } from "./common/config.js";
7
7
  import type { ToolBase } from "./tools/tool.js";
8
+ import { type ConnectionErrorHandler } from "./common/connectionErrorHandler.js";
8
9
  export interface ServerOptions {
9
10
  session: Session;
10
11
  userConfig: UserConfig;
11
12
  mcpServer: McpServer;
12
13
  telemetry: Telemetry;
14
+ connectionErrorHandler: ConnectionErrorHandler;
13
15
  }
14
16
  export declare class Server {
15
17
  readonly session: Session;
@@ -17,11 +19,12 @@ export declare class Server {
17
19
  private readonly telemetry;
18
20
  readonly userConfig: UserConfig;
19
21
  readonly tools: ToolBase[];
22
+ readonly connectionErrorHandler: ConnectionErrorHandler;
20
23
  private _mcpLogLevel;
21
24
  get mcpLogLevel(): LogLevel;
22
25
  private readonly startTime;
23
26
  private readonly subscriptions;
24
- constructor({ session, mcpServer, userConfig, telemetry }: ServerOptions);
27
+ constructor({ session, mcpServer, userConfig, telemetry, connectionErrorHandler }: ServerOptions);
25
28
  connect(transport: Transport): Promise<void>;
26
29
  close(): Promise<void>;
27
30
  sendResourceListChanged(): void;
@@ -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;AAI/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,oBAAoB,CAAC;AAWrD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAGhD,MAAM,WAAW,aAAa;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,UAAU,CAAC;IACvB,SAAS,EAAE,SAAS,CAAC;IACrB,SAAS,EAAE,SAAS,CAAC;CACxB;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,KAAK,EAAE,QAAQ,EAAE,CAAM;IAEvC,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,EAAE,aAAa;IAQlE,OAAO,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IA0F5C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAMrB,uBAAuB,IAAI,IAAI;IAI/B,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAM7C;;;;OAIG;IACH,OAAO,CAAC,eAAe;IA6BvB,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,iBAAiB;YAOX,cAAc;YAiCd,+BAA+B;CAehD"}
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;AAI/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,oBAAoB,CAAC;AAWrD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAGhD,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAEjF,MAAM,WAAW,aAAa;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,UAAU,CAAC;IACvB,SAAS,EAAE,SAAS,CAAC;IACrB,SAAS,EAAE,SAAS,CAAC;IACrB,sBAAsB,EAAE,sBAAsB,CAAC;CAClD;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,KAAK,EAAE,QAAQ,EAAE,CAAM;IACvC,SAAgB,sBAAsB,EAAE,sBAAsB,CAAC;IAE/D,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,sBAAsB,EAAE,EAAE,aAAa;IAS1F,OAAO,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAyF5C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAMrB,uBAAuB,IAAI,IAAI;IAI/B,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAM7C;;;;OAIG;IACH,OAAO,CAAC,eAAe;IA6BvB,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,iBAAiB;YAOX,cAAc;YAiCd,+BAA+B;CAqBhD"}
@@ -5,11 +5,12 @@ import { LogId, McpLogger } from "./common/logger.js";
5
5
  import { CallToolRequestSchema, SetLevelRequestSchema, SubscribeRequestSchema, UnsubscribeRequestSchema, } from "@modelcontextprotocol/sdk/types.js";
6
6
  import assert from "assert";
7
7
  import { validateConnectionString } from "./helpers/connectionOptions.js";
8
+ import { packageInfo } from "./common/packageInfo.js";
8
9
  export class Server {
9
10
  get mcpLogLevel() {
10
11
  return this._mcpLogLevel;
11
12
  }
12
- constructor({ session, mcpServer, userConfig, telemetry }) {
13
+ constructor({ session, mcpServer, userConfig, telemetry, connectionErrorHandler }) {
13
14
  this.tools = [];
14
15
  this._mcpLogLevel = "debug";
15
16
  this.subscriptions = new Set();
@@ -18,6 +19,7 @@ export class Server {
18
19
  this.telemetry = telemetry;
19
20
  this.mcpServer = mcpServer;
20
21
  this.userConfig = userConfig;
22
+ this.connectionErrorHandler = connectionErrorHandler;
21
23
  }
22
24
  async connect(transport) {
23
25
  // Resources are now reactive, so we register them ASAP so they can listen to events like
@@ -73,7 +75,7 @@ export class Server {
73
75
  this.session.logger.info({
74
76
  id: LogId.serverInitialized,
75
77
  context: "server",
76
- message: `Server started with transport ${transport.constructor.name} and agent runner ${this.session.mcpClient?.name}`,
78
+ message: `Server with version ${packageInfo.version} started with transport ${transport.constructor.name} and agent runner ${JSON.stringify(this.session.mcpClient)}`,
77
79
  });
78
80
  this.emitServerEvent("start", Date.now() - this.startTime);
79
81
  };
@@ -129,7 +131,7 @@ export class Server {
129
131
  event.properties.reason = error.message;
130
132
  }
131
133
  }
132
- this.telemetry.emitEvents([event]).catch(() => { });
134
+ this.telemetry.emitEvents([event]);
133
135
  }
134
136
  registerTools() {
135
137
  for (const toolConstructor of [...AtlasTools, ...MongoDbTools]) {
@@ -174,13 +176,22 @@ export class Server {
174
176
  async connectToConfigConnectionString() {
175
177
  if (this.userConfig.connectionString) {
176
178
  try {
179
+ this.session.logger.info({
180
+ id: LogId.mongodbConnectTry,
181
+ context: "server",
182
+ message: `Detected a MongoDB connection string in the configuration, trying to connect...`,
183
+ });
177
184
  await this.session.connectToMongoDB({
178
185
  connectionString: this.userConfig.connectionString,
179
186
  });
180
187
  }
181
188
  catch (error) {
182
- console.error("Failed to connect to MongoDB instance using the connection string from the config: ", error);
183
- throw new Error("Failed to connect to MongoDB instance using the connection string from the config");
189
+ // We don't throw an error here because we want to allow the server to start even if the connection string is invalid.
190
+ this.session.logger.error({
191
+ id: LogId.mongodbConnectFailure,
192
+ context: "server",
193
+ message: `Failed to connect to MongoDB instance using the connection string from the config: ${error instanceof Error ? error.message : String(error)}`,
194
+ });
184
195
  }
185
196
  }
186
197
  }
@@ -1 +1 @@
1
- {"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"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"}
@@ -16,10 +16,17 @@ export declare class EventCache {
16
16
  */
17
17
  static getInstance(): EventCache;
18
18
  /**
19
- * Gets a copy of the currently cached events
19
+ * Gets the number of currently cached events
20
+ */
21
+ get size(): number;
22
+ /**
23
+ * Gets a copy of the currently cached events along with their ids
20
24
  * @returns Array of cached BaseEvent objects
21
25
  */
22
- getEvents(): BaseEvent[];
26
+ getEvents(): {
27
+ id: number;
28
+ event: BaseEvent;
29
+ }[];
23
30
  /**
24
31
  * Appends new events to the cached events
25
32
  * LRU cache automatically handles dropping oldest events when limit is exceeded
@@ -27,8 +34,8 @@ export declare class EventCache {
27
34
  */
28
35
  appendEvents(events: BaseEvent[]): void;
29
36
  /**
30
- * Clears all cached events
37
+ * Removes cached events by their ids
31
38
  */
32
- clearEvents(): void;
39
+ removeEvents(ids: number[]): void;
33
40
  }
34
41
  //# sourceMappingURL=eventCache.d.ts.map
@@ -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;;IAWnB;;;OAGG;WACW,WAAW,IAAI,UAAU;IAOvC;;;OAGG;IACI,SAAS,IAAI,SAAS,EAAE;IAI/B;;;;OAIG;IACI,YAAY,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI;IAM9C;;OAEG;IACI,WAAW,IAAI,IAAI;CAI7B"}
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;;IAWnB;;;OAGG;WACW,WAAW,IAAI,UAAU;IAOvC;;OAEG;IACH,IAAW,IAAI,IAAI,MAAM,CAExB;IAED;;;OAGG;IACI,SAAS,IAAI;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,SAAS,CAAA;KAAE,EAAE;IAItD;;;;OAIG;IACI,YAAY,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI;IAM9C;;OAEG;IACI,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI;CAK3C"}
@@ -25,11 +25,17 @@ export class EventCache {
25
25
  return EventCache.instance;
26
26
  }
27
27
  /**
28
- * Gets a copy of the currently cached events
28
+ * Gets the number of currently cached events
29
+ */
30
+ get size() {
31
+ return this.cache.size;
32
+ }
33
+ /**
34
+ * Gets a copy of the currently cached events along with their ids
29
35
  * @returns Array of cached BaseEvent objects
30
36
  */
31
37
  getEvents() {
32
- return Array.from(this.cache.values());
38
+ return Array.from(this.cache.entries()).map(([id, event]) => ({ id, event }));
33
39
  }
34
40
  /**
35
41
  * Appends new events to the cached events
@@ -42,11 +48,12 @@ export class EventCache {
42
48
  }
43
49
  }
44
50
  /**
45
- * Clears all cached events
51
+ * Removes cached events by their ids
46
52
  */
47
- clearEvents() {
48
- this.cache.clear();
49
- this.nextId = 0;
53
+ removeEvents(ids) {
54
+ for (const id of ids) {
55
+ this.cache.delete(id);
56
+ }
50
57
  }
51
58
  }
52
59
  EventCache.MAX_EVENTS = 1000;
@@ -1 +1 @@
1
- {"version":3,"file":"eventCache.js","sourceRoot":"","sources":["../../../src/telemetry/eventCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAGrC;;;;GAIG;AACH,MAAM,OAAO,UAAU;IAOnB;QAFQ,WAAM,GAAG,CAAC,CAAC;QAGf,IAAI,CAAC,KAAK,GAAG,IAAI,QAAQ,CAAC;YACtB,GAAG,EAAE,UAAU,CAAC,UAAU;YAC1B,0CAA0C;YAC1C,UAAU,EAAE,KAAK;YACjB,cAAc,EAAE,KAAK;SACxB,CAAC,CAAC;IACP,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,WAAW;QACrB,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;YACvB,UAAU,CAAC,QAAQ,GAAG,IAAI,UAAU,EAAE,CAAC;QAC3C,CAAC;QACD,OAAO,UAAU,CAAC,QAAQ,CAAC;IAC/B,CAAC;IAED;;;OAGG;IACI,SAAS;QACZ,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAC3C,CAAC;IAED;;;;OAIG;IACI,YAAY,CAAC,MAAmB;QACnC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YACzB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,KAAK,CAAC,CAAC;QACzC,CAAC;IACL,CAAC;IAED;;OAEG;IACI,WAAW;QACd,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;IACpB,CAAC;;AAlDuB,qBAAU,GAAG,IAAI,AAAP,CAAQ"}
1
+ {"version":3,"file":"eventCache.js","sourceRoot":"","sources":["../../../src/telemetry/eventCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAGrC;;;;GAIG;AACH,MAAM,OAAO,UAAU;IAOnB;QAFQ,WAAM,GAAG,CAAC,CAAC;QAGf,IAAI,CAAC,KAAK,GAAG,IAAI,QAAQ,CAAC;YACtB,GAAG,EAAE,UAAU,CAAC,UAAU;YAC1B,0CAA0C;YAC1C,UAAU,EAAE,KAAK;YACjB,cAAc,EAAE,KAAK;SACxB,CAAC,CAAC;IACP,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,WAAW;QACrB,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;YACvB,UAAU,CAAC,QAAQ,GAAG,IAAI,UAAU,EAAE,CAAC;QAC3C,CAAC;QACD,OAAO,UAAU,CAAC,QAAQ,CAAC;IAC/B,CAAC;IAED;;OAEG;IACH,IAAW,IAAI;QACX,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;IAC3B,CAAC;IAED;;;OAGG;IACI,SAAS;QACZ,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IAClF,CAAC;IAED;;;;OAIG;IACI,YAAY,CAAC,MAAmB;QACnC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YACzB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,KAAK,CAAC,CAAC;QACzC,CAAC;IACL,CAAC;IAED;;OAEG;IACI,YAAY,CAAC,GAAa;QAC7B,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;YACnB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC1B,CAAC;IACL,CAAC;;AA1DuB,qBAAU,GAAG,IAAI,AAAP,CAAQ"}
@@ -3,6 +3,12 @@ import type { BaseEvent, CommonProperties } from "./types.js";
3
3
  import type { UserConfig } from "../common/config.js";
4
4
  import { EventCache } from "./eventCache.js";
5
5
  import type { DeviceId } from "../helpers/deviceId.js";
6
+ import { EventEmitter } from "events";
7
+ export interface TelemetryEvents {
8
+ "events-emitted": [];
9
+ "events-send-failed": [];
10
+ "events-skipped": [];
11
+ }
6
12
  export declare class Telemetry {
7
13
  private readonly session;
8
14
  private readonly userConfig;
@@ -10,12 +16,13 @@ export declare class Telemetry {
10
16
  private isBufferingEvents;
11
17
  /** Resolves when the setup is complete or a timeout occurs */
12
18
  setupPromise: Promise<[string, boolean]> | undefined;
19
+ readonly events: EventEmitter<TelemetryEvents>;
13
20
  private eventCache;
14
21
  private deviceId;
15
22
  private constructor();
16
23
  static create(session: Session, userConfig: UserConfig, deviceId: DeviceId, { commonProperties, eventCache, }?: {
24
+ commonProperties?: Partial<CommonProperties>;
17
25
  eventCache?: EventCache;
18
- commonProperties?: CommonProperties;
19
26
  }): Telemetry;
20
27
  private setup;
21
28
  close(): Promise<void>;
@@ -23,7 +30,7 @@ export declare class Telemetry {
23
30
  * Emits events through the telemetry pipeline
24
31
  * @param events - The events to emit
25
32
  */
26
- emitEvents(events: BaseEvent[]): Promise<void>;
33
+ emitEvents(events: BaseEvent[]): void;
27
34
  /**
28
35
  * Gets the common properties for events
29
36
  * @returns Object containing common properties for all events
@@ -1 +1 @@
1
- {"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../../src/telemetry/telemetry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAItD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAOvD,qBAAa,SAAS;IAQd,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IATrC,OAAO,CAAC,iBAAiB,CAAiB;IAC1C,8DAA8D;IACvD,YAAY,EAAE,OAAO,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAC5D,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,QAAQ,CAAW;IAE3B,OAAO;IAUP,MAAM,CAAC,MAAM,CACT,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,QAAQ,EAClB,EACI,gBAA0C,EAC1C,UAAqC,GACxC,GAAE;QACC,UAAU,CAAC,EAAE,UAAU,CAAC;QACxB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;KAClC,GACP,SAAS;YAOE,KAAK;IAcN,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAKnC;;;OAGG;IACU,UAAU,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAuB3D;;;OAGG;IACI,mBAAmB,IAAI,gBAAgB;IAY9C;;;;;;OAMG;IACI,kBAAkB,IAAI,OAAO;IAUpC;;;OAGG;YACW,IAAI;IAkClB;;OAEG;YACW,UAAU;CAgB3B"}
1
+ {"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../../src/telemetry/telemetry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAItD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAOtC,MAAM,WAAW,eAAe;IAC5B,gBAAgB,EAAE,EAAE,CAAC;IACrB,oBAAoB,EAAE,EAAE,CAAC;IACzB,gBAAgB,EAAE,EAAE,CAAC;CACxB;AAED,qBAAa,SAAS;IAUd,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAXrC,OAAO,CAAC,iBAAiB,CAAiB;IAC1C,8DAA8D;IACvD,YAAY,EAAE,OAAO,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAC5D,SAAgB,MAAM,EAAE,YAAY,CAAC,eAAe,CAAC,CAAsB;IAE3E,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,QAAQ,CAAW;IAE3B,OAAO;IAUP,MAAM,CAAC,MAAM,CACT,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,QAAQ,EAClB,EACI,gBAAqB,EACrB,UAAqC,GACxC,GAAE;QACC,gBAAgB,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAC7C,UAAU,CAAC,EAAE,UAAU,CAAC;KACtB,GACP,SAAS;YAcE,KAAK;IAoBN,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA8BnC;;;OAGG;IACI,UAAU,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI;IAW5C;;;OAGG;IACI,mBAAmB,IAAI,gBAAgB;IAY9C;;;;;;OAMG;IACI,kBAAkB,IAAI,OAAO;IAUpC;;;OAGG;YACW,IAAI;IA8ClB;;OAEG;YACW,UAAU;CAgB3B"}
@@ -2,22 +2,37 @@ import { LogId } from "../common/logger.js";
2
2
  import { MACHINE_METADATA } from "./constants.js";
3
3
  import { EventCache } from "./eventCache.js";
4
4
  import { detectContainerEnv } from "../helpers/container.js";
5
+ import { EventEmitter } from "events";
5
6
  export class Telemetry {
6
7
  constructor(session, userConfig, commonProperties, { eventCache, deviceId }) {
7
8
  this.session = session;
8
9
  this.userConfig = userConfig;
9
10
  this.commonProperties = commonProperties;
10
11
  this.isBufferingEvents = true;
12
+ this.events = new EventEmitter();
11
13
  this.eventCache = eventCache;
12
14
  this.deviceId = deviceId;
13
15
  }
14
- static create(session, userConfig, deviceId, { commonProperties = { ...MACHINE_METADATA }, eventCache = EventCache.getInstance(), } = {}) {
15
- const instance = new Telemetry(session, userConfig, commonProperties, { eventCache, deviceId });
16
+ static create(session, userConfig, deviceId, { commonProperties = {}, eventCache = EventCache.getInstance(), } = {}) {
17
+ const mergedProperties = {
18
+ ...MACHINE_METADATA,
19
+ ...commonProperties,
20
+ };
21
+ const instance = new Telemetry(session, userConfig, mergedProperties, {
22
+ eventCache,
23
+ deviceId,
24
+ });
16
25
  void instance.setup();
17
26
  return instance;
18
27
  }
19
28
  async setup() {
20
29
  if (!this.isTelemetryEnabled()) {
30
+ this.session.logger.info({
31
+ id: LogId.telemetryEmitFailure,
32
+ context: "telemetry",
33
+ message: "Telemetry is disabled.",
34
+ noRedaction: true,
35
+ });
21
36
  return;
22
37
  }
23
38
  this.setupPromise = Promise.all([this.deviceId.get(), detectContainerEnv()]);
@@ -28,33 +43,42 @@ export class Telemetry {
28
43
  }
29
44
  async close() {
30
45
  this.isBufferingEvents = false;
31
- await this.emitEvents(this.eventCache.getEvents());
46
+ this.session.logger.debug({
47
+ id: LogId.telemetryClose,
48
+ message: `Closing telemetry and flushing ${this.eventCache.size} events`,
49
+ context: "telemetry",
50
+ });
51
+ // Wait up to 5 seconds for events to be sent before closing, but don't throw if it times out
52
+ const flushMaxWaitTime = 5000;
53
+ let flushTimeout;
54
+ await Promise.race([
55
+ new Promise((resolve) => {
56
+ flushTimeout = setTimeout(() => {
57
+ this.session.logger.debug({
58
+ id: LogId.telemetryClose,
59
+ message: `Failed to flush remaining events within ${flushMaxWaitTime}ms timeout`,
60
+ context: "telemetry",
61
+ });
62
+ resolve();
63
+ }, flushMaxWaitTime);
64
+ flushTimeout.unref();
65
+ }),
66
+ this.emit([]),
67
+ ]);
68
+ clearTimeout(flushTimeout);
32
69
  }
33
70
  /**
34
71
  * Emits events through the telemetry pipeline
35
72
  * @param events - The events to emit
36
73
  */
37
- async emitEvents(events) {
38
- try {
39
- if (!this.isTelemetryEnabled()) {
40
- this.session.logger.info({
41
- id: LogId.telemetryEmitFailure,
42
- context: "telemetry",
43
- message: "Telemetry is disabled.",
44
- noRedaction: true,
45
- });
46
- return;
47
- }
48
- await this.emit(events);
49
- }
50
- catch {
51
- this.session.logger.debug({
52
- id: LogId.telemetryEmitFailure,
53
- context: "telemetry",
54
- message: "Error emitting telemetry events.",
55
- noRedaction: true,
56
- });
74
+ emitEvents(events) {
75
+ if (!this.isTelemetryEnabled()) {
76
+ this.events.emit("events-skipped");
77
+ return;
57
78
  }
79
+ // Don't wait for events to be sent - we should not block regular server
80
+ // operations on telemetry
81
+ void this.emit(events);
58
82
  }
59
83
  /**
60
84
  * Gets the common properties for events
@@ -95,29 +119,42 @@ export class Telemetry {
95
119
  this.eventCache.appendEvents(events);
96
120
  return;
97
121
  }
98
- const cachedEvents = this.eventCache.getEvents();
99
- const allEvents = [...cachedEvents, ...events];
100
- this.session.logger.debug({
101
- id: LogId.telemetryEmitStart,
102
- context: "telemetry",
103
- message: `Attempting to send ${allEvents.length} events (${cachedEvents.length} cached)`,
104
- });
105
- const result = await this.sendEvents(this.session.apiClient, allEvents);
106
- if (result.success) {
107
- this.eventCache.clearEvents();
122
+ try {
123
+ const cachedEvents = this.eventCache.getEvents();
124
+ const allEvents = [...cachedEvents.map((e) => e.event), ...events];
108
125
  this.session.logger.debug({
109
- id: LogId.telemetryEmitSuccess,
126
+ id: LogId.telemetryEmitStart,
110
127
  context: "telemetry",
111
- message: `Sent ${allEvents.length} events successfully: ${JSON.stringify(allEvents, null, 2)}`,
128
+ message: `Attempting to send ${allEvents.length} events (${cachedEvents.length} cached)`,
112
129
  });
113
- return;
130
+ const result = await this.sendEvents(this.session.apiClient, allEvents);
131
+ if (result.success) {
132
+ this.eventCache.removeEvents(cachedEvents.map((e) => e.id));
133
+ this.session.logger.debug({
134
+ id: LogId.telemetryEmitSuccess,
135
+ context: "telemetry",
136
+ message: `Sent ${allEvents.length} events successfully: ${JSON.stringify(allEvents)}`,
137
+ });
138
+ this.events.emit("events-emitted");
139
+ return;
140
+ }
141
+ this.session.logger.debug({
142
+ id: LogId.telemetryEmitFailure,
143
+ context: "telemetry",
144
+ message: `Error sending event to client: ${result.error instanceof Error ? result.error.message : String(result.error)}`,
145
+ });
146
+ this.eventCache.appendEvents(events);
147
+ this.events.emit("events-send-failed");
148
+ }
149
+ catch (error) {
150
+ this.session.logger.debug({
151
+ id: LogId.telemetryEmitFailure,
152
+ context: "telemetry",
153
+ message: `Error emitting telemetry events: ${error instanceof Error ? error.message : String(error)}`,
154
+ noRedaction: true,
155
+ });
156
+ this.events.emit("events-send-failed");
114
157
  }
115
- this.session.logger.debug({
116
- id: LogId.telemetryEmitFailure,
117
- context: "telemetry",
118
- message: `Error sending event to client: ${result.error instanceof Error ? result.error.message : String(result.error)}`,
119
- });
120
- this.eventCache.appendEvents(events);
121
158
  }
122
159
  /**
123
160
  * Attempts to send events through the provided API client
@@ -1 +1 @@
1
- {"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../../src/telemetry/telemetry.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAE5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAQ7D,MAAM,OAAO,SAAS;IAOlB,YACqB,OAAgB,EAChB,UAAsB,EACtB,gBAAkC,EACnD,EAAE,UAAU,EAAE,QAAQ,EAAkD;QAHvD,YAAO,GAAP,OAAO,CAAS;QAChB,eAAU,GAAV,UAAU,CAAY;QACtB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAT/C,sBAAiB,GAAY,IAAI,CAAC;QAYtC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;IAED,MAAM,CAAC,MAAM,CACT,OAAgB,EAChB,UAAsB,EACtB,QAAkB,EAClB,EACI,gBAAgB,GAAG,EAAE,GAAG,gBAAgB,EAAE,EAC1C,UAAU,GAAG,UAAU,CAAC,WAAW,EAAE,MAIrC,EAAE;QAEN,MAAM,QAAQ,GAAG,IAAI,SAAS,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC;QAEhG,KAAK,QAAQ,CAAC,KAAK,EAAE,CAAC;QACtB,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEO,KAAK,CAAC,KAAK;QACf,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,CAAC;YAC7B,OAAO;QACX,CAAC;QAED,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC;QAC7E,MAAM,CAAC,aAAa,EAAE,YAAY,CAAC,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC;QAE9D,IAAI,CAAC,gBAAgB,CAAC,SAAS,GAAG,aAAa,CAAC;QAChD,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,GAAG,YAAY,CAAC;QAEtD,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;IACnC,CAAC;IAEM,KAAK,CAAC,KAAK;QACd,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;QAC/B,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC;IACvD,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,UAAU,CAAC,MAAmB;QACvC,IAAI,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,CAAC;gBAC7B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;oBACrB,EAAE,EAAE,KAAK,CAAC,oBAAoB;oBAC9B,OAAO,EAAE,WAAW;oBACpB,OAAO,EAAE,wBAAwB;oBACjC,WAAW,EAAE,IAAI;iBACpB,CAAC,CAAC;gBACH,OAAO;YACX,CAAC;YAED,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC5B,CAAC;QAAC,MAAM,CAAC;YACL,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;gBACtB,EAAE,EAAE,KAAK,CAAC,oBAAoB;gBAC9B,OAAO,EAAE,WAAW;gBACpB,OAAO,EAAE,kCAAkC;gBAC3C,WAAW,EAAE,IAAI;aACpB,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAED;;;OAGG;IACI,mBAAmB;QACtB,OAAO;YACH,GAAG,IAAI,CAAC,gBAAgB;YACxB,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS;YACpC,kBAAkB,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO;YACnD,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI;YAC7C,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS;YAClC,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO;YAC7E,wBAAwB,EAAE,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO;SAChF,CAAC;IACN,CAAC;IAED;;;;;;OAMG;IACI,kBAAkB;QACrB,sDAAsD;QACtD,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,KAAK,UAAU,EAAE,CAAC;YAC3C,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,MAAM,UAAU,GAAG,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC;QACjD,OAAO,CAAC,UAAU,CAAC;IACvB,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,IAAI,CAAC,MAAmB;QAClC,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACzB,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YACrC,OAAO;QACX,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC;QACjD,MAAM,SAAS,GAAG,CAAC,GAAG,YAAY,EAAE,GAAG,MAAM,CAAC,CAAC;QAE/C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;YACtB,EAAE,EAAE,KAAK,CAAC,kBAAkB;YAC5B,OAAO,EAAE,WAAW;YACpB,OAAO,EAAE,sBAAsB,SAAS,CAAC,MAAM,YAAY,YAAY,CAAC,MAAM,UAAU;SAC3F,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QACxE,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACjB,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC;YAC9B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;gBACtB,EAAE,EAAE,KAAK,CAAC,oBAAoB;gBAC9B,OAAO,EAAE,WAAW;gBACpB,OAAO,EAAE,QAAQ,SAAS,CAAC,MAAM,yBAAyB,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE;aACjG,CAAC,CAAC;YACH,OAAO;QACX,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;YACtB,EAAE,EAAE,KAAK,CAAC,oBAAoB;YAC9B,OAAO,EAAE,WAAW;YACpB,OAAO,EAAE,kCAAkC,MAAM,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;SAC3H,CAAC,CAAC;QACH,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,UAAU,CAAC,MAAiB,EAAE,MAAmB;QAC3D,IAAI,CAAC;YACD,MAAM,MAAM,CAAC,UAAU,CACnB,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBACnB,GAAG,KAAK;gBACR,UAAU,EAAE,EAAE,GAAG,IAAI,CAAC,mBAAmB,EAAE,EAAE,GAAG,KAAK,CAAC,UAAU,EAAE;aACrE,CAAC,CAAC,CACN,CAAC;YACF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC7B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO;gBACH,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;aACnE,CAAC;QACN,CAAC;IACL,CAAC;CACJ"}
1
+ {"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../../src/telemetry/telemetry.ts"],"names":[],"mappings":"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"}