befly 3.20.6 → 3.20.7

package/lib/dbHelper/execute.js

@@ -2,6 +2,56 @@ import { toSqlParams } from "../sqlBuilder/util.js";
 import { snakeCase } from "../../utils/util.js";
 import { validateExecuteSql } from "./validate.js";
 
+function safeStringify(value) {
+    try {
+        return JSON.stringify(value);
+    } catch {
+        try {
+            return String(value);
+        } catch {
+            return "[Unserializable]";
+        }
+    }
+}
+
+function getExecuteErrorMessage(error) {
+    if (error instanceof Error && typeof error.message === "string" && error.message.trim().length > 0) {
+        return error.message.trim();
+    }
+
+    if (!error || typeof error !== "object") {
+        return String(error);
+    }
+
+    const message = typeof error.message === "string" && error.message.trim().length > 0 ? error.message.trim() : typeof error.sqlMessage === "string" && error.sqlMessage.trim().length > 0 ? error.sqlMessage.trim() : "";
+    const detail = {};
+
+    if (typeof error.code === "string" && error.code.trim().length > 0) {
+        detail.code = error.code;
+    }
+    if (typeof error.errno === "number") {
+        detail.errno = error.errno;
+    }
+    if (typeof error.sqlState === "string" && error.sqlState.trim().length > 0) {
+        detail.sqlState = error.sqlState;
+    }
+    if (typeof error.sqlMessage === "string" && error.sqlMessage.trim().length > 0) {
+        detail.sqlMessage = error.sqlMessage;
+    }
+    if (typeof error.detail === "string" && error.detail.trim().length > 0) {
+        detail.detail = error.detail;
+    }
+
+    const detailText = Object.keys(detail).length > 0 ? safeStringify(detail) : safeStringify(error);
+    if (message && detailText && detailText !== "{}") {
+        return `${message} | ${detailText}`;
+    }
+    if (message) {
+        return message;
+    }
+    return detailText;
+}
+
 export const executeMethods = {
     async execute(sql, params) {
         if (!this.sql) {
@@ -44,21 +94,24 @@ export const executeMethods = {
             };
         } catch (error) {
             const duration = Date.now() - startTime;
-            const msg = error instanceof Error ? error.message : String(error);
-
-            throw new Error(`SQL执行失败: ${msg}`, {
-                cause: error,
-                code: "runtime",
-                subsystem: "sql",
-                operation: "execute",
+            const msg = getExecuteErrorMessage(error);
+            const sqlInfo = {
+                sql: sql,
                 params: safeParams,
-                duration: duration,
-                sqlInfo: {
-                    sql: sql,
-                    params: safeParams,
-                    duration: duration
-                }
+                duration: duration
+            };
+            const wrappedError = new Error(`SQL执行失败: ${msg}`, {
+                cause: error
             });
+
+            wrappedError.code = "runtime";
+            wrappedError.subsystem = "sql";
+            wrappedError.operation = "execute";
+            wrappedError.params = safeParams;
+            wrappedError.duration = duration;
+            wrappedError.sqlInfo = sqlInfo;
+
+            throw wrappedError;
         }
     },
 

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "befly",
-    "version": "3.20.6",
-    "gitHead": "fc0f4f7193f9e234c87732cd7fc0b3b53591cee5",
+    "version": "3.20.7",
+    "gitHead": "a337be6c93cbf8a8e70bf6ac32eeb30c57fba3a3",
     "private": false,
     "description": "Befly - 为 Bun 专属打造的 JavaScript API 接口框架核心引擎",
     "keywords": [
@@ -52,7 +52,7 @@
         "test": "bun test"
     },
     "dependencies": {
-        "fast-xml-parser": "^5.5.7",
+        "fast-xml-parser": "^5.5.8",
         "nodemailer": "^8.0.2",
         "pathe": "^2.0.3",
         "ua-parser-js": "^2.0.9",

package/utils/loggerUtils.js

@@ -41,11 +41,28 @@ function sanitizeErrorValue(err, options) {
         name: err.name || "Error",
         message: truncateString(err.message || "", options.maxStringLen)
     };
+    const state = { nodes: 0 };
+    const visited = new WeakSet();
+
+    visited.add(err);
 
     if (isString(err.stack)) {
         out["stack"] = truncateString(err.stack, options.maxStringLen);
     }
 
+    if (!isNullable(err.cause)) {
+        out["cause"] = sanitizeAny(err.cause, options, state, 0, visited);
+    }
+
+    const ownKeys = Object.keys(err);
+    for (const key of ownKeys) {
+        if (key === "name" || key === "message" || key === "stack" || key === "cause") {
+            continue;
+        }
+
+        out[key] = sanitizeAny(err[key], options, state, 0, visited);
+    }
+
     return out;
 }