@serve.zone/dcrouter 15.0.1 → 15.0.3
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/deno.json +1 -1
- package/dist_serve/bundle.js +768 -768
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/acme/classes.smartacme-lifecycle.d.ts +25 -0
- package/dist_ts/acme/classes.smartacme-lifecycle.js +144 -0
- package/dist_ts/acme/index.d.ts +1 -0
- package/dist_ts/acme/index.js +2 -1
- package/dist_ts/classes.dcrouter.d.ts +21 -139
- package/dist_ts/classes.dcrouter.js +71 -1585
- package/dist_ts/dns/classes.dns-server-runtime.d.ts +37 -0
- package/dist_ts/dns/classes.dns-server-runtime.js +449 -0
- package/dist_ts/dns/index.d.ts +1 -0
- package/dist_ts/dns/index.js +2 -1
- package/dist_ts/email/classes.accepted-email-spool.d.ts +55 -0
- package/dist_ts/email/classes.accepted-email-spool.js +345 -0
- package/dist_ts/email/classes.email-route-builder.d.ts +28 -0
- package/dist_ts/email/classes.email-route-builder.js +260 -0
- package/dist_ts/email/index.d.ts +2 -0
- package/dist_ts/email/index.js +3 -1
- package/dist_ts/opsserver/handlers/gatewayclient.handler.js +10 -8
- package/dist_ts/remoteingress/classes.hub-lifecycle.d.ts +27 -0
- package/dist_ts/remoteingress/classes.hub-lifecycle.js +241 -0
- package/dist_ts/remoteingress/classes.remoteingress-manager.d.ts +1 -2
- package/dist_ts/remoteingress/index.d.ts +1 -0
- package/dist_ts/remoteingress/index.js +2 -1
- package/dist_ts/security/classes.route-policy-augmenter.d.ts +22 -0
- package/dist_ts/security/classes.route-policy-augmenter.js +120 -0
- package/dist_ts/security/index.d.ts +1 -0
- package/dist_ts/security/index.js +2 -1
- package/dist_ts/vpn/classes.vpn-access-resolver.d.ts +34 -0
- package/dist_ts/vpn/classes.vpn-access-resolver.js +101 -0
- package/dist_ts/vpn/index.d.ts +1 -0
- package/dist_ts/vpn/index.js +2 -1
- package/dist_ts_migrations/index.js +92 -9
- package/dist_ts_web/00_commitinfo_data.js +1 -1
- package/dist_ts_web/appstate/acme.d.ts +17 -0
- package/dist_ts_web/appstate/acme.js +64 -0
- package/dist_ts_web/appstate/certificates.d.ts +37 -0
- package/dist_ts_web/appstate/certificates.js +107 -0
- package/dist_ts_web/appstate/config.d.ts +9 -0
- package/dist_ts_web/appstate/config.js +35 -0
- package/dist_ts_web/appstate/domains.d.ts +80 -0
- package/dist_ts_web/appstate/domains.js +324 -0
- package/dist_ts_web/appstate/email-domains.d.ts +25 -0
- package/dist_ts_web/appstate/email-domains.js +104 -0
- package/dist_ts_web/appstate/email-ops.d.ts +10 -0
- package/dist_ts_web/appstate/email-ops.js +40 -0
- package/dist_ts_web/appstate/login.d.ts +30 -0
- package/dist_ts_web/appstate/login.js +83 -0
- package/dist_ts_web/appstate/logs.d.ts +16 -0
- package/dist_ts_web/appstate/logs.js +27 -0
- package/dist_ts_web/appstate/network.d.ts +50 -0
- package/dist_ts_web/appstate/network.js +122 -0
- package/dist_ts_web/appstate/profiles-targets.d.ts +45 -0
- package/dist_ts_web/appstate/profiles-targets.js +173 -0
- package/dist_ts_web/appstate/remoteingress.d.ts +47 -0
- package/dist_ts_web/appstate/remoteingress.js +204 -0
- package/dist_ts_web/appstate/routes.d.ts +76 -0
- package/dist_ts_web/appstate/routes.js +316 -0
- package/dist_ts_web/appstate/runtime.d.ts +1 -0
- package/dist_ts_web/appstate/runtime.js +276 -0
- package/dist_ts_web/appstate/security.d.ts +29 -0
- package/dist_ts_web/appstate/security.js +167 -0
- package/dist_ts_web/appstate/shared.d.ts +3 -0
- package/dist_ts_web/appstate/shared.js +13 -0
- package/dist_ts_web/appstate/stats.d.ts +15 -0
- package/dist_ts_web/appstate/stats.js +59 -0
- package/dist_ts_web/appstate/target-profiles.d.ts +37 -0
- package/dist_ts_web/appstate/target-profiles.js +118 -0
- package/dist_ts_web/appstate/ui.d.ts +11 -0
- package/dist_ts_web/appstate/ui.js +55 -0
- package/dist_ts_web/appstate/users.d.ts +27 -0
- package/dist_ts_web/appstate/users.js +85 -0
- package/dist_ts_web/appstate/vpn.d.ts +44 -0
- package/dist_ts_web/appstate/vpn.js +148 -0
- package/dist_ts_web/appstate.d.ts +20 -568
- package/dist_ts_web/appstate.js +24 -2418
- package/package.json +1 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/acme/classes.smartacme-lifecycle.ts +155 -0
- package/ts/acme/index.ts +1 -0
- package/ts/classes.dcrouter.ts +118 -1919
- package/ts/dns/classes.dns-server-runtime.ts +525 -0
- package/ts/dns/index.ts +1 -0
- package/ts/email/classes.accepted-email-spool.ts +434 -0
- package/ts/email/classes.email-route-builder.ts +312 -0
- package/ts/email/index.ts +2 -0
- package/ts/opsserver/handlers/gatewayclient.handler.ts +9 -7
- package/ts/remoteingress/classes.hub-lifecycle.ts +278 -0
- package/ts/remoteingress/classes.remoteingress-manager.ts +1 -1
- package/ts/remoteingress/index.ts +1 -0
- package/ts/security/classes.route-policy-augmenter.ts +140 -0
- package/ts/security/index.ts +1 -0
- package/ts/vpn/classes.vpn-access-resolver.ts +126 -0
- package/ts/vpn/index.ts +1 -0
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/ts_web/appstate/acme.ts +93 -0
- package/ts_web/appstate/certificates.ts +159 -0
- package/ts_web/appstate/config.ts +49 -0
- package/ts_web/appstate/domains.ts +429 -0
- package/ts_web/appstate/email-domains.ts +155 -0
- package/ts_web/appstate/email-ops.ts +57 -0
- package/ts_web/appstate/login.ts +128 -0
- package/ts_web/appstate/logs.ts +50 -0
- package/ts_web/appstate/network.ts +161 -0
- package/ts_web/appstate/profiles-targets.ts +240 -0
- package/ts_web/appstate/remoteingress.ts +300 -0
- package/ts_web/appstate/routes.ts +447 -0
- package/ts_web/appstate/runtime.ts +308 -0
- package/ts_web/appstate/security.ts +229 -0
- package/ts_web/appstate/shared.ts +15 -0
- package/ts_web/appstate/stats.ts +79 -0
- package/ts_web/appstate/target-profiles.ts +164 -0
- package/ts_web/appstate/ui.ts +75 -0
- package/ts_web/appstate/users.ts +133 -0
- package/ts_web/appstate/vpn.ts +234 -0
- package/ts_web/appstate.ts +24 -3403
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import * as plugins from '../plugins.js';
|
|
2
|
+
import type { DcRouter } from '../classes.dcrouter.js';
|
|
3
|
+
/**
|
|
4
|
+
* Sets up and feeds the embedded authoritative smartdns server: validates the
|
|
5
|
+
* DNS configuration, generates authoritative/email/DKIM records, applies
|
|
6
|
+
* proxy-IP replacement, registers record handlers, wires rate-limited query
|
|
7
|
+
* logging/metrics, and provides the DoH socket handler for SmartProxy routes.
|
|
8
|
+
*/
|
|
9
|
+
export declare class DnsServerRuntime {
|
|
10
|
+
private dcRouterRef;
|
|
11
|
+
private logWindowSecond;
|
|
12
|
+
private logWindowCount;
|
|
13
|
+
private batchCount;
|
|
14
|
+
private batchTimer;
|
|
15
|
+
constructor(dcRouterRef: DcRouter);
|
|
16
|
+
/**
|
|
17
|
+
* Create the DNS server, start it on UDP, wire metrics/logging, and
|
|
18
|
+
* register all generated records.
|
|
19
|
+
*/
|
|
20
|
+
setup(): Promise<void>;
|
|
21
|
+
/**
|
|
22
|
+
* Create the DoH socket handler SmartProxy routes hand TLS sockets to.
|
|
23
|
+
*/
|
|
24
|
+
createSocketHandler(): (socket: plugins.net.Socket) => Promise<void>;
|
|
25
|
+
/** Flush the pending rate-limited query-log batch and reset logging state. */
|
|
26
|
+
flushQueryLogBatch(): void;
|
|
27
|
+
private registerRecords;
|
|
28
|
+
private parseRecordData;
|
|
29
|
+
private validateConfiguration;
|
|
30
|
+
private generateEmailDnsRecords;
|
|
31
|
+
private loadDkimRecords;
|
|
32
|
+
private initializeDkimForEmailDomains;
|
|
33
|
+
private generateAuthoritativeRecords;
|
|
34
|
+
private extractDomain;
|
|
35
|
+
private applyProxyIpReplacement;
|
|
36
|
+
private detectServerPublicIp;
|
|
37
|
+
}
|
|
@@ -0,0 +1,449 @@
|
|
|
1
|
+
import * as plugins from '../plugins.js';
|
|
2
|
+
import * as paths from '../paths.js';
|
|
3
|
+
import { logger } from '../logger.js';
|
|
4
|
+
import { buildEmailDnsRecords } from '../email/index.js';
|
|
5
|
+
/**
|
|
6
|
+
* Sets up and feeds the embedded authoritative smartdns server: validates the
|
|
7
|
+
* DNS configuration, generates authoritative/email/DKIM records, applies
|
|
8
|
+
* proxy-IP replacement, registers record handlers, wires rate-limited query
|
|
9
|
+
* logging/metrics, and provides the DoH socket handler for SmartProxy routes.
|
|
10
|
+
*/
|
|
11
|
+
export class DnsServerRuntime {
|
|
12
|
+
dcRouterRef;
|
|
13
|
+
// Adaptive query-log rate limiting state
|
|
14
|
+
logWindowSecond = 0; // epoch second of current window
|
|
15
|
+
logWindowCount = 0; // queries logged this second
|
|
16
|
+
batchCount = 0;
|
|
17
|
+
batchTimer = null;
|
|
18
|
+
constructor(dcRouterRef) {
|
|
19
|
+
this.dcRouterRef = dcRouterRef;
|
|
20
|
+
}
|
|
21
|
+
/**
|
|
22
|
+
* Create the DNS server, start it on UDP, wire metrics/logging, and
|
|
23
|
+
* register all generated records.
|
|
24
|
+
*/
|
|
25
|
+
async setup() {
|
|
26
|
+
const options = this.dcRouterRef.options;
|
|
27
|
+
if (!options.dnsNsDomains || options.dnsNsDomains.length === 0) {
|
|
28
|
+
throw new Error('dnsNsDomains is required for DNS server setup');
|
|
29
|
+
}
|
|
30
|
+
if (!options.dnsScopes || options.dnsScopes.length === 0) {
|
|
31
|
+
throw new Error('dnsScopes is required for DNS server setup');
|
|
32
|
+
}
|
|
33
|
+
const primaryNameserver = options.dnsNsDomains[0];
|
|
34
|
+
logger.log('info', `Setting up DNS server with primary nameserver: ${primaryNameserver}`);
|
|
35
|
+
// Get VM IP address for UDP binding
|
|
36
|
+
const networkInterfaces = plugins.os.networkInterfaces();
|
|
37
|
+
let vmIpAddress = options.dnsBindInterface || '0.0.0.0'; // Default to all interfaces
|
|
38
|
+
// Try to find the VM's internal IP address when no explicit bind address is configured.
|
|
39
|
+
if (!options.dnsBindInterface) {
|
|
40
|
+
interfaceLoop: for (const [_name, interfaces] of Object.entries(networkInterfaces)) {
|
|
41
|
+
if (interfaces) {
|
|
42
|
+
for (const iface of interfaces) {
|
|
43
|
+
if (!iface.internal && iface.family === 'IPv4') {
|
|
44
|
+
vmIpAddress = iface.address;
|
|
45
|
+
break interfaceLoop;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
// Create DNS server instance with manual HTTPS mode
|
|
52
|
+
const dnsServer = new plugins.smartdns.dnsServerMod.DnsServer({
|
|
53
|
+
udpPort: 53,
|
|
54
|
+
udpBindInterface: vmIpAddress,
|
|
55
|
+
httpsPort: 443, // Required but won't bind due to manual mode
|
|
56
|
+
manualHttpsMode: true, // Enable manual HTTPS socket handling
|
|
57
|
+
dnssecZone: primaryNameserver,
|
|
58
|
+
primaryNameserver: primaryNameserver, // Automatically generates correct SOA records
|
|
59
|
+
// For now, use self-signed cert until we integrate with Let's Encrypt
|
|
60
|
+
httpsKey: '',
|
|
61
|
+
httpsCert: ''
|
|
62
|
+
});
|
|
63
|
+
this.dcRouterRef.dnsServer = dnsServer;
|
|
64
|
+
// Start the DNS server (UDP only)
|
|
65
|
+
await dnsServer.start();
|
|
66
|
+
logger.log('info', `DNS server started on UDP ${vmIpAddress}:53`);
|
|
67
|
+
// Wire DNS query events to MetricsManager and logger with adaptive rate limiting
|
|
68
|
+
if (this.dcRouterRef.metricsManager) {
|
|
69
|
+
const flushDnsBatch = () => {
|
|
70
|
+
if (this.batchCount > 0) {
|
|
71
|
+
logger.log('info', `DNS: ${this.batchCount} queries processed (rate limited)`, { zone: 'dns' });
|
|
72
|
+
this.batchCount = 0;
|
|
73
|
+
}
|
|
74
|
+
this.batchTimer = null;
|
|
75
|
+
};
|
|
76
|
+
dnsServer.on('query', (event) => {
|
|
77
|
+
// Metrics tracking
|
|
78
|
+
for (const question of event.questions) {
|
|
79
|
+
this.dcRouterRef.metricsManager?.trackDnsQuery(question.type, question.name, false, event.responseTimeMs, event.answered);
|
|
80
|
+
}
|
|
81
|
+
// Adaptive logging: individual logs up to 2/sec, then batch
|
|
82
|
+
const nowSec = Math.floor(Date.now() / 1000);
|
|
83
|
+
if (nowSec !== this.logWindowSecond) {
|
|
84
|
+
this.logWindowSecond = nowSec;
|
|
85
|
+
this.logWindowCount = 0;
|
|
86
|
+
}
|
|
87
|
+
if (this.logWindowCount < 2) {
|
|
88
|
+
this.logWindowCount++;
|
|
89
|
+
const summary = event.questions.map(q => `${q.type} ${q.name}`).join(', ');
|
|
90
|
+
logger.log('info', `DNS query: ${summary} (${event.responseTimeMs}ms, ${event.answered ? 'answered' : 'unanswered'})`, { zone: 'dns' });
|
|
91
|
+
}
|
|
92
|
+
else {
|
|
93
|
+
this.batchCount++;
|
|
94
|
+
if (!this.batchTimer) {
|
|
95
|
+
this.batchTimer = setTimeout(flushDnsBatch, 5000);
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
});
|
|
99
|
+
}
|
|
100
|
+
// Validate DNS configuration
|
|
101
|
+
await this.validateConfiguration();
|
|
102
|
+
// Generate and register authoritative records
|
|
103
|
+
const authoritativeRecords = await this.generateAuthoritativeRecords();
|
|
104
|
+
// Generate email DNS records
|
|
105
|
+
const emailDnsRecords = await this.generateEmailDnsRecords();
|
|
106
|
+
// Ensure DKIM keys exist for internal-dns domains before generating records.
|
|
107
|
+
await this.initializeDkimForEmailDomains();
|
|
108
|
+
// Generate DKIM records directly from smartmta.
|
|
109
|
+
const dkimRecords = await this.loadDkimRecords();
|
|
110
|
+
// Combine all records: authoritative, email, DKIM, and user-defined
|
|
111
|
+
const allRecords = [...authoritativeRecords, ...emailDnsRecords, ...dkimRecords];
|
|
112
|
+
if (options.dnsRecords && options.dnsRecords.length > 0) {
|
|
113
|
+
allRecords.push(...options.dnsRecords);
|
|
114
|
+
}
|
|
115
|
+
// Apply proxy IP replacement if configured
|
|
116
|
+
await this.applyProxyIpReplacement(allRecords);
|
|
117
|
+
// Register all DNS records
|
|
118
|
+
if (allRecords.length > 0) {
|
|
119
|
+
this.registerRecords(allRecords);
|
|
120
|
+
logger.log('info', `Registered ${allRecords.length} DNS records (${authoritativeRecords.length} authoritative, ${emailDnsRecords.length} email, ${dkimRecords.length} DKIM, ${options.dnsRecords?.length || 0} user-defined)`);
|
|
121
|
+
}
|
|
122
|
+
// Hand the DnsServer to DnsManager so DB-backed local records on
|
|
123
|
+
// dcrouter-hosted domains get registered too.
|
|
124
|
+
if (this.dcRouterRef.dnsManager) {
|
|
125
|
+
await this.dcRouterRef.dnsManager.attachDnsServer(dnsServer);
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
/**
|
|
129
|
+
* Create the DoH socket handler SmartProxy routes hand TLS sockets to.
|
|
130
|
+
*/
|
|
131
|
+
createSocketHandler() {
|
|
132
|
+
return async (socket) => {
|
|
133
|
+
if (!this.dcRouterRef.dnsServer) {
|
|
134
|
+
logger.log('error', 'DNS socket handler called but DNS server not initialized');
|
|
135
|
+
socket.end();
|
|
136
|
+
return;
|
|
137
|
+
}
|
|
138
|
+
// Prevent uncaught exception from socket 'error' events
|
|
139
|
+
socket.on('error', (err) => {
|
|
140
|
+
logger.log('error', `DNS socket error: ${err.message}`);
|
|
141
|
+
if (!socket.destroyed) {
|
|
142
|
+
socket.destroy();
|
|
143
|
+
}
|
|
144
|
+
});
|
|
145
|
+
logger.log('debug', 'DNS socket handler: passing socket to DnsServer');
|
|
146
|
+
try {
|
|
147
|
+
// Use the built-in socket handler from smartdns
|
|
148
|
+
// This handles HTTP/2, DoH protocol, etc.
|
|
149
|
+
await this.dcRouterRef.dnsServer.handleHttpsSocket(socket);
|
|
150
|
+
}
|
|
151
|
+
catch (error) {
|
|
152
|
+
logger.log('error', `DNS socket handler error: ${error.message}`);
|
|
153
|
+
if (!socket.destroyed) {
|
|
154
|
+
socket.destroy();
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
};
|
|
158
|
+
}
|
|
159
|
+
/** Flush the pending rate-limited query-log batch and reset logging state. */
|
|
160
|
+
flushQueryLogBatch() {
|
|
161
|
+
if (this.batchTimer) {
|
|
162
|
+
clearTimeout(this.batchTimer);
|
|
163
|
+
if (this.batchCount > 0) {
|
|
164
|
+
logger.log('info', `DNS: ${this.batchCount} queries processed (final flush)`, { zone: 'dns' });
|
|
165
|
+
}
|
|
166
|
+
this.batchTimer = null;
|
|
167
|
+
this.batchCount = 0;
|
|
168
|
+
this.logWindowSecond = 0;
|
|
169
|
+
this.logWindowCount = 0;
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
registerRecords(records) {
|
|
173
|
+
const dnsServer = this.dcRouterRef.dnsServer;
|
|
174
|
+
if (!dnsServer)
|
|
175
|
+
return;
|
|
176
|
+
// Register a separate handler for each record
|
|
177
|
+
// This ensures multiple records of the same type (like NS records) are all served
|
|
178
|
+
for (const record of records) {
|
|
179
|
+
// Register handler for this specific record
|
|
180
|
+
dnsServer.registerHandler(record.name, [record.type], (question) => {
|
|
181
|
+
// Check if this handler matches the question
|
|
182
|
+
if (question.name === record.name && question.type === record.type) {
|
|
183
|
+
return {
|
|
184
|
+
name: record.name,
|
|
185
|
+
type: record.type,
|
|
186
|
+
class: 'IN',
|
|
187
|
+
ttl: record.ttl || 300,
|
|
188
|
+
data: this.parseRecordData(record.type, record.value)
|
|
189
|
+
};
|
|
190
|
+
}
|
|
191
|
+
return null;
|
|
192
|
+
});
|
|
193
|
+
}
|
|
194
|
+
logger.log('info', `Registered ${records.length} DNS handlers (one per record)`);
|
|
195
|
+
}
|
|
196
|
+
parseRecordData(type, value) {
|
|
197
|
+
switch (type) {
|
|
198
|
+
case 'A':
|
|
199
|
+
return value; // IP address as string
|
|
200
|
+
case 'MX':
|
|
201
|
+
const [priority, exchange] = value.split(' ');
|
|
202
|
+
return { priority: parseInt(priority), exchange };
|
|
203
|
+
case 'TXT':
|
|
204
|
+
return value;
|
|
205
|
+
case 'NS':
|
|
206
|
+
return value;
|
|
207
|
+
case 'SOA':
|
|
208
|
+
// SOA format: primary-ns admin-email serial refresh retry expire minimum
|
|
209
|
+
const parts = value.split(' ');
|
|
210
|
+
return {
|
|
211
|
+
mname: parts[0],
|
|
212
|
+
rname: parts[1],
|
|
213
|
+
serial: parseInt(parts[2]),
|
|
214
|
+
refresh: parseInt(parts[3]),
|
|
215
|
+
retry: parseInt(parts[4]),
|
|
216
|
+
expire: parseInt(parts[5]),
|
|
217
|
+
minimum: parseInt(parts[6])
|
|
218
|
+
};
|
|
219
|
+
default:
|
|
220
|
+
return value;
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
async validateConfiguration() {
|
|
224
|
+
const options = this.dcRouterRef.options;
|
|
225
|
+
if (!options.dnsNsDomains || !options.dnsScopes) {
|
|
226
|
+
return;
|
|
227
|
+
}
|
|
228
|
+
logger.log('info', 'Validating DNS configuration...');
|
|
229
|
+
// Check if email domains with internal-dns are in dnsScopes
|
|
230
|
+
if (options.emailConfig?.domains) {
|
|
231
|
+
for (const domainConfig of options.emailConfig.domains) {
|
|
232
|
+
if (domainConfig.dnsMode === 'internal-dns' &&
|
|
233
|
+
!options.dnsScopes.includes(domainConfig.domain)) {
|
|
234
|
+
logger.log('warn', `Email domain '${domainConfig.domain}' with internal-dns mode is not in dnsScopes. It should be added to dnsScopes.`);
|
|
235
|
+
}
|
|
236
|
+
}
|
|
237
|
+
}
|
|
238
|
+
// Validate user-provided DNS records are within scopes
|
|
239
|
+
if (options.dnsRecords) {
|
|
240
|
+
for (const record of options.dnsRecords) {
|
|
241
|
+
const recordDomain = this.extractDomain(record.name);
|
|
242
|
+
const isInScope = options.dnsScopes.some(scope => recordDomain === scope || recordDomain.endsWith(`.${scope}`));
|
|
243
|
+
if (!isInScope) {
|
|
244
|
+
logger.log('warn', `DNS record for '${record.name}' is outside defined scopes [${options.dnsScopes.join(', ')}]`);
|
|
245
|
+
}
|
|
246
|
+
}
|
|
247
|
+
}
|
|
248
|
+
}
|
|
249
|
+
async generateEmailDnsRecords() {
|
|
250
|
+
const options = this.dcRouterRef.options;
|
|
251
|
+
const records = [];
|
|
252
|
+
if (!options.emailConfig?.domains) {
|
|
253
|
+
return records;
|
|
254
|
+
}
|
|
255
|
+
// Filter domains with internal-dns mode
|
|
256
|
+
const internalDnsDomains = options.emailConfig.domains.filter(domain => domain.dnsMode === 'internal-dns');
|
|
257
|
+
for (const domainConfig of internalDnsDomains) {
|
|
258
|
+
const domain = domainConfig.domain;
|
|
259
|
+
const ttl = domainConfig.dns?.internal?.ttl || 3600;
|
|
260
|
+
const requiredRecords = buildEmailDnsRecords({
|
|
261
|
+
domain,
|
|
262
|
+
hostname: options.emailConfig.hostname,
|
|
263
|
+
mxPriority: domainConfig.dns?.internal?.mxPriority,
|
|
264
|
+
}).filter((record) => !record.name.includes('._domainkey.'));
|
|
265
|
+
for (const record of requiredRecords) {
|
|
266
|
+
records.push({
|
|
267
|
+
name: record.name,
|
|
268
|
+
type: record.type,
|
|
269
|
+
value: record.value,
|
|
270
|
+
ttl,
|
|
271
|
+
});
|
|
272
|
+
}
|
|
273
|
+
}
|
|
274
|
+
logger.log('info', `Generated ${records.length} email DNS records for ${internalDnsDomains.length} internal-dns domains`);
|
|
275
|
+
return records;
|
|
276
|
+
}
|
|
277
|
+
async loadDkimRecords() {
|
|
278
|
+
const options = this.dcRouterRef.options;
|
|
279
|
+
const records = [];
|
|
280
|
+
if (!options.emailConfig?.domains || !this.dcRouterRef.emailServer?.dkimCreator) {
|
|
281
|
+
return records;
|
|
282
|
+
}
|
|
283
|
+
for (const domainConfig of options.emailConfig.domains) {
|
|
284
|
+
if (domainConfig.dnsMode !== 'internal-dns') {
|
|
285
|
+
continue;
|
|
286
|
+
}
|
|
287
|
+
const selector = domainConfig.dkim?.selector || 'default';
|
|
288
|
+
try {
|
|
289
|
+
const dkimRecord = await this.dcRouterRef.emailServer.dkimCreator.getDNSRecordForDomain(domainConfig.domain, selector);
|
|
290
|
+
records.push({
|
|
291
|
+
name: dkimRecord.name,
|
|
292
|
+
type: 'TXT',
|
|
293
|
+
value: dkimRecord.value,
|
|
294
|
+
ttl: domainConfig.dns?.internal?.ttl || 3600,
|
|
295
|
+
});
|
|
296
|
+
}
|
|
297
|
+
catch (error) {
|
|
298
|
+
logger.log('error', `Failed to generate DKIM record for ${domainConfig.domain}: ${error.message}`);
|
|
299
|
+
}
|
|
300
|
+
}
|
|
301
|
+
return records;
|
|
302
|
+
}
|
|
303
|
+
async initializeDkimForEmailDomains() {
|
|
304
|
+
const options = this.dcRouterRef.options;
|
|
305
|
+
if (!options.emailConfig?.domains || !this.dcRouterRef.emailServer) {
|
|
306
|
+
return;
|
|
307
|
+
}
|
|
308
|
+
logger.log('info', 'Initializing DKIM keys for email domains...');
|
|
309
|
+
// Get DKIMCreator instance from email server (public in smartmta)
|
|
310
|
+
const dkimCreator = this.dcRouterRef.emailServer.dkimCreator;
|
|
311
|
+
if (!dkimCreator) {
|
|
312
|
+
logger.log('warn', 'DKIMCreator not available, skipping DKIM initialization');
|
|
313
|
+
return;
|
|
314
|
+
}
|
|
315
|
+
// Ensure necessary directories exist
|
|
316
|
+
paths.ensureDataDirectories(this.dcRouterRef.resolvedPaths);
|
|
317
|
+
// Generate DKIM keys for each internal-dns email domain using the configured selector.
|
|
318
|
+
for (const domainConfig of options.emailConfig.domains) {
|
|
319
|
+
if (domainConfig.dnsMode !== 'internal-dns') {
|
|
320
|
+
continue;
|
|
321
|
+
}
|
|
322
|
+
try {
|
|
323
|
+
await dkimCreator.handleDKIMKeysForSelector(domainConfig.domain, domainConfig.dkim?.selector || 'default', domainConfig.dkim?.keySize || 2048);
|
|
324
|
+
logger.log('info', `DKIM keys initialized for ${domainConfig.domain}`);
|
|
325
|
+
}
|
|
326
|
+
catch (error) {
|
|
327
|
+
logger.log('error', `Failed to initialize DKIM for ${domainConfig.domain}: ${error.message}`);
|
|
328
|
+
}
|
|
329
|
+
}
|
|
330
|
+
logger.log('info', 'DKIM initialization complete');
|
|
331
|
+
}
|
|
332
|
+
async generateAuthoritativeRecords() {
|
|
333
|
+
const options = this.dcRouterRef.options;
|
|
334
|
+
const records = [];
|
|
335
|
+
if (!options.dnsNsDomains || !options.dnsScopes) {
|
|
336
|
+
return records;
|
|
337
|
+
}
|
|
338
|
+
// Determine the public IP for nameserver A records
|
|
339
|
+
let publicIp = null;
|
|
340
|
+
// Use proxy IPs if configured (these should be public IPs)
|
|
341
|
+
if (options.proxyIps && options.proxyIps.length > 0) {
|
|
342
|
+
publicIp = options.proxyIps[0]; // Use first proxy IP
|
|
343
|
+
logger.log('info', `Using proxy IP for nameserver A records: ${publicIp}`);
|
|
344
|
+
}
|
|
345
|
+
else if (options.publicIp) {
|
|
346
|
+
// Use explicitly configured public IP
|
|
347
|
+
publicIp = options.publicIp;
|
|
348
|
+
this.dcRouterRef.detectedPublicIp = publicIp;
|
|
349
|
+
logger.log('info', `Using configured public IP for nameserver A records: ${publicIp}`);
|
|
350
|
+
}
|
|
351
|
+
else {
|
|
352
|
+
// Auto-discover public IP using smartnetwork
|
|
353
|
+
try {
|
|
354
|
+
logger.log('info', 'Auto-discovering public IP address...');
|
|
355
|
+
const smartNetwork = new plugins.smartnetwork.SmartNetwork();
|
|
356
|
+
const publicIps = await smartNetwork.getPublicIps();
|
|
357
|
+
if (publicIps.v4) {
|
|
358
|
+
publicIp = publicIps.v4;
|
|
359
|
+
this.dcRouterRef.detectedPublicIp = publicIp;
|
|
360
|
+
logger.log('info', `Auto-discovered public IPv4: ${publicIp}`);
|
|
361
|
+
}
|
|
362
|
+
else {
|
|
363
|
+
logger.log('warn', 'Could not auto-discover public IPv4 address');
|
|
364
|
+
}
|
|
365
|
+
}
|
|
366
|
+
catch (error) {
|
|
367
|
+
logger.log('error', `Failed to auto-discover public IP: ${error.message}`);
|
|
368
|
+
}
|
|
369
|
+
if (!publicIp) {
|
|
370
|
+
logger.log('warn', 'No public IP available. Nameserver A records require either proxyIps, publicIp, or successful auto-discovery.');
|
|
371
|
+
}
|
|
372
|
+
}
|
|
373
|
+
// Generate A records for nameservers if we have a public IP
|
|
374
|
+
if (publicIp) {
|
|
375
|
+
for (const nsDomain of options.dnsNsDomains) {
|
|
376
|
+
records.push({
|
|
377
|
+
name: nsDomain,
|
|
378
|
+
type: 'A',
|
|
379
|
+
value: publicIp,
|
|
380
|
+
ttl: 3600
|
|
381
|
+
});
|
|
382
|
+
}
|
|
383
|
+
logger.log('info', `Generated A records for ${options.dnsNsDomains.length} nameservers`);
|
|
384
|
+
}
|
|
385
|
+
// Generate NS records for each domain in scopes
|
|
386
|
+
for (const domain of options.dnsScopes) {
|
|
387
|
+
// Add NS records for all nameservers
|
|
388
|
+
for (const nsDomain of options.dnsNsDomains) {
|
|
389
|
+
records.push({
|
|
390
|
+
name: domain,
|
|
391
|
+
type: 'NS',
|
|
392
|
+
value: nsDomain,
|
|
393
|
+
ttl: 3600
|
|
394
|
+
});
|
|
395
|
+
}
|
|
396
|
+
// SOA records are now automatically generated by smartdns DnsServer
|
|
397
|
+
// with the primaryNameserver configuration option
|
|
398
|
+
}
|
|
399
|
+
logger.log('info', `Generated ${records.length} total records (A + NS) for ${options.dnsScopes.length} domains`);
|
|
400
|
+
return records;
|
|
401
|
+
}
|
|
402
|
+
extractDomain(recordName) {
|
|
403
|
+
// Handle wildcards
|
|
404
|
+
if (recordName.startsWith('*.')) {
|
|
405
|
+
recordName = recordName.substring(2);
|
|
406
|
+
}
|
|
407
|
+
return recordName;
|
|
408
|
+
}
|
|
409
|
+
async applyProxyIpReplacement(records) {
|
|
410
|
+
const options = this.dcRouterRef.options;
|
|
411
|
+
if (!options.proxyIps || options.proxyIps.length === 0) {
|
|
412
|
+
return; // No proxy IPs configured, skip replacement
|
|
413
|
+
}
|
|
414
|
+
// Get server's public IP
|
|
415
|
+
const serverIp = await this.detectServerPublicIp();
|
|
416
|
+
if (!serverIp) {
|
|
417
|
+
logger.log('warn', 'Could not detect server public IP, skipping proxy IP replacement');
|
|
418
|
+
return;
|
|
419
|
+
}
|
|
420
|
+
logger.log('info', `Applying proxy IP replacement. Server IP: ${serverIp}, Proxy IPs: ${options.proxyIps.join(', ')}`);
|
|
421
|
+
let proxyIndex = 0;
|
|
422
|
+
for (const record of records) {
|
|
423
|
+
if (record.type === 'A' &&
|
|
424
|
+
record.value === serverIp &&
|
|
425
|
+
record.useIngressProxy !== false) {
|
|
426
|
+
// Round-robin through proxy IPs
|
|
427
|
+
const proxyIp = options.proxyIps[proxyIndex % options.proxyIps.length];
|
|
428
|
+
logger.log('info', `Replacing A record for ${record.name}: ${record.value} → ${proxyIp}`);
|
|
429
|
+
record.value = proxyIp;
|
|
430
|
+
proxyIndex++;
|
|
431
|
+
}
|
|
432
|
+
}
|
|
433
|
+
}
|
|
434
|
+
async detectServerPublicIp() {
|
|
435
|
+
try {
|
|
436
|
+
const smartNetwork = new plugins.smartnetwork.SmartNetwork();
|
|
437
|
+
const publicIps = await smartNetwork.getPublicIps();
|
|
438
|
+
if (publicIps.v4) {
|
|
439
|
+
return publicIps.v4;
|
|
440
|
+
}
|
|
441
|
+
return null;
|
|
442
|
+
}
|
|
443
|
+
catch (error) {
|
|
444
|
+
logger.log('warn', `Failed to detect public IP: ${error.message}`);
|
|
445
|
+
return null;
|
|
446
|
+
}
|
|
447
|
+
}
|
|
448
|
+
}
|
|
449
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.dns-server-runtime.js","sourceRoot":"","sources":["../../../ts/dns/classes.dns-server-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,KAAK,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAKzD;;;;;GAKG;AACH,MAAM,OAAO,gBAAgB;IAOP;IANpB,yCAAyC;IACjC,eAAe,GAAG,CAAC,CAAC,CAAC,iCAAiC;IACtD,cAAc,GAAG,CAAC,CAAC,CAAC,6BAA6B;IACjD,UAAU,GAAG,CAAC,CAAC;IACf,UAAU,GAAyC,IAAI,CAAC;IAEhE,YAAoB,WAAqB;QAArB,gBAAW,GAAX,WAAW,CAAU;IAAG,CAAC;IAE7C;;;OAGG;IACI,KAAK,CAAC,KAAK;QAChB,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;QACzC,IAAI,CAAC,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/D,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;QACnE,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzD,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAChE,CAAC;QAED,MAAM,iBAAiB,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAClD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,kDAAkD,iBAAiB,EAAE,CAAC,CAAC;QAE1F,oCAAoC;QACpC,MAAM,iBAAiB,GAAG,OAAO,CAAC,EAAE,CAAC,iBAAiB,EAGrD,CAAC;QACF,IAAI,WAAW,GAAG,OAAO,CAAC,gBAAgB,IAAI,SAAS,CAAC,CAAC,4BAA4B;QAErF,wFAAwF;QACxF,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC;YAC9B,aAAa,EAAE,KAAK,MAAM,CAAC,KAAK,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBACnF,IAAI,UAAU,EAAE,CAAC;oBACf,KAAK,MAAM,KAAK,IAAI,UAAU,EAAE,CAAC;wBAC/B,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;4BAC/C,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC;4BAC5B,MAAM,aAAa,CAAC;wBACtB,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,oDAAoD;QACpD,MAAM,SAAS,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,SAAS,CAAC;YAC5D,OAAO,EAAE,EAAE;YACX,gBAAgB,EAAE,WAAW;YAC7B,SAAS,EAAE,GAAG,EAAE,6CAA6C;YAC7D,eAAe,EAAE,IAAI,EAAE,sCAAsC;YAC7D,UAAU,EAAE,iBAAiB;YAC7B,iBAAiB,EAAE,iBAAiB,EAAE,8CAA8C;YACpF,sEAAsE;YACtE,QAAQ,EAAE,EAAE;YACZ,SAAS,EAAE,EAAE;SACd,CAAC,CAAC;QACH,IAAI,CAAC,WAAW,CAAC,SAAS,GAAG,SAAS,CAAC;QAEvC,kCAAkC;QAClC,MAAM,SAAS,CAAC,KAAK,EAAE,CAAC;QACxB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,6BAA6B,WAAW,KAAK,CAAC,CAAC;QAElE,iFAAiF;QACjF,IAAI,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;YACpC,MAAM,aAAa,GAAG,GAAG,EAAE;gBACzB,IAAI,IAAI,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC;oBACxB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,IAAI,CAAC,UAAU,mCAAmC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;oBAChG,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;gBACtB,CAAC;gBACD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;YACzB,CAAC,CAAC;YAEF,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAA4D,EAAE,EAAE;gBACrF,mBAAmB;gBACnB,KAAK,MAAM,QAAQ,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;oBACvC,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,aAAa,CAC5C,QAAQ,CAAC,IAAI,EACb,QAAQ,CAAC,IAAI,EACb,KAAK,EACL,KAAK,CAAC,cAAc,EACpB,KAAK,CAAC,QAAQ,CACf,CAAC;gBACJ,CAAC;gBAED,4DAA4D;gBAC5D,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;gBAC7C,IAAI,MAAM,KAAK,IAAI,CAAC,eAAe,EAAE,CAAC;oBACpC,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC;oBAC9B,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC;gBAC1B,CAAC;gBAED,IAAI,IAAI,CAAC,cAAc,GAAG,CAAC,EAAE,CAAC;oBAC5B,IAAI,CAAC,cAAc,EAAE,CAAC;oBACtB,MAAM,OAAO,GAAG,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAC3E,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,OAAO,KAAK,KAAK,CAAC,cAAc,OAAO,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,YAAY,GAAG,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;gBAC1I,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,UAAU,EAAE,CAAC;oBAClB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;wBACrB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;oBACpD,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAED,6BAA6B;QAC7B,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAEnC,8CAA8C;QAC9C,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,4BAA4B,EAAE,CAAC;QAEvE,6BAA6B;QAC7B,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAE7D,6EAA6E;QAC7E,MAAM,IAAI,CAAC,6BAA6B,EAAE,CAAC;QAE3C,gDAAgD;QAChD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAEjD,oEAAoE;QACpE,MAAM,UAAU,GAAqB,CAAC,GAAG,oBAAoB,EAAE,GAAG,eAAe,EAAE,GAAG,WAAW,CAAC,CAAC;QACnG,IAAI,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxD,UAAU,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;QACzC,CAAC;QAED,2CAA2C;QAC3C,MAAM,IAAI,CAAC,uBAAuB,CAAC,UAAU,CAAC,CAAC;QAE/C,2BAA2B;QAC3B,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YACjC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,UAAU,CAAC,MAAM,iBAAiB,oBAAoB,CAAC,MAAM,mBAAmB,eAAe,CAAC,MAAM,WAAW,WAAW,CAAC,MAAM,UAAU,OAAO,CAAC,UAAU,EAAE,MAAM,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACjO,CAAC;QAED,iEAAiE;QACjE,8CAA8C;QAC9C,IAAI,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;YAChC,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;IAED;;OAEG;IACI,mBAAmB;QACxB,OAAO,KAAK,EAAE,MAA0B,EAAE,EAAE;YAC1C,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;gBAChC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,0DAA0D,CAAC,CAAC;gBAChF,MAAM,CAAC,GAAG,EAAE,CAAC;gBACb,OAAO;YACT,CAAC;YAED,wDAAwD;YACxD,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;gBACzB,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,qBAAqB,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;gBACxD,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;oBACtB,MAAM,CAAC,OAAO,EAAE,CAAC;gBACnB,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,iDAAiD,CAAC,CAAC;YAEvE,IAAI,CAAC;gBACH,gDAAgD;gBAChD,0CAA0C;gBAC1C,MAAO,IAAI,CAAC,WAAW,CAAC,SAAiB,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;YACtE,CAAC;YAAC,OAAO,KAAc,EAAE,CAAC;gBACxB,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,6BAA8B,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC7E,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;oBACtB,MAAM,CAAC,OAAO,EAAE,CAAC;gBACnB,CAAC;YACH,CAAC;QACH,CAAC,CAAC;IACJ,CAAC;IAED,8EAA8E;IACvE,kBAAkB;QACvB,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC9B,IAAI,IAAI,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC;gBACxB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,IAAI,CAAC,UAAU,kCAAkC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;YACjG,CAAC;YACD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;YACvB,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;YACpB,IAAI,CAAC,eAAe,GAAG,CAAC,CAAC;YACzB,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC;IAEO,eAAe,CAAC,OAAyB;QAC/C,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC;QAC7C,IAAI,CAAC,SAAS;YAAE,OAAO;QAEvB,8CAA8C;QAC9C,kFAAkF;QAClF,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,4CAA4C;YAC5C,SAAS,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE;gBACjE,6CAA6C;gBAC7C,IAAI,QAAQ,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC;oBACnE,OAAO;wBACL,IAAI,EAAE,MAAM,CAAC,IAAI;wBACjB,IAAI,EAAE,MAAM,CAAC,IAAI;wBACjB,KAAK,EAAE,IAAI;wBACX,GAAG,EAAE,MAAM,CAAC,GAAG,IAAI,GAAG;wBACtB,IAAI,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC;qBACtD,CAAC;gBACJ,CAAC;gBAED,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;QACL,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,OAAO,CAAC,MAAM,gCAAgC,CAAC,CAAC;IACnF,CAAC;IAEO,eAAe,CAAC,IAAY,EAAE,KAAa;QACjD,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,GAAG;gBACN,OAAO,KAAK,CAAC,CAAC,uBAAuB;YACvC,KAAK,IAAI;gBACP,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC9C,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC;YACpD,KAAK,KAAK;gBACR,OAAO,KAAK,CAAC;YACf,KAAK,IAAI;gBACP,OAAO,KAAK,CAAC;YACf,KAAK,KAAK;gBACR,yEAAyE;gBACzE,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC/B,OAAO;oBACL,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;oBACf,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;oBACf,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBAC1B,OAAO,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBAC3B,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBACzB,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBAC1B,OAAO,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;iBAC5B,CAAC;YACJ;gBACE,OAAO,KAAK,CAAC;QACjB,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,qBAAqB;QACjC,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;QACzC,IAAI,CAAC,OAAO,CAAC,YAAY,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;YAChD,OAAO;QACT,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,iCAAiC,CAAC,CAAC;QAEtD,4DAA4D;QAC5D,IAAI,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,CAAC;YACjC,KAAK,MAAM,YAAY,IAAI,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;gBACvD,IAAI,YAAY,CAAC,OAAO,KAAK,cAAc;oBACvC,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC;oBACrD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,iBAAiB,YAAY,CAAC,MAAM,gFAAgF,CAAC,CAAC;gBAC3I,CAAC;YACH,CAAC;QACH,CAAC;QAED,uDAAuD;QACvD,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YACvB,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;gBACxC,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBACrD,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAC/C,YAAY,KAAK,KAAK,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,KAAK,EAAE,CAAC,CAC7D,CAAC;gBAEF,IAAI,CAAC,SAAS,EAAE,CAAC;oBACf,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,MAAM,CAAC,IAAI,gCAAgC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACpH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,uBAAuB;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;QACzC,MAAM,OAAO,GAAqB,EAAE,CAAC;QAErC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,CAAC;YAClC,OAAO,OAAO,CAAC;QACjB,CAAC;QAED,wCAAwC;QACxC,MAAM,kBAAkB,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAC3D,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,KAAK,cAAc,CAC5C,CAAC;QAEF,KAAK,MAAM,YAAY,IAAI,kBAAkB,EAAE,CAAC;YAC9C,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC;YACnC,MAAM,GAAG,GAAG,YAAY,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,IAAI,IAAI,CAAC;YACpD,MAAM,eAAe,GAAG,oBAAoB,CAAC;gBAC3C,MAAM;gBACN,QAAQ,EAAE,OAAO,CAAC,WAAW,CAAC,QAAQ;gBACtC,UAAU,EAAE,YAAY,CAAC,GAAG,EAAE,QAAQ,EAAE,UAAU;aACnD,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC;YAE7D,KAAK,MAAM,MAAM,IAAI,eAAe,EAAE,CAAC;gBACrC,OAAO,CAAC,IAAI,CAAC;oBACX,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,KAAK,EAAE,MAAM,CAAC,KAAK;oBACnB,GAAG;iBACJ,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,aAAa,OAAO,CAAC,MAAM,0BAA0B,kBAAkB,CAAC,MAAM,uBAAuB,CAAC,CAAC;QAC1H,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,KAAK,CAAC,eAAe;QAC3B,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;QACzC,MAAM,OAAO,GAAqB,EAAE,CAAC;QACrC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,WAAW,EAAE,CAAC;YAChF,OAAO,OAAO,CAAC;QACjB,CAAC;QAED,KAAK,MAAM,YAAY,IAAI,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YACvD,IAAI,YAAY,CAAC,OAAO,KAAK,cAAc,EAAE,CAAC;gBAC5C,SAAS;YACX,CAAC;YACD,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,EAAE,QAAQ,IAAI,SAAS,CAAC;YAC1D,IAAI,CAAC;gBACH,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,WAAW,CAAC,qBAAqB,CAAC,YAAY,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;gBACvH,OAAO,CAAC,IAAI,CAAC;oBACX,IAAI,EAAE,UAAU,CAAC,IAAI;oBACrB,IAAI,EAAE,KAAK;oBACX,KAAK,EAAE,UAAU,CAAC,KAAK;oBACvB,GAAG,EAAE,YAAY,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,IAAI,IAAI;iBAC7C,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,KAAc,EAAE,CAAC;gBACxB,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,sCAAsC,YAAY,CAAC,MAAM,KAAM,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;YAChH,CAAC;QACH,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,KAAK,CAAC,6BAA6B;QACzC,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;QACzC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC;YACnE,OAAO;QACT,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,6CAA6C,CAAC,CAAC;QAElE,kEAAkE;QAClE,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,WAAW,CAAC;QAC7D,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,yDAAyD,CAAC,CAAC;YAC9E,OAAO;QACT,CAAC;QAED,qCAAqC;QACrC,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;QAE5D,uFAAuF;QACvF,KAAK,MAAM,YAAY,IAAI,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YACvD,IAAI,YAAY,CAAC,OAAO,KAAK,cAAc,EAAE,CAAC;gBAC5C,SAAS;YACX,CAAC;YACD,IAAI,CAAC;gBACH,MAAM,WAAW,CAAC,yBAAyB,CACzC,YAAY,CAAC,MAAM,EACnB,YAAY,CAAC,IAAI,EAAE,QAAQ,IAAI,SAAS,EACxC,YAAY,CAAC,IAAI,EAAE,OAAO,IAAI,IAAI,CACnC,CAAC;gBACF,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,6BAA6B,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC;YACzE,CAAC;YAAC,OAAO,KAAc,EAAE,CAAC;gBACxB,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,iCAAiC,YAAY,CAAC,MAAM,KAAM,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;YAC3G,CAAC;QACH,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,8BAA8B,CAAC,CAAC;IACrD,CAAC;IAEO,KAAK,CAAC,4BAA4B;QACxC,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;QACzC,MAAM,OAAO,GAAqB,EAAE,CAAC;QAErC,IAAI,CAAC,OAAO,CAAC,YAAY,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;YAChD,OAAO,OAAO,CAAC;QACjB,CAAC;QAED,mDAAmD;QACnD,IAAI,QAAQ,GAAkB,IAAI,CAAC;QAEnC,2DAA2D;QAC3D,IAAI,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpD,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,qBAAqB;YACrD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,4CAA4C,QAAQ,EAAE,CAAC,CAAC;QAC7E,CAAC;aAAM,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YAC5B,sCAAsC;YACtC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;YAC5B,IAAI,CAAC,WAAW,CAAC,gBAAgB,GAAG,QAAQ,CAAC;YAC7C,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,wDAAwD,QAAQ,EAAE,CAAC,CAAC;QACzF,CAAC;aAAM,CAAC;YACN,6CAA6C;YAC7C,IAAI,CAAC;gBACH,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,uCAAuC,CAAC,CAAC;gBAC5D,MAAM,YAAY,GAAG,IAAI,OAAO,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;gBAC7D,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,YAAY,EAAE,CAAC;gBAEpD,IAAI,SAAS,CAAC,EAAE,EAAE,CAAC;oBACjB,QAAQ,GAAG,SAAS,CAAC,EAAE,CAAC;oBACxB,IAAI,CAAC,WAAW,CAAC,gBAAgB,GAAG,QAAQ,CAAC;oBAC7C,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,gCAAgC,QAAQ,EAAE,CAAC,CAAC;gBACjE,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,6CAA6C,CAAC,CAAC;gBACpE,CAAC;YACH,CAAC;YAAC,OAAO,KAAc,EAAE,CAAC;gBACxB,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,sCAAuC,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;YACxF,CAAC;YAED,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,+GAA+G,CAAC,CAAC;YACtI,CAAC;QACH,CAAC;QAED,4DAA4D;QAC5D,IAAI,QAAQ,EAAE,CAAC;YACb,KAAK,MAAM,QAAQ,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;gBAC5C,OAAO,CAAC,IAAI,CAAC;oBACX,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,GAAG;oBACT,KAAK,EAAE,QAAQ;oBACf,GAAG,EAAE,IAAI;iBACV,CAAC,CAAC;YACL,CAAC;YACD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,2BAA2B,OAAO,CAAC,YAAY,CAAC,MAAM,cAAc,CAAC,CAAC;QAC3F,CAAC;QAED,gDAAgD;QAChD,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;YACvC,qCAAqC;YACrC,KAAK,MAAM,QAAQ,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;gBAC5C,OAAO,CAAC,IAAI,CAAC;oBACX,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,IAAI;oBACV,KAAK,EAAE,QAAQ;oBACf,GAAG,EAAE,IAAI;iBACV,CAAC,CAAC;YACL,CAAC;YAED,oEAAoE;YACpE,kDAAkD;QACpD,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,aAAa,OAAO,CAAC,MAAM,+BAA+B,OAAO,CAAC,SAAS,CAAC,MAAM,UAAU,CAAC,CAAC;QACjH,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,aAAa,CAAC,UAAkB;QACtC,mBAAmB;QACnB,IAAI,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YAChC,UAAU,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;IAEO,KAAK,CAAC,uBAAuB,CAAC,OAAyB;QAC7D,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;QACzC,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvD,OAAO,CAAC,4CAA4C;QACtD,CAAC;QAED,yBAAyB;QACzB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;QACnD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,kEAAkE,CAAC,CAAC;YACvF,OAAO;QACT,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,6CAA6C,QAAQ,gBAAgB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEvH,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,IAAI,MAAM,CAAC,IAAI,KAAK,GAAG;gBACnB,MAAM,CAAC,KAAK,KAAK,QAAQ;gBACzB,MAAM,CAAC,eAAe,KAAK,KAAK,EAAE,CAAC;gBACrC,gCAAgC;gBAChC,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBACvE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,0BAA0B,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,KAAK,MAAM,OAAO,EAAE,CAAC,CAAC;gBAC1F,MAAM,CAAC,KAAK,GAAG,OAAO,CAAC;gBACvB,UAAU,EAAE,CAAC;YACf,CAAC;QACH,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,oBAAoB;QAChC,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,IAAI,OAAO,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;YAC7D,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,YAAY,EAAE,CAAC;YAEpD,IAAI,SAAS,CAAC,EAAE,EAAE,CAAC;gBACjB,OAAO,SAAS,CAAC,EAAE,CAAC;YACtB,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,+BAAgC,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;YAC9E,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;CACF"}
|
package/dist_ts/dns/index.d.ts
CHANGED
package/dist_ts/dns/index.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
export * from './manager.dns.js';
|
|
2
2
|
export * from './providers/index.js';
|
|
3
|
-
|
|
3
|
+
export * from './classes.dns-server-runtime.js';
|
|
4
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9kbnMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxrQkFBa0IsQ0FBQztBQUNqQyxjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMsaUNBQWlDLENBQUMifQ==
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import type { IMessageAcceptanceContext, IMessageAcceptanceDecision } from '@push.rocks/smartmta';
|
|
2
|
+
import type { DcRouter } from '../classes.dcrouter.js';
|
|
3
|
+
export declare const DCROUTER_CACHE_ID_HEADER = "X-Dcrouter-Cached-Email-Id";
|
|
4
|
+
export type TSmartMtaQueueItemLike = {
|
|
5
|
+
processingResult?: {
|
|
6
|
+
headers?: Record<string, string>;
|
|
7
|
+
email?: {
|
|
8
|
+
headers?: Record<string, string>;
|
|
9
|
+
};
|
|
10
|
+
};
|
|
11
|
+
status?: 'pending' | 'processing' | 'queued' | 'delivered' | 'failed' | 'deferred';
|
|
12
|
+
attempts?: number;
|
|
13
|
+
nextAttempt?: Date;
|
|
14
|
+
lastError?: string;
|
|
15
|
+
};
|
|
16
|
+
/**
|
|
17
|
+
* Accept-then-spool pipeline for inbound SMTP messages: persists accepted
|
|
18
|
+
* messages as CachedEmail docs, replays them through SmartMTA on an interval,
|
|
19
|
+
* and mirrors SmartMTA delivery-queue outcomes back onto the cached docs.
|
|
20
|
+
*/
|
|
21
|
+
export declare class AcceptedEmailSpool {
|
|
22
|
+
private dcRouterRef;
|
|
23
|
+
private spoolTimer?;
|
|
24
|
+
private spoolRun?;
|
|
25
|
+
private processing;
|
|
26
|
+
private stopping;
|
|
27
|
+
private queueUpdatePromises;
|
|
28
|
+
constructor(dcRouterRef: DcRouter);
|
|
29
|
+
acceptMessage(context: IMessageAcceptanceContext, processAfterAccept?: boolean): Promise<IMessageAcceptanceDecision>;
|
|
30
|
+
/** Start the interval-driven spool processor and trigger an immediate run. */
|
|
31
|
+
start(): void;
|
|
32
|
+
/** Mark the spool as stopping and clear the interval without awaiting in-flight work. */
|
|
33
|
+
beginStop(): void;
|
|
34
|
+
/** Stop the spool and wait (bounded) for an in-flight run to settle. */
|
|
35
|
+
stop(): Promise<void>;
|
|
36
|
+
/** Kick off a spool run unless one is already in flight. */
|
|
37
|
+
run(): void;
|
|
38
|
+
trackQueueUpdate(item: TSmartMtaQueueItemLike, status: 'queued' | 'delivered' | 'failed', failureMessage: string): void;
|
|
39
|
+
drainQueueUpdates(): Promise<void>;
|
|
40
|
+
/** Requeue emails left in 'queued' state by a previous process as pending. */
|
|
41
|
+
recoverQueuedEmails(): Promise<void>;
|
|
42
|
+
private processSpool;
|
|
43
|
+
private processAcceptedCachedEmail;
|
|
44
|
+
private buildCachedEmailSession;
|
|
45
|
+
private parseCachedEmailRouteData;
|
|
46
|
+
private updateAcceptedEmailFromQueueItem;
|
|
47
|
+
private waitForPromiseToSettleWithTimeout;
|
|
48
|
+
private clearSpoolTimer;
|
|
49
|
+
private setDcRouterCacheIdHeader;
|
|
50
|
+
private isCachedEmailTerminal;
|
|
51
|
+
private getCachedEmailIdFromQueueItem;
|
|
52
|
+
private getHeaderValue;
|
|
53
|
+
private removeHeader;
|
|
54
|
+
private throwIfMessageAcceptanceAborted;
|
|
55
|
+
}
|