@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,345 @@
|
|
|
1
|
+
import * as plugins from '../plugins.js';
|
|
2
|
+
import { logger } from '../logger.js';
|
|
3
|
+
import { CachedEmail } from '../db/index.js';
|
|
4
|
+
export const DCROUTER_CACHE_ID_HEADER = 'X-Dcrouter-Cached-Email-Id';
|
|
5
|
+
const ACCEPTED_EMAIL_SPOOL_INTERVAL_MS = 60_000;
|
|
6
|
+
const ACCEPTED_EMAIL_RETRY_DELAY_MS = 5 * 60_000;
|
|
7
|
+
const ACCEPTED_EMAIL_QUEUE_LEASE_MS = 30 * 60_000;
|
|
8
|
+
const ACCEPTED_EMAIL_SPOOL_BATCH_SIZE = 25;
|
|
9
|
+
const ACCEPTED_EMAIL_STOP_DRAIN_TIMEOUT_MS = 30_000;
|
|
10
|
+
/**
|
|
11
|
+
* Accept-then-spool pipeline for inbound SMTP messages: persists accepted
|
|
12
|
+
* messages as CachedEmail docs, replays them through SmartMTA on an interval,
|
|
13
|
+
* and mirrors SmartMTA delivery-queue outcomes back onto the cached docs.
|
|
14
|
+
*/
|
|
15
|
+
export class AcceptedEmailSpool {
|
|
16
|
+
dcRouterRef;
|
|
17
|
+
spoolTimer;
|
|
18
|
+
spoolRun;
|
|
19
|
+
processing = false;
|
|
20
|
+
stopping = false;
|
|
21
|
+
queueUpdatePromises = new Set();
|
|
22
|
+
constructor(dcRouterRef) {
|
|
23
|
+
this.dcRouterRef = dcRouterRef;
|
|
24
|
+
}
|
|
25
|
+
async acceptMessage(context, processAfterAccept = true) {
|
|
26
|
+
if (!this.dcRouterRef.dcRouterDb?.isReady()) {
|
|
27
|
+
throw new Error('DcRouterDb is not available for email acceptance');
|
|
28
|
+
}
|
|
29
|
+
this.throwIfMessageAcceptanceAborted(context.abortSignal);
|
|
30
|
+
const rawMessage = context.rawMessage;
|
|
31
|
+
const session = context.session;
|
|
32
|
+
const envelope = session.envelope;
|
|
33
|
+
const envelopeRecipients = Array.isArray(envelope.rcptTo)
|
|
34
|
+
? envelope.rcptTo.map((recipient) => recipient.address).filter(Boolean)
|
|
35
|
+
: [];
|
|
36
|
+
const email = context.email;
|
|
37
|
+
const headers = email.headers;
|
|
38
|
+
const cachedEmail = CachedEmail.createNew();
|
|
39
|
+
this.removeHeader(email.headers, DCROUTER_CACHE_ID_HEADER);
|
|
40
|
+
email.headers[DCROUTER_CACHE_ID_HEADER] = cachedEmail.id;
|
|
41
|
+
cachedEmail.messageId = headers['Message-ID'] || headers['message-id'] || cachedEmail.id;
|
|
42
|
+
cachedEmail.from = envelope.mailFrom?.address || email.from || '';
|
|
43
|
+
cachedEmail.to = envelopeRecipients.length > 0
|
|
44
|
+
? envelopeRecipients
|
|
45
|
+
: Array.isArray(email.to) ? email.to : [];
|
|
46
|
+
cachedEmail.cc = Array.isArray(email.cc) ? email.cc : [];
|
|
47
|
+
cachedEmail.bcc = Array.isArray(email.bcc) ? email.bcc : [];
|
|
48
|
+
cachedEmail.subject = email.subject || '';
|
|
49
|
+
cachedEmail.rawContent = this.setDcRouterCacheIdHeader(rawMessage.toString('utf8'), cachedEmail.id);
|
|
50
|
+
cachedEmail.status = 'pending';
|
|
51
|
+
cachedEmail.nextAttempt = new Date();
|
|
52
|
+
cachedEmail.routeData = JSON.stringify({
|
|
53
|
+
acceptedAt: new Date().toISOString(),
|
|
54
|
+
session: {
|
|
55
|
+
id: session.id,
|
|
56
|
+
remoteAddress: session.remoteAddress,
|
|
57
|
+
clientHostname: session.clientHostname,
|
|
58
|
+
secure: !!session.secure,
|
|
59
|
+
authenticated: !!session.authenticated,
|
|
60
|
+
user: session.user,
|
|
61
|
+
envelope,
|
|
62
|
+
},
|
|
63
|
+
});
|
|
64
|
+
cachedEmail.updateSenderDomain();
|
|
65
|
+
await cachedEmail.save();
|
|
66
|
+
if (context.abortSignal?.aborted) {
|
|
67
|
+
cachedEmail.markFailed('Message acceptance aborted before SMTP success');
|
|
68
|
+
await cachedEmail.save();
|
|
69
|
+
throw new Error('Message acceptance aborted before SMTP success');
|
|
70
|
+
}
|
|
71
|
+
if (processAfterAccept) {
|
|
72
|
+
this.run();
|
|
73
|
+
}
|
|
74
|
+
else {
|
|
75
|
+
cachedEmail.markDelivered();
|
|
76
|
+
await cachedEmail.save();
|
|
77
|
+
}
|
|
78
|
+
return {
|
|
79
|
+
accepted: true,
|
|
80
|
+
smtpCode: 250,
|
|
81
|
+
smtpMessage: '2.0.0 Message accepted for delivery',
|
|
82
|
+
continueProcessing: false,
|
|
83
|
+
};
|
|
84
|
+
}
|
|
85
|
+
/** Start the interval-driven spool processor and trigger an immediate run. */
|
|
86
|
+
start() {
|
|
87
|
+
this.clearSpoolTimer();
|
|
88
|
+
this.stopping = false;
|
|
89
|
+
const runProcessor = () => {
|
|
90
|
+
this.run();
|
|
91
|
+
};
|
|
92
|
+
this.spoolTimer = setInterval(runProcessor, ACCEPTED_EMAIL_SPOOL_INTERVAL_MS);
|
|
93
|
+
this.spoolTimer.unref?.();
|
|
94
|
+
runProcessor();
|
|
95
|
+
}
|
|
96
|
+
/** Mark the spool as stopping and clear the interval without awaiting in-flight work. */
|
|
97
|
+
beginStop() {
|
|
98
|
+
this.stopping = true;
|
|
99
|
+
this.clearSpoolTimer();
|
|
100
|
+
}
|
|
101
|
+
/** Stop the spool and wait (bounded) for an in-flight run to settle. */
|
|
102
|
+
async stop() {
|
|
103
|
+
this.beginStop();
|
|
104
|
+
const spoolRun = this.spoolRun;
|
|
105
|
+
if (spoolRun) {
|
|
106
|
+
const settled = await this.waitForPromiseToSettleWithTimeout(spoolRun, ACCEPTED_EMAIL_STOP_DRAIN_TIMEOUT_MS);
|
|
107
|
+
if (!settled) {
|
|
108
|
+
logger.log('warn', 'Timed out waiting for accepted email spool processing to stop');
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
/** Kick off a spool run unless one is already in flight. */
|
|
113
|
+
run() {
|
|
114
|
+
if (this.spoolRun) {
|
|
115
|
+
return;
|
|
116
|
+
}
|
|
117
|
+
const run = this.processSpool().catch((error) => {
|
|
118
|
+
logger.log('warn', `Accepted email spool processing failed: ${error.message}`);
|
|
119
|
+
});
|
|
120
|
+
this.spoolRun = run;
|
|
121
|
+
void run.finally(() => {
|
|
122
|
+
if (this.spoolRun === run) {
|
|
123
|
+
this.spoolRun = undefined;
|
|
124
|
+
}
|
|
125
|
+
});
|
|
126
|
+
}
|
|
127
|
+
trackQueueUpdate(item, status, failureMessage) {
|
|
128
|
+
const updatePromise = this.updateAcceptedEmailFromQueueItem(item, status).catch((error) => {
|
|
129
|
+
logger.log('warn', `${failureMessage}: ${error.message}`);
|
|
130
|
+
});
|
|
131
|
+
this.queueUpdatePromises.add(updatePromise);
|
|
132
|
+
void updatePromise.finally(() => {
|
|
133
|
+
this.queueUpdatePromises.delete(updatePromise);
|
|
134
|
+
});
|
|
135
|
+
}
|
|
136
|
+
async drainQueueUpdates() {
|
|
137
|
+
const queueUpdates = [...this.queueUpdatePromises];
|
|
138
|
+
if (queueUpdates.length === 0) {
|
|
139
|
+
return;
|
|
140
|
+
}
|
|
141
|
+
const settled = await this.waitForPromiseToSettleWithTimeout(Promise.allSettled(queueUpdates).then(() => undefined), ACCEPTED_EMAIL_STOP_DRAIN_TIMEOUT_MS);
|
|
142
|
+
if (!settled) {
|
|
143
|
+
for (const queueUpdate of queueUpdates) {
|
|
144
|
+
this.queueUpdatePromises.delete(queueUpdate);
|
|
145
|
+
}
|
|
146
|
+
logger.log('warn', `Timed out waiting for ${queueUpdates.length} accepted email queue update(s) to settle`);
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
/** Requeue emails left in 'queued' state by a previous process as pending. */
|
|
150
|
+
async recoverQueuedEmails() {
|
|
151
|
+
while (true) {
|
|
152
|
+
const queuedEmails = await CachedEmail.findQueuedForRecovery(ACCEPTED_EMAIL_SPOOL_BATCH_SIZE);
|
|
153
|
+
if (queuedEmails.length === 0) {
|
|
154
|
+
return;
|
|
155
|
+
}
|
|
156
|
+
for (const queuedEmail of queuedEmails) {
|
|
157
|
+
if (this.isCachedEmailTerminal(queuedEmail)) {
|
|
158
|
+
continue;
|
|
159
|
+
}
|
|
160
|
+
queuedEmail.status = 'pending';
|
|
161
|
+
queuedEmail.nextAttempt = new Date();
|
|
162
|
+
await queuedEmail.save();
|
|
163
|
+
}
|
|
164
|
+
if (queuedEmails.length < ACCEPTED_EMAIL_SPOOL_BATCH_SIZE) {
|
|
165
|
+
return;
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
async processSpool() {
|
|
170
|
+
const emailServer = this.dcRouterRef.emailServer;
|
|
171
|
+
if (this.processing || !emailServer || !this.dcRouterRef.dcRouterDb?.isReady()) {
|
|
172
|
+
return;
|
|
173
|
+
}
|
|
174
|
+
this.processing = true;
|
|
175
|
+
try {
|
|
176
|
+
const cachedEmails = await CachedEmail.findPendingForDelivery(ACCEPTED_EMAIL_SPOOL_BATCH_SIZE);
|
|
177
|
+
for (const cachedEmail of cachedEmails) {
|
|
178
|
+
if (this.stopping || this.dcRouterRef.emailServer !== emailServer) {
|
|
179
|
+
break;
|
|
180
|
+
}
|
|
181
|
+
const session = this.buildCachedEmailSession(cachedEmail);
|
|
182
|
+
const rawMessage = plugins.buffer.Buffer.from(cachedEmail.rawContent || '', 'utf8');
|
|
183
|
+
await this.processAcceptedCachedEmail(cachedEmail, rawMessage, session, emailServer);
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
finally {
|
|
187
|
+
this.processing = false;
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
async processAcceptedCachedEmail(cachedEmail, emailData, session, emailServer) {
|
|
191
|
+
cachedEmail.status = 'processing';
|
|
192
|
+
cachedEmail.nextAttempt = new Date(Date.now() + ACCEPTED_EMAIL_QUEUE_LEASE_MS);
|
|
193
|
+
await cachedEmail.save();
|
|
194
|
+
try {
|
|
195
|
+
await emailServer.processEmailByMode(emailData, session);
|
|
196
|
+
if (session.matchedRoute?.action.type === 'forward') {
|
|
197
|
+
cachedEmail.markDelivered();
|
|
198
|
+
}
|
|
199
|
+
else {
|
|
200
|
+
const currentCachedEmail = await CachedEmail.findById(cachedEmail.id) || cachedEmail;
|
|
201
|
+
if (this.isCachedEmailTerminal(currentCachedEmail)) {
|
|
202
|
+
return;
|
|
203
|
+
}
|
|
204
|
+
currentCachedEmail.status = 'queued';
|
|
205
|
+
currentCachedEmail.nextAttempt = new Date(Date.now() + ACCEPTED_EMAIL_QUEUE_LEASE_MS);
|
|
206
|
+
await currentCachedEmail.save();
|
|
207
|
+
return;
|
|
208
|
+
}
|
|
209
|
+
await cachedEmail.save();
|
|
210
|
+
}
|
|
211
|
+
catch (error) {
|
|
212
|
+
cachedEmail.scheduleRetry(ACCEPTED_EMAIL_RETRY_DELAY_MS);
|
|
213
|
+
cachedEmail.lastError = error.message;
|
|
214
|
+
await cachedEmail.save();
|
|
215
|
+
logger.log('warn', `Accepted email ${cachedEmail.id} deferred after SmartMTA handoff failure: ${error.message}`);
|
|
216
|
+
}
|
|
217
|
+
}
|
|
218
|
+
buildCachedEmailSession(cachedEmail) {
|
|
219
|
+
const routeData = this.parseCachedEmailRouteData(cachedEmail);
|
|
220
|
+
const storedSession = routeData.session || {};
|
|
221
|
+
const storedEnvelope = storedSession.envelope || {};
|
|
222
|
+
const storedRcptTo = Array.isArray(storedEnvelope.rcptTo) && storedEnvelope.rcptTo.length > 0
|
|
223
|
+
? storedEnvelope.rcptTo
|
|
224
|
+
: cachedEmail.to.map((address) => ({ address, args: {} }));
|
|
225
|
+
const rcptTo = storedRcptTo
|
|
226
|
+
.filter((recipient) => !!recipient.address)
|
|
227
|
+
.map((recipient) => ({ address: recipient.address, args: recipient.args || {} }));
|
|
228
|
+
const mailFrom = storedEnvelope.mailFrom
|
|
229
|
+
? { address: storedEnvelope.mailFrom.address, args: storedEnvelope.mailFrom.args || {} }
|
|
230
|
+
: { address: cachedEmail.from || '', args: {} };
|
|
231
|
+
const session = {
|
|
232
|
+
id: `${storedSession.id || cachedEmail.id}-replay-${Date.now()}`,
|
|
233
|
+
state: 'DATA',
|
|
234
|
+
clientHostname: storedSession.clientHostname || '',
|
|
235
|
+
mailFrom: mailFrom.address,
|
|
236
|
+
rcptTo: rcptTo.map((recipient) => recipient.address),
|
|
237
|
+
emailData: cachedEmail.rawContent || '',
|
|
238
|
+
useTLS: !!storedSession.secure,
|
|
239
|
+
connectionEnded: false,
|
|
240
|
+
remoteAddress: storedSession.remoteAddress || '127.0.0.1',
|
|
241
|
+
secure: !!storedSession.secure,
|
|
242
|
+
authenticated: !!storedSession.authenticated,
|
|
243
|
+
envelope: {
|
|
244
|
+
mailFrom,
|
|
245
|
+
rcptTo,
|
|
246
|
+
},
|
|
247
|
+
};
|
|
248
|
+
if (storedSession.user) {
|
|
249
|
+
session.user = storedSession.user;
|
|
250
|
+
}
|
|
251
|
+
return session;
|
|
252
|
+
}
|
|
253
|
+
parseCachedEmailRouteData(cachedEmail) {
|
|
254
|
+
try {
|
|
255
|
+
return cachedEmail.routeData ? JSON.parse(cachedEmail.routeData) : {};
|
|
256
|
+
}
|
|
257
|
+
catch {
|
|
258
|
+
return {};
|
|
259
|
+
}
|
|
260
|
+
}
|
|
261
|
+
async updateAcceptedEmailFromQueueItem(item, status) {
|
|
262
|
+
const cachedEmailId = this.getCachedEmailIdFromQueueItem(item);
|
|
263
|
+
if (!cachedEmailId || !this.dcRouterRef.dcRouterDb?.isReady()) {
|
|
264
|
+
return;
|
|
265
|
+
}
|
|
266
|
+
const cachedEmail = await CachedEmail.findById(cachedEmailId);
|
|
267
|
+
if (!cachedEmail) {
|
|
268
|
+
return;
|
|
269
|
+
}
|
|
270
|
+
if (this.isCachedEmailTerminal(cachedEmail) && status !== 'delivered') {
|
|
271
|
+
return;
|
|
272
|
+
}
|
|
273
|
+
cachedEmail.attempts = Math.max(cachedEmail.attempts || 0, item.attempts || 0);
|
|
274
|
+
if (status === 'delivered') {
|
|
275
|
+
cachedEmail.markDelivered();
|
|
276
|
+
}
|
|
277
|
+
else if (status === 'failed') {
|
|
278
|
+
cachedEmail.markFailed(item.lastError || 'SmartMTA delivery failed');
|
|
279
|
+
}
|
|
280
|
+
else {
|
|
281
|
+
cachedEmail.status = 'queued';
|
|
282
|
+
cachedEmail.nextAttempt = new Date(Date.now() + ACCEPTED_EMAIL_QUEUE_LEASE_MS);
|
|
283
|
+
}
|
|
284
|
+
await cachedEmail.save();
|
|
285
|
+
}
|
|
286
|
+
async waitForPromiseToSettleWithTimeout(promise, timeoutMs) {
|
|
287
|
+
let timeout;
|
|
288
|
+
return await new Promise((resolve) => {
|
|
289
|
+
let settled = false;
|
|
290
|
+
const settle = (didSettle) => {
|
|
291
|
+
if (settled) {
|
|
292
|
+
return;
|
|
293
|
+
}
|
|
294
|
+
settled = true;
|
|
295
|
+
if (timeout) {
|
|
296
|
+
clearTimeout(timeout);
|
|
297
|
+
}
|
|
298
|
+
resolve(didSettle);
|
|
299
|
+
};
|
|
300
|
+
timeout = setTimeout(() => settle(false), timeoutMs);
|
|
301
|
+
timeout.unref?.();
|
|
302
|
+
promise.then(() => settle(true), () => settle(true));
|
|
303
|
+
});
|
|
304
|
+
}
|
|
305
|
+
clearSpoolTimer() {
|
|
306
|
+
if (this.spoolTimer) {
|
|
307
|
+
clearInterval(this.spoolTimer);
|
|
308
|
+
this.spoolTimer = undefined;
|
|
309
|
+
}
|
|
310
|
+
}
|
|
311
|
+
setDcRouterCacheIdHeader(rawContent, cachedEmailId) {
|
|
312
|
+
const headerRegex = new RegExp(`^${DCROUTER_CACHE_ID_HEADER}:.*(?:\r?\n[\t ].*)*\r?\n?`, 'gim');
|
|
313
|
+
const sanitizedContent = rawContent.replace(headerRegex, '');
|
|
314
|
+
return `${DCROUTER_CACHE_ID_HEADER}: ${cachedEmailId}\r\n${sanitizedContent}`;
|
|
315
|
+
}
|
|
316
|
+
isCachedEmailTerminal(cachedEmail) {
|
|
317
|
+
return cachedEmail.status === 'delivered' || cachedEmail.status === 'failed';
|
|
318
|
+
}
|
|
319
|
+
getCachedEmailIdFromQueueItem(item) {
|
|
320
|
+
return this.getHeaderValue(item.processingResult?.headers, DCROUTER_CACHE_ID_HEADER)
|
|
321
|
+
|| this.getHeaderValue(item.processingResult?.email?.headers, DCROUTER_CACHE_ID_HEADER);
|
|
322
|
+
}
|
|
323
|
+
getHeaderValue(headers, headerName) {
|
|
324
|
+
if (!headers) {
|
|
325
|
+
return undefined;
|
|
326
|
+
}
|
|
327
|
+
const normalizedHeaderName = headerName.toLowerCase();
|
|
328
|
+
const matchingHeaderName = Object.keys(headers).find((key) => key.toLowerCase() === normalizedHeaderName);
|
|
329
|
+
return matchingHeaderName ? headers[matchingHeaderName] : undefined;
|
|
330
|
+
}
|
|
331
|
+
removeHeader(headers, headerName) {
|
|
332
|
+
const normalizedHeaderName = headerName.toLowerCase();
|
|
333
|
+
for (const key of Object.keys(headers)) {
|
|
334
|
+
if (key.toLowerCase() === normalizedHeaderName) {
|
|
335
|
+
delete headers[key];
|
|
336
|
+
}
|
|
337
|
+
}
|
|
338
|
+
}
|
|
339
|
+
throwIfMessageAcceptanceAborted(abortSignal) {
|
|
340
|
+
if (abortSignal?.aborted) {
|
|
341
|
+
throw new Error('Message acceptance aborted before SMTP success');
|
|
342
|
+
}
|
|
343
|
+
}
|
|
344
|
+
}
|
|
345
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.accepted-email-spool.js","sourceRoot":"","sources":["../../../ts/email/classes.accepted-email-spool.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import * as plugins from '../plugins.js';
|
|
2
|
+
import type { IUnifiedEmailServerOptions } from '@push.rocks/smartmta';
|
|
3
|
+
import type { IRoute } from '../../dist_ts_interfaces/data/route-management.js';
|
|
4
|
+
import type { IDcRouterRouteConfig } from '../../dist_ts_interfaces/data/remoteingress.js';
|
|
5
|
+
import type { DcRouter } from '../classes.dcrouter.js';
|
|
6
|
+
/**
|
|
7
|
+
* Generates SmartProxy routes for the email ports and hydrates persisted
|
|
8
|
+
* email routes into runtime routes: server-first SMTP ports get a raw
|
|
9
|
+
* socket-handler proxy that injects PROXY protocol toward the backend.
|
|
10
|
+
*/
|
|
11
|
+
export declare class EmailRouteBuilder {
|
|
12
|
+
private dcRouterRef;
|
|
13
|
+
constructor(dcRouterRef: DcRouter);
|
|
14
|
+
generateEmailRoutes(emailConfig: IUnifiedEmailServerOptions): IDcRouterRouteConfig[];
|
|
15
|
+
getRuntimeEmailRoutes(emailRoutes: IDcRouterRouteConfig[]): plugins.smartproxy.IRouteConfig[];
|
|
16
|
+
/**
|
|
17
|
+
* Hydrate a persisted route into its runtime form: generated email routes
|
|
18
|
+
* get the server-first socket-handler treatment, DoH routes get the DNS
|
|
19
|
+
* socket handler. Returns undefined when the stored route runs as-is.
|
|
20
|
+
*/
|
|
21
|
+
hydrateStoredRouteForRuntime(storedRoute: IRoute): plugins.smartproxy.IRouteConfig | undefined;
|
|
22
|
+
private getCurrentGeneratedEmailRouteNames;
|
|
23
|
+
private shouldHydrateGeneratedEmailRoute;
|
|
24
|
+
private createServerFirstEmailRuntimeRoute;
|
|
25
|
+
private getRemoteIngressEmailInboundProxyPolicy;
|
|
26
|
+
private createEmailSocketProxyHandler;
|
|
27
|
+
private createProxyProtocolV1Header;
|
|
28
|
+
}
|