systeminformation 6.0.0-beta.7 → 6.0.0-beta.9

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.
Files changed (58) hide show
  1. package/README.md +17 -1
  2. package/dist/common/defaults.d.ts +2 -1
  3. package/dist/common/defaults.js +11 -1
  4. package/dist/common/files.d.ts +8 -0
  5. package/dist/common/files.js +58 -3
  6. package/dist/common/nvidia.js +2 -1
  7. package/dist/common/parse.d.ts +4 -6
  8. package/dist/common/parse.js +24 -69
  9. package/dist/common/security.d.ts +1 -0
  10. package/dist/common/security.js +3 -1
  11. package/dist/common/types.d.ts +12 -2
  12. package/dist/cpu-current-load.js +5 -5
  13. package/dist/cpu-current-speed.js +5 -3
  14. package/dist/darwin/index.d.ts +1 -0
  15. package/dist/darwin/index.js +3 -1
  16. package/dist/darwin/serial-ports.d.ts +2 -0
  17. package/dist/darwin/serial-ports.js +94 -0
  18. package/dist/get-data.d.ts +2 -0
  19. package/dist/get-data.js +3 -1
  20. package/dist/index.d.ts +1 -0
  21. package/dist/index.js +3 -1
  22. package/dist/linux/audio.js +11 -2
  23. package/dist/linux/baseboard.js +9 -20
  24. package/dist/linux/bios.js +6 -15
  25. package/dist/linux/camera.js +2 -1
  26. package/dist/linux/chassis.js +4 -10
  27. package/dist/linux/cpu-temperature.js +34 -19
  28. package/dist/linux/cpu.js +3 -1
  29. package/dist/linux/disk-layout.js +2 -5
  30. package/dist/linux/disks-io.js +6 -6
  31. package/dist/linux/fans.js +3 -2
  32. package/dist/linux/fs-size.js +120 -26
  33. package/dist/linux/fs-stats.js +6 -9
  34. package/dist/linux/gpu.js +2 -1
  35. package/dist/linux/index.d.ts +1 -0
  36. package/dist/linux/index.js +3 -1
  37. package/dist/linux/mem-layout.js +2 -2
  38. package/dist/linux/network-interfaces.js +10 -29
  39. package/dist/linux/network-stats.js +1 -1
  40. package/dist/linux/npu.js +2 -1
  41. package/dist/linux/os-info.js +19 -4
  42. package/dist/linux/printer.js +4 -4
  43. package/dist/linux/process-load.js +9 -12
  44. package/dist/linux/processes.js +88 -79
  45. package/dist/linux/serial-ports.d.ts +2 -0
  46. package/dist/linux/serial-ports.js +102 -0
  47. package/dist/linux/services.js +12 -12
  48. package/dist/linux/system.js +1 -7
  49. package/dist/linux/uuid.js +4 -10
  50. package/dist/serial-ports.d.ts +1 -0
  51. package/dist/serial-ports.js +17 -0
  52. package/dist/windows/index.d.ts +1 -0
  53. package/dist/windows/index.js +3 -1
  54. package/dist/windows/process-load.js +5 -4
  55. package/dist/windows/processes.js +10 -6
  56. package/dist/windows/serial-ports.d.ts +3 -0
  57. package/dist/windows/serial-ports.js +73 -0
  58. package/package.json +1 -1
@@ -4,6 +4,7 @@ exports.services = void 0;
4
4
  const common_1 = require("../common");
5
5
  const const_1 = require("../common/const");
6
6
  const exec_1 = require("../common/exec");
7
+ const files_1 = require("../common/files");
7
8
  const parse_1 = require("../common/parse");
8
9
  const security_1 = require("../common/security");
