befly 3.76.7 → 3.77.1

package/libs/validator/parser.js

@@ -5,7 +5,7 @@ function addIssue(issues, path, code, message) {
 }
 
 function typeMessage(kind) {
-    if (kind === "boolean") return "必须是 boolean";
+    if (kind === "boolean") return "必须是布尔值";
     if (kind === "integer") return "必须是安全整数";
     if (kind === "number") return "必须是有限数字";
     if (kind === "string") return "必须是字符串";
@@ -44,11 +44,13 @@ export function parseNode(value, node, path, useDefault = true) {
     if (value === null) return failure([{ path: path, code: "null", message: "不允许为 null" }]);
 
     if (node.kind === "anyOf") {
+        const branchMessages = [];
         for (const branch of node.branches) {
             const result = parseNode(value, branch, path);
             if (result.ok) return result;
+            branchMessages.push(result.issues[0]?.message || typeMessage(branch.kind));
         }
-        return failure([{ path: path, code: "anyOf", message: "不符合任一允许类型" }]);
+        return failure([{ path: path, code: "anyOf", message: `不符合任一允许类型：${branchMessages.join("；")}` }]);
     }
 
     if (node.kind === "any") return success(value);
@@ -79,8 +81,9 @@ export function parseNode(value, node, path, useDefault = true) {
     }
 
     if (node.kind === "array") {
-        if (node.minItem !== undefined && value.length < node.minItem) addIssue(issues, path, "minItem", `至少需要${node.minItem}项`);
-        if (node.maxItem !== undefined && value.length > node.maxItem) addIssue(issues, path, "maxItem", `最多允许${node.maxItem}项`);
+        // 数量违规提前返回，避免后续对超大数组的遍历与拷贝
+        if (node.minItem !== undefined && value.length < node.minItem) return failure([{ path: path, code: "minItem", message: `至少需要${node.minItem}项` }]);
+        if (node.maxItem !== undefined && value.length > node.maxItem) return failure([{ path: path, code: "maxItem", message: `最多允许${node.maxItem}项` }]);
         if (node.unique && new Set(value).size !== value.length) addIssue(issues, path, "unique", "数组项不能重复");
         if (node.uniqueBy) {
             const seen = new Set();
@@ -97,7 +100,10 @@ export function parseNode(value, node, path, useDefault = true) {
                 if (result.ok) data.push(result.data);
                 else issues.push(...result.issues);
             });
-        } else data.push(...value);
+        } else {
+            // 逐项拷贝而非 spread，避免超大数组触发调用栈溢出
+            for (const item of value) data.push(item);
+        }
         return issues.length > 0 ? failure(issues) : success(data);
     }
 

package/libs/validator/util.js

@@ -1,5 +1 @@
-export function isPlainObject(value) {
-    if (!value || typeof value !== "object" || Array.isArray(value)) return false;
-    const prototype = Object.getPrototypeOf(value);
-    return prototype === Object.prototype || prototype === null;
-}
+export { isPlainObject } from "../../utils/is.js";

package/package.json

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

package/paths.js

@@ -10,7 +10,8 @@
  *
  */
 
