@serve.zone/dcrouter 17.0.0 → 17.1.1

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.
Files changed (141) hide show
  1. package/.smartconfig.json +7 -4
  2. package/deno.json +1 -1
  3. package/dist_serve/bundle.js +1316 -1151
  4. package/dist_ts/00_commitinfo_data.js +1 -1
  5. package/dist_ts/classes.dcrouter.d.ts +3 -1
  6. package/dist_ts/classes.dcrouter.js +113 -52
  7. package/dist_ts/db/classes.cache.cleaner.d.ts +3 -0
  8. package/dist_ts/db/classes.cache.cleaner.js +7 -3
  9. package/dist_ts/db/classes.dcrouter-db.js +1 -2
  10. package/dist_ts/db/documents/classes.cached.email.d.ts +41 -4
  11. package/dist_ts/db/documents/classes.cached.email.js +36 -5
  12. package/dist_ts/db/documents/classes.dns-record.doc.js +3 -1
  13. package/dist_ts/dns/classes.dns-server-runtime.d.ts +0 -1
  14. package/dist_ts/dns/classes.dns-server-runtime.js +4 -36
  15. package/dist_ts/dns/index.d.ts +1 -0
  16. package/dist_ts/dns/index.js +2 -1
  17. package/dist_ts/dns/manager.dns.d.ts +1 -0
  18. package/dist_ts/dns/manager.dns.js +49 -14
  19. package/dist_ts/dns/providers/cloudflare.provider.js +19 -4
  20. package/dist_ts/dns/txt-record-presentation.d.ts +20 -0
  21. package/dist_ts/dns/txt-record-presentation.js +131 -0
  22. package/dist_ts/email/classes.accepted-email-spool.d.ts +32 -3
  23. package/dist_ts/email/classes.accepted-email-spool.js +174 -13
  24. package/dist_ts/email/classes.email-domain.manager.d.ts +14 -1
  25. package/dist_ts/email/classes.email-domain.manager.js +151 -8
  26. package/dist_ts/email/classes.email-settings.manager.js +2 -2
  27. package/dist_ts/email/classes.mail-dns-sync.d.ts +31 -5
  28. package/dist_ts/email/classes.mail-dns-sync.js +508 -117
  29. package/dist_ts/email/classes.smartmta-blob-storage-manager.d.ts +2 -2
  30. package/dist_ts/email/classes.smartmta-blob-storage-manager.js +4 -3
  31. package/dist_ts/email/classes.workapp-mail-manager.d.ts +1 -0
  32. package/dist_ts/email/classes.workapp-mail-manager.js +26 -2
  33. package/dist_ts/email/index.d.ts +2 -0
  34. package/dist_ts/email/index.js +3 -1
  35. package/dist_ts/email/mail-dns-txt-policy.d.ts +18 -0
  36. package/dist_ts/email/mail-dns-txt-policy.js +466 -0
  37. package/dist_ts/email/reconcile-mail-dns-singleton.d.ts +47 -0
  38. package/dist_ts/email/reconcile-mail-dns-singleton.js +159 -0
  39. package/dist_ts/opsserver/classes.opsserver.d.ts +8 -0
  40. package/dist_ts/opsserver/classes.opsserver.js +34 -1
  41. package/dist_ts/opsserver/handlers/certificate.handler.js +25 -4
  42. package/dist_ts/opsserver/handlers/config.handler.js +9 -5
  43. package/dist_ts/opsserver/handlers/dns-provider.handler.js +19 -2
  44. package/dist_ts/opsserver/handlers/dns-record.handler.js +25 -4
  45. package/dist_ts/opsserver/handlers/domain.handler.js +37 -3
  46. package/dist_ts/opsserver/handlers/email-domain.handler.js +5 -7
  47. package/dist_ts/opsserver/handlers/email-ops.handler.d.ts +1 -0
  48. package/dist_ts/opsserver/handlers/email-ops.handler.js +26 -7
  49. package/dist_ts/opsserver/handlers/index.d.ts +1 -0
  50. package/dist_ts/opsserver/handlers/index.js +2 -1
  51. package/dist_ts/opsserver/handlers/logs.handler.d.ts +1 -1
  52. package/dist_ts/opsserver/handlers/logs.handler.js +3 -3
  53. package/dist_ts/opsserver/handlers/realtime.handler.d.ts +37 -0
  54. package/dist_ts/opsserver/handlers/realtime.handler.js +154 -0
  55. package/dist_ts/opsserver/handlers/remoteingress.handler.js +22 -1
  56. package/dist_ts/opsserver/handlers/route-management.handler.js +47 -5
  57. package/dist_ts/opsserver/handlers/stats.handler.js +5 -1
  58. package/dist_ts/paths.d.ts +0 -11
  59. package/dist_ts/paths.js +1 -22
  60. package/dist_ts/plugins.d.ts +0 -34
  61. package/dist_ts/plugins.js +1 -62
  62. package/dist_ts_interfaces/data/email-domain.d.ts +14 -0
  63. package/dist_ts_interfaces/requests/config.d.ts +1 -1
  64. package/dist_ts_interfaces/requests/email-ops.d.ts +34 -1
  65. package/dist_ts_interfaces/requests/index.d.ts +1 -0
  66. package/dist_ts_interfaces/requests/index.js +2 -1
  67. package/dist_ts_interfaces/requests/realtime.d.ts +38 -0
  68. package/dist_ts_interfaces/requests/realtime.js +11 -0
  69. package/dist_ts_migrations/index.d.ts +6 -0
  70. package/dist_ts_migrations/index.js +208 -9
  71. package/dist_ts_web/00_commitinfo_data.js +1 -1
  72. package/dist_ts_web/appstate/certificates.js +9 -2
  73. package/dist_ts_web/appstate/domains.js +16 -5
  74. package/dist_ts_web/appstate/email-domains.d.ts +3 -0
  75. package/dist_ts_web/appstate/email-domains.js +47 -14
  76. package/dist_ts_web/appstate/email-ops.d.ts +1 -0
  77. package/dist_ts_web/appstate/email-ops.js +20 -2
  78. package/dist_ts_web/appstate/realtime.d.ts +27 -0
  79. package/dist_ts_web/appstate/realtime.js +71 -0
  80. package/dist_ts_web/appstate/remoteingress.js +9 -3
  81. package/dist_ts_web/appstate/routes.js +16 -5
  82. package/dist_ts_web/appstate/runtime.js +135 -7
  83. package/dist_ts_web/appstate.d.ts +1 -0
  84. package/dist_ts_web/appstate.js +2 -1
  85. package/dist_ts_web/elements/email/email-domain-creation-progress.d.ts +33 -0
  86. package/dist_ts_web/elements/email/email-domain-creation-progress.js +257 -0
  87. package/dist_ts_web/elements/email/ops-view-email-domains.js +233 -68
  88. package/dist_ts_web/elements/email/ops-view-emails.d.ts +4 -2
  89. package/dist_ts_web/elements/email/ops-view-emails.js +25 -13
  90. package/dist_ts_web/elements/overview/ops-view-config.js +5 -5
  91. package/package.json +22 -19
  92. package/ts/00_commitinfo_data.ts +1 -1
  93. package/ts/classes.dcrouter.ts +124 -57
  94. package/ts/db/classes.cache.cleaner.ts +18 -3
  95. package/ts/db/classes.dcrouter-db.ts +0 -2
  96. package/ts/db/documents/classes.cached.email.ts +78 -4
  97. package/ts/db/documents/classes.dns-record.doc.ts +1 -0
  98. package/ts/dns/classes.dns-server-runtime.ts +9 -45
  99. package/ts/dns/index.ts +1 -0
  100. package/ts/dns/manager.dns.ts +50 -16
  101. package/ts/dns/providers/cloudflare.provider.ts +21 -3
  102. package/ts/dns/txt-record-presentation.ts +134 -0
  103. package/ts/email/classes.accepted-email-spool.ts +220 -14
  104. package/ts/email/classes.email-domain.manager.ts +201 -7
  105. package/ts/email/classes.email-settings.manager.ts +1 -1
  106. package/ts/email/classes.mail-dns-sync.ts +588 -122
  107. package/ts/email/classes.smartmta-blob-storage-manager.ts +3 -2
  108. package/ts/email/classes.workapp-mail-manager.ts +34 -1
  109. package/ts/email/index.ts +2 -0
  110. package/ts/email/mail-dns-txt-policy.ts +505 -0
  111. package/ts/email/reconcile-mail-dns-singleton.ts +224 -0
  112. package/ts/opsserver/classes.opsserver.ts +42 -0
  113. package/ts/opsserver/handlers/certificate.handler.ts +24 -3
  114. package/ts/opsserver/handlers/config.handler.ts +9 -5
  115. package/ts/opsserver/handlers/dns-provider.handler.ts +18 -1
  116. package/ts/opsserver/handlers/dns-record.handler.ts +24 -3
  117. package/ts/opsserver/handlers/domain.handler.ts +36 -2
  118. package/ts/opsserver/handlers/email-domain.handler.ts +4 -5
  119. package/ts/opsserver/handlers/email-ops.handler.ts +29 -6
  120. package/ts/opsserver/handlers/index.ts +1 -0
  121. package/ts/opsserver/handlers/logs.handler.ts +2 -2
  122. package/ts/opsserver/handlers/realtime.handler.ts +222 -0
  123. package/ts/opsserver/handlers/remoteingress.handler.ts +21 -0
  124. package/ts/opsserver/handlers/route-management.handler.ts +46 -4
  125. package/ts/opsserver/handlers/stats.handler.ts +4 -0
  126. package/ts/paths.ts +0 -25
  127. package/ts/plugins.ts +0 -68
  128. package/ts_web/00_commitinfo_data.ts +1 -1
  129. package/ts_web/appstate/certificates.ts +6 -1
  130. package/ts_web/appstate/domains.ts +11 -4
  131. package/ts_web/appstate/email-domains.ts +68 -14
  132. package/ts_web/appstate/email-ops.ts +20 -1
  133. package/ts_web/appstate/realtime.ts +109 -0
  134. package/ts_web/appstate/remoteingress.ts +6 -2
  135. package/ts_web/appstate/routes.ts +11 -4
  136. package/ts_web/appstate/runtime.ts +176 -7
  137. package/ts_web/appstate.ts +1 -0
  138. package/ts_web/elements/email/email-domain-creation-progress.ts +340 -0
  139. package/ts_web/elements/email/ops-view-email-domains.ts +273 -74
  140. package/ts_web/elements/email/ops-view-emails.ts +23 -16
  141. package/ts_web/elements/overview/ops-view-config.ts +4 -4
