@hedhog/mail 0.51.2 → 0.51.4
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/mail.service.d.ts +16 -7
- package/dist/mail.service.d.ts.map +1 -1
- package/dist/mail.service.js +33 -10
- package/dist/mail.service.js.map +1 -1
- package/package.json +45 -45
- package/src/mail.service.ts +38 -11
package/dist/mail.service.d.ts
CHANGED
|
@@ -9,14 +9,23 @@ export declare class MailService implements OnModuleInit {
|
|
|
9
9
|
constructor(mailConfig: MailModuleOptions, httpService: HttpService);
|
|
10
10
|
onModuleInit(): Promise<void>;
|
|
11
11
|
private log;
|
|
12
|
-
send(mail: Mail): Promise<
|
|
12
|
+
send(mail: Mail): Promise<{
|
|
13
|
+
result: any;
|
|
14
|
+
mail: Mail;
|
|
15
|
+
}>;
|
|
13
16
|
createRawEmail(mail: Mail): Promise<string>;
|
|
14
|
-
sendWithSMTP(mail: Mail): Promise<
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
}
|
|
18
|
-
|
|
19
|
-
result: import("
|
|
17
|
+
sendWithSMTP(mail: Mail): Promise<{
|
|
18
|
+
result: any;
|
|
19
|
+
mail: Mail;
|
|
20
|
+
}>;
|
|
21
|
+
sendWithGmail(mail: Mail): Promise<{
|
|
22
|
+
result: import("axios").AxiosResponse<any, {
|
|
23
|
+
raw: string;
|
|
24
|
+
}>;
|
|
25
|
+
mail: Mail;
|
|
26
|
+
}>;
|
|
27
|
+
sendWithSES(mail: Mail): Promise<{
|
|
28
|
+
result: import("aws-sdk/lib/request").PromiseResult<import("aws-sdk/clients/ses").SendRawEmailResponse, import("aws-sdk").AWSError>;
|
|
20
29
|
mail: Mail;
|
|
21
30
|
}>;
|
|
22
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mail.service.d.ts","sourceRoot":"","sources":["../src/mail.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAkC,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAI9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,EAAE,IAAI,EAAuB,MAAM,eAAe,CAAC;AAE1D,qBACa,WAAY,YAAW,YAAY;IAK5C,OAAO,CAAC,QAAQ,CAAC,UAAU;IAE3B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAN9B,OAAO,CAAC,KAAK,CAAS;gBAIH,UAAU,EAAE,iBAAiB,EAE7B,WAAW,EAAE,WAAW;IAGrC,YAAY;IAMlB,OAAO,CAAC,GAAG;IAML,IAAI,CAAC,IAAI,EAAE,IAAI
|
|
1
|
+
{"version":3,"file":"mail.service.d.ts","sourceRoot":"","sources":["../src/mail.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAkC,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAI9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,EAAE,IAAI,EAAuB,MAAM,eAAe,CAAC;AAE1D,qBACa,WAAY,YAAW,YAAY;IAK5C,OAAO,CAAC,QAAQ,CAAC,UAAU;IAE3B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAN9B,OAAO,CAAC,KAAK,CAAS;gBAIH,UAAU,EAAE,iBAAiB,EAE7B,WAAW,EAAE,WAAW;IAGrC,YAAY;IAMlB,OAAO,CAAC,GAAG;IAML,IAAI,CAAC,IAAI,EAAE,IAAI;;;;IAcf,cAAc,CAAC,IAAI,EAAE,IAAI;IA2EzB,YAAY,CAAC,IAAI,EAAE,IAAI;;;;IA8EvB,aAAa,CAAC,IAAI,EAAE,IAAI;;;;;;IAiDxB,WAAW,CAAC,IAAI,EAAE,IAAI;;;;CAuI7B"}
|
package/dist/mail.service.js
CHANGED
|
@@ -151,7 +151,7 @@ let MailService = class MailService {
|
|
|
151
151
|
pass,
|
|
152
152
|
rejectUnauthorized,
|
|
153
153
|
});
|
|
154
|
-
const
|
|
154
|
+
const transportOptions = {
|
|
155
155
|
host,
|
|
156
156
|
port,
|
|
157
157
|
secure,
|
|
@@ -159,12 +159,32 @@ let MailService = class MailService {
|
|
|
159
159
|
user,
|
|
160
160
|
pass,
|
|
161
161
|
},
|
|
162
|
-
|
|
162
|
+
requireTLS: process.env.MAIL_REQUIRE_TLS || false,
|
|
163
|
+
tls: process.env.MAIL_TLS !== undefined ? JSON.parse(process.env.MAIL_TLS) : {
|
|
163
164
|
rejectUnauthorized,
|
|
164
165
|
},
|
|
166
|
+
envelope: { from: mail.from || process.env.MAIL_FROM || process.env.SMTP_FROM || process.env.SMTP_USER, to: mail.to }
|
|
167
|
+
};
|
|
168
|
+
if (process.env.MAIL_UNSUBSCRIBE) {
|
|
169
|
+
transportOptions.headers = {
|
|
170
|
+
'List-Unsubscribe': `<mailto:${process.env.MAIL_UNSUBSCRIBE_EMAIL}?subject=unsubscribe>, <${process.env.MAIL_UNSUBSCRIBE_URL}?u=__EMAIL__>`,
|
|
171
|
+
'List-Unsubscribe-Post': 'List-Unsubscribe=One-Click'
|
|
172
|
+
};
|
|
173
|
+
}
|
|
174
|
+
this.log('transportOptions', transportOptions);
|
|
175
|
+
const transporter = nodemailer.createTransport(transportOptions);
|
|
176
|
+
this.log('Email sendMail:', {
|
|
177
|
+
from: mail.from || process.env.MAIL_FROM || process.env.SMTP_FROM || process.env.SMTP_USER,
|
|
178
|
+
to: mail.to,
|
|
179
|
+
subject: mail.subject,
|
|
180
|
+
html: mail.body,
|
|
181
|
+
cc: mail.cc,
|
|
182
|
+
bcc: mail.bcc,
|
|
183
|
+
replyTo: mail.replyTo,
|
|
184
|
+
priority: mail.priority,
|
|
165
185
|
});
|
|
166
186
|
const result = await transporter.sendMail({
|
|
167
|
-
from: mail.from || process.env.
|
|
187
|
+
from: mail.from || process.env.MAIL_FROM || process.env.SMTP_USER,
|
|
168
188
|
to: mail.to,
|
|
169
189
|
subject: mail.subject,
|
|
170
190
|
html: mail.body,
|
|
@@ -174,7 +194,7 @@ let MailService = class MailService {
|
|
|
174
194
|
priority: mail.priority,
|
|
175
195
|
});
|
|
176
196
|
this.log('Email sent:', result);
|
|
177
|
-
return result;
|
|
197
|
+
return { result, mail };
|
|
178
198
|
}
|
|
179
199
|
async sendWithGmail(mail) {
|
|
180
200
|
if (this.mailConfig.type !== 'GMAIL') {
|
|
@@ -206,7 +226,7 @@ let MailService = class MailService {
|
|
|
206
226
|
const response = this.httpService.post(url, requestBody, { headers });
|
|
207
227
|
const result = await (0, rxjs_1.firstValueFrom)(response);
|
|
208
228
|
this.log('Email sent:', result);
|
|
209
|
-
return result;
|
|
229
|
+
return { result, mail };
|
|
210
230
|
}
|
|
211
231
|
async sendWithSES(mail) {
|
|
212
232
|
var _a;
|
|
@@ -285,11 +305,14 @@ let MailService = class MailService {
|
|
|
285
305
|
attachmentEntity.header('Content-Disposition', `attachment ;filename="${item.filename}"`);
|
|
286
306
|
mailContent.body.push(attachmentEntity);
|
|
287
307
|
}));
|
|
288
|
-
return
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
308
|
+
return {
|
|
309
|
+
result: await ses
|
|
310
|
+
.sendRawEmail({
|
|
311
|
+
RawMessage: { Data: mailContent.toString() },
|
|
312
|
+
})
|
|
313
|
+
.promise(),
|
|
314
|
+
mail,
|
|
315
|
+
};
|
|
293
316
|
}
|
|
294
317
|
else {
|
|
295
318
|
const params = {
|
package/dist/mail.service.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mail.service.js","sourceRoot":"","sources":["../src/mail.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAA4C;AAC5C,2CAA8E;AAC9E,yDAA2C;AAC3C,+BAAsC;AACtC,uFAAiF;AAEjF,+CAA0D;AAGnD,IAAM,WAAW,GAAjB,MAAM,WAAW;IAGtB,YAEE,UAA8C,EAE9C,WAAyC;QAFxB,eAAU,GAAV,UAAU,CAAmB;QAE7B,gBAAW,GAAX,WAAW,CAAa;QANnC,UAAK,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"mail.service.js","sourceRoot":"","sources":["../src/mail.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,45 +1,45 @@
|
|
|
1
|
-
{
|
|
2
|
-
"name": "@hedhog/mail",
|
|
3
|
-
"version": "0.51.
|
|
4
|
-
"main": "dist/index.js",
|
|
5
|
-
"scripts": {
|
|
6
|
-
"build": "tsc --project tsconfig.production.json && npm version patch",
|
|
7
|
-
"prod": "npm run build && npm publish --access public"
|
|
8
|
-
},
|
|
9
|
-
"keywords": [],
|
|
10
|
-
"author": "HedHog",
|
|
11
|
-
"license": "MIT",
|
|
12
|
-
"description": "",
|
|
13
|
-
"file": [
|
|
14
|
-
"dist/**/*",
|
|
15
|
-
"src/migrations/**/*.ts",
|
|
16
|
-
"src/**/*.ejs",
|
|
17
|
-
"hedhog/**/*.yaml",
|
|
18
|
-
"hedhog.yaml"
|
|
19
|
-
],
|
|
20
|
-
"dependencies": {
|
|
21
|
-
"@nestjs/axios": "^3.0.3",
|
|
22
|
-
"@nestjs/jwt": "^10.2.0",
|
|
23
|
-
"axios": "^1.7.7",
|
|
24
|
-
"mimemessage": "1.0.5",
|
|
25
|
-
"bcrypt": "^5.1.1",
|
|
26
|
-
"nodemailer": "^6.9.0",
|
|
27
|
-
"aws-sdk": "2.1691.0",
|
|
28
|
-
"googleapis": "144.0.0"
|
|
29
|
-
},
|
|
30
|
-
"peerDependencies": {
|
|
31
|
-
"aws-sdk": "2.1691.0",
|
|
32
|
-
"googleapis": "144.0.0"
|
|
33
|
-
},
|
|
34
|
-
"peerDependenciesMeta": {
|
|
35
|
-
"aws-sdk": {
|
|
36
|
-
"optional": true
|
|
37
|
-
},
|
|
38
|
-
"googleapis": {
|
|
39
|
-
"optional": true
|
|
40
|
-
},
|
|
41
|
-
"nodemailer": {
|
|
42
|
-
"optional": true
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
}
|
|
1
|
+
{
|
|
2
|
+
"name": "@hedhog/mail",
|
|
3
|
+
"version": "0.51.4",
|
|
4
|
+
"main": "dist/index.js",
|
|
5
|
+
"scripts": {
|
|
6
|
+
"build": "tsc --project tsconfig.production.json && npm version patch",
|
|
7
|
+
"prod": "npm run build && npm publish --access public"
|
|
8
|
+
},
|
|
9
|
+
"keywords": [],
|
|
10
|
+
"author": "HedHog",
|
|
11
|
+
"license": "MIT",
|
|
12
|
+
"description": "",
|
|
13
|
+
"file": [
|
|
14
|
+
"dist/**/*",
|
|
15
|
+
"src/migrations/**/*.ts",
|
|
16
|
+
"src/**/*.ejs",
|
|
17
|
+
"hedhog/**/*.yaml",
|
|
18
|
+
"hedhog.yaml"
|
|
19
|
+
],
|
|
20
|
+
"dependencies": {
|
|
21
|
+
"@nestjs/axios": "^3.0.3",
|
|
22
|
+
"@nestjs/jwt": "^10.2.0",
|
|
23
|
+
"axios": "^1.7.7",
|
|
24
|
+
"mimemessage": "1.0.5",
|
|
25
|
+
"bcrypt": "^5.1.1",
|
|
26
|
+
"nodemailer": "^6.9.0",
|
|
27
|
+
"aws-sdk": "2.1691.0",
|
|
28
|
+
"googleapis": "144.0.0"
|
|
29
|
+
},
|
|
30
|
+
"peerDependencies": {
|
|
31
|
+
"aws-sdk": "2.1691.0",
|
|
32
|
+
"googleapis": "144.0.0"
|
|
33
|
+
},
|
|
34
|
+
"peerDependenciesMeta": {
|
|
35
|
+
"aws-sdk": {
|
|
36
|
+
"optional": true
|
|
37
|
+
},
|
|
38
|
+
"googleapis": {
|
|
39
|
+
"optional": true
|
|
40
|
+
},
|
|
41
|
+
"nodemailer": {
|
|
42
|
+
"optional": true
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
}
|
package/src/mail.service.ts
CHANGED
|
@@ -15,7 +15,7 @@ export class MailService implements OnModuleInit {
|
|
|
15
15
|
private readonly mailConfig: MailModuleOptions,
|
|
16
16
|
@Inject(forwardRef(() => HttpService))
|
|
17
17
|
private readonly httpService: HttpService,
|
|
18
|
-
) {}
|
|
18
|
+
) { }
|
|
19
19
|
|
|
20
20
|
async onModuleInit() {
|
|
21
21
|
if (this.mailConfig.debug) {
|
|
@@ -143,7 +143,7 @@ export class MailService implements OnModuleInit {
|
|
|
143
143
|
rejectUnauthorized,
|
|
144
144
|
});
|
|
145
145
|
|
|
146
|
-
const
|
|
146
|
+
const transportOptions: any = {
|
|
147
147
|
host,
|
|
148
148
|
port,
|
|
149
149
|
secure,
|
|
@@ -151,13 +151,37 @@ export class MailService implements OnModuleInit {
|
|
|
151
151
|
user,
|
|
152
152
|
pass,
|
|
153
153
|
},
|
|
154
|
-
|
|
154
|
+
requireTLS: process.env.MAIL_REQUIRE_TLS || false,
|
|
155
|
+
tls: process.env.MAIL_TLS !== undefined ? JSON.parse(process.env.MAIL_TLS) : {
|
|
155
156
|
rejectUnauthorized,
|
|
156
157
|
},
|
|
158
|
+
envelope: { from: mail.from || process.env.MAIL_FROM || process.env.SMTP_FROM || process.env.SMTP_USER, to: mail.to }
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
if (process.env.MAIL_UNSUBSCRIBE) {
|
|
162
|
+
transportOptions.headers = {
|
|
163
|
+
'List-Unsubscribe': `<mailto:${process.env.MAIL_UNSUBSCRIBE_EMAIL}?subject=unsubscribe>, <${process.env.MAIL_UNSUBSCRIBE_URL}?u=__EMAIL__>`,
|
|
164
|
+
'List-Unsubscribe-Post': 'List-Unsubscribe=One-Click'
|
|
165
|
+
};
|
|
166
|
+
}
|
|
167
|
+
|
|
168
|
+
this.log('transportOptions', transportOptions)
|
|
169
|
+
|
|
170
|
+
const transporter = nodemailer.createTransport(transportOptions);
|
|
171
|
+
|
|
172
|
+
this.log('Email sendMail:', {
|
|
173
|
+
from: mail.from || process.env.MAIL_FROM || process.env.SMTP_FROM || process.env.SMTP_USER,
|
|
174
|
+
to: mail.to,
|
|
175
|
+
subject: mail.subject,
|
|
176
|
+
html: mail.body,
|
|
177
|
+
cc: mail.cc,
|
|
178
|
+
bcc: mail.bcc,
|
|
179
|
+
replyTo: mail.replyTo,
|
|
180
|
+
priority: mail.priority,
|
|
157
181
|
});
|
|
158
182
|
|
|
159
183
|
const result = await transporter.sendMail({
|
|
160
|
-
from: mail.from || process.env.
|
|
184
|
+
from: mail.from || process.env.MAIL_FROM || process.env.SMTP_USER,
|
|
161
185
|
to: mail.to,
|
|
162
186
|
subject: mail.subject,
|
|
163
187
|
html: mail.body,
|
|
@@ -169,7 +193,7 @@ export class MailService implements OnModuleInit {
|
|
|
169
193
|
|
|
170
194
|
this.log('Email sent:', result);
|
|
171
195
|
|
|
172
|
-
return result;
|
|
196
|
+
return { result, mail };
|
|
173
197
|
}
|
|
174
198
|
|
|
175
199
|
async sendWithGmail(mail: Mail) {
|
|
@@ -218,7 +242,7 @@ export class MailService implements OnModuleInit {
|
|
|
218
242
|
|
|
219
243
|
this.log('Email sent:', result);
|
|
220
244
|
|
|
221
|
-
return result;
|
|
245
|
+
return { result, mail };
|
|
222
246
|
}
|
|
223
247
|
|
|
224
248
|
async sendWithSES(mail: Mail) {
|
|
@@ -314,11 +338,14 @@ export class MailService implements OnModuleInit {
|
|
|
314
338
|
}),
|
|
315
339
|
);
|
|
316
340
|
|
|
317
|
-
return
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
341
|
+
return {
|
|
342
|
+
result: await ses
|
|
343
|
+
.sendRawEmail({
|
|
344
|
+
RawMessage: { Data: mailContent.toString() },
|
|
345
|
+
})
|
|
346
|
+
.promise(),
|
|
347
|
+
mail,
|
|
348
|
+
};
|
|
322
349
|
} else {
|
|
323
350
|
const params = {
|
|
324
351
|
Destination: {
|