systeminformation 5.27.16 → 5.28.0

package/lib/system.js

@@ -21,21 +21,19 @@ const exec = require('child_process').exec;
 const execSync = require('child_process').execSync;
 const execPromise = util.promisify(require('child_process').exec);
 
-let _platform = process.platform;
+const _platform = process.platform;
 
-const _linux = (_platform === 'linux' || _platform === 'android');
-const _darwin = (_platform === 'darwin');
-const _windows = (_platform === 'win32');
-const _freebsd = (_platform === 'freebsd');
-const _openbsd = (_platform === 'openbsd');
-const _netbsd = (_platform === 'netbsd');
-const _sunos = (_platform === 'sunos');
+const _linux = _platform === 'linux' || _platform === 'android';
+const _darwin = _platform === 'darwin';
+const _windows = _platform === 'win32';
+const _freebsd = _platform === 'freebsd';
+const _openbsd = _platform === 'openbsd';
+const _netbsd = _platform === 'netbsd';
+const _sunos = _platform === 'sunos';
 
 function system(callback) {
-
   return new Promise((resolve) => {
     process.nextTick(() => {
-
       let result = {
         manufacturer: '',
         model: 'Computer',
@@ -47,13 +45,13 @@ function system(callback) {
       };
 
       if (_linux || _freebsd || _openbsd || _netbsd) {
-        exec('export LC_ALL=C; dmidecode -t system 2>/dev/null; unset LC_ALL', function (error, stdout) {
+        exec('export LC_ALL=C; dmidecode -t system 2>/dev/null; unset LC_ALL', (error, stdout) => {
           let lines = stdout.toString().split('\n');
           result.manufacturer = cleanDefaults(util.getValue(lines, 'manufacturer'));
           result.model = cleanDefaults(util.getValue(lines, 'product name'));
           result.version = cleanDefaults(util.getValue(lines, 'version'));
           result.serial = cleanDefaults(util.getValue(lines, 'serial number'));
-          result.uuid = cleanDefaults((util.getValue(lines, 'uuid'))).toLowerCase();
+          result.uuid = cleanDefaults(util.getValue(lines, 'uuid')).toLowerCase();
           result.sku = cleanDefaults(util.getValue(lines, 'sku number'));
           // Non-Root values
           const cmd = `echo -n "product_name: "; cat /sys/devices/virtual/dmi/id/product_name 2>/dev/null; echo;
@@ -68,17 +66,34 @@ function system(callback) {
             result.version = cleanDefaults(result.version === '' ? util.getValue(lines, 'product_version') : result.version);
             result.serial = cleanDefaults(result.serial === '' ? util.getValue(lines, 'product_serial') : result.serial);
             result.uuid = cleanDefaults(result.uuid === '' ? util.getValue(lines, 'product_uuid').toLowerCase() : result.uuid);
-          } catch (e) {
+          } catch {
             util.noop();
           }
-          if (!result.serial) { result.serial = '-'; }
-          if (!result.manufacturer) { result.manufacturer = ''; }
-          if (!result.model) { result.model = 'Computer'; }
-          if (!result.version) { result.version = ''; }
-          if (!result.sku) { result.sku = '-'; }
+          if (!result.serial) {
+            result.serial = '-';
+          }
+          if (!result.manufacturer) {
+            result.manufacturer = '';
+          }
+          if (!result.model) {
+            result.model = 'Computer';
+          }
+          if (!result.version) {
+            result.version = '';
+          }
+          if (!result.sku) {
+            result.sku = '-';
+          }
 
           // detect virtual (1)
-          if (result.model.toLowerCase() === 'virtualbox' || result.model.toLowerCase() === 'kvm' || result.model.toLowerCase() === 'virtual machine' || result.model.toLowerCase() === 'bochs' || result.model.toLowerCase().startsWith('vmware') || result.model.toLowerCase().startsWith('droplet')) {
+          if (
+            result.model.toLowerCase() === 'virtualbox' ||
+            result.model.toLowerCase() === 'kvm' ||
+            result.model.toLowerCase() === 'virtual machine' ||
+            result.model.toLowerCase() === 'bochs' ||
+            result.model.toLowerCase().startsWith('vmware') ||
+            result.model.toLowerCase().startsWith('droplet')
+          ) {
             result.virtual = true;
             switch (result.model.toLowerCase()) {
               case 'virtualbox':
@@ -117,7 +132,7 @@ function system(callback) {
                 result.virtual = true;
                 result.virtualHost = 'VirtualBox';
               }
-            } catch (e) {
+            } catch {
               util.noop();
             }
           }
@@ -133,7 +148,7 @@ function system(callback) {
               if (!result.model || result.model === 'Computer') {
                 result.model = util.getValue(lines, 'hw.model', ':').trim();
               }
-            } catch (e) {
+            } catch {
               util.noop();
             }
           }
@@ -163,7 +178,7 @@ function system(callback) {
                   result.virtualHost = 'bochs';
                   break;
               }
-            } catch (e) {
+            } catch {
               util.noop();
             }
           }
@@ -174,9 +189,11 @@ function system(callback) {
           try {
             const stdout = execSync('dmesg 2>/dev/null | grep -iE "virtual|hypervisor" | grep -iE "vmware|qemu|kvm|xen" | grep -viE "Nested Virtualization|/virtual/"');
             // detect virtual machines
-            let lines = stdout.toString().split('\n');
+            const lines = stdout.toString().split('\n');
             if (lines.length > 0) {
-              if (result.model === 'Computer') { result.model = 'Virtual machine'; }
+              if (result.model === 'Computer') {
+                result.model = 'Virtual machine';
+              }
               result.virtual = true;
               if (stdout.toString().toLowerCase().indexOf('vmware') >= 0 && !result.virtualHost) {
                 result.virtualHost = 'VMware';
@@ -191,13 +208,13 @@ function system(callback) {
                 result.virtualHost = 'KVM';
               }
             }
-          } catch (e) {
+          } catch {
             util.noop();
           }
 
           if (result.manufacturer === '' && result.model === 'Computer' && result.version === '') {
             // Check Raspberry Pi
-            fs.readFile('/proc/cpuinfo', function (error, stdout) {
+            fs.readFile('/proc/cpuinfo', (error, stdout) => {
               if (!error) {
                 let lines = stdout.toString().split('\n');
                 result.model = util.getValue(lines, 'hardware', ':', true).toUpperCase();
@@ -219,23 +236,25 @@ function system(callback) {
                   };
                 }
               }
-              if (callback) { callback(result); }
+              if (callback) {
+                callback(result);
+              }
               resolve(result);
             });
           } else {
-            if (callback) { callback(result); }
+            if (callback) {
+              callback(result);
+            }
             resolve(result);
           }
         });
       }
       if (_darwin) {
-        exec('ioreg -c IOPlatformExpertDevice -d 2', function (error, stdout) {
+        exec('ioreg -c IOPlatformExpertDevice -d 2',  (error, stdout) => {
           if (!error) {
-            let lines = stdout.toString().replace(/[<>"]/g, '').split('\n');
+            const lines = stdout.toString().replace(/[<>"]/g, '').split('\n');
 
             const model = util.getAppleModel(util.getValue(lines, 'model', '=', true));
-            // const modelParts = util.splitByNumber(model);
-            // const version = util.getValue(lines, 'version', '=', true);
             result.manufacturer = util.getValue(lines, 'manufacturer', '=', true);
             result.model = model.key;
             result.type = macOsChassisType(model.version);
@@ -244,19 +263,23 @@ function system(callback) {
             result.uuid = util.getValue(lines, 'ioplatformuuid', '=', true).toLowerCase();
             result.sku = util.getValue(lines, 'board-id', '=', true) || util.getValue(lines, 'target-sub-type', '=', true);
           }
-          if (callback) { callback(result); }
+          if (callback) {
+            callback(result);
+          }
           resolve(result);
         });
       }
       if (_sunos) {
-        if (callback) { callback(result); }
+        if (callback) {
+          callback(result);
+        }
         resolve(result);
       }
       if (_windows) {
         try {
           util.powerShell('Get-CimInstance Win32_ComputerSystemProduct | select Name,Vendor,Version,IdentifyingNumber,UUID | fl').then((stdout, error) => {
             if (!error) {
-              let lines = stdout.split('\r\n');
+              const lines = stdout.split('\r\n');
               result.manufacturer = util.getValue(lines, 'vendor', ':');
               result.model = util.getValue(lines, 'name', ':');
               result.version = util.getValue(lines, 'version', ':');
@@ -264,33 +287,68 @@ function system(callback) {
               result.uuid = util.getValue(lines, 'uuid', ':').toLowerCase();
               // detect virtual (1)
               const model = result.model.toLowerCase();
-              if (model === 'virtualbox' || model === 'kvm' || model === 'virtual machine' || model === 'bochs' || model.startsWith('vmware') || model.startsWith('qemu') || model.startsWith('parallels')) {
+              if (
+                model === 'virtualbox' ||
+                model === 'kvm' ||
+                model === 'virtual machine' ||
+                model === 'bochs' ||
+                model.startsWith('vmware') ||
+                model.startsWith('qemu') ||
+                model.startsWith('parallels')
+              ) {
                 result.virtual = true;
-                if (model.startsWith('virtualbox')) { result.virtualHost = 'VirtualBox'; }
-                if (model.startsWith('vmware')) { result.virtualHost = 'VMware'; }
-                if (model.startsWith('kvm')) { result.virtualHost = 'KVM'; }
-                if (model.startsWith('bochs')) { result.virtualHost = 'bochs'; }
-                if (model.startsWith('qemu')) { result.virtualHost = 'KVM'; }
-                if (model.startsWith('parallels')) { result.virtualHost = 'Parallels'; }
+                if (model.startsWith('virtualbox')) {
+                  result.virtualHost = 'VirtualBox';
+                }
+                if (model.startsWith('vmware')) {
+                  result.virtualHost = 'VMware';
+                }
+                if (model.startsWith('kvm')) {
+                  result.virtualHost = 'KVM';
+                }
+                if (model.startsWith('bochs')) {
+                  result.virtualHost = 'bochs';
+                }
+                if (model.startsWith('qemu')) {
+                  result.virtualHost = 'KVM';
+                }
+                if (model.startsWith('parallels')) {
+                  result.virtualHost = 'Parallels';
+                }
               }
               const manufacturer = result.manufacturer.toLowerCase();
               if (manufacturer.startsWith('vmware') || manufacturer.startsWith('qemu') || manufacturer === 'xen' || manufacturer.startsWith('parallels')) {
                 result.virtual = true;
-                if (manufacturer.startsWith('vmware')) { result.virtualHost = 'VMware'; }
-                if (manufacturer.startsWith('xen')) { result.virtualHost = 'Xen'; }
-                if (manufacturer.startsWith('qemu')) { result.virtualHost = 'KVM'; }
-                if (manufacturer.startsWith('parallels')) { result.virtualHost = 'Parallels'; }
+                if (manufacturer.startsWith('vmware')) {
+                  result.virtualHost = 'VMware';
+                }
+                if (manufacturer.startsWith('xen')) {
+                  result.virtualHost = 'Xen';
+                }
+                if (manufacturer.startsWith('qemu')) {
+                  result.virtualHost = 'KVM';
+                }
+                if (manufacturer.startsWith('parallels')) {
+                  result.virtualHost = 'Parallels';
+                }
               }
               util.powerShell('Get-CimInstance MS_Systeminformation -Namespace "root/wmi" | select systemsku | fl ').then((stdout, error) => {
                 if (!error) {
-                  let lines = stdout.split('\r\n');
+                  const lines = stdout.split('\r\n');
                   result.sku = util.getValue(lines, 'systemsku', ':');
                 }
                 if (!result.virtual) {
                   util.powerShell('Get-CimInstance Win32_bios | select Version, SerialNumber, SMBIOSBIOSVersion').then((stdout, error) => {
                     if (!error) {
                       let lines = stdout.toString();
-                      if (lines.indexOf('VRTUAL') >= 0 || lines.indexOf('A M I ') >= 0 || lines.indexOf('VirtualBox') >= 0 || lines.indexOf('VMWare') >= 0 || lines.indexOf('Xen') >= 0 || lines.indexOf('Parallels') >= 0) {
+                      if (
+                        lines.indexOf('VRTUAL') >= 0 ||
+                        lines.indexOf('A M I ') >= 0 ||
+                        lines.indexOf('VirtualBox') >= 0 ||
+                        lines.indexOf('VMWare') >= 0 ||
+                        lines.indexOf('Xen') >= 0 ||
+                        lines.indexOf('Parallels') >= 0
+                      ) {
                         result.virtual = true;
                         if (lines.indexOf('VirtualBox') >= 0 && !result.virtualHost) {
                           result.virtualHost = 'VirtualBox';
@@ -311,25 +369,35 @@ function system(callback) {
                           result.virtualHost = 'Parallels';
                         }
                       }
-                      if (callback) { callback(result); }
+                      if (callback) {
+                        callback(result);
+                      }
                       resolve(result);
                     } else {
-                      if (callback) { callback(result); }
+                      if (callback) {
+                        callback(result);
+                      }
                       resolve(result);
                     }
                   });
                 } else {
-                  if (callback) { callback(result); }
+                  if (callback) {
+                    callback(result);
+                  }
                   resolve(result);
                 }
               });
             } else {
-              if (callback) { callback(result); }
+              if (callback) {
+                callback(result);
+              }
               resolve(result);
             }
           });
-        } catch (e) {
-          if (callback) { callback(result); }
+        } catch {
+          if (callback) {
+            callback(result);
+          }
           resolve(result);
         }
       }
@@ -347,15 +415,13 @@ function cleanDefaults(s) {
   return '';
 }
 function bios(callback) {
-
   return new Promise((resolve) => {
     process.nextTick(() => {
-
       let result = {
         vendor: '',
         version: '',
         releaseDate: '',
-        revision: '',
+        revision: ''
       };
       let cmd = '';
       if (_linux || _freebsd || _openbsd || _netbsd) {
@@ -364,7 +430,7 @@ function bios(callback) {
         } else {
           cmd = 'export LC_ALL=C; dmidecode -t bios 2>/dev/null; unset LC_ALL';
         }
-        exec(cmd, function (error, stdout) {
+        exec(cmd, (error, stdout) => {
           let lines = stdout.toString().split('\n');
           result.vendor = util.getValue(lines, 'Vendor');
           result.version = util.getValue(lines, 'Version');
@@ -378,7 +444,7 @@ function bios(callback) {
           }
           if (lines.length && stdout.toString().indexOf('Characteristics:') >= 0) {
             const features = [];
-            lines.forEach(line => {
+            lines.forEach((line) => {
               if (line.indexOf(' is supported') >= 0) {
                 const feature = line.split(' is supported')[0].trim();
                 features.push(feature);
@@ -399,62 +465,75 @@ function bios(callback) {
           } catch (e) {
             util.noop();
           }
-          if (callback) { callback(result); }
+          if (callback) {
+            callback(result);
+          }
           resolve(result);
         });
       }
       if (_darwin) {
         result.vendor = 'Apple Inc.';
-        exec(
-          'system_profiler SPHardwareDataType -json', function (error, stdout) {
-            try {
-              const hardwareData = JSON.parse(stdout.toString());
-              if (hardwareData && hardwareData.SPHardwareDataType && hardwareData.SPHardwareDataType.length) {
-                let bootRomVersion = hardwareData.SPHardwareDataType[0].boot_rom_version;
-                bootRomVersion = bootRomVersion ? bootRomVersion.split('(')[0].trim() : null;
-                result.version = bootRomVersion;
-              }
-            } catch (e) {
-              util.noop();
+        exec('system_profiler SPHardwareDataType -json', (error, stdout) => {
+          try {
+            const hardwareData = JSON.parse(stdout.toString());
+            if (hardwareData && hardwareData.SPHardwareDataType && hardwareData.SPHardwareDataType.length) {
+              let bootRomVersion = hardwareData.SPHardwareDataType[0].boot_rom_version;
+              bootRomVersion = bootRomVersion ? bootRomVersion.split('(')[0].trim() : null;
+              result.version = bootRomVersion;
             }
-            if (callback) { callback(result); }
-            resolve(result);
-          });
+          } catch (e) {
+            util.noop();
+          }
+          if (callback) {
+            callback(result);
+          }
+          resolve(result);
+        });
       }
       if (_sunos) {
         result.vendor = 'Sun Microsystems';
-        if (callback) { callback(result); }
+        if (callback) {
+          callback(result);
+        }
         resolve(result);
       }
       if (_windows) {
         try {
-          util.powerShell('Get-CimInstance Win32_bios | select Description,Version,Manufacturer,@{n="ReleaseDate";e={$_.ReleaseDate.ToString("yyyy-MM-dd")}},BuildNumber,SerialNumber,SMBIOSBIOSVersion | fl').then((stdout, error) => {
-            if (!error) {
-              let lines = stdout.toString().split('\r\n');
-              const description = util.getValue(lines, 'description', ':');
-              const version = util.getValue(lines, 'SMBIOSBIOSVersion', ':');
-              if (description.indexOf(' Version ') !== -1) {
-                // ... Phoenix ROM BIOS PLUS Version 1.10 A04
-                result.vendor = description.split(' Version ')[0].trim();
-                result.version = description.split(' Version ')[1].trim();
-              } else if (description.indexOf(' Ver: ') !== -1) {
-                // ... BIOS Date: 06/27/16 17:50:16 Ver: 1.4.5
-                result.vendor = util.getValue(lines, 'manufacturer', ':');
-                result.version = description.split(' Ver: ')[1].trim();
-              } else {
-                result.vendor = util.getValue(lines, 'manufacturer', ':');
-                result.version = version || util.getValue(lines, 'version', ':');
+          util
+            .powerShell(
+              'Get-CimInstance Win32_bios | select Description,Version,Manufacturer,@{n="ReleaseDate";e={$_.ReleaseDate.ToString("yyyy-MM-dd")}},BuildNumber,SerialNumber,SMBIOSBIOSVersion | fl'
+            )
+            .then((stdout, error) => {
+              if (!error) {
+                let lines = stdout.toString().split('\r\n');
+                const description = util.getValue(lines, 'description', ':');
+                const version = util.getValue(lines, 'SMBIOSBIOSVersion', ':');
+                if (description.indexOf(' Version ') !== -1) {
+                  // ... Phoenix ROM BIOS PLUS Version 1.10 A04
+                  result.vendor = description.split(' Version ')[0].trim();
+                  result.version = description.split(' Version ')[1].trim();
+                } else if (description.indexOf(' Ver: ') !== -1) {
+                  // ... BIOS Date: 06/27/16 17:50:16 Ver: 1.4.5
+                  result.vendor = util.getValue(lines, 'manufacturer', ':');
+                  result.version = description.split(' Ver: ')[1].trim();
+                } else {
+                  result.vendor = util.getValue(lines, 'manufacturer', ':');
+                  result.version = version || util.getValue(lines, 'version', ':');
+                }
+                result.releaseDate = util.getValue(lines, 'releasedate', ':');
+                result.revision = util.getValue(lines, 'buildnumber', ':');
+                result.serial = cleanDefaults(util.getValue(lines, 'serialnumber', ':'));
               }
-              result.releaseDate = util.getValue(lines, 'releasedate', ':');
-              result.revision = util.getValue(lines, 'buildnumber', ':');
-              result.serial = cleanDefaults(util.getValue(lines, 'serialnumber', ':'));
-            }
 
-            if (callback) { callback(result); }
-            resolve(result);
-          });
+              if (callback) {
+                callback(result);
+              }
+              resolve(result);
+            });
         } catch (e) {
-          if (callback) { callback(result); }
+          if (callback) {
+            callback(result);
+          }
           resolve(result);
         }
       }
@@ -465,11 +544,9 @@ function bios(callback) {
 exports.bios = bios;
 
 function baseboard(callback) {
-
   return new Promise((resolve) => {
     process.nextTick(() => {
-
-      let result = {
+      const result = {
         manufacturer: '',
         model: '',
         version: '',
@@ -489,9 +566,7 @@ function baseboard(callback) {
         const workload = [];
         workload.push(execPromise(cmd));
         workload.push(execPromise('export LC_ALL=C; dmidecode -t memory 2>/dev/null'));
-        util.promiseAll(
-          workload
-        ).then((data) => {
+        util.promiseAll(workload).then((data) => {
           let lines = data.results[0] ? data.results[0].toString().split('\n') : [''];
           result.manufacturer = cleanDefaults(util.getValue(lines, 'Manufacturer'));
           result.model = cleanDefaults(util.getValue(lines, 'Product Name'));
@@ -511,7 +586,7 @@ function baseboard(callback) {
             result.version = cleanDefaults(!result.version ? util.getValue(lines, 'board_version') : result.version);
             result.serial = cleanDefaults(!result.serial ? util.getValue(lines, 'board_serial') : result.serial);
             result.assetTag = cleanDefaults(!result.assetTag ? util.getValue(lines, 'board_asset_tag') : result.assetTag);
-          } catch (e) {
+          } catch {
             util.noop();
           }
 
@@ -531,7 +606,9 @@ function baseboard(callback) {
             result.memSlots = 0;
           }
 
-          if (callback) { callback(result); }
+          if (callback) {
+            callback(result);
+          }
           resolve(result);
         });
       }
@@ -539,10 +616,8 @@ function baseboard(callback) {
         const workload = [];
         workload.push(execPromise('ioreg -c IOPlatformExpertDevice -d 2'));
         workload.push(execPromise('system_profiler SPMemoryDataType'));
-        util.promiseAll(
-          workload
-        ).then((data) => {
-          let lines = data.results[0] ? data.results[0].toString().replace(/[<>"]/g, '').split('\n') : [''];
+        util.promiseAll(workload).then((data) => {
+          const lines = data.results[0] ? data.results[0].toString().replace(/[<>"]/g, '').split('\n') : [''];
           result.manufacturer = util.getValue(lines, 'manufacturer', '=', true);
           result.model = util.getValue(lines, 'model', '=', true);
           result.version = util.getValue(lines, 'version', '=', true);
@@ -562,12 +637,16 @@ function baseboard(callback) {
             result.memMax = os.totalmem();
           }
 
-          if (callback) { callback(result); }
+          if (callback) {
+            callback(result);
+          }
           resolve(result);
         });
       }
       if (_sunos) {
-        if (callback) { callback(result); }
+        if (callback) {
+          callback(result);
+        }
         resolve(result);
       }
       if (_windows) {
@@ -577,9 +656,7 @@ function baseboard(callback) {
           const maxCapacityAttribute = win10plus ? 'MaxCapacityEx' : 'MaxCapacity';
           workload.push(util.powerShell('Get-CimInstance Win32_baseboard | select Model,Manufacturer,Product,Version,SerialNumber,PartNumber,SKU | fl'));
           workload.push(util.powerShell(`Get-CimInstance Win32_physicalmemoryarray | select ${maxCapacityAttribute}, MemoryDevices | fl`));
-          util.promiseAll(
-            workload
-          ).then((data) => {
+          util.promiseAll(workload).then((data) => {
             let lines = data.results[0] ? data.results[0].toString().split('\r\n') : [''];
 
             result.manufacturer = cleanDefaults(util.getValue(lines, 'manufacturer', ':'));
@@ -599,11 +676,15 @@ function baseboard(callback) {
             result.memMax = util.toInt(util.getValue(lines, maxCapacityAttribute, ':')) * (win10plus ? 1024 : 1) || null;
             result.memSlots = util.toInt(util.getValue(lines, 'MemoryDevices', ':')) || null;
 
-            if (callback) { callback(result); }
+            if (callback) {
+              callback(result);
+            }
             resolve(result);
           });
-        } catch (e) {
-          if (callback) { callback(result); }
+        } catch {
+          if (callback) {
+            callback(result);
+          }
           resolve(result);
         }
       }
@@ -615,18 +696,33 @@ exports.baseboard = baseboard;
 
 function macOsChassisType(model) {
   model = model.toLowerCase();
-  if (model.indexOf('macbookair') >= 0 || model.indexOf('macbook air') >= 0) { return 'Notebook'; }
-  if (model.indexOf('macbookpro') >= 0 || model.indexOf('macbook pro') >= 0) { return 'Notebook'; }
-  if (model.indexOf('macbook') >= 0) { return 'Notebook'; }
-  if (model.indexOf('macmini') >= 0 || model.indexOf('mac mini') >= 0) { return 'Desktop'; }
-  if (model.indexOf('imac') >= 0) { return 'Desktop'; }
-  if (model.indexOf('macstudio') >= 0 || model.indexOf('mac studio') >= 0) { return 'Desktop'; }
-  if (model.indexOf('macpro') >= 0 || model.indexOf('mac pro') >= 0) { return 'Tower'; }
+  if (model.indexOf('macbookair') >= 0 || model.indexOf('macbook air') >= 0) {
+    return 'Notebook';
+  }
+  if (model.indexOf('macbookpro') >= 0 || model.indexOf('macbook pro') >= 0) {
+    return 'Notebook';
+  }
+  if (model.indexOf('macbook') >= 0) {
+    return 'Notebook';
+  }
+  if (model.indexOf('macmini') >= 0 || model.indexOf('mac mini') >= 0) {
+    return 'Desktop';
+  }
+  if (model.indexOf('imac') >= 0) {
+    return 'Desktop';
+  }
+  if (model.indexOf('macstudio') >= 0 || model.indexOf('mac studio') >= 0) {
+    return 'Desktop';
+  }
+  if (model.indexOf('macpro') >= 0 || model.indexOf('mac pro') >= 0) {
+    return 'Tower';
+  }
   return 'Other';
 }
 
 function chassis(callback) {
-  const chassisTypes = ['Other',
+  const chassisTypes = [
+    'Other',
     'Unknown',
     'Desktop',
     'Low Profile Desktop',
@@ -661,12 +757,11 @@ function chassis(callback) {
     'IoT Gateway ',
     'Embedded PC',
     'Mini PC',
-    'Stick PC',
+    'Stick PC'
   ];
 
   return new Promise((resolve) => {
     process.nextTick(() => {
-
       let result = {
         manufacturer: '',
         model: '',
@@ -674,7 +769,7 @@ function chassis(callback) {
         version: '',
         serial: '-',
         assetTag: '-',
-        sku: '',
+        sku: ''
       };
       if (_linux || _freebsd || _openbsd || _netbsd) {
         const cmd = `echo -n "chassis_asset_tag: "; cat /sys/devices/virtual/dmi/id/chassis_asset_tag 2>/dev/null; echo;
@@ -682,26 +777,26 @@ function chassis(callback) {
             echo -n "chassis_type: "; cat /sys/devices/virtual/dmi/id/chassis_type 2>/dev/null; echo;
             echo -n "chassis_vendor: "; cat /sys/devices/virtual/dmi/id/chassis_vendor 2>/dev/null; echo;
             echo -n "chassis_version: "; cat /sys/devices/virtual/dmi/id/chassis_version 2>/dev/null; echo;`;
-        exec(cmd, function (error, stdout) {
+        exec(cmd, (error, stdout) => {
           let lines = stdout.toString().split('\n');
           result.manufacturer = cleanDefaults(util.getValue(lines, 'chassis_vendor'));
           const ctype = parseInt(util.getValue(lines, 'chassis_type').replace(/\D/g, ''));
-          result.type = cleanDefaults((ctype && !isNaN(ctype) && ctype < chassisTypes.length) ? chassisTypes[ctype - 1] : '');
+          result.type = cleanDefaults(ctype && !isNaN(ctype) && ctype < chassisTypes.length ? chassisTypes[ctype - 1] : '');
           result.version = cleanDefaults(util.getValue(lines, 'chassis_version'));
           result.serial = cleanDefaults(util.getValue(lines, 'chassis_serial'));
           result.assetTag = cleanDefaults(util.getValue(lines, 'chassis_asset_tag'));
 
-          if (callback) { callback(result); }
+          if (callback) {
+            callback(result);
+          }
           resolve(result);
         });
       }
       if (_darwin) {
-        exec('ioreg -c IOPlatformExpertDevice -d 2', function (error, stdout) {
+        exec('ioreg -c IOPlatformExpertDevice -d 2', (error, stdout) => {
           if (!error) {
-            let lines = stdout.toString().replace(/[<>"]/g, '').split('\n');
+            const lines = stdout.toString().replace(/[<>"]/g, '').split('\n');
             const model = util.getAppleModel(util.getValue(lines, 'model', '=', true));
-            // const modelParts = util.splitByNumber(model);
-            // const version = util.getValue(lines, 'version', '=', true);
             result.manufacturer = util.getValue(lines, 'manufacturer', '=', true);
             result.model = model.key;
             result.type = macOsChassisType(model.model);
@@ -711,12 +806,16 @@ function chassis(callback) {
             result.sku = util.getValue(lines, 'target-sub-type', '=', true);
           }
 
-          if (callback) { callback(result); }
+          if (callback) {
+            callback(result);
+          }
           resolve(result);
         });
       }
       if (_sunos) {
-        if (callback) { callback(result); }
+        if (callback) {
+          callback(result);
+        }
         resolve(result);
       }
       if (_windows) {
@@ -728,7 +827,7 @@ function chassis(callback) {
               result.manufacturer = cleanDefaults(util.getValue(lines, 'manufacturer', ':'));
               result.model = cleanDefaults(util.getValue(lines, 'model', ':'));
               const ctype = parseInt(util.getValue(lines, 'ChassisTypes', ':').replace(/\D/g, ''));
-              result.type = (ctype && !isNaN(ctype) && ctype < chassisTypes.length) ? chassisTypes[ctype - 1] : '';
+              result.type = ctype && !isNaN(ctype) && ctype < chassisTypes.length ? chassisTypes[ctype - 1] : '';
               result.version = cleanDefaults(util.getValue(lines, 'version', ':'));
               result.serial = cleanDefaults(util.getValue(lines, 'serialnumber', ':'));
               result.assetTag = cleanDefaults(util.getValue(lines, 'partnumber', ':'));
@@ -738,11 +837,15 @@ function chassis(callback) {
               result.sku = cleanDefaults(util.getValue(lines, 'sku', ':'));
             }
 
-            if (callback) { callback(result); }
+            if (callback) {
+              callback(result);
+            }
             resolve(result);
           });
-        } catch (e) {
-          if (callback) { callback(result); }
+        } catch {
+          if (callback) {
+            callback(result);
+          }
           resolve(result);
         }
       }