@@ -0,0 +1,257 @@
1
+ const settledIntentStatuses = new Set([
2
+ 'satisfied',
3
+ 'valid',
4
+ 'conflict',
5
+ 'failed',
6
+ ]);
7
+ const formatOperationError = (errorArg) => {
8
+ const location = errorArg.recordKey ? `${errorArg.recordKey}: ` : '';
9
+ return `${location}${errorArg.message} [${errorArg.code}]`;
10
+ };
11
+ const appendDnsStatusLines = (linesArg, dnsStatusArg) => {
12
+ for (const [label, status] of [
13
+ ['MX', dnsStatusArg.mx],
14
+ ['SPF', dnsStatusArg.spf],
15
+ ['DKIM', dnsStatusArg.dkim],
16
+ ['DMARC', dnsStatusArg.dmarc],
17
+ ]) {
18
+ if (status !== 'unchecked') {
19
+ linesArg.push(`${label}: ${status}`);
20
+ }
21
+ }
22
+ };
23
+ export const getEmailDomainCreationProgress = (inputArg) => {
24
+ const { domain, operation, requestCompleted } = inputArg;
25
+ if (!domain) {
26
+ if (!requestCompleted) {
27
+ return {
28
+ percentage: 0,
29
+ indeterminate: true,
30
+ showPercentage: false,
31
+ statusText: 'Generating DKIM material and creating the domain record...',
32
+ terminalLines: ['Submitting email domain configuration'],
33
+ };
34
+ }
35
+ const lines = ['Email domain creation request completed without a persisted domain'];
36
+ for (const error of operation?.errors || []) {
37
+ lines.push(formatOperationError(error));
38
+ }
39
+ if (operation?.message && !lines.includes(operation.message)) {
40
+ lines.push(operation.message);
41
+ }
42
+ return {
43
+ percentage: 100,
44
+ indeterminate: false,
45
+ showPercentage: false,
46
+ statusText: operation?.message || 'Email domain creation failed.',
47
+ terminalLines: lines,
48
+ };
49
+ }
50
+ const reconciliation = domain.reconciliation;
51
+ const lines = [`Domain record persisted: ${domain.domain}`];
52
+ if (!reconciliation || reconciliation.intents.length === 0) {
53
+ if (!requestCompleted) {
54
+ lines.push('Preparing the managed DNS plan');
55
+ return {
56
+ percentage: 0,
57
+ indeterminate: true,
58
+ showPercentage: false,
59
+ statusText: 'Preparing the managed DNS plan...',
60
+ terminalLines: lines,
61
+ };
62
+ }
63
+ lines.push('No DNS reconciliation plan is available');
64
+ const errors = reconciliation?.errors.length
65
+ ? reconciliation.errors
66
+ : operation?.errors || [];
67
+ for (const error of errors) {
68
+ lines.push(formatOperationError(error));
69
+ }
70
+ const retryAt = reconciliation?.retryAt || operation?.retryAt;
71
+ if (retryAt) {
72
+ lines.push(`Retry scheduled for ${retryAt}`);
73
+ }
74
+ const statusText = reconciliation?.lifecycleStatus === 'failed'
75
+ ? operation?.message || `DNS setup failed for ${domain.domain}.`
76
+ : retryAt
77
+ ? 'DNS reconciliation is pending and will retry automatically.'
78
+ : operation?.message || 'The domain was created without a DNS reconciliation plan.';
79
+ return {
80
+ percentage: 100,
81
+ indeterminate: false,
82
+ showPercentage: false,
83
+ statusText,
84
+ terminalLines: lines,
85
+ };
86
+ }
87
+ const settledCount = reconciliation.intents.filter((intent) => settledIntentStatuses.has(intent.status)).length;
88
+ lines.push(`DNS plan prepared: ${reconciliation.intents.length} managed records`);
89
+ lines.push(`DNS reconciliation: ${settledCount} settled, ${reconciliation.intents.length - settledCount} pending`);
90
+ appendDnsStatusLines(lines, domain.dnsStatus);
91
+ if (reconciliation.lifecycleStatus === 'active') {
92
+ lines.push('Email domain is active');
93
+ return {
94
+ percentage: 100,
95
+ indeterminate: false,
96
+ showPercentage: true,
97
+ statusText: `${domain.domain} is active.`,
98
+ terminalLines: lines,
99
+ };
100
+ }
101
+ if (!requestCompleted) {
102
+ return {
103
+ percentage: 0,
104
+ indeterminate: true,
105
+ showPercentage: false,
106
+ statusText: 'Reconciling and validating managed DNS records...',
107
+ terminalLines: lines,
108
+ };
109
+ }
110
+ const errors = reconciliation.errors.length > 0
111
+ ? reconciliation.errors
112
+ : operation?.errors || [];
113
+ for (const error of errors) {
114
+ lines.push(formatOperationError(error));
115
+ }
116
+ const retryAt = reconciliation.retryAt || operation?.retryAt;
117
+ if (retryAt) {
118
+ lines.push(`Retry scheduled for ${retryAt}`);
119
+ }
120
+ if (reconciliation.lifecycleStatus === 'failed') {
121
+ return {
122
+ percentage: 100,
123
+ indeterminate: false,
124
+ showPercentage: false,
125
+ statusText: operation?.message || `DNS setup failed for ${domain.domain}.`,
126
+ terminalLines: lines,
127
+ };
128
+ }
129
+ return {
130
+ percentage: 100,
131
+ indeterminate: false,
132
+ showPercentage: false,
133
+ statusText: retryAt
134
+ ? `DNS reconciliation is pending and will retry automatically.`
135
+ : `DNS reconciliation is pending for ${domain.domain}.`,
136
+ terminalLines: lines,
137
+ };
138
+ };
139
+ export const findNewEmailDomain = (domainsArg, expectedDomainArg, existingIdsArg) => {
140
+ const expectedDomain = expectedDomainArg.trim().toLowerCase();
141
+ const candidates = domainsArg.filter((domain) => domain.domain.toLowerCase() === expectedDomain && !existingIdsArg.has(domain.id));
142
+ if (candidates.length > 1) {
143
+ throw new Error(`Multiple new email domains appeared for ${expectedDomain}`);
144
+ }
145
+ return candidates[0];
146
+ };
147
+ const waitForPollInterval = async (delayMsArg, signalArg) => {
148
+ if (signalArg.aborted)
149
+ return;
150
+ await new Promise((resolve) => {
151
+ const finish = () => {
152
+ signalArg.removeEventListener('abort', handleAbort);
153
+ resolve();
154
+ };
155
+ const handleAbort = () => {
156
+ clearTimeout(timeoutId);
157
+ finish();
158
+ };
159
+ const timeoutId = setTimeout(finish, delayMsArg);
160
+ signalArg.addEventListener('abort', handleAbort, { once: true });
161
+ });
162
+ };
163
+ export const observeNewEmailDomain = async (optionsArg) => {
164
+ const startedAt = Date.now();
165
+ const pollIntervalMs = optionsArg.pollIntervalMs ?? (optionsArg.subscribeToDomains ? 15_000 : 600);
166
+ const timeoutMs = optionsArg.timeoutMs ?? 120_000;
167
+ let observedId;
168
+ let latestDomain;
169
+ let pushedDomains;
170
+ let wakeObserver;
171
+ const unsubscribe = optionsArg.subscribeToDomains?.((domainsArg) => {
172
+ pushedDomains = domainsArg;
173
+ wakeObserver?.();
174
+ });
175
+ try {
176
+ while (!optionsArg.signal.aborted && Date.now() - startedAt < timeoutMs) {
177
+ try {
178
+ let domain;
179
+ if (!observedId) {
180
+ const domainSnapshot = pushedDomains || await optionsArg.listDomains();
181
+ pushedDomains = undefined;
182
+ const foundDomain = findNewEmailDomain(domainSnapshot, optionsArg.expectedDomain, optionsArg.existingIds);
183
+ observedId = foundDomain?.id;
184
+ domain = foundDomain;
185
+ }
186
+ else if (pushedDomains) {
187
+ domain = pushedDomains.find((candidate) => candidate.id === observedId);
188
+ pushedDomains = undefined;
189
+ }
190
+ else {
191
+ domain = await optionsArg.getDomain(observedId);
192
+ }
193
+ if (optionsArg.signal.aborted)
194
+ break;
195
+ if (domain) {
196
+ if (domain !== latestDomain) {
197
+ latestDomain = domain;
198
+ optionsArg.onDomain(domain);
199
+ }
200
+ const lifecycleStatus = domain.reconciliation?.lifecycleStatus;
201
+ if (lifecycleStatus === 'active' || lifecycleStatus === 'failed') {
202
+ return domain;
203
+ }
204
+ }
205
+ }
206
+ catch (error) {
207
+ if (error instanceof Error && error.message.startsWith('Multiple new email domains')) {
208
+ throw error;
209
+ }
210
+ // The realtime subscription or bounded fallback read will retry.
211
+ }
212
+ const updatePromise = new Promise((resolve) => {
213
+ wakeObserver = resolve;
214
+ });
215
+ if (pushedDomains) {
216
+ wakeObserver = undefined;
217
+ continue;
218
+ }
219
+ await Promise.race([
220
+ updatePromise,
221
+ waitForPollInterval(pollIntervalMs, optionsArg.signal),
222
+ ]);
223
+ wakeObserver = undefined;
224
+ }
225
+ }
226
+ finally {
227
+ unsubscribe?.();
228
+ wakeObserver?.();
229
+ }
230
+ return latestDomain;
231
+ };
232
+ export const withAbortableDeadline = async (promiseArg, optionsArg) => {
233
+ return new Promise((resolve, reject) => {
234
+ let settled = false;
235
+ const finish = (callbackArg) => {
236
+ if (settled)
237
+ return;
238
+ settled = true;
239
+ clearTimeout(timeoutId);
240
+ optionsArg.signal?.removeEventListener('abort', handleAbort);
241
+ callbackArg();
242
+ };
243
+ const handleAbort = () => {
244
+ finish(() => reject(new Error('Email domain creation progress was interrupted')));
245
+ };
246
+ const timeoutId = setTimeout(() => {
247
+ finish(() => reject(new Error(optionsArg.timeoutMessage)));
248
+ }, optionsArg.timeoutMs);
249
+ if (optionsArg.signal?.aborted) {
250
+ handleAbort();
251
+ return;
252
+ }
253
+ optionsArg.signal?.addEventListener('abort', handleAbort, { once: true });
254
+ promiseArg.then((value) => finish(() => resolve(value)), (error) => finish(() => reject(error)));
255
+ });
256
+ };
257
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"email-domain-creation-progress.js","sourceRoot":"","sources":["../../../../ts_web/elements/email/email-domain-creation-progress.ts"],"names":[],"mappings":"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"}