@serve.zone/dcrouter 15.6.1 → 15.8.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/deno.json +1 -1
- package/dist_serve/bundle.js +423 -407
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.dcrouter.d.ts +4 -1
- package/dist_ts/classes.dcrouter.js +45 -1
- package/dist_ts/db/documents/classes.email-server-settings.doc.d.ts +2 -1
- package/dist_ts/db/documents/classes.email-server-settings.doc.js +8 -2
- package/dist_ts/db/documents/classes.remote-ingress-edge.doc.d.ts +2 -1
- package/dist_ts/db/documents/classes.remote-ingress-edge.doc.js +8 -2
- package/dist_ts/email/classes.email-settings.manager.d.ts +5 -1
- package/dist_ts/email/classes.email-settings.manager.js +24 -1
- package/dist_ts/opsserver/handlers/config.handler.js +2 -1
- package/dist_ts/opsserver/handlers/email-settings.handler.js +2 -1
- package/dist_ts/opsserver/handlers/remoteingress.handler.js +3 -2
- package/dist_ts/remoteingress/classes.remoteingress-manager.d.ts +6 -2
- package/dist_ts/remoteingress/classes.remoteingress-manager.js +65 -2
- package/dist_ts/remoteingress/classes.tunnel-manager.d.ts +6 -0
- package/dist_ts/remoteingress/classes.tunnel-manager.js +42 -1
- package/dist_ts_apiclient/classes.remoteingress.d.ts +10 -0
- package/dist_ts_apiclient/classes.remoteingress.js +23 -1
- package/dist_ts_interfaces/data/email-settings.d.ts +4 -0
- package/dist_ts_interfaces/data/remoteingress.d.ts +18 -0
- package/dist_ts_interfaces/requests/config.d.ts +1 -0
- package/dist_ts_interfaces/requests/remoteingress.d.ts +3 -1
- package/dist_ts_migrations/index.d.ts +1 -0
- package/dist_ts_migrations/index.js +80 -9
- package/dist_ts_web/00_commitinfo_data.js +1 -1
- package/dist_ts_web/appstate/remoteingress.d.ts +2 -0
- package/dist_ts_web/appstate/remoteingress.js +3 -1
- package/dist_ts_web/elements/email/ops-view-email-domains.js +7 -1
- package/dist_ts_web/elements/network/ops-view-remoteingress.d.ts +2 -0
- package/dist_ts_web/elements/network/ops-view-remoteingress.js +54 -2
- package/package.json +5 -5
- package/readme.md +22 -0
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.dcrouter.ts +56 -4
- package/ts/db/documents/classes.email-server-settings.doc.ts +4 -1
- package/ts/db/documents/classes.remote-ingress-edge.doc.ts +4 -1
- package/ts/email/classes.email-settings.manager.ts +29 -0
- package/ts/opsserver/handlers/config.handler.ts +1 -0
- package/ts/opsserver/handlers/email-settings.handler.ts +1 -0
- package/ts/opsserver/handlers/remoteingress.handler.ts +2 -0
- package/ts/remoteingress/classes.remoteingress-manager.ts +78 -3
- package/ts/remoteingress/classes.tunnel-manager.ts +61 -0
- package/ts_apiclient/classes.remoteingress.ts +26 -0
- package/ts_apiclient/readme.md +8 -0
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/ts_web/appstate/remoteingress.ts +4 -0
- package/ts_web/elements/email/ops-view-email-domains.ts +6 -0
- package/ts_web/elements/network/ops-view-remoteingress.ts +55 -1
|
@@ -292,6 +292,7 @@ let OpsViewRemoteIngress = (() => {
|
|
|
292
292
|
transport: this.getTransportHtml(edge.id),
|
|
293
293
|
publicIp: this.getEdgePublicIp(edge.id),
|
|
294
294
|
ports: this.getPortsHtml(edge),
|
|
295
|
+
smtpEgress: this.getEgressHtml(edge),
|
|
295
296
|
tunnels: this.getEdgeTunnelCount(edge.id),
|
|
296
297
|
maxConnections: this.getMaxConnectionsHtml(edge),
|
|
297
298
|
window: this.getWindowHtml(edge.id),
|
|
@@ -314,6 +315,9 @@ let OpsViewRemoteIngress = (() => {
|
|
|
314
315
|
<dees-input-text .key=${'listenPorts'} .label=${'Manual Ports'} .description=${'Comma-separated port numbers, optional'}></dees-input-text>
|
|
315
316
|
<dees-input-checkbox .key=${'autoDerivePorts'} .label=${'Auto-derive ports from routes'} .value=${true}></dees-input-checkbox>
|
|
316
317
|
<dees-input-text .key=${'maxStreamsPerEdge'} .label=${'Max Connections'} .description=${'Optional maximum concurrent client connections for this edge. Leave empty to use the hub default.'}></dees-input-text>
|
|
318
|
+
<dees-input-checkbox .key=${'egressEnabled'} .label=${'Allow outbound SMTP egress'} .value=${false}></dees-input-checkbox>
|
|
319
|
+
<dees-input-text .key=${'egressAllowedHostPatterns'} .label=${'SMTP Egress Host Patterns'} .description=${'Optional comma-separated MX host patterns. Leave empty to allow public MX hosts on port 25.'}></dees-input-text>
|
|
320
|
+
<dees-input-text .key=${'egressMaxConcurrentStreams'} .label=${'SMTP Egress Max Streams'} .description=${'Optional concurrent outbound SMTP stream cap for this edge.'}></dees-input-text>
|
|
317
321
|
<dees-input-text .key=${'tags'} .label=${'Tags'} .description=${'Comma-separated, optional'}></dees-input-text>
|
|
318
322
|
</dees-form>
|
|
319
323
|
`,
|
|
@@ -340,8 +344,10 @@ let OpsViewRemoteIngress = (() => {
|
|
|
340
344
|
: undefined;
|
|
341
345
|
const autoDerivePorts = formData.autoDerivePorts !== false;
|
|
342
346
|
let performance;
|
|
347
|
+
let egress;
|
|
343
348
|
try {
|
|
344
349
|
performance = this.collectPerformanceOverride(formData);
|
|
350
|
+
egress = this.collectEgressPolicy(formData);
|
|
345
351
|
}
|
|
346
352
|
catch (err) {
|
|
347
353
|
const { DeesToast } = await import('@design.estate/dees-catalog');
|
|
@@ -351,7 +357,7 @@ let OpsViewRemoteIngress = (() => {
|
|
|
351
357
|
const tags = formData.tags
|
|
352
358
|
? formData.tags.split(',').map((t) => t.trim()).filter(Boolean)
|
|
353
359
|
: undefined;
|
|
354
|
-
await appstate.remoteIngressStatePart.dispatchAction(appstate.createRemoteIngressAction, { name, listenPorts, autoDerivePorts, performance, tags });
|
|
360
|
+
await appstate.remoteIngressStatePart.dispatchAction(appstate.createRemoteIngressAction, { name, listenPorts, autoDerivePorts, performance, egress, tags });
|
|
355
361
|
await modalArg.destroy();
|
|
356
362
|
},
|
|
357
363
|
},
|
|
@@ -402,6 +408,9 @@ let OpsViewRemoteIngress = (() => {
|
|
|
402
408
|
<dees-input-text .key=${'listenPorts'} .label=${'Manual Ports'} .description=${'Comma-separated port numbers'} .value=${(edge.listenPorts || []).join(', ')}></dees-input-text>
|
|
403
409
|
<dees-input-checkbox .key=${'autoDerivePorts'} .label=${'Auto-derive ports from routes'} .value=${edge.autoDerivePorts !== false}></dees-input-checkbox>
|
|
404
410
|
<dees-input-text .key=${'maxStreamsPerEdge'} .label=${'Max Connections'} .description=${'Optional maximum concurrent client connections for this edge. Leave empty to use the hub default.'} .value=${edge.performance?.maxStreamsPerEdge?.toString() || ''}></dees-input-text>
|
|
411
|
+
<dees-input-checkbox .key=${'egressEnabled'} .label=${'Allow outbound SMTP egress'} .value=${edge.egress?.enabled === true}></dees-input-checkbox>
|
|
412
|
+
<dees-input-text .key=${'egressAllowedHostPatterns'} .label=${'SMTP Egress Host Patterns'} .description=${'Optional comma-separated MX host patterns. Leave empty to allow public MX hosts on port 25.'} .value=${(edge.egress?.allowedHostPatterns || []).join(', ')}></dees-input-text>
|
|
413
|
+
<dees-input-text .key=${'egressMaxConcurrentStreams'} .label=${'SMTP Egress Max Streams'} .description=${'Optional concurrent outbound SMTP stream cap for this edge.'} .value=${edge.egress?.maxConcurrentStreams?.toString() || ''}></dees-input-text>
|
|
405
414
|
<dees-input-text .key=${'tags'} .label=${'Tags'} .description=${'Comma-separated'} .value=${(edge.tags || []).join(', ')}></dees-input-text>
|
|
406
415
|
</dees-form>
|
|
407
416
|
`,
|
|
@@ -425,8 +434,10 @@ let OpsViewRemoteIngress = (() => {
|
|
|
425
434
|
: [];
|
|
426
435
|
const autoDerivePorts = formData.autoDerivePorts !== false;
|
|
427
436
|
let performance;
|
|
437
|
+
let egress;
|
|
428
438
|
try {
|
|
429
439
|
performance = this.collectPerformanceOverride(formData, edge.performance);
|
|
440
|
+
egress = this.collectEgressPolicy(formData, edge.egress);
|
|
430
441
|
}
|
|
431
442
|
catch (err) {
|
|
432
443
|
const { DeesToast } = await import('@design.estate/dees-catalog');
|
|
@@ -442,6 +453,7 @@ let OpsViewRemoteIngress = (() => {
|
|
|
442
453
|
listenPorts,
|
|
443
454
|
autoDerivePorts,
|
|
444
455
|
performance,
|
|
456
|
+
egress,
|
|
445
457
|
tags,
|
|
446
458
|
});
|
|
447
459
|
await modalArg.destroy();
|
|
@@ -549,6 +561,16 @@ let OpsViewRemoteIngress = (() => {
|
|
|
549
561
|
<span>${override || effective}</span>
|
|
550
562
|
<span class="metricMuted">${override ? 'edge override' : 'hub default'}</span>
|
|
551
563
|
</div>
|
|
564
|
+
`;
|
|
565
|
+
}
|
|
566
|
+
getEgressHtml(edge) {
|
|
567
|
+
if (!edge.egress?.enabled)
|
|
568
|
+
return '-';
|
|
569
|
+
return html `
|
|
570
|
+
<div class="metricStack">
|
|
571
|
+
<strong>SMTP</strong>
|
|
572
|
+
<span class="metricMuted">port ${(edge.egress.allowedPorts || [25]).join(', ')}</span>
|
|
573
|
+
</div>
|
|
552
574
|
`;
|
|
553
575
|
}
|
|
554
576
|
getTransportHtml(edgeId) {
|
|
@@ -632,6 +654,36 @@ let OpsViewRemoteIngress = (() => {
|
|
|
632
654
|
}
|
|
633
655
|
return base ? {} : undefined;
|
|
634
656
|
}
|
|
657
|
+
collectEgressPolicy(formData, base) {
|
|
658
|
+
const enabled = formData.egressEnabled !== false && Boolean(formData.egressEnabled);
|
|
659
|
+
if (!enabled) {
|
|
660
|
+
return { enabled: false };
|
|
661
|
+
}
|
|
662
|
+
const next = {
|
|
663
|
+
...(base || {}),
|
|
664
|
+
enabled: true,
|
|
665
|
+
allowedPorts: [25],
|
|
666
|
+
};
|
|
667
|
+
const hostPatternsText = `${formData.egressAllowedHostPatterns || ''}`.trim();
|
|
668
|
+
if (hostPatternsText) {
|
|
669
|
+
next.allowedHostPatterns = hostPatternsText.split(',').map((pattern) => pattern.trim()).filter(Boolean);
|
|
670
|
+
}
|
|
671
|
+
else {
|
|
672
|
+
delete next.allowedHostPatterns;
|
|
673
|
+
}
|
|
674
|
+
const maxStreamsText = `${formData.egressMaxConcurrentStreams || ''}`.trim();
|
|
675
|
+
if (maxStreamsText) {
|
|
676
|
+
const maxConcurrentStreams = Number.parseInt(maxStreamsText, 10);
|
|
677
|
+
if (!Number.isInteger(maxConcurrentStreams) || maxConcurrentStreams < 1) {
|
|
678
|
+
throw new Error('SMTP Egress Max Streams must be a positive integer');
|
|
679
|
+
}
|
|
680
|
+
next.maxConcurrentStreams = maxConcurrentStreams;
|
|
681
|
+
}
|
|
682
|
+
else {
|
|
683
|
+
delete next.maxConcurrentStreams;
|
|
684
|
+
}
|
|
685
|
+
return next;
|
|
686
|
+
}
|
|
635
687
|
async showHubSettingsDialog() {
|
|
636
688
|
const { DeesModal, DeesToast } = await import('@design.estate/dees-catalog');
|
|
637
689
|
const hubSettings = this.riState.hubSettings;
|
|
@@ -802,4 +854,4 @@ let OpsViewRemoteIngress = (() => {
|
|
|
802
854
|
return OpsViewRemoteIngress = _classThis;
|
|
803
855
|
})();
|
|
804
856
|
export { OpsViewRemoteIngress };
|
|
805
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-remoteingress.js","sourceRoot":"","sources":["../../../../ts_web/elements/network/ops-view-remoteingress.ts"],"names":[],"mappings":"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"}
|
|
857
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-remoteingress.js","sourceRoot":"","sources":["../../../../ts_web/elements/network/ops-view-remoteingress.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@serve.zone/dcrouter",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "15.
|
|
4
|
+
"version": "15.8.0",
|
|
5
5
|
"description": "A multifaceted routing service handling mail and SMS delivery functions.",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"bin": {
|
|
@@ -17,12 +17,12 @@
|
|
|
17
17
|
"devDependencies": {
|
|
18
18
|
"@git.zone/tsbuild": "^4.4.2",
|
|
19
19
|
"@git.zone/tsbundle": "^2.11.0",
|
|
20
|
-
"@git.zone/tsdeno": "^1.
|
|
20
|
+
"@git.zone/tsdeno": "^1.7.0",
|
|
21
21
|
"@git.zone/tsdocker": "^2.5.0",
|
|
22
22
|
"@git.zone/tsrun": "^2.0.4",
|
|
23
23
|
"@git.zone/tstest": "^3.6.6",
|
|
24
24
|
"@git.zone/tswatch": "^3.3.5",
|
|
25
|
-
"@types/node": "^26.0
|
|
25
|
+
"@types/node": "^26.1.0"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
28
|
"@api.global/typedrequest": "^3.3.2",
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"@push.rocks/smartmcp": "^0.2.0",
|
|
49
49
|
"@push.rocks/smartmetrics": "^3.0.3",
|
|
50
50
|
"@push.rocks/smartmigration": "1.4.1",
|
|
51
|
-
"@push.rocks/smartmta": "^6.
|
|
51
|
+
"@push.rocks/smartmta": "^6.3.0",
|
|
52
52
|
"@push.rocks/smartnetwork": "^4.7.2",
|
|
53
53
|
"@push.rocks/smartpath": "^6.0.0",
|
|
54
54
|
"@push.rocks/smartpromise": "^4.2.4",
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
"@push.rocks/taskbuffer": "^8.0.2",
|
|
63
63
|
"@serve.zone/catalog": "^2.14.0",
|
|
64
64
|
"@serve.zone/interfaces": "^7.28.0",
|
|
65
|
-
"@serve.zone/remoteingress": "^4.
|
|
65
|
+
"@serve.zone/remoteingress": "^4.25.0",
|
|
66
66
|
"@tsclass/tsclass": "^9.5.1",
|
|
67
67
|
"@types/qrcode": "^1.5.6",
|
|
68
68
|
"lru-cache": "^11.5.1",
|
package/readme.md
CHANGED
|
@@ -113,6 +113,7 @@ Bootstrap behavior:
|
|
|
113
113
|
| `baseDir` | Root directory for dcrouter runtime data. Defaults to `~/.serve.zone/dcrouter`. |
|
|
114
114
|
| `coreTrafficConfig` | Main CoreTraffic route configuration for HTTP/HTTPS/TCP/SNI traffic. `smartProxyConfig` remains accepted as a legacy alias. |
|
|
115
115
|
| `emailConfig` | UnifiedEmailServer configuration: hostname, ports, domains, and mail routes. |
|
|
116
|
+
| `emailOutboundMode` | Outbound SMTP mode. Defaults to `direct`; `remoteIngress` routes outbound SMTP through a RemoteIngress egress edge. |
|
|
116
117
|
| `emailPortConfig` | External-to-internal email port mapping and received-email storage path. |
|
|
117
118
|
| `tls` | Legacy/static TLS and ACME contact settings used to seed certificate config. |
|
|
118
119
|
| `dnsNsDomains` | Nameserver hostnames used for generated NS records and DoH routes. |
|
|
@@ -133,6 +134,7 @@ Important runtime behavior:
|
|
|
133
134
|
- Qualifying HTTPS forward routes on port `443` are HTTP/3-augmented unless `http3.enabled === false` or the route opts out.
|
|
134
135
|
- DNS-over-HTTPS routes are generated on the first `dnsNsDomains` entry at `/dns-query` and `/resolve`.
|
|
135
136
|
- Email listener ports can be remapped internally, for example public `25`, `587`, and `465` to unprivileged internal ports.
|
|
137
|
+
- `emailOutboundMode: 'remoteIngress'` requires an enabled RemoteIngress hub and an eligible connected QUIC edge with SMTP egress enabled. If no eligible edge is available, outbound delivery fails or defers instead of silently falling back to direct SMTP from the hub.
|
|
136
138
|
|
|
137
139
|
## Route Ownership
|
|
138
140
|
|
|
@@ -326,6 +328,7 @@ const router = new DcRouter({
|
|
|
326
328
|
},
|
|
327
329
|
],
|
|
328
330
|
},
|
|
331
|
+
emailOutboundMode: 'remoteIngress',
|
|
329
332
|
dnsNsDomains: ['ns1.example.com', 'ns2.example.com'],
|
|
330
333
|
dnsScopes: ['example.com'],
|
|
331
334
|
publicIp: '203.0.113.10',
|
|
@@ -390,6 +393,25 @@ Use `@serve.zone/dcrouter/interfaces` or `@serve.zone/dcrouter-interfaces` when
|
|
|
390
393
|
|
|
391
394
|
Gateway-client mail contracts let Cloudly or Onebox claim exact app addresses, attach inbound `smtpForward` targets, enable managed outbound SMTP credentials, and rotate those credentials through TypedRequest. Managed SMTP users can only send as their exact claimed address; mismatched envelope or header `From` values are rejected before relay.
|
|
392
395
|
|
|
396
|
+
### RemoteIngress SMTP Egress
|
|
397
|
+
|
|
398
|
+
The email settings API and Ops UI expose `outboundMode`. Keep it at `direct` to let SmartMTA dial destination MX hosts from the dcrouter hub. Set it to `remoteIngress` to make SmartMTA request a one-shot RemoteIngress TCP egress proxy for each outbound SMTP connection while keeping the logical MX host and port for SMTP/TLS identity.
|
|
399
|
+
|
|
400
|
+
RemoteIngress edge create/update APIs accept an `egress` policy. Egress is default-disabled and is propagated to the hub only when `egress.enabled === true`.
|
|
401
|
+
|
|
402
|
+
Supported egress policy fields:
|
|
403
|
+
|
|
404
|
+
| Field | Purpose |
|
|
405
|
+
| --- | --- |
|
|
406
|
+
| `enabled` | Enables edge-originating outbound TCP egress for that edge. |
|
|
407
|
+
| `allowedPorts` | Destination ports allowed by dcrouter. Currently limited to SMTP port `25`. |
|
|
408
|
+
| `allowedHostPatterns` | Optional MX host patterns evaluated by the edge before dialing. |
|
|
409
|
+
| `allowPrivateRanges` | Allows private destination ranges when explicitly enabled. Loopback, metadata, multicast, unspecified, documentation, shared, and other reserved ranges remain blocked by the RemoteIngress edge. |
|
|
410
|
+
| `deniedCidrs` | CIDRs denied after edge-side DNS resolution. |
|
|
411
|
+
| `maxConcurrentStreams` | Optional concurrent outbound SMTP stream cap for the edge. |
|
|
412
|
+
|
|
413
|
+
RemoteIngress status responses include `capabilities` and `egressEnabled` so automation can verify whether a connected edge can be selected for SMTP egress. The dcrouter selector currently requires a connected QUIC edge advertising `egressTcpV1`; `quicWithFallback` edges are eligible only while they are not using TCP fallback.
|
|
414
|
+
|
|
393
415
|
## OCI / Container Bootstrap
|
|
394
416
|
|
|
395
417
|
`runCli()` supports an environment-driven container mode when `DCROUTER_MODE=OCI_CONTAINER`.
|
package/ts/00_commitinfo_data.ts
CHANGED
package/ts/classes.dcrouter.ts
CHANGED
|
@@ -14,6 +14,8 @@ import {
|
|
|
14
14
|
type IExtendedSmtpSession,
|
|
15
15
|
type IMessageAcceptanceContext,
|
|
16
16
|
type IMessageAcceptanceDecision,
|
|
17
|
+
type IOutboundConnectionProxy,
|
|
18
|
+
type IOutboundConnectionProxyContext,
|
|
17
19
|
} from '@push.rocks/smartmta';
|
|
18
20
|
import { logger } from './logger.js';
|
|
19
21
|
import { StorageBackedCertManager } from './classes.storage-cert-manager.js';
|
|
@@ -39,7 +41,7 @@ import { AcmeConfigManager } from './acme/manager.acme-config.js';
|
|
|
39
41
|
import { SmartAcmeLifecycle } from './acme/classes.smartacme-lifecycle.js';
|
|
40
42
|
import { AcceptedEmailSpool, EmailDomainManager, EmailRouteBuilder, EmailSettingsManager, SmartMtaStorageManager, WorkAppMailManager, type TSmartMtaQueueItemLike } from './email/index.js';
|
|
41
43
|
import type { IRoute } from '../ts_interfaces/data/route-management.js';
|
|
42
|
-
import type { IEmailPortConfig, IEmailServerSettings, IEmailServerSettingsSeed, TEmailServerSettingsUpdate } from '../ts_interfaces/data/email-settings.js';
|
|
44
|
+
import type { IEmailPortConfig, IEmailServerSettings, IEmailServerSettingsSeed, TEmailOutboundMode, TEmailServerSettingsUpdate } from '../ts_interfaces/data/email-settings.js';
|
|
43
45
|
import type { IDcRouterRouteConfig, IRemoteIngressHubSettings, IRemoteIngressPerformanceConfig, TRemoteIngressHubSettingsUpdate } from '../ts_interfaces/data/remoteingress.js';
|
|
44
46
|
import type { ISecurityCompiledPolicy } from '../ts_interfaces/data/security-policy.js';
|
|
45
47
|
|
|
@@ -55,20 +57,23 @@ export interface IDcRouterOptions {
|
|
|
55
57
|
|
|
56
58
|
/** Legacy name for coreTrafficConfig. */
|
|
57
59
|
smartProxyConfig?: plugins.smartproxy.ISmartProxyOptions;
|
|
58
|
-
|
|
60
|
+
|
|
59
61
|
/**
|
|
60
62
|
* Email server configuration
|
|
61
63
|
* This enables all email handling with pattern-based routing
|
|
62
64
|
*/
|
|
63
65
|
emailConfig?: IUnifiedEmailServerOptions;
|
|
64
|
-
|
|
66
|
+
|
|
67
|
+
/** Outbound SMTP connection mode. Defaults to direct unless DB settings override it. */
|
|
68
|
+
emailOutboundMode?: TEmailOutboundMode;
|
|
69
|
+
|
|
65
70
|
/**
|
|
66
71
|
* Custom email port configuration
|
|
67
72
|
* Allows configuring specific ports for email handling
|
|
68
73
|
* This overrides the default port mapping in the emailConfig
|
|
69
74
|
*/
|
|
70
75
|
emailPortConfig?: IEmailPortConfig;
|
|
71
|
-
|
|
76
|
+
|
|
72
77
|
/** TLS/certificate configuration */
|
|
73
78
|
tls?: {
|
|
74
79
|
/** Contact email for ACME certificates */
|
|
@@ -841,6 +846,9 @@ export class DcRouter {
|
|
|
841
846
|
seed.enabled = true;
|
|
842
847
|
seed.emailConfig = JSON.parse(JSON.stringify(this.options.emailConfig));
|
|
843
848
|
}
|
|
849
|
+
if (this.options.emailOutboundMode) {
|
|
850
|
+
seed.outboundMode = this.options.emailOutboundMode;
|
|
851
|
+
}
|
|
844
852
|
if (this.options.emailPortConfig) {
|
|
845
853
|
seed.emailPortConfig = JSON.parse(JSON.stringify(this.options.emailPortConfig));
|
|
846
854
|
}
|
|
@@ -1591,6 +1599,9 @@ export class DcRouter {
|
|
|
1591
1599
|
// Create config with mapped ports
|
|
1592
1600
|
const baseEmailConfig = this.options.emailConfig;
|
|
1593
1601
|
const configuredMessageDataHook = baseEmailConfig.hooks?.onMessageData;
|
|
1602
|
+
const outboundMode = this.emailSettingsManager?.getOutboundMode()
|
|
1603
|
+
|| this.options.emailOutboundMode
|
|
1604
|
+
|| 'direct';
|
|
1594
1605
|
const mappedEmailPorts = baseEmailConfig.ports.map(port => portMapping[port] || port + 10000);
|
|
1595
1606
|
const configuredSecurePort = baseEmailConfig.smtp?.securePort;
|
|
1596
1607
|
const mappedSecurePort = configuredSecurePort === undefined
|
|
@@ -1606,6 +1617,12 @@ export class DcRouter {
|
|
|
1606
1617
|
...this.options.emailConfig.queue,
|
|
1607
1618
|
storageType: 'memory',
|
|
1608
1619
|
},
|
|
1620
|
+
outbound: {
|
|
1621
|
+
...baseEmailConfig.outbound,
|
|
1622
|
+
...(outboundMode === 'remoteIngress'
|
|
1623
|
+
? { connectionProxyProvider: async (context) => this.createRemoteIngressEmailConnectionProxy(context) }
|
|
1624
|
+
: {}),
|
|
1625
|
+
},
|
|
1609
1626
|
smtp: {
|
|
1610
1627
|
...baseEmailConfig.smtp,
|
|
1611
1628
|
...(mappedSecurePort !== undefined
|
|
@@ -1755,6 +1772,41 @@ export class DcRouter {
|
|
|
1755
1772
|
logger.log('info', `Email server started on ports: ${emailConfig.ports.join(', ')}`);
|
|
1756
1773
|
}
|
|
1757
1774
|
|
|
1775
|
+
private async createRemoteIngressEmailConnectionProxy(
|
|
1776
|
+
context: IOutboundConnectionProxyContext,
|
|
1777
|
+
): Promise<IOutboundConnectionProxy> {
|
|
1778
|
+
const tunnelManager = this.tunnelManager;
|
|
1779
|
+
if (!tunnelManager) {
|
|
1780
|
+
throw new Error('RemoteIngress outbound SMTP egress is enabled, but the hub is not running');
|
|
1781
|
+
}
|
|
1782
|
+
|
|
1783
|
+
const connectionTimeoutMs = this.options.emailConfig?.outbound?.connectionTimeout ?? 30_000;
|
|
1784
|
+
const proxy = await tunnelManager.startEgressTcpProxy({
|
|
1785
|
+
logicalHost: context.host,
|
|
1786
|
+
port: context.port,
|
|
1787
|
+
serverFirst: !context.secure,
|
|
1788
|
+
connectTimeoutMs: connectionTimeoutMs,
|
|
1789
|
+
acceptTimeoutMs: connectionTimeoutMs,
|
|
1790
|
+
});
|
|
1791
|
+
let closed = false;
|
|
1792
|
+
return {
|
|
1793
|
+
connectHost: proxy.listenHost,
|
|
1794
|
+
connectPort: proxy.listenPort,
|
|
1795
|
+
poolKey: `remoteIngress:${proxy.edgeId}:${context.host}:${context.port}`,
|
|
1796
|
+
close: async () => {
|
|
1797
|
+
if (closed) {
|
|
1798
|
+
return;
|
|
1799
|
+
}
|
|
1800
|
+
closed = true;
|
|
1801
|
+
try {
|
|
1802
|
+
await tunnelManager.stopEgressTcpProxy(proxy.proxyId);
|
|
1803
|
+
} catch (err: unknown) {
|
|
1804
|
+
logger.log('warn', `Failed to stop RemoteIngress egress proxy ${proxy.proxyId}: ${(err as Error).message}`);
|
|
1805
|
+
}
|
|
1806
|
+
},
|
|
1807
|
+
};
|
|
1808
|
+
}
|
|
1809
|
+
|
|
1758
1810
|
|
|
1759
1811
|
/**
|
|
1760
1812
|
* Update the unified email configuration
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { IUnifiedEmailServerOptions } from '@push.rocks/smartmta';
|
|
2
2
|
import * as plugins from '../../plugins.js';
|
|
3
3
|
import { DcRouterDb } from '../classes.dcrouter-db.js';
|
|
4
|
-
import type { IEmailPortConfig } from '../../../ts_interfaces/data/email-settings.js';
|
|
4
|
+
import type { IEmailPortConfig, TEmailOutboundMode } from '../../../ts_interfaces/data/email-settings.js';
|
|
5
5
|
|
|
6
6
|
const getDb = () => DcRouterDb.getInstance().getDb();
|
|
7
7
|
|
|
@@ -17,6 +17,9 @@ export class EmailServerSettingsDoc extends plugins.smartdata.SmartDataDbDoc<Ema
|
|
|
17
17
|
@plugins.smartdata.svDb()
|
|
18
18
|
public emailConfig?: IUnifiedEmailServerOptions;
|
|
19
19
|
|
|
20
|
+
@plugins.smartdata.svDb()
|
|
21
|
+
public outboundMode: TEmailOutboundMode = 'direct';
|
|
22
|
+
|
|
20
23
|
@plugins.smartdata.svDb()
|
|
21
24
|
public emailPortConfig?: IEmailPortConfig;
|
|
22
25
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as plugins from '../../plugins.js';
|
|
2
2
|
import { DcRouterDb } from '../classes.dcrouter-db.js';
|
|
3
|
-
import type { IRemoteIngressPerformanceConfig } from '../../../ts_interfaces/data/remoteingress.js';
|
|
3
|
+
import type { IRemoteIngressEgressPolicyConfig, IRemoteIngressPerformanceConfig } from '../../../ts_interfaces/data/remoteingress.js';
|
|
4
4
|
|
|
5
5
|
const getDb = () => DcRouterDb.getInstance().getDb();
|
|
6
6
|
|
|
@@ -31,6 +31,9 @@ export class RemoteIngressEdgeDoc extends plugins.smartdata.SmartDataDbDoc<Remot
|
|
|
31
31
|
@plugins.smartdata.svDb()
|
|
32
32
|
public performance?: IRemoteIngressPerformanceConfig;
|
|
33
33
|
|
|
34
|
+
@plugins.smartdata.svDb()
|
|
35
|
+
public egress?: IRemoteIngressEgressPolicyConfig;
|
|
36
|
+
|
|
34
37
|
@plugins.smartdata.svDb()
|
|
35
38
|
public tags!: string[];
|
|
36
39
|
|
|
@@ -4,6 +4,7 @@ import type { IDcRouterOptions } from '../classes.dcrouter.js';
|
|
|
4
4
|
import type {
|
|
5
5
|
IEmailPortConfig,
|
|
6
6
|
IEmailServerSettings,
|
|
7
|
+
TEmailOutboundMode,
|
|
7
8
|
TEmailServerSettingsUpdate,
|
|
8
9
|
} from '../../ts_interfaces/data/email-settings.js';
|
|
9
10
|
|
|
@@ -21,6 +22,7 @@ function hasOwn(objectArg: object, keyArg: string): boolean {
|
|
|
21
22
|
export class EmailSettingsManager {
|
|
22
23
|
private cachedEmailConfig?: IUnifiedEmailServerOptions;
|
|
23
24
|
private cachedEmailPortConfig?: IEmailPortConfig;
|
|
25
|
+
private outboundMode: TEmailOutboundMode = 'direct';
|
|
24
26
|
private enabled = false;
|
|
25
27
|
private updatedAt = 0;
|
|
26
28
|
private updatedBy = 'default';
|
|
@@ -61,12 +63,17 @@ export class EmailSettingsManager {
|
|
|
61
63
|
return this.isEnabled() ? clonePlain(this.cachedEmailPortConfig) : undefined;
|
|
62
64
|
}
|
|
63
65
|
|
|
66
|
+
public getOutboundMode(): TEmailOutboundMode {
|
|
67
|
+
return this.outboundMode;
|
|
68
|
+
}
|
|
69
|
+
|
|
64
70
|
public getPublicSettings(): IEmailServerSettings {
|
|
65
71
|
const emailConfig = this.cachedEmailConfig;
|
|
66
72
|
const emailPortConfig = this.cachedEmailPortConfig;
|
|
67
73
|
return {
|
|
68
74
|
enabled: this.isEnabled(),
|
|
69
75
|
hostname: emailConfig?.hostname || null,
|
|
76
|
+
outboundMode: this.outboundMode,
|
|
70
77
|
ports: [...(emailConfig?.ports || [])],
|
|
71
78
|
portMapping: emailPortConfig?.portMapping ? { ...emailPortConfig.portMapping } : null,
|
|
72
79
|
receivedEmailsPath: emailPortConfig?.receivedEmailsPath || null,
|
|
@@ -92,10 +99,12 @@ export class EmailSettingsManager {
|
|
|
92
99
|
const nextEnabled = hasOwn(updates, 'enabled') ? Boolean(updates.enabled) : doc.enabled;
|
|
93
100
|
const nextEmailConfig = this.patchEmailConfig(doc.emailConfig, updates, nextEnabled);
|
|
94
101
|
const nextEmailPortConfig = this.patchEmailPortConfig(doc.emailPortConfig, updates);
|
|
102
|
+
const nextOutboundMode = this.patchOutboundMode(doc.outboundMode, updates);
|
|
95
103
|
|
|
96
104
|
doc.enabled = nextEnabled;
|
|
97
105
|
doc.emailConfig = nextEmailConfig;
|
|
98
106
|
doc.emailPortConfig = nextEmailPortConfig;
|
|
107
|
+
doc.outboundMode = nextOutboundMode;
|
|
99
108
|
doc.updatedAt = Date.now();
|
|
100
109
|
doc.updatedBy = updatedBy;
|
|
101
110
|
await doc.save();
|
|
@@ -109,6 +118,7 @@ export class EmailSettingsManager {
|
|
|
109
118
|
this.enabled = doc.enabled;
|
|
110
119
|
this.cachedEmailConfig = clonePlain(doc.emailConfig);
|
|
111
120
|
this.cachedEmailPortConfig = clonePlain(doc.emailPortConfig);
|
|
121
|
+
this.outboundMode = this.normalizeOutboundMode(doc.outboundMode);
|
|
112
122
|
this.updatedAt = doc.updatedAt;
|
|
113
123
|
this.updatedBy = doc.updatedBy;
|
|
114
124
|
}
|
|
@@ -116,6 +126,25 @@ export class EmailSettingsManager {
|
|
|
116
126
|
private applyToRuntimeOptions(): void {
|
|
117
127
|
this.options.emailConfig = this.getEmailConfig();
|
|
118
128
|
this.options.emailPortConfig = this.getEmailPortConfig();
|
|
129
|
+
this.options.emailOutboundMode = this.outboundMode;
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
private patchOutboundMode(
|
|
133
|
+
existingMode: TEmailOutboundMode | undefined,
|
|
134
|
+
updates: TEmailServerSettingsUpdate,
|
|
135
|
+
): TEmailOutboundMode {
|
|
136
|
+
if (hasOwn(updates, 'outboundMode') && updates.outboundMode !== undefined) {
|
|
137
|
+
return this.normalizeOutboundMode(updates.outboundMode);
|
|
138
|
+
}
|
|
139
|
+
return this.normalizeOutboundMode(existingMode);
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
private normalizeOutboundMode(mode: TEmailOutboundMode | undefined): TEmailOutboundMode {
|
|
143
|
+
if (!mode) return 'direct';
|
|
144
|
+
if (mode !== 'direct' && mode !== 'remoteIngress') {
|
|
145
|
+
throw new Error('Invalid email outbound mode');
|
|
146
|
+
}
|
|
147
|
+
return mode;
|
|
119
148
|
}
|
|
120
149
|
|
|
121
150
|
private patchEmailConfig(
|
|
@@ -107,6 +107,7 @@ export class ConfigHandler {
|
|
|
107
107
|
ports: emailSettings?.ports || opts.emailConfig?.ports || [],
|
|
108
108
|
portMapping,
|
|
109
109
|
hostname: emailSettings?.hostname || opts.emailConfig?.hostname || null,
|
|
110
|
+
outboundMode: emailSettings?.outboundMode || opts.emailOutboundMode || 'direct',
|
|
110
111
|
domains: emailDomains,
|
|
111
112
|
emailRouteCount: emailSettings?.routeCount ?? opts.emailConfig?.routes?.length ?? 0,
|
|
112
113
|
receivedEmailsPath: emailSettings?.receivedEmailsPath || opts.emailPortConfig?.receivedEmailsPath || null,
|
|
@@ -58,6 +58,7 @@ export class EmailSettingsHandler {
|
|
|
58
58
|
return {
|
|
59
59
|
enabled: Boolean(emailConfig),
|
|
60
60
|
hostname: emailConfig?.hostname || null,
|
|
61
|
+
outboundMode: this.opsServerRef.dcRouterRef.options.emailOutboundMode || 'direct',
|
|
61
62
|
ports: [...(emailConfig?.ports || [])],
|
|
62
63
|
portMapping: emailPortConfig?.portMapping ? { ...emailPortConfig.portMapping } : null,
|
|
63
64
|
receivedEmailsPath: emailPortConfig?.receivedEmailsPath || null,
|