@push.rocks/smartmta 7.0.0 → 8.0.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/changelog.md +30 -0
- package/dist_rust/mailer-bin_linux_amd64 +0 -0
- package/dist_rust/mailer-bin_linux_arm64 +0 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/functions.errors.d.ts +3 -0
- package/dist_ts/functions.errors.js +8 -0
- package/dist_ts/index.d.ts +3 -0
- package/dist_ts/index.js +4 -1
- package/dist_ts/mail/core/classes.bouncemanager.d.ts +11 -0
- package/dist_ts/mail/core/classes.bouncemanager.js +120 -38
- package/dist_ts/mail/core/classes.email.js +14 -12
- package/dist_ts/mail/core/classes.emailvalidator.d.ts +3 -3
- package/dist_ts/mail/core/classes.emailvalidator.js +7 -5
- package/dist_ts/mail/delivery/classes.delivery.queue.d.ts +77 -2
- package/dist_ts/mail/delivery/classes.delivery.queue.js +551 -46
- package/dist_ts/mail/delivery/classes.delivery.system.d.ts +13 -7
- package/dist_ts/mail/delivery/classes.delivery.system.js +458 -145
- package/dist_ts/mail/delivery/classes.unified.rate.limiter.js +9 -8
- package/dist_ts/mail/delivery/functions.safe-observers.d.ts +10 -0
- package/dist_ts/mail/delivery/functions.safe-observers.js +37 -0
- package/dist_ts/mail/delivery/interfaces.d.ts +21 -0
- package/dist_ts/mail/delivery/interfaces.js +1 -1
- package/dist_ts/mail/routing/classes.dkim.manager.d.ts +8 -4
- package/dist_ts/mail/routing/classes.dkim.manager.js +46 -29
- package/dist_ts/mail/routing/classes.dns.manager.d.ts +5 -3
- package/dist_ts/mail/routing/classes.dns.manager.js +22 -11
- package/dist_ts/mail/routing/classes.email.action.executor.d.ts +2 -1
- package/dist_ts/mail/routing/classes.email.action.executor.js +45 -16
- package/dist_ts/mail/routing/classes.email.router.d.ts +3 -0
- package/dist_ts/mail/routing/classes.email.router.js +15 -9
- package/dist_ts/mail/routing/classes.unified.email.server.d.ts +4 -0
- package/dist_ts/mail/routing/classes.unified.email.server.js +61 -40
- package/dist_ts/mail/security/classes.dkimcreator.d.ts +7 -0
- package/dist_ts/mail/security/classes.dkimcreator.js +33 -8
- package/dist_ts/mail/security/classes.spfverifier.js +5 -3
- package/dist_ts/security/classes.contentscanner.js +14 -11
- package/dist_ts/security/classes.ipreputationchecker.d.ts +3 -0
- package/dist_ts/security/classes.ipreputationchecker.js +20 -11
- package/dist_ts/security/classes.rustsecuritybridge.d.ts +49 -1
- package/dist_ts/security/classes.rustsecuritybridge.js +201 -4
- package/dist_ts/security/classes.securitylogger.js +7 -5
- package/dist_ts/security/index.d.ts +1 -1
- package/dist_ts/security/index.js +2 -2
- package/package.json +8 -8
- package/readme.hints.md +4 -3
- package/readme.md +41 -13
- package/readme.plan.md +6 -0
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/functions.errors.ts +8 -0
- package/ts/index.ts +3 -0
- package/ts/mail/core/classes.bouncemanager.ts +157 -45
- package/ts/mail/core/classes.email.ts +19 -13
- package/ts/mail/core/classes.emailvalidator.ts +9 -7
- package/ts/mail/delivery/classes.delivery.queue.ts +740 -58
- package/ts/mail/delivery/classes.delivery.system.ts +583 -170
- package/ts/mail/delivery/classes.unified.rate.limiter.ts +9 -8
- package/ts/mail/delivery/functions.safe-observers.ts +45 -0
- package/ts/mail/delivery/interfaces.ts +27 -1
- package/ts/mail/routing/classes.dkim.manager.ts +62 -37
- package/ts/mail/routing/classes.dns.manager.ts +36 -13
- package/ts/mail/routing/classes.email.action.executor.ts +64 -17
- package/ts/mail/routing/classes.email.router.ts +15 -8
- package/ts/mail/routing/classes.unified.email.server.ts +90 -44
- package/ts/mail/security/classes.dkimcreator.ts +50 -7
- package/ts/mail/security/classes.spfverifier.ts +4 -2
- package/ts/security/classes.contentscanner.ts +14 -11
- package/ts/security/classes.ipreputationchecker.ts +21 -10
- package/ts/security/classes.rustsecuritybridge.ts +269 -3
- package/ts/security/classes.securitylogger.ts +6 -4
- package/ts/security/index.ts +5 -1
|
@@ -2,6 +2,183 @@ import * as plugins from '../plugins.js';
|
|
|
2
2
|
import * as paths from '../paths.js';
|
|
3
3
|
import { logger } from '../logger.js';
|
|
4
4
|
import { EventEmitter } from 'events';
|
|
5
|
+
/** Persisted SMTP traces are bounded by entries, Unicode code points, and UTF-8 bytes. */
|
|
6
|
+
export const SMTP_TRANSCRIPT_MAX_ENTRIES = 200;
|
|
7
|
+
export const SMTP_TRANSCRIPT_MAX_ENTRY_CODE_POINTS = 2_048;
|
|
8
|
+
export const SMTP_TRANSCRIPT_MAX_UTF8_BYTES = 64 * 1_024;
|
|
9
|
+
export const SMTP_TRANSCRIPT_TRUNCATION_MARKER = 'SMTP transcript truncated';
|
|
10
|
+
const utf8ByteLength = (valueArg) => Buffer.byteLength(valueArg, 'utf8');
|
|
11
|
+
const truncateCodePoints = (valueArg) => {
|
|
12
|
+
const codePoints = [...valueArg];
|
|
13
|
+
if (codePoints.length <= SMTP_TRANSCRIPT_MAX_ENTRY_CODE_POINTS)
|
|
14
|
+
return valueArg;
|
|
15
|
+
return `${codePoints.slice(0, SMTP_TRANSCRIPT_MAX_ENTRY_CODE_POINTS - 1).join('')}…`;
|
|
16
|
+
};
|
|
17
|
+
const redactAuthTranscriptText = (phaseArg, directionArg, textArg) => {
|
|
18
|
+
if (phaseArg !== 'auth')
|
|
19
|
+
return textArg;
|
|
20
|
+
if (directionArg === 'client')
|
|
21
|
+
return '[AUTH command redacted]';
|
|
22
|
+
if (directionArg === 'server')
|
|
23
|
+
return '[AUTH response redacted]';
|
|
24
|
+
return '[AUTH diagnostic redacted]';
|
|
25
|
+
};
|
|
26
|
+
/**
|
|
27
|
+
* Normalize an untrusted SMTP trace before exposing or persisting it.
|
|
28
|
+
* Entry text is measured in Unicode code points; the aggregate is measured in UTF-8 bytes.
|
|
29
|
+
*/
|
|
30
|
+
export const normalizeSmtpTranscript = (entriesArg) => {
|
|
31
|
+
const normalized = [];
|
|
32
|
+
let totalUtf8Bytes = 0;
|
|
33
|
+
const appendTruncationMarker = (referenceArg) => {
|
|
34
|
+
const markerBytes = utf8ByteLength(SMTP_TRANSCRIPT_TRUNCATION_MARKER);
|
|
35
|
+
while (normalized.length >= SMTP_TRANSCRIPT_MAX_ENTRIES
|
|
36
|
+
|| totalUtf8Bytes + markerBytes > SMTP_TRANSCRIPT_MAX_UTF8_BYTES) {
|
|
37
|
+
const removed = normalized.pop();
|
|
38
|
+
if (!removed)
|
|
39
|
+
break;
|
|
40
|
+
totalUtf8Bytes -= utf8ByteLength(removed.text);
|
|
41
|
+
}
|
|
42
|
+
if (normalized.length < SMTP_TRANSCRIPT_MAX_ENTRIES
|
|
43
|
+
&& totalUtf8Bytes + markerBytes <= SMTP_TRANSCRIPT_MAX_UTF8_BYTES) {
|
|
44
|
+
normalized.push({
|
|
45
|
+
timestampMs: typeof referenceArg?.timestampMs === 'number'
|
|
46
|
+
&& Number.isFinite(referenceArg.timestampMs)
|
|
47
|
+
? referenceArg.timestampMs
|
|
48
|
+
: Date.now(),
|
|
49
|
+
phase: isSmtpDeliveryPhase(referenceArg?.phase) ? referenceArg.phase : 'unknown',
|
|
50
|
+
direction: 'system',
|
|
51
|
+
text: SMTP_TRANSCRIPT_TRUNCATION_MARKER,
|
|
52
|
+
});
|
|
53
|
+
totalUtf8Bytes += markerBytes;
|
|
54
|
+
}
|
|
55
|
+
};
|
|
56
|
+
for (const valueArg of entriesArg) {
|
|
57
|
+
if (!valueArg || typeof valueArg !== 'object')
|
|
58
|
+
continue;
|
|
59
|
+
const value = valueArg;
|
|
60
|
+
if (typeof value.timestampMs !== 'number'
|
|
61
|
+
|| !Number.isFinite(value.timestampMs)
|
|
62
|
+
|| !isSmtpDeliveryPhase(value.phase)
|
|
63
|
+
|| !['client', 'server', 'system'].includes(value.direction)
|
|
64
|
+
|| typeof value.text !== 'string') {
|
|
65
|
+
continue;
|
|
66
|
+
}
|
|
67
|
+
const direction = value.direction;
|
|
68
|
+
const text = truncateCodePoints(redactAuthTranscriptText(value.phase, direction, value.text));
|
|
69
|
+
const textBytes = utf8ByteLength(text);
|
|
70
|
+
if (normalized.length >= SMTP_TRANSCRIPT_MAX_ENTRIES
|
|
71
|
+
|| totalUtf8Bytes + textBytes > SMTP_TRANSCRIPT_MAX_UTF8_BYTES) {
|
|
72
|
+
appendTruncationMarker(value);
|
|
73
|
+
break;
|
|
74
|
+
}
|
|
75
|
+
normalized.push({
|
|
76
|
+
timestampMs: value.timestampMs,
|
|
77
|
+
phase: value.phase,
|
|
78
|
+
direction,
|
|
79
|
+
text,
|
|
80
|
+
...(typeof value.responseCode === 'number' && Number.isInteger(value.responseCode)
|
|
81
|
+
? { responseCode: value.responseCode }
|
|
82
|
+
: {}),
|
|
83
|
+
});
|
|
84
|
+
totalUtf8Bytes += textBytes;
|
|
85
|
+
}
|
|
86
|
+
return normalized;
|
|
87
|
+
};
|
|
88
|
+
export class SmtpDeliveryError extends Error {
|
|
89
|
+
errorType;
|
|
90
|
+
retryable;
|
|
91
|
+
smtpCode;
|
|
92
|
+
phase;
|
|
93
|
+
transactionLog;
|
|
94
|
+
recipients;
|
|
95
|
+
recipientDomain;
|
|
96
|
+
recipientResults;
|
|
97
|
+
constructor(details, cause) {
|
|
98
|
+
const transactionLog = normalizeSmtpTranscript(details.transactionLog);
|
|
99
|
+
const authFailure = (details.phase === 'auth'
|
|
100
|
+
|| details.errorType === 'authentication'
|
|
101
|
+
|| transactionLog.some((entry) => entry.phase === 'auth'));
|
|
102
|
+
super(authFailure ? 'SMTP authentication failed' : details.message);
|
|
103
|
+
this.name = 'SmtpDeliveryError';
|
|
104
|
+
this.errorType = details.errorType;
|
|
105
|
+
this.retryable = details.retryable;
|
|
106
|
+
this.smtpCode = details.smtpCode;
|
|
107
|
+
this.phase = details.phase;
|
|
108
|
+
this.transactionLog = transactionLog;
|
|
109
|
+
this.recipients = details.recipients || [];
|
|
110
|
+
this.recipientDomain = details.recipientDomain;
|
|
111
|
+
this.recipientResults = (details.recipientResults || []).map((result) => ({ ...result }));
|
|
112
|
+
if (cause !== undefined && !authFailure) {
|
|
113
|
+
this.cause = cause;
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
static from(errorArg) {
|
|
117
|
+
if (errorArg instanceof SmtpDeliveryError) {
|
|
118
|
+
return errorArg;
|
|
119
|
+
}
|
|
120
|
+
const source = errorArg instanceof Error ? errorArg : new Error(String(errorArg));
|
|
121
|
+
try {
|
|
122
|
+
const parsed = JSON.parse(source.message);
|
|
123
|
+
if (typeof parsed.message !== 'string' || typeof parsed.retryable !== 'boolean') {
|
|
124
|
+
throw new Error('Incomplete SMTP error payload');
|
|
125
|
+
}
|
|
126
|
+
const phase = isSmtpDeliveryPhase(parsed.phase) ? parsed.phase : 'unknown';
|
|
127
|
+
const transactionLog = Array.isArray(parsed.transactionLog)
|
|
128
|
+
? normalizeSmtpTranscript(parsed.transactionLog)
|
|
129
|
+
: [];
|
|
130
|
+
return new SmtpDeliveryError({
|
|
131
|
+
message: parsed.message,
|
|
132
|
+
errorType: typeof parsed.errorType === 'string' ? parsed.errorType : 'unknown',
|
|
133
|
+
retryable: parsed.retryable,
|
|
134
|
+
...(typeof parsed.smtpCode === 'number' ? { smtpCode: parsed.smtpCode } : {}),
|
|
135
|
+
phase,
|
|
136
|
+
transactionLog,
|
|
137
|
+
recipients: Array.isArray(parsed.recipients)
|
|
138
|
+
? parsed.recipients.filter((value) => typeof value === 'string')
|
|
139
|
+
: [],
|
|
140
|
+
recipientResults: Array.isArray(parsed.recipientResults)
|
|
141
|
+
? parsed.recipientResults.filter((value) => (Boolean(value)
|
|
142
|
+
&& typeof value === 'object'
|
|
143
|
+
&& typeof value.recipient === 'string'
|
|
144
|
+
&& typeof value.accepted === 'boolean'
|
|
145
|
+
&& Number.isInteger(value.responseCode))).map((value) => ({ ...value }))
|
|
146
|
+
: [],
|
|
147
|
+
...(typeof parsed.recipientDomain === 'string'
|
|
148
|
+
? { recipientDomain: parsed.recipientDomain }
|
|
149
|
+
: {}),
|
|
150
|
+
}, source);
|
|
151
|
+
}
|
|
152
|
+
catch {
|
|
153
|
+
return new SmtpDeliveryError({
|
|
154
|
+
message: source.message,
|
|
155
|
+
errorType: 'unknown',
|
|
156
|
+
retryable: true,
|
|
157
|
+
phase: 'unknown',
|
|
158
|
+
transactionLog: [],
|
|
159
|
+
recipients: [],
|
|
160
|
+
}, source);
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
const smtpDeliveryPhases = new Set([
|
|
165
|
+
'connect',
|
|
166
|
+
'greeting',
|
|
167
|
+
'ehlo',
|
|
168
|
+
'starttls',
|
|
169
|
+
'tls_handshake',
|
|
170
|
+
'post_tls_ehlo',
|
|
171
|
+
'auth',
|
|
172
|
+
'mail_from',
|
|
173
|
+
'rcpt_to',
|
|
174
|
+
'data_command',
|
|
175
|
+
'message_body',
|
|
176
|
+
'final_response',
|
|
177
|
+
'rset',
|
|
178
|
+
'quit',
|
|
179
|
+
'unknown',
|
|
180
|
+
]);
|
|
181
|
+
const isSmtpDeliveryPhase = (valueArg) => typeof valueArg === 'string' && smtpDeliveryPhases.has(valueArg);
|
|
5
182
|
// ---------------------------------------------------------------------------
|
|
6
183
|
// Bridge state machine
|
|
7
184
|
// ---------------------------------------------------------------------------
|
|
@@ -74,7 +251,9 @@ export class RustSecurityBridge extends EventEmitter {
|
|
|
74
251
|
this.bridge = new plugins.smartrust.RustBridge({
|
|
75
252
|
binaryName: 'mailer-bin',
|
|
76
253
|
cliArgs: ['--management'],
|
|
77
|
-
|
|
254
|
+
// A full SMTP transaction can legitimately span several socket waits.
|
|
255
|
+
// Health checks retain their own short timeout and run concurrently.
|
|
256
|
+
requestTimeoutMs: 300_000,
|
|
78
257
|
readyTimeoutMs: 10_000,
|
|
79
258
|
localPaths,
|
|
80
259
|
searchSystemPath: false,
|
|
@@ -440,12 +619,30 @@ export class RustSecurityBridge extends EventEmitter {
|
|
|
440
619
|
/** Send a structured email via the Rust SMTP client. */
|
|
441
620
|
async sendOutboundEmail(opts) {
|
|
442
621
|
this.ensureRunning();
|
|
443
|
-
|
|
622
|
+
try {
|
|
623
|
+
const result = await this.bridge.sendCommand('sendEmail', opts);
|
|
624
|
+
return {
|
|
625
|
+
...result,
|
|
626
|
+
transactionLog: normalizeSmtpTranscript(result.transactionLog),
|
|
627
|
+
};
|
|
628
|
+
}
|
|
629
|
+
catch (error) {
|
|
630
|
+
throw SmtpDeliveryError.from(error);
|
|
631
|
+
}
|
|
444
632
|
}
|
|
445
633
|
/** Send a pre-formatted raw email via the Rust SMTP client. */
|
|
446
634
|
async sendRawEmail(opts) {
|
|
447
635
|
this.ensureRunning();
|
|
448
|
-
|
|
636
|
+
try {
|
|
637
|
+
const result = await this.bridge.sendCommand('sendRawEmail', opts);
|
|
638
|
+
return {
|
|
639
|
+
...result,
|
|
640
|
+
transactionLog: normalizeSmtpTranscript(result.transactionLog),
|
|
641
|
+
};
|
|
642
|
+
}
|
|
643
|
+
catch (error) {
|
|
644
|
+
throw SmtpDeliveryError.from(error);
|
|
645
|
+
}
|
|
449
646
|
}
|
|
450
647
|
/** Verify connectivity to an SMTP server. */
|
|
451
648
|
async verifySmtpConnection(opts) {
|
|
@@ -565,4 +762,4 @@ export class RustSecurityBridge extends EventEmitter {
|
|
|
565
762
|
this.bridge.off('management:scramCredentialRequest', handler);
|
|
566
763
|
}
|
|
567
764
|
}
|
|
568
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.rustsecuritybridge.js","sourceRoot":"","sources":["../../ts/security/classes.rustsecuritybridge.ts"],"names":[],"mappings":"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"}
|
|
765
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.rustsecuritybridge.js","sourceRoot":"","sources":["../../ts/security/classes.rustsecuritybridge.ts"],"names":[],"mappings":"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"}
|
|
@@ -104,11 +104,13 @@ export class SecurityLogger {
|
|
|
104
104
|
if (filter.type) {
|
|
105
105
|
filteredEvents = filteredEvents.filter(event => event.type === filter.type);
|
|
106
106
|
}
|
|
107
|
-
|
|
108
|
-
|
|
107
|
+
const fromTimestamp = filter.fromTimestamp;
|
|
108
|
+
if (fromTimestamp !== undefined) {
|
|
109
|
+
filteredEvents = filteredEvents.filter(event => event.timestamp >= fromTimestamp);
|
|
109
110
|
}
|
|
110
|
-
|
|
111
|
-
|
|
111
|
+
const toTimestamp = filter.toTimestamp;
|
|
112
|
+
if (toTimestamp !== undefined) {
|
|
113
|
+
filteredEvents = filteredEvents.filter(event => event.timestamp <= toTimestamp);
|
|
112
114
|
}
|
|
113
115
|
}
|
|
114
116
|
// Return most recent events up to limit
|
|
@@ -232,4 +234,4 @@ export class SecurityLogger {
|
|
|
232
234
|
};
|
|
233
235
|
}
|
|
234
236
|
}
|
|
235
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
237
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.securitylogger.js","sourceRoot":"","sources":["../../ts/security/classes.securitylogger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC;;GAEG;AACH,MAAM,CAAN,IAAY,gBAKX;AALD,WAAY,gBAAgB;IAC1B,iCAAa,CAAA;IACb,iCAAa,CAAA;IACb,mCAAe,CAAA;IACf,yCAAqB,CAAA;AACvB,CAAC,EALW,gBAAgB,KAAhB,gBAAgB,QAK3B;AAED;;GAEG;AACH,MAAM,CAAN,IAAY,iBAmBX;AAnBD,WAAY,iBAAiB;IAC3B,sDAAiC,CAAA;IACjC,sDAAiC,CAAA;IACjC,0DAAqC,CAAA;IACrC,0DAAqC,CAAA;IACrC,0DAAqC,CAAA;IACrC,sDAAiC,CAAA;IACjC,kCAAa,CAAA;IACb,gCAAW,CAAA;IACX,oCAAe,CAAA;IACf,8CAAyB,CAAA;IACzB,oDAA+B,CAAA;IAC/B,kCAAa,CAAA;IACb,wCAAmB,CAAA;IACnB,8CAAyB,CAAA;IACzB,oDAA+B,CAAA;IAC/B,oDAA+B,CAAA;IAC/B,oDAA+B,CAAA;IAC/B,gEAA2C,CAAA;AAC7C,CAAC,EAnBW,iBAAiB,KAAjB,iBAAiB,QAmB5B;AAqBD;;GAEG;AACH,MAAM,OAAO,cAAc;IACjB,MAAM,CAAC,QAAQ,CAAiB;IAChC,cAAc,GAAqB,EAAE,CAAC;IACtC,eAAe,CAAS;IACxB,mBAAmB,CAAU;IAErC,YAAoB,OAGnB;QACC,IAAI,CAAC,eAAe,GAAG,OAAO,EAAE,eAAe,IAAI,IAAI,CAAC;QACxD,IAAI,CAAC,mBAAmB,GAAG,OAAO,EAAE,mBAAmB,IAAI,KAAK,CAAC;IACnE,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,WAAW,CAAC,OAGzB;QACC,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;YAC7B,cAAc,CAAC,QAAQ,GAAG,IAAI,cAAc,CAAC,OAAO,CAAC,CAAC;QACxD,CAAC;QACD,OAAO,cAAc,CAAC,QAAQ,CAAC;IACjC,CAAC;IAED;;;OAGG;IACI,QAAQ,CAAC,KAAwC;QACtD,MAAM,SAAS,GAAmB;YAChC,GAAG,KAAK;YACR,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;SACtB,CAAC;QAEF,yBAAyB;QACzB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEpC,yBAAyB;QACzB,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;YACtD,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;QAC9B,CAAC;QAED,+CAA+C;QAC/C,QAAQ,KAAK,CAAC,KAAK,EAAE,CAAC;YACpB,KAAK,gBAAgB,CAAC,IAAI;gBACxB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,aAAa,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;gBAC/E,MAAM;YACR,KAAK,gBAAgB,CAAC,IAAI;gBACxB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,aAAa,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;gBAC/E,MAAM;YACR,KAAK,gBAAgB,CAAC,KAAK,CAAC;YAC5B,KAAK,gBAAgB,CAAC,QAAQ;gBAC5B,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,aAAa,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;gBAEhF,mDAAmD;gBACnD,IAAI,KAAK,CAAC,KAAK,KAAK,gBAAgB,CAAC,QAAQ,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;oBAC1E,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;gBACnC,CAAC;gBACD,MAAM;QACV,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACI,eAAe,CAAC,QAAgB,GAAG,EAAE,MAK3C;QACC,IAAI,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;QAEzC,gBAAgB;QAChB,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;gBACjB,cAAc,GAAG,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,KAAK,MAAM,CAAC,KAAK,CAAC,CAAC;YAChF,CAAC;YAED,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;gBAChB,cAAc,GAAG,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC;YAC9E,CAAC;YAED,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;YAC3C,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;gBAChC,cAAc,GAAG,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,IAAI,aAAa,CAAC,CAAC;YACpF,CAAC;YAED,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;YACvC,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;gBAC9B,cAAc,GAAG,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,IAAI,WAAW,CAAC,CAAC;YAClF,CAAC;QACH,CAAC;QAED,wCAAwC;QACxC,OAAO,cAAc;aAClB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC;aACzC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IACrB,CAAC;IAED;;;;;OAKG;IACI,gBAAgB,CAAC,KAAuB,EAAE,QAAgB,GAAG;QAClE,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;IAChD,CAAC;IAED;;;;;OAKG;IACI,eAAe,CAAC,IAAuB,EAAE,QAAgB,GAAG;QACjE,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IAC/C,CAAC;IAED;;;;;OAKG;IACI,aAAa,CAAC,SAAiB,EAAE,QAAgB,GAAG;QACzD,OAAO,IAAI,CAAC,cAAc;aACvB,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,KAAK,SAAS,CAAC;aAC9C,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC;aACzC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IACrB,CAAC;IAED;;;;;OAKG;IACI,iBAAiB,CAAC,MAAc,EAAE,QAAgB,GAAG;QAC1D,OAAO,IAAI,CAAC,cAAc;aACvB,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC;aACxC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC;aACzC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IACrB,CAAC;IAED;;;;OAIG;IACK,gBAAgB,CAAC,KAAqB;QAC5C,gFAAgF;QAChF,4DAA4D;QAC5D,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,2BAA2B,KAAK,CAAC,OAAO,EAAE,EAAE;YAC9D,GAAG,KAAK;YACR,gBAAgB,EAAE,IAAI;SACvB,CAAC,CAAC;QAEH,yDAAyD;IAC3D,CAAC;IAED;;OAEG;IACI,WAAW;QAChB,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;IAC3B,CAAC;IAED;;;;OAIG;IACI,gBAAgB,CAAC,UAAmB;QAOzC,oCAAoC;QACpC,IAAI,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC;QACjC,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,UAAU,CAAC;YACvC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,IAAI,MAAM,CAAC,CAAC;QACrD,CAAC;QAED,iBAAiB;QACjB,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;YACpE,GAAG,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC,MAAM,CAAC;YAC1D,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAsC,CAAC,CAAC;QAE3C,gBAAgB;QAChB,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;YACnE,GAAG,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,MAAM,CAAC;YACvD,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAuC,CAAC,CAAC;QAE5C,cAAc;QACd,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC3C,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACjB,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;gBAChB,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAClE,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,kBAAkB;QAClB,MAAM,YAAY,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC/C,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACjB,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;gBACb,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACpE,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,6BAA6B;QAC7B,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;aAC1C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;aACrC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;aACjC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAEhB,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;aAClD,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;aAC7C,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;aACjC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAEhB,OAAO;YACL,KAAK,EAAE,MAAM,CAAC,MAAM;YACpB,OAAO;YACP,MAAM;YACN,MAAM;YACN,UAAU;SACX,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export { SecurityLogger, SecurityLogLevel, SecurityEventType, type ISecurityEvent } from './classes.securitylogger.js';
|
|
2
2
|
export { IPReputationChecker, ReputationThreshold, IPType, type IReputationResult, type IIPReputationOptions } from './classes.ipreputationchecker.js';
|
|
3
3
|
export { ContentScanner, ThreatCategory, type IScanResult, type IContentScannerOptions } from './classes.contentscanner.js';
|
|
4
|
-
export { RustSecurityBridge, BridgeState, type IBridgeResilienceConfig, type IDkimVerificationResult, type ISpfResult, type IDmarcResult, type IEmailSecurityResult, type IValidationResult, type IBounceDetection, type IRustReputationResult, type IVersionInfo, type IOutboundEmail, type ISmtpSendResult, type ISmtpSendOptions, type ISmtpVerifyResult, type ISmtpPoolStatus, } from './classes.rustsecuritybridge.js';
|
|
4
|
+
export { RustSecurityBridge, BridgeState, SmtpDeliveryError, type IBridgeResilienceConfig, type TSmtpDeliveryPhase, type ISmtpTranscriptEntry, type ISmtpDeliveryErrorDetails, type IDkimVerificationResult, type ISpfResult, type IDmarcResult, type IEmailSecurityResult, type IValidationResult, type IBounceDetection, type IRustReputationResult, type IVersionInfo, type IOutboundEmail, type ISmtpSendResult, type ISmtpSendOptions, type ISmtpVerifyResult, type ISmtpPoolStatus, } from './classes.rustsecuritybridge.js';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export { SecurityLogger, SecurityLogLevel, SecurityEventType } from './classes.securitylogger.js';
|
|
2
2
|
export { IPReputationChecker, ReputationThreshold, IPType } from './classes.ipreputationchecker.js';
|
|
3
3
|
export { ContentScanner, ThreatCategory } from './classes.contentscanner.js';
|
|
4
|
-
export { RustSecurityBridge, BridgeState, } from './classes.rustsecuritybridge.js';
|
|
5
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
4
|
+
export { RustSecurityBridge, BridgeState, SmtpDeliveryError, } from './classes.rustsecuritybridge.js';
|
|
5
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9zZWN1cml0eS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsY0FBYyxFQUNkLGdCQUFnQixFQUNoQixpQkFBaUIsRUFFbEIsTUFBTSw2QkFBNkIsQ0FBQztBQUVyQyxPQUFPLEVBQ0wsbUJBQW1CLEVBQ25CLG1CQUFtQixFQUNuQixNQUFNLEVBR1AsTUFBTSxrQ0FBa0MsQ0FBQztBQUUxQyxPQUFPLEVBQ0wsY0FBYyxFQUNkLGNBQWMsRUFHZixNQUFNLDZCQUE2QixDQUFDO0FBRXJDLE9BQU8sRUFDTCxrQkFBa0IsRUFDbEIsV0FBVyxFQUNYLGlCQUFpQixHQWtCbEIsTUFBTSxpQ0FBaUMsQ0FBQyJ9
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartmta",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "8.0.0",
|
|
4
4
|
"description": "A high-performance, enterprise-grade Mail Transfer Agent (MTA) built from scratch in TypeScript with Rust acceleration.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"mta",
|
|
@@ -32,23 +32,23 @@
|
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
34
|
"@git.zone/cli": "^2.23.0",
|
|
35
|
-
"@git.zone/tsbuild": "4.
|
|
35
|
+
"@git.zone/tsbuild": "4.4.2",
|
|
36
36
|
"@git.zone/tsrust": "^1.6.0",
|
|
37
37
|
"@git.zone/tstest": "^3.6.6",
|
|
38
38
|
"@types/mailparser": "^3.4.6",
|
|
39
39
|
"@types/node": "^26.1.1",
|
|
40
|
-
"tsx": "^4.
|
|
40
|
+
"tsx": "^4.23.1"
|
|
41
41
|
},
|
|
42
42
|
"dependencies": {
|
|
43
43
|
"@push.rocks/smartfile": "^13.1.2",
|
|
44
44
|
"@push.rocks/smartlog": "^3.2.2",
|
|
45
|
-
"@push.rocks/smartmail": "^2.2.
|
|
45
|
+
"@push.rocks/smartmail": "^2.2.1",
|
|
46
46
|
"@push.rocks/smartpath": "^6.0.0",
|
|
47
47
|
"@push.rocks/smartrust": "^1.3.2",
|
|
48
48
|
"@tsclass/tsclass": "^9.5.0",
|
|
49
|
-
"lru-cache": "^
|
|
50
|
-
"mailparser": "^3.9.
|
|
51
|
-
"uuid": "^
|
|
49
|
+
"lru-cache": "^11.5.2",
|
|
50
|
+
"mailparser": "^3.9.14",
|
|
51
|
+
"uuid": "^14.0.1"
|
|
52
52
|
},
|
|
53
53
|
"files": [
|
|
54
54
|
"ts/**/*",
|
|
@@ -59,7 +59,7 @@
|
|
|
59
59
|
"changelog.md"
|
|
60
60
|
],
|
|
61
61
|
"engines": {
|
|
62
|
-
"node": ">=
|
|
62
|
+
"node": ">=22"
|
|
63
63
|
},
|
|
64
64
|
"os": [
|
|
65
65
|
"linux"
|
package/readme.hints.md
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
|
|
12
12
|
## Build
|
|
13
13
|
- `pnpm build` runs `tsbuild tsfolders && tsrust`
|
|
14
|
-
-
|
|
14
|
+
- `pnpm run check` uses `@git.zone/tsbuild` 4.4.2 for production and test type checks
|
|
15
15
|
- `tsrust` independently works and produces binaries in `dist_rust/`
|
|
16
16
|
|
|
17
17
|
## Key Dependencies (Rust)
|
|
@@ -31,6 +31,7 @@
|
|
|
31
31
|
- `pnpm run test:rust` runs the Rust unit tests; plain `cargo test` in `rust/` works as well.
|
|
32
32
|
- Verify linkage manually with `ldd dist_rust/<binary>_linux_amd64` → "statically linked".
|
|
33
33
|
|
|
34
|
-
##
|
|
34
|
+
## Type Checking
|
|
35
35
|
|
|
36
|
-
-
|
|
36
|
+
- `@git.zone/tsbuild` is pinned at 4.4.2 and the stricter production/test checks are clean.
|
|
37
|
+
- Do not downgrade tsbuild or add `skipLibCheck` to production configuration; fix source types at their origin.
|
package/readme.md
CHANGED
|
@@ -241,10 +241,29 @@ await emailServer.start();
|
|
|
241
241
|
|
|
242
242
|
> 🔒 **Note:** `start()` will throw if the Rust binary is not compiled. Run `pnpm build` first.
|
|
243
243
|
>
|
|
244
|
+
> SmartMTA 8 requires Node.js 22 or newer.
|
|
245
|
+
>
|
|
244
246
|
> `hostname` is the public SMTP identity for greetings and outbound delivery by default. It is not a bind address.
|
|
245
247
|
>
|
|
246
248
|
> `dcRouterRef.storageManager` implements `IStorageManager` for small textual state such as DKIM keys, routes, bounce metadata, and reputation cache; use SmartData for that adapter. Queue bodies and attachment blobs use `IBlobStorageManager`, normally backed by SmartBucket. SmartMTA has no local-filesystem persistence fallback.
|
|
247
249
|
|
|
250
|
+
### Durable Delivery Checkpoints
|
|
251
|
+
|
|
252
|
+
Managed queues store complete queue items as SmartBucket blobs. Schema V2 adds per-recipient delivery states and a durable bounce outbox:
|
|
253
|
+
|
|
254
|
+
- A recipient becomes `delivered` only after the remote SMTP server's final `250` response.
|
|
255
|
+
- A permanent `5xx RCPT TO` response atomically stores both the recipient's terminal state and its pending bounce operation in one queue-item blob mutation.
|
|
256
|
+
- A temporary `4xx` response remains unresolved, so only that recipient is attempted against the next MX host or a later queue retry. Delivered and permanently rejected recipients are never resent.
|
|
257
|
+
- Bounce operation IDs are deterministic hashes of the queue item, normalized recipient, and operation kind. Pending work is drained immediately at delivery-system startup and periodically afterward, including work on terminal queue items.
|
|
258
|
+
- Observer and event-listener failures are logged and isolated after the durable state transition; they cannot reclassify delivery state or statistics.
|
|
259
|
+
|
|
260
|
+
V1 queue blobs remain readable. They hydrate with an empty bounce outbox and are upgraded to V2 on their next mutation; SmartMTA never invents retroactive bounce work. V2 blobs are intentionally not readable by V7, so rolling back after a V2 write is unsupported.
|
|
261
|
+
|
|
262
|
+
The managed-prefix ownership guard is process-local only. It coordinates queues only when they share the exact same `IBlobStorageManager` object instance and normalized storage prefix. Different storage-wrapper instances and different JavaScript processes are not coordinated; the embedder must enforce one delivery owner or provide an external distributed lease. This guard does not provide distributed ownership. Because queue writes are forward-only to schema V2, V7 rollback remains unsupported after the first V2 mutation.
|
|
263
|
+
|
|
264
|
+
Bounce delivery is at-least-once. `BounceManager` uses the operation ID as a durable processed marker and deduplicates concurrent/restarted calls. Its in-process completed-operation LRU is only a hot-duplicate optimization, bounded to 10,000 entries with a 24-hour TTL; cache misses always re-read the durable marker. A process crash after an external side effect but before the queue completion checkpoint can cause the operation to be presented again. Custom `bounceHandler.processSmtpFailure` implementations receive `options.operationId` and must deduplicate it in their own durable store; SmartMTA does not claim exactly-once execution for custom handlers.
|
|
265
|
+
|
|
266
|
+
|
|
248
267
|
### 🛂 Inbound Recipient Policy And Relay Control
|
|
249
268
|
|
|
250
269
|
SmartMTA validates each `RCPT TO` before the client can enter `DATA` by default. The default policy evaluates routes and accepts configured local domains. External recipients are rejected unless the matched route action explicitly sets `allowRelay: true`. Set `smtp.recipientValidation: false` only on fully trusted private listeners where another layer performs recipient and relay policy.
|
|
@@ -382,7 +401,9 @@ DKIM key management is handled by `DKIMCreator`, which generates, stores, and ro
|
|
|
382
401
|
```typescript
|
|
383
402
|
import { DKIMCreator } from '@push.rocks/smartmta';
|
|
384
403
|
|
|
385
|
-
|
|
404
|
+
// Small structured key state is supplied by the embedder through managed storage.
|
|
405
|
+
// Use a SmartData-backed IStorageManager; SmartMTA never writes keys to local files.
|
|
406
|
+
const dkimCreator = new DKIMCreator(storageManager);
|
|
386
407
|
|
|
387
408
|
// Auto-generate keys if they don't exist
|
|
388
409
|
await dkimCreator.handleDKIMKeysForDomain('example.com');
|
|
@@ -401,11 +422,12 @@ if (needsRotation) {
|
|
|
401
422
|
```
|
|
402
423
|
|
|
403
424
|
When `UnifiedEmailServer.start()` is called:
|
|
404
|
-
- DKIM keys are generated or loaded for every configured domain
|
|
405
|
-
-
|
|
406
|
-
-
|
|
425
|
+
- In the default `automatic` mode, DKIM keys are generated or loaded for every configured domain and rotation follows `rotationInterval`.
|
|
426
|
+
- With `dkimKeyProvisioning: 'caller-managed'`, SmartMTA only loads the requested selector from managed storage; it never generates or rotates keys.
|
|
427
|
+
- A requested missing or invalid key fails closed before SMTP delivery. SmartMTA never falls back to unsigned delivery.
|
|
428
|
+
- Signing is applied exactly once, by the Rust SMTP client at final outbound transmission.
|
|
407
429
|
|
|
408
|
-
Embedders can check `smartMtaCapabilities.selectorCorrectDkimSigning
|
|
430
|
+
Embedders can check `smartMtaCapabilities.selectorCorrectDkimSigning`, `callerManagedDkimKeys`, `structuredSmtpTransactions`, and `typedDeliveryFailures` as compatibility probes.
|
|
409
431
|
|
|
410
432
|
### 🛡️ Email Authentication (SPF, DKIM, DMARC)
|
|
411
433
|
|
|
@@ -549,13 +571,16 @@ Automatic bounce detection (via Rust), classification, and suppression tracking:
|
|
|
549
571
|
import { Core } from '@push.rocks/smartmta';
|
|
550
572
|
const { BounceManager } = Core;
|
|
551
573
|
|
|
552
|
-
const bounceManager = new BounceManager();
|
|
574
|
+
const bounceManager = new BounceManager({ storageManager: smartDataStorage });
|
|
553
575
|
|
|
554
576
|
// Process an SMTP failure
|
|
555
577
|
const bounce = await bounceManager.processSmtpFailure(
|
|
556
578
|
'recipient@example.com',
|
|
557
579
|
'550 5.1.1 User unknown',
|
|
558
|
-
{
|
|
580
|
+
{
|
|
581
|
+
operationId: 'queue-item-and-recipient-derived-operation-id',
|
|
582
|
+
originalEmailId: 'msg-123',
|
|
583
|
+
}
|
|
559
584
|
);
|
|
560
585
|
// -> { bounceType: 'invalid_recipient', bounceCategory: 'hard', ... }
|
|
561
586
|
|
|
@@ -601,7 +626,7 @@ const email = await templates.createEmail('welcome', {
|
|
|
601
626
|
|
|
602
627
|
### 🌍 DNS Management
|
|
603
628
|
|
|
604
|
-
|
|
629
|
+
DNS behavior is explicit per domain and DKIM ownership mode:
|
|
605
630
|
|
|
606
631
|
```typescript
|
|
607
632
|
const emailServer = new UnifiedEmailServer(dcRouterRef, {
|
|
@@ -615,12 +640,15 @@ const emailServer = new UnifiedEmailServer(dcRouterRef, {
|
|
|
615
640
|
// ... other config
|
|
616
641
|
});
|
|
617
642
|
|
|
618
|
-
//
|
|
619
|
-
//
|
|
620
|
-
//
|
|
621
|
-
// - DKIM TXT records with public keys from DKIMCreator
|
|
622
|
-
// - DMARC TXT records with your policy
|
|
643
|
+
// In automatic key-provisioning mode, internal DNS domains register the
|
|
644
|
+
// configured MX/SPF/DMARC handlers and the generated selector-specific DKIM record.
|
|
645
|
+
// External DNS domains are validated and report the required public changes.
|
|
623
646
|
await emailServer.start();
|
|
647
|
+
|
|
648
|
+
// With dkimKeyProvisioning: 'caller-managed', startup only validates the exact
|
|
649
|
+
// configured selector in managed storage and reads public DNS for validation.
|
|
650
|
+
// It performs no key generation/rotation, local DNS handler registration,
|
|
651
|
+
// DNS record write/delete, or provisioning fallback.
|
|
624
652
|
```
|
|
625
653
|
|
|
626
654
|
### 🪵 Logging
|
package/readme.plan.md
CHANGED
|
@@ -2,6 +2,12 @@
|
|
|
2
2
|
|
|
3
3
|
## Completed Phases
|
|
4
4
|
|
|
5
|
+
### Phase 6: Durable Per-Recipient Delivery And Bounce Outbox
|
|
6
|
+
- Queue schema V2 stores explicit recipient dispositions and deterministic bounce operations in managed blob storage
|
|
7
|
+
- Final 250 acceptance, permanent 5xx terminal state, and unresolved 4xx retry semantics are checkpointed per recipient
|
|
8
|
+
- Built-in bounce processing is idempotent by operation ID; custom handlers receive the ID for at-least-once deduplication
|
|
9
|
+
- Queue and delivery observers are isolated from committed state, statistics, and downstream listeners
|
|
10
|
+
|
|
5
11
|
### Phase 3: Rust Primary Backend (DKIM/SPF/DMARC/IP Reputation)
|
|
6
12
|
- Rust is the mandatory security backend — no TS fallbacks
|
|
7
13
|
- All DKIM signing/verification, SPF, DMARC, IP reputation through Rust bridge
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
/** Normalize values caught from promise and callback boundaries. */
|
|
2
|
+
export function getErrorMessage(error: unknown): string {
|
|
3
|
+
return error instanceof Error ? error.message : String(error);
|
|
4
|
+
}
|
|
5
|
+
|
|
6
|
+
export function getErrorStack(error: unknown): string | undefined {
|
|
7
|
+
return error instanceof Error ? error.stack : undefined;
|
|
8
|
+
}
|