systeminformation 6.0.0-beta.25 → 6.0.0-beta.26

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/README.md CHANGED
@@ -53,6 +53,7 @@ in a browser.
53
53
  - `serialPorts()` - detected serial / COM ports
54
54
  - `networkRoutes()` - network routing table
55
55
  - `diskSpeed()` - disk speed test (sequential write / read throughput)
56
+ - `inetSpeed()` - internet speed test (download / upload throughput)
56
57
 
57
58
  ### Extended Windows support
58
59
 
@@ -171,7 +172,7 @@ implementations can be tree-shaken away.
171
172
 
172
173
  - complete rewrite in TypeScript with typed declarations for every function
173
174
  - modular imports: load the whole library, a single operating system, or a single function
174
- - new functions: `camera()`, `keyboard()`, `mouse()`, `thunderbolt()`, `pci()`, `npu()`, `software()`, `npm()`, `fans()`, `serialPorts()`, `networkRoutes()`, `diskSpeed()`
175
+ - new functions: `camera()`, `keyboard()`, `mouse()`, `thunderbolt()`, `pci()`, `npu()`, `software()`, `npm()`, `fans()`, `serialPorts()`, `networkRoutes()`, `diskSpeed()`, `inetSpeed()`
175
176
  - extended Windows support: `disksIO()`, `fsStats()`, `fsOpenFiles()`, `thunderbolt()`
176
177
  - `time()` and `version()` are now asynchronous - all functions are async (async/await preferred, promises as alternative)
177
178
  - callbacks are no longer supported
@@ -787,6 +788,13 @@ On Linux, `si.gpu()` also covers the integrated GPU of NVIDIA Tegra / Jetson boa
787
788
  | | status | X | X | X | X | X | status code |
788
789
  | | ms | X | X | X | X | X | response time in ms |
789
790
  | si.inetLatency(host) | : number | X | X | X | X | X | response-time (ms) to external resource<br>host parameter is optional (default 8.8.8.8) |
791
+ | si.inetSpeed(dlUrl, ulUrl) | {...} | X | X | X | X | X | internet speed test (download / upload, max. 8 s each)<br>default server: speed.cloudflare.com, URLs optional |
792
+ | | server | X | X | X | X | X | test server (host) |
793
+ | | downloadSpeed | X | X | X | X | X | download throughput in Mbit/s |
794
+ | | uploadSpeed | X | X | X | X | X | upload throughput in Mbit/s |
795
+ | | downloadMB | X | X | X | X | X | transferred download volume in MB (max. 250) |
796
+ | | uploadMB | X | X | X | X | X | transferred upload volume in MB (max. 50) |
797
+ | | ms | X | X | X | X | X | total duration in ms |
790
798
 
791
799
  #### 13. Wifi
792
800
 
@@ -821,7 +829,8 @@ On Linux, `si.gpu()` also covers the integrated GPU of NVIDIA Tegra / Jetson boa
821
829
  | | [0].signalLevel | X | | X | X | | signal level in dB |
822
830
  | | [0].quality | X | | X | X | | quality in % |
823
831
  | | [0].security | X | | X | X | | array e.g. WPA, WPA-2 |
824
- | | [0].txRate | X | | X | X | | transfer rate MBit/s |
832
+ | | [0].txRate | X | | X | X | | link transmit rate MBit/s |
833
+ | | [0].rxRate | X | | | X | | link receive rate MBit/s |
825
834
 
826
835
  #### 14. Bluetooth
827
836
 
@@ -8,6 +8,7 @@ export { networkRoutes } from '../darwin/network-routes';
8
8
  export { users } from '../darwin/users';
9
9
  export { dockerAll, dockerContainerProcesses, dockerContainers, dockerContainerStats, dockerImages, dockerInfo, dockerVolumes } from '../docker';
10
10
  export { inetChecksite } from '../inet-checksite';
11
+ export { inetSpeed } from '../inet-speed';
11
12
  export { audio } from '../linux/audio';
12
13
  export { baseboard } from '../linux/baseboard';
13
14
  export { bios } from '../linux/bios';
package/dist/bsd/index.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.uuid = exports.osInfo = exports.networkStats = exports.mem = exports.cpuTemperature = exports.cpuFlags = exports.cpuCache = exports.cpu = exports.battery = exports.vboxInfo = exports.versions = exports.version = exports.time = exports.shell = exports.system = exports.services = exports.processes = exports.processLoad = exports.printer = exports.networkGatewayDefault = exports.networkConnections = exports.memLayout = exports.inetLatency = exports.fsSize = exports.disksIO = exports.diskSpeed = exports.chassis = exports.bios = exports.baseboard = exports.audio = exports.inetChecksite = exports.dockerVolumes = exports.dockerInfo = exports.dockerImages = exports.dockerContainerStats = exports.dockerContainers = exports.dockerContainerProcesses = exports.dockerAll = exports.users = exports.networkRoutes = exports.networkInterfaces = exports.networkInterfaceDefault = exports.fsOpenFiles = exports.fullLoad = exports.cpuCurrentSpeed = exports.currentLoad = void 0;
3
+ exports.uuid = exports.osInfo = exports.networkStats = exports.mem = exports.cpuTemperature = exports.cpuFlags = exports.cpuCache = exports.cpu = exports.battery = exports.vboxInfo = exports.versions = exports.version = exports.time = exports.shell = exports.system = exports.services = exports.processes = exports.processLoad = exports.printer = exports.networkGatewayDefault = exports.networkConnections = exports.memLayout = exports.inetLatency = exports.fsSize = exports.disksIO = exports.diskSpeed = exports.chassis = exports.bios = exports.baseboard = exports.audio = exports.inetSpeed = exports.inetChecksite = exports.dockerVolumes = exports.dockerInfo = exports.dockerImages = exports.dockerContainerStats = exports.dockerContainers = exports.dockerContainerProcesses = exports.dockerAll = exports.users = exports.networkRoutes = exports.networkInterfaces = exports.networkInterfaceDefault = exports.fsOpenFiles = exports.fullLoad = exports.cpuCurrentSpeed = exports.currentLoad = void 0;
4
4
  var cpu_current_load_1 = require("../cpu-current-load");
