@push.rocks/smartnetwork 4.9.0 → 4.10.1
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/dist_rust/rustnetwork_linux_amd64 +0 -0
- package/dist_rust/rustnetwork_linux_arm64 +0 -0
- package/dist_ts/00_commitinfo_data.js +2 -2
- package/dist_ts/smartnetwork.classes.domainintelligence.d.ts +23 -62
- package/dist_ts/smartnetwork.classes.domainintelligence.js +113 -357
- package/dist_ts/smartnetwork.classes.ipintelligence.d.ts +11 -36
- package/dist_ts/smartnetwork.classes.ipintelligence.js +83 -316
- package/dist_ts/smartnetwork.classes.rustbridge.d.ts +12 -8
- package/dist_ts/smartnetwork.classes.rustbridge.js +70 -15
- package/dist_ts/smartnetwork.classes.smartnetwork.d.ts +10 -3
- package/dist_ts/smartnetwork.classes.smartnetwork.js +132 -50
- package/dist_ts/smartnetwork.plugins.d.ts +2 -1
- package/dist_ts/smartnetwork.plugins.js +3 -2
- package/package.json +8 -7
- package/readme.hints.md +3 -3
- package/readme.md +23 -9
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/smartnetwork.classes.domainintelligence.ts +121 -381
- package/ts/smartnetwork.classes.ipintelligence.ts +88 -345
- package/ts/smartnetwork.classes.rustbridge.ts +72 -14
- package/ts/smartnetwork.classes.smartnetwork.ts +140 -52
- package/ts/smartnetwork.plugins.ts +2 -1
|
@@ -28,15 +28,15 @@ export interface IIpIntelligenceOptions {
|
|
|
28
28
|
timeout?: number;
|
|
29
29
|
/**
|
|
30
30
|
* Optional injected smartdns client. When provided, IpIntelligence will
|
|
31
|
-
* not create or
|
|
31
|
+
* not create or terminate its own client (the owner — typically SmartNetwork —
|
|
32
32
|
* manages lifecycle). When omitted, a short-lived client is created per
|
|
33
|
-
* Team Cymru lookup and
|
|
33
|
+
* Team Cymru lookup and terminated in finally.
|
|
34
34
|
*/
|
|
35
35
|
dnsClient?: InstanceType<typeof plugins.smartdns.dnsClientMod.Smartdns>;
|
|
36
36
|
}
|
|
37
37
|
/**
|
|
38
38
|
* IpIntelligence provides IP address intelligence by combining three data sources:
|
|
39
|
-
* - RDAP (direct to RIRs) for registration/org data
|
|
39
|
+
* - RDAP (direct to RIRs, via @push.rocks/smartwhois) for registration/org data
|
|
40
40
|
* - Team Cymru DNS for ASN
|
|
41
41
|
* - MaxMind GeoLite2 (in-memory MMDB) for geolocation
|
|
42
42
|
*/
|
|
@@ -48,47 +48,30 @@ export declare class IpIntelligence {
|
|
|
48
48
|
private asnReader;
|
|
49
49
|
private lastFetchTime;
|
|
50
50
|
private refreshPromise;
|
|
51
|
-
private
|
|
52
|
-
private bootstrapPromise;
|
|
51
|
+
private readonly rdapClient;
|
|
53
52
|
private readonly sharedDnsClient;
|
|
53
|
+
private ownedDnsClient;
|
|
54
|
+
private dnsLifecycleQueue;
|
|
54
55
|
constructor(options?: IIpIntelligenceOptions);
|
|
55
56
|
/**
|
|
56
57
|
* Get comprehensive IP intelligence for the given IP address.
|
|
57
58
|
* Runs RDAP, Team Cymru DNS, and MaxMind lookups in parallel.
|
|
58
59
|
*/
|
|
59
60
|
getIntelligence(ip: string): Promise<IIpIntelligenceResult>;
|
|
61
|
+
/** Retry and confirm cleanup of a standalone DNS client, if one is retained. */
|
|
62
|
+
stop(): Promise<void>;
|
|
60
63
|
/**
|
|
61
|
-
*
|
|
62
|
-
*/
|
|
63
|
-
private ensureBootstrap;
|
|
64
|
-
/**
|
|
65
|
-
* Find the RDAP base URL for a given IP via longest-prefix match
|
|
66
|
-
*/
|
|
67
|
-
private matchRir;
|
|
68
|
-
/**
|
|
69
|
-
* Query RDAP for registration data
|
|
64
|
+
* Query RDAP for registration data via the smartwhois RdapClient (IPv4 and IPv6).
|
|
70
65
|
*/
|
|
71
66
|
private queryRdap;
|
|
72
|
-
private parseRdapNetworkInfo;
|
|
73
|
-
private extractRdapCidrs;
|
|
74
|
-
/**
|
|
75
|
-
* Extract the 'fn' (formatted name) from an entity's vcardArray
|
|
76
|
-
*/
|
|
77
|
-
private extractVcardFn;
|
|
78
|
-
/**
|
|
79
|
-
* Extract email from an entity's vcardArray
|
|
80
|
-
*/
|
|
81
|
-
private extractVcardEmail;
|
|
82
|
-
/**
|
|
83
|
-
* Extract country from an entity's vcardArray address field
|
|
84
|
-
*/
|
|
85
|
-
private extractVcardCountry;
|
|
86
67
|
/**
|
|
87
68
|
* Query Team Cymru DNS for ASN information.
|
|
88
69
|
* Query format: reversed.ip.origin.asn.cymru.com TXT
|
|
89
70
|
* Response: "ASN | prefix | CC | rir | date"
|
|
90
71
|
*/
|
|
91
72
|
private queryTeamCymru;
|
|
73
|
+
private enqueueDnsLifecycle;
|
|
74
|
+
private terminateOwnedDnsClient;
|
|
92
75
|
/**
|
|
93
76
|
* Ensure MMDB readers are initialized. Downloads on first call,
|
|
94
77
|
* triggers background refresh if stale.
|
|
@@ -106,12 +89,4 @@ export declare class IpIntelligence {
|
|
|
106
89
|
* Query MaxMind for geo + ASN data
|
|
107
90
|
*/
|
|
108
91
|
private queryMaxMind;
|
|
109
|
-
/**
|
|
110
|
-
* Convert an IPv4 address string to a 32-bit unsigned number
|
|
111
|
-
*/
|
|
112
|
-
private ipToNumber;
|
|
113
|
-
private ipv4RangeToCidrs;
|
|
114
|
-
private ipv4ToBigInt;
|
|
115
|
-
private numberToIpv4;
|
|
116
|
-
private powerOfTwoExponent;
|
|
117
92
|
}
|
|
@@ -3,13 +3,11 @@ import { getLogger } from './logging.js';
|
|
|
3
3
|
// CDN URLs for GeoLite2 MMDB files (served via jsDelivr from npm packages)
|
|
4
4
|
const CITY_MMDB_URL = 'https://cdn.jsdelivr.net/npm/@ip-location-db/geolite2-city-mmdb/geolite2-city-ipv4.mmdb';
|
|
5
5
|
const ASN_MMDB_URL = 'https://cdn.jsdelivr.net/npm/@ip-location-db/geolite2-asn-mmdb/geolite2-asn-ipv4.mmdb';
|
|
6
|
-
// IANA bootstrap for RDAP
|
|
7
|
-
const IANA_BOOTSTRAP_IPV4_URL = 'https://data.iana.org/rdap/ipv4.json';
|
|
8
6
|
const DEFAULT_DB_MAX_AGE = 7 * 24 * 60 * 60 * 1000; // 7 days
|
|
9
7
|
const DEFAULT_TIMEOUT = 5000;
|
|
10
8
|
/**
|
|
11
9
|
* IpIntelligence provides IP address intelligence by combining three data sources:
|
|
12
|
-
* - RDAP (direct to RIRs) for registration/org data
|
|
10
|
+
* - RDAP (direct to RIRs, via @push.rocks/smartwhois) for registration/org data
|
|
13
11
|
* - Team Cymru DNS for ASN
|
|
14
12
|
* - MaxMind GeoLite2 (in-memory MMDB) for geolocation
|
|
15
13
|
*/
|
|
@@ -21,12 +19,16 @@ export class IpIntelligence {
|
|
|
21
19
|
this.asnReader = null;
|
|
22
20
|
this.lastFetchTime = 0;
|
|
23
21
|
this.refreshPromise = null;
|
|
24
|
-
|
|
25
|
-
this.
|
|
26
|
-
this.bootstrapPromise = null;
|
|
22
|
+
this.ownedDnsClient = null;
|
|
23
|
+
this.dnsLifecycleQueue = Promise.resolve();
|
|
27
24
|
this.dbMaxAge = options?.dbMaxAge ?? DEFAULT_DB_MAX_AGE;
|
|
28
25
|
this.timeout = options?.timeout ?? DEFAULT_TIMEOUT;
|
|
29
26
|
this.sharedDnsClient = options?.dnsClient ?? null;
|
|
27
|
+
this.rdapClient = new plugins.smartwhois.RdapClient({
|
|
28
|
+
requestTimeoutMs: this.timeout,
|
|
29
|
+
totalTimeoutMs: this.timeout,
|
|
30
|
+
userAgent: '@push.rocks/smartnetwork',
|
|
31
|
+
});
|
|
30
32
|
}
|
|
31
33
|
/**
|
|
32
34
|
* Get comprehensive IP intelligence for the given IP address.
|
|
@@ -55,6 +57,9 @@ export class IpIntelligence {
|
|
|
55
57
|
this.queryTeamCymru(ip),
|
|
56
58
|
this.queryMaxMind(ip),
|
|
57
59
|
]);
|
|
60
|
+
if (cymruResult.status === 'rejected') {
|
|
61
|
+
throw cymruResult.reason;
|
|
62
|
+
}
|
|
58
63
|
// Merge RDAP results
|
|
59
64
|
if (rdapResult.status === 'fulfilled' && rdapResult.value) {
|
|
60
65
|
const rdap = rdapResult.value;
|
|
@@ -91,228 +96,33 @@ export class IpIntelligence {
|
|
|
91
96
|
// the asnOrg remains null (we don't do an additional lookup)
|
|
92
97
|
return result;
|
|
93
98
|
}
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
if (this.bootstrapEntries)
|
|
100
|
-
return;
|
|
101
|
-
if (this.bootstrapPromise) {
|
|
102
|
-
await this.bootstrapPromise;
|
|
103
|
-
return;
|
|
104
|
-
}
|
|
105
|
-
this.bootstrapPromise = (async () => {
|
|
106
|
-
try {
|
|
107
|
-
const controller = new AbortController();
|
|
108
|
-
const timeoutId = setTimeout(() => controller.abort(), this.timeout);
|
|
109
|
-
try {
|
|
110
|
-
const response = await fetch(IANA_BOOTSTRAP_IPV4_URL, {
|
|
111
|
-
signal: controller.signal,
|
|
112
|
-
headers: { 'User-Agent': '@push.rocks/smartnetwork' },
|
|
113
|
-
});
|
|
114
|
-
if (!response.ok)
|
|
115
|
-
throw new Error(`HTTP ${response.status}`);
|
|
116
|
-
const data = await response.json();
|
|
117
|
-
const entries = [];
|
|
118
|
-
for (const [prefixes, urls] of data.services) {
|
|
119
|
-
const baseUrl = urls[0]; // first URL is preferred
|
|
120
|
-
for (const prefix of prefixes) {
|
|
121
|
-
const [network, bits] = prefix.split('/');
|
|
122
|
-
entries.push({
|
|
123
|
-
prefix,
|
|
124
|
-
prefixNum: this.ipToNumber(network),
|
|
125
|
-
maskBits: parseInt(bits, 10),
|
|
126
|
-
baseUrl: baseUrl.replace(/\/$/, ''), // strip trailing slash
|
|
127
|
-
});
|
|
128
|
-
}
|
|
129
|
-
}
|
|
130
|
-
// Sort by mask bits descending for longest-prefix match
|
|
131
|
-
entries.sort((a, b) => b.maskBits - a.maskBits);
|
|
132
|
-
this.bootstrapEntries = entries;
|
|
133
|
-
}
|
|
134
|
-
finally {
|
|
135
|
-
clearTimeout(timeoutId);
|
|
136
|
-
}
|
|
137
|
-
}
|
|
138
|
-
catch (err) {
|
|
139
|
-
this.logger.debug?.(`Failed to load RDAP bootstrap: ${err.message}`);
|
|
140
|
-
this.bootstrapEntries = []; // empty = all RDAP lookups will skip
|
|
141
|
-
}
|
|
142
|
-
})();
|
|
143
|
-
await this.bootstrapPromise;
|
|
144
|
-
this.bootstrapPromise = null;
|
|
99
|
+
/** Retry and confirm cleanup of a standalone DNS client, if one is retained. */
|
|
100
|
+
stop() {
|
|
101
|
+
if (this.sharedDnsClient)
|
|
102
|
+
return Promise.resolve();
|
|
103
|
+
return this.enqueueDnsLifecycle(() => this.terminateOwnedDnsClient());
|
|
145
104
|
}
|
|
105
|
+
// ─── RDAP Subsystem (delegated to @push.rocks/smartwhois) ───────────
|
|
146
106
|
/**
|
|
147
|
-
*
|
|
148
|
-
*/
|
|
149
|
-
matchRir(ip) {
|
|
150
|
-
if (!this.bootstrapEntries || this.bootstrapEntries.length === 0)
|
|
151
|
-
return null;
|
|
152
|
-
const ipNum = this.ipToNumber(ip);
|
|
153
|
-
for (const entry of this.bootstrapEntries) {
|
|
154
|
-
const mask = (0xFFFFFFFF << (32 - entry.maskBits)) >>> 0;
|
|
155
|
-
if ((ipNum & mask) === (entry.prefixNum & mask)) {
|
|
156
|
-
return entry.baseUrl;
|
|
157
|
-
}
|
|
158
|
-
}
|
|
159
|
-
return null;
|
|
160
|
-
}
|
|
161
|
-
/**
|
|
162
|
-
* Query RDAP for registration data
|
|
107
|
+
* Query RDAP for registration data via the smartwhois RdapClient (IPv4 and IPv6).
|
|
163
108
|
*/
|
|
164
109
|
async queryRdap(ip) {
|
|
165
|
-
await this.ensureBootstrap();
|
|
166
|
-
const baseUrl = this.matchRir(ip);
|
|
167
|
-
if (!baseUrl)
|
|
168
|
-
return null;
|
|
169
|
-
const controller = new AbortController();
|
|
170
|
-
const timeoutId = setTimeout(() => controller.abort(), this.timeout);
|
|
171
110
|
try {
|
|
172
|
-
const
|
|
173
|
-
|
|
174
|
-
headers: {
|
|
175
|
-
'Accept': 'application/rdap+json',
|
|
176
|
-
'User-Agent': '@push.rocks/smartnetwork',
|
|
177
|
-
},
|
|
178
|
-
});
|
|
179
|
-
if (!response.ok)
|
|
111
|
+
const rdapRecord = await this.rdapClient.lookupIp(ip);
|
|
112
|
+
if (!rdapRecord)
|
|
180
113
|
return null;
|
|
181
|
-
const data = await response.json();
|
|
182
|
-
let registrantOrg = null;
|
|
183
|
-
let registrantCountry = data.country || null;
|
|
184
|
-
let abuseContact = null;
|
|
185
|
-
const { networkRange, networkCidrs } = this.parseRdapNetworkInfo(data);
|
|
186
|
-
// Parse entities
|
|
187
|
-
if (data.entities && Array.isArray(data.entities)) {
|
|
188
|
-
for (const entity of data.entities) {
|
|
189
|
-
const roles = entity.roles || [];
|
|
190
|
-
if (roles.includes('registrant') || roles.includes('administrative')) {
|
|
191
|
-
const orgName = this.extractVcardFn(entity);
|
|
192
|
-
if (orgName)
|
|
193
|
-
registrantOrg = orgName;
|
|
194
|
-
// Try to get country from registrant address if not at top level
|
|
195
|
-
if (!registrantCountry) {
|
|
196
|
-
registrantCountry = this.extractVcardCountry(entity);
|
|
197
|
-
}
|
|
198
|
-
}
|
|
199
|
-
if (roles.includes('abuse')) {
|
|
200
|
-
abuseContact = this.extractVcardEmail(entity);
|
|
201
|
-
// Check nested entities for abuse contact
|
|
202
|
-
if (!abuseContact && entity.entities) {
|
|
203
|
-
for (const subEntity of entity.entities) {
|
|
204
|
-
const subRoles = subEntity.roles || [];
|
|
205
|
-
if (subRoles.includes('abuse')) {
|
|
206
|
-
abuseContact = this.extractVcardEmail(subEntity);
|
|
207
|
-
if (abuseContact)
|
|
208
|
-
break;
|
|
209
|
-
}
|
|
210
|
-
}
|
|
211
|
-
}
|
|
212
|
-
}
|
|
213
|
-
}
|
|
214
|
-
}
|
|
215
|
-
return { registrantOrg, registrantCountry, networkRange, networkCidrs, abuseContact };
|
|
216
|
-
}
|
|
217
|
-
catch (err) {
|
|
218
|
-
this.logger.debug?.(`RDAP query failed for ${ip}: ${err.message}`);
|
|
219
|
-
return null;
|
|
220
|
-
}
|
|
221
|
-
finally {
|
|
222
|
-
clearTimeout(timeoutId);
|
|
223
|
-
}
|
|
224
|
-
}
|
|
225
|
-
parseRdapNetworkInfo(data) {
|
|
226
|
-
const cidrs = this.extractRdapCidrs(data);
|
|
227
|
-
if (cidrs.length > 0) {
|
|
228
|
-
return {
|
|
229
|
-
networkRange: cidrs[0],
|
|
230
|
-
networkCidrs: cidrs,
|
|
231
|
-
};
|
|
232
|
-
}
|
|
233
|
-
if (typeof data.startAddress === 'string' && typeof data.endAddress === 'string') {
|
|
234
|
-
const rangeCidrs = this.ipv4RangeToCidrs(data.startAddress, data.endAddress);
|
|
235
114
|
return {
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
networkCidrs:
|
|
115
|
+
registrantOrg: rdapRecord.registrantOrg ?? null,
|
|
116
|
+
registrantCountry: rdapRecord.registrantCountry ?? null,
|
|
117
|
+
networkRange: rdapRecord.networkRange ?? null,
|
|
118
|
+
networkCidrs: rdapRecord.networkCidrs ?? null,
|
|
119
|
+
abuseContact: rdapRecord.abuseEmail ?? null,
|
|
240
120
|
};
|
|
241
121
|
}
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
extractRdapCidrs(data) {
|
|
245
|
-
if (!Array.isArray(data.cidr0_cidrs))
|
|
246
|
-
return [];
|
|
247
|
-
return data.cidr0_cidrs
|
|
248
|
-
.map((cidr) => {
|
|
249
|
-
const prefix = cidr?.v4prefix || cidr?.v6prefix;
|
|
250
|
-
const length = Number(cidr?.length);
|
|
251
|
-
if (typeof prefix !== 'string' || !Number.isInteger(length))
|
|
252
|
-
return null;
|
|
253
|
-
return `${prefix}/${length}`;
|
|
254
|
-
})
|
|
255
|
-
.filter(Boolean);
|
|
256
|
-
}
|
|
257
|
-
/**
|
|
258
|
-
* Extract the 'fn' (formatted name) from an entity's vcardArray
|
|
259
|
-
*/
|
|
260
|
-
extractVcardFn(entity) {
|
|
261
|
-
if (!entity.vcardArray || !Array.isArray(entity.vcardArray))
|
|
262
|
-
return null;
|
|
263
|
-
const properties = entity.vcardArray[1];
|
|
264
|
-
if (!Array.isArray(properties))
|
|
265
|
-
return null;
|
|
266
|
-
for (const prop of properties) {
|
|
267
|
-
if (Array.isArray(prop) && prop[0] === 'fn') {
|
|
268
|
-
return prop[3] || null;
|
|
269
|
-
}
|
|
270
|
-
}
|
|
271
|
-
return null;
|
|
272
|
-
}
|
|
273
|
-
/**
|
|
274
|
-
* Extract email from an entity's vcardArray
|
|
275
|
-
*/
|
|
276
|
-
extractVcardEmail(entity) {
|
|
277
|
-
if (!entity.vcardArray || !Array.isArray(entity.vcardArray))
|
|
278
|
-
return null;
|
|
279
|
-
const properties = entity.vcardArray[1];
|
|
280
|
-
if (!Array.isArray(properties))
|
|
281
|
-
return null;
|
|
282
|
-
for (const prop of properties) {
|
|
283
|
-
if (Array.isArray(prop) && prop[0] === 'email') {
|
|
284
|
-
return prop[3] || null;
|
|
285
|
-
}
|
|
286
|
-
}
|
|
287
|
-
return null;
|
|
288
|
-
}
|
|
289
|
-
/**
|
|
290
|
-
* Extract country from an entity's vcardArray address field
|
|
291
|
-
*/
|
|
292
|
-
extractVcardCountry(entity) {
|
|
293
|
-
if (!entity.vcardArray || !Array.isArray(entity.vcardArray))
|
|
294
|
-
return null;
|
|
295
|
-
const properties = entity.vcardArray[1];
|
|
296
|
-
if (!Array.isArray(properties))
|
|
122
|
+
catch (err) {
|
|
123
|
+
this.logger.debug?.(`RDAP query failed for ${ip}: ${err.message}`);
|
|
297
124
|
return null;
|
|
298
|
-
for (const prop of properties) {
|
|
299
|
-
if (Array.isArray(prop) && prop[0] === 'adr') {
|
|
300
|
-
// The label parameter often contains the full address with country at the end
|
|
301
|
-
const label = prop[1]?.label;
|
|
302
|
-
if (typeof label === 'string') {
|
|
303
|
-
const lines = label.split('\n');
|
|
304
|
-
const lastLine = lines[lines.length - 1]?.trim();
|
|
305
|
-
if (lastLine && lastLine.length > 1)
|
|
306
|
-
return lastLine;
|
|
307
|
-
}
|
|
308
|
-
// Also check the structured value (7-element array, last element is country)
|
|
309
|
-
const value = prop[3];
|
|
310
|
-
if (Array.isArray(value) && value.length >= 7 && value[6]) {
|
|
311
|
-
return value[6];
|
|
312
|
-
}
|
|
313
|
-
}
|
|
314
125
|
}
|
|
315
|
-
return null;
|
|
316
126
|
}
|
|
317
127
|
// ─── Team Cymru DNS Subsystem ───────────────────────────────────────
|
|
318
128
|
/**
|
|
@@ -321,46 +131,65 @@ export class IpIntelligence {
|
|
|
321
131
|
* Response: "ASN | prefix | CC | rir | date"
|
|
322
132
|
*/
|
|
323
133
|
async queryTeamCymru(ip) {
|
|
324
|
-
const
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
134
|
+
const query = async (dnsClientArg) => {
|
|
135
|
+
try {
|
|
136
|
+
const reversed = ip.split('.').reverse().join('.');
|
|
137
|
+
const queryName = `${reversed}.origin.asn.cymru.com`;
|
|
138
|
+
const records = await dnsClientArg.getRecordsTxt(queryName);
|
|
139
|
+
if (!records || records.length === 0)
|
|
140
|
+
return null;
|
|
141
|
+
// Parse the first TXT record: "13335 | 1.1.1.0/24 | AU | apnic | 2011-08-11"
|
|
142
|
+
const txt = records[0].value || records[0].data;
|
|
143
|
+
if (!txt)
|
|
144
|
+
return null;
|
|
145
|
+
const parts = txt.split('|').map((s) => s.trim());
|
|
146
|
+
if (parts.length < 3)
|
|
147
|
+
return null;
|
|
148
|
+
const asn = parseInt(parts[0], 10);
|
|
149
|
+
if (isNaN(asn))
|
|
150
|
+
return null;
|
|
151
|
+
return {
|
|
152
|
+
asn,
|
|
153
|
+
prefix: parts[1] || '',
|
|
154
|
+
country: parts[2] || '',
|
|
155
|
+
};
|
|
335
156
|
}
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
return null;
|
|
339
|
-
// Parse the first TXT record: "13335 | 1.1.1.0/24 | AU | apnic | 2011-08-11"
|
|
340
|
-
const txt = records[0].value || records[0].data;
|
|
341
|
-
if (!txt)
|
|
342
|
-
return null;
|
|
343
|
-
const parts = txt.split('|').map((s) => s.trim());
|
|
344
|
-
if (parts.length < 3)
|
|
345
|
-
return null;
|
|
346
|
-
const asn = parseInt(parts[0], 10);
|
|
347
|
-
if (isNaN(asn))
|
|
157
|
+
catch (err) {
|
|
158
|
+
this.logger.debug?.(`Team Cymru DNS query failed for ${ip}: ${err.message}`);
|
|
348
159
|
return null;
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
};
|
|
354
|
-
}
|
|
355
|
-
catch (err) {
|
|
356
|
-
this.logger.debug?.(`Team Cymru DNS query failed for ${ip}: ${err.message}`);
|
|
357
|
-
return null;
|
|
160
|
+
}
|
|
161
|
+
};
|
|
162
|
+
if (this.sharedDnsClient) {
|
|
163
|
+
return query(this.sharedDnsClient);
|
|
358
164
|
}
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
165
|
+
return this.enqueueDnsLifecycle(async () => {
|
|
166
|
+
await this.terminateOwnedDnsClient();
|
|
167
|
+
const dnsClient = new plugins.smartdns.dnsClientMod.Smartdns({
|
|
168
|
+
strategy: 'prefer-system',
|
|
169
|
+
allowDohFallback: true,
|
|
170
|
+
timeoutMs: this.timeout,
|
|
171
|
+
});
|
|
172
|
+
this.ownedDnsClient = dnsClient;
|
|
173
|
+
try {
|
|
174
|
+
return await query(dnsClient);
|
|
175
|
+
}
|
|
176
|
+
finally {
|
|
177
|
+
await this.terminateOwnedDnsClient();
|
|
363
178
|
}
|
|
179
|
+
});
|
|
180
|
+
}
|
|
181
|
+
enqueueDnsLifecycle(operationArg) {
|
|
182
|
+
const result = this.dnsLifecycleQueue.then(operationArg);
|
|
183
|
+
this.dnsLifecycleQueue = result.then(() => { }, () => { });
|
|
184
|
+
return result;
|
|
185
|
+
}
|
|
186
|
+
async terminateOwnedDnsClient() {
|
|
187
|
+
const dnsClient = this.ownedDnsClient;
|
|
188
|
+
if (!dnsClient)
|
|
189
|
+
return;
|
|
190
|
+
await dnsClient.terminate();
|
|
191
|
+
if (this.ownedDnsClient === dnsClient) {
|
|
192
|
+
this.ownedDnsClient = null;
|
|
364
193
|
}
|
|
365
194
|
}
|
|
366
195
|
// ─── MaxMind GeoLite2 Subsystem ─────────────────────────────────────
|
|
@@ -472,67 +301,5 @@ export class IpIntelligence {
|
|
|
472
301
|
}
|
|
473
302
|
return { country, countryCode, city, latitude, longitude, accuracyRadius, timezone, asn, asnOrg };
|
|
474
303
|
}
|
|
475
|
-
// ─── Utilities ──────────────────────────────────────────────────────
|
|
476
|
-
/**
|
|
477
|
-
* Convert an IPv4 address string to a 32-bit unsigned number
|
|
478
|
-
*/
|
|
479
|
-
ipToNumber(ip) {
|
|
480
|
-
const parts = ip.split('.');
|
|
481
|
-
return (((parseInt(parts[0], 10) << 24) |
|
|
482
|
-
(parseInt(parts[1], 10) << 16) |
|
|
483
|
-
(parseInt(parts[2], 10) << 8) |
|
|
484
|
-
parseInt(parts[3], 10)) >>> 0);
|
|
485
|
-
}
|
|
486
|
-
ipv4RangeToCidrs(startIp, endIp) {
|
|
487
|
-
const start = this.ipv4ToBigInt(startIp);
|
|
488
|
-
const end = this.ipv4ToBigInt(endIp);
|
|
489
|
-
if (start === undefined || end === undefined || start > end)
|
|
490
|
-
return [];
|
|
491
|
-
const cidrs = [];
|
|
492
|
-
let current = start;
|
|
493
|
-
while (current <= end) {
|
|
494
|
-
let maxBlockSize = current === 0n ? 1n << 32n : current & -current;
|
|
495
|
-
const remaining = end - current + 1n;
|
|
496
|
-
while (maxBlockSize > remaining) {
|
|
497
|
-
maxBlockSize = maxBlockSize / 2n;
|
|
498
|
-
}
|
|
499
|
-
const prefixLength = 32 - this.powerOfTwoExponent(maxBlockSize);
|
|
500
|
-
cidrs.push(`${this.numberToIpv4(current)}/${prefixLength}`);
|
|
501
|
-
current += maxBlockSize;
|
|
502
|
-
}
|
|
503
|
-
return cidrs;
|
|
504
|
-
}
|
|
505
|
-
ipv4ToBigInt(ip) {
|
|
506
|
-
const parts = ip.trim().split('.');
|
|
507
|
-
if (parts.length !== 4)
|
|
508
|
-
return undefined;
|
|
509
|
-
let result = 0n;
|
|
510
|
-
for (const part of parts) {
|
|
511
|
-
if (!/^\d+$/.test(part))
|
|
512
|
-
return undefined;
|
|
513
|
-
const number = Number(part);
|
|
514
|
-
if (!Number.isInteger(number) || number < 0 || number > 255)
|
|
515
|
-
return undefined;
|
|
516
|
-
result = (result * 256n) + BigInt(number);
|
|
517
|
-
}
|
|
518
|
-
return result;
|
|
519
|
-
}
|
|
520
|
-
numberToIpv4(value) {
|
|
521
|
-
return [
|
|
522
|
-
Number((value >> 24n) & 255n),
|
|
523
|
-
Number((value >> 16n) & 255n),
|
|
524
|
-
Number((value >> 8n) & 255n),
|
|
525
|
-
Number(value & 255n),
|
|
526
|
-
].join('.');
|
|
527
|
-
}
|
|
528
|
-
powerOfTwoExponent(value) {
|
|
529
|
-
let exponent = 0;
|
|
530
|
-
let remaining = value;
|
|
531
|
-
while (remaining > 1n) {
|
|
532
|
-
remaining >>= 1n;
|
|
533
|
-
exponent++;
|
|
534
|
-
}
|
|
535
|
-
return exponent;
|
|
536
|
-
}
|
|
537
304
|
}
|
|
538
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartnetwork.classes.ipintelligence.js","sourceRoot":"","sources":["../ts/smartnetwork.classes.ipintelligence.ts"],"names":[],"mappings":"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"}
|
|
305
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartnetwork.classes.ipintelligence.js","sourceRoot":"","sources":["../ts/smartnetwork.classes.ipintelligence.ts"],"names":[],"mappings":"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"}
|
|
@@ -69,6 +69,10 @@ type TNetworkCommands = {
|
|
|
69
69
|
};
|
|
70
70
|
};
|
|
71
71
|
};
|
|
72
|
+
/** Internal marker for an activation failure whose cleanup still needs an owner. */
|
|
73
|
+
export declare class RustNetworkBridgeActivationCleanupError extends AggregateError {
|
|
74
|
+
constructor(activationErrorArg: unknown, cleanupErrorArg: unknown);
|
|
75
|
+
}
|
|
72
76
|
/**
|
|
73
77
|
* Singleton bridge to the rustnetwork binary.
|
|
74
78
|
* Manages the IPC lifecycle for network diagnostics operations.
|
|
@@ -77,19 +81,19 @@ export declare class RustNetworkBridge {
|
|
|
77
81
|
private static instance;
|
|
78
82
|
static getInstance(): RustNetworkBridge;
|
|
79
83
|
private bridge;
|
|
84
|
+
private readonly owners;
|
|
85
|
+
private cleanupRequired;
|
|
86
|
+
private lifecycleQueue;
|
|
80
87
|
private constructor();
|
|
88
|
+
private enqueueLifecycle;
|
|
81
89
|
/**
|
|
82
|
-
*
|
|
83
|
-
*/
|
|
84
|
-
start(): Promise<void>;
|
|
85
|
-
/**
|
|
86
|
-
* Kill the Rust binary.
|
|
90
|
+
* Acquire the shared Rust binary and wait for it to be ready.
|
|
87
91
|
*/
|
|
88
|
-
|
|
92
|
+
start(ownerArg?: object): Promise<void>;
|
|
89
93
|
/**
|
|
90
|
-
*
|
|
94
|
+
* Release one owner and terminate the Rust binary after the last release.
|
|
91
95
|
*/
|
|
92
|
-
|
|
96
|
+
stop(ownerArg?: object): Promise<void>;
|
|
93
97
|
ping(host: string, count?: number, timeoutMs?: number): Promise<TNetworkCommands['ping']['result']>;
|
|
94
98
|
traceroute(host: string, maxHops?: number, timeoutMs?: number): Promise<TNetworkCommands['traceroute']['result']>;
|
|
95
99
|
tcpPortCheck(host: string, port: number, timeoutMs?: number): Promise<TNetworkCommands['tcpPortCheck']['result']>;
|