@kne/fastify-message 1.0.0 → 1.0.2

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

@@ -5,7 +5,7 @@ const template = require('lodash/template');
 const merge = require('lodash/merge');
 const nodemailer = require('nodemailer');
 const { convert } = require('html-to-text');
-const pify = require('pify').default;
+const pify = require('pify');
 
 module.exports = fp(async (fastify, options) => {
   const emailConfig = Object.assign(
@@ -98,40 +98,50 @@ module.exports = fp(async (fastify, options) => {
 
   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 sendOptions = await (async () => {
+      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 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) {
+          await pify(smtp.sendMail.bind(smtp))(mailOptions);
+        }
+        return mailOptions;
       }
+      const currentSender = options.senders?.[type];
+      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, {

package/package.json

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