@builder6/email 0.11.12 → 0.12.1

package/README.md

@@ -12,10 +12,18 @@ B6_EMAIL_PASSWORD=xxxxx
 B6_EMAIL_SECURE=false
 B6_EMAIL_DEBUG=true
 B6_EMAIL_LOGGER=true
+B6_EMAIL_ENABLED=true
 ```
 
 ## 配置定时发送
 
-```
-STEEDOS_CRON_MAILQUEUE_INTERVAL=3000 # 邮件定时器，单位：毫秒
+B6_EMAIL_ENABLED 时会启动定时发送任务，从 _mail_queue 集合中读取邮件发送任务，发送成功后删除任务。
+
+以下环境变量非必须配置。
+
+```shell
+STEEDOS_EMAIL_QUEUE_INTERVAL=3000 # 邮件定时器，单位：毫秒, 默认值：3000
+STEEDOS_EMAIL_QUEUE_BATCH_SIZE=1 # 邮件队列批量发送数量，默认值：1
+STEEDOS_EMAIL_QUEUE_TIMEOUT=60000 # 邮件队列超时时间，单位：毫秒，默认值：60000
+STEEDOS_EMAIL_QUEUE_KEEPS=false # 邮件发送之后是否保留邮件队列，默认值：false
 ```

package/dist/email/email.controller.d.ts

@@ -12,6 +12,16 @@ export declare class EmailController {
         };
         message?: undefined;
     }>;
