@push.rocks/smartdns 8.1.0 → 8.2.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_amd64.tsrust-build.json +14 -0
- package/dist_rust/rustdns-client_linux_arm64 +0 -0
- package/dist_rust/rustdns-client_linux_arm64.tsrust-build.json +14 -0
- package/dist_rust/rustdns_linux_amd64 +0 -0
- package/dist_rust/rustdns_linux_amd64.tsrust-build.json +14 -0
- package/dist_rust/rustdns_linux_arm64 +0 -0
- package/dist_rust/rustdns_linux_arm64.tsrust-build.json +14 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts_server/classes.dnsserver.d.ts +21 -2
- package/dist_ts_server/classes.dnsserver.js +185 -42
- package/dist_ts_server/classes.rustdnsbridge.d.ts +4 -0
- package/dist_ts_server/classes.rustdnsbridge.js +10 -1
- package/package.json +6 -6
- package/readme.hints.md +35 -19
- package/readme.md +32 -4
- package/ts/00_commitinfo_data.ts +1 -1
|
Binary file
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
{
|
|
2
|
+
"format": "tsrust.build-provenance.v2",
|
|
3
|
+
"binarySha256": "b0419c40c34a6d5fa6d6687847f9e7cb2290348d1fc0930fe4e83c808760078a",
|
|
4
|
+
"buildInfo": {
|
|
5
|
+
"projectName": "@push.rocks/smartdns",
|
|
6
|
+
"projectVersion": "8.2.0",
|
|
7
|
+
"gitCommit": "f3f7861802c8b26d517dd454add13e1bb0909c7b",
|
|
8
|
+
"gitDirty": false,
|
|
9
|
+
"builtAt": "2026-08-22T20:55:24.742Z",
|
|
10
|
+
"tsrustVersion": "1.10.0",
|
|
11
|
+
"binary": "rustdns-client",
|
|
12
|
+
"target": "linux_amd64"
|
|
13
|
+
}
|
|
14
|
+
}
|
|
Binary file
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
{
|
|
2
|
+
"format": "tsrust.build-provenance.v2",
|
|
3
|
+
"binarySha256": "8b24aa046dbac269aa71e6b7b554565d5f50e5664f8f6a54c59d7fe05d232ab5",
|
|
4
|
+
"buildInfo": {
|
|
5
|
+
"projectName": "@push.rocks/smartdns",
|
|
6
|
+
"projectVersion": "8.2.0",
|
|
7
|
+
"gitCommit": "f3f7861802c8b26d517dd454add13e1bb0909c7b",
|
|
8
|
+
"gitDirty": false,
|
|
9
|
+
"builtAt": "2026-08-22T20:55:25.226Z",
|
|
10
|
+
"tsrustVersion": "1.10.0",
|
|
11
|
+
"binary": "rustdns-client",
|
|
12
|
+
"target": "linux_arm64"
|
|
13
|
+
}
|
|
14
|
+
}
|
|
Binary file
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
{
|
|
2
|
+
"format": "tsrust.build-provenance.v2",
|
|
3
|
+
"binarySha256": "562c4ff14d42e17d0fccd653729eea025dc4eba7be56cb4b49cd2aafe1203bb4",
|
|
4
|
+
"buildInfo": {
|
|
5
|
+
"projectName": "@push.rocks/smartdns",
|
|
6
|
+
"projectVersion": "8.2.0",
|
|
7
|
+
"gitCommit": "f3f7861802c8b26d517dd454add13e1bb0909c7b",
|
|
8
|
+
"gitDirty": false,
|
|
9
|
+
"builtAt": "2026-08-22T20:55:24.742Z",
|
|
10
|
+
"tsrustVersion": "1.10.0",
|
|
11
|
+
"binary": "rustdns",
|
|
12
|
+
"target": "linux_amd64"
|
|
13
|
+
}
|
|
14
|
+
}
|
|
Binary file
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
{
|
|
2
|
+
"format": "tsrust.build-provenance.v2",
|
|
3
|
+
"binarySha256": "b2d37952a49874fc35b8ee7bdd5d4c794458dd93e1f2c315425351aa111f2c49",
|
|
4
|
+
"buildInfo": {
|
|
5
|
+
"projectName": "@push.rocks/smartdns",
|
|
6
|
+
"projectVersion": "8.2.0",
|
|
7
|
+
"gitCommit": "f3f7861802c8b26d517dd454add13e1bb0909c7b",
|
|
8
|
+
"gitDirty": false,
|
|
9
|
+
"builtAt": "2026-08-22T20:55:25.226Z",
|
|
10
|
+
"tsrustVersion": "1.10.0",
|
|
11
|
+
"binary": "rustdns",
|
|
12
|
+
"target": "linux_arm64"
|
|
13
|
+
}
|
|
14
|
+
}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartdns',
|
|
6
|
-
version: '8.
|
|
6
|
+
version: '8.2.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=
|
|
@@ -93,7 +93,7 @@ interface LetsEncryptOptions {
|
|
|
93
93
|
export interface IDnsQueryCompletedEvent {
|
|
94
94
|
/** The original questions from the query */
|
|
95
95
|
questions: IIpcDnsQuestion[];
|
|
96
|
-
/** Whether
|
|
96
|
+
/** Whether the response contains or synthesizes an answer */
|
|
97
97
|
answered: boolean;
|
|
98
98
|
/** The outcome actually sent on the wire */
|
|
99
99
|
responseKind: TDnsQueryResponseKind;
|
|
@@ -127,6 +127,9 @@ export declare class DnsServer extends plugins.events.EventEmitter {
|
|
|
127
127
|
/** Stable for the lifetime of this server, so the apex SOA does not churn. */
|
|
128
128
|
private readonly soaSerial;
|
|
129
129
|
private bridgeSpawned;
|
|
130
|
+
private lifecycleState;
|
|
131
|
+
private lifecycleTail;
|
|
132
|
+
private pendingLifecycleOperations;
|
|
130
133
|
private httpsServer;
|
|
131
134
|
private udpServer;
|
|
132
135
|
private tcpServer;
|
|
@@ -165,14 +168,25 @@ export declare class DnsServer extends plugins.events.EventEmitter {
|
|
|
165
168
|
unregisterHandlersByOwner(owner: string): number;
|
|
166
169
|
/** Every currently registered handler, for introspection and leak checks. */
|
|
167
170
|
listHandlers(): IDnsHandlerInfo[];
|
|
171
|
+
/**
|
|
172
|
+
* Replace the authoritative zone set used by subsequent queries without
|
|
173
|
+
* restarting any listener. The input is validated and copied before the live
|
|
174
|
+
* set changes; an explicit empty array means the server claims no DNS zone.
|
|
175
|
+
*/
|
|
176
|
+
setAuthoritativeZones(authoritativeZones: string[]): void;
|
|
168
177
|
/**
|
|
169
178
|
* Start the DNS server.
|
|
170
179
|
*/
|
|
171
180
|
start(): Promise<void>;
|
|
181
|
+
private startInternal;
|
|
172
182
|
/**
|
|
173
|
-
* Stop the DNS server.
|
|
183
|
+
* Stop the DNS server and resolve only after the Rust process has closed.
|
|
174
184
|
*/
|
|
175
185
|
stop(): Promise<void>;
|
|
186
|
+
private stopInternal;
|
|
187
|
+
private enqueueLifecycle;
|
|
188
|
+
private confirmBridgeTerminationAfterFailure;
|
|
189
|
+
private clearBridgeOwnership;
|
|
176
190
|
/**
|
|
177
191
|
* Initialize servers (no-op with Rust bridge, kept for API compatibility).
|
|
178
192
|
*/
|
|
@@ -215,6 +229,8 @@ export declare class DnsServer extends plugins.events.EventEmitter {
|
|
|
215
229
|
* Filter domains to include only those the server is authoritative for.
|
|
216
230
|
*/
|
|
217
231
|
filterAuthorizedDomains(domainNames: string[]): string[];
|
|
232
|
+
private applyUpdatedCertificates;
|
|
233
|
+
private isOperational;
|
|
218
234
|
/**
|
|
219
235
|
* Resolve a DNS query event from Rust using TypeScript handlers.
|
|
220
236
|
*
|
|
@@ -227,6 +243,9 @@ export declare class DnsServer extends plugins.events.EventEmitter {
|
|
|
227
243
|
private normalizeName;
|
|
228
244
|
/** Configured authoritative zones, most specific first. */
|
|
229
245
|
private normalizedAuthoritativeZones;
|
|
246
|
+
/** Canonical set used only to detect semantically equivalent updates. */
|
|
247
|
+
private canonicalAuthoritativeZoneSet;
|
|
248
|
+
private warnIfHandlerIsOutsideAuthority;
|
|
230
249
|
/** The most specific configured zone containing `name`, if any. */
|
|
231
250
|
private zoneForName;
|
|
232
251
|
/**
|
|
@@ -3,7 +3,6 @@ import { RustDnsBridge, } from './classes.rustdnsbridge.js';
|
|
|
3
3
|
export class DnsServer extends plugins.events.EventEmitter {
|
|
4
4
|
constructor(options) {
|
|
5
5
|
super();
|
|
6
|
-
this.options = options;
|
|
7
6
|
this.handlers = [];
|
|
8
7
|
this.handlerIdCounter = 0;
|
|
9
8
|
/** Patterns already warned about, so a hot loop cannot flood the log. */
|
|
@@ -12,10 +11,19 @@ export class DnsServer extends plugins.events.EventEmitter {
|
|
|
12
11
|
this.soaSerial = Math.floor(Date.now() / 1000);
|
|
13
12
|
// Track initialization state
|
|
14
13
|
this.bridgeSpawned = false;
|
|
14
|
+
this.lifecycleState = 'stopped';
|
|
15
|
+
this.lifecycleTail = Promise.resolve();
|
|
16
|
+
this.pendingLifecycleOperations = 0;
|
|
15
17
|
// Legacy server references (kept for backward-compatible test access)
|
|
16
18
|
this.httpsServer = null;
|
|
17
19
|
this.udpServer = null;
|
|
18
20
|
this.tcpServer = null;
|
|
21
|
+
this.options = {
|
|
22
|
+
...options,
|
|
23
|
+
authoritativeZones: options.authoritativeZones === undefined
|
|
24
|
+
? undefined
|
|
25
|
+
: [...options.authoritativeZones],
|
|
26
|
+
};
|
|
19
27
|
this.bridge = new RustDnsBridge();
|
|
20
28
|
// Wire up the dnsQuery event to run TypeScript handlers
|
|
21
29
|
this.bridge.on('dnsQuery', async (event) => {
|
|
@@ -25,7 +33,7 @@ export class DnsServer extends plugins.events.EventEmitter {
|
|
|
25
33
|
const responseTimeMs = Date.now() - startTime;
|
|
26
34
|
this.emit('query', {
|
|
27
35
|
questions: event.questions,
|
|
28
|
-
answered: resolution.answers.length > 0,
|
|
36
|
+
answered: resolution.answers.length > 0 || resolution.responseKind === 'answer',
|
|
29
37
|
responseKind: resolution.responseKind,
|
|
30
38
|
authorityZone: resolution.authorityZone,
|
|
31
39
|
suppressedHandlers: resolution.suppressedHandlers,
|
|
@@ -79,16 +87,7 @@ export class DnsServer extends plugins.events.EventEmitter {
|
|
|
79
87
|
handler,
|
|
80
88
|
};
|
|
81
89
|
this.handlers.push(entry);
|
|
82
|
-
|
|
83
|
-
!this.patternCanMatchAuthoritativeZone(domainPattern) &&
|
|
84
|
-
!this.warnedOutOfZonePatterns.has(domainPattern.toLowerCase())) {
|
|
85
|
-
// Loud at the point of the mistake, rather than silently at query time.
|
|
86
|
-
this.warnedOutOfZonePatterns.add(domainPattern.toLowerCase());
|
|
87
|
-
console.warn(`smartdns: handler for '${domainPattern}' cannot match any configured authoritative zone ` +
|
|
88
|
-
`(${this.normalizedAuthoritativeZones().join(', ') || 'none'}). Its answers will be ` +
|
|
89
|
-
`suppressed. Add the zone to authoritativeZones, or register with ` +
|
|
90
|
-
`{ authority: 'non-authoritative' } if this is a deliberate overlay.`);
|
|
91
|
-
}
|
|
90
|
+
this.warnIfHandlerIsOutsideAuthority(domainPattern, authority);
|
|
92
91
|
return {
|
|
93
92
|
id,
|
|
94
93
|
domainPattern,
|
|
@@ -157,10 +156,55 @@ export class DnsServer extends plugins.events.EventEmitter {
|
|
|
157
156
|
owner: handler.owner,
|
|
158
157
|
}));
|
|
159
158
|
}
|
|
159
|
+
/**
|
|
160
|
+
* Replace the authoritative zone set used by subsequent queries without
|
|
161
|
+
* restarting any listener. The input is validated and copied before the live
|
|
162
|
+
* set changes; an explicit empty array means the server claims no DNS zone.
|
|
163
|
+
*/
|
|
164
|
+
setAuthoritativeZones(authoritativeZones) {
|
|
165
|
+
if (!Array.isArray(authoritativeZones)
|
|
166
|
+
|| authoritativeZones.some((zone) => typeof zone !== 'string')) {
|
|
167
|
+
throw new TypeError('authoritativeZones must be an array of strings');
|
|
168
|
+
}
|
|
169
|
+
const currentZones = this.canonicalAuthoritativeZoneSet(this.options.authoritativeZones === undefined
|
|
170
|
+
? [this.options.dnssecZone]
|
|
171
|
+
: this.options.authoritativeZones);
|
|
172
|
+
const replacementZones = this.canonicalAuthoritativeZoneSet(authoritativeZones);
|
|
173
|
+
if (currentZones.length === replacementZones.length
|
|
174
|
+
&& currentZones.every((zone, index) => zone === replacementZones[index])) {
|
|
175
|
+
return;
|
|
176
|
+
}
|
|
177
|
+
this.options.authoritativeZones = [...authoritativeZones];
|
|
178
|
+
const invalidAuthoritativePatterns = new Set(this.handlers
|
|
179
|
+
.filter((handler) => handler.authority === 'authoritative'
|
|
180
|
+
&& !this.patternCanMatchAuthoritativeZone(handler.domainPattern))
|
|
181
|
+
.map((handler) => handler.domainPattern.toLowerCase()));
|
|
182
|
+
for (const warnedPattern of this.warnedOutOfZonePatterns) {
|
|
183
|
+
if (!invalidAuthoritativePatterns.has(warnedPattern)) {
|
|
184
|
+
this.warnedOutOfZonePatterns.delete(warnedPattern);
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
for (const handler of this.handlers) {
|
|
188
|
+
this.warnIfHandlerIsOutsideAuthority(handler.domainPattern, handler.authority);
|
|
189
|
+
}
|
|
190
|
+
}
|
|
160
191
|
/**
|
|
161
192
|
* Start the DNS server.
|
|
162
193
|
*/
|
|
163
|
-
|
|
194
|
+
start() {
|
|
195
|
+
return this.enqueueLifecycle(() => this.startInternal());
|
|
196
|
+
}
|
|
197
|
+
async startInternal() {
|
|
198
|
+
if (this.lifecycleState === 'running') {
|
|
199
|
+
if (this.bridgeSpawned && this.bridge.running) {
|
|
200
|
+
return;
|
|
201
|
+
}
|
|
202
|
+
await this.confirmBridgeTerminationAfterFailure(new Error('DNS server bridge exited unexpectedly'));
|
|
203
|
+
}
|
|
204
|
+
if (this.lifecycleState !== 'stopped') {
|
|
205
|
+
throw new Error(`DNS server cannot start while lifecycle state is '${this.lifecycleState}'; ` +
|
|
206
|
+
`call stop() to retry cleanup`);
|
|
207
|
+
}
|
|
164
208
|
// Validate interface addresses if provided
|
|
165
209
|
const udpInterface = this.options.udpBindInterface || '0.0.0.0';
|
|
166
210
|
const tcpInterface = this.options.tcpBindInterface || udpInterface;
|
|
@@ -175,11 +219,21 @@ export class DnsServer extends plugins.events.EventEmitter {
|
|
|
175
219
|
if (this.options.httpsBindInterface && !this.isValidIpAddress(this.options.httpsBindInterface)) {
|
|
176
220
|
throw new Error(`Invalid HTTPS bind interface: ${this.options.httpsBindInterface}`);
|
|
177
221
|
}
|
|
222
|
+
this.lifecycleState = 'starting';
|
|
178
223
|
// Spawn the Rust binary
|
|
179
224
|
if (!this.bridgeSpawned) {
|
|
180
|
-
|
|
225
|
+
let spawned;
|
|
226
|
+
try {
|
|
227
|
+
spawned = await this.bridge.spawn();
|
|
228
|
+
}
|
|
229
|
+
catch (spawnError) {
|
|
230
|
+
await this.confirmBridgeTerminationAfterFailure(spawnError);
|
|
231
|
+
throw spawnError;
|
|
232
|
+
}
|
|
181
233
|
if (!spawned) {
|
|
182
|
-
|
|
234
|
+
const spawnError = new Error('Failed to spawn rustdns binary');
|
|
235
|
+
await this.confirmBridgeTerminationAfterFailure(spawnError);
|
|
236
|
+
throw spawnError;
|
|
183
237
|
}
|
|
184
238
|
this.bridgeSpawned = true;
|
|
185
239
|
}
|
|
@@ -205,15 +259,15 @@ export class DnsServer extends plugins.events.EventEmitter {
|
|
|
205
259
|
try {
|
|
206
260
|
await this.bridge.startServer(config);
|
|
207
261
|
}
|
|
208
|
-
catch (
|
|
209
|
-
this.
|
|
210
|
-
|
|
211
|
-
throw error;
|
|
262
|
+
catch (startError) {
|
|
263
|
+
await this.confirmBridgeTerminationAfterFailure(startError);
|
|
264
|
+
throw startError;
|
|
212
265
|
}
|
|
213
266
|
// Set legacy markers for backward-compatible test checks
|
|
214
267
|
this.httpsServer = { _rustBridgeManaged: true };
|
|
215
268
|
this.udpServer = { _rustBridgeManaged: true };
|
|
216
269
|
this.tcpServer = { _rustBridgeManaged: true };
|
|
270
|
+
this.lifecycleState = 'running';
|
|
217
271
|
const udpManual = this.options.manualUdpMode || false;
|
|
218
272
|
const tcpManual = this.options.manualTcpMode || false;
|
|
219
273
|
const httpsManual = this.options.manualHttpsMode || false;
|
|
@@ -233,19 +287,60 @@ export class DnsServer extends plugins.events.EventEmitter {
|
|
|
233
287
|
}
|
|
234
288
|
}
|
|
235
289
|
/**
|
|
236
|
-
* Stop the DNS server.
|
|
290
|
+
* Stop the DNS server and resolve only after the Rust process has closed.
|
|
237
291
|
*/
|
|
238
|
-
|
|
239
|
-
|
|
292
|
+
stop() {
|
|
293
|
+
return this.enqueueLifecycle(() => this.stopInternal());
|
|
294
|
+
}
|
|
295
|
+
async stopInternal() {
|
|
296
|
+
const shouldSendStopCommand = this.bridgeSpawned && this.lifecycleState === 'running';
|
|
297
|
+
if (this.lifecycleState !== 'cleanupPending') {
|
|
298
|
+
this.lifecycleState = 'stopping';
|
|
299
|
+
}
|
|
300
|
+
let stopError;
|
|
301
|
+
if (shouldSendStopCommand) {
|
|
240
302
|
try {
|
|
241
303
|
await this.bridge.stopServer();
|
|
242
304
|
}
|
|
243
|
-
catch (
|
|
244
|
-
|
|
305
|
+
catch (error) {
|
|
306
|
+
stopError = error;
|
|
307
|
+
}
|
|
308
|
+
}
|
|
309
|
+
try {
|
|
310
|
+
await this.bridge.terminate();
|
|
311
|
+
}
|
|
312
|
+
catch (terminationError) {
|
|
313
|
+
this.lifecycleState = 'cleanupPending';
|
|
314
|
+
if (stopError) {
|
|
315
|
+
throw new AggregateError([stopError, terminationError], 'Failed to stop the DNS server and terminate its Rust bridge');
|
|
245
316
|
}
|
|
246
|
-
|
|
247
|
-
this.bridgeSpawned = false;
|
|
317
|
+
throw terminationError;
|
|
248
318
|
}
|
|
319
|
+
// Once process closure is confirmed, a failed stop command is immaterial.
|
|
320
|
+
this.clearBridgeOwnership();
|
|
321
|
+
}
|
|
322
|
+
enqueueLifecycle(operationArg) {
|
|
323
|
+
this.pendingLifecycleOperations++;
|
|
324
|
+
const operation = this.lifecycleTail.then(operationArg, operationArg);
|
|
325
|
+
this.lifecycleTail = operation.then(() => undefined, () => undefined);
|
|
326
|
+
void operation.then(() => { this.pendingLifecycleOperations--; }, () => { this.pendingLifecycleOperations--; });
|
|
327
|
+
return operation;
|
|
328
|
+
}
|
|
329
|
+
async confirmBridgeTerminationAfterFailure(operationError) {
|
|
330
|
+
// A failed activation can still leave smartrust owning a child transport.
|
|
331
|
+
this.bridgeSpawned = true;
|
|
332
|
+
try {
|
|
333
|
+
await this.bridge.terminate();
|
|
334
|
+
}
|
|
335
|
+
catch (terminationError) {
|
|
336
|
+
this.lifecycleState = 'cleanupPending';
|
|
337
|
+
throw new AggregateError([operationError, terminationError], 'DNS server operation failed and Rust bridge termination was not confirmed');
|
|
338
|
+
}
|
|
339
|
+
this.clearBridgeOwnership();
|
|
340
|
+
}
|
|
341
|
+
clearBridgeOwnership() {
|
|
342
|
+
this.bridgeSpawned = false;
|
|
343
|
+
this.lifecycleState = 'stopped';
|
|
249
344
|
this.httpsServer = null;
|
|
250
345
|
this.udpServer = null;
|
|
251
346
|
this.tcpServer = null;
|
|
@@ -301,8 +396,8 @@ export class DnsServer extends plugins.events.EventEmitter {
|
|
|
301
396
|
* no size bound is applied — correct for TCP and DoH framing.
|
|
302
397
|
*/
|
|
303
398
|
async processRawDnsPacketAsync(packet, transport) {
|
|
304
|
-
if (!this.
|
|
305
|
-
throw new Error('DNS server not
|
|
399
|
+
if (!this.isOperational()) {
|
|
400
|
+
throw new Error('DNS server is not accepting packets — await start() or stop() completion');
|
|
306
401
|
}
|
|
307
402
|
return this.bridge.processPacket(packet, transport);
|
|
308
403
|
}
|
|
@@ -404,16 +499,11 @@ export class DnsServer extends plugins.events.EventEmitter {
|
|
|
404
499
|
const certificate = await client.getCertificate(order);
|
|
405
500
|
const certPath = plugins.path.join(opts.certDir, `${authorizedDomains[0]}.cert`);
|
|
406
501
|
plugins.fs.writeFileSync(certPath, certificate);
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
await this.bridge.updateCerts(privateKey, certificate);
|
|
413
|
-
}
|
|
414
|
-
catch (err) {
|
|
415
|
-
console.error('Error updating certs on Rust bridge:', err);
|
|
416
|
-
}
|
|
502
|
+
try {
|
|
503
|
+
await this.applyUpdatedCertificates(privateKey, certificate);
|
|
504
|
+
}
|
|
505
|
+
catch (err) {
|
|
506
|
+
console.error('Error updating certs on Rust bridge:', err);
|
|
417
507
|
}
|
|
418
508
|
return {
|
|
419
509
|
cert: certificate,
|
|
@@ -453,6 +543,23 @@ export class DnsServer extends plugins.events.EventEmitter {
|
|
|
453
543
|
}
|
|
454
544
|
return authorizedDomains;
|
|
455
545
|
}
|
|
546
|
+
async applyUpdatedCertificates(httpsKey, httpsCert) {
|
|
547
|
+
this.options.httpsKey = httpsKey;
|
|
548
|
+
this.options.httpsCert = httpsCert;
|
|
549
|
+
await this.enqueueLifecycle(async () => {
|
|
550
|
+
if (this.lifecycleState === 'running'
|
|
551
|
+
&& this.bridgeSpawned
|
|
552
|
+
&& this.bridge.running) {
|
|
553
|
+
await this.bridge.updateCerts(httpsKey, httpsCert);
|
|
554
|
+
}
|
|
555
|
+
});
|
|
556
|
+
}
|
|
557
|
+
isOperational() {
|
|
558
|
+
return (this.pendingLifecycleOperations === 0
|
|
559
|
+
&& this.lifecycleState === 'running'
|
|
560
|
+
&& this.bridgeSpawned
|
|
561
|
+
&& this.bridge.running);
|
|
562
|
+
}
|
|
456
563
|
// ── Private helpers ───────────────────────────────────────────────
|
|
457
564
|
/**
|
|
458
565
|
* Resolve a DNS query event from Rust using TypeScript handlers.
|
|
@@ -533,6 +640,21 @@ export class DnsServer extends plugins.events.EventEmitter {
|
|
|
533
640
|
answers.push(this.buildApexSoaAnswer(questionZone));
|
|
534
641
|
}
|
|
535
642
|
}
|
|
643
|
+
const isAuthorizedDnskeyQuery = event.dnssecRequested
|
|
644
|
+
&& event.questions.length > 0
|
|
645
|
+
&& event.questions.every((question) => question.type.toUpperCase() === 'DNSKEY'
|
|
646
|
+
&& this.normalizeName(question.name) === this.normalizeName(this.options.dnssecZone)
|
|
647
|
+
&& this.zoneForName(question.name) !== null);
|
|
648
|
+
if (isAuthorizedDnskeyQuery && authorityZone) {
|
|
649
|
+
// Rust owns the key material and synthesizes the signed RRset after this
|
|
650
|
+
// live TypeScript authority decision crosses the query callback boundary.
|
|
651
|
+
return {
|
|
652
|
+
answers: [],
|
|
653
|
+
responseKind: 'answer',
|
|
654
|
+
authorityZone,
|
|
655
|
+
suppressedHandlers,
|
|
656
|
+
};
|
|
657
|
+
}
|
|
536
658
|
if (answers.length > 0) {
|
|
537
659
|
// AA is a property of the message, so a single non-authoritative
|
|
538
660
|
// contribution downgrades the whole response.
|
|
@@ -563,13 +685,34 @@ export class DnsServer extends plugins.events.EventEmitter {
|
|
|
563
685
|
}
|
|
564
686
|
/** Configured authoritative zones, most specific first. */
|
|
565
687
|
normalizedAuthoritativeZones() {
|
|
566
|
-
return (this.options.authoritativeZones
|
|
567
|
-
? this.options.
|
|
568
|
-
:
|
|
688
|
+
return (this.options.authoritativeZones === undefined
|
|
689
|
+
? [this.options.dnssecZone]
|
|
690
|
+
: this.options.authoritativeZones)
|
|
569
691
|
.map((zone) => this.normalizeName(zone))
|
|
570
692
|
.filter(Boolean)
|
|
571
693
|
.sort((a, b) => b.length - a.length);
|
|
572
694
|
}
|
|
695
|
+
/** Canonical set used only to detect semantically equivalent updates. */
|
|
696
|
+
canonicalAuthoritativeZoneSet(authoritativeZones) {
|
|
697
|
+
return [...new Set(authoritativeZones
|
|
698
|
+
.map((zone) => this.normalizeName(zone))
|
|
699
|
+
.filter(Boolean))].sort();
|
|
700
|
+
}
|
|
701
|
+
warnIfHandlerIsOutsideAuthority(domainPattern, authority) {
|
|
702
|
+
const normalizedPattern = domainPattern.toLowerCase();
|
|
703
|
+
if (authority !== 'authoritative'
|
|
704
|
+
|| this.patternCanMatchAuthoritativeZone(domainPattern)
|
|
705
|
+
|| this.warnedOutOfZonePatterns.has(normalizedPattern)) {
|
|
706
|
+
return;
|
|
707
|
+
}
|
|
708
|
+
// Loud at registration and whenever live authority changes invalidate an
|
|
709
|
+
// existing authoritative handler.
|
|
710
|
+
this.warnedOutOfZonePatterns.add(normalizedPattern);
|
|
711
|
+
console.warn(`smartdns: handler for '${domainPattern}' cannot match any configured authoritative zone ` +
|
|
712
|
+
`(${this.normalizedAuthoritativeZones().join(', ') || 'none'}). Its answers will be ` +
|
|
713
|
+
`suppressed. Add the zone to authoritativeZones, or register with ` +
|
|
714
|
+
`{ authority: 'non-authoritative' } if this is a deliberate overlay.`);
|
|
715
|
+
}
|
|
573
716
|
/** The most specific configured zone containing `name`, if any. */
|
|
574
717
|
zoneForName(name) {
|
|
575
718
|
const normalizedName = this.normalizeName(name);
|
|
@@ -657,4 +800,4 @@ export class DnsServer extends plugins.events.EventEmitter {
|
|
|
657
800
|
return this.zoneForName(domain) !== null;
|
|
658
801
|
}
|
|
659
802
|
}
|
|
660
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.dnsserver.js","sourceRoot":"","sources":["../ts_server/classes.dnsserver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,EACL,aAAa,GAMd,MAAM,4BAA4B,CAAC;AAuIpC,MAAM,OAAO,SAAU,SAAQ,OAAO,CAAC,MAAM,CAAC,YAAY;IAiBxD,YAAoB,OAA0B;QAC5C,KAAK,EAAE,CAAC;QADU,YAAO,GAAP,OAAO,CAAmB;QAftC,aAAQ,GAAkB,EAAE,CAAC;QAC7B,qBAAgB,GAAG,CAAC,CAAC;QAC7B,yEAAyE;QACjE,4BAAuB,GAAG,IAAI,GAAG,EAAU,CAAC;QACpD,8EAA8E;QAC7D,cAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;QAE3D,6BAA6B;QACrB,kBAAa,GAAY,KAAK,CAAC;QAEvC,sEAAsE;QAC9D,gBAAW,GAAQ,IAAI,CAAC;QACxB,cAAS,GAAQ,IAAI,CAAC;QACtB,cAAS,GAAQ,IAAI,CAAC;QAI5B,IAAI,CAAC,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;QAElC,wDAAwD;QACxD,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,UAAU,EAAE,KAAK,EAAE,KAAqB,EAAE,EAAE;YACzD,IAAI,CAAC;gBACH,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBAC7B,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;gBAC5C,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;gBAC9C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;oBACjB,SAAS,EAAE,KAAK,CAAC,SAAS;oBAC1B,QAAQ,EAAE,UAAU,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;oBACvC,YAAY,EAAE,UAAU,CAAC,YAAY;oBACrC,aAAa,EAAE,UAAU,CAAC,aAAa;oBACvC,kBAAkB,EAAE,UAAU,CAAC,kBAAkB;oBACjD,cAAc;oBACd,SAAS,EAAE,SAAS;iBACa,CAAC,CAAC;gBACrC,IACE,UAAU,CAAC,YAAY,KAAK,SAAS;oBACrC,UAAU,CAAC,kBAAkB,CAAC,MAAM,GAAG,CAAC,EACxC,CAAC;oBACD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;wBACnB,SAAS,EAAE,KAAK,CAAC,SAAS;wBAC1B,YAAY,EAAE,UAAU,CAAC,YAAY;wBACrC,aAAa,EAAE,UAAU,CAAC,aAAa;wBACvC,kBAAkB,EAAE,UAAU,CAAC,kBAAkB;wBACjD,SAAS,EAAE,SAAS;qBACW,CAAC,CAAC;gBACrC,CAAC;gBACD,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAC/B,KAAK,CAAC,aAAa,EACnB,UAAU,CAAC,OAAO,EAClB,UAAU,CAAC,YAAY,EACvB,UAAU,CAAC,aAAa,IAAI,SAAS,CACtC,CAAC;YACJ,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,CAAC,KAAK,CAAC,2BAA2B,EAAE,GAAG,CAAC,CAAC;gBAChD,IAAI,CAAC;oBACH,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,aAAa,EAAE,EAAE,EAAE,UAAU,CAAC,CAAC;gBACzE,CAAC;gBAAC,OAAO,OAAO,EAAE,CAAC;oBACjB,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,OAAO,CAAC,CAAC;gBAC9D,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;;;;;;OAWG;IACI,eAAe,CACpB,aAAqB,EACrB,WAAqB,EACrB,OAAqD,EACrD,UAA8B,EAAE;QAEhC,MAAM,SAAS,GAAyB,OAAO,CAAC,SAAS,IAAI,eAAe,CAAC;QAC7E,MAAM,EAAE,GAAG,QAAQ,EAAE,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC7C,MAAM,KAAK,GAAgB;YACzB,EAAE;YACF,aAAa;YACb,WAAW,EAAE,CAAC,GAAG,WAAW,CAAC;YAC7B,SAAS;YACT,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,OAAO;SACR,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAE1B,IACE,SAAS,KAAK,eAAe;YAC7B,CAAC,IAAI,CAAC,gCAAgC,CAAC,aAAa,CAAC;YACrD,CAAC,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,EAC9D,CAAC;YACD,wEAAwE;YACxE,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,CAAC;YAC9D,OAAO,CAAC,IAAI,CACV,0BAA0B,aAAa,mDAAmD;gBACxF,IAAI,IAAI,CAAC,4BAA4B,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,yBAAyB;gBACrF,mEAAmE;gBACnE,qEAAqE,CACxE,CAAC;QACJ,CAAC;QAED,OAAO;YACL,EAAE;YACF,aAAa;YACb,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,SAAS;YACT,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,EAAE,CAAC;SACjD,CAAC;IACJ,CAAC;IAED;;;;;;;OAOG;IACI,iBAAiB,CAAC,aAAqB,EAAE,WAAqB;QACnE,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QAC3C,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,CAAC;QACjE,MAAM,uBAAuB,GAAG,aAAa,CAAC,WAAW,EAAE,CAAC;QAC5D,MAAM,qBAAqB,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QAC1E,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAC7C,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,WAAW,EAAE,KAAK,uBAAuB;YAC/D,qBAAqB,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CACvH,CAAC;QACF,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,aAAa,CAAC;IAC9C,CAAC;IAED;;;OAGG;IACI,qBAAqB,CAAC,SAAiB;QAC5C,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QAC3C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;YAC/C,IAAI,OAAO,CAAC,EAAE,KAAK,SAAS,EAAE,CAAC;gBAC7B,OAAO,IAAI,CAAC;YACd,CAAC;YACD,oEAAoE;YACpE,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,CAAC;YACzE,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,aAAa,CAAC;IAC9C,CAAC;IAED;;;OAGG;IACI,yBAAyB,CAAC,KAAa;QAC5C,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QAC3C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;YAC/C,IAAI,OAAO,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;gBAC5B,OAAO,IAAI,CAAC;YACd,CAAC;YACD,oEAAoE;YACpE,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,CAAC;YACzE,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;QACH,OAAO,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;IAC9C,CAAC;IAED,6EAA6E;IACtE,YAAY;QACjB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YACrC,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,WAAW,EAAE,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC;YACrC,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,KAAK,EAAE,OAAO,CAAC,KAAK;SACrB,CAAC,CAAC,CAAC;IACN,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,KAAK;QAChB,2CAA2C;QAC3C,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,IAAI,SAAS,CAAC;QAChE,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,IAAI,YAAY,CAAC;QACnE,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,IAAI,SAAS,CAAC;QACpE,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;QAE7D,IAAI,IAAI,CAAC,OAAO,CAAC,gBAAgB,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAC3F,MAAM,IAAI,KAAK,CAAC,+BAA+B,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;QAClF,CAAC;QAED,IAAI,IAAI,CAAC,OAAO,CAAC,gBAAgB,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAC3F,MAAM,IAAI,KAAK,CAAC,+BAA+B,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;QAClF,CAAC;QAED,IAAI,IAAI,CAAC,OAAO,CAAC,kBAAkB,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC;YAC/F,MAAM,IAAI,KAAK,CAAC,iCAAiC,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAAC;QACtF,CAAC;QAED,wBAAwB;QACxB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACxB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAC1C,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;YACpD,CAAC;YACD,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC5B,CAAC;QAED,wBAAwB;QACxB,MAAM,MAAM,GAAmB;YAC7B,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO;YAC7B,OAAO;YACP,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS;YACjC,gBAAgB,EAAE,YAAY;YAC9B,gBAAgB,EAAE,YAAY;YAC9B,kBAAkB,EAAE,cAAc;YAClC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE;YACrC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE;YACvC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;YACnC,eAAe,EAAE,OAAO;YACxB,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,iBAAiB,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACrF,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,uBAAuB,EAAE,IAAI,CAAC,OAAO,CAAC,uBAAuB,KAAK,KAAK;YACvE,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa,IAAI,KAAK;YAClD,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa,IAAI,KAAK;YAClD,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC,eAAe,IAAI,KAAK;SACvD,CAAC;QAEF,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACxC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACnB,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;YAC3B,MAAM,KAAK,CAAC;QACd,CAAC;QAED,yDAAyD;QACzD,IAAI,CAAC,WAAW,GAAG,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC;QAChD,IAAI,CAAC,SAAS,GAAG,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC;QAC9C,IAAI,CAAC,SAAS,GAAG,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC;QAE9C,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,IAAI,KAAK,CAAC;QACtD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,IAAI,KAAK,CAAC;QACtD,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,IAAI,KAAK,CAAC;QAE1D,IAAI,SAAS,IAAI,SAAS,IAAI,WAAW,EAAE,CAAC;YAC1C,OAAO,CAAC,GAAG,CAAC,sEAAsE,CAAC,CAAC;QACtF,CAAC;aAAM,IAAI,SAAS,IAAI,SAAS,IAAI,WAAW,EAAE,CAAC;YACjD,MAAM,gBAAgB,GAAa,EAAE,CAAC;YACtC,MAAM,gBAAgB,GAAa,EAAE,CAAC;YACtC,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,YAAY,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;YAChH,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,YAAY,IAAI,OAAO,EAAE,CAAC,CAAC;YACnG,WAAW,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,cAAc,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;YAC1H,OAAO,CAAC,GAAG,CAAC,uBAAuB,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QACjJ,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,4BAA4B,YAAY,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,UAAU,YAAY,IAAI,OAAO,YAAY,cAAc,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,CAAC,CAAC;QACxK,CAAC;IACH,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,IAAI;QACf,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YACjC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,8DAA8D;YAChE,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACnB,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;QAC7B,CAAC;QAED,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;IACxB,CAAC;IAED;;OAEG;IACI,iBAAiB;QACtB,gEAAgE;IAClE,CAAC;IAED;;OAEG;IACI,mBAAmB;QACxB,QAAQ;IACV,CAAC;IAED;;OAEG;IACI,qBAAqB;QAC1B,QAAQ;IACV,CAAC;IAED;;;OAGG;IACI,iBAAiB,CAAC,MAA0B;QACjD,OAAO,CAAC,IAAI,CAAC,4GAA4G,CAAC,CAAC;QAC3H,MAAM,CAAC,GAAG,EAAE,CAAC;IACf,CAAC;IAED;;OAEG;IACI,gBAAgB,CACrB,GAAW,EACX,KAA+B,EAC/B,gBAA8E;QAE9E,mEAAmE;QACnE,sEAAsE;QACtE,IAAI,CAAC,wBAAwB,CAAC,GAAG,EAAE,KAAK,CAAC;aACtC,IAAI,CAAC,CAAC,YAAY,EAAE,EAAE;YACrB,IAAI,gBAAgB,EAAE,CAAC;gBACrB,gBAAgB,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;YACxC,CAAC;QACH,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACb,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,GAAG,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;;;;;OAOG;IACI,KAAK,CAAC,wBAAwB,CACnC,MAAc,EACd,SAAyB;QAEzB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACjE,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACtD,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,sBAAsB,CACjC,WAAqB,EACrB,UAA8B,EAAE;QAEhC,MAAM,IAAI,GAAG;YACX,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,mBAAmB;YAC3C,OAAO,EAAE,OAAO,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK;YAChE,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,SAAS;SACtC,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YACzC,OAAO,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1D,CAAC;QAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,uBAAuB,CAAC,WAAW,CAAC,CAAC;QAEpE,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,OAAO,CAAC,KAAK,CAAC,iEAAiE,CAAC,CAAC;YACjF,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QAC/C,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,2CAA2C,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEvF,sEAAsE;QACtE,iCAAiC;QACjC,MAAM,iBAAiB,GAAgE,EAAE,CAAC;QAE1F,IAAI,CAAC;YACH,gEAAgE;YAChE,MAAM,UAAU,GAAG,IAAI,CAAC,kBAAkB,IAAI,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC;YAE1E,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;YACtE,IAAI,UAAkB,CAAC;YAEvB,IAAI,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;gBAC1C,UAAU,GAAG,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;YACvD,CAAC;iBAAM,CAAC;gBACN,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,mBAAmB,CAAC,KAAK,EAAE;oBAC/D,aAAa,EAAE,IAAI;oBACnB,iBAAiB,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE;oBAClD,kBAAkB,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE;iBACrD,CAAC,CAAC;gBAEH,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBACrC,OAAO,CAAC,EAAE,CAAC,aAAa,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;YACvD,CAAC;YAED,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC;gBACnC,YAAY,EAAE,IAAI,CAAC,OAAO;oBACxB,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,WAAW,CAAC,OAAO;oBAC1C,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,WAAW,CAAC,UAAU;gBAC/C,UAAU,EAAE,UAAU;aACvB,CAAC,CAAC;YAEH,MAAM,MAAM,CAAC,aAAa,CAAC;gBACzB,oBAAoB,EAAE,IAAI;gBAC1B,OAAO,EAAE,CAAC,UAAU,IAAI,CAAC,KAAK,EAAE,CAAC;aAClC,CAAC,CAAC;YAEH,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC;gBACrC,WAAW,EAAE,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBAC5C,IAAI,EAAE,KAAK;oBACX,KAAK,EAAE,MAAM;iBACd,CAAC,CAAC;aACJ,CAAC,CAAC;YAEH,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;YAE7D,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE,CAAC;gBAClC,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;gBACrC,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;gBACxE,IAAI,CAAC,SAAS,EAAE,CAAC;oBACf,MAAM,IAAI,KAAK,CAAC,iCAAiC,MAAM,EAAE,CAAC,CAAC;gBAC7D,CAAC;gBAED,MAAM,gBAAgB,GAAG,MAAM,MAAM,CAAC,4BAA4B,CAAC,SAAS,CAAC,CAAC;gBAC9E,MAAM,WAAW,GAAG,IAAI,CAAC,6BAA6B,CAAC,gBAAgB,CAAC,CAAC;gBACzE,MAAM,eAAe,GAAG,mBAAmB,MAAM,EAAE,CAAC;gBAEpD,OAAO,CAAC,GAAG,CAAC,6BAA6B,eAAe,KAAK,WAAW,EAAE,CAAC,CAAC;gBAE5E,MAAM,qBAAqB,GAAG,IAAI,CAAC,eAAe,CAChD,eAAe,EACf,CAAC,KAAK,CAAC,EACP,CAAC,QAAsB,EAAoB,EAAE;oBAC3C,IAAI,QAAQ,CAAC,IAAI,KAAK,eAAe,IAAI,QAAQ,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;wBACjE,OAAO;4BACL,IAAI,EAAE,QAAQ,CAAC,IAAI;4BACnB,IAAI,EAAE,KAAK;4BACX,KAAK,EAAE,IAAI;4BACX,GAAG,EAAE,GAAG;4BACR,IAAI,EAAE,CAAC,WAAW,CAAC;yBACpB,CAAC;oBACJ,CAAC;oBACD,OAAO,IAAI,CAAC;gBACd,CAAC,CACF,CAAC;gBAEF,iBAAiB,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,qBAAqB,EAAE,CAAC,CAAC;gBACxE,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;gBACxD,MAAM,MAAM,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;gBAC1C,MAAM,MAAM,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;gBAC3C,OAAO,CAAC,GAAG,CAAC,iBAAiB,MAAM,0BAA0B,CAAC,CAAC;YACjE,CAAC;YAED,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,iBAAiB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YACrF,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,mBAAmB,CAAC,KAAK,EAAE;gBAC/D,aAAa,EAAE,IAAI;gBACnB,iBAAiB,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE;gBAClD,kBAAkB,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE;aACrD,CAAC,CAAC;YAEH,OAAO,CAAC,EAAE,CAAC,aAAa,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;YAMpD,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC;gBACjD,UAAU,EAAE,iBAAiB,CAAC,CAAC,CAAC;gBAChC,QAAQ,EAAE,iBAAiB;aAC5B,CAAyB,CAAC;YAE3B,MAAM,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC;YACjD,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;YAEvD,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,iBAAiB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACjF,OAAO,CAAC,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;YAEhD,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,WAAW,CAAC;YACrC,IAAI,CAAC,OAAO,CAAC,QAAQ,GAAG,UAAU,CAAC;YAEnC,yCAAyC;YACzC,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;gBACvB,IAAI,CAAC;oBACH,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;gBACzD,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,OAAO,CAAC,KAAK,CAAC,sCAAsC,EAAE,GAAG,CAAC,CAAC;gBAC7D,CAAC;YACH,CAAC;YAED,OAAO;gBACL,IAAI,EAAE,WAAW;gBACjB,GAAG,EAAE,UAAU;gBACf,OAAO,EAAE,IAAI;aACd,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAC;YAC1D,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QAC/C,CAAC;gBAAS,CAAC;YACT,KAAK,MAAM,OAAO,IAAI,iBAAiB,EAAE,CAAC;gBACxC,oDAAoD;gBACpD,kEAAkE;gBAClE,0DAA0D;gBAC1D,OAAO,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;gBAClC,OAAO,CAAC,GAAG,CAAC,oCAAoC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;YACpE,CAAC;QACH,CAAC;IACH,CAAC;IAED;;OAEG;IACI,uBAAuB,CAAC,WAAqB;QAClD,MAAM,iBAAiB,GAAa,EAAE,CAAC;QAEvC,KAAK,MAAM,MAAM,IAAI,WAAW,EAAE,CAAC;YACjC,IAAI,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC5B,MAAM,UAAU,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;gBACvC,IAAI,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,EAAE,CAAC;oBAC3C,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACjC,CAAC;YACH,CAAC;iBAAM,IAAI,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC9C,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACjC,CAAC;QACH,CAAC;QAED,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAED,qEAAqE;IAErE;;;;;;OAMG;IACK,YAAY,CAAC,KAAqB;QAMxC,MAAM,OAAO,GAAoB,EAAE,CAAC;QACpC,MAAM,kBAAkB,GAA4B,EAAE,CAAC;QACvD,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACnD,IAAI,yBAAyB,GAAG,KAAK,CAAC;QACtC,IAAI,UAAU,GAAG,KAAK,CAAC;QAEvB,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;YAChC,MAAM,sBAAsB,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAC1D,MAAM,sBAAsB,GAAG,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACpD,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,sBAAsB,CAAC,CAAC;YAC9D,uEAAuE;YACvE,sEAAsE;YACtE,uEAAuE;YACvE,mEAAmE;YACnE,eAAe;YACf,IACE,YAAY;gBACZ,CAAC,sBAAsB,KAAK,YAAY;oBACtC,IAAI,CAAC,yBAAyB,CAAC,sBAAsB,CAAC,CAAC,EACzD,CAAC;gBACD,UAAU,GAAG,IAAI,CAAC;YACpB,CAAC;YACD,MAAM,QAAQ,GAAiB;gBAC7B,IAAI,EAAE,sBAAsB;gBAC5B,IAAI,EAAE,sBAAsB;gBAC5B,KAAK,EAAE,CAAC,CAAC,KAAK;aACf,CAAC;YAEF,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACzC,MAAM,uBAAuB,GAAG,YAAY,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC;gBACzE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,sBAAsB,EAAE,uBAAuB,CAAC,EAAE,CAAC;oBAClF,SAAS;gBACX,CAAC;gBACD,gEAAgE;gBAChE,8BAA8B;gBAC9B,UAAU,GAAG,IAAI,CAAC;gBAElB,MAAM,qBAAqB,GAAG,YAAY,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;gBACnG,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,CAAC;oBAC5D,SAAS;gBACX,CAAC;gBAED,IAAI,YAAY,CAAC,SAAS,KAAK,eAAe,IAAI,CAAC,YAAY,EAAE,CAAC;oBAChE,2DAA2D;oBAC3D,kEAAkE;oBAClE,4BAA4B;oBAC5B,kBAAkB,CAAC,IAAI,CAAC;wBACtB,YAAY,EAAE,sBAAsB;wBACpC,YAAY,EAAE,sBAAsB;wBACpC,aAAa,EAAE,YAAY,CAAC,aAAa;wBACzC,SAAS,EAAE,YAAY,CAAC,EAAE;wBAC1B,KAAK,EAAE,YAAY,CAAC,KAAK;qBAC1B,CAAC,CAAC;oBACH,SAAS;gBACX,CAAC;gBAED,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;gBAC9C,IAAI,MAAM,EAAE,CAAC;oBACX,OAAO,CAAC,IAAI,CAAC;wBACX,IAAI,EAAE,MAAM,CAAC,IAAI;wBACjB,IAAI,EAAE,MAAM,CAAC,IAAI;wBACjB,KAAK,EAAE,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,IAAI,CAAC;wBACvE,GAAG,EAAE,MAAM,CAAC,GAAG,IAAI,GAAG;wBACtB,IAAI,EAAE,MAAM,CAAC,IAAI;qBAClB,CAAC,CAAC;oBACH,IAAI,YAAY,CAAC,SAAS,KAAK,mBAAmB,IAAI,CAAC,YAAY,EAAE,CAAC;wBACpE,yBAAyB,GAAG,IAAI,CAAC;oBACnC,CAAC;gBACH,CAAC;YACH,CAAC;YAED,uEAAuE;YACvE,IACE,OAAO,CAAC,MAAM,KAAK,CAAC;gBACpB,sBAAsB,KAAK,KAAK;gBAChC,YAAY;gBACZ,sBAAsB,KAAK,YAAY,EACvC,CAAC;gBACD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC,CAAC;YACtD,CAAC;QACH,CAAC;QAED,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,iEAAiE;YACjE,8CAA8C;YAC9C,OAAO;gBACL,OAAO;gBACP,YAAY,EACV,aAAa,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,wBAAwB;gBACnF,aAAa;gBACb,kBAAkB;aACnB,CAAC;QACJ,CAAC;QAED,IAAI,aAAa,EAAE,CAAC;YAClB,kEAAkE;YAClE,oEAAoE;YACpE,sEAAsE;YACtE,4DAA4D;YAC5D,OAAO;gBACL,OAAO;gBACP,YAAY,EAAE,UAAU,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,wBAAwB;gBAC7E,aAAa;gBACb,kBAAkB;aACnB,CAAC;QACJ,CAAC;QAED,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,aAAa,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC;IACvF,CAAC;IAED,6EAA6E;IACrE,aAAa,CAAC,IAAY;QAChC,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAC/C,CAAC;IAED,2DAA2D;IACnD,4BAA4B;QAClC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,MAAM;YAC7C,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB;YACjC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAC5B;aACE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;aACvC,MAAM,CAAC,OAAO,CAAC;aACf,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;IAED,mEAAmE;IAC3D,WAAW,CAAC,IAAY;QAC9B,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAChD,OAAO,CACL,IAAI,CAAC,4BAA4B,EAAE,CAAC,IAAI,CACtC,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,KAAK,IAAI,IAAI,cAAc,CAAC,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAC,CACzE,IAAI,IAAI,CACV,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACK,gCAAgC,CAAC,aAAqB;QAC5D,OAAO,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,KAAK,IAAI,CAAC;IAClD,CAAC;IAED;;;;;;;;;;;OAWG;IACK,yBAAyB,CAAC,IAAY;QAC5C,IAAI,IAAI,CAAC,4BAA4B,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;YAClF,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,EAAE;YACzC,MAAM,OAAO,GAAG,YAAY,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC;YACzD,OAAO,CACL,OAAO,CAAC,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAC;gBAC5B,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,eAAe,IAAI,EAAE,EAAE,OAAO,CAAC,CAC5D,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,mFAAmF;IAC3E,kBAAkB,CAAC,IAAY;QACrC,OAAO;YACL,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,KAAK;YACX,KAAK,EAAE,IAAI;YACX,GAAG,EAAE,IAAI;YACT,IAAI,EAAE;gBACJ,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,iBAAiB,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;gBACzE,KAAK,EAAE,cAAc,IAAI,EAAE;gBAC3B,MAAM,EAAE,IAAI,CAAC,SAAS;gBACtB,OAAO,EAAE,IAAI;gBACb,KAAK,EAAE,GAAG;gBACV,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,KAAK;aACf;SACF,CAAC;IACJ,CAAC;IAED,8EAA8E;IACtE,gBAAgB,CAAC,KAAqB;QAC5C,IAAI,KAAK,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAC9C,MAAM,YAAY,GAAG,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QACxF,MAAM,WAAW,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QACpC,OAAO,WAAW,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,WAAW,CAAC;YACtE,CAAC,CAAC,WAAW;YACb,CAAC,CAAC,IAAI,CAAC;IACX,CAAC;IAEO,6BAA6B,CAAC,gBAAwB;QAC5D,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM;aAC1B,UAAU,CAAC,QAAQ,CAAC;aACpB,MAAM,CAAC,gBAAgB,CAAC;aACxB,MAAM,CAAC,QAAQ,CAAC;aAChB,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;aACnB,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;aACnB,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAErB,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,gBAAgB,CAAC,EAAU;QACjC,MAAM,WAAW,GAAG,6FAA6F,CAAC;QAClH,MAAM,WAAW,GAAG,qDAAqD,CAAC;QAC1E,OAAO,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACtD,CAAC;IAEO,qBAAqB,CAAC,MAAc;QAC1C,oEAAoE;QACpE,sEAAsE;QACtE,wEAAwE;QACxE,wEAAwE;QACxE,wCAAwC;QACxC,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC;IAC3C,CAAC;CACF"}
|
|
803
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.dnsserver.js","sourceRoot":"","sources":["../ts_server/classes.dnsserver.ts"],"names":[],"mappings":"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"}
|
|
@@ -130,6 +130,10 @@ export declare class RustDnsBridge extends plugins.events.EventEmitter {
|
|
|
130
130
|
* Kill the Rust process.
|
|
131
131
|
*/
|
|
132
132
|
kill(): void;
|
|
133
|
+
/**
|
|
134
|
+
* Terminate the Rust process and resolve only after closure is confirmed.
|
|
135
|
+
*/
|
|
136
|
+
terminate(): Promise<void>;
|
|
133
137
|
/**
|
|
134
138
|
* Whether the bridge is running.
|
|
135
139
|
*/
|
|
@@ -23,6 +23,9 @@ export class RustDnsBridge extends plugins.events.EventEmitter {
|
|
|
23
23
|
cliArgs: ['--management'],
|
|
24
24
|
requestTimeoutMs: 30_000,
|
|
25
25
|
readyTimeoutMs: 10_000,
|
|
26
|
+
maxPendingRequestsByMethod: {
|
|
27
|
+
processPacket: 256,
|
|
28
|
+
},
|
|
26
29
|
localPaths,
|
|
27
30
|
searchSystemPath: false,
|
|
28
31
|
});
|
|
@@ -107,6 +110,12 @@ export class RustDnsBridge extends plugins.events.EventEmitter {
|
|
|
107
110
|
kill() {
|
|
108
111
|
this.bridge.kill();
|
|
109
112
|
}
|
|
113
|
+
/**
|
|
114
|
+
* Terminate the Rust process and resolve only after closure is confirmed.
|
|
115
|
+
*/
|
|
116
|
+
async terminate() {
|
|
117
|
+
await this.bridge.terminate();
|
|
118
|
+
}
|
|
110
119
|
/**
|
|
111
120
|
* Whether the bridge is running.
|
|
112
121
|
*/
|
|
@@ -137,4 +146,4 @@ function getPlatformSuffix() {
|
|
|
137
146
|
}
|
|
138
147
|
return null;
|
|
139
148
|
}
|
|
140
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
149
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5ydXN0ZG5zYnJpZGdlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHNfc2VydmVyL2NsYXNzZXMucnVzdGRuc2JyaWRnZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQTBGeEM7O0dBRUc7QUFDSCxNQUFNLE9BQU8sYUFBYyxTQUFRLE9BQU8sQ0FBQyxNQUFNLENBQUMsWUFBWTtJQUc1RDtRQUNFLEtBQUssRUFBRSxDQUFDO1FBRVIsTUFBTSxVQUFVLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQ3JDLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksR0FBRyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsUUFBUSxDQUFDLEVBQ3ZELElBQUksQ0FDTCxDQUFDO1FBRUYsMkVBQTJFO1FBQzNFLE1BQU0sY0FBYyxHQUFHLGlCQUFpQixFQUFFLENBQUM7UUFDM0MsTUFBTSxVQUFVLEdBQWEsRUFBRSxDQUFDO1FBRWhDLDBFQUEwRTtRQUMxRSxJQUFJLGNBQWMsRUFBRSxDQUFDO1lBQ25CLFVBQVUsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLFdBQVcsRUFBRSxXQUFXLGNBQWMsRUFBRSxDQUFDLENBQUMsQ0FBQztRQUMzRixDQUFDO1FBQ0QsMkNBQTJDO1FBQzNDLFVBQVUsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLFdBQVcsRUFBRSxTQUFTLENBQUMsQ0FBQyxDQUFDO1FBQ3ZFLHdCQUF3QjtRQUN4QixVQUFVLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLFNBQVMsRUFBRSxTQUFTLENBQUMsQ0FBQyxDQUFDO1FB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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartdns",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.2.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": {
|
|
@@ -40,20 +40,20 @@
|
|
|
40
40
|
"dependencies": {
|
|
41
41
|
"@push.rocks/smartdelay": "^3.0.1",
|
|
42
42
|
"@push.rocks/smartenv": "^6.0.0",
|
|
43
|
-
"@push.rocks/smartpromise": "^4.2.
|
|
44
|
-
"@push.rocks/smartrust": "^1.
|
|
43
|
+
"@push.rocks/smartpromise": "^4.2.5",
|
|
44
|
+
"@push.rocks/smartrust": "^1.8.0",
|
|
45
45
|
"@tsclass/tsclass": "^9.5.1",
|
|
46
46
|
"acme-client": "^5.4.0",
|
|
47
|
-
"minimatch": "^10.2.
|
|
47
|
+
"minimatch": "^10.2.6"
|
|
48
48
|
},
|
|
49
49
|
"devDependencies": {
|
|
50
50
|
"@git.zone/tsbuild": "^4.4.2",
|
|
51
51
|
"@git.zone/tsrun": "^2.0.6",
|
|
52
|
-
"@git.zone/tsrust": "^1.
|
|
52
|
+
"@git.zone/tsrust": "^1.10.0",
|
|
53
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.
|
|
56
|
+
"@types/node": "^26.2.0",
|
|
57
57
|
"dns-packet": "^5.6.1"
|
|
58
58
|
},
|
|
59
59
|
"files": [
|
package/readme.hints.md
CHANGED
|
@@ -23,9 +23,9 @@ TypeScript retains handler registration, ACME orchestration, and the public API.
|
|
|
23
23
|
### IPC Flow
|
|
24
24
|
```
|
|
25
25
|
DNS Query -> Rust (UDP/HTTPS) -> Parse packet
|
|
26
|
-
-> Try local resolution (localhost
|
|
26
|
+
-> Try local resolution (localhost)
|
|
27
27
|
-> If handler needed: emit "dnsQuery" event to TypeScript
|
|
28
|
-
-> TypeScript runs minimatch handlers, sends "dnsQueryResult" back
|
|
28
|
+
-> TypeScript runs minimatch handlers and authorizes DNSKEY, sends "dnsQueryResult" back
|
|
29
29
|
-> Rust builds response, signs DNSSEC if requested, sends packet
|
|
30
30
|
```
|
|
31
31
|
|
|
@@ -147,9 +147,14 @@ The test suite demonstrates:
|
|
|
147
147
|
|
|
148
148
|
Authority comes from **configuration**, never from the presence of a handler.
|
|
149
149
|
|
|
150
|
-
- `authoritativeZones`
|
|
151
|
-
|
|
152
|
-
|
|
150
|
+
- `authoritativeZones` is the single source of truth for the `aa` bit. Omission
|
|
151
|
+
falls back to `[dnssecZone]`; an explicit empty array means no authority.
|
|
152
|
+
`setAuthoritativeZones()` validates and copies a replacement set synchronously,
|
|
153
|
+
so listeners stay up while subsequent queries see the new authority.
|
|
154
|
+
- DNSKEY queries for `dnssecZone` cross the TypeScript query callback before
|
|
155
|
+
Rust synthesizes the signed RRset. This keeps built-in DNSSEC answers inside
|
|
156
|
+
the same live authority boundary; an empty set cannot leak an authoritative
|
|
157
|
+
DNSKEY answer from the fixed Rust configuration.
|
|
153
158
|
- `registerHandler(pattern, types, handler, options?)` takes
|
|
154
159
|
`options.authority`:
|
|
155
160
|
- `'authoritative'` (default) — the handler only contributes for names inside
|
|
@@ -231,8 +236,12 @@ authoritative by definition, not by delegation.
|
|
|
231
236
|
compress names, so record sizes are additive (`DnsPacket::encoded_len`).
|
|
232
237
|
`processRawDnsPacketAsync(packet, 'udp')` declares the same UDP bound for the
|
|
233
238
|
manual path (`handleUdpMessage` passes it automatically); without the hint no
|
|
234
|
-
size bound is applied, which is correct for TCP and DoH framing.
|
|
235
|
-
|
|
239
|
+
size bound is applied, which is correct for TCP and DoH framing. Manual packet
|
|
240
|
+
work runs through a bounded task set so the management loop remains available
|
|
241
|
+
for handler callbacks and their results. The TypeScript bridge mirrors the
|
|
242
|
+
Rust task bound by admitting at most 256 pending `processPacket` requests;
|
|
243
|
+
excess requests fail before serialization with
|
|
244
|
+
`ERR_RUST_BRIDGE_REQUEST_LIMIT`, while control methods remain unbounded.
|
|
236
245
|
- **RA** is cleared on every path — this server never recurses.
|
|
237
246
|
- **RDATA validation** fails closed: a handler returning an unencodable value
|
|
238
247
|
(for example a non-IPv4 string for an A record) produces SERVFAIL and an error
|
|
@@ -247,6 +256,25 @@ authoritative by definition, not by delegation.
|
|
|
247
256
|
carrying the handler `id`, `domainPattern` and `owner`. Wire this up: the
|
|
248
257
|
original incident was invisible for weeks because nothing surfaced it.
|
|
249
258
|
|
|
259
|
+
## Server Lifecycle
|
|
260
|
+
|
|
261
|
+
- `start()` and `stop()` share a serialized lifecycle queue. Each caller keeps
|
|
262
|
+
its own operation result, and a rejection does not poison later operations.
|
|
263
|
+
- Repeated `start()` calls are idempotent at the `DnsServer` facade. Rust also
|
|
264
|
+
rejects duplicate active `start` commands, so low-level bridge callers cannot
|
|
265
|
+
replace listeners while detached HTTPS connection work still exists.
|
|
266
|
+
- `stop()` awaits confirmed Rust child closure before clearing ownership and
|
|
267
|
+
legacy server markers. A failed termination retains them so cleanup can be
|
|
268
|
+
retried safely.
|
|
269
|
+
- If an operation and confirmed cleanup both fail, both errors are preserved in
|
|
270
|
+
an `AggregateError`. A failed stop command is suppressed only after process
|
|
271
|
+
closure has been confirmed.
|
|
272
|
+
- A server may be started again after a confirmed stop; smartrust activates a
|
|
273
|
+
fresh process generation on the same bridge.
|
|
274
|
+
- Packet IPC is admitted only while no lifecycle operation is queued and the
|
|
275
|
+
facade state, ownership marker, and bridge liveness all agree. Certificate
|
|
276
|
+
updates use the same queue so they cannot race startup or shutdown.
|
|
277
|
+
|
|
250
278
|
## Known Limitations
|
|
251
279
|
|
|
252
280
|
1. **Handler Deduplication**: If the same handler is registered multiple times, it will contribute duplicate records (this may be desired behavior for some use cases)
|
|
@@ -254,18 +282,6 @@ authoritative by definition, not by delegation.
|
|
|
254
282
|
3. **SOA serial does not track zone changes** — it is a process-lifetime
|
|
255
283
|
constant, not a change counter. Secondaries driven by AXFR/IXFR are not
|
|
256
284
|
supported.
|
|
257
|
-
4. **Manual-path (`processPacket`) queries deadlock on handler resolution**
|
|
258
|
-
— pre-existing, not introduced by the v8 hardening. The IPC select loop in
|
|
259
|
-
`rust/crates/rustdns/src/management.rs` awaits `handle_request` inline, so
|
|
260
|
-
while `handle_process_packet` waits for the TypeScript `dnsQuery` callback
|
|
261
|
-
the loop can neither emit the query event nor read its result; every
|
|
262
|
-
handler-backed query through `processRawDnsPacketAsync` /
|
|
263
|
-
`handleUdpMessage` times out to SERVFAIL after 10 s. The built-in UDP, TCP
|
|
264
|
-
and DoH listeners are unaffected (they resolve outside the IPC request
|
|
265
|
-
loop). The `transport: 'udp'` truncation contract on this path is wired
|
|
266
|
-
and unit-tested but cannot be observed end-to-end until the loop spawns
|
|
267
|
-
`processPacket` handling instead of awaiting it inline. No test exercises
|
|
268
|
-
`processRawDnsPacketAsync`; fixing this needs its own release.
|
|
269
285
|
## Static Rust Binaries
|
|
270
286
|
|
|
271
287
|
- The Rust binaries in `dist_rust/` are statically linked (static-pie) via `"static": true` in the `@git.zone/tsrust` block of `.smartconfig.json` (tsrust >= 1.4.1). They run on both glibc (Debian/Ubuntu) and musl (Alpine) systems.
|
package/readme.md
CHANGED
|
@@ -270,7 +270,7 @@ interface IDnsServerOptions {
|
|
|
270
270
|
httpsKey: string; // PEM private key (path or content)
|
|
271
271
|
httpsCert: string; // PEM certificate (path or content)
|
|
272
272
|
dnssecZone: string; // Zone for DNSSEC signing
|
|
273
|
-
authoritativeZones?: string[]; //
|
|
273
|
+
authoritativeZones?: string[]; // Omitted defaults to [dnssecZone]; [] claims no zone
|
|
274
274
|
primaryNameserver?: string; // SOA mname field (default: 'ns1.{dnssecZone}')
|
|
275
275
|
udpBindInterface?: string; // IP to bind UDP (default: '0.0.0.0')
|
|
276
276
|
tcpBindInterface?: string; // IP to bind TCP (defaults to udpBindInterface)
|
|
@@ -316,12 +316,32 @@ await server.start();
|
|
|
316
316
|
// DNS Server started (UDP: 0.0.0.0:5333, TCP: 0.0.0.0:5333, HTTPS: 0.0.0.0:8443)
|
|
317
317
|
```
|
|
318
318
|
|
|
319
|
+
Calling `start()` again while this `DnsServer` is running is an idempotent
|
|
320
|
+
no-op. After a confirmed `stop()`, the same instance can be started again with
|
|
321
|
+
a fresh Rust process.
|
|
322
|
+
|
|
319
323
|
### Handler System 🎯
|
|
320
324
|
|
|
321
325
|
Handlers use **glob patterns** (via `minimatch`) to match incoming query names. Multiple handlers can contribute records to the same response.
|
|
322
326
|
|
|
323
327
|
Registering a handler does **not** make the server authoritative for the matched names. Authority comes solely from `authoritativeZones` (falling back to `dnssecZone`): list every zone you serve there, or queries for it are withheld. A default-authority handler whose match falls outside every configured zone is suppressed and reported on the `refused` event; register with `{ authority: 'non-authoritative' }` to deliberately serve out-of-zone names without the `aa` bit or DNSSEC signatures.
|
|
324
328
|
|
|
329
|
+
Replace the live authority set without restarting UDP, TCP, or HTTPS listeners:
|
|
330
|
+
|
|
331
|
+
```typescript
|
|
332
|
+
server.setAuthoritativeZones(['example.com', 'example.net']);
|
|
333
|
+
server.setAuthoritativeZones([]); // explicitly claim no zone
|
|
334
|
+
```
|
|
335
|
+
|
|
336
|
+
The constructor copies its supplied array, and `setAuthoritativeZones()` validates
|
|
337
|
+
and copies replacements. Omitting `authoritativeZones` from the constructor
|
|
338
|
+
retains the backward-compatible `[dnssecZone]` default; passing or setting an
|
|
339
|
+
empty array does not fall back. DNSKEY answers for
|
|
340
|
+
`dnssecZone` pass through the same live authority decision, so removing the last
|
|
341
|
+
zone also removes the last DNSSEC authority claim. RFC 6761 `localhost` handling
|
|
342
|
+
is the deliberate exception: while enabled, built-in localhost A/AAAA answers
|
|
343
|
+
remain authoritative even when the configured zone set is empty.
|
|
344
|
+
|
|
325
345
|
```typescript
|
|
326
346
|
// Exact domain
|
|
327
347
|
server.registerHandler('example.com', ['A'], handler);
|
|
@@ -382,7 +402,7 @@ DNSSEC is enabled automatically when you set the `dnssecZone` option. The Rust b
|
|
|
382
402
|
|
|
383
403
|
- **Key generation** — ECDSA P-256 (algorithm 13) by default
|
|
384
404
|
- **DNSKEY / DS record** generation
|
|
385
|
-
- **RRSIG signing** for
|
|
405
|
+
- **RRSIG signing** for authoritative answers when the query requests DNSSEC
|
|
386
406
|
- **NSEC records** for authenticated denial of existence
|
|
387
407
|
|
|
388
408
|
```typescript
|
|
@@ -428,7 +448,7 @@ const server = new DnsServer({
|
|
|
428
448
|
|
|
429
449
|
### Let's Encrypt Integration 🔒
|
|
430
450
|
|
|
431
|
-
Built-in ACME DNS-01 challenge support for automatic SSL certificates. Challenge TXT handlers are registered at default authority, so DNS-01 validation only completes for domains inside `authoritativeZones
|
|
451
|
+
Built-in ACME DNS-01 challenge support for automatic SSL certificates. Challenge TXT handlers are registered at default authority, so DNS-01 validation only completes for domains inside `authoritativeZones`, or inside `dnssecZone` when `authoritativeZones` is omitted:
|
|
432
452
|
|
|
433
453
|
```typescript
|
|
434
454
|
const server = new DnsServer({
|
|
@@ -533,6 +553,12 @@ const udpResponse = await server.processRawDnsPacketAsync(packetBuffer, 'udp');
|
|
|
533
553
|
|
|
534
554
|
Manual TCP callers must handle DNS-over-TCP's two-byte length prefix themselves and pass only the raw DNS packet payload to `processRawDnsPacketAsync()`.
|
|
535
555
|
|
|
556
|
+
At most 256 `processRawDnsPacketAsync()` calls may be pending at once. Additional
|
|
557
|
+
calls reject before transport writes with a `RustBridgeRequestError` whose code
|
|
558
|
+
is `ERR_RUST_BRIDGE_REQUEST_LIMIT`; control and callback commands remain
|
|
559
|
+
available while packet work is saturated. New packet calls are also rejected
|
|
560
|
+
while `start()`, `stop()`, or a certificate update is queued or running.
|
|
561
|
+
|
|
536
562
|
#### Load Balancing Example
|
|
537
563
|
|
|
538
564
|
```typescript
|
|
@@ -560,7 +586,9 @@ for (let i = 0; i < numCPUs; i++) {
|
|
|
560
586
|
await server.stop();
|
|
561
587
|
```
|
|
562
588
|
|
|
563
|
-
|
|
589
|
+
`stop()` is serialized with `start()` and resolves only after the Rust process
|
|
590
|
+
has closed and its bound sockets are released. If confirmed termination fails,
|
|
591
|
+
the call rejects and retains ownership so a later `stop()` can retry cleanup.
|
|
564
592
|
|
|
565
593
|
---
|
|
566
594
|
|
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.2.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
|
}
|