@social-mail/social-mail-web-server 1.16.151 → 1.16.153

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.
@@ -16,21 +16,22 @@ export default class DnsService {
16
16
  * @param domain domain
17
17
  * @param nameServers optional name servers
18
18
  */
19
- getMX(domain: string, nameServers?: string[]): Promise<string[]>;
19
+ getA(domain: string, nameServers?: string[]): Promise<string[]>;
20
20
  /**
21
- * Will return all acceptable IP addresses
21
+ * This will try to get cached mx and cached a record for mx records.
22
22
  * @param domain domain
23
23
  * @param nameServers optional name servers
24
24
  */
25
- getA(domain: string, nameServers?: string[]): Promise<string[]>;
26
- /**
27
- * Will return all acceptable IP addresses
28
- * @param domain domain
29
- * @param nameServers optional name servers
30
- */
31
25
  getMXAddresses(domain: string, nameServers?: string[]): Promise<{
32
26
  host: string;
33
27
  ip: string;
34
28
  }[]>;
29
+ /**
30
+ * Will return all acceptable IP addresses
31
+ * @param domain domain
32
+ * @param nameServers optional name servers
33
+ */
34
+ private getMX;
35
+ private try;
35
36
  }
36
37
  //# 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;AAM7C,MAAM,WAAW,WAAW;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACrB;AAMD,MAAM,CAAC,OAAO,OAAO,UAAU;IAId,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;CAkD/G"}
1
+ {"version":3,"file":"DnsService.d.ts","sourceRoot":"","sources":["../../../../src/server/smtp/dns/DnsService.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAM7C,MAAM,WAAW,WAAW;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACrB;AAMD,MAAM,CAAC,OAAO,OAAO,UAAU;IAId,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,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAM5E;;;;OAIG;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;IAiC5G;;;;OAIG;YAEW,KAAK;YAML,GAAG;CAkBpB"}
@@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
9
9
  };
