befly 3.76.1 → 3.76.2

package/tables/menu.json

@@ -1,47 +1,33 @@
-{
-    "id": {
-        "name": "ID",
-        "input": "integer",
-        "min": 1,
-        "max": null
-    },
+{
+    "$tableName": "菜单表",
     "name": {
         "name": "菜单名称",
-        "input": "string",
-        "min": 2,
-        "max": 50
+        "minValue": 2,
+        "maxValue": 50,
+        "paramType": "string",
+        "fieldType": "varchar",
+        "fieldDefault": ""
     },
     "path": {
         "name": "路由路径",
-        "input": "string",
-        "min": 1,
-        "max": 150
+        "minValue": 1,
+        "maxValue": 150,
+        "paramType": "string",
+        "fieldType": "varchar",
+        "fieldDefault": ""
     },
     "sort": {
         "name": "排序",
-        "input": "number",
-        "max": 9999
+        "maxValue": 9999,
+        "paramType": "integer",
+        "fieldType": "integer",
+        "fieldDefault": 0
     },
     "parentPath": {
         "name": "父级路径",
-        "input": "string",
-        "max": 200
-    },
-    "state": {
-        "name": "状态（0=已删除，1=正常，2=禁用）",
-        "input": "enumInteger",
-        "check": "0|1|2"
-    },
-    "createdAt": {
-        "name": "创建时间",
-        "input": "number"
-    },
-    "updatedAt": {
-        "name": "更新时间",
-        "input": "number"
-    },
-    "deletedAt": {
-        "name": "删除时间",
-        "input": "number"
+        "maxValue": 200,
+        "paramType": "string",
+        "fieldType": "varchar",
+        "fieldDefault": ""
     }
 }

package/tables/operateLog.json

@@ -1,91 +1,97 @@
 {
-    "id": {
-        "name": "ID",
-        "input": "integer",
-        "min": 1,
-        "max": null
-    },
+    "$tableName": "操作日志表",
     "adminId": {
         "name": "管理员ID",
-        "input": "number"
+        "paramType": "integer",
+        "fieldType": "integer",
+        "fieldDefault": 0
     },
     "username": {
         "name": "用户名",
-        "input": "string",
-        "min": 1,
-        "max": 50
+        "minValue": 1,
+        "maxValue": 50,
+        "paramType": "string",
+        "fieldType": "varchar",
+        "fieldDefault": ""
     },
     "nickname": {
         "name": "昵称",
-        "input": "string",
-        "max": 50
+        "maxValue": 50,
+        "paramType": "string",
+        "fieldType": "varchar",
+        "fieldDefault": ""
     },
     "ip": {
         "name": "操作IP",
-        "input": "string",
-        "max": 50
+        "maxValue": 50,
+        "paramType": "string",
+        "fieldType": "varchar",
+        "fieldDefault": ""
     },
     "module": {
         "name": "操作模块",
-        "input": "string",
-        "max": 50
+        "maxValue": 50,
+        "paramType": "string",
+        "fieldType": "varchar",
+        "fieldDefault": ""
     },
     "action": {
         "name": "操作类型",
-        "input": "string",
-        "max": 50
+        "maxValue": 50,
+        "paramType": "string",
+        "fieldType": "varchar",
+        "fieldDefault": ""
     },
     "method": {
         "name": "请求方法",
-        "input": "string",
-        "max": 10
+        "maxValue": 10,
+        "paramType": "string",
+        "fieldType": "varchar",
+        "fieldDefault": ""
     },
     "path": {
         "name": "请求路径",
-        "input": "string",
-        "max": 200
+        "maxValue": 200,
+        "paramType": "string",
+        "fieldType": "varchar",
+        "fieldDefault": ""
     },
     "params": {
         "name": "请求参数",
-        "input": "string"
+        "paramType": "string",
+        "fieldType": "text",
+        "fieldNullable": true
     },
     "result": {
         "name": "操作结果",
-        "input": "number",
-        "max": 1
+        "maxValue": 1,
+        "paramType": "integer",
+        "fieldType": "integer",
+        "fieldDefault": 0
     },
     "response": {
         "name": "响应内容",
-        "input": "string"
+        "paramType": "string",
+        "fieldType": "text",
+        "fieldNullable": true
     },
     "duration": {
         "name": "耗时毫秒",
-        "input": "number"
+        "paramType": "integer",
+        "fieldType": "integer",
+        "fieldDefault": 0
     },
     "operateTime": {
         "name": "操作时间",
-        "input": "number"
+        "paramType": "integer",
+        "fieldType": "integer",
+        "fieldDefault": 0
     },
     "remark": {
         "name": "备注",
-        "input": "string",
-        "max": 500
-    },
-    "state": {
-        "name": "状态（0=已删除，1=正常，2=禁用）",
-        "input": "enumInteger",
-        "check": "0|1|2"
-    },
-    "createdAt": {
-        "name": "创建时间",
-        "input": "number"
-    },
-    "updatedAt": {
-        "name": "更新时间",
-        "input": "number"
-    },
-    "deletedAt": {
-        "name": "删除时间",
-        "input": "number"
+        "maxValue": 500,
+        "paramType": "string",
+        "fieldType": "varchar",
+        "fieldDefault": ""
     }
 }

package/tables/project.json

@@ -1,42 +1,30 @@
 {
-    "id": {
-        "name": "ID",
-        "input": "integer",
-        "min": 1,
-        "max": null
+    "$tableName": "项目表",
+    "$tableIndexes": {
+        "uk_befly_project_code": "unique#code",
+        "idx_befly_project_state": "index#state"
     },
     "code": {
         "name": "产品代号",
-        "input": "string",
-        "min": 1,
-        "max": 100
+        "minValue": 1,
+        "maxValue": 100,
+        "paramType": "string",
+        "fieldType": "varchar",
+        "fieldDefault": ""
     },
     "name": {
         "name": "产品名称",
-        "input": "string",
-        "min": 1,
-        "max": 100
+        "minValue": 1,
+        "maxValue": 100,
+        "paramType": "string",
+        "fieldType": "varchar",
+        "fieldDefault": ""
     },
     "sort": {
         "name": "排序",
-        "input": "number",
-        "max": 9999
-    },
-    "state": {
-        "name": "状态（0=已删除，1=正常，2=禁用）",
-        "input": "enumInteger",
-        "check": "0|1|2"
-    },
-    "createdAt": {
-        "name": "创建时间",
-        "input": "number"
-    },
-    "updatedAt": {
-        "name": "更新时间",
-        "input": "number"
-    },
-    "deletedAt": {
-        "name": "删除时间",
-        "input": "number"
+        "maxValue": 9999,
+        "paramType": "integer",
+        "fieldType": "integer",
+        "fieldDefault": 0
     }
 }

package/tables/role.json

@@ -1,56 +1,52 @@
-{
-    "id": {
-        "name": "ID",
-        "input": "integer",
-        "min": 1,
-        "max": null
-    },
+{
+    "$tableName": "角色表",
     "name": {
         "name": "角色名称",
-        "input": "string",
-        "min": 2,
-        "max": 50
+        "minValue": 2,
+        "maxValue": 50,
+        "paramType": "string",
+        "fieldType": "varchar",
+        "fieldDefault": ""
     },
     "code": {
         "name": "角色编码",
-        "input": "regexp",
-        "check": "@alphanumericDash_",
-        "min": 2,
-        "max": 50
+        "minValue": 2,
+        "maxValue": 50,
+        "paramType": "string",
+        "pattern": "^[a-zA-Z0-9_-]+$",
+        "fieldType": "varchar",
+        "fieldDefault": ""
     },
     "description": {
         "name": "角色描述",
-        "input": "string",
-        "max": 200
+        "maxValue": 200,
+        "paramType": "string",
+        "fieldType": "varchar",
+        "fieldDefault": ""
     },
     "menus": {
         "name": "菜单权限",
-        "input": "array"
+        "paramType": "array",
+        "items": {
+            "paramType": "string"
+        },
+        "fieldType": "text",
+        "fieldNullable": true
     },
     "apis": {
         "name": "接口权限",
-        "input": "array"
+        "paramType": "array",
+        "items": {
+            "paramType": "string"
+        },
+        "fieldType": "text",
+        "fieldNullable": true
     },
     "sort": {
         "name": "排序",
-        "input": "number",
-        "max": 9999
-    },
-    "state": {
-        "name": "状态（0=已删除，1=正常，2=禁用）",
-        "input": "enumInteger",
-        "check": "0|1|2"
-    },
-    "createdAt": {
-        "name": "创建时间",
-        "input": "number"
-    },
-    "updatedAt": {
-        "name": "更新时间",
-        "input": "number"
-    },
-    "deletedAt": {
-        "name": "删除时间",
-        "input": "number"
+        "maxValue": 9999,
+        "paramType": "integer",
+        "fieldType": "integer",
+        "fieldDefault": 0
     }
 }

package/utils/cors.js

@@ -1,52 +1,48 @@
+const originMatcherCache = new WeakMap();
+
+function getOriginMatchers(config) {
+    if (originMatcherCache.has(config)) return originMatcherCache.get(config);
+    const matchers = config.origins?.map((pattern) => new Bun.Glob(pattern));
+    originMatcherCache.set(config, matchers);
+    return matchers;
+}
+
+function splitHeaderList(value) {
+    return value
+        .split(",")
+        .map((item) => item.trim())
+        .filter(Boolean);
+}
+
 /**
- * 设置 CORS 响应头
- * @param req - 请求对象
- * @param config - CORS 配置
- * @returns CORS 响应头对象
+ * origins 省略时回显任意 Origin；配置后使用 Bun.Glob 匹配 Origin。
+ * 无 Origin 的 VS Code、小程序、App、服务端请求不受浏览器 CORS 限制。
  */
 export function setCorsOptions(req, config) {
     const origin = req.headers.get("origin");
-    const allowCredentials = config.credentials === true || config.credentials === "true" ? "true" : "false";
-    const requestedHeaders = req.headers.get("Access-Control-Request-Headers") || "";
-
-    const allowedHeaderItems = [];
-    const allowedHeaderMap = Object.create(null);
-
-    const pushHeaderIfNeeded = (rawValue) => {
-        if (typeof rawValue !== "string") {
-            return;
-        }
-
-        const value = rawValue.trim();
-        if (value.length < 1) {
-            return;
-        }
-
-        const key = value.toLowerCase();
-        if (allowedHeaderMap[key]) {
-            return;
-        }
-
-        allowedHeaderMap[key] = 1;
-        allowedHeaderItems.push(value);
-    };
-
-    for (const item of String(config.allowedHeaders || "").split(",")) {
-        pushHeaderIfNeeded(item);
+    if (!origin) return {};
+
+    const originMatchers = getOriginMatchers(config);
+    const unrestricted = originMatchers === undefined;
+    if (!unrestricted && !originMatchers.some((matcher) => matcher.match(origin))) return { Vary: "Origin" };
+
+    const requestedHeaders = splitHeaderList(req.headers.get("access-control-request-headers") || "");
+    let responseHeaders;
+    if (unrestricted) {
+        responseHeaders = requestedHeaders.length > 0 ? requestedHeaders : splitHeaderList(config.allowedHeaders);
+    } else {
+        const allowedHeaders = splitHeaderList(config.allowedHeaders);
+        const allowedHeaderSet = new Set(allowedHeaders.map((item) => item.toLowerCase()));
+        responseHeaders = requestedHeaders.length > 0 ? requestedHeaders.filter((item) => allowedHeaderSet.has(item.toLowerCase())) : allowedHeaders;
     }
 
-    for (const item of String(requestedHeaders).split(",")) {
-        pushHeaderIfNeeded(item);
-    }
-
-    const allowHeaders = allowedHeaderItems.join(", ");
-
     return {
-        ...(origin ? { "Access-Control-Allow-Origin": origin, Vary: "Origin" } : {}),
-        "Access-Control-Allow-Methods": config.methods,
-        "Access-Control-Allow-Headers": allowHeaders,
+        "Access-Control-Allow-Origin": origin,
+        Vary: "Origin",
+        "Access-Control-Allow-Methods": "GET,POST",
+        "Access-Control-Allow-Headers": responseHeaders.join(", "),
         "Access-Control-Expose-Headers": config.exposedHeaders,
         "Access-Control-Max-Age": String(config.maxAge),
-        "Access-Control-Allow-Credentials": allowCredentials
+        ...(config.credentials ? { "Access-Control-Allow-Credentials": "true" } : {})
     };
 }

package/utils/deepMerge.js

@@ -22,7 +22,9 @@ function concat(targetArr, sourceArr, cloneTargetItems) {
         nextArr.push(clone(item));
     }
 
-    return nextArr;
+    const merged = nextArr;
+    if (merged.every((item) => item === null || ["string", "number", "boolean"].includes(typeof item))) return [...new Set(merged)];
+    return merged;
 }
 
 function mergeValue(baseValue, incomingValue) {

package/utils/error.js

@@ -1,64 +1,9 @@
-/**
- * 统一错误工厂
- * 框架错误对象的唯一构造入口，统一字段约定：
- * - code: "validation" | "runtime" | "policy"
- * - subsystem: 子系统标识（sql/cache/redis/sync/config/start/...）
- * - operation: 操作名
- * - 其余字段原样透传（如 table、roleCode、runMode 等）
- * - 不传 cause 时不设置（缺省为 undefined，避免 cause: null 噪音）
- */
 export function createError(message, options = {}) {
     const error = new Error(message, options.cause === undefined ? undefined : { cause: options.cause });
 
-    if (options.code) error.code = options.code;
-    if (options.subsystem) error.subsystem = options.subsystem;
-    if (options.operation) error.operation = options.operation;
-
     for (const [key, value] of Object.entries(options)) {
-        if (key === "cause" || key === "code" || key === "subsystem" || key === "operation") {
-            continue;
-        }
-        error[key] = value;
+        if (key !== "cause") error[key] = value;
     }
 
     return error;
 }
-
-/**
- * 参数校验错误（code: "validation"）
- */
-export function validationError(message) {
-    return createError(message, { code: "validation" });
-}
-
-/**
- * 沿 cause 链取最底层错误（根因）
- */
-export function getRootCause(error) {
-    let current = error;
-    while (current?.cause instanceof Error) {
-        current = current.cause;
-    }
-    return current;
-}
-
-/**
- * 错误链摘要：沿 cause 展开为单行文本，根因在后
- * 每层格式：message [code/subsystem/operation]（无元信息时仅 message）
- * 例：SQL执行失败 [runtime/sql/execute] <- ER_DUP_ENTRY: 重复插入 [runtime]
- */
-export function errorChainSummary(error) {
-    const parts = [];
-    const visited = new Set();
-    let current = error;
-
-    while (current instanceof Error && !visited.has(current)) {
-        visited.add(current);
-        const meta = [current.code, current.subsystem, current.operation].filter(Boolean).join("/");
-        const text = current.message || current.name || "Error";
-        parts.push(meta ? `${text} [${meta}]` : text);
-        current = current.cause;
-    }
-
-    return parts.join(" <- ");
-}

package/utils/id.js

@@ -0,0 +1,44 @@
+function resolveInstanceId(value) {
+    const instanceId = value === undefined || value === "" ? 0 : Number(value);
+    if (!Number.isInteger(instanceId) || instanceId < 0 || instanceId > 9) {
+        throw new TypeError(`BM2_INSTANCE_ID 必须是 0 到 9 的整数，当前值: ${String(value)}`);
+    }
+    return instanceId;
+}
+
+/**
+ * 创建 13 位逻辑毫秒 + 1 位 BM2 实例编号 + 2 位序列的安全整数 ID 生成器。
+ */
+export function createIdGenerator(options = {}) {
+    const instanceId = resolveInstanceId(options.instanceId ?? Bun.env.BM2_INSTANCE_ID);
+    const now = options.now || Date.now;
+    let lastTimestamp = 0;
+    let sequence = 0;
+
+    return function generateId() {
+        const currentTimestamp = now();
+        if (!Number.isInteger(currentTimestamp) || currentTimestamp <= 0) {
+            throw new TypeError(`当前时间戳必须是正整数，当前值: ${String(currentTimestamp)}`);
+        }
+
+        if (currentTimestamp > lastTimestamp) {
+            lastTimestamp = currentTimestamp;
+            sequence = 0;
+        } else {
+            sequence += 1;
+            if (sequence > 99) {
+                lastTimestamp += 1;
+                sequence = 0;
+            }
+        }
+
+        const id = lastTimestamp * 1000 + instanceId * 100 + sequence;
+        if (!Number.isSafeInteger(id)) throw new RangeError(`生成的 ID 超出 JavaScript 安全整数范围: ${id}`);
+        return id;
+    };
+}
+
+/**
+ * 使用当前 Bun 进程的 BM2_INSTANCE_ID 生成全局唯一的安全整数 ID。
+ */
+export const genId = createIdGenerator();