@social-mail/social-mail-web-server 1.7.129 → 1.7.131
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/protocols/smtp/ESmtpClient.d.ts +2 -1
- package/dist/protocols/smtp/ESmtpClient.d.ts.map +1 -1
- package/dist/protocols/smtp/ESmtpClient.js +6 -4
- package/dist/protocols/smtp/ESmtpClient.js.map +1 -1
- package/dist/protocols/socket/client/SocketClient.d.ts +2 -1
- package/dist/protocols/socket/client/SocketClient.d.ts.map +1 -1
- package/dist/protocols/socket/client/SocketClient.js +2 -2
- package/dist/protocols/socket/client/SocketClient.js.map +1 -1
- package/dist/server/smtp/client/SMTPClient.d.ts.map +1 -1
- package/dist/server/smtp/client/SMTPClient.js +8 -5
- package/dist/server/smtp/client/SMTPClient.js.map +1 -1
- package/dist/server/smtp/dns/DnsService.d.ts +15 -0
- package/dist/server/smtp/dns/DnsService.d.ts.map +1 -1
- package/dist/server/smtp/dns/DnsService.js +56 -0
- package/dist/server/smtp/dns/DnsService.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/protocols/smtp/ESmtpClient.ts +6 -3
- package/src/protocols/socket/client/SocketClient.ts +2 -2
- package/src/server/smtp/client/SMTPClient.ts +7 -5
- package/src/server/smtp/dns/DnsService.ts +53 -0
|
@@ -9,10 +9,11 @@ export interface ISmtpAuth {
|
|
|
9
9
|
export default class ESmtpClient {
|
|
10
10
|
private client;
|
|
11
11
|
private logger;
|
|
12
|
-
static connect({ port, host, hosts, startTLS, helo, auth, logger }: {
|
|
12
|
+
static connect({ port, host, hosts, servername, startTLS, helo, auth, logger }: {
|
|
13
13
|
port?: number;
|
|
14
14
|
host?: string;
|
|
15
15
|
hosts?: string[];
|
|
16
|
+
servername?: string;
|
|
16
17
|
startTLS?: boolean;
|
|
17
18
|
helo?: string;
|
|
18
19
|
auth?: ISmtpAuth;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ESmtpClient.d.ts","sourceRoot":"","sources":["../../../src/protocols/smtp/ESmtpClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAI/E,OAAO,YAAY,MAAM,kCAAkC,CAAC;AAK5D,MAAM,WAAW,SAAS;IACtB,KAAK,EAAE;QACH,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;KACpB,CAAA;CACJ;AAED,MAAM,CAAC,OAAO,OAAO,WAAW;
|
|
1
|
+
{"version":3,"file":"ESmtpClient.d.ts","sourceRoot":"","sources":["../../../src/protocols/smtp/ESmtpClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAI/E,OAAO,YAAY,MAAM,kCAAkC,CAAC;AAK5D,MAAM,WAAW,SAAS;IACtB,KAAK,EAAE;QACH,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;KACpB,CAAA;CACJ;AAED,MAAM,CAAC,OAAO,OAAO,WAAW;IAwER,OAAO,CAAC,MAAM;IAAgB,OAAO,CAAC,MAAM;WAtE5C,OAAO,CAAC,EACxB,IAAS,EACT,IAAuB,EACvB,KAA0B,EAC1B,UAA6B,EAC7B,QAAe,EACf,IAAuB,EACvB,IAA0B,EAC1B,MAAmC,EACtC;;;;;;;;gCADiC,IAAI;KACrC,GAAG,OAAO,CAAC,WAAW,CAAC;IAmDxB,IAAW,UAAU,kGAEpB;IAED,IAAW,WAAW,kGAErB;IAED,OAAO,CAAC,YAAY,CAAU;IAE9B,OAAO;IAGA,OAAO;IAId,CAAC,MAAM,CAAC,OAAO,CAAC;IAIH,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,GAAG,MAAM;;;;;IAgChE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,GAAG,MAAM;YAsBxD,IAAI;YAmBJ,WAAW;CAuB5B"}
|
|
@@ -52,7 +52,7 @@ import os from "node:os";
|
|
|
52
52
|
import { SmtpStatusCodes } from "../../server/smtp/client/SmtpStatusCodes.js";
|
|
53
53
|
;
|
|
54
54
|
export default class ESmtpClient {
|
|
55
|
-
static async connect({ port = 25, host = void 0, hosts = void 0, startTLS = true, helo = void 0, auth = void 0, logger = void 0 }) {
|
|
55
|
+
static async connect({ port = 25, host = void 0, hosts = void 0, servername = void 0, startTLS = true, helo = void 0, auth = void 0, logger = void 0 }) {
|
|
56
56
|
if (hosts) {
|
|
57
57
|
let error;
|
|
58
58
|
for (const iterator of hosts) {
|
|
@@ -60,6 +60,7 @@ export default class ESmtpClient {
|
|
|
60
60
|
return await this.connect({
|
|
61
61
|
port,
|
|
62
62
|
host: iterator,
|
|
63
|
+
servername,
|
|
63
64
|
startTLS,
|
|
64
65
|
helo,
|
|
65
66
|
auth,
|
|
@@ -78,6 +79,7 @@ export default class ESmtpClient {
|
|
|
78
79
|
const client = await SocketClient.connect({
|
|
79
80
|
port,
|
|
80
81
|
host,
|
|
82
|
+
servername,
|
|
81
83
|
ssl: false,
|
|
82
84
|
logger
|
|
83
85
|
});
|
|
@@ -87,7 +89,7 @@ export default class ESmtpClient {
|
|
|
87
89
|
throw new Error("Failed to open SMTP connection");
|
|
88
90
|
}
|
|
89
91
|
const eSmtpClient = new ESmtpClient(client, logger);
|
|
90
|
-
await eSmtpClient.init(helo, greeting.toLocaleLowerCase().includes("esmtp"), host, startTLS);
|
|
92
|
+
await eSmtpClient.init(helo, greeting.toLocaleLowerCase().includes("esmtp"), servername ?? host, startTLS);
|
|
91
93
|
const login = auth?.login;
|
|
92
94
|
if (login) {
|
|
93
95
|
await eSmtpClient.sendCommand("AUTH LOGIN", 334);
|
|
@@ -174,7 +176,7 @@ export default class ESmtpClient {
|
|
|
174
176
|
__disposeResources(env_1);
|
|
175
177
|
}
|
|
176
178
|
}
|
|
177
|
-
async init(name, eSmtp = false,
|
|
179
|
+
async init(name, eSmtp = false, servername, startTLS) {
|
|
178
180
|
let startTLSSupported = false;
|
|
179
181
|
if (eSmtp) {
|
|
180
182
|
await this.sendCommand(`EHLO ${name ?? os.hostname()}`, 250, (t) => startTLSSupported ||= /-STARTTLS/i.test(t));
|
|
@@ -184,7 +186,7 @@ export default class ESmtpClient {
|
|
|
184
186
|
}
|
|
185
187
|
if (startTLSSupported && startTLS) {
|
|
186
188
|
await this.sendCommand("STARTTLS", 220);
|
|
187
|
-
await this.client.upgradeTLS({ servername
|
|
189
|
+
await this.client.upgradeTLS({ servername, rejectUnauthorized: false });
|
|
188
190
|
await this.sendCommand(`EHLO ${name ?? os.hostname()}`);
|
|
189
191
|
this.sslSupported = true;
|
|
190
192
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ESmtpClient.js","sourceRoot":"","sources":["../../../src/protocols/smtp/ESmtpClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,OAAO,SAAS,MAAM,yCAAyC,CAAC;AAChE,OAAO,UAAU,MAAM,uBAAuB,CAAC;AAE/C,OAAO,YAAY,MAAM,kCAAkC,CAAC;AAC5D,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAO7E,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,WAAW;IAErB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EACxB,IAAI,GAAG,EAAE,EACT,IAAI,GAAG,KAAK,CAAW,EACvB,KAAK,GAAG,KAAK,CAAa,EAC1B,QAAQ,GAAG,IAAI,EACf,IAAI,GAAG,KAAK,CAAW,EACvB,IAAI,GAAG,KAAK,CAAc,EAC1B,MAAM,GAAG,KAAK,CAAqB,EACtC;QAEG,IAAI,KAAK,EAAE,CAAC;YACR,IAAI,KAAY,CAAC;YACjB,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;gBAC3B,IAAI,CAAC;oBACD,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC;wBACtB,IAAI;wBACJ,IAAI,EAAE,QAAQ;wBACd,QAAQ;wBACR,IAAI;wBACJ,IAAI;wBACJ,MAAM;qBACT,CAAC,CAAC;gBACP,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACT,KAAK,GAAG,CAAC,CAAC;oBACV,cAAc;gBAClB,CAAC;YACL,CAAC;YACD,IAAI,KAAK,EAAE,CAAC;gBACR,MAAM,KAAK,CAAC;YAChB,CAAC;QACL,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC;YACtC,IAAI;YACJ,IAAI;YACJ,GAAG,EAAE,KAAK;YACV,MAAM;SACT,CAAC,CAAC;QAEH,MAAM,CAAC,OAAO,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;QAE/B,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;QACzC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;QACtD,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACpD,MAAM,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,iBAAiB,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ESmtpClient.js","sourceRoot":"","sources":["../../../src/protocols/smtp/ESmtpClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,9 +4,10 @@ export default class SocketClient {
|
|
|
4
4
|
private client;
|
|
5
5
|
private bufferStream;
|
|
6
6
|
private logger;
|
|
7
|
-
static connect({ port, host, logger, ssl }: {
|
|
7
|
+
static connect({ port, host, servername, logger, ssl }: {
|
|
8
8
|
port: any;
|
|
9
9
|
host?: any;
|
|
10
|
+
servername?: any;
|
|
10
11
|
logger?: any;
|
|
11
12
|
ssl?: any;
|
|
12
13
|
}): Promise<SocketClient>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SocketClient.d.ts","sourceRoot":"","sources":["../../../../src/protocols/socket/client/SocketClient.ts"],"names":[],"mappings":"AAEA,OAAO,QAAQ,MAAM,sDAAsD,CAAC;AAC5E,OAAO,GAAkB,MAAM,KAAK,CAAC;AAIrC,MAAM,CAAC,OAAO,OAAO,YAAY;IAiDzB,OAAO,CAAC,MAAM;IAEd,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,MAAM;WAlDE,OAAO,CAAC,EAAE,IAAI,EAAE,IAAa,EAAE,MAAe,EAAE,GAAY,EAAC
|
|
1
|
+
{"version":3,"file":"SocketClient.d.ts","sourceRoot":"","sources":["../../../../src/protocols/socket/client/SocketClient.ts"],"names":[],"mappings":"AAEA,OAAO,QAAQ,MAAM,sDAAsD,CAAC;AAC5E,OAAO,GAAkB,MAAM,KAAK,CAAC;AAIrC,MAAM,CAAC,OAAO,OAAO,YAAY;IAiDzB,OAAO,CAAC,MAAM;IAEd,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,MAAM;WAlDE,OAAO,CAAC,EAAE,IAAI,EAAE,IAAa,EAAE,UAAmB,EAAE,MAAe,EAAE,GAAY,EAAC;;;;;;KAAA;IAuBtG,UAAU,0BAAsB;IAEhC,WAAW,0BAAsB;IAEjC,IAAI,eAAe,YAElB;IAED;;OAEG;IACH,IAAI,OAAO,IAGI,MAAM,CADpB;IACD,IAAI,OAAO,CAAC,CAAC,EAAE,MAAM,EAKpB;IAED,OAAO,CAAC,UAAU,CAAC;IAEnB,OAAO;IAgBP,OAAO;IAIP,SAAS;IAaT,CAAC,MAAM,CAAC,OAAO,CAAC;IAIV,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,QAAoC,EAAE,GAAU,EAAC;;;KAAK;IAiBtF,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW;IAIhB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW;IAI7C,UAAU,CAAC,OAAO,GAAE,GAAG,CAAC,iBAAwB;CA8BjE"}
|
|
@@ -3,11 +3,11 @@ import EventSet from "@entity-access/entity-access/dist/common/EventSet.js";
|
|
|
3
3
|
import tls from "tls";
|
|
4
4
|
import { BufferStream } from "../../../common/BufferStream.js";
|
|
5
5
|
export default class SocketClient {
|
|
6
|
-
static async connect({ port, host = void 0, logger = void 0, ssl = void 0 }) {
|
|
6
|
+
static async connect({ port, host = void 0, servername = void 0, logger = void 0, ssl = void 0 }) {
|
|
7
7
|
logger?.(`Opening connection to ${host}:${port} with ssl as ${ssl}`);
|
|
8
8
|
const client = await new Promise((resolve, reject) => {
|
|
9
9
|
const c = ssl
|
|
10
|
-
? tls.connect({ port, host, rejectUnauthorized: false })
|
|
10
|
+
? tls.connect({ port, host, servername, rejectUnauthorized: false })
|
|
11
11
|
: host ? net.connect({ host, port }) : net.connect(port);
|
|
12
12
|
c.once("error", (error) => {
|
|
13
13
|
logger?.(error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SocketClient.js","sourceRoot":"","sources":["../../../../src/protocols/socket/client/SocketClient.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,OAAO,QAAQ,MAAM,sDAAsD,CAAC;AAC5E,OAAO,GAAkB,MAAM,KAAK,CAAC;AAErC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,MAAM,CAAC,OAAO,OAAO,YAAY;IAEtB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,GAAG,KAAK,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC,EAAE,GAAG,GAAG,KAAK,CAAC,EAAC;
|
|
1
|
+
{"version":3,"file":"SocketClient.js","sourceRoot":"","sources":["../../../../src/protocols/socket/client/SocketClient.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,OAAO,QAAQ,MAAM,sDAAsD,CAAC;AAC5E,OAAO,GAAkB,MAAM,KAAK,CAAC;AAErC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,MAAM,CAAC,OAAO,OAAO,YAAY;IAEtB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,GAAG,KAAK,CAAC,EAAE,UAAU,GAAG,KAAK,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC,EAAE,GAAG,GAAG,KAAK,CAAC,EAAC;QAClG,MAAM,EAAE,CAAC,yBAAyB,IAAI,IAAI,IAAI,gBAAgB,GAAG,EAAE,CAAC,CAAC;QACrE,MAAM,MAAM,GAAG,MAAM,IAAI,OAAO,CAAe,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC/D,MAAM,CAAC,GAAG,GAAG;gBACT,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,kBAAkB,EAAE,KAAK,EAAE,CAAC;gBACpE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC7D,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;gBACtB,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC;gBAChB,MAAM,CAAC,KAAK,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;YACH,MAAM,EAAE,GAAG,IAAI,YAAY,EAAE,CAAC;YAC9B,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBAClB,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACrB,CAAC,CAAC,CAAC;YACH,CAAC,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;gBACjB,MAAM,EAAE,CAAC,kBAAkB,CAAC,CAAC;gBAC7B,OAAO,CAAC,IAAI,YAAY,CAAC,CAAC,EAAE,EAAE,EAAG,MAAM,CAAC,CAAC,CAAC;YAC9C,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QACH,MAAM,EAAE,CAAC,wBAAwB,CAAC,CAAC;QACnC,OAAO,MAAM,CAAC;IAClB,CAAC;IAMD,IAAI,eAAe;QACf,OAAO,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC;IAC7C,CAAC;IAED;;OAEG;IACH,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;IAC/B,CAAC;IACD,IAAI,OAAO,CAAC,CAAS;QACjB,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAC1B,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YACR,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAC9B,CAAC;IACL,CAAC;IAID,YACY,MAAkB;IAC1B,0CAA0C;IAClC,YAA0B,EAC1B,SAAyB,GAAG,EAAE,CAAC,KAAK,CAAC;QAHrC,WAAM,GAAN,MAAM,CAAY;QAElB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,WAAM,GAAN,MAAM,CAA+B;QA3BjD,eAAU,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEhC,gBAAW,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC;QA2B7B,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,CAAC,UAAU,GAAG,GAAG,EAAE;YACnB,IAAI,CAAC,SAAS,EAAE,CAAC;QACrB,CAAC,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QACrD,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3C,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACpD,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAC3C,CAAC;IAED,OAAO;QACH,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;IAC1B,CAAC;IAED,SAAS;QACL,IAAI,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;QACtB,CAAC;QAAC,MAAM,CAAC;YACL,aAAa;QACjB,CAAC;QACD,IAAI,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QAC1B,CAAC;QAAC,MAAM,CAAC;YACL,aAAa;QACjB,CAAC;IACL,CAAC;IAED,CAAC,MAAM,CAAC,OAAO,CAAC;QACZ,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,IAAY,EAAE,EAAE,QAAQ,GAAG,OAAyB,EAAE,GAAG,GAAG,IAAI,KAAI,EAAE;QAClF,IAAI,GAAG,EAAE,CAAC;YACN,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;QAC9B,CAAC;QACD,yCAAyC;QACzC,0BAA0B;QAC1B,IAAI,IAAI,MAAM,CAAC;QACf,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACxC,IAAI,CAAC,MAAM,CAAC,KAAK,CACb,IAAI,EACJ,QAAQ,EACR,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK;gBACZ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;gBACf,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;IACP,CAAC;IAED,QAAQ,CAAC,MAAoB;QACzB,OAAO,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACnE,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,MAAc,EAAE,MAAoB;QACvD,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClD,CAAC;IAEM,KAAK,CAAE,UAAU,CAAC,UAAiC,EAAI;QAE1D,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QACtD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAC5C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACrD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAGxC,MAAM,EAAE,GAAG,MAAM,IAAI,OAAO,CAAY,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACxD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;YAC3B,MAAM,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC;gBAClB,IAAI,EAAE,MAAM,CAAC,UAAU;gBACvB,MAAM;gBACN,kBAAkB,EAAE,KAAK;gBACzB,GAAI,OAAO;aACd,EAAE,GAAG,EAAE;gBACJ,OAAO,CAAC,CAAC,CAAC,CAAC;YACf,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACnC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,YAAY,GAAG,IAAI,YAAY,EAAE,CAAC;QACvC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QACrD,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3C,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACpD,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAC3C,CAAC;CAEJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SMTPClient.d.ts","sourceRoot":"","sources":["../../../../src/server/smtp/client/SMTPClient.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAIvD,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAI/E,MAAM,WAAW,mBAAmB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,EAAE,CAAC;CAEhB;AAED,MAAM,WAAW,aAAa;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,eAAe,CAAC;IAC5B,IAAI,EAAE,MAAM,CAAA;CACf;AAED,MAAM,CAAC,OAAO,OAAO,UAAU;IAOvB,OAAO,CAAC,MAAM;IALlB,OAAO,CAAC,MAAM,CAAc;IAE5B,OAAO,CAAC,MAAM,CAAoC;gBAGtC,MAAM,EAAE;QACZ,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,CAAC,EAAE,MAAM,CAAA;KAChB;IAKC,OAAO;
|
|
1
|
+
{"version":3,"file":"SMTPClient.d.ts","sourceRoot":"","sources":["../../../../src/server/smtp/client/SMTPClient.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAIvD,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAI/E,MAAM,WAAW,mBAAmB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,EAAE,CAAC;CAEhB;AAED,MAAM,WAAW,aAAa;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,eAAe,CAAC;IAC5B,IAAI,EAAE,MAAM,CAAA;CACf;AAED,MAAM,CAAC,OAAO,OAAO,UAAU;IAOvB,OAAO,CAAC,MAAM;IALlB,OAAO,CAAC,MAAM,CAAc;IAE5B,OAAO,CAAC,MAAM,CAAoC;gBAGtC,MAAM,EAAE;QACZ,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,CAAC,EAAE,MAAM,CAAA;KAChB;IAKC,OAAO;IAkCP,IAAI,CAAC,QAAQ,EAAE,mBAAmB,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC;IA0BlF,KAAK,CAAC,EAAE,KAAA;IAIF,OAAO;CAIhB"}
|
|
@@ -59,16 +59,19 @@ export default class SMTPClient {
|
|
|
59
59
|
}
|
|
60
60
|
async connect() {
|
|
61
61
|
const dns = globalServices.resolve(DnsService);
|
|
62
|
-
const mx = await dns.
|
|
62
|
+
const mx = await dns.getMXAddresses(this.config.host);
|
|
63
63
|
if (mx.length === 0) {
|
|
64
|
-
console.
|
|
65
|
-
mx.push(this.config.host);
|
|
64
|
+
console.error(`No ips found for ${this.config.host}`);
|
|
66
65
|
}
|
|
67
|
-
|
|
66
|
+
else {
|
|
67
|
+
console.log(`Found ${this.config.host} -> ${JSON.stringify(mx)}`);
|
|
68
|
+
}
|
|
69
|
+
for (const { host, ip } of mx) {
|
|
68
70
|
try {
|
|
69
71
|
this.client = await ESmtpClient.connect({
|
|
70
72
|
...this.config,
|
|
71
|
-
host,
|
|
73
|
+
host: ip,
|
|
74
|
+
servername: host,
|
|
72
75
|
logger: (data) => {
|
|
73
76
|
// console.log(data);
|
|
74
77
|
this.logger?.info(data);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SMTPClient.js","sourceRoot":"","sources":["../../../../src/server/smtp/client/SMTPClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,UAAU,MAAM,sBAAsB,CAAC;AAC9C,OAAO,YAAY,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,YAAY,MAAM,iCAAiC,CAAC;AAC3D,OAAO,WAAW,MAAM,wCAAwC,CAAC;AACjE,OAAO,SAAS,MAAM,0BAA0B,CAAC;AAkBjD,MAAM,CAAC,OAAO,OAAO,UAAU;IAM3B,YACY,MAIP;QAJO,WAAM,GAAN,MAAM,CAIb;QAPG,WAAM,GAAiB,IAAI,YAAY,EAAE,CAAC;IAUlD,CAAC;IAED,KAAK,CAAC,OAAO;QAET,MAAM,GAAG,GAAG,cAAc,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAE/C,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"SMTPClient.js","sourceRoot":"","sources":["../../../../src/server/smtp/client/SMTPClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,5 +19,20 @@ export default class DnsService implements ICacheContainer<DnsService> {
|
|
|
19
19
|
* @param nameServers optional name servers
|
|
20
20
|
*/
|
|
21
21
|
getMX(domain: string, nameServers?: string[]): Promise<string[]>;
|
|
22
|
+
/**
|
|
23
|
+
* Will return all acceptable IP addresses
|
|
24
|
+
* @param domain domain
|
|
25
|
+
* @param nameServers optional name servers
|
|
26
|
+
*/
|
|
27
|
+
getA(domain: string, nameServers?: string[]): Promise<string[]>;
|
|
28
|
+
/**
|
|
29
|
+
* Will return all acceptable IP addresses
|
|
30
|
+
* @param domain domain
|
|
31
|
+
* @param nameServers optional name servers
|
|
32
|
+
*/
|
|
33
|
+
getMXAddresses(domain: string, nameServers?: string[]): Promise<{
|
|
34
|
+
host: string;
|
|
35
|
+
ip: string;
|
|
36
|
+
}[]>;
|
|
22
37
|
}
|
|
23
38
|
//# sourceMappingURL=DnsService.d.ts.map
|
|
@@ -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;AAEpF,MAAM,WAAW,WAAW;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACrB;AAKD,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;
|
|
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;AAEpF,MAAM,WAAW,WAAW;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACrB;AAKD,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;CA6B/G"}
|
|
@@ -99,6 +99,50 @@ let DnsService = class DnsService {
|
|
|
99
99
|
mx.answers.sort((a, b) => a.priority - b.priority);
|
|
100
100
|
return mx.answers.map((a) => a.exchange);
|
|
101
101
|
}
|
|
102
|
+
/**
|
|
103
|
+
* Will return all acceptable IP addresses
|
|
104
|
+
* @param domain domain
|
|
105
|
+
* @param nameServers optional name servers
|
|
106
|
+
*/
|
|
107
|
+
async getA(domain, nameServers) {
|
|
108
|
+
nameServers ??= [];
|
|
109
|
+
if (!nameServers.length) {
|
|
110
|
+
nameServers = defaultNameServers;
|
|
111
|
+
}
|
|
112
|
+
const dns = new dns2({ nameServers });
|
|
113
|
+
const mx = await dns.resolveA(domain);
|
|
114
|
+
return mx.answers.map((v) => v.address);
|
|
115
|
+
}
|
|
116
|
+
/**
|
|
117
|
+
* Will return all acceptable IP addresses
|
|
118
|
+
* @param domain domain
|
|
119
|
+
* @param nameServers optional name servers
|
|
120
|
+
*/
|
|
121
|
+
async getMXAddresses(domain, nameServers) {
|
|
122
|
+
nameServers ??= [];
|
|
123
|
+
if (!nameServers.length) {
|
|
124
|
+
nameServers = defaultNameServers;
|
|
125
|
+
}
|
|
126
|
+
const dns = new dns2({ nameServers });
|
|
127
|
+
const mx = await dns.resolveMX(domain);
|
|
128
|
+
let hosts = [{ exchange: domain }];
|
|
129
|
+
if (mx.answers.length === 0) {
|
|
130
|
+
hosts = [{ exchange: domain }];
|
|
131
|
+
}
|
|
132
|
+
else {
|
|
133
|
+
mx.answers.sort((a, b) => a.priority - b.priority);
|
|
134
|
+
hosts = mx.answers.map((x) => x.exchange);
|
|
135
|
+
}
|
|
136
|
+
const result = [];
|
|
137
|
+
await Promise.all(hosts.map(async (a) => {
|
|
138
|
+
const host = a.exchange;
|
|
139
|
+
const ips = await this.getA(host);
|
|
140
|
+
for (const ip of ips) {
|
|
141
|
+
result.push({ host, ip });
|
|
142
|
+
}
|
|
143
|
+
}));
|
|
144
|
+
return result;
|
|
145
|
+
}
|
|
102
146
|
};
|
|
103
147
|
__decorate([
|
|
104
148
|
cacheFor(),
|
|
@@ -118,6 +162,18 @@ __decorate([
|
|
|
118
162
|
__metadata("design:paramtypes", [String, Array]),
|
|
119
163
|
__metadata("design:returntype", Promise)
|
|
120
164
|
], DnsService.prototype, "getMX", null);
|
|
165
|
+
__decorate([
|
|
166
|
+
cacheFor(),
|
|
167
|
+
__metadata("design:type", Function),
|
|
168
|
+
__metadata("design:paramtypes", [String, Array]),
|
|
169
|
+
__metadata("design:returntype", Promise)
|
|
170
|
+
], DnsService.prototype, "getA", null);
|
|
171
|
+
__decorate([
|
|
172
|
+
cacheFor(),
|
|
173
|
+
__metadata("design:type", Function),
|
|
174
|
+
__metadata("design:paramtypes", [String, Array]),
|
|
175
|
+
__metadata("design:returntype", Promise)
|
|
176
|
+
], DnsService.prototype, "getMXAddresses", null);
|
|
121
177
|
DnsService = __decorate([
|
|
122
178
|
RegisterSingleton
|
|
123
179
|
], DnsService);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DnsService.js","sourceRoot":"","sources":["../../../../src/server/smtp/dns/DnsService.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"DnsService.js","sourceRoot":"","sources":["../../../../src/server/smtp/dns/DnsService.ts"],"names":[],"mappings":"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"}
|