@push.rocks/smartdns 8.0.0 → 8.1.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/dist_rust/rustdns-client_linux_amd64 +0 -0
- package/dist_rust/rustdns-client_linux_arm64 +0 -0
- package/dist_rust/rustdns_linux_amd64 +0 -0
- package/dist_rust/rustdns_linux_arm64 +0 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts_client/classes.dnsclient.d.ts +20 -1
- package/dist_ts_client/classes.dnsclient.js +48 -17
- package/dist_ts_client/classes.rustdnsclientbridge.d.ts +4 -0
- package/dist_ts_client/classes.rustdnsclientbridge.js +8 -1
- package/dist_ts_client/plugins.js +3 -2
- package/package.json +6 -6
- package/readme.md +10 -3
- package/ts/00_commitinfo_data.ts +1 -1
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartdns',
|
|
6
|
-
version: '8.
|
|
6
|
+
version: '8.1.0',
|
|
7
7
|
description: 'A robust TypeScript library providing advanced DNS management and resolution capabilities including support for DNSSEC, custom DNS servers, and integration with various DNS providers.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxzQkFBc0I7SUFDNUIsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLHlMQUF5TDtDQUN2TSxDQUFBIn0=
|
|
@@ -8,6 +8,20 @@ export interface ISmartDnsConstructorOptions {
|
|
|
8
8
|
allowDohFallback?: boolean;
|
|
9
9
|
timeoutMs?: number;
|
|
10
10
|
}
|
|
11
|
+
type TNodeDnsPromises = NonNullable<typeof plugins.dns>['promises'];
|
|
12
|
+
export interface INodeDnsResolver {
|
|
13
|
+
resolve4(recordNameArg: string): Promise<string[]>;
|
|
14
|
+
resolve6(recordNameArg: string): Promise<string[]>;
|
|
15
|
+
resolveTxt(recordNameArg: string): ReturnType<TNodeDnsPromises['resolveTxt']>;
|
|
16
|
+
resolveMx(recordNameArg: string): ReturnType<TNodeDnsPromises['resolveMx']>;
|
|
17
|
+
resolveNs(recordNameArg: string): ReturnType<TNodeDnsPromises['resolveNs']>;
|
|
18
|
+
resolveCname(recordNameArg: string): ReturnType<TNodeDnsPromises['resolveCname']>;
|
|
19
|
+
resolvePtr(recordNameArg: string): ReturnType<TNodeDnsPromises['resolvePtr']>;
|
|
20
|
+
resolveSrv(recordNameArg: string): ReturnType<TNodeDnsPromises['resolveSrv']>;
|
|
21
|
+
resolveSoa(recordNameArg: string): ReturnType<TNodeDnsPromises['resolveSoa']>;
|
|
22
|
+
getServers(): ReturnType<TNodeDnsPromises['getServers']>;
|
|
23
|
+
cancel?(): void;
|
|
24
|
+
}
|
|
11
25
|
/**
|
|
12
26
|
* Smartdns offers methods for working with DNS resolution.
|
|
13
27
|
* Supports system resolver, UDP wire-format, and DoH (DNS-over-HTTPS) via a Rust binary.
|
|
@@ -51,7 +65,7 @@ export declare class Smartdns {
|
|
|
51
65
|
* Legacy getRecords* methods intentionally retain their historical behavior.
|
|
52
66
|
*/
|
|
53
67
|
queryRecords(recordNameArg: string, recordTypeArg: TQueryRecordType): Promise<TQueryRecordsResult>;
|
|
54
|
-
protected getNodeDnsPromises():
|
|
68
|
+
protected getNodeDnsPromises(): INodeDnsResolver | undefined;
|
|
55
69
|
protected querySystemStrict(recordNameArg: string, recordTypeArg: TQueryRecordType): Promise<TQueryAttempt>;
|
|
56
70
|
protected queryRustStrict(recordNameArg: string, recordTypeArg: TQueryRecordType, transportArg: 'udp' | 'doh'): Promise<TQueryAttempt>;
|
|
57
71
|
/**
|
|
@@ -74,4 +88,9 @@ export declare class Smartdns {
|
|
|
74
88
|
* Destroy the Rust client bridge and free resources.
|
|
75
89
|
*/
|
|
76
90
|
destroy(): void;
|
|
91
|
+
/**
|
|
92
|
+
* Confirm that the Rust client bridge has closed before releasing ownership.
|
|
93
|
+
*/
|
|
94
|
+
terminate(): Promise<void>;
|
|
77
95
|
}
|
|
96
|
+
export {};
|
|
@@ -238,14 +238,21 @@ export class Smartdns {
|
|
|
238
238
|
return this.finalizeStrictQuery(fallbackAttempt, attempts);
|
|
239
239
|
}
|
|
240
240
|
getNodeDnsPromises() {
|
|
241
|
-
|
|
241
|
+
const nodeDns = plugins.dns;
|
|
242
|
+
if (!nodeDns) {
|
|
243
|
+
return undefined;
|
|
244
|
+
}
|
|
245
|
+
const resolver = new nodeDns.promises.Resolver();
|
|
246
|
+
resolver.setServers(nodeDns.getServers());
|
|
247
|
+
return resolver;
|
|
242
248
|
}
|
|
243
249
|
async querySystemStrict(recordNameArg, recordTypeArg) {
|
|
244
|
-
const systemResolver = this.getNodeDnsPromises();
|
|
245
|
-
if (!systemResolver) {
|
|
246
|
-
return this.makeStrictErrorAttempt('system', 'internal', 'DNS_SYSTEM_UNAVAILABLE', 'Node DNS module is not available in this runtime', false);
|
|
247
|
-
}
|
|
248
250
|
try {
|
|
251
|
+
const systemResolver = this.getNodeDnsPromises();
|
|
252
|
+
if (!systemResolver) {
|
|
253
|
+
return this.makeStrictErrorAttempt('system', 'internal', 'DNS_SYSTEM_UNAVAILABLE', 'Node DNS module is not available in this runtime', false);
|
|
254
|
+
}
|
|
255
|
+
const withSystemTimeout = (promiseArg) => this.withStrictTimeout(promiseArg, systemResolver.cancel?.bind(systemResolver));
|
|
249
256
|
let records;
|
|
250
257
|
const makeRecord = (value) => ({
|
|
251
258
|
name: recordNameArg,
|
|
@@ -255,47 +262,47 @@ export class Smartdns {
|
|
|
255
262
|
});
|
|
256
263
|
switch (recordTypeArg) {
|
|
257
264
|
case 'A': {
|
|
258
|
-
const values = await
|
|
265
|
+
const values = await withSystemTimeout(systemResolver.resolve4(recordNameArg));
|
|
259
266
|
records = values.map(makeRecord);
|
|
260
267
|
break;
|
|
261
268
|
}
|
|
262
269
|
case 'AAAA': {
|
|
263
|
-
const values = await
|
|
270
|
+
const values = await withSystemTimeout(systemResolver.resolve6(recordNameArg));
|
|
264
271
|
records = values.map(makeRecord);
|
|
265
272
|
break;
|
|
266
273
|
}
|
|
267
274
|
case 'TXT': {
|
|
268
|
-
const values = await
|
|
275
|
+
const values = await withSystemTimeout(systemResolver.resolveTxt(recordNameArg));
|
|
269
276
|
records = values.map((chunks) => makeRecord(chunks.join('')));
|
|
270
277
|
break;
|
|
271
278
|
}
|
|
272
279
|
case 'MX': {
|
|
273
|
-
const values = await
|
|
280
|
+
const values = await withSystemTimeout(systemResolver.resolveMx(recordNameArg));
|
|
274
281
|
records = values.map((value) => makeRecord(`${value.priority} ${value.exchange}`));
|
|
275
282
|
break;
|
|
276
283
|
}
|
|
277
284
|
case 'NS': {
|
|
278
|
-
const values = await
|
|
285
|
+
const values = await withSystemTimeout(systemResolver.resolveNs(recordNameArg));
|
|
279
286
|
records = values.map(makeRecord);
|
|
280
287
|
break;
|
|
281
288
|
}
|
|
282
289
|
case 'CNAME': {
|
|
283
|
-
const values = await
|
|
290
|
+
const values = await withSystemTimeout(systemResolver.resolveCname(recordNameArg));
|
|
284
291
|
records = values.map(makeRecord);
|
|
285
292
|
break;
|
|
286
293
|
}
|
|
287
294
|
case 'PTR': {
|
|
288
|
-
const values = await
|
|
295
|
+
const values = await withSystemTimeout(systemResolver.resolvePtr(recordNameArg));
|
|
289
296
|
records = values.map(makeRecord);
|
|
290
297
|
break;
|
|
291
298
|
}
|
|
292
299
|
case 'SRV': {
|
|
293
|
-
const values = await
|
|
300
|
+
const values = await withSystemTimeout(systemResolver.resolveSrv(recordNameArg));
|
|
294
301
|
records = values.map((value) => makeRecord(`${value.priority} ${value.weight} ${value.port} ${value.name}`));
|
|
295
302
|
break;
|
|
296
303
|
}
|
|
297
304
|
case 'SOA': {
|
|
298
|
-
const value = await
|
|
305
|
+
const value = await withSystemTimeout(systemResolver.resolveSoa(recordNameArg));
|
|
299
306
|
records = [
|
|
300
307
|
makeRecord(`${value.nsname} ${value.hostmaster} ${value.serial} ${value.refresh} ${value.retry} ${value.expire} ${value.minttl}`),
|
|
301
308
|
];
|
|
@@ -438,24 +445,36 @@ export class Smartdns {
|
|
|
438
445
|
finalizeStrictQuery(finalAttempt, attempts) {
|
|
439
446
|
return { ...finalAttempt, attempts: [...attempts] };
|
|
440
447
|
}
|
|
441
|
-
async withStrictTimeout(promiseArg) {
|
|
448
|
+
async withStrictTimeout(promiseArg, cancelArg) {
|
|
442
449
|
if (!this.timeoutMs) {
|
|
443
450
|
return promiseArg;
|
|
444
451
|
}
|
|
445
452
|
let timer;
|
|
453
|
+
let timeoutFired = false;
|
|
446
454
|
const timeoutPromise = new Promise((_resolve, reject) => {
|
|
447
455
|
timer = setTimeout(() => {
|
|
456
|
+
if (timeoutFired) {
|
|
457
|
+
return;
|
|
458
|
+
}
|
|
459
|
+
timeoutFired = true;
|
|
448
460
|
const timeoutError = new Error(`DNS query timed out after ${this.timeoutMs}ms`);
|
|
449
461
|
Object.assign(timeoutError, { code: 'DNS_QUERY_TIMEOUT' });
|
|
450
462
|
reject(timeoutError);
|
|
463
|
+
try {
|
|
464
|
+
cancelArg?.();
|
|
465
|
+
}
|
|
466
|
+
catch {
|
|
467
|
+
// The timeout result owns this deadline even if an injected cancel callback fails.
|
|
468
|
+
}
|
|
451
469
|
}, this.timeoutMs);
|
|
452
470
|
});
|
|
453
471
|
try {
|
|
454
472
|
return await Promise.race([promiseArg, timeoutPromise]);
|
|
455
473
|
}
|
|
456
474
|
finally {
|
|
457
|
-
if (timer)
|
|
475
|
+
if (timer) {
|
|
458
476
|
clearTimeout(timer);
|
|
477
|
+
}
|
|
459
478
|
}
|
|
460
479
|
}
|
|
461
480
|
makeStrictErrorAttempt(transportArg, kindArg, codeArg, messageArg, retryableArg, rcodeArg) {
|
|
@@ -510,5 +529,17 @@ export class Smartdns {
|
|
|
510
529
|
this.rustBridge = null;
|
|
511
530
|
}
|
|
512
531
|
}
|
|
532
|
+
/**
|
|
533
|
+
* Confirm that the Rust client bridge has closed before releasing ownership.
|
|
534
|
+
*/
|
|
535
|
+
async terminate() {
|
|
536
|
+
const rustBridge = this.rustBridge;
|
|
537
|
+
if (!rustBridge)
|
|
538
|
+
return;
|
|
539
|
+
await rustBridge.terminate();
|
|
540
|
+
if (this.rustBridge === rustBridge) {
|
|
541
|
+
this.rustBridge = null;
|
|
542
|
+
}
|
|
543
|
+
}
|
|
513
544
|
}
|
|
514
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.dnsclient.js","sourceRoot":"","sources":["../ts_client/classes.dnsclient.ts"],"names":[],"mappings":"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"}
|
|
545
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.dnsclient.js","sourceRoot":"","sources":["../ts_client/classes.dnsclient.ts"],"names":[],"mappings":"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"}
|
|
@@ -79,6 +79,10 @@ export declare class RustDnsClientBridge {
|
|
|
79
79
|
* Kill the Rust process.
|
|
80
80
|
*/
|
|
81
81
|
kill(): void;
|
|
82
|
+
/**
|
|
83
|
+
* Terminate the Rust process and retain retry state until closure is confirmed.
|
|
84
|
+
*/
|
|
85
|
+
terminate(): Promise<void>;
|
|
82
86
|
/**
|
|
83
87
|
* Whether the bridge is running.
|
|
84
88
|
*/
|
|
@@ -96,6 +96,13 @@ export class RustDnsClientBridge {
|
|
|
96
96
|
this.bridge.kill();
|
|
97
97
|
this.spawnPromise = null;
|
|
98
98
|
}
|
|
99
|
+
/**
|
|
100
|
+
* Terminate the Rust process and retain retry state until closure is confirmed.
|
|
101
|
+
*/
|
|
102
|
+
async terminate() {
|
|
103
|
+
await this.bridge.terminate();
|
|
104
|
+
this.spawnPromise = null;
|
|
105
|
+
}
|
|
99
106
|
/**
|
|
100
107
|
* Whether the bridge is running.
|
|
101
108
|
*/
|
|
@@ -125,4 +132,4 @@ function getPlatformSuffix() {
|
|
|
125
132
|
}
|
|
126
133
|
return null;
|
|
127
134
|
}
|
|
128
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
135
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5ydXN0ZG5zY2xpZW50YnJpZGdlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHNfY2xpZW50L2NsYXNzZXMucnVzdGRuc2NsaWVudGJyaWRnZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQXFFeEM7O0dBRUc7QUFDSCxNQUFNLE9BQU8sbUJBQW1CO0lBSTlCO1FBRlEsaUJBQVksR0FBNEIsSUFBSSxDQUFDO1FBR25ELE1BQU0sVUFBVSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUNyQyxPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxFQUN2RCxJQUFJLENBQ0wsQ0FBQztRQUVGLDJFQUEyRTtRQUMzRSxNQUFNLGNBQWMsR0FBRyxpQkFBaUIsRUFBRSxDQUFDO1FBQzNDLE1BQU0sVUFBVSxHQUFhLEVBQUUsQ0FBQztRQUVoQywwRUFBMEU7UUFDMUUsSUFBSSxjQUFjLEVBQUUsQ0FBQztZQUNuQixVQUFVLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxXQUFXLEVBQUUsa0JBQWtCLGNBQWMsRUFBRSxDQUFDLENBQUMsQ0FBQztRQUNsRyxDQUFDO1FBQ0QsMkNBQTJDO1FBQzNDLFVBQVUsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLFdBQVcsRUFBRSxnQkFBZ0IsQ0FBQyxDQUFDLENBQUM7UUFDOUUsd0JBQXdCO1FBQ3hCLFVBQVUsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsU0FBUyxFQUFFLGdCQUFnQixDQUFDLENBQUMsQ0FBQztRQUM5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
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import * as smartenv from '@push.rocks/smartenv';
|
|
2
2
|
const smartenvInstance = new smartenv.Smartenv();
|
|
3
|
-
const
|
|
3
|
+
const dnsModule = await smartenvInstance.getSafeNodeModule('dns');
|
|
4
|
+
const dns = dnsModule?.default ?? dnsModule;
|
|
4
5
|
export { dns };
|
|
5
6
|
// node native scope
|
|
6
7
|
import * as path from 'path';
|
|
@@ -14,4 +15,4 @@ import * as smartrust from '@push.rocks/smartrust';
|
|
|
14
15
|
export { smartdelay, smartenv, smartpromise, smartrust };
|
|
15
16
|
import * as tsclass from '@tsclass/tsclass';
|
|
16
17
|
export { tsclass };
|
|
17
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
18
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzX2NsaWVudC9wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxRQUFRLE1BQU0sc0JBQXNCLENBQUM7QUFDakQsTUFBTSxnQkFBZ0IsR0FBRyxJQUFJLFFBQVEsQ0FBQyxRQUFRLEVBQUUsQ0FBQztBQUlqRCxNQUFNLFNBQVMsR0FBRyxNQUFNLGdCQUFnQixDQUFDLGlCQUFpQixDQUFtQixLQUFLLENBQUMsQ0FBQztBQUNwRixNQUFNLEdBQUcsR0FBK0IsU0FBUyxFQUFFLE9BQU8sSUFBSSxTQUFTLENBQUM7QUFFeEUsT0FBTyxFQUFFLEdBQUcsRUFBRSxDQUFDO0FBRWYsb0JBQW9CO0FBQ3BCLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQzdCLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFFdEMsT0FBTyxFQUFFLElBQUksRUFBRSxDQUFDO0FBQ2hCLE1BQU0sQ0FBQyxNQUFNLE1BQU0sR0FBRyxFQUFFLFlBQVksRUFBRSxDQUFDO0FBRXZDLGtCQUFrQjtBQUNsQixPQUFPLEtBQUssVUFBVSxNQUFNLHdCQUF3QixDQUFDO0FBQ3JELE9BQU8sS0FBSyxZQUFZLE1BQU0sMEJBQTBCLENBQUM7QUFDekQsT0FBTyxLQUFLLFNBQVMsTUFBTSx1QkFBdUIsQ0FBQztBQUVuRCxPQUFPLEVBQUUsVUFBVSxFQUFFLFFBQVEsRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLENBQUM7QUFFekQsT0FBTyxLQUFLLE9BQU8sTUFBTSxrQkFBa0IsQ0FBQztBQUU1QyxPQUFPLEVBQUUsT0FBTyxFQUFFLENBQUMifQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartdns",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.1.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "A robust TypeScript library providing advanced DNS management and resolution capabilities including support for DNSSEC, custom DNS servers, and integration with various DNS providers.",
|
|
6
6
|
"exports": {
|
|
@@ -41,19 +41,19 @@
|
|
|
41
41
|
"@push.rocks/smartdelay": "^3.0.1",
|
|
42
42
|
"@push.rocks/smartenv": "^6.0.0",
|
|
43
43
|
"@push.rocks/smartpromise": "^4.2.3",
|
|
44
|
-
"@push.rocks/smartrust": "^1.
|
|
44
|
+
"@push.rocks/smartrust": "^1.6.1",
|
|
45
45
|
"@tsclass/tsclass": "^9.5.1",
|
|
46
46
|
"acme-client": "^5.4.0",
|
|
47
47
|
"minimatch": "^10.2.5"
|
|
48
48
|
},
|
|
49
49
|
"devDependencies": {
|
|
50
50
|
"@git.zone/tsbuild": "^4.4.2",
|
|
51
|
-
"@git.zone/tsrun": "^2.0.
|
|
52
|
-
"@git.zone/tsrust": "^1.
|
|
53
|
-
"@git.zone/tstest": "^
|
|
51
|
+
"@git.zone/tsrun": "^2.0.6",
|
|
52
|
+
"@git.zone/tsrust": "^1.7.0",
|
|
53
|
+
"@git.zone/tstest": "^4.0.0",
|
|
54
54
|
"@types/dns-packet": "^5.6.5",
|
|
55
55
|
"@types/lodash.clonedeep": "^4.5.9",
|
|
56
|
-
"@types/node": "^26.1.
|
|
56
|
+
"@types/node": "^26.1.2",
|
|
57
57
|
"dns-packet": "^5.6.1"
|
|
58
58
|
},
|
|
59
59
|
"files": [
|
package/readme.md
CHANGED
|
@@ -114,7 +114,7 @@ interface ISmartDnsConstructorOptions {
|
|
|
114
114
|
|
|
115
115
|
| Strategy | Behavior |
|
|
116
116
|
|---|---|
|
|
117
|
-
| `prefer-system` | 🏠 Try the
|
|
117
|
+
| `prefer-system` | 🏠 Try the Node DNS resolver first, then fall back to Rust DoH. |
|
|
118
118
|
| `system` | 🏠 Use only the Node.js system resolver. No Rust binary needed. |
|
|
119
119
|
| `doh` | 🌐 Use only DNS-over-HTTPS (RFC 8484 wire format via Cloudflare). Rust-powered. |
|
|
120
120
|
| `udp` | ⚡ Use only raw UDP queries to upstream resolver (Cloudflare 1.1.1.1). Rust-powered. |
|
|
@@ -174,6 +174,11 @@ perform their preferred attempt first and, when enabled, at most one DoH fallbac
|
|
|
174
174
|
a missing result or an error. The fallback result is authoritative and `attempts` retains both outcomes.
|
|
175
175
|
Set `allowDohFallback: false` to prohibit that second attempt.
|
|
176
176
|
|
|
177
|
+
When `timeoutMs` is set, every strict `system` attempt owns an isolated Node resolver. SmartDNS
|
|
178
|
+
returns `DNS_QUERY_TIMEOUT` at the deadline and cancels the underlying native query, so timed-out
|
|
179
|
+
lookups do not continue accumulating in the background. Isolated resolvers inherit servers selected
|
|
180
|
+
through `makeNodeProcessUseDnsProvider()`.
|
|
181
|
+
|
|
177
182
|
The strict `system` path uses Node's explicit DNS resolvers (`resolve4`, `resolve6`, `resolveTxt`,
|
|
178
183
|
`resolveMx`, `resolveNs`, `resolveCname`, `resolvePtr`, `resolveSrv`, and `resolveSoa`). This makes
|
|
179
184
|
DNS response semantics observable and intentionally differs from the legacy A/AAAA path.
|
|
@@ -239,14 +244,16 @@ makeNodeProcessUseDnsProvider('google'); // 8.8.8.8 / 8.8.4.4
|
|
|
239
244
|
|
|
240
245
|
### Cleanup
|
|
241
246
|
|
|
242
|
-
When you're done with a `Smartdns` instance (especially one using Rust strategies),
|
|
247
|
+
When you're done with a `Smartdns` instance (especially one using Rust strategies), await `terminate()` when later work must not overlap the Rust child process:
|
|
243
248
|
|
|
244
249
|
```typescript
|
|
245
250
|
const dns = new Smartdns({ strategy: 'udp' });
|
|
246
251
|
// ... do queries ...
|
|
247
|
-
dns.
|
|
252
|
+
await dns.terminate(); // confirms rustdns-client process closure
|
|
248
253
|
```
|
|
249
254
|
|
|
255
|
+
If termination fails, `terminate()` rejects and retains the Rust bridge so the caller can retry cleanup. `destroy()` remains available as a fire-and-forget compatibility API.
|
|
256
|
+
|
|
250
257
|
---
|
|
251
258
|
|
|
252
259
|
## 🖥️ DNS Server
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartdns',
|
|
6
|
-
version: '8.
|
|
6
|
+
version: '8.1.0',
|
|
7
7
|
description: 'A robust TypeScript library providing advanced DNS management and resolution capabilities including support for DNSSEC, custom DNS servers, and integration with various DNS providers.'
|
|
8
8
|
}
|