@kne/fastify-message 1.0.1 → 1.0.3

package/index.js

@@ -12,7 +12,8 @@ module.exports = fp(async function (fastify, options) {
           throw new Error('fastify-account plugin must be registered before fastify-trtc-conference,or set options.getUserModel');
         }
         return fastify.account.models.user;
-      }
+      },
+      senders: {}
     },
     options
   );

package/libs/services/main.js

@@ -8,14 +8,9 @@ const { convert } = require('html-to-text');
 const pify = require('pify');
 
 module.exports = fp(async (fastify, options) => {
-  const emailConfig = Object.assign(
-    {},
-    {
-      port: 465,
-      secure: true
-    },
-    options.emailConfig
-  );
+  const emailConfig = Object.assign({}, {
+    port: 465, secure: true
+  }, options.emailConfig);
   const isTest = options.isTest;
   const { models, services } = fastify[options.name];
   const includeTemplate = async dir => {
@@ -30,14 +25,10 @@ module.exports = fp(async (fastify, options) => {
       const content = await fs.readFile(filePath, 'utf8');
       const filename = file.replace(path.extname(file), '');
       const tempArray = filename.split('_');
-      const code = tempArray[0],
-        type = tempArray[1] || 0,
-        name = tempArray[2] || code;
+      const code = tempArray[0], type = tempArray[1] || 0, name = tempArray[2] || code;
       const codeTemplate = await models.template.findOne({
         where: {
-          code,
-          type,
-          level: 0
+          code, type, level: 0
         }
       });
 
@@ -49,11 +40,7 @@ module.exports = fp(async (fastify, options) => {
         continue;
       }
       await models.template.create({
-        code,
-        type,
-        name,
-        content,
-        level: 0
+        code, type, name, content, level: 0
       });
       console.log(`create template: ${code}`);
     }
@@ -76,9 +63,7 @@ module.exports = fp(async (fastify, options) => {
   const messageTemplate = async ({ code, type = 0, level = 0, props }) => {
     const codeTemplate = await models.template.findOne({
       where: {
-        code,
-        type,
-        level
+        code, type, level
       }
     });
     if (!codeTemplate) {
@@ -88,56 +73,54 @@ module.exports = fp(async (fastify, options) => {
     const content = parseTemplate(template(codeTemplate.content)(props).split(/<!--(\s*)-->/g));
 
     return {
-      content,
-      props,
-      code,
-      type,
-      templateId: codeTemplate.id
+      content, props, code, type, templateId: codeTemplate.id
     };
   };
 
   const sendMessage = async ({ type = 0, name, props, code, level = 0, client, options: targetOptions }) => {
     targetOptions = Object.assign({}, targetOptions);
-    if (type === 0) {
-      const currentClient = merge(
-        {},
-        {
-          host: emailConfig.host,
-          port: emailConfig.port,
-          secure: emailConfig.secure,
-          auth: {
-            user: emailConfig.user,
-            pass: emailConfig.pass
-          }
-        },
-        client
-      );
-      const smtp = nodemailer.createTransport(currentClient);
-
-      const { content, templateId } = await messageTemplate({ code, type, level, props });
+    const { content, templateId } = await messageTemplate({ code, type, level, props });
+    const sendOptions = await (async () => {
+      const currentSender = options.senders?.[type];
+      if (type === 0) {
+        const mailOptions = {
+          ...targetOptions,
+          from: `"${targetOptions.title || emailConfig.user}" <${emailConfig.user}>`,
+          to: name,
+          subject: content.subject || options.subject || emailConfig.defaultSubject || 'Message reminder',
+          text: content.text || convert(content.html),
+          html: content.html,
+          attachments: options.attachments || []
+        };
 
-      const mailOptions = {
-        ...targetOptions,
-        from: `"${targetOptions.title || emailConfig.user}" <${emailConfig.user}>`,
-        to: name,
-        subject: content.subject || options.subject || emailConfig.defaultSubject || 'Message reminder',
-        text: content.text || convert(content.html),
-        html: content.html,
-        attachments: options.attachments || []
-      };
-
-      if (!isTest) {
-        await pify(smtp.sendMail.bind(smtp))(mailOptions);
+        if (!isTest) {
+          if (typeof currentSender === 'function') {
+            await currentSender(mailOptions);
+          } else {
+            const currentClient = merge({}, {
+              host: emailConfig.host, port: emailConfig.port, secure: emailConfig.secure, auth: {
+                user: emailConfig.user, pass: emailConfig.pass
+              }
+            }, client);
+            const smtp = nodemailer.createTransport(currentClient);
+            await pify(smtp.sendMail.bind(smtp))(mailOptions);
+          }
+        }
+        return mailOptions;
       }
+      if (typeof currentSender === 'function') {
+        const { content, templateId } = await messageTemplate({ code, type, level, props });
+        if (!isTest) {
+          return await currentSender({ code, templateId, content, props, name, type, level, options: targetOptions });
+        }
 
-      await models.record.create({ type, code, templateId, props, name, content: mailOptions });
-    }
+        return { content, props, level, options: targetOptions };
+      }
+    })(type);
+    await models.record.create({ type, code, templateId, props, name, content: sendOptions });
   };
 
   Object.assign(fastify[options.name].services, {
-    includeTemplate,
-    messageTemplate,
-    parseTemplate,
-    sendMessage
+    includeTemplate, messageTemplate, parseTemplate, sendMessage
   });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kne/fastify-message",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "管理消息发送，支持sms消息，email消息等.",
   "main": "index.js",
   "scripts": {