10
10
  import { RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
11
11
  import dns2 from "dns2";
12
+ import { NOTFOUND, NODATA } from "dns";
12
13
  import { SPFRecords } from "./SPFRecords.js";
13
14
  import localDns from "node:dns/promises";
14
15
  import TimeoutError from "../../../common/errors/TimeoutError.js";
@@ -92,82 +93,75 @@ let DnsService = class DnsService {
92
93
  * @param domain domain
93
94
  * @param nameServers optional name servers
94
95
  */
95
- async getMX(domain, nameServers) {
96
- nameServers ??= [];
97
- if (!nameServers.length) {
98
- nameServers = defaultNameServers;
99
- }
100
- const dns = new dns2({ nameServers });
101
- const mx = await dns.resolveMX(domain);
102
- mx.answers.sort((a, b) => a.priority - b.priority);
103
- return mx.answers.map((a) => a.exchange);
96
+ async getA(domain, nameServers) {
97
+ const mx = await this.try((x) => localDns.resolve(x), domain);
98
+ return mx;
104
99
  }
105
100
  /**
106
- * Will return all acceptable IP addresses
101
+ * This will try to get cached mx and cached a record for mx records.
107
102
  * @param domain domain
108
103
  * @param nameServers optional name servers
109
104
  */
110
- async getA(domain, nameServers) {
111
- nameServers ??= [];
112
- if (!nameServers.length) {
113
- nameServers = defaultNameServers;
105
+ async getMXAddresses(domain, nameServers) {
106
+ const result = [];
107
+ try {
108
+ // we should try to get cached result
109
+ const mxs = await this.getMX(domain, nameServers);
110
+ await Promise.all(mxs.map(async (x) => {
111
+ try {
112
+ const ips = await this.getA(x);
113
+ for (const ip of ips) {
114
+ result.push({ host: x, ip });
115
+ }
116
+ }
117
+ catch (e) {
118
+ // do nothing...
119
+ }
120
+ }));
121
+ if (result.length) {
122
+ return result;
123
+ }
114
124
  }
115
- const dns = new dns2({ nameServers });
116
- const mx = await dns.resolveA(domain);
117
- return mx.answers.map((v) => v.address);
125
+ catch (error) {
126
+ if (error.code === NOTFOUND) {
127
+ throw error;
128
+ }
129
+ }
130
+ // try a...
131
+ const r = await this.getA(domain, nameServers);
132
+ for (const ip of r) {
133
+ result.push({ host: domain, ip });
134
+ }
135
+ return result;
118
136
  }
119
137
  /**
120
- * Will return all acceptable IP addresses
121
- * @param domain domain
122
- * @param nameServers optional name servers
123
- */
124
- async getMXAddresses(domain, nameServers) {
125
- const errors = [];
138
+ * Will return all acceptable IP addresses
139
+ * @param domain domain
140
+ * @param nameServers optional name servers
141
+ */
142
+ async getMX(domain, nameServers) {
143
+ const mx = await this.try((x) => localDns.resolveMx(x), domain);
144
+ mx.sort((a, b) => a.priority - b.priority);
145
+ return mx.map((x) => x.exchange);
146
+ }
147
+ async try(fx, p) {
148
+ let lastError = void 0;
126
149
  for (let i = 0; i < 3; i++) {
127
150
  try {
128
- const mx = await localDns.resolveMx(domain);
129
- let hosts = [{ exchange: domain }];
130
- if (mx.length === 0) {
131
- hosts = [{ exchange: domain }];
132
- console.warn(`No MX defined for ${domain}`);
133
- }
134
- else {
135
- mx.sort((a, b) => a.priority - b.priority);
136
- hosts = mx;
137
- }
138
- const result = [];
139
- await Promise.all(hosts.map(async (a) => {
140
- for (let tries = 0; tries < 3; tries++) {
141
- try {
142
- const host = a.exchange;
143
- const ips = await localDns.resolve(host);
144
- for (const ip of ips) {
145
- result.push({ host, ip });
146
- }
147
- // return on success
148
- return;
149
- }
150
- catch (error) {
151
- errors.push(error);
152
- await sleep(100);
153
- }
154
- }
155
- }));
156
- if (result.length) {
157
- return result;
158
- }
151
+ return await fx(p);
159
152
  }
160
153
  catch (error) {
161
- errors.push(error.cause
162
- ? (error.cause?.stack ?? error.cause)
163
- : (error.stack ?? error));
164
- await sleep(300);
154
+ lastError = error;
155
+ if (error.code === NOTFOUND || error.code === NODATA) {
156
+ break;
157
+ }
165
158
  }
159
+ await sleep(500);
166
160
  }
167
- if (errors.length) {
168
- throw new Error(`Failed to get MX for ${domain} ${errors.join("\n")}`);
161
+ if (!lastError) {
162
+ throw new TimeoutError();
169
163
  }
170
- throw new TimeoutError();
164
+ throw lastError;
171
165
  }
172
166
  };
173
167
  __decorate([
@@ -187,19 +181,19 @@ __decorate([
187
181
  __metadata("design:type", Function),
188
182
  __metadata("design:paramtypes", [String, Array]),
189
183
  __metadata("design:returntype", Promise)
190
- ], DnsService.prototype, "getMX", null);
184
+ ], DnsService.prototype, "getA", null);
191
185
  __decorate([
192
186
  jsonCache(),
193
187
  __metadata("design:type", Function),
194
188
  __metadata("design:paramtypes", [String, Array]),
195
189
  __metadata("design:returntype", Promise)
196
- ], DnsService.prototype, "getA", null);
190
+ ], DnsService.prototype, "getMXAddresses", null);
197
191
  __decorate([
198
192
  jsonCache(),
199
193
  __metadata("design:type", Function),
200
194
  __metadata("design:paramtypes", [String, Array]),
201
195
  __metadata("design:returntype", Promise)
202
- ], DnsService.prototype, "getMXAddresses", null);
196
+ ], DnsService.prototype, "getMX", null);
203
197
  DnsService = __decorate([
204
198
  RegisterSingleton
205
199
  ], 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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"}
@@ -121,7 +121,7 @@ class DispatchEmailToMX extends Workflow {
121
121
  }
122
122
  catch (error) {
123
123
  // we will try again...
124
- console.error(error);
124
+ ServerLogger.error(error);
125
125
  lastError = error;
126
126
  }
127
127
  await this.delay(ts);
@@ -1 +1 @@
1
- {"version":3,"file":"DispatchEmailToMX.js","sourceRoot":"","sources":["../../../../src/server/workflows/smtp/DispatchEmailToMX.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DispatchEmailToMX.js","sourceRoot":"","sources":["../../../../src/server/workflows/smtp/DispatchEmailToMX.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@social-mail/social-mail-web-server",
3
- "version": "1.16.151",
3
+ "version": "1.16.153",
4
4
  "description": "## Phase 1",
5
5
  "main": "index.js",
6
6
  "type": "module",
@@ -1,5 +1,6 @@
1
1
  import { RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
2
2
  import dns2 from "dns2";
3
+ import { NOTFOUND, NODATA } from "dns";
3
4
  import { SPFRecords } from "./SPFRecords.js";
4
5
  import localDns from "node:dns/promises";
5
6
  import TimeoutError from "../../../common/errors/TimeoutError.js";
@@ -101,88 +102,79 @@ export default class DnsService {
101
102
  * @param nameServers optional name servers
102
103
  */
103
104
  @jsonCache()
104
- public async getMX(domain: string, nameServers?: string[]): Promise<string[]> {
105
- nameServers ??= [];
106
- if (!nameServers.length) {
107
- nameServers = defaultNameServers;
108
- }
109
- const dns = new dns2({nameServers });
110
- const mx = await dns.resolveMX(domain);
111
- mx.answers.sort((a: any, b: any) => a.priority - b.priority);
112
- return mx.answers.map((a: any) => a.exchange);
105
+ public async getA(domain: string, nameServers?: string[]): Promise<string[]> {
106
+ const mx = await this.try((x) => localDns.resolve(x), domain);
107
+ return mx;
113
108
  }
114
109
 
110
+
115
111
  /**
116
- * Will return all acceptable IP addresses
112
+ * This will try to get cached mx and cached a record for mx records.
117
113
  * @param domain domain
118
114
  * @param nameServers optional name servers
119
115
  */
120
116
  @jsonCache()
121
- public async getA(domain: string, nameServers?: string[]): Promise<string[]> {
122
- nameServers ??= [];
123
- if (!nameServers.length) {
124
- nameServers = defaultNameServers;
117
+ public async getMXAddresses(domain: string, nameServers?: string[]): Promise<{ host: string, ip: string }[]> {
118
+
119
+ const result = [] as { host: string, ip: string}[];
120
+ try {
121
+ // we should try to get cached result
122
+ const mxs = await this.getMX(domain, nameServers);
123
+ await Promise.all(mxs.map( async (x) => {
124
+ try {
125
+ const ips = await this.getA(x);
126
+ for(const ip of ips) {
127
+ result.push({ host: x, ip });
128
+ }
129
+ } catch (e) {
130
+ // do nothing...
131
+ }
132
+ }));
133
+ if (result.length) {
134
+ return result;
135
+ }
136
+ } catch (error) {
137
+ if (error.code === NOTFOUND) {
138
+ throw error;
139
+ }
125
140
  }
126
- const dns = new dns2({nameServers });
127
- const mx = await dns.resolveA(domain);
128
- return mx.answers.map((v) => v.address);
129
- }
130
141
 
142
+ // try a...
143
+ const r = await this.getA(domain, nameServers);
144
+ for(const ip of r) {
145
+ result.push({ host: domain, ip });
146
+ }
147
+ return result;
148
+ }
131
149
 
132
- /**
150
+ /**
133
151
  * Will return all acceptable IP addresses
134
152
  * @param domain domain
135
153
  * @param nameServers optional name servers
136
154
  */
137
155
  @jsonCache()
138
- public async getMXAddresses(domain: string, nameServers?: string[]): Promise<{ host: string, ip: string }[]> {
156
+ private async getMX(domain: string, nameServers?: string[]): Promise<string[]> {
157
+ const mx = await this.try( (x) => localDns.resolveMx(x), domain);
158
+ mx.sort((a: any, b: any) => a.priority - b.priority);
159
+ return mx.map((x) => x.exchange);
160
+ }
139
161
 
140
- const errors = [];
141
- for(let i=0; i<3;i++) {
162
+ private async try<TIn,T>(fx: (x: TIn) => Promise<T>, p: TIn): Promise<T> {
163
+ let lastError = void 0;
164
+ for(let i=0;i<3;i++) {
142
165
  try {
143
- const mx = await localDns.resolveMx(domain);
144
-
145
- let hosts = [{ exchange: domain }];
146
-
147
- if (mx.length === 0) {
148
- hosts = [{ exchange: domain }];
149
- console.warn(`No MX defined for ${domain}`);
150
- } else {
151
- mx.sort((a: any, b: any) => a.priority - b.priority);
152
- hosts = mx as any[];
153
- }
154
-
155
- const result = [] as { host: string, ip: string}[];
156
-
157
- await Promise.all(hosts.map(async (a: any) => {
158
- for(let tries = 0; tries< 3; tries++ ) {
159
- try {
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
- // return on success
166
- return;
167
- } catch (error) {
168
- errors.push(error);
169
- await sleep(100);
170
- }
171
- }
172
- }));
173
- if (result.length) {
174
- return result;
175
- }
166
+ return await fx(p);
176
167
  } catch (error) {
177
- errors.push(error.cause
178
- ? (error.cause?.stack ?? error.cause)
179
- : (error.stack ?? error));
180
- await sleep(300);
168
+ lastError = error;
169
+ if(error.code === NOTFOUND || error.code === NODATA) {
170
+ break;
171
+ }
181
172
  }
173
+ await sleep(500);
182
174
  }
183
- if (errors.length) {
184
- throw new Error(`Failed to get MX for ${domain} ${errors.join("\n")}`);
175
+ if(!lastError) {
176
+ throw new TimeoutError();
185
177
  }
186
- throw new TimeoutError();
178
+ throw lastError;
187
179
  }
188
180
  }
@@ -78,7 +78,7 @@ export default class DispatchEmailToMX extends Workflow<IMessageEnvelope> {
78
78
  }
79
79
  } catch (error) {
80
80
  // we will try again...
81
- console.error(error);
81
+ ServerLogger.error(error);
82
82
  lastError = error;
83
83
  }
84
84