befly 3.76.6 → 3.77.0

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/scanFiles.js

@@ -24,58 +24,61 @@ export async function scanFiles(dir, source, type, pattern) {
         const glob = new Bun.Glob(pattern);
         if (!existsSync(dir)) return [];
 
-        const results = [];
+        const files = await Array.fromAsync(
+            glob.scan({
+                cwd: dir,
+                onlyFiles: true,
+                absolute: true,
+                followSymlinks: true
+            })
+        );
 
-        const files = await glob.scan({
-            cwd: dir,
-            onlyFiles: true,
-            absolute: true,
-            followSymlinks: true
-        });
+        // 并行导入源文件，Promise.all 保持与扫描顺序一致的结果顺序
+        const results = await Promise.all(
+            files.map(async (file) => {
+                const filePath = normalize(file);
+                const parsedFile = parse(filePath);
 
-        for await (const file of files) {
-            const filePath = normalize(file);
-            const parsedFile = parse(filePath);
+                // 获取文件名（去除扩展名）
+                const fileName = parsedFile.name;
 
-            // 获取文件名（去除扩展名）
-            const fileName = parsedFile.name;
+                // 计算相对路径（去除扩展名）
+                const parsedRelativePath = parse(relative(dir, filePath));
+                const relativePath = (parsedRelativePath.dir ? join(parsedRelativePath.dir, parsedRelativePath.name) : parsedRelativePath.name).replaceAll("\\", "/");
 
-            // 计算相对路径（去除扩展名）
-            const parsedRelativePath = parse(relative(dir, filePath));
-            const relativePath = (parsedRelativePath.dir ? join(parsedRelativePath.dir, parsedRelativePath.name) : parsedRelativePath.name).replaceAll("\\", "/");
+                // 固定默认过滤（不可关闭）：忽略下划线开头的文件/目录
+                if (relativePath.split("/").some((part) => part.startsWith("_"))) return null;
+                const content = await importDefault(filePath, {});
+                const contentObj = isPlainObject(content) ? content : {};
 
-            // 固定默认过滤（不可关闭）：忽略下划线开头的文件/目录
-            if (relativePath.split("/").some((part) => part.startsWith("_"))) continue;
-            const content = await importDefault(filePath, {});
-            const contentObj = isPlainObject(content) ? content : {};
-
-            const base = {
-                source: source,
-                type: type,
-                filePath: filePath,
-                relativePath: relativePath,
-                fileName: fileName,
-                apiPath: source === "core" ? `/api/${source}/${relativePath}` : `/api/${relativePath}`
-            };
-            if (type === "table") {
-                base["fieldsDef"] = contentObj;
-            }
-            if (type === "api") {
-                base["name"] = "";
-            }
-            if (type !== "table") {
-                for (const [key, value] of Object.entries(contentObj)) {
-                    if (base[key]) continue;
-                    base[key] = value;
+                const base = {
+                    source: source,
+                    type: type,
+                    filePath: filePath,
+                    relativePath: relativePath,
+                    fileName: fileName,
+                    apiPath: source === "core" ? `/api/${source}/${relativePath}` : `/api/${relativePath}`
+                };
+                if (type === "table") {
+                    base["fieldsDef"] = contentObj;
+                }
+                if (type === "api") {
+                    base["name"] = "";
+                }
+                if (type !== "table") {
+                    for (const [key, value] of Object.entries(contentObj)) {
+                        if (base[key]) continue;
+                        base[key] = value;
+                    }
+                }
+                if (type === "api") {
+                    base.category ||= "other";
+                    if (base.category === "select") base.fields = { ...selectFields, ...base.fields };
                 }
-            }
-            if (type === "api") {
-                base.category ||= "other";
-                if (base.category === "select") base.fields = { ...selectFields, ...base.fields };
-            }
-            results.push(base);
-        }
-        return results;
+                return base;
+            })
+        );
+        return results.filter((item) => item !== null);
     } catch (error) {
         throw createError(`扫描失败: source=${source} type=${type} dir=${dir} pattern=${pattern}`, { cause: error, code: "runtime" });
     }

package/utils/scanSources.js

@@ -1,3 +1,6 @@
+import { existsSync } from "node:fs";
+
+import { Logger } from "../libs/logger/index.js";
 import { buildTableModel } from "../libs/tableModel.js";
 import {
     //
@@ -15,6 +18,18 @@ import {
 import { createError } from "./error.js";
 import { scanFiles } from "./scanFiles.js";
 
+function warnWhenAppSourcesMissing() {
+    // 全部 app 源码目录都不存在时显式告警，避免"项目源码静默消失、以纯 core 形态运行"的配置事故
+    const appDirs = [appApiDir, appTableDir, appPluginDir, appHookDir, appCornDir];
+    if (appDirs.every((dir) => !existsSync(dir))) {
+        Logger.warn("项目源码目录（apis/tables/plugins/hooks/corns）均不存在，请检查启动目录是否为项目根目录", {
+            subsystem: "scan",
+            operation: "scanSources",
+            appDir: appDirs[0]
+        });
+    }
+}
+
 export function assertUnique(items, key, label) {
     const values = new Map();
     for (const item of items) {
@@ -72,6 +87,8 @@ export const scanSources = async ({ beflyMode = "auto" } = {}) => {
     const tables = await scanTables({ beflyMode: beflyMode });
     const corns = [];
 
+    warnWhenAppSourcesMissing();
+
     // 处理插件
     const allCorePlugins = await scanFiles(corePluginDir, "core", "plugin", "*.js");
     for (const item of allCorePlugins) {

package/utils/util.js

@@ -37,7 +37,11 @@ export function getRunMode() {
 }
 
 export function toSessionTtlSeconds(ttlDays) {
-    return ttlDays * 24 * 60 * 60;
+    const parsed = typeof ttlDays === "number" ? ttlDays : Number(String(ttlDays ?? "").trim());
+    if (Number.isFinite(parsed) && parsed > 0) {
+        return Math.floor(parsed * 24 * 60 * 60);
+    }
+    return 7 * 24 * 60 * 60;
 }
 
 export function genShortId() {