fix: switch to native-machine-id

Author: gagik

package-lock.json

@@ -132,6 +132,10 @@ export class SignableCompiler {
       path: await findModulePath('cli-repl', 'glibc-version'),
       requireRegexp: /\bglibc_version\.node$/,
     };
+    const nativeMachineIdAddon = {
+      path: await findModulePath('logging', 'native-machine-id'),
+      requireRegexp: /\bnative_machine_id\.node$/,
+    };
     // Warning! Until https://jira.mongodb.org/browse/MONGOSH-990,
     // packages/service-provider-node-driver *also* has a copy of these.
     // We use the versions included in packages/cli-repl here, so these
@@ -186,6 +190,7 @@ export class SignableCompiler {
         kerberosAddon,
         cryptLibraryVersionAddon,
         glibcVersionAddon,
+        nativeMachineIdAddon,
       ]
         .concat(winCAAddon ? [winCAAddon] : [])
         .concat(winConsoleProcessListAddon ? [winConsoleProcessListAddon] : [])

packages/build/src/compile/signable-compiler.ts

@@ -87,6 +87,12 @@ const config = {
       'commonjs2 ../build/Release/mongocrypt.node',
     '../build/Debug/mongocrypt.node':
       'commonjs2 ../build/Debug/mongocrypt.node',
+    '../build/Release/native_machine_id.node':
+      'commonjs2 ../build/Release/native_machine_id.node',
+    '../build/Debug/native_machine_id.node':
+      'commonjs2 ../build/Debug/native_machine_id.node',
+    './build/Release/native_machine_id.node':
+      'commonjs2 ./build/Release/native_machine_id.node',
   },
 
   externalsPresets: {

packages/cli-repl/webpack.config.js

@@ -23,7 +23,7 @@
     "@mongosh/types": "3.6.0",
     "mongodb-log-writer": "^2.3.1",
     "mongodb-redact": "^1.1.5",
-    "node-machine-id": "^1.1.12"
+    "native-machine-id": "^0.0.11"
   },
   "devDependencies": {
     "@mongodb-js/eslint-config-mongosh": "^1.0.0",

packages/logging/package.json

@@ -217,7 +217,10 @@ describe('MongoshLoggingAndTelemetry', function () {
 
     it('uses device ID "unknown" and logs error if it fails to resolve it', async function () {
       // eslint-disable-next-line @typescript-eslint/no-var-requires
-      sinon.stub(require('child_process'), 'exec').throws(new Error('Test'));
+      sinon
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        .stub(require('native-machine-id'), 'getMachineId')
+        .rejects(new Error('Test'));
       const loggingAndTelemetry = setupLoggingAndTelemetry({
         ...testLoggingArguments,
         bus,
@@ -289,7 +292,7 @@ describe('MongoshLoggingAndTelemetry', function () {
       });
       sinon
         // eslint-disable-next-line @typescript-eslint/no-var-requires
-        .stub(require('node-machine-id'), 'machineId')
+        .stub(require('native-machine-id'), 'getMachineId')
         .resolves(delayedTelemetry);
 
       const loggingAndTelemetry = setupLoggingAndTelemetry({

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

@@ -53,7 +53,7 @@ import type {
   MongoshLoggingAndTelemetryArguments,
   MongoshTrackingProperties,
 } from './types';
-import { machineId } from 'node-machine-id';
+import { getMachineId } from 'native-machine-id';
 import { createHmac } from 'crypto';
 
 export function setupLoggingAndTelemetry(
@@ -66,13 +66,15 @@ export function setupLoggingAndTelemetry(
 }
 
 /**
- * @returns A hashed, unique identifier for the running device.
- * @throws If something goes wrong when getting the device ID.
+ * @returns A hashed, unique identifier for the running device or `undefined` if not known.
  */
-export async function getDeviceId(): Promise<string> {
+export async function getDeviceId(): Promise<string | 'unknown'> {
   // Create a hashed format from the all uppercase version of the machine ID
   // to match it exactly with the denisbrodbeck/machineid library that Atlas CLI uses.
-  const originalId = (await machineId(true)).toUpperCase();
+  const originalId = (await getMachineId({ raw: true }))?.toUpperCase();
+  if (!originalId) {
+    return 'unknown';
+  }
   const hmac = createHmac('sha256', originalId);
 
   /** This matches the message used to create the hashes in Atlas CLI */