befly 3.18.8 → 3.18.10

package/apis/email/send.js

@@ -26,7 +26,7 @@ export default {
 
         const startTime = Date.now();
 
-        const result = await befly.email.send({
+        const result = await befly.email.sendMail({
             to: ctx.body.to,
             subject: ctx.body.subject,
             html: ctx.body.isHtml ? ctx.body.content : undefined,
@@ -50,7 +50,7 @@ export default {
                     sendTime: startTime,
                     sendResult: result.success ? 1 : 0,
                     messageId: result.messageId || "",
-                    failReason: result.error || ""
+                    failReason: result.reason || ""
                 }
             });
         } catch (logError) {
@@ -61,6 +61,6 @@ export default {
             return befly.tool.Yes("发送成功", { messageId: result.messageId });
         }
 
-        return befly.tool.No(result.error || "发送失败");
+        return befly.tool.No(result.reason || "发送失败");
     }
 };

package/configs/beflyConfig.json

@@ -42,6 +42,15 @@
         "expireDays": 7
     },
 
+    "email": {
+        "host": "smtp.qq.com",
+        "port": 465,
+        "secure": true,
+        "user": "",
+        "pass": "",
+        "label": "befly"
+    },
+
     "cors": {
         "origin": "*",
         "methods": "GET,HEAD,PUT,PATCH,POST,DELETE",

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "befly",
-    "version": "3.18.8",
-    "gitHead": "28fcd2cee85330bc97d228712c4cbb2252ee0a06",
+    "version": "3.18.10",
+    "gitHead": "aa1555eff1f468ef7f5104113e16ba2ea5aa70d6",
     "private": false,
     "description": "Befly - 为 Bun 专属打造的 JavaScript API 接口框架核心引擎",
     "keywords": [
@@ -52,7 +52,7 @@
         "test": "bun test"
     },
     "dependencies": {
-        "fast-xml-parser": "^5.3.7",
+        "fast-xml-parser": "^5.4.1",
         "nodemailer": "^8.0.1",
         "pathe": "^2.0.3",
         "ua-parser-js": "^2.0.9",

package/plugins/email.js

@@ -3,25 +3,67 @@
  * 提供邮件发送功能，支持 SMTP 配置
  */
 
-import { EmailHelper } from "../lib/emailHelper.js";
-
-/** 默认配置 */
-const defaultConfig = {
-    host: "smtp.qq.com",
-    port: 465,
-    secure: true,
-    user: "",
-    pass: "",
-    fromName: "Befly System"
-};
+import { Logger } from "../lib/logger.js";
+import nodemailer from "nodemailer";
 
 export default {
     order: 7,
     async handler(befly) {
-        // 从 befly.config.email 获取配置
-        const emailConfigRaw = (befly.config ? befly.config["email"] : undefined) || {};
-        const emailConfig = Object.assign({}, defaultConfig, emailConfigRaw);
+        const config = befly?.config?.email || {};
+        let transporter = null;
+
+        if (config && config.host && config.user) {
+            try {
+                transporter = nodemailer.createTransport({
+                    host: config.host,
+                    port: config.port || 25,
+                    secure: config.ssl,
+                    auth: {
+                        user: config.user,
+                        pass: config.pass
+                    },
+                    connectionTimeout: config.timeout || 10000
+                });
+            } catch (error) {
+                Logger.warn("邮件服务初始化失败", { err: error });
+            }
+        }
+
+        const sendMail = async function (options) {
+            if (!transporter) {
+                Logger.warn("邮件未配置，已禁用发送");
+                return {
+                    success: false,
+                    reason: "邮件未配置，已禁用发送"
+                };
+            }
 
-        return new EmailHelper(befly, emailConfig);
+            try {
+                const info = await transporter.sendMail({
+                    text: options.text,
+                    html: options.html,
+                    from: options.from || (config.label ? `${config.label} <${config.user}>` : config.user),
+                    to: options.to,
+                    cc: options.cc,
+                    bcc: options.bcc,
+                    subject: options.subject,
+                    attachments: options.attachments
+                });
+                return {
+                    success: true,
+                    reason: "发送成功",
+                    messageId: info?.messageId || ""
+                };
+            } catch (error) {
+                Logger.warn("发送邮件失败", { err: error });
+                return {
+                    success: false,
+                    reason: error?.message || "发送邮件失败"
+                };
+            }
+        };
+        return {
+            sendMail: sendMail
+        };
     }
 };

package/lib/emailHelper.js

@@ -1,110 +0,0 @@
-/**
- * 邮件发送工具类 - JavaScript 版本
- */
-
-import { Logger } from "./logger.js";
-
-/**
- * 邮件发送工具类
- */
-export class EmailHelper {
-    /**
-     * 创建 EmailHelper 实例
-     * @param config - 邮件配置
-     */
-    constructor(config) {
-        this.config = config;
-    }
-
-    /**
-     * 发送邮件
-     * @param options - 邮件选项
-     * @returns 是否发送成功
-     */
-    async send(options) {
-        const config = this.getConfig();
-
-        if (!config || !config.host || !config.user) {
-            Logger.warn("邮件未配置，已禁用发送");
-            return false;
-        }
-
-        try {
-            const result = await this.doSend(config, options);
-            if (result.success) {
-                return true;
-            }
-
-            Logger.warn("发送邮件失败", { err: result.error });
-            return false;
-        } catch (error) {
-            Logger.error("发送邮件异常", error);
-            return false;
-        }
-    }
-
-    /**
-     * 获取邮件配置
-     * @returns 完整配置
-     */
-    getConfig() {
-        if (!this.config) {
-            return null;
-        }
-
-        const result = Object.assign({}, this.config);
-        result.pass = this.config.pass || process.env.SMTP_PASS;
-        result.ssl = Boolean(this.config.ssl);
-        return result;
-    }
-
-    /**
-     * 实际发送邮件
-     * @param config - 邮件配置
-     * @param options - 邮件选项
-     * @returns 发送结果
-     */
-    async doSend(config, options) {
-        let emailService;
-
-        try {
-            // 动态加载 emailjs
-            const emailjs = await import("emailjs");
-            emailService = emailjs.server.connect({
-                user: config.user,
-                password: config.pass,
-                host: config.host,
-                port: config.port || 25,
-                ssl: config.ssl,
-                timeout: config.timeout || 10000
-            });
-        } catch (error) {
-            return { success: false, error: error };
-        }
-
-        try {
-            await emailService.send({
-                text: options.text || options.html,
-                from: options.from || config.from || config.user,
-                to: options.to,
-                cc: options.cc,
-                bcc: options.bcc,
-                subject: options.subject,
-                attachment: options.attachments
-            });
-
-            return { success: true };
-        } catch (error) {
-            return { success: false, error: error };
-        }
-    }
-}
-
-/**
- * 创建邮件工具实例
- * @param config - 邮件配置
- * @returns EmailHelper 实例
- */
-export function createEmailHelper(config) {
-    return new EmailHelper(config);
-}