refactor: fixes from feedback

Author: gagik

packages/machine-id/src/index.spec.ts

@@ -6,6 +6,7 @@ import { createHash } from 'crypto';
 import sinonChai from 'sinon-chai';
 import sinon from 'sinon';
 import bindings from 'bindings';
+import assert from 'assert';
 
 chai.use(sinonChai);
 
@@ -16,7 +17,9 @@ describe('machine-id', function () {
     let id: string;
 
     beforeEach(function () {
-      id = getMachineId({ raw: true }) || '';
+      const deviceId = getMachineId();
+      assert(deviceId);
+      id = deviceId;
     });
 
     it('returns a valid UUID format machine ID', function () {
@@ -50,7 +53,9 @@ describe('machine-id', function () {
     let id: string;
 
     beforeEach(function () {
-      id = getMachineId() || '';
+      const deviceId = getMachineId();
+      assert(deviceId);
+      id = deviceId;
     });
 
     it('returns a valid SHA256 hash format machine ID', function () {
@@ -59,11 +64,10 @@ describe('machine-id', function () {
 
       expect(hashRegex.test(id));
 
-      expect(id).equals(
-        createHash('sha256')
-          .update(getMachineId({ raw: true }) || '')
-          .digest('hex'),
-      );
+      const hashId = getMachineId({ raw: true });
+      assert(hashId);
+
+      expect(id).equals(createHash('sha256').update(hashId).digest('hex'));
     });
   });
 

packages/machine-id/src/index.ts

@@ -8,27 +8,25 @@ export type GetMachineIdOptions = {
   raw?: boolean;
 };
 
+function getMachineIdFromBinding(): string | undefined {
+  try {
+    return binding.getMachineId() || undefined;
+  } catch {
+    // If the binding fails, we can assume the machine ID is not available.
+    return undefined;
+  }
+}
+
 /**
  * Get the machine ID for the current system
  * @returns The machine ID (UUID) or undefined if not available
  */
 export function getMachineId({ raw = false }: GetMachineIdOptions = {}):
   | string
   | undefined {
-  let machineId: string | undefined;
-
-  try {
-    machineId = binding.getMachineId();
-  } catch {
-    // If the binding fails, we can assume the machine ID is not available.
-    return undefined;
-  }
-
-  if (!machineId) {
-    return undefined;
-  }
+  const machineId: string | undefined = getMachineIdFromBinding();
 
-  if (raw === true) {
+  if (!machineId || raw === true) {
     return machineId;
   }