@social-mail/social-mail-web-server 1.16.91 → 1.16.92
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/dist/.tsbuildinfo +1 -1
- package/dist/server/smtp/dns/DnsService.d.ts.map +1 -1
- package/dist/server/smtp/dns/DnsService.js +34 -17
- package/dist/server/smtp/dns/DnsService.js.map +1 -1
- package/dist/server/workflows/smtp/DispatchEmailToMX.d.ts.map +1 -1
- package/dist/server/workflows/smtp/DispatchEmailToMX.js +19 -13
- package/dist/server/workflows/smtp/DispatchEmailToMX.js.map +1 -1
- package/package.json +1 -1
- package/src/server/smtp/dns/DnsService.ts +35 -18
- package/src/server/workflows/smtp/DispatchEmailToMX.ts +19 -14
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DnsService.d.ts","sourceRoot":"","sources":["../../../../src/server/smtp/dns/DnsService.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,EAAC,eAAe,EAAE,WAAW,EAAY,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"DnsService.d.ts","sourceRoot":"","sources":["../../../../src/server/smtp/dns/DnsService.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,EAAC,eAAe,EAAE,WAAW,EAAY,MAAM,6BAA6B,CAAC;AAIpF,MAAM,WAAW,WAAW;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACrB;AAOD,MAAM,CAAC,OAAO,OAAO,UAAW,YAAW,eAAe,CAAC,UAAU,CAAC;IAElE,KAAK,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IAGlB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC;IA8BzG;;;;OAIG;IAEU,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC;IAwChF;;;;OAIG;IAEU,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAW7E;;;;OAIG;IAEU,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAWxE;;;;GAID;IAEU,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAwC/G"}
|
|
@@ -12,6 +12,8 @@ import dns2 from "dns2";
|
|
|
12
12
|
import { SPFRecords } from "./SPFRecords.js";
|
|
13
13
|
import localDns from "node:dns/promises";
|
|
14
14
|
import { cacheFor } from "../../../common/cacheFor.js";
|
|
15
|
+
import TimeoutError from "../../../common/errors/TimeoutError.js";
|
|
16
|
+
import sleep from "../../../common/sleep.js";
|
|
15
17
|
const defaultNameServers = ["8.8.8.8", "1.1.1.1", "114.114.114.114"];
|
|
16
18
|
// localDns.setServers(defaultNameServers);
|
|
17
19
|
let DnsService = class DnsService {
|
|
@@ -121,25 +123,40 @@ let DnsService = class DnsService {
|
|
|
121
123
|
* @param nameServers optional name servers
|
|
122
124
|
*/
|
|
123
125
|
async getMXAddresses(domain, nameServers) {
|
|
124
|
-
const
|
|
125
|
-
let
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
126
|
+
const errors = [];
|
|
127
|
+
for (let i = 0; i < 3; i++) {
|
|
128
|
+
try {
|
|
129
|
+
const mx = await localDns.resolveMx(domain);
|
|
130
|
+
let hosts = [{ exchange: domain }];
|
|
131
|
+
if (mx.length === 0) {
|
|
132
|
+
hosts = [{ exchange: domain }];
|
|
133
|
+
console.warn(`No MX defined for ${domain}`);
|
|
134
|
+
}
|
|
135
|
+
else {
|
|
136
|
+
mx.sort((a, b) => a.priority - b.priority);
|
|
137
|
+
hosts = mx;
|
|
138
|
+
}
|
|
139
|
+
const result = [];
|
|
140
|
+
await Promise.all(hosts.map(async (a) => {
|
|
141
|
+
const host = a.exchange;
|
|
142
|
+
const ips = await localDns.resolve(host);
|
|
143
|
+
for (const ip of ips) {
|
|
144
|
+
result.push({ host, ip });
|
|
145
|
+
}
|
|
146
|
+
}));
|
|
147
|
+
return result;
|
|
148
|
+
}
|
|
149
|
+
catch (error) {
|
|
150
|
+
errors.push(error.cause
|
|
151
|
+
? (error.cause?.stack ?? error.cause)
|
|
152
|
+
: (error.stack ?? error));
|
|
153
|
+
await sleep(300);
|
|
154
|
+
}
|
|
129
155
|
}
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
hosts = mx;
|
|
156
|
+
if (errors.length) {
|
|
157
|
+
throw new Error(`Failed to get MX for ${domain} ${errors.join("\n")}`);
|
|
133
158
|
}
|
|
134
|
-
|
|
135
|
-
await Promise.all(hosts.map(async (a) => {
|
|
136
|
-
const host = a.exchange;
|
|
137
|
-
const ips = await localDns.resolve(host);
|
|
138
|
-
for (const ip of ips) {
|
|
139
|
-
result.push({ host, ip });
|
|
140
|
-
}
|
|
141
|
-
}));
|
|
142
|
-
return result;
|
|
159
|
+
throw new TimeoutError();
|
|
143
160
|
}
|
|
144
161
|
};
|
|
145
162
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DnsService.js","sourceRoot":"","sources":["../../../../src/server/smtp/dns/DnsService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAA+B,QAAQ,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"DnsService.js","sourceRoot":"","sources":["../../../../src/server/smtp/dns/DnsService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAA+B,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACpF,OAAO,YAAY,MAAM,wCAAwC,CAAC;AAClE,OAAO,KAAK,MAAM,0BAA0B,CAAC;AAO7C,MAAM,kBAAkB,GAAG,CAAC,SAAS,EAAE,SAAS,EAAE,iBAAiB,CAAC,CAAC;AAErE,2CAA2C;AAG5B,IAAM,UAAU,GAAhB,MAAM,UAAU;IAKd,AAAN,KAAK,CAAC,YAAY,CAAC,QAAgB,EAAE,MAAc,EAAE,WAAsB;QAC9E,WAAW,KAAK,EAAE,CAAC;QACnB,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;YACtB,WAAW,GAAG,kBAAkB,CAAC;QACrC,CAAC;QACD,MAAM,IAAI,GAAG,GAAG,QAAQ,eAAe,MAAM,EAAE,CAAC;QAChD,MAAM,GAAG,GAAG,IAAI,IAAI,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;QACtC,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC/C,KAAK,MAAM,QAAQ,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACrC,IAAI,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBACjC,IAAI,OAAO,CAAC;gBACZ,IAAI,SAAS,CAAC;gBACd,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACjD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;oBACzB,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;oBAC7C,QAAO,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;wBACjB,KAAK,GAAG;4BACJ,SAAS,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;4BACzB,MAAM;wBACV,KAAK,GAAG;4BACJ,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;4BACvB,MAAM;oBACd,CAAC;gBACL,CAAC;gBACD,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;YAClC,CAAC;QACL,CAAC;QACD,OAAO;IACX,CAAC;IAED;;;;OAIG;IAEU,AAAN,KAAK,CAAC,MAAM,CAAC,MAAc,EAAE,WAAsB;QACtD,WAAW,KAAK,EAAE,CAAC;QACnB,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;YACtB,WAAW,GAAG,kBAAkB,CAAC;QACrC,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,IAAI,CAAC,EAAC,WAAW,EAAE,CAAC,CAAC;QAErC,MAAM,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAEhC,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACjD,KAAK,MAAM,QAAQ,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACrC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBACjC,SAAS;YACb,CAAC;YACD,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACjD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBACzB,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;gBAC7C,QAAO,IAAI,EAAE,CAAC;oBACV,KAAK,UAAU;wBACX,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;oBACjD,KAAK,SAAS;wBACV,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;wBACtD,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;wBACxB,MAAM;oBACV,KAAK,GAAG;wBACJ,MAAM,CAAC,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;wBACpC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;wBAClD,MAAM;oBACV,KAAK,KAAK;wBACN,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;wBAC3B,MAAM;oBACV,KAAK,MAAM;wBACP,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC;wBACvB,MAAM;gBACd,CAAC;YACL,CAAC;QACL,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED;;;;OAIG;IAEU,AAAN,KAAK,CAAC,KAAK,CAAC,MAAc,EAAE,WAAsB;QACrD,WAAW,KAAK,EAAE,CAAC;QACnB,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;YACtB,WAAW,GAAG,kBAAkB,CAAC;QACrC,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,IAAI,CAAC,EAAC,WAAW,EAAE,CAAC,CAAC;QACrC,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACvC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC;QAC7D,OAAO,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAClD,CAAC;IAED;;;;OAIG;IAEU,AAAN,KAAK,CAAC,IAAI,CAAC,MAAc,EAAE,WAAsB;QACpD,WAAW,KAAK,EAAE,CAAC;QACnB,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;YACtB,WAAW,GAAG,kBAAkB,CAAC;QACrC,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,IAAI,CAAC,EAAC,WAAW,EAAE,CAAC,CAAC;QACrC,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACtC,OAAO,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;IAGG;;;;GAID;IAEU,AAAN,KAAK,CAAC,cAAc,CAAC,MAAc,EAAE,WAAsB;QAE9D,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,KAAI,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,CAAC,EAAC,CAAC,EAAE,EAAE,CAAC;YACnB,IAAI,CAAC;gBACD,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;gBAE5C,IAAI,KAAK,GAAG,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;gBAEnC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAClB,KAAK,GAAG,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;oBAC/B,OAAO,CAAC,IAAI,CAAC,qBAAqB,MAAM,EAAE,CAAC,CAAC;gBAChD,CAAC;qBAAM,CAAC;oBACJ,EAAE,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC;oBACrD,KAAK,GAAG,EAAW,CAAC;gBACxB,CAAC;gBAED,MAAM,MAAM,GAAG,EAAmC,CAAC;gBAEnD,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,CAAM,EAAE,EAAE;oBACzC,MAAM,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC;oBACxB,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;oBACzC,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;wBACnB,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;oBAC9B,CAAC;gBACL,CAAC,CAAC,CAAC,CAAC;gBAEJ,OAAO,MAAM,CAAC;YAClB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK;oBACnB,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC;oBACrC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC;gBAC9B,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC;QACL,CAAC;QACD,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,wBAAwB,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC3E,CAAC;QACD,MAAM,IAAI,YAAY,EAAE,CAAC;IAC7B,CAAC;CACJ,CAAA;AA5JgB;IADZ,QAAQ,EAAE;;;;8CA6BV;AAQY;IADZ,QAAQ,EAAE;;;;wCAuCV;AAQY;IADZ,QAAQ,EAAE;;;;uCAUV;AAQY;IADZ,QAAQ,EAAE;;;;sCASV;AASY;IADZ,QAAQ,EAAE;;;;gDAwCV;AAhKgB,UAAU;IAD9B,iBAAiB;GACG,UAAU,CAiK9B;eAjKoB,UAAU"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DispatchEmailToMX.d.ts","sourceRoot":"","sources":["../../../../src/server/workflows/smtp/DispatchEmailToMX.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,wDAAwD,CAAC;AAIzF,OAAO,QAA4B,MAAM,yDAAyD,CAAC;AACnG,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,UAAU,EAAE,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAE5E,OAAO,qBAAqB,MAAM,4BAA4B,CAAC;AAC/D,OAAO,eAAe,MAAM,8CAA8C,CAAC;AAC3E,OAAO,mBAAmB,MAAM,uCAAuC,CAAC;AAGxE,OAAO,iBAAiB,MAAM,gDAAgD,CAAC;AAC/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,sBAAsB,MAAM,+CAA+C,CAAC;AAInF,eAAO,MAAM,QAAQ,6BASlB,CAAC;AAEJ,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,QAAQ,CAAC,gBAAgB,CAAC;IAErE,OAAO,CAAC,QAAQ,CAAgB;IAEhC,OAAO,CAAC,eAAe,CAAS;IAE1B,GAAG;
|
|
1
|
+
{"version":3,"file":"DispatchEmailToMX.d.ts","sourceRoot":"","sources":["../../../../src/server/workflows/smtp/DispatchEmailToMX.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,wDAAwD,CAAC;AAIzF,OAAO,QAA4B,MAAM,yDAAyD,CAAC;AACnG,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,UAAU,EAAE,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAE5E,OAAO,qBAAqB,MAAM,4BAA4B,CAAC;AAC/D,OAAO,eAAe,MAAM,8CAA8C,CAAC;AAC3E,OAAO,mBAAmB,MAAM,uCAAuC,CAAC;AAGxE,OAAO,iBAAiB,MAAM,gDAAgD,CAAC;AAC/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,sBAAsB,MAAM,+CAA+C,CAAC;AAInF,eAAO,MAAM,QAAQ,6BASlB,CAAC;AAEJ,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,QAAQ,CAAC,gBAAgB,CAAC;IAErE,OAAO,CAAC,QAAQ,CAAgB;IAEhC,OAAO,CAAC,eAAe,CAAS;IAE1B,GAAG;IAyCH,SAAS,CACH,GAAG,CAAC,EAAE,qBAAqB;IAMjC,gBAAgB,CAClB,OAAO,EAAE,MAAM,EACP,GAAG,CAAC,EAAE,eAAe,EACrB,EAAE,CAAC,EAAE,iBAAiB,EACtB,EAAE,CAAC,EAAE,iBAAiB;;;;;IA8D5B,QAAQ,CACV,OAAO,EAAE,MAAM,EACP,GAAG,CAAC,EAAE,eAAe,EACrB,GAAG,CAAC,EAAE,mBAAmB,EACzB,GAAG,CAAC,EAAE,sBAAsB;IAiDlC,UAAU,CACJ,EAAE,CAAC,EAAE,iBAAiB,EACtB,GAAG,CAAC,EAAE,eAAe;CAwFpC"}
|
|
@@ -96,19 +96,25 @@ export default class DispatchEmailToMX extends Workflow {
|
|
|
96
96
|
this.signedFileLogID = await this.signEmail();
|
|
97
97
|
const { external } = this.input;
|
|
98
98
|
for (let index = 0; index < 5; index++) {
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
99
|
+
try {
|
|
100
|
+
const status = this.response = await (external ? this.sendExternalMail(index) : this.sendMail(index));
|
|
101
|
+
switch (status.statusCode) {
|
|
102
|
+
case SmtpStatusCodes.Ok:
|
|
103
|
+
await this.saveStatus();
|
|
104
|
+
return null;
|
|
105
|
+
case SmtpStatusCodes.ExceededStorageAllocation:
|
|
106
|
+
case SmtpStatusCodes.MailboxBusy:
|
|
107
|
+
case SmtpStatusCodes.TransactionFailed:
|
|
108
|
+
case SmtpStatusCodes.ServiceNotAvailable:
|
|
109
|
+
break;
|
|
110
|
+
default:
|
|
111
|
+
await this.saveStatus();
|
|
112
|
+
return status.status;
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
catch (error) {
|
|
116
|
+
// we will try again...
|
|
117
|
+
console.error(error);
|
|
112
118
|
}
|
|
113
119
|
await this.delay(ts);
|
|
114
120
|
ts = ts.add(ts);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DispatchEmailToMX.js","sourceRoot":"","sources":["../../../../src/server/workflows/smtp/DispatchEmailToMX.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,EAAE,eAAe,EAAE,MAAM,wDAAwD,CAAC;AACzF,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,QAAQ,EAAE,EAAE,cAAc,EAAE,MAAM,yDAAyD,CAAC;AACnG,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,UAA6B,MAAM,iCAAiC,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,qBAAqB,MAAM,4BAA4B,CAAC;AAC/D,OAAO,eAAe,MAAM,8CAA8C,CAAC;AAC3E,OAAO,mBAAmB,MAAM,uCAAuC,CAAC;AACxE,4EAA4E;AAC5E,OAAO,WAAW,MAAM,wCAAwC,CAAC;AACjE,OAAO,iBAAiB,MAAM,gDAAgD,CAAC;AAE/E,OAAO,sBAAsB,MAAM,+CAA+C,CAAC;AACnF,OAAO,YAAY,MAAM,uDAAuD,CAAC;AACjF,OAAO,yBAAyB,MAAM,yCAAyC,CAAC;AAEhF,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,eAAe,CAAa,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC/D,YAAY,EAAE,GAAG,EAAE,CAAC,IAAI,UAAU,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE;IACtD,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE;IACjC,mBAAmB,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE;QAC/B,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;YACjC,KAAK,EAAE,CAAC;QACZ,CAAC,CAAC,CAAC;IACP,CAAC;CACJ,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,QAA0B;IAMrE,KAAK,CAAC,GAAG;QAEL,IAAI,EAAE,GAAG,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAElC,IAAI,CAAC,eAAe,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QAE9C,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAEhC,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;YAErC,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"DispatchEmailToMX.js","sourceRoot":"","sources":["../../../../src/server/workflows/smtp/DispatchEmailToMX.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -3,6 +3,8 @@ import dns2 from "dns2";
|
|
|
3
3
|
import { SPFRecords } from "./SPFRecords.js";
|
|
4
4
|
import localDns from "node:dns/promises";
|
|
5
5
|
import {ICacheContainer, ObjectCache, cacheFor } from "../../../common/cacheFor.js";
|
|
6
|
+
import TimeoutError from "../../../common/errors/TimeoutError.js";
|
|
7
|
+
import sleep from "../../../common/sleep.js";
|
|
6
8
|
|
|
7
9
|
export interface IDKIMRecord {
|
|
8
10
|
keyType: string;
|
|
@@ -136,28 +138,43 @@ export default class DnsService implements ICacheContainer<DnsService> {
|
|
|
136
138
|
*/
|
|
137
139
|
@cacheFor()
|
|
138
140
|
public async getMXAddresses(domain: string, nameServers?: string[]): Promise<{ host: string, ip: string }[]> {
|
|
139
|
-
const mx = await localDns.resolveMx(domain);
|
|
140
141
|
|
|
141
|
-
|
|
142
|
+
const errors = [];
|
|
143
|
+
for(let i=0; i<3;i++) {
|
|
144
|
+
try {
|
|
145
|
+
const mx = await localDns.resolveMx(domain);
|
|
142
146
|
|
|
143
|
-
|
|
144
|
-
hosts = [{ exchange: domain }];
|
|
145
|
-
console.warn(`No MX defined for ${domain}`);
|
|
146
|
-
} else {
|
|
147
|
-
mx.sort((a: any, b: any) => a.priority - b.priority);
|
|
148
|
-
hosts = mx as any[];
|
|
149
|
-
}
|
|
147
|
+
let hosts = [{ exchange: domain }];
|
|
150
148
|
|
|
151
|
-
|
|
149
|
+
if (mx.length === 0) {
|
|
150
|
+
hosts = [{ exchange: domain }];
|
|
151
|
+
console.warn(`No MX defined for ${domain}`);
|
|
152
|
+
} else {
|
|
153
|
+
mx.sort((a: any, b: any) => a.priority - b.priority);
|
|
154
|
+
hosts = mx as any[];
|
|
155
|
+
}
|
|
152
156
|
|
|
153
|
-
|
|
154
|
-
const host = a.exchange;
|
|
155
|
-
const ips = await localDns.resolve(host);
|
|
156
|
-
for (const ip of ips) {
|
|
157
|
-
result.push({ host, ip });
|
|
158
|
-
}
|
|
159
|
-
}));
|
|
157
|
+
const result = [] as { host: string, ip: string}[];
|
|
160
158
|
|
|
161
|
-
|
|
159
|
+
await Promise.all(hosts.map(async (a: any) => {
|
|
160
|
+
const host = a.exchange;
|
|
161
|
+
const ips = await localDns.resolve(host);
|
|
162
|
+
for (const ip of ips) {
|
|
163
|
+
result.push({ host, ip });
|
|
164
|
+
}
|
|
165
|
+
}));
|
|
166
|
+
|
|
167
|
+
return result;
|
|
168
|
+
} catch (error) {
|
|
169
|
+
errors.push(error.cause
|
|
170
|
+
? (error.cause?.stack ?? error.cause)
|
|
171
|
+
: (error.stack ?? error));
|
|
172
|
+
await sleep(300);
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
if (errors.length) {
|
|
176
|
+
throw new Error(`Failed to get MX for ${domain} ${errors.join("\n")}`);
|
|
177
|
+
}
|
|
178
|
+
throw new TimeoutError();
|
|
162
179
|
}
|
|
163
180
|
}
|
|
@@ -45,20 +45,25 @@ export default class DispatchEmailToMX extends Workflow<IMessageEnvelope> {
|
|
|
45
45
|
|
|
46
46
|
for (let index = 0; index < 5; index++) {
|
|
47
47
|
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
48
|
+
try {
|
|
49
|
+
const status = this.response = await (external ? this.sendExternalMail(index) : this.sendMail(index));
|
|
50
|
+
|
|
51
|
+
switch(status.statusCode) {
|
|
52
|
+
case SmtpStatusCodes.Ok:
|
|
53
|
+
await this.saveStatus();
|
|
54
|
+
return null;
|
|
55
|
+
case SmtpStatusCodes.ExceededStorageAllocation:
|
|
56
|
+
case SmtpStatusCodes.MailboxBusy:
|
|
57
|
+
case SmtpStatusCodes.TransactionFailed:
|
|
58
|
+
case SmtpStatusCodes.ServiceNotAvailable:
|
|
59
|
+
break;
|
|
60
|
+
default:
|
|
61
|
+
await this.saveStatus();
|
|
62
|
+
return status.status;
|
|
63
|
+
}
|
|
64
|
+
} catch (error) {
|
|
65
|
+
// we will try again...
|
|
66
|
+
console.error(error);
|
|
62
67
|
}
|
|
63
68
|
|
|
64
69
|
await this.delay(ts);
|