+    sendMailToUsers(spaceId: string, fromUserId: string, toUserIds: string[], ccUserIds: string[], bccUserIds: string[], replyToUserId: string, subject: string, text: string, html: string, headers: object, attachments: object[], mailComposer: object): Promise<{
+        message: string;
+        error?: undefined;
+    } | {
+        error: {
+            code: number;
+            message: any;
+        };
+        message?: undefined;
+    }>;
     updateConfig(config: object): Promise<{
         message: string;
         error?: undefined;

package/dist/email/email.controller.js

@@ -23,7 +23,7 @@ let EmailController = class EmailController {
     }
     async sendEmail(from, to, subject, text, html) {
         try {
-            await this.emailService.sendMail({ from, to, subject, text, html });
+            await this.emailService.addEmailToQueue({ from, to, subject, text, html });
             return { message: '邮件发送成功' };
         }
         catch (error) {
@@ -36,6 +36,34 @@ let EmailController = class EmailController {
             };
         }
     }
+    async sendMailToUsers(spaceId, fromUserId, toUserIds, ccUserIds, bccUserIds, replyToUserId, subject, text, html, headers, attachments, mailComposer) {
+        try {
+            await this.emailService.sendMailToUsers({
+                spaceId,
+                fromUserId,
+                toUserIds,
+                ccUserIds,
+                bccUserIds,
+                replyToUserId,
+                subject,
+                text,
+                html,
+                headers,
+                attachments,
+                mailComposer
+            });
+            return { message: '给多人发送邮件发送成功' };
+        }
+        catch (error) {
+            console.error('Query error', error);
+            return {
+                error: {
+                    code: 500,
+                    message: error.message,
+                },
+            };
+        }
+    }
     async updateConfig(config) {
         try {
             await this.emailService.updateConfig(config);
@@ -101,6 +129,106 @@ __decorate([
     __metadata("design:paramtypes", [String, String, String, String, String]),
     __metadata("design:returntype", Promise)
 ], EmailController.prototype, "sendEmail", null);
+__decorate([
+    (0, common_1.Post)('sendMailToUsers'),
+    (0, swagger_1.ApiOperation)({
+        summary: '给多人发送邮件',
+        description: '通过提供收件人id列表、主题和邮件内容发送邮件',
+    }),
+    (0, swagger_1.ApiBody)({
+        description: '发送邮件所需的参数',
+        schema: {
+            type: 'object',
+            properties: {
+                spaceId: {
+                    type: 'string',
+                    example: '67505d7484ff2b0b4fc245bb',
+                    description: 'space id',
+                },
+                fromUserId: {
+                    type: 'string',
+                    example: '67505d5f84ff2b0b4fc245b9',
+                    description: '发送人的用户id',
+                },
+                toUserIds: {
+                    type: 'array',
+                    items: {
+                        type: 'string',
+                    },
+                    example: ['675b95f987d0d8467f525e91', '6756c5be07e329d0106cdd36'],
+                    description: '接收邮件的邮箱地址',
+                },
+                ccUserIds: {
+                    type: 'array',
+                    items: {
+                        type: 'string',
+                    },
+                    example: ['675b95f987d0d8467f525e91', '6756c5be07e329d0106cdd36'],
+                    description: '抄送的用户ids',
+                },
+                bccUserIds: {
+                    type: 'array',
+                    items: {
+                        type: 'string',
+                    },
+                    example: ['675b95f987d0d8467f525e91', '6756c5be07e329d0106cdd36'],
+                    description: '秘密抄送的用户ids',
+                },
+                replyToUserId: {
+                    type: 'string',
+                    example: '67505d5f84ff2b0b4fc245b9',
+                    description: '回复某人的邮件id',
+                },
+                subject: {
+                    type: 'string',
+                    example: '邮件标题示例',
+                    description: '邮件主题',
+                },
+                text: {
+                    type: 'string',
+                    example: '这是一封测试邮件的文本内容',
+                    description: '邮件的纯文本内容',
+                },
+                html: {
+                    type: 'string',
+                    example: '<h1>这是 HTML 格式的内容</h1>',
+                    description: '邮件的 HTML 格式内容',
+                },
+                headers: {
+                    type: 'object',
+                    description: '特殊的消息头',
+                },
+                attachments: {
+                    type: 'array',
+                    items: {
+                        type: 'object'
+                    },
+                    description: '附件列表',
+                },
+                mailComposer: {
+                    type: 'object',
+                    description: 'MailComposer对象',
+                }
+            },
+            required: ['spaceId', 'toUserIds', 'subject'],
+        },
+    }),
+    __param(0, (0, common_1.Body)('spaceId')),
+    __param(1, (0, common_1.Body)('fromUserId')),
+    __param(2, (0, common_1.Body)('toUserIds')),
+    __param(3, (0, common_1.Body)('ccUserIds')),
+    __param(4, (0, common_1.Body)('bccUserIds')),
+    __param(5, (0, common_1.Body)('replyToUserId')),
+    __param(6, (0, common_1.Body)('subject')),
+    __param(7, (0, common_1.Body)('text')),
+    __param(8, (0, common_1.Body)('html')),
+    __param(9, (0, common_1.Body)('headers')),
+    __param(10, (0, common_1.Body)('attachments')),
+    __param(11, (0, common_1.Body)('mailComposer')),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, String, Array, Array, Array, String, String, String, String, Object, Array, Object]),
+    __metadata("design:returntype", Promise)
+], EmailController.prototype, "sendMailToUsers", null);
 __decorate([
     (0, common_1.Patch)('config'),
     (0, swagger_1.ApiOperation)({

package/dist/email/email.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"email.controller.js","sourceRoot":"","sources":["../../src/email/email.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"email.controller.js","sourceRoot":"","sources":["../../src/email/email.controller.ts"],"names":[],"mappings":"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"}

package/dist/email/email.module.js

@@ -12,12 +12,13 @@ const core_1 = require("@builder6/core");
 const email_service_1 = require("./email.service");
 const email_controller_1 = require("./email.controller");
 const email_moleculer_1 = require("./email.moleculer");
+const email_schedule_1 = require("./email.schedule");
 let EmailModule = class EmailModule {
 };
 EmailModule = __decorate([
     (0, common_1.Module)({
         imports: [core_1.AuthModule, core_1.MongodbModule],
-        providers: [email_service_1.EmailService, email_moleculer_1.EmailMoleculer],
+        providers: [email_service_1.EmailService, email_moleculer_1.EmailMoleculer, email_schedule_1.EmailScheduleService],
         controllers: [email_controller_1.EmailController],
         exports: [email_service_1.EmailService],
     })

package/dist/email/email.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"email.module.js","sourceRoot":"","sources":["../../src/email/email.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,yCAA2D;AAC3D,mDAA+C;AAC/C,yDAAqD;AACrD,uDAAmD;AAQ5C,IAAM,WAAW,GAAjB,MAAM,WAAW;CAAG,CAAA;AAAd,WAAW;IANvB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,iBAAU,EAAE,oBAAa,CAAC;QACpC,SAAS,EAAE,CAAC,4BAAY,EAAE,gCAAc,CAAC;QACzC,WAAW,EAAE,CAAC,kCAAe,CAAC;QAC9B,OAAO,EAAE,CAAC,4BAAY,CAAC;KACxB,CAAC;GACW,WAAW,CAAG;AAAd,kCAAW"}
+{"version":3,"file":"email.module.js","sourceRoot":"","sources":["../../src/email/email.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,yCAA2D;AAC3D,mDAA+C;AAC/C,yDAAqD;AACrD,uDAAmD;AACnD,qDAAwD;AAQjD,IAAM,WAAW,GAAjB,MAAM,WAAW;CAAG,CAAA;AAAd,WAAW;IANvB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,iBAAU,EAAE,oBAAa,CAAC;QACpC,SAAS,EAAE,CAAC,4BAAY,EAAE,gCAAc,EAAE,qCAAoB,CAAC;QAC/D,WAAW,EAAE,CAAC,kCAAe,CAAC;QAC9B,OAAO,EAAE,CAAC,4BAAY,CAAC;KACxB,CAAC;GACW,WAAW,CAAG;AAAd,kCAAW"}

package/dist/email/email.moleculer.d.ts

@@ -16,4 +16,9 @@ export declare class EmailMoleculer extends Service {
             message: any;
         };
     }>;
+    sendMailToUsers(ctx: Context): Promise<void | {
+        error: {
+            message: any;
+        };
+    }>;
 }

package/dist/email/email.moleculer.js

@@ -17,6 +17,7 @@ const moleculer_1 = require("moleculer");
 const common_1 = require("@nestjs/common");
 const moleculer_2 = require("@builder6/moleculer");
 const email_service_1 = require("./email.service");
+const lodash_1 = require("lodash");
 let EmailMoleculer = class EmailMoleculer extends moleculer_1.Service {
     constructor(emailService, broker) {
         super(broker);
@@ -26,6 +27,7 @@ let EmailMoleculer = class EmailMoleculer extends moleculer_1.Service {
             settings: {},
             actions: {
                 send: this.send,
+                sendMailToUsers: this.sendMailToUsers,
             },
             created: this.serviceCreated,
             started: this.serviceStarted,
@@ -36,15 +38,18 @@ let EmailMoleculer = class EmailMoleculer extends moleculer_1.Service {
     async serviceStarted() { }
     async serviceStopped() { }
     async send(ctx) {
-        const { from, to, subject, text, html } = ctx.params;
+        let { to, subject } = ctx.params;
+        to = (0, lodash_1.isArray)(to) && to.length > 0 ? to.join(',') : to;
+        if (!(0, lodash_1.isEmpty)(to) || !subject) {
+            console.error(`参数错误：to=${to}, subject=${subject?.substring(0, 10)}`);
+            return {
+                error: {
+                    message: '参数错误',
+                },
+            };
+        }
         try {
-            const result = await this.emailService.sendMail({
-                from,
-                to,
-                subject,
-                text,
-                html,
-            });
+            const result = await this.emailService.addEmailToQueue(ctx.params);
             return result;
         }
         catch (error) {
@@ -77,6 +82,28 @@ let EmailMoleculer = class EmailMoleculer extends moleculer_1.Service {
             };
         }
     }
+    async sendMailToUsers(ctx) {
+        const { spaceId, toUserIds, subject } = ctx.params;
+        if (!spaceId || !(0, lodash_1.isArray)(toUserIds) || !subject) {
+            console.error(`参数错误：spaceId=${spaceId}, toUserIds=${(toUserIds ?? []).join(',')}, subject=${subject?.substring(0, 10)}`);
+            return {
+                error: {
+                    message: '参数错误',
+                },
+            };
+        }
+        try {
+            return this.emailService.sendMailToUsers(ctx.params);
+        }
+        catch (error) {
+            console.error(error);
+            return {
+                error: {
+                    message: error.message,
+                },
+            };
+        }
+    }
 };
 EmailMoleculer = __decorate([
     (0, common_1.Injectable)(),

package/dist/email/email.moleculer.js.map

@@ -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;AAGxC,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,mBAAO;IACzC,YACmB,YAA0B,EAC3B,MAAqB;QAErC,KAAK,CAAC,MAAM,CAAC,CAAC;QAHG,iBAAY,GAAZ,YAAY,CAAc;QAK3C,IAAI,CAAC,kBAAkB,CAAC;YACtB,IAAI,EAAE,iBAAiB;YACvB,QAAQ,EAAE,EAAE;YACZ,OAAO,EAAE;gBACP,IAAI,EAAE,IAAI,CAAC,IAAI;aAChB;YACD,OAAO,EAAE,IAAI,CAAC,cAAc;YAC5B,OAAO,EAAE,IAAI,CAAC,cAAc;YAC5B,OAAO,EAAE,IAAI,CAAC,cAAc;SAC7B,CAAC,CAAC;IACL,CAAC;IAED,cAAc,KAAI,CAAC;IAEnB,KAAK,CAAC,cAAc,KAAI,CAAC;IAEzB,KAAK,CAAC,cAAc,KAAI,CAAC;IAEzB,KAAK,CAAC,IAAI,CAAC,GAAY;QACrB,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,MAAa,CAAC;QAC5D,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC;gBAC9C,IAAI;gBACJ,EAAE;gBACF,OAAO;gBACP,IAAI;gBACJ,IAAI;aACL,CAAC,CAAC;YACH,OAAO,MAAM,CAAC;SACf;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACrB,OAAO;gBACL,KAAK,EAAE;oBACL,OAAO,EAAE,KAAK,CAAC,OAAO;iBACvB;aACF,CAAC;SACH;IACH,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAY;QAC3B,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,MAAa,CAAC;QACxE,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC;gBACpD,UAAU;gBACV,QAAQ;gBACR,OAAO;gBACP,IAAI;gBACJ,IAAI;aACL,CAAC,CAAC;YACH,OAAO,MAAM,CAAC;SACf;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACrB,OAAO;gBACL,KAAK,EAAE;oBACL,OAAO,EAAE,KAAK,CAAC,OAAO;iBACvB;aACF,CAAC;SACH;IACH,CAAC;CACF,CAAA;AAlEY,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAIR,WAAA,IAAA,wBAAY,GAAE,CAAA;qCADgB,4BAAY;QACnB,yBAAa;GAH5B,cAAc,CAkE1B;AAlEY,wCAAc"}
+{"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,mCAA0C;AAGnC,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,mBAAO;IACzC,YACmB,YAA0B,EAC3B,MAAqB;QAErC,KAAK,CAAC,MAAM,CAAC,CAAC;QAHG,iBAAY,GAAZ,YAAY,CAAc;QAK3C,IAAI,CAAC,kBAAkB,CAAC;YACtB,IAAI,EAAE,iBAAiB;YACvB,QAAQ,EAAE,EAAE;YACZ,OAAO,EAAE;gBACP,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,eAAe,EAAE,IAAI,CAAC,eAAe;aACtC;YACD,OAAO,EAAE,IAAI,CAAC,cAAc;YAC5B,OAAO,EAAE,IAAI,CAAC,cAAc;YAC5B,OAAO,EAAE,IAAI,CAAC,cAAc;SAC7B,CAAC,CAAC;IACL,CAAC;IAED,cAAc,KAAK,CAAC;IAEpB,KAAK,CAAC,cAAc,KAAK,CAAC;IAE1B,KAAK,CAAC,cAAc,KAAK,CAAC;IAE1B,KAAK,CAAC,IAAI,CAAC,GAAY;QACrB,IAAI,EAAE,EAAE,EAAE,OAAO,EAAC,GAAG,GAAG,CAAC,MAAa,CAAC;QACvC,EAAE,GAAG,IAAA,gBAAO,EAAC,EAAE,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtD,IAAI,CAAC,IAAA,gBAAO,EAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE;YAC5B,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,aAAa,OAAO,EAAE,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;YACrE,OAAO;gBACL,KAAK,EAAE;oBACL,OAAO,EAAE,MAAM;iBAChB;aACF,CAAC;SACH;QACD,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,GAAG,CAAC,MAAa,CAAC,CAAC;YAC1E,OAAO,MAAM,CAAC;SACf;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACrB,OAAO;gBACL,KAAK,EAAE;oBACL,OAAO,EAAE,KAAK,CAAC,OAAO;iBACvB;aACF,CAAC;SACH;IACH,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAY;QAC3B,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,MAAa,CAAC;QACxE,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC;gBACpD,UAAU;gBACV,QAAQ;gBACR,OAAO;gBACP,IAAI;gBACJ,IAAI;aACL,CAAC,CAAC;YACH,OAAO,MAAM,CAAC;SACf;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACrB,OAAO;gBACL,KAAK,EAAE;oBACL,OAAO,EAAE,KAAK,CAAC,OAAO;iBACvB;aACF,CAAC;SACH;IACH,CAAC;IACD,KAAK,CAAC,eAAe,CAAC,GAAY;QAChC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,MAAa,CAAC;QAC1D,IAAI,CAAC,OAAO,IAAI,CAAC,IAAA,gBAAO,EAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE;YAC/C,OAAO,CAAC,KAAK,CAAC,gBAAgB,OAAO,eAAe,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,OAAO,EAAE,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;YACzH,OAAO;gBACL,KAAK,EAAE;oBACL,OAAO,EAAE,MAAM;iBAChB;aACF,CAAC;SACH;QACD,IAAI;YACF,OAAO,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,GAAG,CAAC,MAAa,CAAC,CAAC;SAC7D;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACrB,OAAO;gBACL,KAAK,EAAE;oBACL,OAAO,EAAE,KAAK,CAAC,OAAO;iBACvB;aACF,CAAC;SACH;IACH,CAAC;CACF,CAAA;AA3FY,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAIR,WAAA,IAAA,wBAAY,GAAE,CAAA;qCADgB,4BAAY;QACnB,yBAAa;GAH5B,cAAc,CA2F1B;AA3FY,wCAAc"}

package/dist/email/email.schedule.d.ts

@@ -0,0 +1,16 @@
+import { ConfigService } from '@nestjs/config';
+import { MongodbService } from '@builder6/core';
+import { EmailService } from './email.service';
+export declare class EmailScheduleService {
+    private configService;
+    private mongodbService;
+    private readonly emailService;
+    private readonly logger;
+    private isSendingMail;
+    private static interval;
+    private batchSize;
+    private timeout;
+    private keepMails;
+    constructor(configService: ConfigService, mongodbService: MongodbService, emailService: EmailService);
+    sendEmail(): Promise<void>;
+}

package/dist/email/email.schedule.js

@@ -0,0 +1,126 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var EmailScheduleService_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EmailScheduleService = void 0;
+const common_1 = require("@nestjs/common");
+const schedule_1 = require("@nestjs/schedule");
+const common_2 = require("@nestjs/common");
+const config_1 = require("@nestjs/config");
+const core_1 = require("@builder6/core");
+const email_service_1 = require("./email.service");
+const MyPromise = require("bluebird");
+const lodash_1 = require("lodash");
+let EmailScheduleService = EmailScheduleService_1 = class EmailScheduleService {
+    constructor(configService, mongodbService, emailService) {
+        this.configService = configService;
+        this.mongodbService = mongodbService;
+        this.emailService = emailService;
+        this.logger = new common_2.Logger(EmailScheduleService_1.name);
+        this.batchSize = Number(this.configService.get('email.queue.batch.size') || 1);
+        this.timeout = Number(this.configService.get('email.queue.timeout') || 60000);
+        this.keepMails = this.configService.get('email.queue.keeps');
+    }
+    async sendEmail() {
+        if (this.configService.get('email.enabled')) {
+            this.logger.debug(`Called SendEmail ${new Date()}`);
+            if (this.isSendingMail)
+                return;
+            this.isSendingMail = true;
+            const now = Date.now();
+            try {
+                const pendingMails = await this.mongodbService.find('_mail_queue', {
+                    sent: false,
+                    sending: {
+                        $lt: now,
+                    },
+                    errMsg: {
+                        $exists: false,
+                    },
+                }, {
+                    sort: {
+                        createdAt: 1,
+                    },
+                    limit: this.batchSize,
+                });
+                if (pendingMails.length > 0) {
+                    const mailqueueCol = await this.mongodbService.getCollection('_mail_queue');
+                    await MyPromise.map(pendingMails, async (pendingMail) => {
+                        const timeoutAt = now + this.timeout;
+                        var reserved = await mailqueueCol.updateOne({
+                            _id: pendingMail._id,
+                            sent: false,
+                            sending: {
+                                $lt: now,
+                            },
+                        }, {
+                            $set: {
+                                sending: timeoutAt,
+                            },
+                        });
+                        if (!(0, lodash_1.isEmpty)(reserved)) {
+                            try {
+                                await this.emailService.sendMail(pendingMail.mail);
+                                if (this.keepMails) {
+                                    await mailqueueCol.updateOne({
+                                        _id: pendingMail._id,
+                                    }, {
+                                        $set: {
+                                            sent: true,
+                                            sentAt: new Date(),
+                                            sending: 0
+                                        },
+                                    });
+                                }
+                                else {
+                                    await mailqueueCol.deleteOne({
+                                        _id: pendingMail._id,
+                                    });
+                                }
+                            }
+                            catch (error) {
+                                this.logger.error(error);
+                                await mailqueueCol.updateOne({
+                                    _id: pendingMail._id,
+                                }, {
+                                    $set: {
+                                        errMsg: error.message || error.toString(),
+                                    },
+                                });
+                            }
+                        }
+                    }, { concurrency: pendingMails.length });
+                }
+            }
+            catch (error) {
+                this.logger.error(error);
+            }
+            finally {
+                this.isSendingMail = false;
+            }
+        }
+    }
+};
+EmailScheduleService.interval = Number(process.env.STEEDOS_EMAIL_QUEUE_INTERVAL || 3000);
+__decorate([
+    (0, schedule_1.Interval)(EmailScheduleService_1.interval),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], EmailScheduleService.prototype, "sendEmail", null);
+EmailScheduleService = EmailScheduleService_1 = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [config_1.ConfigService,
+        core_1.MongodbService,
+        email_service_1.EmailService])
+], EmailScheduleService);
+exports.EmailScheduleService = EmailScheduleService;
+//# sourceMappingURL=email.schedule.js.map

package/dist/email/email.schedule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"email.schedule.js","sourceRoot":"","sources":["../../src/email/email.schedule.ts"],"names":[],"mappings":"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"}

package/dist/email/email.service.d.ts

@@ -1,5 +1,6 @@
 import { MongodbService } from '@builder6/core';
 import { ConfigService } from '@nestjs/config';
+import * as nodemailer from 'nodemailer';
 export declare class EmailService {
     private configService;
     private mongodbService;
@@ -7,12 +8,45 @@ export declare class EmailService {
     private emailConfig;
     private readonly logger;
     constructor(configService: ConfigService, mongodbService: MongodbService);
-    sendMail({ from, to, subject, text, html, }: {
+    sendMail({ from, to, cc, bcc, replyTo, subject, text, html, headers, attachments, mailComposer, }: {
         from?: string;
         to: string;
+        cc?: string;
+        bcc?: string;
+        replyTo?: string;
         subject: string;
         text?: string;
         html?: string;
+        headers?: object;
+        attachments?: nodemailer.Attachment[];
+        mailComposer?: nodemailer.MailComposer;
+    }): Promise<void>;
+    addEmailToQueue({ from, to, cc, bcc, replyTo, subject, text, html, headers, attachments, mailComposer, }: {
+        from?: string;
+        to: string;
+        cc?: string;
+        bcc?: string;
+        replyTo?: string;
+        subject: string;
+        text?: string;
+        html?: string;
+        headers?: object;
+        attachments?: nodemailer.Attachment[];
+        mailComposer?: nodemailer.MailComposer;
+    }): Promise<void>;
+    sendMailToUsers({ spaceId, fromUserId, toUserIds, ccUserIds, bccUserIds, replyToUserId, subject, text, html, headers, attachments, mailComposer, }: {
+        spaceId: string;
+        fromUserId: string;
+        toUserIds: string[];
+        ccUserIds?: string[];
+        bccUserIds?: string[];
+        replyToUserId?: string;
+        subject: string;
+        text?: string;
+        html?: string;
+        headers?: object;
+        attachments?: nodemailer.Attachment[];
+        mailComposer?: nodemailer.MailComposer;
     }): Promise<void>;
     sendMailToUser({ fromUserId, toUserId, subject, text, html, }: {
         fromUserId?: string;
@@ -22,5 +56,11 @@ export declare class EmailService {
         html?: string;
     }): Promise<void>;
     getUserEmail(userId: string): Promise<any>;
+    getUsersEmail(userIds: string[], spaceId: string): Promise<any>;
+    convertUserIdsToEmails(userIds: string[], allUsers: {
+        _id: string;
+        email: string;
+        name: string;
+    }[]): string;
     updateConfig(config: object): Promise<void>;
 }

package/dist/email/email.service.js

@@ -14,6 +14,7 @@ exports.EmailService = void 0;
 const core_1 = require("@builder6/core");
 const common_1 = require("@nestjs/common");
 const config_1 = require("@nestjs/config");
+const lodash_1 = require("lodash");
 const nodemailer = require("nodemailer");
 let EmailService = EmailService_1 = class EmailService {
     constructor(configService, mongodbService) {
@@ -40,16 +41,22 @@ let EmailService = EmailService_1 = class EmailService {
             this.transporter = nodemailer.createTransport(this.emailConfig);
         }
     }
-    async sendMail({ from = this.configService.get('email.from'), to, subject, text, html, }) {
+    async sendMail({ from = this.configService.get('email.from'), to, cc, bcc, replyTo, subject, text, html, headers, attachments, mailComposer, }) {
         if (!this.transporter) {
             throw new Error('Email service not enabled');
         }
         const mailOptions = {
-            from: from,
+            from,
             to,
+            cc,
+            bcc,
+            replyTo,
             subject,
             text,
             html,
+            headers,
+            attachments,
+            mailComposer,
         };
         try {
             const info = await this.transporter.sendMail(mailOptions);
@@ -61,6 +68,65 @@ let EmailService = EmailService_1 = class EmailService {
             throw error;
         }
     }
+    async addEmailToQueue({ from = this.configService.get('email.from'), to, cc, bcc, replyTo, subject, text, html, headers, attachments, mailComposer, }) {
+        await this.mongodbService.insertOne('_mail_queue', {
+            createdAt: new Date().toISOString(),
+            createdBy: '<SERVER>',
+            mail: {
+                from,
+                to,
+                cc,
+                bcc,
+                replyTo,
+                subject,
+                text,
+                html,
+                headers,
+                attachments,
+                mailComposer,
+            },
+            sent: false,
+            sending: 0,
+        });
+    }
+    async sendMailToUsers({ spaceId, fromUserId, toUserIds, ccUserIds, bccUserIds, replyToUserId, subject, text, html, headers, attachments, mailComposer, }) {
+        const allUsers = await this.getUsersEmail((0, lodash_1.compact)([
+            fromUserId,
+            replyToUserId,
+            ...toUserIds,
+            ...(ccUserIds ?? []),
+            ...(bccUserIds ?? []),
+        ]), spaceId);
+        const from = this.convertUserIdsToEmails([fromUserId], allUsers) ||
+            this.configService.get('email.from');
+        let to = this.convertUserIdsToEmails(toUserIds, allUsers);
+        const cc = this.convertUserIdsToEmails(ccUserIds ?? [], allUsers);
+        const bcc = this.convertUserIdsToEmails(bccUserIds ?? [], allUsers);
+        if ((0, lodash_1.isEmpty)(to) && (0, lodash_1.isEmpty)(cc) && (0, lodash_1.isEmpty)(bcc)) {
+            throw new Error('没有满足要求的接收者');
+        }
+        to = (0, lodash_1.isEmpty)(to) ? '华炎魔方 <noreply@xxx.com>' : to;
+        const replyTo = this.convertUserIdsToEmails([replyToUserId], allUsers);
+        await this.mongodbService.insertOne('_mail_queue', {
+            createdAt: new Date().toISOString(),
+            createdBy: fromUserId ?? '<SERVER>',
+            mail: {
+                from,
+                to,
+                cc,
+                bcc,
+                replyTo,
+                subject,
+                text,
+                html,
+                headers,
+                attachments,
+                mailComposer,
+            },
+            sent: false,
+            sending: 0,
+        });
+    }
     async sendMailToUser({ fromUserId, toUserId, subject, text, html, }) {
         const from = (fromUserId && (await this.getUserEmail(fromUserId))) ||
             this.configService.get('email.from');
@@ -89,6 +155,48 @@ let EmailService = EmailService_1 = class EmailService {
             return null;
         }
     }
+    async getUsersEmail(userIds, spaceId) {
+        const [users, spaceUsers] = await Promise.all([
+            this.mongodbService.find('users', {
+                _id: { $in: userIds },
+                email: { $exists: true },
+            }, {
+                projection: {
+                    _id: 1,
+                    name: 1,
+                    email: 1,
+                },
+            }),
+            this.mongodbService.find('space_users', {
+                space: spaceId,
+                user: { $in: userIds },
+                email_notification: true,
+            }, {
+                projection: {
+                    user: 1,
+                },
+            }),
+        ]);
+        const spaceUsersIds = spaceUsers.map((spaceUser) => spaceUser.user);
+        return (users ?? []).filter((user) => spaceUsersIds.includes(user._id));
+    }
+    convertUserIdsToEmails(userIds, allUsers) {
+        if ((0, lodash_1.isEmpty)(userIds) || (0, lodash_1.isEmpty)(allUsers)) {
+            return undefined;
+        }
+        return (0, lodash_1.compact)(userIds.map((userId) => {
+            const currUser = allUsers.find((user) => user._id === userId);
+            if (currUser && currUser.name) {
+                return `"${currUser.name}" <${currUser.email}>`;
+            }
+            else if (currUser) {
+                return currUser.email;
+            }
+            else {
+                return null;
+            }
+        })).join(', ');
+    }
     async updateConfig(config) {
         const emailConfig = {
             ...this.emailConfig,

package/dist/email/email.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"email.service.js","sourceRoot":"","sources":["../../src/email/email.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"email.service.js","sourceRoot":"","sources":["../../src/email/email.service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builder6/email",
-  "version": "0.11.12",
+  "version": "0.12.1",
   "main": "dist/index.js",
   "license": "MIT",
   "files": [
@@ -12,11 +12,16 @@
     "build:watch": "rimraf dist && tsc --watch"
   },
   "dependencies": {
-    "@builder6/core": "^0.11.12",
+    "@builder6/core": "^0.12.1",
+    "bluebird": "^3.7.2",
+    "lodash": "^4.17.5",
     "nodemailer": "^6.9.16"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9995c16ebe40080ae99cdf5f91994cba1aff4db6"
+  "gitHead": "04c332c3bd98f8df718399b56abbfa7f866904e6",
+  "devDependencies": {
+    "@types/bluebird": "^3.5.42"
+  }
 }