Machine id fetching improvements.

app/helpers/identifiers.js

@@ -0,0 +1,18 @@
+import { machineId } from 'node-machine-id';
+import { settingsStorage } from './storageHelper';
+
+export async function getMachineId() {
+  const settings = settingsStorage.getItems(['machineId']);
+
+  if (!settings?.machineId) {
+    const _machineId = await machineId();
+
+    settingsStorage.setItems({
+      machineId: _machineId,
+    });
+
+    return _machineId;
+  }
+
+  return settings.machineId;
+}

app/services/analytics/mixpanelAnalytics.js

@@ -1,6 +1,5 @@
 import { isObject } from 'nice-utils';
 import mixpanel from 'mixpanel-browser';
-import { machineId } from 'node-machine-id';
 import { release } from 'os';
 import { log } from '../../utils/log';
 import { isEmpty } from '../../utils/funcs';
@@ -15,6 +14,7 @@ import { unixTimestampNow } from '../../utils/date';
 import { getCurrentWindowHash } from '../../helpers/windowHelper';
 import { getPlatform } from '../../utils/getPlatform';
 import { APP_VERSION } from '../../constants/meta';
+import { getMachineId } from '../../helpers/identifiers';
 
 export class MixpanelAnalytics {
   constructor() {
@@ -48,7 +48,7 @@ export class MixpanelAnalytics {
       }
 
       // this is a hashed value (sha-256)
-      this.machineId = await machineId();
+      this.machineId = await getMachineId();
 
       if (ENV_FLAVOR.enableMixpanelAnalytics) {
         mixpanel.init(SERVICE_KEYS.mixpanelAnalytics);

app/services/sentry/index.js

@@ -1,12 +1,12 @@
 import * as Sentry from '@sentry/electron';
-import { machineId } from 'node-machine-id';
 import { ENV_FLAVOR } from '../../constants/env';
 import { SERVICE_KEYS } from '../../constants/serviceKeys';
 import { getDeviceInfo } from '../../helpers/deviceInfo';
 import { isEmpty } from '../../utils/funcs';
 import { pkginfo } from '../../utils/pkginfo';
 import { checkIf } from '../../utils/checkIf';
 import { MTP_MODE } from '../../enums';
+import { getMachineId } from '../../helpers/identifiers';
 
 class SentryService {
   constructor() {
@@ -25,7 +25,7 @@ class SentryService {
       release: pkginfo.version,
     });
 
-    this.machineId = await machineId();
+    this.machineId = await getMachineId();
   }
 
   async report({ error, title, mtpMode }) {

app/utils/log.js

@@ -1,6 +1,5 @@
 import clp from 'console-log-plus';
 import os, { EOL } from 'os';
-import { machineId } from 'node-machine-id';
 import { IS_PROD } from '../constants/env';
 import { APP_NAME, APP_VERSION } from '../constants/meta';
 import { PATHS } from '../constants/paths';
@@ -12,6 +11,7 @@ import { isEmpty } from './funcs';
 import { getMtpModeSetting } from '../helpers/settings';
 import { redactHomeDirectory } from '../helpers/logs';
 import { isConsoleError } from './errors';
+import { getMachineId } from '../helpers/identifiers';
 
 const { logFile } = PATHS;
 
@@ -121,7 +121,7 @@ export const log = {
     let _deviceInfoStrigified = '';
     const deviceInfo = getDeviceInfo();
     const mtpMode = getMtpModeSetting();
-    const uuid = await machineId();
+    const uuid = await getMachineId();
 
     if (!isEmpty(deviceInfo)) {
       Object.keys(deviceInfo).forEach((a) => {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "openmtp",
   "productName": "OpenMTP",
-  "version": "3.2.20",
+  "version": "3.2.21",
   "description": "OpenMTP | Android File Transfer for macOS",
   "scripts": {
     "build": "yarn lint && concurrently \"yarn build-main\" \"yarn build-renderer\"",