-import { basename, dirname, isAbsolute, join, resolve } from "node:path";
+import { existsSync } from "node:fs";
+import { dirname, isAbsolute, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
 // 当前文件的路径信息
@@ -25,12 +26,6 @@ const moduleDir = dirname(moduleFilePath);
  */
 export const coreDir = moduleDir;
 
-/**
- * Core 框架 dist 目录
- * @description 源码态为 packages/core/dist；dist 运行态为 packages/core/dist
- */
-export const coreDistDir = basename(moduleDir) === "dist" ? moduleDir : join(moduleDir, "dist");
-
 /**
  * Core 框架检查目录
  * @description packages/core/checks/
@@ -75,12 +70,30 @@ export const coreTableDir = join(moduleDir, "tables");
 
 // ==================== 用户项目路径 ====================
 
+/**
+ * 定位项目根目录：从 cwd 逐级向上查找 bm2.toml（项目根标识文件）。
+ * 找不到时回退 cwd——此时项目源码目录（apis/tables 等）将扫描不到，
+ * 由 scanSources 在启动期对"app 源码目录全部缺失"的场景统一告警。
+ */
+function findAppRoot() {
+    let dir = process.cwd();
+    for (;;) {
+        if (existsSync(join(dir, "bm2.toml"))) {
+            return dir;
+        }
+        const parent = dirname(dir);
+        if (parent === dir) {
+            return process.cwd();
+        }
+        dir = parent;
+    }
+}
+
 /**
  * 项目根目录
- * @description process.cwd()
- * @usage 用户项目的根目录
+ * @description 含 bm2.toml 的目录
  */
-export const appDir = process.cwd();
+export const appDir = findAppRoot();
 
 /**
  * 项目检查目录

package/router/static.js

@@ -62,14 +62,21 @@ export function staticHandler(corsConfig, uploadConfig) {
 
             const file = Bun.file(filePath);
             if (await file.exists()) {
-                const headers = {};
-                if (corsHeaders && typeof corsHeaders === "object") {
-                    for (const key of Object.keys(corsHeaders)) {
-                        headers[key] = corsHeaders[key];
-                    }
-                }
+                const headers = { ...corsHeaders };
                 headers["Content-Type"] = file.type || "application/octet-stream";
                 headers["X-Content-Type-Options"] = "nosniff";
+
+                // ETag 协商缓存：命中 If-None-Match 直接返回 304，避免重复传输文件体
+                const etag = `"${file.size}-${file.lastModified}"`;
+                headers["ETag"] = etag;
+                headers["Cache-Control"] = "public, max-age=86400";
+                if (req.headers.get("if-none-match") === etag) {
+                    return new Response(null, {
+                        status: 304,
+                        headers: headers
+                    });
+                }
+
                 if (uploadConfig.forceDownloadExtensions.split(",").includes(extname(filePath).toLowerCase())) {
                     headers["Content-Disposition"] = `attachment; filename="${basename(filePath).replaceAll('"', "")}"`;
                 }

package/schemas/api.json

@@ -19,6 +19,12 @@
                 "paramType": "string",
                 "minValue": 1
             },
+            "parentTitle": {
+                "paramType": "string",
+                "minValue": 0,
+                "maxValue": 500,
+                "optional": true
+            },
             "apiPath": {
                 "paramType": "string",
                 "minValue": 1,
@@ -52,6 +58,10 @@
                             "paramType": "string",
                             "minValue": 1
                         }
+                    },
+                    {
+                        "paramType": "string",
+                        "enum": ["dev"]
                     }
                 ]
             },

package/schemas/config.json

@@ -78,6 +78,24 @@
                     "items": {
                         "paramType": "string"
                     }
+                },
+                "truncateStringLength": {
+                    "paramType": "integer",
+                    "minValue": 32,
+                    "maxValue": 65536,
+                    "optional": true
+                },
+                "truncateArrayLength": {
+                    "paramType": "integer",
+                    "minValue": 1,
+                    "maxValue": 1000,
+                    "optional": true
+                },
+                "truncatePreviewLength": {
+                    "paramType": "integer",
+                    "minValue": 32,
+                    "maxValue": 65536,
+                    "optional": true
                 }
             }
         },
@@ -248,6 +266,26 @@
                     "items": {
                         "paramType": "string"
                     }
+                },
+                "rules": {
+                    "paramType": "array",
+                    "items": {
+                        "paramType": "object",
+                        "fields": {
+                            "path": {
+                                "paramType": "string",
+                                "minValue": 1
+                            },
+                            "limit": {
+                                "paramType": "integer",
+                                "minValue": 1
+                            },
+                            "window": {
+                                "paramType": "integer",
+                                "minValue": 1
+                            }
+                        }
+                    }
                 }
             }
         }

package/sync/api.js

@@ -1,6 +1,13 @@
 import { BEFLY_API_TABLE } from "../configs/constConfig.js";
 import { buildPathSyncLists, serializeAuth } from "./syncUtil.js";
 
+// insBatch 单批上限 1000 行，超出分批写入
+async function insBatchChunked(mysql, table, list) {
+    for (let start = 0; start < list.length; start += 1000) {
+        await mysql.insBatch(table, list.slice(start, start + 1000));
+    }
+}
+
 const getApiParentPath = (apiPath) => {
     const segments = apiPath
         .split("/")
@@ -19,7 +26,7 @@ const getApiParentPath = (apiPath) => {
 export async function syncApi(ctx, apis) {
     const allDbApis = await ctx.mysql.getAll({
         table: BEFLY_API_TABLE,
-        fields: ["id", "path", "parentPath", "name", "auth", "state"],
+        fields: ["id", "path", "parentPath", "parentTitle", "name", "method", "auth", "category", "state"],
         where: { state$gte: 0 }
     });
 
@@ -30,7 +37,9 @@ export async function syncApi(ctx, apis) {
             path: api.apiPath,
             method: api.method,
             parentPath: getApiParentPath(api.apiPath),
-            auth: serializeAuth(api.auth)
+            parentTitle: api.parentTitle || "",
+            auth: serializeAuth(api.auth),
+            category: api.category || "other"
         });
     }
 
@@ -42,14 +51,18 @@ export async function syncApi(ctx, apis) {
             path: def.path,
             method: def.method,
             parentPath: def.parentPath,
-            auth: def.auth
+            parentTitle: def.parentTitle,
+            auth: def.auth,
+            category: def.category
         }),
         (def) => ({
             name: def.name,
             path: def.path,
             method: def.method,
             parentPath: def.parentPath,
-            auth: def.auth
+            parentTitle: def.parentTitle,
+            auth: def.auth,
+            category: def.category
         })
     );
 
@@ -57,9 +70,7 @@ export async function syncApi(ctx, apis) {
         await ctx.mysql.updBatch(BEFLY_API_TABLE, syncLists.updList);
     }
 
-    if (syncLists.insList.length > 0) {
-        await ctx.mysql.insBatch(BEFLY_API_TABLE, syncLists.insList);
-    }
+    await insBatchChunked(ctx.mysql, BEFLY_API_TABLE, syncLists.insList);
 
     if (syncLists.delIds.length > 0) {
         await ctx.mysql.delForceBatch(BEFLY_API_TABLE, syncLists.delIds);

package/sync/dev.js

@@ -38,6 +38,12 @@ export async function syncDev(ctx) {
             where: { username: "dev", state$gte: 0 }
         });
 
+        const adminAccount = await ctx.mysql.getOne({
+            table: BEFLY_ADMIN_TABLE,
+            fields: ["id"],
+            where: { username: "admin", state$gte: 0 }
+        });
+
         const menuPaths = [];
         for (const item of allMenus.data.lists) {
             menuPaths.push(item.path);
@@ -72,7 +78,6 @@ export async function syncDev(ctx) {
 
         // devPassword 为必填项（校验见函数开头），此处直接使用
         const password = await hashPassword(ctx.config.devPassword);
-        // 【临时诊断】hashPassword 后连接预检
 
         const devAdminData = {
             nickname: "开发者",
@@ -92,7 +97,24 @@ export async function syncDev(ctx) {
         } else {
             await ctx.mysql.insData({
                 table: BEFLY_ADMIN_TABLE,
-                data: { ...devAdminData, state: 1 }
+                data: devAdminData
+            });
+        }
+
+        // admin 管理员账号：仅首次创建，已存在则不覆盖（密码与资料以库内为准，改密后重启不受影响）
+        // 初始密码为固定默认值 admin123456，首次登录后应立即修改
+        if (!isNumber(adminAccount.data.id)) {
+            await ctx.mysql.insData({
+                table: BEFLY_ADMIN_TABLE,
+                data: {
+                    nickname: "管理员",
+                    email: "admin@qq.com",
+                    username: "admin",
+                    password: await hashPassword("admin123456"),
+                    roleCode: "admin",
+                    roleType: "admin",
+                    state: 1
+                }
             });
         }
 
@@ -141,6 +163,8 @@ export async function syncDev(ctx) {
 
             const mergedApis = [];
             const mergedApiSet = new Set();
+            // 仅保留当前仍存在的接口路径，已删除/改名的旧 path 不再永久残留
+            const validApiSet = new Set(allApis.data.lists.map((api) => api.path));
 
             if (Array.isArray(existingRole.data?.apis)) {
                 for (const apiPath of existingRole.data.apis) {
@@ -148,7 +172,7 @@ export async function syncDev(ctx) {
                         continue;
                     }
                     const value = apiPath.trim();
-                    if (value.length === 0 || mergedApiSet.has(value)) {
+                    if (value.length === 0 || !validApiSet.has(value) || mergedApiSet.has(value)) {
                         continue;
                     }
                     mergedApiSet.add(value);

package/sync/menu.js

@@ -40,7 +40,7 @@ export function flattenMenusToDefMap(menus) {
 export async function syncMenu(ctx, menus) {
     const menuDefMap = flattenMenusToDefMap(menus);
 
-    // 2) 批量同步（事务内）：按 path diff 执行批量 insert/update/delete
+    // 2) 批量同步：按 path diff 执行批量 insert/update/delete（幂等收敛，非原子事务）
     // 读取全部菜单
     const allExistingMenus = await ctx.mysql.getAll({
         table: BEFLY_MENU_TABLE,
@@ -69,8 +69,8 @@ export async function syncMenu(ctx, menus) {
         await ctx.mysql.updBatch(BEFLY_MENU_TABLE, syncLists.updList);
     }
 
-    if (syncLists.insList.length > 0) {
-        await ctx.mysql.insBatch(BEFLY_MENU_TABLE, syncLists.insList);
+    for (let start = 0; start < syncLists.insList.length; start += 1000) {
+        await ctx.mysql.insBatch(BEFLY_MENU_TABLE, syncLists.insList.slice(start, start + 1000));
     }
 
     // 3) 删除差集（DB - 配置）

package/sync/syncUtil.js

@@ -1,9 +1,10 @@
 // 接口 auth 的存储协议（serializeAuth 与 authAllowsRole 配套使用）：
 // - true -> 1（需登录）
 // - false -> 0（免登录）
+// - "dev" -> "dev"（超级管理员专属：管理员表中 roleCode 为 dev/admin 的账号，不参与角色授权）
 // - string[] -> "a,b,c"（角色类型白名单，如 admin/user）
 export function serializeAuth(auth) {
-    return auth === false ? 0 : Array.isArray(auth) ? auth.join(",") : 1;
+    return auth === false ? 0 : auth === "dev" ? "dev" : Array.isArray(auth) ? auth.join(",") : 1;
 }
 
 /**
@@ -17,6 +18,10 @@ export function authAllowsRole(auth, roleCode) {
     return false;
 }
 
+function isSameRecord(data, existing) {
+    return Object.entries(data).every(([key, value]) => existing[key] === value);
+}
+
 export function buildPathSyncLists(existingList, defList, buildUpdateData, buildInsertData) {
     const existingMap = new Map();
     const delIdSet = new Set();
@@ -24,8 +29,9 @@ export function buildPathSyncLists(existingList, defList, buildUpdateData, build
     for (const record of existingList) {
         if (!existingMap.has(record.path)) {
             existingMap.set(record.path, record);
-            delIdSet.add(record.id);
         }
+        // 全部行先进删除集，命中配置的再移出；同 path 重复行（历史并发同步产物）因此按孤儿清理
+        delIdSet.add(record.id);
     }
 
     const updList = [];
@@ -36,10 +42,10 @@ export function buildPathSyncLists(existingList, defList, buildUpdateData, build
 
         if (existing) {
             delIdSet.delete(existing.id);
-            updList.push({
-                id: existing.id,
-                data: buildUpdateData(def, existing)
-            });
+            const data = buildUpdateData(def, existing);
+            if (!isSameRecord(data, existing)) {
+                updList.push({ id: existing.id, data: data });
+            }
             continue;
         }
 

package/tables/api.json

@@ -1,5 +1,8 @@
 {
     "$tableName": "接口表",
+    "$tableIndexes": {
+        "uk_befly_api_path": "unique#path"
+    },
     "name": {
         "name": "接口名称",
         "minValue": 2,
@@ -17,6 +20,15 @@
         "fieldType": "varchar",
         "fieldDefault": ""
     },
+    "category": {
+        "name": "接口分类",
+        "detail": "select=查询类，other=其他",
+        "minValue": 1,
+        "maxValue": 50,
+        "paramType": "string",
+        "fieldType": "varchar",
+        "fieldDefault": "other"
+    },
     "method": {
         "name": "请求方式",
         "minValue": 1,
@@ -40,5 +52,14 @@
         "paramType": "string",
         "fieldType": "varchar",
         "fieldDefault": ""
+    },
+    "parentTitle": {
+        "name": "目录标题",
+        "detail": "目录标题路径：每级有 _meta.js 标题用标题，没有用目录名",
+        "minValue": 0,
+        "maxValue": 100,
+        "paramType": "string",
+        "fieldType": "varchar",
+        "fieldDefault": ""
     }
 }

package/tables/emailLog.json

@@ -48,14 +48,18 @@
         "maxValue": 500,
         "paramType": "string",
         "fieldType": "varchar",
-        "fieldDefault": ""
+        "fieldDefault": "",
+        "pattern": "^(|[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}([;,][a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,})*)$",
+        "minValue": 0
     },
     "bccEmail": {
         "name": "密送邮箱",
         "maxValue": 500,
         "paramType": "string",
         "fieldType": "varchar",
-        "fieldDefault": ""
+        "fieldDefault": "",
+        "pattern": "^(|[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}([;,][a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,})*)$",
+        "minValue": 0
     },
     "sendTime": {
         "name": "发送时间",

package/tables/menu.json

@@ -1,5 +1,8 @@
 {
     "$tableName": "菜单表",
+    "$tableIndexes": {
+        "uk_befly_menu_path": "unique#path"
+    },
     "name": {
         "name": "菜单名称",
         "minValue": 2,

package/utils/is.js

@@ -28,3 +28,10 @@ export function isPrimaryProcess() {
     const instance = Bun.env.BM2_APP_INSTANCE;
     return instance === "0" || instance === 0 || instance === undefined;
 }
+
+// 超级管理员判定（auth: "dev" 接口的准入口径）：
+// 必须是管理员表账号（roleType=admin）且角色代号为 dev 或 admin；
+// 用户表账号 roleType 固定为 user，即使 roleCode=admin 也不具备超管接口权限
+export function isSuperAdminContext(ctx) {
+    return ctx?.roleType === "admin" && (ctx?.roleCode === "dev" || ctx?.roleCode === "admin");
+}

package/utils/prettyError.js

@@ -0,0 +1,102 @@
+import { relative } from "node:path";
+
+// 摘要中每组错误最多列出的文件数，其余以计数收尾（完整清单在日志里）
+const MAX_FILES_PER_GROUP = 3;
+
+// 高频错误的修复提示（按内容模式匹配，只保留最有价值的少数几条）
+const HINT_RULES = [
+    {
+        match: (text) => text.includes("不允许出现"),
+        hint: "疑似新增字段未在对应 schema 中声明"
+    },
+    {
+        match: (text) => text.includes("必须是") || text.includes("必填"),
+        hint: "检查对应字段的类型与取值是否符合 schema 声明"
+    }
+];
+
+function shortPath(file) {
+    const text = String(file || "");
+    if (!text) return "(未知来源)";
+    const related = relative(process.cwd(), text);
+    return (related.length < text.length ? related : text).replaceAll("\\", "/");
+}
+
+// 兼容字符串化的错误项（经 sanitize 深度降级后会变成 JSON 字符串）
+function toErrorItems(errors) {
+    if (!Array.isArray(errors)) return [];
+    return errors.map((item) => {
+        if (item && typeof item === "object") return item;
+        if (typeof item === "string" && item.startsWith("{")) {
+            try {
+                return JSON.parse(item);
+            } catch {
+                return { expected: item };
+            }
+        }
+        return { expected: String(item) };
+    });
+}
+
+function collectHints(texts) {
+    const hints = [];
+    for (const rule of HINT_RULES) {
+        if (hints.length >= 2) break;
+        if (texts.some((text) => rule.match(text)) && !hints.includes(rule.hint)) {
+            hints.push(rule.hint);
+        }
+    }
+    return hints;
+}
+
+/**
+ * 将结构化错误（含 checkAll 的 errors 分组）格式化为人类可读的多行摘要。
+ * 用于启动失败等关键错误的终端输出；日志仍记录完整结构化信息。
+ */
+export function formatErrorSummary(error, options = {}) {
+    const title = options.title || "启动失败";
+    const lines = [`✗ ${title}：${error?.message || error}`];
+
+    const groups = Array.isArray(error?.errors) ? error.errors : [];
+    const allTexts = [];
+    for (const group of groups) {
+        const items = toErrorItems(group?.errors ?? group);
+        if (items.length === 0) continue;
+
+        // 按原因聚合：同因错误合并，文件清单截断展示
+        const byReason = new Map();
+        for (const item of items) {
+            const reason = item.expected || item.message || "(无原因)";
+            if (!byReason.has(reason)) byReason.set(reason, []);
+            byReason.get(reason).push(shortPath(item.file));
+        }
+        allTexts.push(...byReason.keys());
+
+        lines.push("");
+        lines.push(`[${group?.check || "错误"}] 共 ${items.length} 处：`);
+        for (const [reason, files] of byReason) {
+            lines.push(`  ${reason}`);
+            const shown = files.slice(0, MAX_FILES_PER_GROUP);
+            for (const file of shown) {
+                lines.push(`    ${file}`);
+            }
+            if (files.length > shown.length) {
+                lines.push(`    … 其余 ${files.length - shown.length} 个`);
+            }
+        }
+    }
+
+    const hints = collectHints(allTexts);
+    if (hints.length > 0) {
+        lines.push("");
+        for (const hint of hints) {
+            lines.push(`提示：${hint}`);
+        }
+    }
+
+    return lines.join("\n");
+}
+
+export function printErrorSummary(error, options = {}) {
+    Bun.stderr.write(`${formatErrorSummary(error, options)}\n`);
+}