systeminformation 5.26.0 → 5.26.2

package/lib/graphics.js

@@ -425,7 +425,8 @@ function graphics(callback) {
         options.stdio = ['pipe', 'pipe', 'ignore'];
       }
       try {
-        const res = execSync(cmd, options).toString();
+        const sanitized = util.sanitizeShellString(cmd);
+        const res = execSync(sanitized, options).toString();
         return res;
       } catch (e) {
         util.noop();

package/lib/index.d.ts

@@ -991,8 +991,11 @@ export function diskLayout(cb?: (data: Systeminformation.DiskLayoutData[]) => an
 
 export function networkInterfaceDefault(cb?: (data: string) => any): Promise<string>;
 export function networkGatewayDefault(cb?: (data: string) => any): Promise<string>;
+export function networkInterfaces(): Promise<Systeminformation.NetworkInterfacesData[]>;
+export function networkInterfaces(defaultString: 'default'): Promise<Systeminformation.NetworkInterfacesData>;
+export function networkInterfaces(rescan: boolean): Promise<Systeminformation.NetworkInterfacesData[]>;
 export function networkInterfaces(
-  cb?:
+  cb:
     | ((data: Systeminformation.NetworkInterfacesData[] | Systeminformation.NetworkInterfacesData) => any)
     | boolean
     | string,

package/lib/memory.js

@@ -29,41 +29,33 @@ const _openbsd = (_platform === 'openbsd');
 const _netbsd = (_platform === 'netbsd');
 const _sunos = (_platform === 'sunos');
 
-const OSX_RAM_manufacturers = {
-  '0x014F': 'Transcend Information',
-  '0x2C00': 'Micron Technology Inc.',
-  '0x802C': 'Micron Technology Inc.',
-  '0x80AD': 'Hynix Semiconductor Inc.',
-  '0x80CE': 'Samsung Electronics Inc.',
-  '0xAD00': 'Hynix Semiconductor Inc.',
-  '0xCE00': 'Samsung Electronics Inc.',
-  '0x02FE': 'Elpida',
-  '0x5105': 'Qimonda AG i. In.',
-  '0x8551': 'Qimonda AG i. In.',
-  '0x859B': 'Crucial',
-  '0x04CD': 'G-Skill'
-};
-
-const LINUX_RAM_manufacturers = {
-  '017A': 'Apacer',
+const RAM_manufacturers = {
+  '00CE': 'Samsung Electronics Inc',
+  '014F': 'Transcend Information',
+  '017A': 'Apacer Technology Inc',
   '0198': 'HyperX',
   '029E': 'Corsair',
+  '02FE': 'Elpida',
   '04CB': 'A-DATA',
-  '04CD': 'G-Skill',
+  '04CD': 'G-Skill International Enterprise',
   '059B': 'Crucial',
-  '00CE': 'Samsung',
   '1315': 'Crucial',
-  '014F': 'Transcend Information',
   '2C00': 'Micron Technology Inc.',
+  '5105': 'Qimonda AG i. In.',
   '802C': 'Micron Technology Inc.',
   '80AD': 'Hynix Semiconductor Inc.',
   '80CE': 'Samsung Electronics Inc.',
+  '8551': 'Qimonda AG i. In.',
+  '859B': 'Crucial',
   'AD00': 'Hynix Semiconductor Inc.',
   'CE00': 'Samsung Electronics Inc.',
-  '02FE': 'Elpida',
-  '5105': 'Qimonda AG i. In.',
-  '8551': 'Qimonda AG i. In.',
-  '859B': 'Crucial'
+  'SAMSUNG': 'Samsung Electronics Inc.',
+  'HYNIX': 'Hynix Semiconductor Inc.',
+  'G-SKILL': 'G-Skill International Enterprise',
+  'TRANSCEND': 'Transcend Information',
+  'APACER': 'Apacer Technology Inc',
+  'MICRON': 'Micron Technology Inc.',
+  'QIMONDA': 'Qimonda AG i. In.',
 };
 
 // _______________________________________________________________________________________
@@ -315,17 +307,10 @@ exports.mem = mem;
 
 function memLayout(callback) {
 
-  function getManufacturerDarwin(manId) {
-    if ({}.hasOwnProperty.call(OSX_RAM_manufacturers, manId)) {
-      return (OSX_RAM_manufacturers[manId]);
-    }
-    return manId;
-  }
-
-  function getManufacturerLinux(manId) {
+  function getManufacturer(manId) {
     const manIdSearch = manId.replace('0x', '').toUpperCase();
-    if (manIdSearch.length === 4 && {}.hasOwnProperty.call(LINUX_RAM_manufacturers, manIdSearch)) {
-      return (LINUX_RAM_manufacturers[manIdSearch]);
+    if (manIdSearch.length >= 4 && {}.hasOwnProperty.call(RAM_manufacturers, manIdSearch)) {
+      return (RAM_manufacturers[manIdSearch]);
     }
     return manId;
   }
@@ -358,7 +343,7 @@ function memLayout(callback) {
                   ecc: dataWidth && totalWidth ? totalWidth > dataWidth : false,
                   clockSpeed: (util.getValue(lines, 'Configured Clock Speed:') ? parseInt(util.getValue(lines, 'Configured Clock Speed:'), 10) : (util.getValue(lines, 'Speed:') ? parseInt(util.getValue(lines, 'Speed:'), 10) : null)),
                   formFactor: util.getValue(lines, 'Form Factor:'),
-                  manufacturer: getManufacturerLinux(util.getValue(lines, 'Manufacturer:')),
+                  manufacturer: getManufacturer(util.getValue(lines, 'Manufacturer:')),
                   partNum: util.getValue(lines, 'Part Number:'),
                   serialNum: util.getValue(lines, 'Serial Number:'),
                   voltageConfigured: parseFloat(util.getValue(lines, 'Configured Voltage:')) || null,
@@ -470,7 +455,7 @@ function memLayout(callback) {
                   ecc: eccStatus ? eccStatus === 'enabled' : null,
                   clockSpeed: parseInt(util.getValue(lines, '          Speed:'), 10),
                   formFactor: '',
-                  manufacturer: getManufacturerDarwin(util.getValue(lines, '          Manufacturer:')),
+                  manufacturer: getManufacturer(util.getValue(lines, '          Manufacturer:')),
                   partNum: util.getValue(lines, '          Part Number:'),
                   serialNum: util.getValue(lines, '          Serial Number:'),
                   voltageConfigured: null,
@@ -508,7 +493,7 @@ function memLayout(callback) {
                 ecc: false,
                 clockSpeed: null,
                 formFactor: 'SOC',
-                manufacturer: getManufacturerDarwin(manufacturerId),
+                manufacturer: getManufacturer(manufacturerId),
                 partNum: '',
                 serialNum: '',
                 voltageConfigured: null,
@@ -551,7 +536,7 @@ function memLayout(callback) {
                     ecc: dataWidth && totalWidth ? totalWidth > dataWidth : false,
                     clockSpeed: parseInt(util.getValue(lines, 'ConfiguredClockSpeed', ':'), 10) || parseInt(util.getValue(lines, 'Speed', ':'), 10) || 0,
                     formFactor: FormFactors[parseInt(util.getValue(lines, 'FormFactor', ':'), 10) || 0],
-                    manufacturer: util.getValue(lines, 'Manufacturer', ':'),
+                    manufacturer: getManufacturer(util.getValue(lines, 'Manufacturer', ':')),
                     partNum: util.getValue(lines, 'PartNumber', ':'),
                     serialNum: util.getValue(lines, 'SerialNumber', ':'),
                     voltageConfigured: (parseInt(util.getValue(lines, 'ConfiguredVoltage', ':'), 10) || 0) / 1000.0,

package/lib/util.js

@@ -2538,7 +2538,7 @@ function checkWebsite(url, timeout = 5000) {
         });
       })
       .setTimeout(timeout, () => {
-        request.close();
+        request.destroy();
         resolve({
           url,
           statusCode: 408,

package/package.json

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