native-machine-id 0.0.11 → 0.0.13

package/bin/machine-id.js

@@ -0,0 +1,9 @@
+#!/usr/bin/env node
+'use strict';
+
+const { getMachineIdSync } = require('..');
+
+const id = getMachineIdSync({ raw: process.argv.includes('--raw') }) || '';
+
+// eslint-disable-next-line no-console
+console.log(id);

package/dist/index.js

@@ -1,42 +1,11 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMachineId = getMachineId;
-exports.getMachineIdSync = getMachineIdSync;
-const bindings_1 = __importDefault(require("bindings"));
-const crypto_1 = require("crypto");
-const path_1 = __importDefault(require("path"));
-const util_1 = require("util");
-const getBindings = () => {
-    const tries = [
-        () => (0, bindings_1.default)('native_machine_id'),
-        () => require(path_1.default.join(__dirname, '../build/Release/native_machine_id.node')),
-        () => require('../build/Release/native_machine_id.node'),
-        () => require('./build/Release/native_machine_id.node'),
-        () => require('../build/Debug/native_machine_id.node'),
-    ];
-    for (const tryBinding of tries) {
-        try {
-            return tryBinding();
-        }
-        catch (error) {
-            console.error(error);
-        }
-    }
-    throw new Error('Unable to load native machine ID bindings. Please ensure the module is built correctly. Tried: ' +
-        JSON.stringify([
-            path_1.default.resolve('../build/Release/native_machine_id.node'),
-            path_1.default.resolve('../build/Debug/native_machine_id.node'),
-            __dirname,
-            process.cwd(),
-        ]));
-};
-const binding = getBindings();
+import bindings from 'bindings';
+import { createHash } from 'crypto';
+import { promisify } from 'util';
+const binding = bindings('native_machine_id');
 function getMachineIdFromBindingSync() {
     try {
-        return binding.getMachineIdSync() || undefined;
+        const deviceId = binding.getMachineIdSync() || undefined;
+        return deviceId;
     }
     catch {
         return undefined;
@@ -44,25 +13,25 @@ function getMachineIdFromBindingSync() {
 }
 async function getMachineIdFromBindingAsync() {
     try {
-        const deviceId = (await (0, util_1.promisify)(binding.getMachineIdAsync)()) || undefined;
+        const deviceId = (await promisify(binding.getMachineIdAsync)()) || undefined;
         return deviceId;
     }
     catch {
         return undefined;
     }
 }
-async function getMachineId({ raw = false, } = {}) {
+export async function getMachineId({ raw = false, } = {}) {
     const machineId = await getMachineIdFromBindingAsync();
     if (!machineId || raw === true) {
         return machineId;
     }
-    return (0, crypto_1.createHash)('sha256').update(machineId).digest('hex');
+    return createHash('sha256').update(machineId).digest('hex');
 }
-function getMachineIdSync({ raw = false } = {}) {
+export function getMachineIdSync({ raw = false } = {}) {
     const machineId = getMachineIdFromBindingSync();
     if (!machineId || raw === true) {
         return machineId;
     }
-    return (0, crypto_1.createHash)('sha256').update(machineId).digest('hex');
+    return createHash('sha256').update(machineId).digest('hex');
 }
 //# sourceMappingURL=index.js.map

package/index.js

@@ -0,0 +1,67 @@
+'use strict';
+
+const bindings = require('bindings');
+const crypto = require('crypto');
+const util = require('util');
+
+const binding = bindings('native_machine_id');
+
+function getMachineIdFromBindingSync() {
+  try {
+    const deviceId = binding.getMachineIdSync() || undefined;
+    return deviceId;
+  } catch {
+    // If the binding fails, we can assume the machine ID is not available.
+    return undefined;
+  }
+}
+
+async function getMachineIdFromBindingAsync() {
+  try {
+    const deviceId =
+      (await util.promisify(binding.getMachineIdAsync)()) || undefined;
+    return deviceId;
+  } catch {
+    // If the binding fails, we can assume the machine ID is not available.
+    return undefined;
+  }
+}
+
+/**
+ * Get the machine ID for the current system
+ * @param {Object} options - Options for getting the machine ID
+ * @param {boolean} [options.raw=false] - If true, the machine ID will not be hashed with SHA256
+ * @returns {Promise<string|undefined>} A promise that resolves to the machine ID or `undefined` if not available
+ */
+async function getMachineId(options = {}) {
+  const { raw = false } = options;
+  const machineId = await getMachineIdFromBindingAsync();
+
+  if (!machineId || raw === true) {
+    return machineId;
+  }
+
+  return crypto.createHash('sha256').update(machineId).digest('hex');
+}
+
+/**
+ * Get the machine ID for the current system synchronously
+ * @param {Object} options - Options for getting the machine ID
+ * @param {boolean} [options.raw=false] - If true, the machine ID will not be hashed with SHA256
+ * @returns {string|undefined} The machine ID or `undefined` if not available
+ */
+function getMachineIdSync(options = {}) {
+  const { raw = false } = options;
+  const machineId = getMachineIdFromBindingSync();
+
+  if (!machineId || raw === true) {
+    return machineId;
+  }
+
+  return crypto.createHash('sha256').update(machineId).digest('hex');
+}
+
+module.exports = {
+  getMachineId,
+  getMachineIdSync,
+};

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "native-machine-id",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "Native retrieval of a unique desktop machine ID without admin privileges or child processes. Faster and more reliable alternative to node-machine-id.",
-  "main": "dist/index.js",
+  "main": "index.js",
   "types": "dist/index.d.ts",
   "scripts": {
-    "compile": "tsc -p tsconfig.json && node-gyp rebuild && gen-esm-wrapper . ./dist/.esm-wrapper.mjs",
+    "compile": "node-gyp rebuild",
     "bootstrap": "npm run compile",
     "pretest": "npm run compile",
     "install": "prebuild-install --runtime napi || node-gyp rebuild",
@@ -15,7 +15,7 @@
     "lint": "eslint . && prettier --check .",
     "check": "npm run lint && npm run test",
     "prepublishOnly": "npm run compile",
-    "benchmark": "ts-node scripts/benchmark.ts"
+    "benchmark": "node scripts/benchmark.js"
   },
   "author": "Compass Team <compass@mongodb.com>",
   "gypfile": true,
@@ -25,9 +25,7 @@
   },
   "license": "Apache-2.0",
   "exports": {
-    "require": "./dist/index.js",
-    "import": "./dist/.esm-wrapper.mjs",
-    "types": "./dist/index.d.ts"
+    ".": "./index.js"
   },
   "homepage": "https://github.com/mongodb-js/devtools-shared",
   "repository": {
@@ -36,31 +34,24 @@
   },
   "bugs": "https://jira.mongodb.org/projects/COMPASS/issues",
   "bin": {
-    "native-machine-id": "dist/bin/machine-id.js"
+    "native-machine-id": "bin/machine-id.js"
   },
   "files": [
     "binding.cc",
     "binding.gyp",
-    "dist",
-    "LICENSE"
+    "index.js",
+    "bin",
+    "LICENSE",
+    "dist/index.d.ts"
   ],
   "devDependencies": {
     "@mongodb-js/eslint-config-devtools": "0.9.11",
     "@mongodb-js/mocha-config-devtools": "^1.0.5",
     "@mongodb-js/prettier-config-devtools": "^1.0.2",
-    "@mongodb-js/tsconfig-devtools": "^1.0.3",
-    "@types/bindings": "^1.5.5",
-    "@types/chai": "^4.2.21",
-    "@types/mocha": "^9.1.1",
-    "@types/node": "^17.0.35",
-    "@types/sinon-chai": "^3.2.5",
     "chai": "^4.5.0",
     "eslint": "^7.25.0",
-    "gen-esm-wrapper": "^1.1.1",
     "mocha": "^8.4.0",
-    "node-machine-id": "^1.1.12",
-    "ts-node": "^10.9.2",
-    "typescript": "^5.0.4"
+    "node-machine-id": "^1.1.12"
   },
   "keywords": [
     "machine id",

package/dist/.esm-wrapper.mjs

@@ -1,5 +0,0 @@
-import mod from "./index.js";
-
-export default mod;
-export const getMachineId = mod.getMachineId;
-export const getMachineIdSync = mod.getMachineIdSync;

package/dist/bin/machine-id.d.ts

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-export {};
-//# sourceMappingURL=machine-id.d.ts.map

package/dist/bin/machine-id.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"machine-id.d.ts","sourceRoot":"","sources":["../../src/bin/machine-id.ts"],"names":[],"mappings":""}

package/dist/bin/machine-id.js

@@ -1,7 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const __1 = require("..");
-const id = (0, __1.getMachineIdSync)({ raw: process.argv.includes('--raw') }) || '';
-console.log(id);
-//# sourceMappingURL=machine-id.js.map

package/dist/bin/machine-id.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"machine-id.js","sourceRoot":"","sources":["../../src/bin/machine-id.ts"],"names":[],"mappings":";;;AACA,0BAAsC;AAEtC,MAAM,EAAE,GAAG,IAAA,oBAAgB,EAAC,EAAE,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;AAG3E,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC"}

package/dist/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AA+DA,MAAM,MAAM,mBAAmB,GAAG;IAEhC,GAAG,CAAC,EAAE,OAAO,CAAC;CACf,CAAC;AAMF,wBAAsB,YAAY,CAAC,EACjC,GAAW,GACZ,GAAE,mBAAwB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAQxD;AAMD,wBAAgB,gBAAgB,CAAC,EAAE,GAAW,EAAE,GAAE,mBAAwB,GACtE,MAAM,GACN,SAAS,CAQZ"}

package/dist/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;AAwEA,oCAUC;AAMD,4CAUC;AAlGD,wDAAgC;AAChC,mCAAoC;AACpC,gDAAwB;AACxB,+BAAiC;AAEjC,MAAM,WAAW,GAAG,GAKlB,EAAE;IACF,MAAM,KAAK,GAAG;QACZ,GAAG,EAAE,CAAC,IAAA,kBAAQ,EAAC,mBAAmB,CAAC;QACnC,GAAG,EAAE,CACH,OAAO,CAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,yCAAyC,CAAC,CAAC;QAC1E,GAAG,EAAE,CAAC,OAAO,CAAC,yCAAyC,CAAC;QACxD,GAAG,EAAE,CAAC,OAAO,CAAC,wCAAwC,CAAC;QACvD,GAAG,EAAE,CAAC,OAAO,CAAC,uCAAuC,CAAC;KACvD,CAAC;IAEF,KAAK,MAAM,UAAU,IAAI,KAAK,EAAE,CAAC;QAC/B,IAAI,CAAC;YACH,OAAO,UAAU,EAAE,CAAC;QACtB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAEf,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;IAED,MAAM,IAAI,KAAK,CACb,iGAAiG;QAC/F,IAAI,CAAC,SAAS,CAAC;YACb,cAAI,CAAC,OAAO,CAAC,yCAAyC,CAAC;YACvD,cAAI,CAAC,OAAO,CAAC,uCAAuC,CAAC;YACrD,SAAS;YACT,OAAO,CAAC,GAAG,EAAE;SACd,CAAC,CACL,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,OAAO,GAAG,WAAW,EAAE,CAAC;AAE9B,SAAS,2BAA2B;IAClC,IAAI,CAAC;QACH,OAAO,OAAO,CAAC,gBAAgB,EAAE,IAAI,SAAS,CAAC;IACjD,CAAC;IAAC,MAAM,CAAC;QAEP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,KAAK,UAAU,4BAA4B;IACzC,IAAI,CAAC;QACH,MAAM,QAAQ,GACZ,CAAC,MAAM,IAAA,gBAAS,EAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC,IAAI,SAAS,CAAC;QAE9D,OAAO,QAAQ,CAAC;IAClB,CAAC;IAAC,MAAM,CAAC;QAEP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAWM,KAAK,UAAU,YAAY,CAAC,EACjC,GAAG,GAAG,KAAK,MACY,EAAE;IACzB,MAAM,SAAS,GAAG,MAAM,4BAA4B,EAAE,CAAC;IAEvD,IAAI,CAAC,SAAS,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QAC/B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,IAAA,mBAAU,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC9D,CAAC;AAMD,SAAgB,gBAAgB,CAAC,EAAE,GAAG,GAAG,KAAK,KAA0B,EAAE;IAGxE,MAAM,SAAS,GAAG,2BAA2B,EAAE,CAAC;IAEhD,IAAI,CAAC,SAAS,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QAC/B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,IAAA,mBAAU,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC9D,CAAC"}