befly 3.24.8 → 3.24.10

package/apis/dashboard/environmentInfo.js

@@ -1,4 +1,5 @@
 import os from "node:os";
+
 import { isString } from "#root/utils/is.js";
 
 export default {

package/apis/sysConfig/get.js

@@ -1,5 +1,5 @@
-import { isString } from "#root/utils/is.js";
 import sysConfigTable from "#root/tables/sysConfig.json";
+import { isString } from "#root/utils/is.js";
 
 export default {
     name: "根据代码获取配置值",

package/apis/tongJi/errorList.js

@@ -43,7 +43,20 @@ export default {
         const where = {};
 
         if (keyword) {
-            where["$or"] = [{ pagePath$like: keyword }, { pageName$like: keyword }, { message$like: keyword }, { errorType$like: keyword }, { productName$like: keyword }, { productCode$like: keyword }, { productVersion$like: keyword }, { browserName$like: keyword }, { osName$like: keyword }, { deviceType$like: keyword }, { deviceVendor$like: keyword }, { deviceModel$like: keyword }];
+            where["$or"] = [
+                { pagePath$like: keyword },
+                { pageName$like: keyword },
+                { message$like: keyword },
+                { errorType$like: keyword },
+                { productName$like: keyword },
+                { productCode$like: keyword },
+                { productVersion$like: keyword },
+                { browserName$like: keyword },
+                { osName$like: keyword },
+                { deviceType$like: keyword },
+                { deviceVendor$like: keyword },
+                { deviceModel$like: keyword }
+            ];
         }
 
         if (errorType) {

package/apis/tongJi/errorReport.js

@@ -1,4 +1,5 @@
 import { UAParser } from "ua-parser-js";
+
 import { getDateYmdNumber, getTimeBucketStart } from "#root/utils/datetime.js";
 
 const VISIT_STATS_BUCKET_MS = 30 * 60 * 1000;

package/apis/tongJi/infoReport.js

@@ -1,7 +1,7 @@
 import { UAParser } from "ua-parser-js";
 
-import { isValidPositiveInt } from "#root/utils/is.js";
 import { getDateYmdNumber } from "#root/utils/datetime.js";
+import { isValidPositiveInt } from "#root/utils/is.js";
 
 function getInfoStatsMember(ctx) {
     if (isValidPositiveInt(ctx.userId)) {

package/hooks/permission.js

@@ -1,6 +1,6 @@
+import { isValidPositiveInt } from "../utils/is.js";
 // 相对导入
 import { ErrorResponse } from "../utils/response.js";
-import { isValidPositiveInt } from "../utils/is.js";
 
 /**
  * 权限检查钩子

package/hooks/validator.js

@@ -1,7 +1,7 @@
 // 相对导入
 import { Validator } from "../lib/validator.js";
-import { ErrorResponse } from "../utils/response.js";
 import { isPlainObject } from "../utils/is.js";
+import { ErrorResponse } from "../utils/response.js";
 import { snakeCase } from "../utils/util.js";
 
 /**

package/index.js

@@ -3,10 +3,6 @@
  * 提供简洁的框架接口，核心逻辑已提取到 loader 层
  */
 
-// 配置
-import beflyConfig from "#root/configs/beflyConfig.json";
-import beflyMenus from "#root/configs/beflyMenus.json";
-
 // 检查
 import { checkApi } from "#root/checks/api.js";
 import { checkConfig } from "#root/checks/config.js";
@@ -14,6 +10,9 @@ import { checkHook } from "#root/checks/hook.js";
 import { checkMenu } from "#root/checks/menu.js";
 import { checkPlugin } from "#root/checks/plugin.js";
 import { checkTable } from "#root/checks/table.js";
+// 配置
+import beflyConfig from "#root/configs/beflyConfig.json";
+import beflyMenus from "#root/configs/beflyMenus.json";
 // ========== 相对导入（项目内部文件） ==========
 // 基础设施
 import { Connect } from "#root/lib/connect.js";
@@ -28,9 +27,9 @@ import { syncDev } from "#root/sync/dev.js";
 import { syncMenu } from "#root/sync/menu.js";
 // 工具
 import { calcPerfTime } from "#root/utils/calcPerfTime.js";
-import { scanSources } from "#root/utils/scanSources.js";
-import { isPrimaryProcess } from "#root/utils/is.js";
 import { deepMerge } from "#root/utils/deepMerge.js";
+import { isPrimaryProcess } from "#root/utils/is.js";
+import { scanSources } from "#root/utils/scanSources.js";
 
 export { syncDb } from "#root/scripts/syncDb/index.js";
 export { xmlParse } from "#root/lib/xmlParse.js";
@@ -169,7 +168,7 @@ export class Befly {
             await Connect.connectMysql(this.context.config.mysql);
 
             // 加载插件
-            for (const item of this.plugins.sort((a, b) => a.order - b.order)) {
+            for (const item of this.plugins.toSorted((a, b) => a.order - b.order)) {
                 this.context[item.fileName] = await item.handler(this.context);
             }
             await ensureSyncPrerequisites(this.context);
@@ -183,7 +182,7 @@ export class Befly {
             }
 
             // 加载钩子
-            this.hooks = this.hooks.sort((a, b) => a.order - b.order);
+            this.hooks = this.hooks.toSorted((a, b) => a.order - b.order);
 
             // 加载所有 API
             this.apis = Object.fromEntries(this.apis.map((api) => [api.apiPath, api]));
@@ -198,11 +197,11 @@ export class Befly {
                 // 开发模式下启用详细错误信息
                 development: this.context.env.RUN_MODE === "development",
                 // 空闲连接超时时间（秒），防止恶意连接占用资源
-                fetch: async (req, server) => {
+                fetch: async (req, httpServer) => {
                     const url = new URL(req.url);
 
                     if (url.pathname.startsWith("/api/")) {
-                        return apiFetch(req, server);
+                        return apiFetch(req, httpServer);
                     }
 
                     if (url.pathname.startsWith("/public/")) {

package/lib/cacheHelper.js

@@ -3,8 +3,8 @@
  * 负责在服务器启动时缓存接口、菜单和角色权限到 Redis
  */
 
-import { Logger } from "./logger.js";
 import { isNonEmptyString, isNullable, isString } from "../utils/is.js";
+import { Logger } from "./logger.js";
 
 /**
  * 缓存助手类
@@ -110,7 +110,7 @@ export class CacheHelper {
 
             for (const roleCode of roleCodes) {
                 const apiPaths = roleApiPathsMap.get(roleCode) || [];
-                const members = Array.from(new Set(apiPaths)).sort();
+                const members = Array.from(new Set(apiPaths)).toSorted();
 
                 if (members.length > 0) {
                     items.push({ key: `role:apis:${roleCode}`, members: members });
@@ -168,7 +168,7 @@ export class CacheHelper {
 
             for (const roleCode of roleCodes) {
                 const menuPaths = roleMenuPathsMap.get(roleCode) || [];
-                const members = Array.from(new Set(menuPaths)).sort();
+                const members = Array.from(new Set(menuPaths)).toSorted();
 
                 if (members.length > 0) {
                     items.push({ key: `role:menus:${roleCode}`, members: members });

package/lib/connect.js

@@ -4,6 +4,7 @@
  */
 
 import { RedisClient, SQL } from "bun";
+
 import { Logger } from "./logger.js";
 
 function getRunMode() {

package/lib/dbHelper.js

@@ -1,10 +1,10 @@
 import { fieldClear } from "../utils/fieldClear.js";
 import { isNonEmptyString, isNullable, isNumber, isPlainObject, isString } from "../utils/is.js";
 import { camelCase, canConvertToNumber, keysToSnake, snakeCase } from "../utils/util.js";
-import { Logger } from "./logger.js";
 import { DbParse } from "./dbParse.js";
-import { SqlBuilder } from "./sqlBuilder.js";
 import { deserializeArrayFields, parseTableRef, serializeArrayFields } from "./dbUtil.js";
+import { Logger } from "./logger.js";
+import { SqlBuilder } from "./sqlBuilder.js";
 
 function quoteIdentMySql(identifier) {
     if (!isString(identifier)) {
@@ -29,38 +29,38 @@ function normalizeSqlMetaNumber(value) {
     return typeof value === "number" && Number.isFinite(value) ? value : 0;
 }
 
-function normalizeBigIntValues(value) {
-    if (isNullable(value)) {
-        return value;
-    }
-
-    const convertRecord = (source) => {
-        const converted = {};
+function convertBigIntRecord(source) {
+    const converted = {};
 
-        for (const [key, item] of Object.entries(source)) {
-            let nextValue = item;
+    for (const [key, item] of Object.entries(source)) {
+        let nextValue = item;
 
-            if (typeof item === "bigint") {
-                const convertedNumber = canConvertToNumber(item);
-                if (convertedNumber !== null) {
-                    nextValue = convertedNumber;
-                } else {
-                    nextValue = String(item);
-                }
+        if (typeof item === "bigint") {
+            const convertedNumber = canConvertToNumber(item);
+            if (convertedNumber !== null) {
+                nextValue = convertedNumber;
+            } else {
+                nextValue = String(item);
             }
-
-            converted[key] = nextValue;
         }
 
-        return converted;
-    };
+        converted[key] = nextValue;
+    }
+
+    return converted;
+}
+
+function normalizeBigIntValues(value) {
+    if (isNullable(value)) {
+        return value;
+    }
 
     if (Array.isArray(value)) {
-        return value.map((item) => convertRecord(item));
+        return value.map((item) => convertBigIntRecord(item));
     }
 
     if (typeof value === "object") {
-        return convertRecord(value);
+        return convertBigIntRecord(value);
     }
 
     return value;
@@ -710,7 +710,11 @@ class DbHelper {
         }
 
         if (result.length >= MAX_LIMIT) {
-            Logger.warn(`getAll 达到最大限制 ${MAX_LIMIT}，实际总数 ${total}，只返回前 ${MAX_LIMIT} 条`, { table: options.table, limit: MAX_LIMIT, total: total });
+            Logger.warn(`getAll 达到最大限制 ${MAX_LIMIT}，实际总数 ${total}，只返回前 ${MAX_LIMIT} 条`, {
+                table: options.table,
+                limit: MAX_LIMIT,
+                total: total
+            });
         }
 
         const lists = this.normalizeListData(result);
@@ -862,7 +866,7 @@ class DbHelper {
             processedList.push({ id: item.id, data: userData });
         }
 
-        const fields = Array.from(fieldSet).sort();
+        const fields = Array.from(fieldSet).toSorted();
         if (fields.length === 0) {
             return {
                 data: 0,

package/lib/dbUtil.js

@@ -507,6 +507,12 @@ export function processJoinOrderBy(orderBy) {
     return normalizeOrderBy(orderBy, processJoinField);
 }
 
+function replaceJoinOnSegment(segment) {
+    return segment.replace(/([a-zA-Z_][a-zA-Z0-9_]*)(\s*\.\s*)([a-zA-Z_][a-zA-Z0-9_]*)/g, (_match, left, dot, right) => {
+        return `${snakeCase(left)}${dot}${snakeCase(right)}`;
+    });
+}
+
 export function processJoinOn(on) {
     if (!isString(on)) {
         return String(on);
@@ -517,12 +523,6 @@ export function processJoinOn(on) {
         return raw;
     }
 
-    const replaceSegment = (segment) => {
-        return segment.replace(/([a-zA-Z_][a-zA-Z0-9_]*)(\s*\.\s*)([a-zA-Z_][a-zA-Z0-9_]*)/g, (_match, left, dot, right) => {
-            return `${snakeCase(left)}${dot}${snakeCase(right)}`;
-        });
-    };
-
     let result = "";
     let buffer = "";
     let quote = null;
@@ -540,7 +540,7 @@ export function processJoinOn(on) {
 
         if (ch === "'" || ch === '"' || ch === "`") {
             if (buffer.length > 0) {
-                result += replaceSegment(buffer);
+                result += replaceJoinOnSegment(buffer);
                 buffer = "";
             }
             quote = ch;
@@ -554,7 +554,7 @@ export function processJoinOn(on) {
     }
 
     if (buffer.length > 0) {
-        result += replaceSegment(buffer);
+        result += replaceJoinOnSegment(buffer);
     }
 
     return result;

package/lib/logger.js

@@ -7,8 +7,8 @@ import { stat } from "node:fs/promises";
 import { join as nodePathJoin, resolve as nodePathResolve } from "node:path";
 
 import { formatYmdHms } from "../utils/datetime.js";
-import { buildSensitiveKeyMatcher, sanitizeLogObject } from "../utils/loggerUtils.js";
 import { isFiniteNumber, isNumber, isPlainObject, isString } from "../utils/is.js";
+import { buildSensitiveKeyMatcher, sanitizeLogObject } from "../utils/loggerUtils.js";
 import { normalizePositiveInt } from "../utils/util.js";
 
 // 注意：Logger 可能在运行时/测试中被 process.chdir() 影响。

package/lib/sqlBuilder.js

@@ -3,8 +3,8 @@
  * 提供链式 API 构建 SQL 查询
  */
 
-import { escapeField, escapeTable, resolveQuoteIdent } from "./dbUtil.js";
 import { isNonEmptyString } from "../utils/is.js";
+import { escapeField, escapeTable, resolveQuoteIdent } from "./dbUtil.js";
 
 /**
  * SQL 构建器类

package/lib/validator.js

@@ -3,10 +3,10 @@
  * 纯静态类设计，简洁易用
  */
 
-import RegexAliases from "../configs/regexpAlias.json";
 import { FIELD_RULE_DEFAULT_MAX, FIELD_RULE_DEFAULT_MIN, FIELD_RULE_INPUT_TYPES } from "../configs/constConfig.js";
-import { getCompiledRegex } from "../utils/regexpUtil.js";
+import RegexAliases from "../configs/regexpAlias.json";
 import { isFiniteNumber, isIntegerNumber, isJsonObject, isJsonPrimitive, isJsonStructure, isNullable, isNumber, isPlainObject, isRegexInput, isString } from "../utils/is.js";
+import { getCompiledRegex } from "../utils/regexpUtil.js";
 
 const INPUT_TYPE_SET = new Set(FIELD_RULE_INPUT_TYPES);
 const RULE_ALLOWED_KEYS = new Set(["input", "check", "name", "min", "max", "detail"]);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly",
-    "version": "3.24.8",
+    "version": "3.24.10",
     "gitHead": "49c39d36695036e85fc64083cc43c1652fff96cb",
     "private": false,
     "description": "Befly - 为 Bun 专属打造的 JavaScript API 接口框架核心引擎",

package/plugins/email.js

@@ -3,9 +3,10 @@
  * 提供邮件发送功能，支持 SMTP 配置
  */
 
-import { Logger } from "../lib/logger.js";
 import nodemailer from "nodemailer";
 
+import { Logger } from "../lib/logger.js";
+
 export default {
     order: 7,
     async handler(befly) {

package/scripts/syncDb/context.js

@@ -7,6 +7,7 @@ import { Logger } from "#root/lib/logger.js";
 import { importDefault } from "#root/utils/importDefault.js";
 import { isNonEmptyString, isPlainObject } from "#root/utils/is.js";
 import { camelCase } from "#root/utils/util.js";
+
 import { buildSyncDbDiff, groupSyncDbColumns } from "./diff.js";
 import { printSyncDbProcessLog } from "./report.js";
 
@@ -65,7 +66,7 @@ export async function prepareSyncDbBaseContext(mysqlConfig) {
         }
     }
     if (skippedBeflyTables.size > 0) {
-        const skippedTables = Array.from(skippedBeflyTables).sort((left, right) => left.localeCompare(right));
+        const skippedTables = Array.from(skippedBeflyTables).toSorted((left, right) => left.localeCompare(right));
         Logger.info("已跳过 befly_ 前缀表，不参与对比", {
             skippedTableCount: skippedBeflyTables.size,
             skippedTables: skippedTables

package/scripts/syncDb/diff.js

@@ -2,6 +2,7 @@ import { join } from "node:path";
 
 import { isNonEmptyString, isPlainObject } from "#root/utils/is.js";
 import { camelCase, snakeCase } from "#root/utils/util.js";
+
 import { printSyncDbProcessLog } from "./report.js";
 import { toSyncDbFieldDef } from "./transform.js";
 

package/scripts/syncDb/index.js

@@ -2,8 +2,9 @@ import { join, resolve } from "node:path";
 
 import { Connect } from "#root/lib/connect.js";
 import { Logger } from "#root/lib/logger.js";
-import { applySyncDbDiff } from "./diff.js";
+
 import { prepareSyncDbBaseContext } from "./context.js";
+import { applySyncDbDiff } from "./diff.js";
 import { printSyncDbDiffSummary, printSyncDbProcessLog, writeSyncDbReport } from "./report.js";
 
 export async function syncDb(mysqlConfig) {

package/scripts/syncDb/report.js

@@ -4,6 +4,7 @@ import { dirname } from "node:path";
 import { Logger } from "#root/lib/logger.js";
 import { isNonEmptyString } from "#root/utils/is.js";
 import { camelCase } from "#root/utils/util.js";
+
 import { toSyncDbFieldDef } from "./transform.js";
 
 export function printSyncDbProcessLog(message) {

package/utils/fieldClear.js

@@ -13,7 +13,7 @@ export function fieldClear(data, options = {}) {
     const { pickKeys, omitKeys, keepValues, excludeValues, keepMap } = options;
 
     const filterObj = (obj) => {
-        let result = {};
+        const result = {};
         let keys = Object.keys(obj);
         if (pickKeys && pickKeys.length) {
             keys = keys.filter((k) => pickKeys.includes(k));

package/utils/regexpUtil.js

@@ -1,5 +1,5 @@
-import { isMinLengthString } from "./is.js";
 import RegexAliases from "../configs/regexpAlias.json";
+import { isMinLengthString } from "./is.js";
 
 const regexCache = new Map();