@push.rocks/smartnetwork 4.4.0 → 4.5.0
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/{npmextra.json → .smartconfig.json} +17 -5
- package/dist_rust/rustnetwork_linux_amd64 +0 -0
- package/dist_rust/rustnetwork_linux_arm64 +0 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/helpers/stats.js +1 -1
- package/dist_ts/index.d.ts +3 -0
- package/dist_ts/index.js +3 -1
- package/dist_ts/smartnetwork.classes.cloudflarespeed.js +32 -11
- package/dist_ts/smartnetwork.classes.ipintelligence.d.ts +101 -0
- package/dist_ts/smartnetwork.classes.ipintelligence.js +442 -0
- package/dist_ts/smartnetwork.classes.publicip.js +1 -1
- package/dist_ts/smartnetwork.classes.rustbridge.d.ts +100 -0
- package/dist_ts/smartnetwork.classes.rustbridge.js +98 -0
- package/dist_ts/smartnetwork.classes.smartnetwork.d.ts +38 -32
- package/dist_ts/smartnetwork.classes.smartnetwork.js +129 -159
- package/dist_ts/smartnetwork.plugins.d.ts +7 -10
- package/dist_ts/smartnetwork.plugins.js +9 -13
- package/package.json +19 -18
- package/readme.hints.md +60 -34
- package/readme.md +8 -0
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/helpers/stats.ts +1 -1
- package/ts/index.ts +3 -0
- package/ts/smartnetwork.classes.cloudflarespeed.ts +32 -16
- package/ts/smartnetwork.classes.ipintelligence.ts +542 -0
- package/ts/smartnetwork.classes.publicip.ts +2 -2
- package/ts/smartnetwork.classes.rustbridge.ts +181 -0
- package/ts/smartnetwork.classes.smartnetwork.ts +152 -175
- package/ts/smartnetwork.plugins.ts +8 -12
|
@@ -1,9 +1,14 @@
|
|
|
1
1
|
import * as plugins from './smartnetwork.plugins.js';
|
|
2
2
|
import { CloudflareSpeed } from './smartnetwork.classes.cloudflarespeed.js';
|
|
3
3
|
import { PublicIp } from './smartnetwork.classes.publicip.js';
|
|
4
|
+
import { IpIntelligence } from './smartnetwork.classes.ipintelligence.js';
|
|
4
5
|
import { getLogger } from './logging.js';
|
|
5
6
|
import { NetworkError } from './errors.js';
|
|
6
|
-
import
|
|
7
|
+
import { RustNetworkBridge } from './smartnetwork.classes.rustbridge.js';
|
|
8
|
+
/**
|
|
9
|
+
* SmartNetwork simplifies actions within the network.
|
|
10
|
+
* Uses a Rust binary for system-dependent operations (ping, traceroute, port scanning, gateway detection).
|
|
11
|
+
*/
|
|
7
12
|
export class SmartNetwork {
|
|
8
13
|
/** Static registry for external plugins */
|
|
9
14
|
static { this.pluginsRegistry = new Map(); }
|
|
@@ -16,12 +21,41 @@ export class SmartNetwork {
|
|
|
16
21
|
SmartNetwork.pluginsRegistry.delete(name);
|
|
17
22
|
}
|
|
18
23
|
constructor(options) {
|
|
24
|
+
this.bridgeStarted = false;
|
|
25
|
+
this.ipIntelligence = null;
|
|
19
26
|
this.options = options || {};
|
|
20
27
|
this.cache = new Map();
|
|
28
|
+
this.rustBridge = RustNetworkBridge.getInstance();
|
|
21
29
|
}
|
|
22
30
|
/**
|
|
23
|
-
*
|
|
24
|
-
*
|
|
31
|
+
* Start the Rust binary bridge. Must be called before using ping, traceroute,
|
|
32
|
+
* port scanning, or gateway operations. Safe to call multiple times.
|
|
33
|
+
*/
|
|
34
|
+
async start() {
|
|
35
|
+
if (!this.bridgeStarted) {
|
|
36
|
+
await this.rustBridge.start();
|
|
37
|
+
this.bridgeStarted = true;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
/**
|
|
41
|
+
* Stop the Rust binary bridge.
|
|
42
|
+
*/
|
|
43
|
+
async stop() {
|
|
44
|
+
if (this.bridgeStarted) {
|
|
45
|
+
await this.rustBridge.stop();
|
|
46
|
+
this.bridgeStarted = false;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
/**
|
|
50
|
+
* Ensure the Rust bridge is running before sending commands.
|
|
51
|
+
*/
|
|
52
|
+
async ensureBridge() {
|
|
53
|
+
if (!this.bridgeStarted) {
|
|
54
|
+
await this.start();
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
/**
|
|
58
|
+
* Get network speed via Cloudflare speed test (pure TS, no Rust needed).
|
|
25
59
|
*/
|
|
26
60
|
async getSpeed(opts) {
|
|
27
61
|
const cloudflareSpeedInstance = new CloudflareSpeed(opts);
|
|
@@ -31,37 +65,42 @@ export class SmartNetwork {
|
|
|
31
65
|
* Send ICMP pings to a host. Optionally specify count for multiple pings.
|
|
32
66
|
*/
|
|
33
67
|
async ping(host, opts) {
|
|
34
|
-
|
|
68
|
+
await this.ensureBridge();
|
|
69
|
+
const timeoutMs = opts?.timeout ?? 5000;
|
|
35
70
|
const count = opts?.count && opts.count > 1 ? opts.count : 1;
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
71
|
+
let result;
|
|
72
|
+
try {
|
|
73
|
+
result = await this.rustBridge.ping(host, count, timeoutMs);
|
|
74
|
+
}
|
|
75
|
+
catch {
|
|
76
|
+
// DNS resolution failure or other error — return dead ping
|
|
77
|
+
if (count === 1) {
|
|
78
|
+
return { alive: false, time: NaN };
|
|
79
|
+
}
|
|
40
80
|
return {
|
|
41
|
-
|
|
42
|
-
|
|
81
|
+
host,
|
|
82
|
+
count,
|
|
83
|
+
times: Array(count).fill(NaN),
|
|
84
|
+
min: NaN,
|
|
85
|
+
max: NaN,
|
|
86
|
+
avg: NaN,
|
|
87
|
+
stddev: NaN,
|
|
88
|
+
packetLoss: 100,
|
|
89
|
+
alive: false,
|
|
43
90
|
};
|
|
44
91
|
}
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
times.push(NaN);
|
|
57
|
-
}
|
|
92
|
+
// Map times: replace null with NaN for backward compatibility
|
|
93
|
+
const times = result.times.map((t) => (t === null ? NaN : t));
|
|
94
|
+
const min = result.min === null ? NaN : result.min;
|
|
95
|
+
const max = result.max === null ? NaN : result.max;
|
|
96
|
+
const avg = result.avg === null ? NaN : result.avg;
|
|
97
|
+
const stddev = result.stddev === null ? NaN : result.stddev;
|
|
98
|
+
if (count === 1) {
|
|
99
|
+
return {
|
|
100
|
+
alive: result.alive,
|
|
101
|
+
time: times[0] ?? NaN,
|
|
102
|
+
};
|
|
58
103
|
}
|
|
59
|
-
const valid = times.filter((t) => !isNaN(t));
|
|
60
|
-
const min = valid.length ? Math.min(...valid) : NaN;
|
|
61
|
-
const max = valid.length ? Math.max(...valid) : NaN;
|
|
62
|
-
const avg = valid.length ? stats.average(valid) : NaN;
|
|
63
|
-
const stddev = valid.length ? Math.sqrt(stats.average(valid.map((v) => (v - avg) ** 2))) : NaN;
|
|
64
|
-
const packetLoss = ((count - aliveCount) / count) * 100;
|
|
65
104
|
return {
|
|
66
105
|
host,
|
|
67
106
|
count,
|
|
@@ -70,59 +109,20 @@ export class SmartNetwork {
|
|
|
70
109
|
max,
|
|
71
110
|
avg,
|
|
72
111
|
stddev,
|
|
73
|
-
packetLoss,
|
|
74
|
-
alive:
|
|
112
|
+
packetLoss: result.packetLoss,
|
|
113
|
+
alive: result.alive,
|
|
75
114
|
};
|
|
76
115
|
}
|
|
77
|
-
/**
|
|
78
|
-
* returns a promise with a boolean answer
|
|
79
|
-
* note: false also resolves with false as argument
|
|
80
|
-
* @param port
|
|
81
|
-
*/
|
|
82
116
|
/**
|
|
83
117
|
* Check if a local port is unused (both IPv4 and IPv6)
|
|
84
118
|
*/
|
|
85
119
|
async isLocalPortUnused(port) {
|
|
86
|
-
|
|
87
|
-
const
|
|
88
|
-
|
|
89
|
-
// test IPv4 space
|
|
90
|
-
const ipv4Test = net.createServer();
|
|
91
|
-
ipv4Test.once('error', () => {
|
|
92
|
-
doneIpV4.resolve(false);
|
|
93
|
-
});
|
|
94
|
-
ipv4Test.once('listening', () => {
|
|
95
|
-
ipv4Test.once('close', () => {
|
|
96
|
-
doneIpV4.resolve(true);
|
|
97
|
-
});
|
|
98
|
-
ipv4Test.close();
|
|
99
|
-
});
|
|
100
|
-
ipv4Test.listen(port, '0.0.0.0');
|
|
101
|
-
await doneIpV4.promise;
|
|
102
|
-
// test IPv6 space
|
|
103
|
-
const ipv6Test = net.createServer();
|
|
104
|
-
ipv6Test.once('error', () => {
|
|
105
|
-
doneIpV6.resolve(false);
|
|
106
|
-
});
|
|
107
|
-
ipv6Test.once('listening', () => {
|
|
108
|
-
ipv6Test.once('close', () => {
|
|
109
|
-
doneIpV6.resolve(true);
|
|
110
|
-
});
|
|
111
|
-
ipv6Test.close();
|
|
112
|
-
});
|
|
113
|
-
ipv6Test.listen(port, '::');
|
|
114
|
-
// lets wait for the result
|
|
115
|
-
const resultIpV4 = await doneIpV4.promise;
|
|
116
|
-
const resultIpV6 = await doneIpV6.promise;
|
|
117
|
-
const result = resultIpV4 === true && resultIpV6 === true;
|
|
118
|
-
return result;
|
|
120
|
+
await this.ensureBridge();
|
|
121
|
+
const result = await this.rustBridge.isLocalPortFree(port);
|
|
122
|
+
return result.free;
|
|
119
123
|
}
|
|
120
124
|
/**
|
|
121
125
|
* Find the first available port within a given range
|
|
122
|
-
* @param startPort The start of the port range (inclusive)
|
|
123
|
-
* @param endPort The end of the port range (inclusive)
|
|
124
|
-
* @param options Optional configuration for port selection behavior
|
|
125
|
-
* @returns The first available port number (or random if options.randomize is true), or null if no ports are available
|
|
126
126
|
*/
|
|
127
127
|
async findFreePort(startPort, endPort, options) {
|
|
128
128
|
// Validate port range
|
|
@@ -132,59 +132,37 @@ export class SmartNetwork {
|
|
|
132
132
|
if (startPort > endPort) {
|
|
133
133
|
throw new NetworkError('Start port must be less than or equal to end port', 'EINVAL');
|
|
134
134
|
}
|
|
135
|
-
// Create a set of excluded ports for efficient lookup
|
|
136
135
|
const excludedPorts = new Set(options?.exclude || []);
|
|
137
|
-
// If randomize option is true, collect all available ports and select randomly
|
|
138
136
|
if (options?.randomize) {
|
|
139
137
|
const availablePorts = [];
|
|
140
|
-
// Scan the range to find all available ports
|
|
141
138
|
for (let port = startPort; port <= endPort; port++) {
|
|
142
|
-
|
|
143
|
-
if (excludedPorts.has(port)) {
|
|
139
|
+
if (excludedPorts.has(port))
|
|
144
140
|
continue;
|
|
145
|
-
}
|
|
146
141
|
const isUnused = await this.isLocalPortUnused(port);
|
|
147
142
|
if (isUnused) {
|
|
148
143
|
availablePorts.push(port);
|
|
149
144
|
}
|
|
150
145
|
}
|
|
151
|
-
// If there are available ports, select one randomly
|
|
152
146
|
if (availablePorts.length > 0) {
|
|
153
147
|
const randomIndex = Math.floor(Math.random() * availablePorts.length);
|
|
154
148
|
return availablePorts[randomIndex];
|
|
155
149
|
}
|
|
156
|
-
// No free port found in the range
|
|
157
150
|
return null;
|
|
158
151
|
}
|
|
159
152
|
else {
|
|
160
|
-
// Default behavior: return the first available port (sequential search)
|
|
161
153
|
for (let port = startPort; port <= endPort; port++) {
|
|
162
|
-
|
|
163
|
-
if (excludedPorts.has(port)) {
|
|
154
|
+
if (excludedPorts.has(port))
|
|
164
155
|
continue;
|
|
165
|
-
}
|
|
166
156
|
const isUnused = await this.isLocalPortUnused(port);
|
|
167
157
|
if (isUnused) {
|
|
168
158
|
return port;
|
|
169
159
|
}
|
|
170
160
|
}
|
|
171
|
-
// No free port found in the range
|
|
172
161
|
return null;
|
|
173
162
|
}
|
|
174
163
|
}
|
|
175
|
-
/**
|
|
176
|
-
* checks wether a remote port is available
|
|
177
|
-
* @param domainArg
|
|
178
|
-
*/
|
|
179
|
-
/**
|
|
180
|
-
* Check if a remote port is available
|
|
181
|
-
* @param target host or "host:port"
|
|
182
|
-
* @param opts options including port, protocol (only tcp), retries and timeout
|
|
183
|
-
*/
|
|
184
164
|
/**
|
|
185
165
|
* Check if a remote port is available
|
|
186
|
-
* @param target host or "host:port"
|
|
187
|
-
* @param portOrOpts either a port number (deprecated) or options object
|
|
188
166
|
*/
|
|
189
167
|
async isRemotePortAvailable(target, portOrOpts) {
|
|
190
168
|
let hostPart;
|
|
@@ -192,7 +170,6 @@ export class SmartNetwork {
|
|
|
192
170
|
let protocol = 'tcp';
|
|
193
171
|
let retries = 1;
|
|
194
172
|
let timeout;
|
|
195
|
-
// preserve old signature (target, port)
|
|
196
173
|
if (typeof portOrOpts === 'number') {
|
|
197
174
|
[hostPart] = target.split(':');
|
|
198
175
|
port = portOrOpts;
|
|
@@ -212,21 +189,24 @@ export class SmartNetwork {
|
|
|
212
189
|
if (!port) {
|
|
213
190
|
throw new NetworkError('Port not specified', 'EINVAL');
|
|
214
191
|
}
|
|
192
|
+
await this.ensureBridge();
|
|
215
193
|
let last = false;
|
|
216
194
|
for (let attempt = 0; attempt < retries; attempt++) {
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
195
|
+
try {
|
|
196
|
+
const result = await this.rustBridge.tcpPortCheck(hostPart, port, timeout);
|
|
197
|
+
last = result.isOpen;
|
|
198
|
+
if (last)
|
|
199
|
+
return true;
|
|
200
|
+
}
|
|
201
|
+
catch {
|
|
202
|
+
// DNS resolution failure or connection error — treat as not available
|
|
203
|
+
last = false;
|
|
204
|
+
}
|
|
225
205
|
}
|
|
226
206
|
return last;
|
|
227
207
|
}
|
|
228
208
|
/**
|
|
229
|
-
* List network interfaces (gateways)
|
|
209
|
+
* List network interfaces (gateways) — pure TS, no Rust needed.
|
|
230
210
|
*/
|
|
231
211
|
async getGateways() {
|
|
232
212
|
const fetcher = async () => plugins.os.networkInterfaces();
|
|
@@ -235,21 +215,31 @@ export class SmartNetwork {
|
|
|
235
215
|
}
|
|
236
216
|
return fetcher();
|
|
237
217
|
}
|
|
218
|
+
/**
|
|
219
|
+
* Get the default gateway interface and its addresses.
|
|
220
|
+
*/
|
|
238
221
|
async getDefaultGateway() {
|
|
239
|
-
|
|
240
|
-
|
|
222
|
+
await this.ensureBridge();
|
|
223
|
+
const result = await this.rustBridge.defaultGateway();
|
|
224
|
+
const interfaceName = result.interfaceName;
|
|
225
|
+
if (!interfaceName) {
|
|
241
226
|
getLogger().warn?.('Cannot determine default gateway');
|
|
242
227
|
return null;
|
|
243
228
|
}
|
|
229
|
+
// Use os.networkInterfaces() to get rich interface info
|
|
244
230
|
const gateways = await this.getGateways();
|
|
245
|
-
const defaultGateway = gateways[
|
|
231
|
+
const defaultGateway = gateways[interfaceName];
|
|
232
|
+
if (!defaultGateway) {
|
|
233
|
+
getLogger().warn?.(`Interface ${interfaceName} not found in os.networkInterfaces()`);
|
|
234
|
+
return null;
|
|
235
|
+
}
|
|
246
236
|
return {
|
|
247
237
|
ipv4: defaultGateway[0],
|
|
248
238
|
ipv6: defaultGateway[1],
|
|
249
239
|
};
|
|
250
240
|
}
|
|
251
241
|
/**
|
|
252
|
-
* Lookup public IPv4 and IPv6
|
|
242
|
+
* Lookup public IPv4 and IPv6 — pure TS, no Rust needed.
|
|
253
243
|
*/
|
|
254
244
|
async getPublicIps() {
|
|
255
245
|
const fetcher = async () => {
|
|
@@ -262,12 +252,12 @@ export class SmartNetwork {
|
|
|
262
252
|
return fetcher();
|
|
263
253
|
}
|
|
264
254
|
/**
|
|
265
|
-
* Resolve DNS records (A, AAAA, MX)
|
|
255
|
+
* Resolve DNS records (A, AAAA, MX) — uses smartdns, no Rust needed.
|
|
266
256
|
*/
|
|
267
257
|
async resolveDns(host) {
|
|
268
258
|
try {
|
|
269
259
|
const dnsClient = new plugins.smartdns.dnsClientMod.Smartdns({
|
|
270
|
-
strategy: 'prefer-system',
|
|
260
|
+
strategy: 'prefer-system',
|
|
271
261
|
allowDohFallback: true,
|
|
272
262
|
});
|
|
273
263
|
const [aRecords, aaaaRecords, mxRecords] = await Promise.all([
|
|
@@ -275,10 +265,8 @@ export class SmartNetwork {
|
|
|
275
265
|
dnsClient.getRecordsAAAA(host).catch(() => []),
|
|
276
266
|
dnsClient.getRecords(host, 'MX').catch(() => []),
|
|
277
267
|
]);
|
|
278
|
-
// Extract values from the record objects
|
|
279
268
|
const A = aRecords.map((record) => record.value);
|
|
280
269
|
const AAAA = aaaaRecords.map((record) => record.value);
|
|
281
|
-
// Parse MX records - the value contains "priority exchange"
|
|
282
270
|
const MX = mxRecords.map((record) => {
|
|
283
271
|
const parts = record.value.split(' ');
|
|
284
272
|
return {
|
|
@@ -293,15 +281,15 @@ export class SmartNetwork {
|
|
|
293
281
|
}
|
|
294
282
|
}
|
|
295
283
|
/**
|
|
296
|
-
* Perform a simple HTTP/HTTPS endpoint health check
|
|
284
|
+
* Perform a simple HTTP/HTTPS endpoint health check — pure TS.
|
|
297
285
|
*/
|
|
298
286
|
async checkEndpoint(urlString, opts) {
|
|
299
287
|
const start = plugins.perfHooks.performance.now();
|
|
300
288
|
try {
|
|
301
289
|
const url = new URL(urlString);
|
|
302
|
-
const lib = url.protocol === 'https:' ? plugins.https : await import('http');
|
|
290
|
+
const lib = url.protocol === 'https:' ? plugins.https : await import('node:http');
|
|
303
291
|
return new Promise((resolve, reject) => {
|
|
304
|
-
const req = lib.request(url, { method: 'GET', timeout: opts?.timeout, agent: false }, (res) => {
|
|
292
|
+
const req = lib.request(url, { method: 'GET', timeout: opts?.timeout, agent: false, rejectUnauthorized: opts?.rejectUnauthorized ?? true }, (res) => {
|
|
305
293
|
res.on('data', () => { });
|
|
306
294
|
res.once('end', () => {
|
|
307
295
|
const rtt = plugins.perfHooks.performance.now() - start;
|
|
@@ -321,51 +309,33 @@ export class SmartNetwork {
|
|
|
321
309
|
}
|
|
322
310
|
}
|
|
323
311
|
/**
|
|
324
|
-
* Perform a traceroute: hop-by-hop latency using the
|
|
325
|
-
* Falls back to a single-hop stub if traceroute is unavailable or errors.
|
|
312
|
+
* Perform a traceroute: hop-by-hop latency using the Rust binary.
|
|
326
313
|
*/
|
|
327
314
|
async traceroute(host, opts) {
|
|
315
|
+
await this.ensureBridge();
|
|
328
316
|
const maxHops = opts?.maxHops ?? 30;
|
|
329
|
-
const
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
const parts = line.split(/\s+/);
|
|
346
|
-
const ttl = parseInt(parts[0], 10);
|
|
347
|
-
let ip;
|
|
348
|
-
let rtt;
|
|
349
|
-
if (parts[1] === '*' || !parts[1]) {
|
|
350
|
-
ip = parts[1] || '';
|
|
351
|
-
rtt = null;
|
|
352
|
-
}
|
|
353
|
-
else {
|
|
354
|
-
ip = parts[1];
|
|
355
|
-
const timePart = parts.find((p, i) => i >= 2 && /^\d+(\.\d+)?$/.test(p));
|
|
356
|
-
rtt = timePart ? parseFloat(timePart) : null;
|
|
357
|
-
}
|
|
358
|
-
hops.push({ ttl, ip, rtt });
|
|
359
|
-
}
|
|
360
|
-
if (hops.length) {
|
|
361
|
-
return hops;
|
|
362
|
-
}
|
|
317
|
+
const timeoutMs = opts?.timeout ?? 5000;
|
|
318
|
+
const result = await this.rustBridge.traceroute(host, maxHops, timeoutMs);
|
|
319
|
+
return result.hops.map((h) => ({
|
|
320
|
+
ttl: h.ttl,
|
|
321
|
+
ip: h.ip || '*',
|
|
322
|
+
rtt: h.rtt,
|
|
323
|
+
}));
|
|
324
|
+
}
|
|
325
|
+
/**
|
|
326
|
+
* Get IP intelligence: ASN, organization, geolocation, and RDAP registration data.
|
|
327
|
+
* Combines RDAP (RIRs), Team Cymru DNS, and MaxMind GeoLite2 — all run in parallel.
|
|
328
|
+
* Pure TS, no Rust needed.
|
|
329
|
+
*/
|
|
330
|
+
async getIpIntelligence(ip) {
|
|
331
|
+
if (!this.ipIntelligence) {
|
|
332
|
+
this.ipIntelligence = new IpIntelligence();
|
|
363
333
|
}
|
|
364
|
-
|
|
365
|
-
|
|
334
|
+
const fetcher = () => this.ipIntelligence.getIntelligence(ip);
|
|
335
|
+
if (this.options.cacheTtl && this.options.cacheTtl > 0) {
|
|
336
|
+
return this.getCached(`ipIntelligence:${ip}`, fetcher);
|
|
366
337
|
}
|
|
367
|
-
|
|
368
|
-
return [{ ttl: 1, ip: host, rtt: null }];
|
|
338
|
+
return fetcher();
|
|
369
339
|
}
|
|
370
340
|
/**
|
|
371
341
|
* Internal caching helper
|
|
@@ -382,4 +352,4 @@ export class SmartNetwork {
|
|
|
382
352
|
return value;
|
|
383
353
|
}
|
|
384
354
|
}
|
|
385
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartnetwork.classes.smartnetwork.js","sourceRoot":"","sources":["../ts/smartnetwork.classes.smartnetwork.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAC5E,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,KAAK,MAAM,oBAAoB,CAAC;AAgC5C,MAAM,OAAO,YAAY;IACvB,2CAA2C;aAC7B,oBAAe,GAAqB,IAAI,GAAG,EAAE,CAAC;IAC5D,gCAAgC;IACzB,MAAM,CAAC,cAAc,CAAC,IAAY,EAAE,IAAS;QAClD,YAAY,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC/C,CAAC;IACD,kCAAkC;IAC3B,MAAM,CAAC,gBAAgB,CAAC,IAAY;QACzC,YAAY,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC;IAGD,YAAY,OAA6B;QACvC,IAAI,CAAC,OAAO,GAAG,OAAO,IAAI,EAAE,CAAC;QAC7B,IAAI,CAAC,KAAK,GAAG,IAAI,GAAG,EAAE,CAAC;IACzB,CAAC;IACD;;;OAGG;IACI,KAAK,CAAC,QAAQ,CAAC,IAAsD;QAC1E,MAAM,uBAAuB,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC;QAC1D,OAAO,uBAAuB,CAAC,SAAS,EAAE,CAAC;IAC7C,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,IAAI,CAAC,IAAY,EAAE,IAA2C;QACzE,MAAM,OAAO,GAAG,IAAI,EAAE,OAAO,IAAI,GAAG,CAAC;QACrC,MAAM,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7D,MAAM,MAAM,GAAG,IAAI,OAAO,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;QACjD,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;YAChB,wCAAwC;YACxC,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC7C,OAAO;gBACL,GAAG,GAAG;gBACN,IAAI,EAAE,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG;aACpD,CAAC;QACJ,CAAC;QACD,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;YAC/B,IAAI,CAAC;gBACH,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBAC7C,MAAM,CAAC,GAAG,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;gBACxD,IAAI,GAAG,CAAC,KAAK;oBAAE,UAAU,EAAE,CAAC;gBAC5B,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAChB,CAAC;YAAC,MAAM,CAAC;gBACP,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAClB,CAAC;QACH,CAAC;QACD,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QACpD,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QACpD,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QACtD,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QAC/F,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,GAAG,UAAU,CAAC,GAAG,KAAK,CAAC,GAAG,GAAG,CAAC;QACxD,OAAO;YACL,IAAI;YACJ,KAAK;YACL,KAAK;YACL,GAAG;YACH,GAAG;YACH,GAAG;YACH,MAAM;YACN,UAAU;YACV,KAAK,EAAE,UAAU,GAAG,CAAC;SACtB,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH;;OAEG;IACI,KAAK,CAAC,iBAAiB,CAAC,IAAY;QACzC,MAAM,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,KAAK,EAAW,CAAC;QACvD,MAAM,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,KAAK,EAAW,CAAC;QACvD,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,6DAA6D;QAE9F,kBAAkB;QAClB,MAAM,QAAQ,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC;QACpC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;YAC1B,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;QACH,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE;YAC9B,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;gBAC1B,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACzB,CAAC,CAAC,CAAC;YACH,QAAQ,CAAC,KAAK,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;QACH,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAEjC,MAAM,QAAQ,CAAC,OAAO,CAAC;QAEvB,kBAAkB;QAClB,MAAM,QAAQ,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC;QACpC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;YAC1B,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;QACH,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE;YAC9B,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;gBAC1B,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACzB,CAAC,CAAC,CAAC;YACH,QAAQ,CAAC,KAAK,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;QACH,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAE5B,2BAA2B;QAC3B,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC;QAC1C,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC;QAC1C,MAAM,MAAM,GAAG,UAAU,KAAK,IAAI,IAAI,UAAU,KAAK,IAAI,CAAC;QAC1D,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,YAAY,CAAC,SAAiB,EAAE,OAAe,EAAE,OAA8B;QAC1F,sBAAsB;QACtB,IAAI,SAAS,GAAG,CAAC,IAAI,SAAS,GAAG,KAAK,IAAI,OAAO,GAAG,CAAC,IAAI,OAAO,GAAG,KAAK,EAAE,CAAC;YACzE,MAAM,IAAI,YAAY,CAAC,0CAA0C,EAAE,QAAQ,CAAC,CAAC;QAC/E,CAAC;QACD,IAAI,SAAS,GAAG,OAAO,EAAE,CAAC;YACxB,MAAM,IAAI,YAAY,CAAC,mDAAmD,EAAE,QAAQ,CAAC,CAAC;QACxF,CAAC;QAED,sDAAsD;QACtD,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,OAAO,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC;QAEtD,+EAA+E;QAC/E,IAAI,OAAO,EAAE,SAAS,EAAE,CAAC;YACvB,MAAM,cAAc,GAAa,EAAE,CAAC;YAEpC,6CAA6C;YAC7C,KAAK,IAAI,IAAI,GAAG,SAAS,EAAE,IAAI,IAAI,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC;gBACnD,sBAAsB;gBACtB,IAAI,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC5B,SAAS;gBACX,CAAC;gBAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;gBACpD,IAAI,QAAQ,EAAE,CAAC;oBACb,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC5B,CAAC;YACH,CAAC;YAED,oDAAoD;YACpD,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC9B,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;gBACtE,OAAO,cAAc,CAAC,WAAW,CAAC,CAAC;YACrC,CAAC;YAED,kCAAkC;YAClC,OAAO,IAAI,CAAC;QACd,CAAC;aAAM,CAAC;YACN,wEAAwE;YACxE,KAAK,IAAI,IAAI,GAAG,SAAS,EAAE,IAAI,IAAI,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC;gBACnD,sBAAsB;gBACtB,IAAI,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC5B,SAAS;gBACX,CAAC;gBAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;gBACpD,IAAI,QAAQ,EAAE,CAAC;oBACb,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;YAED,kCAAkC;YAClC,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED;;;OAGG;IACH;;;;OAIG;IACH;;;;OAIG;IACI,KAAK,CAAC,qBAAqB,CAChC,MAAc,EACd,UAEmF;QAEnF,IAAI,QAAgB,CAAC;QACrB,IAAI,IAAwB,CAAC;QAC7B,IAAI,QAAQ,GAAW,KAAK,CAAC;QAC7B,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,IAAI,OAA2B,CAAC;QAChC,wCAAwC;QACxC,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;YACnC,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC/B,IAAI,GAAG,UAAU,CAAC;QACpB,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,GAAG,UAAU,IAAI,EAAE,CAAC;YAC9B,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,KAAK,CAAC;YAClC,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC;YAC5B,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;YACvB,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC/B,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YACtC,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QACtE,CAAC;QACD,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;YACvB,MAAM,IAAI,YAAY,CAAC,8BAA8B,EAAE,SAAS,CAAC,CAAC;QACpE,CAAC;QACD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,YAAY,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAC;QACzD,CAAC;QACD,IAAI,IAAI,GAAY,KAAK,CAAC;QAC1B,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC;YACnD,MAAM,IAAI,GAAG,OAAO,CAAC,YAAY,CAAC,KAAK,EAAW,CAAC;YACnD,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,QAA6C,EAAE,EAAE;gBAC/E,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACvC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;YACtC,CAAC,CAAC,CAAC;YACH,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC;YAC1B,IAAI,IAAI;gBAAE,OAAO,IAAI,CAAC;QACxB,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,WAAW;QACtB,MAAM,OAAO,GAAG,KAAK,IAAI,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,iBAAiB,EAAE,CAAC;QAC3D,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,GAAG,CAAC,EAAE,CAAC;YACvD,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAC7C,CAAC;QACD,OAAO,OAAO,EAAE,CAAC;IACnB,CAAC;IAEM,KAAK,CAAC,iBAAiB;QAI5B,MAAM,kBAAkB,GAAG,MAAM,OAAO,CAAC,iBAAiB,CAAC,uBAAuB,EAAE,CAAC;QACrF,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACxB,SAAS,EAAE,CAAC,IAAI,EAAE,CAAC,kCAAkC,CAAC,CAAC;YACvD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,MAAM,cAAc,GAAG,QAAQ,CAAC,kBAAkB,CAAC,CAAC;QACpD,OAAO;YACL,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;YACvB,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;SACxB,CAAC;IACJ,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,YAAY;QACvB,MAAM,OAAO,GAAG,KAAK,IAAI,EAAE;YACzB,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YACjD,OAAO,QAAQ,CAAC,YAAY,EAAE,CAAC;QACjC,CAAC,CAAC;QACF,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,GAAG,CAAC,EAAE,CAAC;YACvD,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAC9C,CAAC;QACD,OAAO,OAAO,EAAE,CAAC;IACnB,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,UAAU,CACrB,IAAY;QAEZ,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC;gBAC3D,QAAQ,EAAE,eAAe,EAAG,iEAAiE;gBAC7F,gBAAgB,EAAE,IAAI;aACvB,CAAC,CAAC;YAEH,MAAM,CAAC,QAAQ,EAAE,WAAW,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBAC3D,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAU,EAAE,CAAC,EAAE,CAAC;gBAClD,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAU,EAAE,CAAC,EAAE,CAAC;gBACrD,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,GAAU,EAAE,CAAC,EAAE,CAAC;aACxD,CAAC,CAAC;YAEH,yCAAyC;YACzC,MAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAW,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACtD,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,MAAW,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAE5D,4DAA4D;YAC5D,MAAM,EAAE,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,MAAW,EAAE,EAAE;gBACvC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACtC,OAAO;oBACL,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;oBAChC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE;iBACzB,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;QACzB,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,MAAM,IAAI,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,aAAa,CACxB,SAAiB,EACjB,IAA2B;QAE3B,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC;QAClD,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;YAC/B,MAAM,GAAG,GAAG,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC;YAC7E,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACrC,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CACrB,GAAG,EACH,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EACvD,CAAC,GAAQ,EAAE,EAAE;oBACX,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;oBACzB,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE;wBACnB,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;wBACxD,MAAM,OAAO,GAA2B,EAAE,CAAC;wBAC3C,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;4BACjD,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;wBAC1D,CAAC;wBACD,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,UAAU,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;oBACpD,CAAC,CAAC,CAAC;gBACL,CAAC,CACF,CAAC;gBACF,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAC/E,GAAG,CAAC,GAAG,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,MAAM,IAAI,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,UAAU,CACrB,IAAY,EACZ,IAA6C;QAE7C,MAAM,OAAO,GAAG,IAAI,EAAE,OAAO,IAAI,EAAE,CAAC;QACpC,MAAM,OAAO,GAAG,IAAI,EAAE,OAAO,CAAC;QAC9B,IAAI,CAAC;YACH,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,CAAC;YAC/C,MAAM,GAAG,GAAG,oBAAoB,OAAO,IAAI,IAAI,EAAE,CAAC;YAClD,MAAM,MAAM,GAAW,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC3D,IAAI,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;oBACvD,IAAI,GAAG;wBAAE,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;oBAC5B,OAAO,CAAC,MAAM,CAAC,CAAC;gBAClB,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YACH,MAAM,IAAI,GAAU,EAAE,CAAC;YACvB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;gBACrC,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;gBACxB,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC;oBAAE,SAAS;gBACrD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAChC,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACnC,IAAI,EAAU,CAAC;gBACf,IAAI,GAAkB,CAAC;gBACvB,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;oBAClC,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;oBACpB,GAAG,GAAG,IAAI,CAAC;gBACb,CAAC;qBAAM,CAAC;oBACN,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;oBACd,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;oBACzE,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;gBAC/C,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;YAC9B,CAAC;YACD,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBAChB,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,0DAA0D;QAC5D,CAAC;QACD,gBAAgB;QAChB,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3C,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,SAAS,CAAI,GAAW,EAAE,OAAyB;QAC/D,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;YAChC,OAAO,KAAK,CAAC,KAAK,CAAC;QACrB,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,OAAO,EAAE,CAAC;QAC9B,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,GAAG,GAAG,EAAE,CAAC,CAAC;QAClD,OAAO,KAAK,CAAC;IACf,CAAC"}
|
|
355
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartnetwork.classes.smartnetwork.js","sourceRoot":"","sources":["../ts/smartnetwork.classes.smartnetwork.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,9 @@
|
|
|
1
|
-
import * as os from 'os';
|
|
2
|
-
import * as https from 'https';
|
|
3
|
-
import * as perfHooks from 'perf_hooks';
|
|
1
|
+
import * as os from 'node:os';
|
|
2
|
+
import * as https from 'node:https';
|
|
3
|
+
import * as perfHooks from 'node:perf_hooks';
|
|
4
4
|
export { os, https, perfHooks };
|
|
5
5
|
import * as smartdns from '@push.rocks/smartdns';
|
|
6
|
-
import * as
|
|
7
|
-
|
|
8
|
-
import * as
|
|
9
|
-
export {
|
|
10
|
-
import isopen from 'isopen';
|
|
11
|
-
import * as systeminformation from 'systeminformation';
|
|
12
|
-
export { isopen, systeminformation };
|
|
6
|
+
import * as smartrust from '@push.rocks/smartrust';
|
|
7
|
+
export { smartdns, smartrust };
|
|
8
|
+
import * as maxmind from 'maxmind';
|
|
9
|
+
export { maxmind };
|
|
@@ -1,17 +1,13 @@
|
|
|
1
1
|
// native scope
|
|
2
|
-
import * as os from 'os';
|
|
3
|
-
import * as https from 'https';
|
|
4
|
-
import * as perfHooks from 'perf_hooks';
|
|
2
|
+
import * as os from 'node:os';
|
|
3
|
+
import * as https from 'node:https';
|
|
4
|
+
import * as perfHooks from 'node:perf_hooks';
|
|
5
5
|
export { os, https, perfHooks };
|
|
6
6
|
// @pushrocks scope
|
|
7
7
|
import * as smartdns from '@push.rocks/smartdns';
|
|
8
|
-
import * as
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
import isopen from 'isopen';
|
|
15
|
-
import * as systeminformation from 'systeminformation';
|
|
16
|
-
export { isopen, systeminformation };
|
|
17
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRuZXR3b3JrLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydG5ldHdvcmsucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxlQUFlO0FBQ2YsT0FBTyxLQUFLLEVBQUUsTUFBTSxJQUFJLENBQUM7QUFDekIsT0FBTyxLQUFLLEtBQUssTUFBTSxPQUFPLENBQUM7QUFDL0IsT0FBTyxLQUFLLFNBQVMsTUFBTSxZQUFZLENBQUM7QUFFeEMsT0FBTyxFQUFFLEVBQUUsRUFBRSxLQUFLLEVBQUUsU0FBUyxFQUFFLENBQUM7QUFFaEMsbUJBQW1CO0FBQ25CLE9BQU8sS0FBSyxRQUFRLE1BQU0sc0JBQXNCLENBQUM7QUFDakQsT0FBTyxLQUFLLFNBQVMsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRCxPQUFPLEtBQUssWUFBWSxNQUFNLDBCQUEwQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxXQUFXLE1BQU0seUJBQXlCLENBQUM7QUFFdkQsT0FBTyxFQUFFLFFBQVEsRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLFdBQVcsRUFBRSxDQUFDO0FBRTFELHFCQUFxQjtBQUNyQixhQUFhO0FBQ2IsT0FBTyxNQUFNLE1BQU0sUUFBUSxDQUFDO0FBQzVCLE9BQU8sS0FBSyxpQkFBaUIsTUFBTSxtQkFBbUIsQ0FBQztBQUV2RCxPQUFPLEVBQUUsTUFBTSxFQUFFLGlCQUFpQixFQUFFLENBQUMifQ==
|
|
8
|
+
import * as smartrust from '@push.rocks/smartrust';
|
|
9
|
+
export { smartdns, smartrust };
|
|
10
|
+
// third party
|
|
11
|
+
import * as maxmind from 'maxmind';
|
|
12
|
+
export { maxmind };
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRuZXR3b3JrLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydG5ldHdvcmsucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxlQUFlO0FBQ2YsT0FBTyxLQUFLLEVBQUUsTUFBTSxTQUFTLENBQUM7QUFDOUIsT0FBTyxLQUFLLEtBQUssTUFBTSxZQUFZLENBQUM7QUFDcEMsT0FBTyxLQUFLLFNBQVMsTUFBTSxpQkFBaUIsQ0FBQztBQUU3QyxPQUFPLEVBQUUsRUFBRSxFQUFFLEtBQUssRUFBRSxTQUFTLEVBQUUsQ0FBQztBQUVoQyxtQkFBbUI7QUFDbkIsT0FBTyxLQUFLLFFBQVEsTUFBTSxzQkFBc0IsQ0FBQztBQUNqRCxPQUFPLEtBQUssU0FBUyxNQUFNLHVCQUF1QixDQUFDO0FBRW5ELE9BQU8sRUFBRSxRQUFRLEVBQUUsU0FBUyxFQUFFLENBQUM7QUFFL0IsY0FBYztBQUNkLE9BQU8sS0FBSyxPQUFPLE1BQU0sU0FBUyxDQUFDO0FBRW5DLE9BQU8sRUFBRSxPQUFPLEVBQUUsQ0FBQyJ9
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartnetwork",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.5.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "A toolkit for network diagnostics including speed tests, port availability checks, and more.",
|
|
6
6
|
"exports": {
|
|
@@ -9,20 +9,22 @@
|
|
|
9
9
|
"type": "module",
|
|
10
10
|
"author": "Lossless GmbH",
|
|
11
11
|
"license": "MIT",
|
|
12
|
+
"scripts": {
|
|
13
|
+
"test": "(tstest test/ --verbose)",
|
|
14
|
+
"build": "(tsbuild tsfolders --allowimplicitany) && (tsrust)",
|
|
15
|
+
"buildDocs": "tsdoc"
|
|
16
|
+
},
|
|
12
17
|
"devDependencies": {
|
|
13
|
-
"@git.zone/tsbuild": "^
|
|
14
|
-
"@git.zone/tsrun": "^
|
|
15
|
-
"@git.zone/
|
|
16
|
-
"@
|
|
17
|
-
"@types/node": "^
|
|
18
|
+
"@git.zone/tsbuild": "^4.4.0",
|
|
19
|
+
"@git.zone/tsrun": "^2.0.2",
|
|
20
|
+
"@git.zone/tsrust": "^1.3.2",
|
|
21
|
+
"@git.zone/tstest": "^3.6.1",
|
|
22
|
+
"@types/node": "^25.5.0"
|
|
18
23
|
},
|
|
19
24
|
"dependencies": {
|
|
20
|
-
"@push.rocks/smartdns": "^7.
|
|
21
|
-
"@push.rocks/
|
|
22
|
-
"
|
|
23
|
-
"@push.rocks/smartstring": "^4.0.2",
|
|
24
|
-
"isopen": "^1.3.0",
|
|
25
|
-
"systeminformation": "^5.27.8"
|
|
25
|
+
"@push.rocks/smartdns": "^7.9.0",
|
|
26
|
+
"@push.rocks/smartrust": "^1.3.2",
|
|
27
|
+
"maxmind": "^5.0.5"
|
|
26
28
|
},
|
|
27
29
|
"files": [
|
|
28
30
|
"ts/**/*",
|
|
@@ -33,7 +35,7 @@
|
|
|
33
35
|
"dist_ts_web/**/*",
|
|
34
36
|
"assets/**/*",
|
|
35
37
|
"cli.js",
|
|
36
|
-
"
|
|
38
|
+
".smartconfig.json",
|
|
37
39
|
"readme.md"
|
|
38
40
|
],
|
|
39
41
|
"browserslist": [
|
|
@@ -56,12 +58,11 @@
|
|
|
56
58
|
"type": "git",
|
|
57
59
|
"url": "https://code.foss.global/push.rocks/smartnetwork.git"
|
|
58
60
|
},
|
|
61
|
+
"packageManager": "pnpm@10.7.0+sha512.6b865ad4b62a1d9842b61d674a393903b871d9244954f652b8842c2b553c72176b278f64c463e52d40fff8aba385c235c8c9ecf5cc7de4fd78b8bb6d49633ab6",
|
|
59
62
|
"bugs": {
|
|
60
63
|
"url": "https://code.foss.global/push.rocks/smartnetwork/issues"
|
|
61
64
|
},
|
|
62
|
-
"
|
|
63
|
-
"
|
|
64
|
-
"build": "(tsbuild tsfolders --allowimplicitany)",
|
|
65
|
-
"buildDocs": "tsdoc"
|
|
65
|
+
"pnpm": {
|
|
66
|
+
"overrides": {}
|
|
66
67
|
}
|
|
67
|
-
}
|
|
68
|
+
}
|