@builder6/email 0.12.0 → 0.12.2
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/email/email.controller.js +1 -1
- package/dist/email/email.controller.js.map +1 -1
- package/dist/email/email.moleculer.js +11 -9
- package/dist/email/email.moleculer.js.map +1 -1
- package/dist/email/email.schedule.js +67 -65
- package/dist/email/email.schedule.js.map +1 -1
- package/dist/email/email.service.d.ts +13 -0
- package/dist/email/email.service.js +21 -0
- package/dist/email/email.service.js.map +1 -1
- package/package.json +3 -3
|
@@ -23,7 +23,7 @@ let EmailController = class EmailController {
|
|
|
23
23
|
}
|
|
24
24
|
async sendEmail(from, to, subject, text, html) {
|
|
25
25
|
try {
|
|
26
|
-
await this.emailService.
|
|
26
|
+
await this.emailService.addEmailToQueue({ from, to, subject, text, html });
|
|
27
27
|
return { message: '邮件发送成功' };
|
|
28
28
|
}
|
|
29
29
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"email.controller.js","sourceRoot":"","sources":["../../src/email/email.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA0E;AAC1E,6CAAwD;AACxD,yCAA4C;AAC5C,mDAA+C;AAIxC,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YAA6B,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAG,CAAC;IAyCrD,AAAN,KAAK,CAAC,SAAS,CACC,IAAY,EACd,EAAU,EACL,OAAe,EAClB,IAAY,EACZ,IAAY;QAE1B,IAAI;YACF,MAAM,IAAI,CAAC,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"email.controller.js","sourceRoot":"","sources":["../../src/email/email.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,16 +38,18 @@ let EmailMoleculer = class EmailMoleculer extends moleculer_1.Service {
|
|
|
38
38
|
async serviceStarted() { }
|
|
39
39
|
async serviceStopped() { }
|
|
40
40
|
async send(ctx) {
|
|
41
|
-
let {
|
|
42
|
-
to = (0, lodash_1.isArray)(
|
|
41
|
+
let { to, subject } = ctx.params;
|
|
42
|
+
to = (0, lodash_1.isArray)(to) && to.length > 0 ? to.join(',') : to;
|
|
43
|
+
if (!(0, lodash_1.isEmpty)(to) || !subject) {
|
|
44
|
+
console.error(`参数错误：to=${to}, subject=${subject?.substring(0, 10)}`);
|
|
45
|
+
return {
|
|
46
|
+
error: {
|
|
47
|
+
message: '参数错误',
|
|
48
|
+
},
|
|
49
|
+
};
|
|
50
|
+
}
|
|
43
51
|
try {
|
|
44
|
-
const result = await this.emailService.
|
|
45
|
-
from,
|
|
46
|
-
to,
|
|
47
|
-
subject,
|
|
48
|
-
text,
|
|
49
|
-
html,
|
|
50
|
-
});
|
|
52
|
+
const result = await this.emailService.addEmailToQueue(ctx.params);
|
|
51
53
|
return result;
|
|
52
54
|
}
|
|
53
55
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"email.moleculer.js","sourceRoot":"","sources":["../../src/email/email.moleculer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yCAA4D;AAC5D,2CAA4C;AAC5C,mDAAmD;AACnD,mDAA+C;AAC/C,
|
|
1
|
+
{"version":3,"file":"email.moleculer.js","sourceRoot":"","sources":["../../src/email/email.moleculer.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,80 +30,82 @@ let EmailScheduleService = EmailScheduleService_1 = class EmailScheduleService {
|
|
|
30
30
|
this.keepMails = this.configService.get('email.queue.keeps');
|
|
31
31
|
}
|
|
32
32
|
async sendEmail() {
|
|
33
|
-
this.
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
33
|
+
if (this.configService.get('email.enabled')) {
|
|
34
|
+
this.logger.debug(`Called SendEmail ${new Date()}`);
|
|
35
|
+
if (this.isSendingMail)
|
|
36
|
+
return;
|
|
37
|
+
this.isSendingMail = true;
|
|
38
|
+
const now = Date.now();
|
|
39
|
+
try {
|
|
40
|
+
const pendingMails = await this.mongodbService.find('_mail_queue', {
|
|
41
|
+
sent: false,
|
|
42
|
+
sending: {
|
|
43
|
+
$lt: now,
|
|
44
|
+
},
|
|
45
|
+
errMsg: {
|
|
46
|
+
$exists: false,
|
|
47
|
+
},
|
|
48
|
+
}, {
|
|
49
|
+
sort: {
|
|
50
|
+
createdAt: 1,
|
|
51
|
+
},
|
|
52
|
+
limit: this.batchSize,
|
|
53
|
+
});
|
|
54
|
+
if (pendingMails.length > 0) {
|
|
55
|
+
const mailqueueCol = await this.mongodbService.getCollection('_mail_queue');
|
|
56
|
+
await MyPromise.map(pendingMails, async (pendingMail) => {
|
|
57
|
+
const timeoutAt = now + this.timeout;
|
|
58
|
+
var reserved = await mailqueueCol.updateOne({
|
|
59
|
+
_id: pendingMail._id,
|
|
60
|
+
sent: false,
|
|
61
|
+
sending: {
|
|
62
|
+
$lt: now,
|
|
63
|
+
},
|
|
64
|
+
}, {
|
|
65
|
+
$set: {
|
|
66
|
+
sending: timeoutAt,
|
|
67
|
+
},
|
|
68
|
+
});
|
|
69
|
+
if (!(0, lodash_1.isEmpty)(reserved)) {
|
|
70
|
+
try {
|
|
71
|
+
await this.emailService.sendMail(pendingMail.mail);
|
|
72
|
+
if (this.keepMails) {
|
|
73
|
+
await mailqueueCol.updateOne({
|
|
74
|
+
_id: pendingMail._id,
|
|
75
|
+
}, {
|
|
76
|
+
$set: {
|
|
77
|
+
sent: true,
|
|
78
|
+
sentAt: new Date(),
|
|
79
|
+
sending: 0
|
|
80
|
+
},
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
else {
|
|
84
|
+
await mailqueueCol.deleteOne({
|
|
85
|
+
_id: pendingMail._id,
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
catch (error) {
|
|
90
|
+
this.logger.error(error);
|
|
72
91
|
await mailqueueCol.updateOne({
|
|
73
92
|
_id: pendingMail._id,
|
|
74
93
|
}, {
|
|
75
94
|
$set: {
|
|
76
|
-
|
|
77
|
-
sentAt: new Date(),
|
|
78
|
-
sending: 0
|
|
95
|
+
errMsg: error.message || error.toString(),
|
|
79
96
|
},
|
|
80
97
|
});
|
|
81
98
|
}
|
|
82
|
-
else {
|
|
83
|
-
await mailqueueCol.deleteOne({
|
|
84
|
-
_id: pendingMail._id,
|
|
85
|
-
});
|
|
86
|
-
}
|
|
87
|
-
}
|
|
88
|
-
catch (error) {
|
|
89
|
-
this.logger.error(error);
|
|
90
|
-
await mailqueueCol.updateOne({
|
|
91
|
-
_id: pendingMail._id,
|
|
92
|
-
}, {
|
|
93
|
-
$set: {
|
|
94
|
-
errMsg: error.message || error.toString(),
|
|
95
|
-
},
|
|
96
|
-
});
|
|
97
99
|
}
|
|
98
|
-
}
|
|
99
|
-
}
|
|
100
|
+
}, { concurrency: pendingMails.length });
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
catch (error) {
|
|
104
|
+
this.logger.error(error);
|
|
105
|
+
}
|
|
106
|
+
finally {
|
|
107
|
+
this.isSendingMail = false;
|
|
100
108
|
}
|
|
101
|
-
this.isSendingMail = false;
|
|
102
|
-
}
|
|
103
|
-
catch (error) {
|
|
104
|
-
}
|
|
105
|
-
finally {
|
|
106
|
-
this.isSendingMail = false;
|
|
107
109
|
}
|
|
108
110
|
}
|
|
109
111
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"email.schedule.js","sourceRoot":"","sources":["../../src/email/email.schedule.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,+CAA4C;AAC5C,2CAAwC;AACxC,2CAA+C;AAC/C,yCAAgD;AAChD,mDAA+C;AAC/C,sCAAsC;AACtC,mCAAiC;AAI1B,IAAM,oBAAoB,4BAA1B,MAAM,oBAAoB;IAU/B,YACU,aAA4B,EAC5B,cAA8B,EACrB,YAA0B;QAFnC,kBAAa,GAAb,aAAa,CAAe;QAC5B,mBAAc,GAAd,cAAc,CAAgB;QACrB,iBAAY,GAAZ,YAAY,CAAc;QAZ5B,WAAM,GAAG,IAAI,eAAM,CAAC,sBAAoB,CAAC,IAAI,CAAC,CAAC;QAc9D,IAAI,CAAC,SAAS,GAAG,MAAM,CACrB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,wBAAwB,CAAC,IAAI,CAAC,CACtD,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,qBAAqB,CAAC,IAAI,KAAK,CAAC,CAAC;QAC9E,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;IAC9D,CAAC;IAGK,AAAN,KAAK,CAAC,SAAS;QACb,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"email.schedule.js","sourceRoot":"","sources":["../../src/email/email.schedule.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,19 @@ export declare class EmailService {
|
|
|
21
21
|
attachments?: nodemailer.Attachment[];
|
|
22
22
|
mailComposer?: nodemailer.MailComposer;
|
|
23
23
|
}): Promise<void>;
|
|
24
|
+
addEmailToQueue({ from, to, cc, bcc, replyTo, subject, text, html, headers, attachments, mailComposer, }: {
|
|
25
|
+
from?: string;
|
|
26
|
+
to: string;
|
|
27
|
+
cc?: string;
|
|
28
|
+
bcc?: string;
|
|
29
|
+
replyTo?: string;
|
|
30
|
+
subject: string;
|
|
31
|
+
text?: string;
|
|
32
|
+
html?: string;
|
|
33
|
+
headers?: object;
|
|
34
|
+
attachments?: nodemailer.Attachment[];
|
|
35
|
+
mailComposer?: nodemailer.MailComposer;
|
|
36
|
+
}): Promise<void>;
|
|
24
37
|
sendMailToUsers({ spaceId, fromUserId, toUserIds, ccUserIds, bccUserIds, replyToUserId, subject, text, html, headers, attachments, mailComposer, }: {
|
|
25
38
|
spaceId: string;
|
|
26
39
|
fromUserId: string;
|
|
@@ -68,6 +68,27 @@ let EmailService = EmailService_1 = class EmailService {
|
|
|
68
68
|
throw error;
|
|
69
69
|
}
|
|
70
70
|
}
|
|
71
|
+
async addEmailToQueue({ from = this.configService.get('email.from'), to, cc, bcc, replyTo, subject, text, html, headers, attachments, mailComposer, }) {
|
|
72
|
+
await this.mongodbService.insertOne('_mail_queue', {
|
|
73
|
+
createdAt: new Date().toISOString(),
|
|
74
|
+
createdBy: '<SERVER>',
|
|
75
|
+
mail: {
|
|
76
|
+
from,
|
|
77
|
+
to,
|
|
78
|
+
cc,
|
|
79
|
+
bcc,
|
|
80
|
+
replyTo,
|
|
81
|
+
subject,
|
|
82
|
+
text,
|
|
83
|
+
html,
|
|
84
|
+
headers,
|
|
85
|
+
attachments,
|
|
86
|
+
mailComposer,
|
|
87
|
+
},
|
|
88
|
+
sent: false,
|
|
89
|
+
sending: 0,
|
|
90
|
+
});
|
|
91
|
+
}
|
|
71
92
|
async sendMailToUsers({ spaceId, fromUserId, toUserIds, ccUserIds, bccUserIds, replyToUserId, subject, text, html, headers, attachments, mailComposer, }) {
|
|
72
93
|
const allUsers = await this.getUsersEmail((0, lodash_1.compact)([
|
|
73
94
|
fromUserId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"email.service.js","sourceRoot":"","sources":["../../src/email/email.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"email.service.js","sourceRoot":"","sources":["../../src/email/email.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,yCAAgD;AAChD,2CAAoD;AACpD,2CAA+C;AAC/C,mCAA0C;AAC1C,yCAAyC;AAGlC,IAAM,YAAY,oBAAlB,MAAM,YAAY;IAKvB,YACU,aAA4B,EAC5B,cAA8B;QAD9B,kBAAa,GAAb,aAAa,CAAe;QAC5B,mBAAc,GAAd,cAAc,CAAgB;QANhC,gBAAW,GAA2B,IAAI,CAAC;QAC3C,gBAAW,GAAW,EAAE,CAAC;QAChB,WAAM,GAAG,IAAI,eAAM,CAAC,cAAY,CAAC,IAAI,CAAC,CAAC;QAMtD,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE;YAC3C,IAAI,CAAC,WAAW,GAAG;gBACjB,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC;gBAC1C,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC;gBAC1C,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,cAAc,CAAC;gBAC9C,IAAI,EAAE;oBACJ,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,gBAAgB,CAAC;oBAC9C,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,gBAAgB,CAAC;iBAC/C;gBACD,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,cAAc,CAAC;gBAC9C,KAAK,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,aAAa,CAAC;gBAC5C,GAAG,EAAE;oBACH,kBAAkB,EAAE,KAAK;iBAC1B;aACF,CAAC;YACF,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACjE;IACH,CAAC;IASD,KAAK,CAAC,QAAQ,CAAC,EACb,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,EAC3C,EAAE,EACF,EAAE,EACF,GAAG,EACH,OAAO,EACP,OAAO,EACP,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,WAAW,EACX,YAAY,GAab;QACC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YACrB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;SAC9C;QAED,MAAM,WAAW,GAA+B;YAC9C,IAAI;YACJ,EAAE;YACF,EAAE;YACF,GAAG;YACH,OAAO;YACP,OAAO;YACP,IAAI;YACJ,IAAI;YACJ,OAAO;YACP,WAAW;YACX,YAAY;SACb,CAAC;QAEF,IAAI;YACF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YAC1D,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,OAAO,EAAE,CAAC,CAAC;YAC7C,OAAO,IAAI,CAAC;SACb;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;YACpC,MAAM,KAAK,CAAC;SACb;IACH,CAAC;IASD,KAAK,CAAC,eAAe,CAAC,EACpB,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,EAC3C,EAAE,EACF,EAAE,EACF,GAAG,EACH,OAAO,EACP,OAAO,EACP,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,WAAW,EACX,YAAY,GAab;QACC,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,aAAa,EAAE;YACjD,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACnC,SAAS,EAAE,UAAU;YACrB,IAAI,EAAE;gBACJ,IAAI;gBACJ,EAAE;gBACF,EAAE;gBACF,GAAG;gBACH,OAAO;gBACP,OAAO;gBACP,IAAI;gBACJ,IAAI;gBACJ,OAAO;gBACP,WAAW;gBACX,YAAY;aACb;YACD,IAAI,EAAE,KAAK;YACX,OAAO,EAAE,CAAC;SACX,CAAC,CAAC;IACL,CAAC;IASD,KAAK,CAAC,eAAe,CAAC,EACpB,OAAO,EACP,UAAU,EACV,SAAS,EACT,SAAS,EACT,UAAU,EACV,aAAa,EACb,OAAO,EACP,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,WAAW,EACX,YAAY,GAcb;QACC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CACvC,IAAA,gBAAO,EAAC;YACN,UAAU;YACV,aAAa;YACb,GAAG,SAAS;YACZ,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC;YACpB,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC;SACtB,CAAC,EACF,OAAO,CACR,CAAC;QAEF,MAAM,IAAI,GACR,IAAI,CAAC,sBAAsB,CAAC,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC;YACnD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACvC,IAAI,EAAE,GAAG,IAAI,CAAC,sBAAsB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAC1D,MAAM,EAAE,GAAG,IAAI,CAAC,sBAAsB,CAAC,SAAS,IAAI,EAAE,EAAE,QAAQ,CAAC,CAAC;QAClE,MAAM,GAAG,GAAG,IAAI,CAAC,sBAAsB,CAAC,UAAU,IAAI,EAAE,EAAE,QAAQ,CAAC,CAAC;QACpE,IAAI,IAAA,gBAAO,EAAC,EAAE,CAAC,IAAI,IAAA,gBAAO,EAAC,EAAE,CAAC,IAAI,IAAA,gBAAO,EAAC,GAAG,CAAC,EAAE;YAE9C,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;SAC/B;QACD,EAAE,GAAG,IAAA,gBAAO,EAAC,EAAE,CAAC,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,EAAE,CAAC;QACjD,MAAM,OAAO,GAAG,IAAI,CAAC,sBAAsB,CAAC,CAAC,aAAa,CAAC,EAAE,QAAQ,CAAC,CAAC;QACvE,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,aAAa,EAAE;YACjD,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACnC,SAAS,EAAE,UAAU,IAAI,UAAU;YACnC,IAAI,EAAE;gBACJ,IAAI;gBACJ,EAAE;gBACF,EAAE;gBACF,GAAG;gBACH,OAAO;gBACP,OAAO;gBACP,IAAI;gBACJ,IAAI;gBACJ,OAAO;gBACP,WAAW;gBACX,YAAY;aACb;YACD,IAAI,EAAE,KAAK;YACX,OAAO,EAAE,CAAC;SACX,CAAC,CAAC;IACL,CAAC;IASD,KAAK,CAAC,cAAc,CAAC,EACnB,UAAU,EACV,QAAQ,EACR,OAAO,EACP,IAAI,EACJ,IAAI,GAOL;QACC,MAAM,IAAI,GACR,CAAC,UAAU,IAAI,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC;YACrD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACvC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC7C,IAAI,CAAC,EAAE,EAAE;YACP,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC;SAC5B;QACD,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,MAAc;QAC/B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC5C,OAAO,EACP;YACE,GAAG,EAAE,MAAM;SACZ,EACD;YACE,UAAU,EAAE;gBACV,IAAI,EAAE,CAAC;gBACP,KAAK,EAAE,CAAC;aACT;SACF,CACF,CAAC;QACF,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,EAAE;YACnC,OAAO,IAAI,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,KAAK,GAAG,CAAC;SACzC;aAAM,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE;YAC7B,OAAO,IAAI,CAAC,KAAK,CAAC;SACnB;aAAM;YACL,OAAO,IAAI,CAAC;SACb;IACH,CAAC;IAGD,KAAK,CAAC,aAAa,CAAC,OAAiB,EAAE,OAAe;QACpD,MAAM,CAAC,KAAK,EAAE,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC5C,IAAI,CAAC,cAAc,CAAC,IAAI,CACtB,OAAO,EACP;gBACE,GAAG,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE;gBACrB,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;aACzB,EACD;gBACE,UAAU,EAAE;oBACV,GAAG,EAAE,CAAC;oBACN,IAAI,EAAE,CAAC;oBACP,KAAK,EAAE,CAAC;iBACT;aACF,CACF;YACD,IAAI,CAAC,cAAc,CAAC,IAAI,CACtB,aAAa,EACb;gBACE,KAAK,EAAE,OAAO;gBACd,IAAI,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE;gBACtB,kBAAkB,EAAE,IAAI;aACzB,EACD;gBACE,UAAU,EAAE;oBACV,IAAI,EAAE,CAAC;iBACR;aACF,CACF;SACF,CAAC,CAAC;QAEH,MAAM,aAAa,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACpE,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,CACzB,CAAC,IAAkD,EAAE,EAAE,CACrD,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CACnC,CAAC;IACJ,CAAC;IAGD,sBAAsB,CACpB,OAAiB,EACjB,QAIG;QAEH,IAAI,IAAA,gBAAO,EAAC,OAAO,CAAC,IAAI,IAAA,gBAAO,EAAC,QAAQ,CAAC,EAAE;YACzC,OAAO,SAAS,CAAC;SAClB;QACD,OAAO,IAAA,gBAAO,EACZ,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YACrB,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,KAAK,MAAM,CAAC,CAAC;YAC9D,IAAI,QAAQ,IAAI,QAAQ,CAAC,IAAI,EAAE;gBAC7B,OAAO,IAAI,QAAQ,CAAC,IAAI,MAAM,QAAQ,CAAC,KAAK,GAAG,CAAC;aACjD;iBAAM,IAAI,QAAQ,EAAE;gBACnB,OAAO,QAAQ,CAAC,KAAK,CAAC;aACvB;iBAAM;gBACL,OAAO,IAAI,CAAC;aACb;QACH,CAAC,CAAC,CACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACf,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,MAAc;QAC/B,MAAM,WAAW,GAAG;YAClB,GAAG,IAAI,CAAC,WAAW;YACnB,GAAG,MAAM;SACV,CAAC;QACF,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;IAC7D,CAAC;CACF,CAAA;AAvVY,YAAY;IADxB,IAAA,mBAAU,GAAE;qCAOc,sBAAa;QACZ,qBAAc;GAP7B,YAAY,CAuVxB;AAvVY,oCAAY"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@builder6/email",
|
|
3
|
-
"version": "0.12.
|
|
3
|
+
"version": "0.12.2",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"files": [
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
"build:watch": "rimraf dist && tsc --watch"
|
|
13
13
|
},
|
|
14
14
|
"dependencies": {
|
|
15
|
-
"@builder6/core": "^0.12.
|
|
15
|
+
"@builder6/core": "^0.12.2",
|
|
16
16
|
"bluebird": "^3.7.2",
|
|
17
17
|
"lodash": "^4.17.5",
|
|
18
18
|
"nodemailer": "^6.9.16"
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"publishConfig": {
|
|
21
21
|
"access": "public"
|
|
22
22
|
},
|
|
23
|
-
"gitHead": "
|
|
23
|
+
"gitHead": "9f2f0ba44298c10eb010f723283977f9a27dd095",
|
|
24
24
|
"devDependencies": {
|
|
25
25
|
"@types/bluebird": "^3.5.42"
|
|
26
26
|
}
|