systeminformation 5.9.18 → 5.10.3

package/lib/system.js

@@ -5,7 +5,7 @@
 // ----------------------------------------------------------------------------------
 // Description:   System Information - library
 //                for Node.js
-// Copyright:     (c) 2014 - 2021
+// Copyright:     (c) 2014 - 2022
 // Author:        Sebastian Hildebrandt
 // ----------------------------------------------------------------------------------
 // License:       MIT
@@ -22,7 +22,7 @@ const execPromise = util.promisify(require('child_process').exec);
 
 let _platform = process.platform;
 
-const _linux = (_platform === 'linux');
+const _linux = (_platform === 'linux' || _platform === 'android');
 const _darwin = (_platform === 'darwin');
 const _windows = (_platform === 'win32');
 const _freebsd = (_platform === 'freebsd');
@@ -353,33 +353,21 @@ function system(callback) {
               result.serial = util.getValue(lines, 'identifyingnumber', ':');
               result.uuid = util.getValue(lines, 'uuid', ':').toLowerCase();
               // 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')) {
+              const model = result.model.toLowerCase();
+              if (model === 'virtualbox' || model === 'kvm' || model === 'virtual machine' || model === 'bochs' || model.startsWith('vmware') || model.startsWith('qemu')) {
                 result.virtual = true;
-                switch (result.model.toLowerCase()) {
-                  case 'virtualbox':
-                    result.virtualHost = 'VirtualBox';
-                    break;
-                  case 'vmware':
-                    result.virtualHost = 'VMware';
-                    break;
-                  case 'kvm':
-                    result.virtualHost = 'KVM';
-                    break;
-                  case 'bochs':
-                    result.virtualHost = 'bochs';
-                    break;
-                }
+                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 (result.manufacturer.toLowerCase().startsWith('vmware') || result.manufacturer.toLowerCase() === 'xen') {
+              const manufacturer = result.manufacturer.toLowerCase();
+              if (manufacturer.startsWith('vmware') || manufacturer.startsWith('qemu') || manufacturer === 'xen') {
                 result.virtual = true;
-                switch (result.manufacturer.toLowerCase()) {
-                  case 'vmware':
-                    result.virtualHost = 'VMware';
-                    break;
-                  case 'xen':
-                    result.virtualHost = 'Xen';
-                    break;
-                }
+                if (manufacturer.startsWith('vmware')) { result.virtualHost = 'VMware'; }
+                if (manufacturer.startsWith('xen')) { result.virtualHost = 'Xen'; }
+                if (manufacturer.startsWith('qemu')) { result.virtualHost = 'KVM'; }
               }
               util.powerShell('Get-WmiObject MS_Systeminformation -Namespace "root/wmi" | fl *').then((stdout, error) => {
                 if (!error) {