systeminformation 5.17.14 → 5.17.16

package/lib/usb.js

@@ -125,20 +125,36 @@ function parseDarwinUsb(usb, id) {
       if (lines[i] !== '{' && lines[i] !== '}' && lines[i + 1] && lines[i + 1].trim() !== '}') {
         lines[i] = lines[i] + ',';
       }
+
+      lines[i] = lines[i].replace(':Yes,', ':"Yes",');
       lines[i] = lines[i].replace(': Yes,', ': "Yes",');
+      lines[i] = lines[i].replace(': Yes', ': "Yes"');
+      lines[i] = lines[i].replace(':No,', ':"No",');
       lines[i] = lines[i].replace(': No,', ': "No",');
+      lines[i] = lines[i].replace(': No', ': "No"');
+
+      // In this case (("com.apple.developer.driverkit.transport.usb"))
+      lines[i] = lines[i].replace('((', '').replace('))', '');
+
+      // In case we have <923c11> we need make it "<923c11>" for correct JSON parse
+      const match = /<(\w+)>/.exec(lines[i]);
+      if (match) {
+        const number = match[0];
+        lines[i] = lines[i].replace(number, `"${number}"`);
+      }
     }
     const usbObj = JSON.parse(lines.join('\n'));
-    const removableDrive = usbObj['Built-In'].toLowerCase() !== 'yes' && usbObj['non-removable'].toLowerCase() === 'no';
+    const removableDrive = (usbObj['Built-In'] ? usbObj['Built-In'].toLowerCase() !== 'yes' : true) && (usbObj['non-removable'] ? usbObj['non-removable'].toLowerCase() === 'no' : true);
 
     result.bus = null;
     result.deviceId = null;
     result.id = usbObj['USB Address'] || null;
     result.name = usbObj['kUSBProductString'] || usbObj['USB Product Name'] || null;
     result.type = getDarwinUsbType((usbObj['kUSBProductString'] || usbObj['USB Product Name'] || '').toLowerCase() + (removableDrive ? ' removable' : ''));
-    result.removable = usbObj['non-removable'].toLowerCase() === 'no';
+    result.removable = usbObj['non-removable'] ? usbObj['non-removable'].toLowerCase() || '' === 'no' : true;
     result.vendor = usbObj['kUSBVendorString'] || usbObj['USB Vendor Name'] || null;
     result.manufacturer = usbObj['kUSBVendorString'] || usbObj['USB Vendor Name'] || null;
+
     result.maxPower = null;
     result.serialNumber = usbObj['kUSBSerialNumberString'] || null;
 

package/lib/util.js

@@ -378,7 +378,7 @@ function powerShellProceedResults(data) {
 
 function powerShellStart() {
   if (!_psChild) {
-    _psChild = spawn('powershell.exe', ['-NoLogo', '-InputFormat', 'Text', '-NoExit', '-Command', '-'], {
+    _psChild = spawn('powershell.exe', ['-NoProfile', '-NoLogo', '-InputFormat', 'Text', '-NoExit', '-Command', '-'], {
       stdio: 'pipe',
       windowsHide: true,
       maxBuffer: 1024 * 20000,
@@ -451,7 +451,7 @@ function powerShell(cmd) {
     return new Promise((resolve) => {
       process.nextTick(() => {
         try {
-          const child = spawn('powershell.exe', ['-NoLogo', '-InputFormat', 'Text', '-NoExit', '-ExecutionPolicy', 'Unrestricted', '-Command', '-'], {
+          const child = spawn('powershell.exe', ['-NoProfile', '-NoLogo', '-InputFormat', 'Text', '-NoExit', '-ExecutionPolicy', 'Unrestricted', '-Command', '-'], {
             stdio: 'pipe',
             windowsHide: true,
             maxBuffer: 1024 * 20000,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "systeminformation",
-  "version": "5.17.14",
+  "version": "5.17.16",
   "description": "Advanced, lightweight system and OS information library",
   "license": "MIT",
   "author": "Sebastian Hildebrandt <hildebrandt@plus-innovations.com> (https://plus-innovations.com)",