Merge pull request #12173 from strapi/fix/non-shell-crash

Fixed non-shell host crash on startup

packages/core/strapi/lib/services/metrics/sender.js

@@ -3,10 +3,10 @@
 const os = require('os');
 const _ = require('lodash');
 const isDocker = require('is-docker');
-const { machineIdSync } = require('node-machine-id');
 const fetch = require('node-fetch');
 const ciEnv = require('ci-info');
 const ee = require('../../utils/ee');
+const machineID = require('../../utils/machine-id');
 const stringifyDeep = require('./stringify-deep');
 
 const defaultQueryOpts = {
@@ -33,7 +33,7 @@ const addPackageJsonStrapiMetadata = (metadata, strapi) => {
  */
 module.exports = strapi => {
   const { uuid } = strapi.config;
-  const deviceId = machineIdSync();
+  const deviceId = machineID();
   const isEE = strapi.EE === true && ee.isEE === true;
 
   const anonymous_metadata = {

packages/core/strapi/lib/utils/machine-id.js

@@ -0,0 +1,14 @@
+'use strict';
+
+const { machineIdSync } = require('node-machine-id');
+const uuid = require('uuid');
+
+module.exports = () => {
+  try {
+    const deviceId = machineIdSync();
+    return deviceId;
+  } catch (error) {
+    const deviceId = uuid();
+    return deviceId;
+  }
+};

packages/core/strapi/lib/utils/success.js

@@ -5,7 +5,7 @@
  */
 
 const fetch = require('node-fetch');
-const { machineIdSync } = require('node-machine-id');
+const machineID = require('./machine-id');
 
 /*
  * No need to worry about this file, we only retrieve anonymous data here.
@@ -21,7 +21,7 @@ try {
       method: 'POST',
       body: JSON.stringify({
         event: 'didInstallStrapi',
-        deviceId: machineIdSync(),
+        deviceId: machineID(),
       }),
       headers: { 'Content-Type': 'application/json' },
     }).catch(() => {});

packages/core/strapi/package.json

@@ -126,7 +126,8 @@
     "qs": "6.10.1",
     "resolve-cwd": "3.0.0",
     "semver": "7.3.5",
-    "statuses": "2.0.1"
+    "statuses": "2.0.1",
+    "uuid": "^3.3.2"
   },
   "devDependencies": {
     "supertest": "^6.1.6"

packages/generators/app/lib/index.js

@@ -3,7 +3,6 @@
 const { join, resolve, basename } = require('path');
 const os = require('os');
 const crypto = require('crypto');
-const { machineIdSync } = require('node-machine-id');
 const uuid = require('uuid/v4');
 const sentry = require('@sentry/node');
 // FIXME
@@ -14,6 +13,7 @@ const { trackError, captureException } = require('./utils/usage');
 const parseDatabaseArguments = require('./utils/parse-db-arguments');
 const generateNew = require('./generate-new');
 const checkInstallPath = require('./utils/check-install-path');
+const machineID = require('./utils/machine-id');
 
 sentry.init({
   dsn: 'https://841d2b2c9b4d4b43a4cde92794cb705a@sentry.io/1762059',
@@ -44,7 +44,7 @@ const generateNewApp = (projectDirectory, cliArguments) => {
     },
     uuid: (process.env.STRAPI_UUID_PREFIX || '') + uuid(),
     docker: process.env.DOCKER === 'true',
-    deviceId: machineIdSync(),
+    deviceId: machineID(),
     tmpPath,
     // use yarn if available and --use-npm isn't true
     useYarn: !useNpm && hasYarn(),

packages/generators/app/lib/utils/machine-id.js

@@ -0,0 +1,14 @@
+'use strict';
+
+const { machineIdSync } = require('node-machine-id');
+const uuid = require('uuid');
+
+module.exports = () => {
+  try {
+    const deviceId = machineIdSync();
+    return deviceId;
+  } catch (error) {
+    const deviceId = uuid();
+    return deviceId;
+  }
+};