9
10
  const _services_cpu = {
@@ -83,19 +84,20 @@ const darwinGetServices = async () => {
83
84
  return srvs;
84
85
  };
85
86
  const calcServicesCpuLinux = async (result) => {
86
- let cmd = 'cat /proc/stat | grep "cpu "';
87
+ result.forEach((item) => {
88
+ item.cpu = 0;
89
+ });
90
+ const pids = [];
87
91
  for (const i in result) {
88
- for (const j in result[i].pids) {
89
- cmd += ';cat /proc/' + result[i].pids[j] + '/stat';
90
- }
92
+ pids.push(...result[i].pids);
91
93
  }
92
- const { stdout } = await (0, exec_1.execSave)(cmd, const_1.execOptsLinux);
93
- let curr_processes = stdout.toString().split('\n');
94
- const all = (0, parse_1.parseProcStat)(curr_processes[0]);
95
- curr_processes = curr_processes.slice(1);
94
+ const cpuBaseline = { ..._services_cpu };
95
+ const stats = await (0, files_1.readProcStats)(pids);
96
+ const all = (0, parse_1.parseProcStat)(stats.all);
97
+ const curr_processes = stats.procs;
96
98
  const list_new = {};
97
99
  curr_processes.forEach((element) => {
98
- const resultProcess = (0, parse_1.calcProcStatLinux)(element, all, _services_cpu);
100
+ const resultProcess = (0, parse_1.calcProcStatLinux)(element, all, cpuBaseline);
99
101
  if (resultProcess.pid) {
100
102
  let listPos = -1;
101
103
  for (let i = 0; i < result.length; i++) {
@@ -112,9 +114,7 @@ const calcServicesCpuLinux = async (result) => {
112
114
  cpuu: resultProcess.cpuu,
113
115
  cpus: resultProcess.cpus,
114
116
  utime: resultProcess.utime,
115
- stime: resultProcess.stime,
116
- cutime: resultProcess.cutime,
117
- cstime: resultProcess.cstime
117
+ stime: resultProcess.stime
118
118
  };
119
119
  }
120
120
  });
@@ -21,14 +21,8 @@ const system = async () => {
21
21
  result.serial = (0, common_1.getValue)(lines, 'serial number');
22
22
  result.uuid = (0, common_1.getValue)(lines, 'uuid').toLowerCase();
23
23
  result.sku = (0, common_1.getValue)(lines, 'sku number');
24
- const cmd = `echo -n "product_name: "; cat /sys/devices/virtual/dmi/id/product_name 2>/dev/null; echo;
25
- echo -n "product_serial: "; cat /sys/devices/virtual/dmi/id/product_serial 2>/dev/null; echo;
26
- echo -n "product_uuid: "; cat /sys/devices/virtual/dmi/id/product_uuid 2>/dev/null; echo;
27
- echo -n "product_version: "; cat /sys/devices/virtual/dmi/id/product_version 2>/dev/null; echo;
28
- echo -n "sys_vendor: "; cat /sys/devices/virtual/dmi/id/sys_vendor 2>/dev/null; echo;`;
29
24
  try {
30
- ({ stdout } = await (0, exec_1.execSave)(cmd));
31
- lines = stdout.split('\n');
25
+ lines = await (0, files_1.readSysfsMany)(files_1.DMI_PATH, ['product_name', 'product_serial', 'product_uuid', 'product_version', 'sys_vendor']);
32
26
  result.manufacturer = result.manufacturer === '' ? (0, common_1.getValue)(lines, 'sys_vendor') : result.manufacturer;
33
27
  result.model = result.model === '' ? (0, common_1.getValue)(lines, 'product_name') : result.model;
34
28
  result.version = result.version === '' ? (0, common_1.getValue)(lines, 'product_version') : result.version;
@@ -4,21 +4,15 @@ exports.uuid = void 0;
4
4
  const promises_1 = require("fs/promises");
5
5
  const common_1 = require("../common");
6
6
  const defaults_1 = require("../common/defaults");
7
- const exec_1 = require("../common/exec");
7
+ const files_1 = require("../common/files");
8
8
  const disk_layout_1 = require("./disk-layout");
9
9
  const uuid = async () => {
10
10
  await (0, common_1.nextTick)();
11
11
  const defaults = defaults_1.initUUID;
12
12
  try {
13
- const cmd = `echo -n "os: "; cat /var/lib/dbus/machine-id 2> /dev/null ||
14
- cat /etc/machine-id 2> /dev/null; echo;
15
- echo -n "hardware: "; cat /sys/class/dmi/id/product_uuid 2> /dev/null; echo;
16
- echo -n "systemuuid: "; cat /sys/devices/virtual/dmi/id/product_uuid 2>/dev/null; echo;`;
17
- const { stdout } = await (0, exec_1.execSave)(cmd);
18
- const lines = stdout.toString().split('\n');
19
- const os = (0, common_1.getValue)(lines, 'os').toLowerCase();
20
- let hardware = (0, common_1.getValue)(lines, 'hardware').toLowerCase();
21
- const systemuuid = (0, common_1.getValue)(lines, 'systemuuid').toLowerCase();
13
+ const os = ((await (0, files_1.readSysfs)('/var/lib/dbus/machine-id')) || (await (0, files_1.readSysfs)('/etc/machine-id'))).toLowerCase();
14
+ let hardware = (await (0, files_1.readSysfs)('/sys/class/dmi/id/product_uuid')).toLowerCase();
15
+ const systemuuid = (await (0, files_1.readSysfs)(`${files_1.DMI_PATH}/product_uuid`)).toLowerCase();
22
16
  if (!hardware) {
23
17
  const lines = (await (0, promises_1.readFile)('/proc/cpuinfo')).toString().split('\n');
24
18
  const serial = (0, common_1.getValue)(lines, 'serial');
@@ -0,0 +1 @@
1
+ export declare const serialPorts: () => Promise<import("./common/types").SerialPortData[] | null>;
@@ -0,0 +1,17 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.serialPorts = void 0;
4
+ const const_1 = require("./common/const");
5
+ const serialPorts = async () => {
6
+ switch (true) {
7
+ case const_1.LINUX || const_1.ANDROID:
8
+ return (await import('./linux/serial-ports.js')).serialPorts();
9
+ case const_1.DARWIN:
10
+ return (await import('./darwin/serial-ports.js')).serialPorts();
11
+ case const_1.WINDOWS:
12
+ return (await import('./windows/serial-ports.js')).serialPorts();
13
+ default:
14
+ return null;
15
+ }
16
+ };
17
+ exports.serialPorts = serialPorts;
@@ -49,6 +49,7 @@ export { shell } from './shell';
49
49
  export { software } from './software';
50
50
  export { system } from './system';
51
51
  export { thunderbolt } from './thunderbolt';
52
+ export { serialPorts } from './serial-ports';
52
53
  export { usb } from './usb';
53
54
  export { users } from './users';
54
55
  export { uuid } from './uuid';
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.printer = exports.pci = exports.osInfo = exports.npu = exports.npm = exports.networkStats = exports.networkInterfaces = exports.networkInterfaceDefault = exports.networkGatewayDefault = exports.networkConnections = exports.mouse = exports.memLayout = exports.mem = exports.keyboard = exports.inetLatency = exports.gpu = exports.fsStats = exports.fsSize = exports.fsOpenFiles = exports.displays = exports.disksIO = exports.diskLayout = exports.fans = exports.cpuTemperature = exports.cpuFlags = exports.cpuCache = exports.cpu = exports.chassis = exports.camera = exports.bluetoothDevices = exports.blockDevices = exports.bios = exports.battery = exports.baseboard = exports.audio = exports.vboxInfo = exports.versions = exports.version = exports.time = exports.inetChecksite = exports.dockerVolumes = exports.dockerInfo = exports.dockerImages = exports.dockerContainerStats = exports.dockerContainers = exports.dockerContainerProcesses = exports.dockerAll = exports.fullLoad = exports.cpuCurrentSpeed = exports.currentLoad = void 0;
4
- exports.wifiNetworks = exports.wifiInterfaces = exports.wifiConnections = exports.uuid = exports.users = exports.usb = exports.thunderbolt = exports.system = exports.software = exports.shell = exports.services = exports.processes = exports.processLoad = void 0;
4
+ exports.wifiNetworks = exports.wifiInterfaces = exports.wifiConnections = exports.uuid = exports.users = exports.usb = exports.serialPorts = exports.thunderbolt = exports.system = exports.software = exports.shell = exports.services = exports.processes = exports.processLoad = void 0;
5
5
  var cpu_current_load_1 = require("../cpu-current-load");
6
6
  Object.defineProperty(exports, "currentLoad", { enumerable: true, get: function () { return cpu_current_load_1.currentLoad; } });
7
7
  var cpu_current_speed_1 = require("../cpu-current-speed");
@@ -110,6 +110,8 @@ var system_1 = require("./system");
110
110
  Object.defineProperty(exports, "system", { enumerable: true, get: function () { return system_1.system; } });
111
111
  var thunderbolt_1 = require("./thunderbolt");
112
112
  Object.defineProperty(exports, "thunderbolt", { enumerable: true, get: function () { return thunderbolt_1.thunderbolt; } });
113
+ var serial_ports_1 = require("./serial-ports");
114
+ Object.defineProperty(exports, "serialPorts", { enumerable: true, get: function () { return serial_ports_1.serialPorts; } });
113
115
  var usb_1 = require("./usb");
114
116
  Object.defineProperty(exports, "usb", { enumerable: true, get: function () { return usb_1.usb; } });
115
117
  var users_1 = require("./users");
@@ -20,19 +20,20 @@ const processLoad = async (proc) => {
20
20
  if (!(0, security_1.isPrototypePolluted)()) {
21
21
  const processes = (0, security_1.sanitizeServiceString)(proc);
22
22
  if (processes.length) {
23
+ const cpuBaseline = { ..._process_cpu };
23
24
  try {
24
25
  const processArray = (0, windows_1.psArray)(await windows_1.ps.exec('Get-CimInstance Win32_Process | select ProcessId,Caption,UserModeTime,KernelModeTime,WorkingSetSize | ConvertTo-Json -compress'));
25
26
  const procStats = [];
26
27
  const list_new = {};
27
- let allcpuu = _process_cpu.all_utime;
28
- let allcpus = _process_cpu.all_stime;
28
+ let allcpuu = cpuBaseline.all_utime;
29
+ let allcpus = cpuBaseline.all_stime;
29
30
  processArray.forEach((element) => {
30
31
  const pid = element.ProcessId;
31
32
  const name = element.Caption;
32
33
  const utime = element.UserModeTime;
33
34
  const stime = element.KernelModeTime;
34
35
  const mem = element.WorkingSetSize;
35
- const cpuOld = _process_cpu.list[pid];
36
+ const cpuOld = cpuBaseline.list[pid];
36
37
  allcpuu += utime - (cpuOld ? cpuOld.utime : 0);
37
38
  allcpus += stime - (cpuOld ? cpuOld.stime : 0);
38
39
  procStats.push({
@@ -90,7 +91,7 @@ const processLoad = async (proc) => {
90
91
  });
91
92
  }
92
93
  procStats.forEach((element) => {
93
- const resultProcess = (0, processes_1.calcProcStatWin)(element, allcpuu + allcpus, _process_cpu);
94
+ const resultProcess = (0, processes_1.calcProcStatWin)(element, allcpuu + allcpus, cpuBaseline);
94
95
  let listPos = -1;
95
96
  for (let j = 0; j < result.length; j++) {
96
97
  if (result[j].pid === resultProcess.pid || result[j].pids.indexOf(resultProcess.pid) >= 0) {
@@ -6,6 +6,7 @@ const common_1 = require("../common");
6
6
  const defaults_1 = require("../common/defaults");
7
7
  const mappings_1 = require("../common/mappings");
8
8
  const windows_1 = require("../common/windows");
9
+ const parse_1 = require("../common/parse");
9
10
  const _processes_cpu = {
10
11
  all: 0,
11
12
  all_utime: 0,
@@ -26,12 +27,13 @@ const calcProcStatWin = (procStat, all, _cpu_old) => {
26
27
  cpuu = all > 0 ? (procStat.utime / all) * 100 : 0;
27
28
  cpus = all > 0 ? (procStat.stime / all) * 100 : 0;
28
29
  }
30
+ const clamped = (0, parse_1.clampCpuPair)(cpuu, cpus);
29
31
  return {
30
32
  pid: procStat.pid,
31
33
  utime: procStat.utime,
32
34
  stime: procStat.stime,
33
- cpuu: cpuu > 0 ? cpuu : 0,
34
- cpus: cpus > 0 ? cpus : 0
35
+ cpuu: clamped.cpuu,
36
+ cpus: clamped.cpus
35
37
  };
36
38
  };
37
39
  exports.calcProcStatWin = calcProcStatWin;
@@ -39,6 +41,7 @@ const processes = async () => {
39
41
  await (0, common_1.nextTick)();
40
42
  const result = (0, common_1.cloneObj)(defaults_1.initProcesses);
41
43
  if ((_processes_cpu.ms && Date.now() - _processes_cpu.ms >= 500) || _processes_cpu.ms === 0) {
44
+ const cpuBaseline = { ..._processes_cpu };
42
45
  try {
43
46
  const processArray = (0, windows_1.psArray)(await windows_1.ps.exec(`Get-CimInstance Win32_Process | select-Object ProcessId,ParentProcessId,ExecutionState,Caption,CommandLine,ExecutablePath,UserModeTime,KernelModeTime,WorkingSetSize,Priority,PageFileUsage,
44
47
  @{n="CreationDate";e={$_.CreationDate.ToString("yyyy-MM-dd HH:mm:ss")}} | ConvertTo-Json -compress`));
@@ -46,8 +49,8 @@ const processes = async () => {
46
49
  const procs = [];
47
50
  const procStats = [];
48
51
  const list_new = {};
49
- let allcpuu = _processes_cpu.all_utime;
50
- let allcpus = _processes_cpu.all_stime;
52
+ let allcpuu = cpuBaseline.all_utime;
53
+ let allcpus = cpuBaseline.all_stime;
51
54
  processArray.forEach((element) => {
52
55
  const pid = element.ProcessId;
53
56
  const parentPid = element.ParentProcessId;
@@ -58,7 +61,7 @@ const processes = async () => {
58
61
  const utime = element.UserModeTime;
59
62
  const stime = element.KernelModeTime;
60
63
  const memw = element.WorkingSetSize;
61
- const cpuOld = _processes_cpu.list[pid];
64
+ const cpuOld = cpuBaseline.list[pid];
62
65
  allcpuu += utime - (cpuOld ? cpuOld.utime : 0);
63
66
  allcpus += stime - (cpuOld ? cpuOld.stime : 0);
64
67
  result.all++;
@@ -87,6 +90,7 @@ const processes = async () => {
87
90
  cpu: 0,
88
91
  cpuu: 0,
89
92
  cpus: 0,
93
+ cpuTime: (utime + stime) / 1e7,
90
94
  mem: (memw / (0, node_os_1.totalmem)()) * 100,
91
95
  priority: element.Priority || 0,
92
96
  memVsz: element.PageFileUsage || null,
@@ -104,7 +108,7 @@ const processes = async () => {
104
108
  result.sleeping = result.all - result.running - result.blocked - result.unknown;
105
109
  result.list = procs;
106
110
  procStats.forEach((element) => {
107
- const resultProcess = (0, exports.calcProcStatWin)(element, allcpuu + allcpus, _processes_cpu);
111
+ const resultProcess = (0, exports.calcProcStatWin)(element, allcpuu + allcpus, cpuBaseline);
108
112
  const listPos = result.list
109
113
  .map((e) => {
110
114
  return e.pid;
@@ -0,0 +1,3 @@
1
+ import type { SerialPortData } from '../common/types';
2
+ export declare const parseSerialPorts: (devices: any[]) => SerialPortData[];
3
+ export declare const serialPorts: () => Promise<SerialPortData[]>;
@@ -0,0 +1,73 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.serialPorts = exports.parseSerialPorts = void 0;
4
+ const common_1 = require("../common");
5
+ const defaults_1 = require("../common/defaults");
6
+ const windows_1 = require("../common/windows");
7
+ const matchId = (deviceId, key) => {
8
+ const match = new RegExp(`${key}_([0-9A-Fa-f]{4})`).exec(deviceId);
9
+ return match?.[1] ? match[1].toLowerCase() : null;
10
+ };
11
+ const parseSerial = (deviceId) => {
12
+ const ftdi = /PID_[0-9A-Fa-f]{4}\+([^+\\]+)/.exec(deviceId);
13
+ if (ftdi?.[1]) {
14
+ return ftdi[1];
15
+ }
16
+ const last = deviceId.split('\\').pop() || '';
17
+ return last && !last.includes('&') ? last : null;
18
+ };
19
+ const parseType = (deviceId) => {
20
+ const id = deviceId.toUpperCase();
21
+ if (id.startsWith('USB\\') || id.startsWith('FTDIBUS\\')) {
22
+ return 'usb';
23
+ }
24
+ if (id.startsWith('BTHENUM') || id.startsWith('BTHLE')) {
25
+ return 'bluetooth';
26
+ }
27
+ if (id.startsWith('PCI\\')) {
28
+ return 'pci';
29
+ }
30
+ if (id.startsWith('ACPI\\')) {
31
+ return 'onboard';
32
+ }
33
+ if (id.startsWith('ROOT\\') || id.startsWith('SW\\') || id.startsWith('UMB\\')) {
34
+ return 'virtual';
35
+ }
36
+ return 'unknown';
37
+ };
38
+ const parseSerialPorts = (devices) => {
39
+ const result = [];
40
+ for (const device of devices) {
41
+ const name = (device.Name || '').trim();
42
+ const port = /\((COM\d+)\)/.exec(name);
43
+ if (!port?.[1]) {
44
+ continue;
45
+ }
46
+ const deviceId = device.DeviceID || device.PNPDeviceID || '';
47
+ const type = parseType(deviceId);
48
+ result.push({
49
+ ...(0, common_1.cloneObj)(defaults_1.initSerialPortResult),
50
+ device: port[1],
51
+ name: name.replace(/\s*\(COM\d+\)\s*$/, '') || port[1],
52
+ manufacturer: (device.Manufacturer || '').trim() || null,
53
+ serialNumber: type === 'usb' ? parseSerial(deviceId) : null,
54
+ vendorId: matchId(deviceId, 'VID'),
55
+ productId: matchId(deviceId, 'PID'),
56
+ pnpId: deviceId || null,
57
+ type
58
+ });
59
+ }
60
+ return result;
61
+ };
62
+ exports.parseSerialPorts = parseSerialPorts;
63
+ const serialPorts = async () => {
64
+ await (0, common_1.nextTick)();
65
+ try {
66
+ const result = await windows_1.ps.exec(`@(Get-CimInstance Win32_PnPEntity -Filter "Name LIKE '%(COM%'" | Select-Object Name,DeviceID,Manufacturer) | ConvertTo-Json -Depth 3`);
67
+ return (0, exports.parseSerialPorts)((0, windows_1.psArray)(result));
68
+ }
69
+ catch {
70
+ return [];
71
+ }
72
+ };
73
+ exports.serialPorts = serialPorts;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "systeminformation",
3
- "version": "6.0.0-beta.7",
3
+ "version": "6.0.0-beta.9",
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)",