fix: update version, use AbortController

Author: gagik

package-lock.json

@@ -17,7 +17,7 @@
     "node": ">=14.15.1"
   },
   "dependencies": {
-    "@mongodb-js/device-id": "^0.2.0",
+    "@mongodb-js/device-id": "^0.2.1",
     "@mongodb-js/devtools-connect": "^3.4.1",
     "@mongosh/errors": "2.4.0",
     "@mongosh/history": "2.4.6",

packages/logging/package.json

@@ -255,6 +255,7 @@ describe('MongoshLoggingAndTelemetry', function () {
     });
 
     it('automatically sets up device ID for telemetry', async function () {
+      const abortController = new AbortController();
       const loggingAndTelemetry = setupLoggingAndTelemetry({
         ...testLoggingArguments,
         bus,
@@ -267,8 +268,8 @@ describe('MongoshLoggingAndTelemetry', function () {
 
       const deviceId = await getDeviceId({
         getMachineId: () => getMachineId({ raw: true }),
-        isNodeMachineId: false,
-      }).value;
+        abortSignal: abortController.signal,
+      });
 
       await (loggingAndTelemetry as LoggingAndTelemetry).setupTelemetryPromise;
 

packages/logging/src/logging-and-telemetry.spec.ts

@@ -95,8 +95,7 @@ export class LoggingAndTelemetry implements MongoshLoggingAndTelemetry {
   /** @internal */
   public setupTelemetryPromise: Promise<void> = Promise.resolve();
 
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
-  private resolveDeviceId: (value: string) => void = () => {};
+  private readonly abortController: AbortController = new AbortController();
 
   constructor({
     bus,
@@ -133,21 +132,19 @@ export class LoggingAndTelemetry implements MongoshLoggingAndTelemetry {
     // Run any other pending events with the set or dummy log for telemetry purposes.
     this.runAndClearPendingBusEvents();
 
-    this.resolveDeviceId('unknown');
+    this.abortController.abort();
   }
 
   private async setupTelemetry(): Promise<void> {
     if (!this.deviceId) {
       // eslint-disable-next-line @typescript-eslint/no-var-requires
       const getMachineId = require('native-machine-id').getMachineId;
-      const { value: deviceId, resolve: resolveDeviceId } = getDeviceId({
+      this.deviceId = await getDeviceId({
         getMachineId: () => getMachineId({ raw: true }),
-        isNodeMachineId: false,
-        onError: (error) => this.bus.emit('mongosh:error', error, 'telemetry'),
+        onError: (_, error) =>
+          this.bus.emit('mongosh:error', error, 'telemetry'),
+        abortSignal: this.abortController.signal,
       });
-
-      this.resolveDeviceId = resolveDeviceId;
-      this.deviceId = await deviceId;
     }
 
     this.runAndClearPendingTelemetryEvents();