systeminformation 5.33.17 → 5.33.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/audio.js CHANGED
@@ -249,6 +249,7 @@ function parseWindowsAudio(lines) {
249
249
  }
250
250
 
251
251
  function audio(callback) {
252
+ callback = util.isFunction(callback) ? callback : null;
252
253
  return new Promise((resolve) => {
253
254
  process.nextTick(() => {
254
255
  const result = [];
package/lib/battery.js CHANGED
@@ -62,7 +62,7 @@ function parseWinBatteryPart(lines, designedCapacity, fullChargeCapacity) {
62
62
  return result;
63
63
  }
64
64
 
65
- module.exports = (callback) =>
65
+ const battery = (callback) =>
66
66
  new Promise((resolve) => {
67
67
  process.nextTick(() => {
68
68
  let result = {
@@ -353,3 +353,5 @@ module.exports = (callback) =>
353
353
  }
354
354
  });
355
355
  });
356
+
357
+ module.exports = (callback) => battery(util.isFunction(callback) ? callback : null);
package/lib/bluetooth.js CHANGED
@@ -163,6 +163,7 @@ function parseWindowsBluetooth(lines) {
163
163
  }
164
164
 
165
165
  function bluetoothDevices(callback) {
166
+ callback = util.isFunction(callback) ? callback : null;
166
167
  return new Promise((resolve) => {
167
168
  process.nextTick(() => {
168
169
  let result = [];
package/lib/cpu.js CHANGED
@@ -1217,6 +1217,7 @@ function getCpu() {
1217
1217
  // CPU - Processor Data
1218
1218
 
1219
1219
  function cpu(callback) {
1220
+ callback = util.isFunction(callback) ? callback : null;
1220
1221
  return new Promise((resolve) => {
1221
1222
  process.nextTick(() => {
1222
1223
  getCpu().then((result) => {
@@ -1298,6 +1299,7 @@ function getCpuCurrentSpeedSync() {
1298
1299
  }
1299
1300
 
1300
1301
  function cpuCurrentSpeed(callback) {
1302
+ callback = util.isFunction(callback) ? callback : null;
1301
1303
  return new Promise((resolve) => {
1302
1304
  process.nextTick(() => {
1303
1305
  let result = getCpuCurrentSpeedSync();
@@ -1325,6 +1327,7 @@ exports.cpuCurrentSpeed = cpuCurrentSpeed;
1325
1327
  // if sensors are installed
1326
1328
 
1327
1329
  function cpuTemperature(callback) {
1330
+ callback = util.isFunction(callback) ? callback : null;
1328
1331
  return new Promise((resolve) => {
1329
1332
  process.nextTick(() => {
1330
1333
  let result = {
@@ -1656,6 +1659,7 @@ exports.cpuTemperature = cpuTemperature;
1656
1659
  // CPU Flags
1657
1660
 
1658
1661
  function cpuFlags(callback) {
1662
+ callback = util.isFunction(callback) ? callback : null;
1659
1663
  return new Promise((resolve) => {
1660
1664
  process.nextTick(() => {
1661
1665
  let result = '';
@@ -1808,6 +1812,7 @@ exports.cpuFlags = cpuFlags;
1808
1812
  // CPU Cache
1809
1813
 
1810
1814
  function cpuCache(callback) {
1815
+ callback = util.isFunction(callback) ? callback : null;
1811
1816
  return new Promise((resolve) => {
1812
1817
  process.nextTick(() => {
1813
1818
  let result = {
@@ -2207,6 +2212,7 @@ function getLoad() {
2207
2212
  }
2208
2213
 
2209
2214
  function currentLoad(callback) {
2215
+ callback = util.isFunction(callback) ? callback : null;
2210
2216
  return new Promise((resolve) => {
2211
2217
  process.nextTick(() => {
2212
2218
  if (_current_cpu.ms === 0) {
@@ -2270,6 +2276,7 @@ function getFullLoad() {
2270
2276
  }
2271
2277
 
2272
2278
  function fullLoad(callback) {
2279
+ callback = util.isFunction(callback) ? callback : null;
2273
2280
  return new Promise((resolve) => {
2274
2281
  process.nextTick(() => {
2275
2282
  getFullLoad().then((result) => {
package/lib/docker.js CHANGED
@@ -26,6 +26,7 @@ let _docker_socket;
26
26
  // get containers (parameter all: get also inactive/exited containers)
27
27
 
28
28
  function dockerInfo(callback) {
29
+ callback = util.isFunction(callback) ? callback : null;
29
30
  return new Promise((resolve) => {
30
31
  process.nextTick(() => {
31
32
  if (!_docker_socket) {
@@ -92,6 +93,7 @@ function dockerInfo(callback) {
92
93
  exports.dockerInfo = dockerInfo;
93
94
 
94
95
  function dockerImages(all, callback) {
96
+ callback = util.isFunction(callback) ? callback : null;
95
97
  // fallback - if only callback is given
96
98
  if (util.isFunction(all) && !callback) {
97
99
  callback = all;
@@ -105,7 +107,7 @@ function dockerImages(all, callback) {
105
107
  }
106
108
 
107
109
  all = all || false;
108
- let result = [];
110
+ const result = [];
109
111
  return new Promise((resolve) => {
110
112
  process.nextTick(() => {
111
113
  if (!_docker_socket) {
@@ -208,6 +210,7 @@ function dockerImagesInspect(imageID, payload) {
208
210
  exports.dockerImages = dockerImages;
209
211
 
210
212
  function dockerContainers(all, callback) {
213
+ callback = util.isFunction(callback) ? callback : null;
211
214
  function inContainers(containers, id) {
212
215
  return containers.some((obj) => obj.Id && obj.Id.indexOf(id) === 0);
213
216
  }
@@ -225,7 +228,7 @@ function dockerContainers(all, callback) {
225
228
  }
226
229
 
227
230
  all = all || false;
228
- let result = [];
231
+ const result = [];
229
232
  return new Promise((resolve) => {
230
233
  process.nextTick(() => {
231
234
  if (!_docker_socket) {
@@ -239,7 +242,7 @@ function dockerContainers(all, callback) {
239
242
  docker_containers = data;
240
243
  if (docker_containers && Object.prototype.toString.call(docker_containers) === '[object Array]' && docker_containers.length > 0) {
241
244
  // GC in _docker_cpu_last_read
242
- for (let key in _docker_cpu_last_read) {
245
+ for (const key in _docker_cpu_last_read) {
243
246
  if ({}.hasOwnProperty.call(_docker_cpu_last_read, key)) {
244
247
  if (!inContainers(docker_containers, key)) {
245
248
  delete _docker_cpu_last_read[key];
@@ -392,7 +395,7 @@ function docker_calcCPUPercent(cpu_stats, precpu_stats, id) {
392
395
  function docker_calcNetworkIO(networks) {
393
396
  let rx = 0;
394
397
  let wx = 0;
395
- for (let key in networks) {
398
+ for (const key in networks) {
396
399
  // skip loop if the property is from prototype
397
400
  if (!{}.hasOwnProperty.call(networks, key)) {
398
401
  continue;
@@ -414,7 +417,7 @@ function docker_calcNetworkIO(networks) {
414
417
  }
415
418
 
416
419
  function docker_calcBlockIO(blkio_stats) {
417
- let result = {
420
+ const result = {
418
421
  r: 0,
419
422
  w: 0
420
423
  };
@@ -448,6 +451,7 @@ function docker_calcBlockIO(blkio_stats) {
448
451
  }
449
452
 
450
453
  function dockerContainerStats(containerIDs, callback) {
454
+ callback = util.isFunction(callback) ? callback : null;
451
455
  let containerArray = [];
452
456
  return new Promise((resolve) => {
453
457
  process.nextTick(() => {
@@ -494,7 +498,7 @@ function dockerContainerStats(containerIDs, callback) {
494
498
  if (containerArray.length && containerArray[0].trim() === '*') {
495
499
  containerArray = [];
496
500
  dockerContainers().then((allContainers) => {
497
- for (let container of (allContainers || []).filter(Boolean)) {
501
+ for (const container of (allContainers || []).filter(Boolean)) {
498
502
  if (container.id) {
499
503
  containerArray.push(container.id.substring(0, 12));
500
504
  }
@@ -514,7 +518,7 @@ function dockerContainerStats(containerIDs, callback) {
514
518
  }
515
519
  });
516
520
  } else {
517
- for (let containerID of containerArray) {
521
+ for (const containerID of containerArray) {
518
522
  workload.push(dockerContainerStatsSingle(containerID.trim()));
519
523
  }
520
524
  if (workload.length) {
@@ -572,7 +576,7 @@ function dockerContainerStatsSingle(containerID) {
572
576
  try {
573
577
  _docker_socket.getStats(containerID, (data) => {
574
578
  try {
575
- let stats = data;
579
+ const stats = data;
576
580
  if (!stats.message) {
577
581
  if (data.id) {
578
582
  result.id = data.id;
@@ -617,11 +621,19 @@ exports.dockerContainerStats = dockerContainerStats;
617
621
  // container processes (for one container)
618
622
 
619
623
  function dockerContainerProcesses(containerID, callback) {
620
- let result = [];
624
+ callback = util.isFunction(callback) ? callback : null;
625
+ if (util.isFunction(containerID) && !callback) {
626
+ callback = containerID;
627
+ containerID = '';
628
+ }
629
+ const result = [];
621
630
  return new Promise((resolve) => {
622
631
  process.nextTick(() => {
623
632
  containerID = containerID || '';
624
633
  if (typeof containerID !== 'string') {
634
+ if (callback) {
635
+ callback(result);
636
+ }
625
637
  return resolve(result);
626
638
  }
627
639
  const containerIdSanitized = util.isPrototypePolluted() ? '' : util.sanitizeContainerID(containerID);
@@ -639,23 +651,21 @@ function dockerContainerProcesses(containerID, callback) {
639
651
  **/
640
652
  try {
641
653
  if (data && data.Titles && data.Processes) {
642
- let titles = data.Titles.map(function (value) {
643
- return value.toUpperCase();
644
- });
645
- let pos_pid = titles.indexOf('PID');
646
- let pos_ppid = titles.indexOf('PPID');
647
- let pos_pgid = titles.indexOf('PGID');
648
- let pos_vsz = titles.indexOf('VSZ');
649
- let pos_time = titles.indexOf('TIME');
650
- let pos_elapsed = titles.indexOf('ELAPSED');
651
- let pos_ni = titles.indexOf('NI');
652
- let pos_ruser = titles.indexOf('RUSER');
653
- let pos_user = titles.indexOf('USER');
654
- let pos_rgroup = titles.indexOf('RGROUP');
655
- let pos_group = titles.indexOf('GROUP');
656
- let pos_stat = titles.indexOf('STAT');
657
- let pos_rss = titles.indexOf('RSS');
658
- let pos_command = titles.indexOf('COMMAND');
654
+ const titles = data.Titles.map((value) => value.toUpperCase());
655
+ const pos_pid = titles.indexOf('PID');
656
+ const pos_ppid = titles.indexOf('PPID');
657
+ const pos_pgid = titles.indexOf('PGID');
658
+ const pos_vsz = titles.indexOf('VSZ');
659
+ const pos_time = titles.indexOf('TIME');
660
+ const pos_elapsed = titles.indexOf('ELAPSED');
661
+ const pos_ni = titles.indexOf('NI');
662
+ const pos_ruser = titles.indexOf('RUSER');
663
+ const pos_user = titles.indexOf('USER');
664
+ const pos_rgroup = titles.indexOf('RGROUP');
665
+ const pos_group = titles.indexOf('GROUP');
666
+ const pos_stat = titles.indexOf('STAT');
667
+ const pos_rss = titles.indexOf('RSS');
668
+ const pos_command = titles.indexOf('COMMAND');
659
669
 
660
670
  data.Processes.forEach((process) => {
661
671
  result.push({
@@ -697,7 +707,8 @@ function dockerContainerProcesses(containerID, callback) {
697
707
  exports.dockerContainerProcesses = dockerContainerProcesses;
698
708
 
699
709
  function dockerVolumes(callback) {
700
- let result = [];
710
+ callback = util.isFunction(callback) ? callback : null;
711
+ const result = [];
701
712
  return new Promise((resolve) => {
702
713
  process.nextTick(() => {
703
714
  if (!_docker_socket) {
@@ -743,6 +754,7 @@ function dockerVolumes(callback) {
743
754
  exports.dockerVolumes = dockerVolumes;
744
755
 
745
756
  function dockerAll(callback) {
757
+ callback = util.isFunction(callback) ? callback : null;
746
758
  return new Promise((resolve) => {
747
759
  process.nextTick(() => {
748
760
  dockerContainers(true).then((result) => {
@@ -751,17 +763,19 @@ function dockerAll(callback) {
751
763
  result.forEach((element) => {
752
764
  dockerContainerStats(element.id).then((res) => {
753
765
  // include stats in array
754
- element.memUsage = res[0].memUsage;
755
- element.memLimit = res[0].memLimit;
756
- element.memPercent = res[0].memPercent;
757
- element.cpuPercent = res[0].cpuPercent;
758
- element.pids = res[0].pids;
759
- element.netIO = res[0].netIO;
760
- element.blockIO = res[0].blockIO;
761
- element.cpuStats = res[0].cpuStats;
762
- element.precpuStats = res[0].precpuStats;
763
- element.memoryStats = res[0].memoryStats;
764
- element.networks = res[0].networks;
766
+ if (res && res[0]) {
767
+ element.memUsage = res[0].memUsage;
768
+ element.memLimit = res[0].memLimit;
769
+ element.memPercent = res[0].memPercent;
770
+ element.cpuPercent = res[0].cpuPercent;
771
+ element.pids = res[0].pids;
772
+ element.netIO = res[0].netIO;
773
+ element.blockIO = res[0].blockIO;
774
+ element.cpuStats = res[0].cpuStats;
775
+ element.precpuStats = res[0].precpuStats;
776
+ element.memoryStats = res[0].memoryStats;
777
+ element.networks = res[0].networks;
778
+ }
765
779
 
766
780
  dockerContainerProcesses(element.id).then((processes) => {
767
781
  element.processes = processes;
package/lib/filesystem.js CHANGED
@@ -37,6 +37,7 @@ const _disk_io = {};
37
37
  // FS - mounted file systems
38
38
 
39
39
  function fsSize(drive, callback) {
40
+ callback = util.isFunction(callback) ? callback : null;
40
41
  if (util.isFunction(drive)) {
41
42
  callback = drive;
42
43
  drive = '';
@@ -261,7 +262,8 @@ function fsSize(drive, callback) {
261
262
  data = parseDf(lines);
262
263
  if (drive) {
263
264
  data = data.filter((item) => {
264
- return item.fs.toLowerCase().indexOf(drive.toLowerCase()) >= 0 || item.mount.toLowerCase().indexOf(drive.toLowerCase()) >= 0;
265
+ // non-string drive input matches no drive (same as windows)
266
+ return typeof drive === 'string' && (item.fs.toLowerCase().indexOf(drive.toLowerCase()) >= 0 || item.mount.toLowerCase().indexOf(drive.toLowerCase()) >= 0);
265
267
  });
266
268
  }
267
269
  if ((!error || data.length) && stdout.toString().trim() !== '') {
@@ -343,6 +345,7 @@ exports.fsSize = fsSize;
343
345
  // FS - open files count
344
346
 
345
347
  function fsOpenFiles(callback) {
348
+ callback = util.isFunction(callback) ? callback : null;
346
349
  return new Promise((resolve) => {
347
350
  process.nextTick(() => {
348
351
  const result = {
@@ -714,6 +717,7 @@ function blkStdoutToObject(stdout) {
714
717
  }
715
718
 
716
719
  function blockDevices(callback) {
720
+ callback = util.isFunction(callback) ? callback : null;
717
721
  return new Promise((resolve) => {
718
722
  process.nextTick(() => {
719
723
  let data = [];
@@ -893,6 +897,7 @@ function calcFsSpeed(rx, wx) {
893
897
  }
894
898
 
895
899
  function fsStats(callback) {
900
+ callback = util.isFunction(callback) ? callback : null;
896
901
  return new Promise((resolve) => {
897
902
  process.nextTick(() => {
898
903
  if (_windows || _freebsd || _openbsd || _netbsd || _sunos) {
@@ -1086,6 +1091,7 @@ function calcDiskIO(rIO, wIO, rWaitTime, wWaitTime, tWaitTime) {
1086
1091
  }
1087
1092
 
1088
1093
  function disksIO(callback) {
1094
+ callback = util.isFunction(callback) ? callback : null;
1089
1095
  return new Promise((resolve) => {
1090
1096
  process.nextTick(() => {
1091
1097
  if (_windows) {
@@ -1206,6 +1212,7 @@ function disksIO(callback) {
1206
1212
  exports.disksIO = disksIO;
1207
1213
 
1208
1214
  function diskLayout(callback) {
1215
+ callback = util.isFunction(callback) ? callback : null;
1209
1216
  function getVendorFromModel(model) {
1210
1217
  const diskManufacturers = [
1211
1218
  { pattern: 'WESTERN.*', manufacturer: 'Western Digital' },
package/lib/graphics.js CHANGED
@@ -148,6 +148,7 @@ function getMetalVersion(id) {
148
148
  }
149
149
 
150
150
  function graphics(callback) {
151
+ callback = util.isFunction(callback) ? callback : null;
151
152
  function parseLinesDarwin(graphicsArr) {
152
153
  const res = {
153
154
  controllers: [],
package/lib/index.d.ts CHANGED
@@ -1045,7 +1045,7 @@ export function getStaticData(cb?: (data: Systeminformation.StaticData) => any):
1045
1045
  export function getDynamicData(srv?: string, iface?: string, cb?: (data: any) => any): Promise<Systeminformation.DynamicData>;
1046
1046
  export function getAllData(srv?: string, iface?: string, cb?: (data: any) => any): Promise<Systeminformation.StaticData & Systeminformation.DynamicData>;
1047
1047
  export function get(valuesObject: any, cb?: (data: any) => any): Promise<any>;
1048
- export function observe(valuesObject: any, interval: number, cb?: (data: any) => any): number;
1048
+ export function observe(valuesObject: any, interval: number, cb: (data: any) => any): number;
1049
1049
 
1050
1050
  export function powerShellStart(): void;
1051
1051
  export function powerShellRelease(): void;
package/lib/index.js CHANGED
@@ -74,6 +74,7 @@ function version() {
74
74
  // get static data - they should not change until restarted
75
75
 
76
76
  function getStaticData(callback) {
77
+ callback = util.isFunction(callback) ? callback : null;
77
78
  return new Promise((resolve) => {
78
79
  process.nextTick(() => {
79
80
  const data = {};
@@ -134,6 +135,7 @@ function getStaticData(callback) {
134
135
  // - iface: define network interface for which you like to monitor network speed e.g. "eth0"
135
136
 
136
137
  function getDynamicData(srv, iface, callback) {
138
+ callback = util.isFunction(callback) ? callback : null;
137
139
  if (util.isFunction(iface)) {
138
140
  callback = iface;
139
141
  iface = '';
@@ -149,7 +151,7 @@ function getDynamicData(srv, iface, callback) {
149
151
  srv = srv || '';
150
152
 
151
153
  // use closure to track ƒ completion
152
- let functionProcessed = (() => {
154
+ const functionProcessed = (() => {
153
155
  let totalFunctions = 15;
154
156
  if (_windows) {
155
157
  totalFunctions = 13;
@@ -161,7 +163,7 @@ function getDynamicData(srv, iface, callback) {
161
163
  totalFunctions = 6;
162
164
  }
163
165
 
164
- return function () {
166
+ return () => {
165
167
  if (--totalFunctions === 0) {
166
168
  if (callback) {
167
169
  callback(data);
@@ -289,6 +291,7 @@ function getDynamicData(srv, iface, callback) {
289
291
  // - iface: define network interface for which you like to monitor network speed e.g. "eth0"
290
292
 
291
293
  function getAllData(srv, iface, callback) {
294
+ callback = util.isFunction(callback) ? callback : null;
292
295
  return new Promise((resolve) => {
293
296
  process.nextTick(() => {
294
297
  let data = {};
@@ -307,7 +310,7 @@ function getAllData(srv, iface, callback) {
307
310
  getStaticData().then((res) => {
308
311
  data = res;
309
312
  getDynamicData(srv, iface).then((res) => {
310
- for (let key in res) {
313
+ for (const key in res) {
311
314
  if ({}.hasOwnProperty.call(res, key)) {
312
315
  data[key] = res[key];
313
316
  }
@@ -323,8 +326,10 @@ function getAllData(srv, iface, callback) {
323
326
  }
324
327
 
325
328
  function get(valueObject, callback) {
329
+ callback = util.isFunction(callback) ? callback : null;
326
330
  return new Promise((resolve) => {
327
331
  process.nextTick(() => {
332
+ valueObject = valueObject || {};
328
333
  const blocked = ['get', 'getStaticData', 'getDynamicData', 'getAllData', 'observe', 'powerShellStart', 'powerShellRelease'];
329
334
  const isGettable = (key) => ({}).hasOwnProperty.call(exports, key) && typeof exports[key] === 'function' && typeof valueObject[key] === 'string' && blocked.indexOf(key) < 0;
330
335
  const allPromises = Object.keys(valueObject)
@@ -333,17 +338,18 @@ function get(valueObject, callback) {
333
338
  const params = valueObject[func].substring(valueObject[func].lastIndexOf('(') + 1, valueObject[func].lastIndexOf(')'));
334
339
  let funcWithoutParams = func.indexOf(')') >= 0 ? func.split(')')[1].trim() : func;
335
340
  funcWithoutParams = func.indexOf('|') >= 0 ? func.split('|')[0].trim() : funcWithoutParams;
336
- if (params) {
337
- return exports[funcWithoutParams](params);
338
- } else {
339
- return exports[funcWithoutParams]('');
341
+ // a failing function yields an empty result for its key only
342
+ try {
343
+ return Promise.resolve(exports[funcWithoutParams](params || '')).catch(() => null);
344
+ } catch {
345
+ return Promise.resolve(null);
340
346
  }
341
347
  });
342
348
 
343
349
  Promise.all(allPromises).then((data) => {
344
350
  const result = {};
345
351
  let i = 0;
346
- for (let key in valueObject) {
352
+ for (const key in valueObject) {
347
353
  if ({}.hasOwnProperty.call(valueObject, key) && isGettable(key) && data.length > i) {
348
354
  if (valueObject[key] === '*' || valueObject[key] === 'all') {
349
355
  result[key] = data[i];
@@ -423,6 +429,12 @@ function get(valueObject, callback) {
423
429
  }
424
430
 
425
431
  function observe(valueObject, interval, callback) {
432
+ callback = util.isFunction(callback) ? callback : null;
433
+ if (!callback) {
434
+ return null;
435
+ }
436
+ // setInterval falls back to 1 ms above this max
437
+ interval = Math.min(Math.max(Number(interval) || 0, 500), 2147483647);
426
438
  let _data = null;
427
439
 
428
440
  const result = setInterval(() => {
package/lib/internet.js CHANGED
@@ -29,6 +29,7 @@ const _sunos = _platform === 'sunos';
29
29
  // check if external site is available
30
30
 
31
31
  function inetChecksite(url, callback) {
32
+ callback = util.isFunction(callback) ? callback : null;
32
33
  return new Promise((resolve) => {
33
34
  process.nextTick(() => {
34
35
  let result = {
@@ -114,6 +115,7 @@ exports.inetChecksite = inetChecksite;
114
115
  // check inet latency
115
116
 
116
117
  function inetLatency(host, callback) {
118
+ callback = util.isFunction(callback) ? callback : null;
117
119
  // fallback - if only callback is given
118
120
  if (util.isFunction(host) && !callback) {
119
121
  callback = host;
package/lib/memory.js CHANGED
@@ -137,6 +137,7 @@ const RAM_manufacturers = {
137
137
  // SUnreclaim: 79352 kB
138
138
 
139
139
  function mem(callback) {
140
+ callback = util.isFunction(callback) ? callback : null;
140
141
  return new Promise((resolve) => {
141
142
  process.nextTick(() => {
142
143
  let result = {
@@ -345,6 +346,7 @@ function mem(callback) {
345
346
  exports.mem = mem;
346
347
 
347
348
  function memLayout(callback) {
349
+ callback = util.isFunction(callback) ? callback : null;
348
350
  function getManufacturer(manId) {
349
351
  const manIdSearch = manId.replace('0x', '').toUpperCase();
350
352
  if (manIdSearch.length >= 4 && {}.hasOwnProperty.call(RAM_manufacturers, manIdSearch)) {
package/lib/network.js CHANGED
@@ -49,7 +49,7 @@ function getDefaultNetworkInterface() {
49
49
  let scopeid = 9999;
50
50
 
51
51
  // fallback - "first" external interface (sorted by scopeid)
52
- for (let dev in ifaces) {
52
+ for (const dev in ifaces) {
53
53
  if ({}.hasOwnProperty.call(ifaces, dev)) {
54
54
  ifaces[dev].forEach((details) => {
55
55
  if (details && details.internal === false) {
@@ -80,7 +80,7 @@ function getDefaultNetworkInterface() {
80
80
  }
81
81
  });
82
82
  if (defaultIp) {
83
- for (let dev in ifaces) {
83
+ for (const dev in ifaces) {
84
84
  if ({}.hasOwnProperty.call(ifaces, dev)) {
85
85
  ifaces[dev].forEach((details) => {
86
86
  if (details && details.address && details.address === defaultIp) {
@@ -206,6 +206,7 @@ function getMacAddresses() {
206
206
  exports.getMacAddresses = getMacAddresses;
207
207
 
208
208
  function networkInterfaceDefault(callback) {
209
+ callback = util.isFunction(callback) ? callback : null;
209
210
  return new Promise((resolve) => {
210
211
  process.nextTick(() => {
211
212
  const result = getDefaultNetworkInterface();
@@ -224,7 +225,7 @@ exports.networkInterfaceDefault = networkInterfaceDefault;
224
225
 
225
226
  function parseLinesWindowsNics(sections, nconfigsections) {
226
227
  const nics = [];
227
- for (let i in sections) {
228
+ for (const i in sections) {
228
229
  try {
229
230
  if ({}.hasOwnProperty.call(sections, i)) {
230
231
  if (sections[i].trim() !== '') {
@@ -602,7 +603,7 @@ function parseLinuxDHCPNics(sections) {
602
603
  if (lines && lines.length) {
603
604
  const parts = lines[0].split(':');
604
605
  if (parts.length > 2) {
605
- for (let line of lines) {
606
+ for (const line of lines) {
606
607
  if (line.indexOf(' inet ') >= 0 && line.indexOf(' dynamic ') >= 0) {
607
608
  const parts2 = line.split(' ');
608
609
  const nic = parts2[parts2.length - 1].trim();
@@ -759,11 +760,12 @@ function networkInterfaces(callback, rescan, defaultString) {
759
760
  callback = null;
760
761
  defaultString = '';
761
762
  }
763
+ callback = util.isFunction(callback) ? callback : null;
762
764
  if (typeof rescan === 'undefined') {
763
765
  rescan = true;
764
766
  }
765
- defaultString = defaultString || '';
766
- defaultString = '' + defaultString;
767
+ // objects without string conversion would throw here
768
+ defaultString = typeof defaultString === 'string' ? defaultString : '';
767
769
 
768
770
  return new Promise((resolve) => {
769
771
  process.nextTick(() => {
@@ -882,7 +884,7 @@ function networkInterfaces(callback, rescan, defaultString) {
882
884
  _ifaces = JSON.parse(JSON.stringify(ifaces));
883
885
  _dhcpNics = getLinuxDHCPNics();
884
886
  const defaultInterface = getDefaultNetworkInterface();
885
- for (let dev in ifaces) {
887
+ for (const dev in ifaces) {
886
888
  let ip4 = '';
887
889
  let ip4subnet = '';
888
890
  let ip6 = '';
@@ -1076,7 +1078,7 @@ function networkInterfaces(callback, rescan, defaultString) {
1076
1078
  });
1077
1079
  nics8021xInfo = getWindowsWiredProfilesInformation();
1078
1080
  dnsSuffixes = getWindowsDNSsuffixes();
1079
- for (let dev in ifaces) {
1081
+ for (const dev in ifaces) {
1080
1082
  const ifaceSanitized = util.sanitizeString(dev);
1081
1083
 
1082
1084
  let iface = dev;
@@ -1085,10 +1087,10 @@ function networkInterfaces(callback, rescan, defaultString) {
1085
1087
  let ip6 = '';
1086
1088
  let ip6subnet = '';
1087
1089
  let mac = '';
1088
- let duplex = '';
1089
- let mtu = '';
1090
+ const duplex = '';
1091
+ const mtu = '';
1090
1092
  let speed = null;
1091
- let carrierChanges = 0;
1093
+ const carrierChanges = 0;
1092
1094
  let operstate = 'down';
1093
1095
  let dhcp = false;
1094
1096
  let dnsSuffix = '';
@@ -1244,6 +1246,7 @@ function calcNetworkSpeed(iface, rx_bytes, tx_bytes, operstate, rx_dropped, rx_e
1244
1246
  }
1245
1247
 
1246
1248
  function networkStats(ifaces, callback) {
1249
+ callback = util.isFunction(callback) ? callback : null;
1247
1250
  let ifacesArray = [];
1248
1251
 
1249
1252
  return new Promise((resolve) => {
@@ -1283,7 +1286,7 @@ function networkStats(ifaces, callback) {
1283
1286
  if (ifacesArray.length && ifacesArray[0].trim() === '*') {
1284
1287
  ifacesArray = [];
1285
1288
  networkInterfaces(false).then((allIFaces) => {
1286
- for (let iface of allIFaces) {
1289
+ for (const iface of allIFaces) {
1287
1290
  ifacesArray.push(iface.iface);
1288
1291
  }
1289
1292
  networkStats(ifacesArray.join(',')).then((result) => {
@@ -1294,7 +1297,7 @@ function networkStats(ifaces, callback) {
1294
1297
  });
1295
1298
  });
1296
1299
  } else {
1297
- for (let iface of ifacesArray) {
1300
+ for (const iface of ifacesArray) {
1298
1301
  workload.push(networkStatsSingle(iface.trim()));
1299
1302
  }
1300
1303
  if (workload.length) {
@@ -1318,7 +1321,7 @@ function networkStats(ifaces, callback) {
1318
1321
  function networkStatsSingle(iface) {
1319
1322
  function parseLinesWindowsPerfData(sections) {
1320
1323
  const perfData = [];
1321
- for (let i in sections) {
1324
+ for (const i in sections) {
1322
1325
  if ({}.hasOwnProperty.call(sections, i)) {
1323
1326
  if (sections[i].trim() !== '') {
1324
1327
  const lines = sections[i].trim().split('\r\n');
@@ -1584,6 +1587,7 @@ function getProcessName(processes, pid) {
1584
1587
  }
1585
1588
 
1586
1589
  function networkConnections(callback) {
1590
+ callback = util.isFunction(callback) ? callback : null;
1587
1591
  return new Promise((resolve) => {
1588
1592
  process.nextTick(() => {
1589
1593
  const result = [];
@@ -1595,7 +1599,7 @@ function networkConnections(callback) {
1595
1599
  'export LC_ALL=C; netstat -na | grep "ESTABLISHED\\|SYN_SENT\\|SYN_RECV\\|FIN_WAIT1\\|FIN_WAIT2\\|TIME_WAIT\\|CLOSE\\|CLOSE_WAIT\\|LAST_ACK\\|LISTEN\\|CLOSING\\|UNKNOWN"; unset LC_ALL';
1596
1600
  }
1597
1601
  exec(cmd, { maxBuffer: 1024 * 102400 }, (error, stdout) => {
1598
- let lines = stdout.toString().split('\n');
1602
+ const lines = stdout.toString().split('\n');
1599
1603
  if (!error && (lines.length > 1 || lines[0] !== '')) {
1600
1604
  lines.forEach((line) => {
1601
1605
  line = line.replace(/ +/g, ' ').split(' ');
@@ -1784,11 +1788,11 @@ function networkConnections(callback) {
1784
1788
  });
1785
1789
  }
1786
1790
  if (_windows) {
1787
- let cmd = 'netstat -nao';
1791
+ const cmd = 'netstat -nao';
1788
1792
  try {
1789
1793
  exec(cmd, util.execOptsWin, (error, stdout) => {
1790
1794
  if (!error) {
1791
- let lines = stdout.toString().split('\r\n');
1795
+ const lines = stdout.toString().split('\r\n');
1792
1796
 
1793
1797
  lines.forEach((line) => {
1794
1798
  line = line.trim().replace(/ +/g, ' ').split(' ');
@@ -1891,6 +1895,7 @@ function networkConnections(callback) {
1891
1895
  exports.networkConnections = networkConnections;
1892
1896
 
1893
1897
  function networkGatewayDefault(callback) {
1898
+ callback = util.isFunction(callback) ? callback : null;
1894
1899
  return new Promise((resolve) => {
1895
1900
  process.nextTick(() => {
1896
1901
  let result = '';
@@ -1899,7 +1904,7 @@ function networkGatewayDefault(callback) {
1899
1904
  try {
1900
1905
  exec(cmd, { maxBuffer: 1024 * 102400 }, (error, stdout) => {
1901
1906
  if (!error) {
1902
- let lines = stdout.toString().split('\n');
1907
+ const lines = stdout.toString().split('\n');
1903
1908
  const line = lines && lines[0] ? lines[0] : '';
1904
1909
  let parts = line.split(' via ');
1905
1910
  if (parts && parts[1]) {
@@ -1979,7 +1984,7 @@ function networkGatewayDefault(callback) {
1979
1984
  });
1980
1985
  if (!result) {
1981
1986
  util.powerShell("Get-CimInstance -ClassName Win32_IP4RouteTable | Where-Object { $_.Destination -eq '0.0.0.0' -and $_.Mask -eq '0.0.0.0' }").then((data) => {
1982
- let lines = data.toString().split('\r\n');
1987
+ const lines = data.toString().split('\r\n');
1983
1988
  if (lines.length > 1 && !result) {
1984
1989
  result = util.getValue(lines, 'NextHop');
1985
1990
  if (callback) {
package/lib/osinfo.js CHANGED
@@ -221,6 +221,7 @@ function getFQDN() {
221
221
  // OS Information
222
222
 
223
223
  function osInfo(callback) {
224
+ callback = util.isFunction(callback) ? callback : null;
224
225
  return new Promise((resolve) => {
225
226
  process.nextTick(() => {
226
227
  let result = {
@@ -452,6 +453,7 @@ function isUefiWindows() {
452
453
  }
453
454
 
454
455
  function versions(apps, callback) {
456
+ callback = util.isFunction(callback) ? callback : null;
455
457
  let versionObject = {
456
458
  kernel: os.release(),
457
459
  apache: '',
@@ -1124,6 +1126,7 @@ function versions(apps, callback) {
1124
1126
  exports.versions = versions;
1125
1127
 
1126
1128
  function shell(callback) {
1129
+ callback = util.isFunction(callback) ? callback : null;
1127
1130
  return new Promise((resolve) => {
1128
1131
  process.nextTick(() => {
1129
1132
  if (_windows) {
@@ -1210,6 +1213,7 @@ function getUniqueMacAdresses() {
1210
1213
  }
1211
1214
 
1212
1215
  function uuid(callback) {
1216
+ callback = util.isFunction(callback) ? callback : null;
1213
1217
  return new Promise((resolve) => {
1214
1218
  process.nextTick(() => {
1215
1219
  let result = {
package/lib/printer.js CHANGED
@@ -112,6 +112,7 @@ function parseWindowsPrinters(lines, id) {
112
112
  }
113
113
 
114
114
  function printer(callback) {
115
+ callback = util.isFunction(callback) ? callback : null;
115
116
  return new Promise((resolve) => {
116
117
  process.nextTick(() => {
117
118
  let result = [];
package/lib/processes.js CHANGED
@@ -110,6 +110,7 @@ function parseElapsedTime(etime) {
110
110
  // this function gives an array back, if the services are running.
111
111
 
112
112
  function services(srv, callback) {
113
+ callback = util.isFunction(callback) ? callback : null;
113
114
  // fallback - if only callback is given
114
115
  if (util.isFunction(srv) && !callback) {
115
116
  callback = srv;
@@ -559,6 +560,7 @@ function calcProcStatWin(procStat, all, _cpu_old) {
559
560
  // running processes
560
561
 
561
562
  function processes(callback) {
563
+ callback = util.isFunction(callback) ? callback : null;
562
564
  let parsedhead = [];
563
565
 
564
566
  function getName(command) {
@@ -1108,6 +1110,7 @@ exports.processes = processes;
1108
1110
  // (PID, CPU-Usage %, Mem-Usage %)
1109
1111
 
1110
1112
  function processLoad(proc, callback) {
1113
+ callback = util.isFunction(callback) ? callback : null;
1111
1114
  // fallback - if only callback is given
1112
1115
  if (util.isFunction(proc) && !callback) {
1113
1116
  callback = proc;
package/lib/system.js CHANGED
@@ -31,6 +31,7 @@ const _netbsd = _platform === 'netbsd';
31
31
  const _sunos = _platform === 'sunos';
32
32
 
33
33
  function system(callback) {
34
+ callback = util.isFunction(callback) ? callback : null;
34
35
  return new Promise((resolve) => {
35
36
  process.nextTick(() => {
36
37
  let result = {
@@ -414,6 +415,7 @@ function cleanDefaults(s) {
414
415
  return '';
415
416
  }
416
417
  function bios(callback) {
418
+ callback = util.isFunction(callback) ? callback : null;
417
419
  return new Promise((resolve) => {
418
420
  process.nextTick(() => {
419
421
  let result = {
@@ -543,6 +545,7 @@ function bios(callback) {
543
545
  exports.bios = bios;
544
546
 
545
547
  function baseboard(callback) {
548
+ callback = util.isFunction(callback) ? callback : null;
546
549
  return new Promise((resolve) => {
547
550
  process.nextTick(() => {
548
551
  const result = {
@@ -720,6 +723,7 @@ function macOsChassisType(model) {
720
723
  }
721
724
 
722
725
  function chassis(callback) {
726
+ callback = util.isFunction(callback) ? callback : null;
723
727
  const chassisTypes = [
724
728
  'Other',
725
729
  'Unknown',
package/lib/usb.js CHANGED
@@ -245,6 +245,7 @@ function parseWindowsUsb(lines, id) {
245
245
  }
246
246
 
247
247
  function usb(callback) {
248
+ callback = util.isFunction(callback) ? callback : null;
248
249
  return new Promise((resolve) => {
249
250
  process.nextTick(() => {
250
251
  let result = [];
package/lib/users.js CHANGED
@@ -169,6 +169,7 @@ function parseUsersDarwin(lines) {
169
169
  }
170
170
 
171
171
  function users(callback) {
172
+ callback = util.isFunction(callback) ? callback : null;
172
173
  return new Promise((resolve) => {
173
174
  process.nextTick(() => {
174
175
  let result = [];
package/lib/util.js CHANGED
@@ -95,8 +95,7 @@ const stringStartWith = new String().startsWith;
95
95
  const mathMin = Math.min;
96
96
 
97
97
  function isFunction(functionToCheck) {
98
- const getType = {};
99
- return functionToCheck && getType.toString.call(functionToCheck) === '[object Function]';
98
+ return typeof functionToCheck === 'function';
100
99
  }
101
100
 
102
101
  function unique(obj) {
package/lib/virtualbox.js CHANGED
@@ -18,6 +18,7 @@ const exec = require('child_process').exec;
18
18
  const util = require('./util');
19
19
 
20
20
  function vboxInfo(callback) {
21
+ callback = util.isFunction(callback) ? callback : null;
21
22
  // fallback - if only callback is given
22
23
  let result = [];
23
24
  return new Promise((resolve) => {
package/lib/wifi.js CHANGED
@@ -425,6 +425,7 @@ function parseWifiDarwin(wifiStr) {
425
425
  }
426
426
  }
427
427
  function wifiNetworks(callback) {
428
+ callback = util.isFunction(callback) ? callback : null;
428
429
  return new Promise((resolve) => {
429
430
  process.nextTick(() => {
430
431
  let result = [];
@@ -588,6 +589,7 @@ function formatBssid(s) {
588
589
  }
589
590
 
590
591
  function wifiConnections(callback) {
592
+ callback = util.isFunction(callback) ? callback : null;
591
593
  return new Promise((resolve) => {
592
594
  process.nextTick(() => {
593
595
  const result = [];
@@ -747,6 +749,7 @@ function wifiConnections(callback) {
747
749
  exports.wifiConnections = wifiConnections;
748
750
 
749
751
  function wifiInterfaces(callback) {
752
+ callback = util.isFunction(callback) ? callback : null;
750
753
  return new Promise((resolve) => {
751
754
  process.nextTick(() => {
752
755
  const result = [];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "systeminformation",
3
- "version": "5.33.17",
3
+ "version": "5.33.19",
4
4
  "description": "Advanced, lightweight system and OS information library",
5
5
  "license": "MIT",
6
6
  "author": "Sebastian Hildebrandt <hildebrandt@plus-innovations.com> (https://plus-innovations.com)",