5
5
  Object.defineProperty(exports, "currentLoad", { enumerable: true, get: function () { return cpu_current_load_1.currentLoad; } });
6
6
  var cpu_current_speed_1 = require("../cpu-current-speed");
@@ -27,6 +27,8 @@ Object.defineProperty(exports, "dockerInfo", { enumerable: true, get: function (
27
27
  Object.defineProperty(exports, "dockerVolumes", { enumerable: true, get: function () { return docker_1.dockerVolumes; } });
28
28
  var inet_checksite_1 = require("../inet-checksite");
29
29
  Object.defineProperty(exports, "inetChecksite", { enumerable: true, get: function () { return inet_checksite_1.inetChecksite; } });
30
+ var inet_speed_1 = require("../inet-speed");
31
+ Object.defineProperty(exports, "inetSpeed", { enumerable: true, get: function () { return inet_speed_1.inetSpeed; } });
30
32
  var audio_1 = require("../linux/audio");
31
33
  Object.defineProperty(exports, "audio", { enumerable: true, get: function () { return audio_1.audio; } });
32
34
  var baseboard_1 = require("../linux/baseboard");
@@ -2,6 +2,7 @@ import type { UserData } from './types';
2
2
  export declare const darwinXcodeExists: () => Promise<boolean>;
3
3
  export declare const USB_DATA_TYPES: string[];
4
4
  export declare const spItems: (data: any, dataTypes: string | string[]) => any[];
5
+ export declare const decodeXmlEntities: (value: string) => string;
5
6
  export declare const plistParser: (xmlStr: string, items?: boolean) => any;
6
7
  export declare const formatBssid: (s: string) => string;
7
8
  export declare const plistReader: (output: string) => {};
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.parseUsersDarwin = exports.plistReader = exports.formatBssid = exports.plistParser = exports.spItems = exports.USB_DATA_TYPES = exports.darwinXcodeExists = void 0;
3
+ exports.parseUsersDarwin = exports.plistReader = exports.formatBssid = exports.plistParser = exports.decodeXmlEntities = exports.spItems = exports.USB_DATA_TYPES = exports.darwinXcodeExists = void 0;
4
4
  const fs_1 = require("fs");
5
5
  const promises_1 = require("fs/promises");
6
6
  const datetime_1 = require("./datetime");
@@ -30,6 +30,18 @@ const spItems = (data, dataTypes) => {
30
30
  return result;
31
31
  };
32
32
  exports.spItems = spItems;
33
+ const XML_ENTITIES = { lt: '<', gt: '>', amp: '&', quot: '"', apos: "'" };
34
+ const decodeXmlEntities = (value) => value.replace(/&(#x[0-9a-f]+|#\d+|lt|gt|amp|quot|apos);/gi, (match, entity) => {
35
+ const lower = entity.toLowerCase();
36
+ if (lower.startsWith('#x')) {
37
+ return String.fromCodePoint(parseInt(lower.slice(2), 16));
38
+ }
39
+ if (lower.startsWith('#')) {
40
+ return String.fromCodePoint(parseInt(lower.slice(1), 10));
41
+ }
42
+ return XML_ENTITIES[lower] ?? match;
43
+ });
44
+ exports.decodeXmlEntities = decodeXmlEntities;
33
45
  const plistParser = (xmlStr, items = true) => {
34
46
  const tags = ['array', 'dict', 'key', 'string', 'integer', 'date', 'real', 'data', 'boolean', 'arrayEmpty'];
35
47
  const startStr = '<plist version';
@@ -129,7 +141,7 @@ const plistParser = (xmlStr, items = true) => {
129
141
  }
130
142
  else {
131
143
  if (metaData[depth].tagEnd === '/key' && metaData[depth].tagContent) {
132
- metaData[depth].key = metaData[depth].tagContent;
144
+ metaData[depth].key = (0, exports.decodeXmlEntities)(metaData[depth].tagContent);
133
145
  }
134
146
  else {
135
147
  if (metaData[depth].tagEnd === '/real' && metaData[depth].tagContent) {
@@ -139,7 +151,7 @@ const plistParser = (xmlStr, items = true) => {
139
151
  metaData[depth].data = parseInt(metaData[depth].tagContent, 10) || 0;
140
152
  }
141
153
  if (metaData[depth].tagEnd === '/string' && metaData[depth].tagContent) {
142
- metaData[depth].data = metaData[depth].tagContent || '';
154
+ metaData[depth].data = (0, exports.decodeXmlEntities)(metaData[depth].tagContent);
143
155
  }
144
156
  if (metaData[depth].tagEnd === '/date' && metaData[depth].tagContent) {
145
157
  metaData[depth].data = metaData[depth].tagContent || '';
@@ -415,6 +415,7 @@ export type WifiConnectionData = {
415
415
  signalLevel: number | null;
416
416
  quality: number | null;
417
417
  txRate: number | null;
418
+ rxRate: number | null;
418
419
  };
419
420
  export type InetChecksiteData = {
420
421
  url: string;
@@ -503,6 +504,14 @@ export type OsData = {
503
504
  remoteSession?: boolean;
504
505
  hypervisor?: boolean;
505
506
  };
507
+ export type InetSpeedData = {
508
+ server: string;
509
+ downloadSpeed: number | null;
510
+ uploadSpeed: number | null;
511
+ downloadMB: number;
512
+ uploadMB: number;
513
+ ms: number;
514
+ };
506
515
  export type InetPublicIpData = {
507
516
  ip4: string;
508
517
  ip6: string;
@@ -1,3 +1,3 @@
1
- import { BluetoothObject } from '../common/types';
1
+ import type { BluetoothObject } from '../common/types';
2
2
  export declare const parseBluetooth: (outObj: any) => BluetoothObject[];
3
3
  export declare const bluetoothDevices: () => Promise<BluetoothObject[]>;
@@ -1,12 +1,12 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.bluetoothDevices = exports.parseBluetooth = void 0;
4
- const darwin_1 = require("./../common/darwin");
5
4
  const common_1 = require("../common");
5
+ const darwin_1 = require("./../common/darwin");
6
6
  const exec_1 = require("../common/exec");
7
7
  const mappings_1 = require("../common/mappings");
8
8
  const deviceId = (id) => {
9
- return id.split(' &lt; ')[0];
9
+ return id.split(' < ')[0];
10
10
  };
11
11
  const parseBluetoothObjects = (bluetoothObject, macAddr2) => {
12
12
  const typeStr = ((bluetoothObject.device_minorClassOfDevice_string || bluetoothObject.device_majorClassOfDevice_string || bluetoothObject.device_minorType || '') + (bluetoothObject.device_name || '')).toLowerCase();
@@ -24,6 +24,7 @@ export { fsStats } from './fs-stats';
24
24
  export { fullLoad } from '../cpu-full-load';
25
25
  export { gpu } from './gpu';
26
26
  export { inetChecksite } from '../inet-checksite';
27
+ export { inetSpeed } from '../inet-speed';
27
28
  export { inetLatency } from '../linux/inet-latency';
28
29
  export { keyboard } from './keyboard';
29
30
  export { mem } from './mem';
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.processLoad = exports.processes = exports.printer = exports.pci = exports.osInfo = exports.npu = exports.npm = exports.networkStats = exports.networkRoutes = exports.networkInterfaces = exports.networkInterfaceDefault = exports.networkGatewayDefault = exports.networkConnections = exports.mouse = exports.memLayout = exports.mem = exports.keyboard = exports.inetLatency = exports.inetChecksite = exports.gpu = exports.fullLoad = exports.fsStats = exports.fsSize = exports.fsOpenFiles = exports.dockerAll = exports.dockerVolumes = exports.dockerContainerProcesses = exports.dockerContainerStats = exports.dockerContainers = exports.dockerImages = exports.dockerInfo = exports.displays = exports.disksIO = exports.diskSpeed = exports.diskLayout = exports.currentLoad = exports.fans = exports.cpuTemperature = exports.cpuFlags = exports.cpuCurrentSpeed = exports.cpuCache = exports.cpu = exports.chassis = exports.camera = exports.bluetoothDevices = exports.blockDevices = exports.bios = exports.battery = exports.baseboard = exports.audio = void 0;
4
- exports.wifiNetworks = exports.wifiInterfaces = exports.wifiConnections = exports.versions = exports.version = exports.vboxInfo = exports.uuid = exports.users = exports.usb = exports.serialPorts = exports.time = exports.thunderbolt = exports.system = exports.software = exports.shell = exports.services = exports.processFocused = void 0;
3
+ exports.processes = exports.printer = exports.pci = exports.osInfo = exports.npu = exports.npm = exports.networkStats = exports.networkRoutes = exports.networkInterfaces = exports.networkInterfaceDefault = exports.networkGatewayDefault = exports.networkConnections = exports.mouse = exports.memLayout = exports.mem = exports.keyboard = exports.inetLatency = exports.inetSpeed = exports.inetChecksite = exports.gpu = exports.fullLoad = exports.fsStats = exports.fsSize = exports.fsOpenFiles = exports.dockerAll = exports.dockerVolumes = exports.dockerContainerProcesses = exports.dockerContainerStats = exports.dockerContainers = exports.dockerImages = exports.dockerInfo = exports.displays = exports.disksIO = exports.diskSpeed = exports.diskLayout = exports.currentLoad = exports.fans = exports.cpuTemperature = exports.cpuFlags = exports.cpuCurrentSpeed = exports.cpuCache = exports.cpu = exports.chassis = exports.camera = exports.bluetoothDevices = exports.blockDevices = exports.bios = exports.battery = exports.baseboard = exports.audio = void 0;
4
+ exports.wifiNetworks = exports.wifiInterfaces = exports.wifiConnections = exports.versions = exports.version = exports.vboxInfo = exports.uuid = exports.users = exports.usb = exports.serialPorts = exports.time = exports.thunderbolt = exports.system = exports.software = exports.shell = exports.services = exports.processFocused = exports.processLoad = void 0;
5
5
  var audio_1 = require("./audio");
6
6
  Object.defineProperty(exports, "audio", { enumerable: true, get: function () { return audio_1.audio; } });
7
7
  var baseboard_1 = require("./baseboard");
@@ -60,6 +60,8 @@ var gpu_1 = require("./gpu");
60
60
  Object.defineProperty(exports, "gpu", { enumerable: true, get: function () { return gpu_1.gpu; } });
61
61
  var inet_checksite_1 = require("../inet-checksite");
62
62
  Object.defineProperty(exports, "inetChecksite", { enumerable: true, get: function () { return inet_checksite_1.inetChecksite; } });
63
+ var inet_speed_1 = require("../inet-speed");
64
+ Object.defineProperty(exports, "inetSpeed", { enumerable: true, get: function () { return inet_speed_1.inetSpeed; } });
63
65
  var inet_latency_1 = require("../linux/inet-latency");
64
66
  Object.defineProperty(exports, "inetLatency", { enumerable: true, get: function () { return inet_latency_1.inetLatency; } });
65
67
  var keyboard_1 = require("./keyboard");
@@ -43,7 +43,7 @@ const wifiConnections = async () => {
43
43
  id: networkWifiObj._name || 'Wi-Fi',
44
44
  networkInterface: networkWifiObj.interface || '',
45
45
  model: networkWifiObj.hardware || '',
46
- ssid: (airportWifiObj._name || '').replace('&lt;', '<').replace('&gt;', '>'),
46
+ ssid: airportWifiObj._name || '',
47
47
  bssid: airportWifiObj.spairport_network_bssid || '',
48
48
  channel,
49
49
  frequency: channel ? (0, network_1.wifiFrequencyFromChannel)(channel) : null,
@@ -51,7 +51,8 @@ const wifiConnections = async () => {
51
51
  security,
52
52
  signalLevel: signalLevel ? Number.parseInt(signalLevel, 10) : null,
53
53
  quality: (0, network_1.wifiQualityFromDB)(signalLevel),
54
- txRate: airportWifiObj.spairport_network_rate || null
54
+ txRate: airportWifiObj.spairport_network_rate || null,
55
+ rxRate: null
55
56
  });
56
57
  }
57
58
  catch { }
package/dist/get.js CHANGED
@@ -36,7 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
36
36
  exports.get = void 0;
37
37
  const common_1 = require("./common");
38
38
  const functions = __importStar(require("./index"));
39
- const blocked = ['get', 'observe', 'getStaticData', 'getDynamicData', 'getAllData', 'powerShellStart', 'powerShellRelease', 'diskSpeed'];
39
+ const blocked = ['get', 'observe', 'getStaticData', 'getDynamicData', 'getAllData', 'powerShellStart', 'powerShellRelease', 'diskSpeed', 'inetSpeed'];
40
40
  const pickKeys = (element, keyList) => {
41
41
  if (keyList.length === 1 && (keyList[0] === '*' || keyList[0] === 'all')) {
42
42
  return element;
package/dist/index.d.ts CHANGED
@@ -28,6 +28,7 @@ export { gpu } from './gpu';
28
28
  export { inetChecksite } from './inet-checksite';
29
29
  export { inetLatency } from './inet-latency';
30
30
  export { inetPublicIp } from './inet-public-ip';
31
+ export { inetSpeed } from './inet-speed';
31
32
  export { keyboard } from './keyboard';
32
33
  export { mem } from './mem';
33
34
  export { memLayout } from './mem-layout';
package/dist/index.js CHANGED
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.npu = exports.npm = exports.networkStats = exports.networkRoutes = exports.networkInterfaces = exports.networkInterfaceDefault = exports.networkGatewayDefault = exports.networkConnections = exports.mouse = exports.memLayout = exports.mem = exports.keyboard = exports.inetPublicIp = exports.inetLatency = exports.inetChecksite = exports.gpu = exports.getStaticData = exports.getDynamicData = exports.getAllData = exports.get = exports.fsStats = exports.fsSize = exports.fsOpenFiles = exports.fans = exports.dockerVolumes = exports.dockerInfo = exports.dockerImages = exports.dockerContainers = exports.dockerContainerStats = exports.dockerContainerProcesses = exports.dockerAll = exports.displays = exports.disksIO = exports.diskSpeed = exports.diskLayout = exports.cpuTemperature = exports.fullLoad = exports.cpuFlags = exports.cpuCurrentSpeed = exports.currentLoad = exports.cpuCache = exports.cpu = exports.chassis = exports.camera = exports.bluetoothDevices = exports.blockDevices = exports.bios = exports.battery = exports.baseboard = exports.audio = void 0;
4
- exports.wifiNetworks = exports.wifiInterfaces = exports.wifiConnections = exports.vboxInfo = exports.versions = exports.version = exports.uuid = exports.users = exports.usb = exports.time = exports.thunderbolt = exports.system = exports.software = exports.shell = exports.services = exports.serialPorts = exports.processes = exports.processLoad = exports.processFocused = exports.printer = exports.powerShellStart = exports.powerShellRelease = exports.pci = exports.osInfo = exports.observe = void 0;
3
+ exports.npm = exports.networkStats = exports.networkRoutes = exports.networkInterfaces = exports.networkInterfaceDefault = exports.networkGatewayDefault = exports.networkConnections = exports.mouse = exports.memLayout = exports.mem = exports.keyboard = exports.inetSpeed = exports.inetPublicIp = exports.inetLatency = exports.inetChecksite = exports.gpu = exports.getStaticData = exports.getDynamicData = exports.getAllData = exports.get = exports.fsStats = exports.fsSize = exports.fsOpenFiles = exports.fans = exports.dockerVolumes = exports.dockerInfo = exports.dockerImages = exports.dockerContainers = exports.dockerContainerStats = exports.dockerContainerProcesses = exports.dockerAll = exports.displays = exports.disksIO = exports.diskSpeed = exports.diskLayout = exports.cpuTemperature = exports.fullLoad = exports.cpuFlags = exports.cpuCurrentSpeed = exports.currentLoad = exports.cpuCache = exports.cpu = exports.chassis = exports.camera = exports.bluetoothDevices = exports.blockDevices = exports.bios = exports.battery = exports.baseboard = exports.audio = void 0;
4
+ exports.wifiNetworks = exports.wifiInterfaces = exports.wifiConnections = exports.vboxInfo = exports.versions = exports.version = exports.uuid = exports.users = exports.usb = exports.time = exports.thunderbolt = exports.system = exports.software = exports.shell = exports.services = exports.serialPorts = exports.processes = exports.processLoad = exports.processFocused = exports.printer = exports.powerShellStart = exports.powerShellRelease = exports.pci = exports.osInfo = exports.observe = exports.npu = void 0;
5
5
  var audio_1 = require("./audio");
6
6
  Object.defineProperty(exports, "audio", { enumerable: true, get: function () { return audio_1.audio; } });
7
7
  var baseboard_1 = require("./baseboard");
@@ -70,6 +70,8 @@ var inet_latency_1 = require("./inet-latency");
70
70
  Object.defineProperty(exports, "inetLatency", { enumerable: true, get: function () { return inet_latency_1.inetLatency; } });
71
71
  var inet_public_ip_1 = require("./inet-public-ip");
72
72
  Object.defineProperty(exports, "inetPublicIp", { enumerable: true, get: function () { return inet_public_ip_1.inetPublicIp; } });
73
+ var inet_speed_1 = require("./inet-speed");
74
+ Object.defineProperty(exports, "inetSpeed", { enumerable: true, get: function () { return inet_speed_1.inetSpeed; } });
73
75
  var keyboard_1 = require("./keyboard");
74
76
  Object.defineProperty(exports, "keyboard", { enumerable: true, get: function () { return keyboard_1.keyboard; } });
75
77
  var mem_1 = require("./mem");
@@ -0,0 +1,11 @@
1
+ import type { InetSpeedData } from './common/types';
2
+ export declare const INET_SPEED: {
3
+ downloadUrl: string;
4
+ uploadUrl: string;
5
+ budgetMs: number;
6
+ maxDownloadBytes: number;
7
+ maxUploadBytes: number;
8
+ uploadRequestBytes: number;
9
+ streams: number;
10
+ };
11
+ export declare const inetSpeed: (downloadUrl?: string, uploadUrl?: string) => Promise<InetSpeedData | null>;
@@ -0,0 +1,152 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.inetSpeed = exports.INET_SPEED = void 0;
7
+ const node_crypto_1 = require("node:crypto");
8
+ const node_http_1 = __importDefault(require("node:http"));
9
+ const node_https_1 = __importDefault(require("node:https"));
10
+ const common_1 = require("./common");
11
+ const MB = 1000 * 1000;
12
+ exports.INET_SPEED = {
13
+ downloadUrl: 'https://speed.cloudflare.com/__down?bytes=25000000',
14
+ uploadUrl: 'https://speed.cloudflare.com/__up',
15
+ budgetMs: 8000,
16
+ maxDownloadBytes: 250 * MB,
17
+ maxUploadBytes: 50 * MB,
18
+ uploadRequestBytes: 10 * MB,
19
+ streams: 4
20
+ };
21
+ const elapsedMs = (start) => Number(process.hrtime.bigint() - start) / 1e6;
22
+ const mbitPerSec = (bytes, ms) => (bytes > 0 && ms > 0 ? Math.round(((bytes * 8) / 1e6 / (ms / 1000)) * 10) / 10 : null);
23
+ const parseUrl = (value, fallback) => {
24
+ if (value === undefined || value === null || value === '') {
25
+ return new URL(fallback);
26
+ }
27
+ if (typeof value !== 'string') {
28
+ return null;
29
+ }
30
+ try {
31
+ const url = new URL(value);
32
+ return url.protocol === 'https:' || url.protocol === 'http:' ? url : null;
33
+ }
34
+ catch {
35
+ return null;
36
+ }
37
+ };
38
+ const clientFor = (url) => (url.protocol === 'https:' ? node_https_1.default : node_http_1.default);
39
+ const HEADERS = { 'User-Agent': 'systeminformation' };
40
+ const timedTransfer = async (maxBytes, request) => {
41
+ let bytes = 0;
42
+ const start = process.hrtime.bigint();
43
+ const state = {
44
+ done: () => bytes >= maxBytes || elapsedMs(start) >= exports.INET_SPEED.budgetMs,
45
+ add: (n) => {
46
+ bytes += n;
47
+ }
48
+ };
49
+ const worker = async () => {
50
+ while (!state.done()) {
51
+ const before = bytes;
52
+ await request(state).catch(() => { });
53
+ if (bytes === before) {
54
+ break;
55
+ }
56
+ }
57
+ };
58
+ await Promise.all(Array.from({ length: exports.INET_SPEED.streams }, worker));
59
+ return { bytes, ms: elapsedMs(start) };
60
+ };
61
+ const download = (url) => timedTransfer(exports.INET_SPEED.maxDownloadBytes, (state) => new Promise((resolve) => {
62
+ const req = clientFor(url).get(url, { headers: HEADERS, timeout: exports.INET_SPEED.budgetMs }, (res) => {
63
+ if (!res.statusCode || res.statusCode < 200 || res.statusCode > 299) {
64
+ res.resume();
65
+ resolve();
66
+ return;
67
+ }
68
+ res.on('data', (chunk) => {
69
+ state.add(chunk.length);
70
+ if (state.done()) {
71
+ req.destroy();
72
+ }
73
+ });
74
+ res.on('end', () => resolve());
75
+ res.on('error', () => resolve());
76
+ });
77
+ req.on('timeout', () => req.destroy());
78
+ req.on('error', () => resolve());
79
+ req.on('close', () => resolve());
80
+ }));
81
+ const upload = (url) => {
82
+ const chunk = (0, node_crypto_1.randomBytes)(64 * 1024);
83
+ return timedTransfer(exports.INET_SPEED.maxUploadBytes, (state) => new Promise((resolve) => {
84
+ const req = clientFor(url).request(url, {
85
+ method: 'POST',
86
+ headers: { ...HEADERS, 'Content-Type': 'application/octet-stream', 'Content-Length': exports.INET_SPEED.uploadRequestBytes },
87
+ timeout: exports.INET_SPEED.budgetMs
88
+ });
89
+ req.on('timeout', () => req.destroy());
90
+ req.on('error', () => resolve());
91
+ req.on('close', () => resolve());
92
+ let queued = 0;
93
+ let counted = 0;
94
+ let rejected = false;
95
+ req.on('response', (res) => {
96
+ res.resume();
97
+ if (!res.statusCode || res.statusCode < 200 || res.statusCode > 299) {
98
+ rejected = true;
99
+ state.add(-counted);
100
+ req.destroy();
101
+ }
102
+ });
103
+ const pump = () => {
104
+ while (queued < exports.INET_SPEED.uploadRequestBytes) {
105
+ if (state.done()) {
106
+ req.destroy();
107
+ return;
108
+ }
109
+ const part = Math.min(chunk.length, exports.INET_SPEED.uploadRequestBytes - queued);
110
+ queued += part;
111
+ const writable = req.write(chunk.subarray(0, part), (err) => {
112
+ if (!err && !rejected) {
113
+ counted += part;
114
+ state.add(part);
115
+ }
116
+ });
117
+ if (!writable) {
118
+ req.once('drain', pump);
119
+ return;
120
+ }
121
+ }
122
+ req.end();
123
+ };
124
+ pump();
125
+ }));
126
+ };
127
+ const measure = async (downloadUrl, uploadUrl) => {
128
+ const down = parseUrl(downloadUrl, exports.INET_SPEED.downloadUrl);
129
+ const up = parseUrl(uploadUrl, exports.INET_SPEED.uploadUrl);
130
+ if (!down || !up) {
131
+ return null;
132
+ }
133
+ const start = process.hrtime.bigint();
134
+ const dl = await download(down);
135
+ const ul = await upload(up);
136
+ return {
137
+ server: down.host,
138
+ downloadSpeed: mbitPerSec(dl.bytes, dl.ms),
139
+ uploadSpeed: mbitPerSec(ul.bytes, ul.ms),
140
+ downloadMB: Math.round((dl.bytes / MB) * 10) / 10,
141
+ uploadMB: Math.round((ul.bytes / MB) * 10) / 10,
142
+ ms: Math.round(elapsedMs(start))
143
+ };
144
+ };
145
+ let _queue = Promise.resolve();
146
+ const inetSpeed = async (downloadUrl, uploadUrl) => {
147
+ await (0, common_1.nextTick)();
148
+ const run = _queue.then(() => measure(downloadUrl, uploadUrl));
149
+ _queue = run.catch(() => null);
150
+ return run;
151
+ };
152
+ exports.inetSpeed = inetSpeed;
@@ -24,6 +24,7 @@ export { fsStats } from './fs-stats';
24
24
  export { fullLoad } from '../cpu-full-load';
25
25
  export { gpu } from './gpu';
26
26
  export { inetChecksite } from '../inet-checksite';
27
+ export { inetSpeed } from '../inet-speed';
27
28
  export { inetLatency } from './inet-latency';
28
29
  export { keyboard } from './keyboard';
29
30
  export { mem } from './mem';
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.processLoad = exports.processes = exports.printer = exports.pci = exports.osInfo = exports.npu = exports.npm = exports.networkStats = exports.networkRoutes = exports.networkInterfaces = exports.networkInterfaceDefault = exports.networkGatewayDefault = exports.networkConnections = exports.mouse = exports.memLayout = exports.mem = exports.keyboard = exports.inetLatency = exports.inetChecksite = exports.gpu = exports.fullLoad = exports.fsStats = exports.fsSize = exports.fsOpenFiles = exports.dockerAll = exports.dockerVolumes = exports.dockerContainerProcesses = exports.dockerContainerStats = exports.dockerContainers = exports.dockerImages = exports.dockerInfo = exports.displays = exports.disksIO = exports.diskSpeed = exports.diskLayout = exports.currentLoad = exports.fans = exports.cpuTemperature = exports.cpuFlags = exports.cpuCurrentSpeed = exports.cpuCache = exports.cpu = exports.chassis = exports.camera = exports.bluetoothDevices = exports.blockDevices = exports.bios = exports.battery = exports.baseboard = exports.audio = void 0;
4
- exports.wifiNetworks = exports.wifiInterfaces = exports.wifiConnections = exports.versions = exports.version = exports.vboxInfo = exports.uuid = exports.users = exports.usb = exports.serialPorts = exports.time = exports.thunderbolt = exports.system = exports.software = exports.shell = exports.services = exports.processFocused = void 0;
3
+ exports.processes = exports.printer = exports.pci = exports.osInfo = exports.npu = exports.npm = exports.networkStats = exports.networkRoutes = exports.networkInterfaces = exports.networkInterfaceDefault = exports.networkGatewayDefault = exports.networkConnections = exports.mouse = exports.memLayout = exports.mem = exports.keyboard = exports.inetLatency = exports.inetSpeed = exports.inetChecksite = exports.gpu = exports.fullLoad = exports.fsStats = exports.fsSize = exports.fsOpenFiles = exports.dockerAll = exports.dockerVolumes = exports.dockerContainerProcesses = exports.dockerContainerStats = exports.dockerContainers = exports.dockerImages = exports.dockerInfo = exports.displays = exports.disksIO = exports.diskSpeed = exports.diskLayout = exports.currentLoad = exports.fans = exports.cpuTemperature = exports.cpuFlags = exports.cpuCurrentSpeed = exports.cpuCache = exports.cpu = exports.chassis = exports.camera = exports.bluetoothDevices = exports.blockDevices = exports.bios = exports.battery = exports.baseboard = exports.audio = void 0;
4
+ exports.wifiNetworks = exports.wifiInterfaces = exports.wifiConnections = exports.versions = exports.version = exports.vboxInfo = exports.uuid = exports.users = exports.usb = exports.serialPorts = exports.time = exports.thunderbolt = exports.system = exports.software = exports.shell = exports.services = exports.processFocused = exports.processLoad = void 0;
5
5
  var audio_1 = require("./audio");
6
6
  Object.defineProperty(exports, "audio", { enumerable: true, get: function () { return audio_1.audio; } });
7
7
  var baseboard_1 = require("./baseboard");
@@ -60,6 +60,8 @@ var gpu_1 = require("./gpu");
60
60
  Object.defineProperty(exports, "gpu", { enumerable: true, get: function () { return gpu_1.gpu; } });
61
61
  var inet_checksite_1 = require("../inet-checksite");
62
62
  Object.defineProperty(exports, "inetChecksite", { enumerable: true, get: function () { return inet_checksite_1.inetChecksite; } });
63
+ var inet_speed_1 = require("../inet-speed");
64
+ Object.defineProperty(exports, "inetSpeed", { enumerable: true, get: function () { return inet_speed_1.inetSpeed; } });
63
65
  var inet_latency_1 = require("./inet-latency");
64
66
  Object.defineProperty(exports, "inetLatency", { enumerable: true, get: function () { return inet_latency_1.inetLatency; } });
65
67
  var keyboard_1 = require("./keyboard");
@@ -1,2 +1,6 @@
1
1
  import type { WifiConnectionData } from '../common/types';
2
+ export declare const parseIwLinkRates: (stdout: string) => {
3
+ txRate: number | null;
4
+ rxRate: number | null;
5
+ };
2
6
  export declare const wifiConnections: () => Promise<WifiConnectionData[]>;
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.wifiConnections = void 0;
3
+ exports.wifiConnections = exports.parseIwLinkRates = void 0;
4
4
  const node_os_1 = require("node:os");
5
5
  const common_1 = require("../common");
6
6
  const const_1 = require("../common/const");
@@ -159,6 +159,22 @@ const getWifiNetworkListNmi = async () => {
159
159
  return [];
160
160
  }
161
161
  };
162
+ const parseIwLinkRates = (stdout) => {
163
+ const rate = (direction) => {
164
+ const match = stdout.match(new RegExp(`${direction} bitrate:\\s*([\\d.]+)\\s*MBit/s`, 'i'));
165
+ return match?.[1] ? parseFloat(match[1]) : null;
166
+ };
167
+ return { txRate: rate('tx'), rxRate: rate('rx') };
168
+ };
169
+ exports.parseIwLinkRates = parseIwLinkRates;
170
+ const linkRatesLinux = async (networkInterface) => {
171
+ try {
172
+ return (0, exports.parseIwLinkRates)(await (0, exec_1.execSecure)('iw', ['dev', networkInterface, 'link'], { timeout: 5000 }));
173
+ }
174
+ catch {
175
+ return { txRate: null, rxRate: null };
176
+ }
177
+ };
162
178
  const wifiConnections = async () => {
163
179
  await (0, common_1.nextTick)();
164
180
  const result = [];
@@ -175,6 +191,7 @@ const wifiConnections = async () => {
175
191
  const bssid = network?.length && network[0].bssid ? network[0].bssid : wpaDetails.bssid || null;
176
192
  const signalLevel = network && network.length && network[0].signalLevel ? network[0].signalLevel : 0;
177
193
  if (ssid && bssid) {
194
+ const rates = await linkRatesLinux(networkInterface);
178
195
  result.push({
179
196
  id: '' + interfaceDetail.id,
180
197
  networkInterface: interfaceDetail.networkInterface,
@@ -187,7 +204,8 @@ const wifiConnections = async () => {
187
204
  security: nmiConnection.security ? nmiConnection.security : wpaDetails.security || null,
188
205
  signalLevel,
189
206
  quality: (0, network_1.wifiQualityFromDB)(signalLevel),
190
- txRate: null
207
+ txRate: rates.txRate,
208
+ rxRate: rates.rxRate
191
209
  });
192
210
  }
193
211
  }
@@ -4,6 +4,7 @@ export { fullLoad } from '../cpu-full-load';
4
4
  export { networkInterfaceDefault } from '../darwin/network-interface-default';
5
5
  export { dockerAll, dockerContainerProcesses, dockerContainers, dockerContainerStats, dockerImages, dockerInfo, dockerVolumes } from '../docker';
6
6
  export { inetChecksite } from '../inet-checksite';
7
+ export { inetSpeed } from '../inet-speed';
7
8
  export { processLoad } from '../linux/process-load';
8
9
  export { processes } from '../linux/processes';
9
10
  export { npm } from '../npm';
package/dist/sun/index.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.users = exports.osInfo = exports.inetLatency = exports.vboxInfo = exports.versions = exports.version = exports.time = exports.shell = exports.npm = exports.processes = exports.processLoad = exports.inetChecksite = exports.dockerVolumes = exports.dockerInfo = exports.dockerImages = exports.dockerContainerStats = exports.dockerContainers = exports.dockerContainerProcesses = exports.dockerAll = exports.networkInterfaceDefault = exports.fullLoad = exports.cpuCurrentSpeed = exports.currentLoad = void 0;
3
+ exports.users = exports.osInfo = exports.inetLatency = exports.vboxInfo = exports.versions = exports.version = exports.time = exports.shell = exports.npm = exports.processes = exports.processLoad = exports.inetSpeed = exports.inetChecksite = exports.dockerVolumes = exports.dockerInfo = exports.dockerImages = exports.dockerContainerStats = exports.dockerContainers = exports.dockerContainerProcesses = exports.dockerAll = exports.networkInterfaceDefault = exports.fullLoad = exports.cpuCurrentSpeed = exports.currentLoad = void 0;
4
4
  var cpu_current_load_1 = require("../cpu-current-load");
5
5
  Object.defineProperty(exports, "currentLoad", { enumerable: true, get: function () { return cpu_current_load_1.currentLoad; } });
6
6
  var cpu_current_speed_1 = require("../cpu-current-speed");
@@ -19,6 +19,8 @@ Object.defineProperty(exports, "dockerInfo", { enumerable: true, get: function (
19
19
  Object.defineProperty(exports, "dockerVolumes", { enumerable: true, get: function () { return docker_1.dockerVolumes; } });
20
20
  var inet_checksite_1 = require("../inet-checksite");
21
21
  Object.defineProperty(exports, "inetChecksite", { enumerable: true, get: function () { return inet_checksite_1.inetChecksite; } });
22
+ var inet_speed_1 = require("../inet-speed");
23
+ Object.defineProperty(exports, "inetSpeed", { enumerable: true, get: function () { return inet_speed_1.inetSpeed; } });
22
24
  var process_load_1 = require("../linux/process-load");
23
25
  Object.defineProperty(exports, "processLoad", { enumerable: true, get: function () { return process_load_1.processLoad; } });
24
26
  var processes_1 = require("../linux/processes");
@@ -3,6 +3,7 @@ export { cpuCurrentSpeed } from '../cpu-current-speed';
3
3
  export { fullLoad } from '../cpu-full-load';
4
4
  export { dockerAll, dockerContainerProcesses, dockerContainers, dockerContainerStats, dockerImages, dockerInfo, dockerVolumes } from '../docker';
5
5
  export { inetChecksite } from '../inet-checksite';
6
+ export { inetSpeed } from '../inet-speed';
6
7
  export { time } from '../time';
7
8
  export { version } from '../version';
8
9
  export { versions } from '../versions';
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.osInfo = exports.npu = exports.npm = exports.networkStats = exports.networkRoutes = 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.diskSpeed = 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.serialPorts = exports.thunderbolt = exports.system = exports.software = exports.shell = exports.services = exports.processes = exports.processFocused = exports.processLoad = exports.printer = exports.pci = void 0;
3
+ exports.npu = exports.npm = exports.networkStats = exports.networkRoutes = 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.diskSpeed = 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.inetSpeed = 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.serialPorts = exports.thunderbolt = exports.system = exports.software = exports.shell = exports.services = exports.processes = exports.processFocused = exports.processLoad = exports.printer = exports.pci = exports.osInfo = 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");
@@ -18,6 +18,8 @@ Object.defineProperty(exports, "dockerInfo", { enumerable: true, get: function (
18
18
  Object.defineProperty(exports, "dockerVolumes", { enumerable: true, get: function () { return docker_1.dockerVolumes; } });
19
19
  var inet_checksite_1 = require("../inet-checksite");
20
20
  Object.defineProperty(exports, "inetChecksite", { enumerable: true, get: function () { return inet_checksite_1.inetChecksite; } });
21
+ var inet_speed_1 = require("../inet-speed");
22
+ Object.defineProperty(exports, "inetSpeed", { enumerable: true, get: function () { return inet_speed_1.inetSpeed; } });
21
23
  var time_1 = require("../time");
22
24
  Object.defineProperty(exports, "time", { enumerable: true, get: function () { return time_1.time; } });
23
25
  var version_1 = require("../version");
@@ -1,2 +1,3 @@
1
1
  import type { WifiConnectionData } from '../common/types';
2
+ export declare const rateValue: (lines: string[], label: RegExp) => number | null;
2
3
  export declare const wifiConnections: () => Promise<WifiConnectionData[]>;
@@ -1,9 +1,14 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.wifiConnections = void 0;
3
+ exports.wifiConnections = exports.rateValue = void 0;
4
4
  const common_1 = require("../common");
5
5
  const network_1 = require("../common/network");
6
6
  const windows_1 = require("../common/windows");
7
+ const rateValue = (lines, label) => {
8
+ const line = lines.find((l) => label.test(l.split(':')[0] || ''));
9
+ return (line && (0, common_1.toInt)(line.split(':').slice(1).join(':'))) || null;
10
+ };
11
+ exports.rateValue = rateValue;
7
12
  const wifiConnections = async () => {
8
13
  await (0, common_1.nextTick)();
9
14
  const result = [];
@@ -32,7 +37,8 @@ const wifiConnections = async () => {
32
37
  const type = (0, common_1.getValue)(lines, 'Radio type', ':', true) || (0, common_1.getValue)(lines, 'Type de radio', ':', true) || (0, common_1.getValue)(lines, 'Funktyp', ':', true) || null;
33
38
  const security = (0, common_1.getValue)(lines, 'authentication', ':', true) || (0, common_1.getValue)(lines, 'Authentification', ':', true) || (0, common_1.getValue)(lines, 'Authentifizierung', ':', true) || null;
34
39
  const channel = (0, common_1.toInt)((0, common_1.getValue)(lines, 'Channel', ':', true) || (0, common_1.getValue)(lines, 'Canal', ':', true) || (0, common_1.getValue)(lines, 'Kanal', ':', true)) || null;
35
- const txRate = (0, common_1.getValue)(lines, 'Transmit rate (mbps)', ':', true) || (0, common_1.getValue)(lines, 'Transmission (mbit/s)', ':', true) || (0, common_1.getValue)(lines, 'Empfangsrate (MBit/s)', ':', true) || null;
40
+ const txRate = (0, exports.rateValue)(lines, /transmit rate|^transmission|bertragungsrate/i);
41
+ const rxRate = (0, exports.rateValue)(lines, /receive rate|ception \(|empfangsrate/i);
36
42
  if (model && id && ssid && bssid) {
37
43
  result.push({
38
44
  id,
@@ -46,7 +52,8 @@ const wifiConnections = async () => {
46
52
  security,
47
53
  signalLevel,
48
54
  quality: quality ? parseInt(quality, 10) : null,
49
- txRate: (0, common_1.toInt)(txRate) || null
55
+ txRate,
56
+ rxRate
50
57
  });
51
58
  }
52
59
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "systeminformation",
3
- "version": "6.0.0-beta.25",
3
+ "version": "6.0.0-beta.26",
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)",