befly 3.17.13 → 3.17.15

package/apis/auth/login.js

@@ -2,7 +2,6 @@ import { UAParser } from "ua-parser-js";
 
 import adminTable from "../../tables/admin.json";
 import { toSessionTtlSeconds } from "../../utils/toSessionTtlSeconds.js";
-import { isString } from "../../utils/is.js";
 
 export default {
     name: "管理员登录",

package/checks/table.js

@@ -8,10 +8,8 @@ z.config(z.locales.zhCN());
 
 const lowerCamelRegex = /^_?[a-z][a-z0-9]*(?:[A-Z][a-z0-9]*)*$/;
 const noTrimString = z.string().refine(isNoTrimStringAllowEmpty, "不允许首尾空格");
-const FIELD_NAME_REGEX_SOURCE = "^[\\u4e00-\\u9fa5a-zA-Z0-9_]+$";
 const INPUT_TYPES = ["number", "integer", "string", "char", "array", "array_number", "array_integer", "json", "json_number", "json_integer"];
 
-const fieldNameRegex = new RegExp(FIELD_NAME_REGEX_SOURCE);
 const inputRegexLiteral = /^\/.*?\/[gimsuy]*$/;
 const inputEnumRegex = /^[^/].*\|.*$/;
 const inputAliasRegex = /^@.+$/;

package/hooks/auth.js

@@ -3,7 +3,7 @@ import { toSessionTtlSeconds } from "../utils/toSessionTtlSeconds.js";
 export default {
     deps: [],
     handler: async (befly, ctx) => {
-        const authHeader = ctx.req.headers.get("authorization");
+        const authHeader = ctx.headers.get("authorization");
         const ttlSeconds = toSessionTtlSeconds(befly.config?.session?.expireDays);
 
         if (authHeader && authHeader.startsWith("Bearer ")) {

package/hooks/parser.js

@@ -15,36 +15,25 @@ const xmlParser = new XMLParser();
 export default {
     deps: ["auth"],
     handler: async (befly, ctx) => {
-        if (!ctx.apiPath) {
-            return;
-        }
-
-        // body=raw 模式：跳过解析，保留原始请求供 handler 自行处理
+        // apiBody=raw 模式：跳过解析，保留原始请求供 handler 自行处理
         // 适用于：微信回调、支付回调、webhook 等需要手动解密/验签的场景
-        if (ctx.body === "raw") {
+        if (ctx.apiBody === "raw") {
             ctx.body = {};
             return;
         }
-
+        const queryParams = Object.fromEntries(new URL(ctx.url).searchParams);
+        const contentType = ctx.headers.get("content-type") || "";
         // GET 请求：解析查询参数
-        if (ctx.req.method === "GET") {
-            const url = new URL(ctx.req.url);
-            const params = Object.fromEntries(url.searchParams);
-            ctx.body = params;
-        } else if (ctx.req.method === "POST") {
+        if (ctx.method === "GET") {
+            ctx.body = queryParams;
+        } else if (ctx.method === "POST") {
             // POST 请求：解析请求体
-            const contentType = ctx.req.headers.get("content-type") || "";
-            // 获取 URL 查询参数（POST 请求也可能带参数）
-            const url = new URL(ctx.req.url);
-            const queryParams = Object.fromEntries(url.searchParams);
-
             try {
                 // JSON 格式
                 if (contentType.includes("application/json")) {
                     const body = await ctx.req.json();
                     // 合并 URL 参数和请求体（请求体优先）
-                    const merged = Object.assign({}, queryParams, body);
-                    ctx.body = merged;
+                    ctx.body = Object.assign({}, queryParams, body);
                 } else if (contentType.includes("application/xml") || contentType.includes("text/xml")) {
                     // XML 格式
                     const text = await ctx.req.text();
@@ -53,8 +42,7 @@ export default {
                     const rootKey = Object.keys(parsed)[0];
                     const body = rootKey && typeof parsed[rootKey] === "object" ? parsed[rootKey] : parsed;
                     // 合并 URL 参数和请求体（请求体优先）
-                    const merged = Object.assign({}, queryParams, body);
-                    ctx.body = merged;
+                    ctx.body = Object.assign({}, queryParams, body);
                 } else {
                     // 不支持的 Content-Type
                     ctx.response = ErrorResponse(

package/hooks/permission.js

@@ -1,8 +1,7 @@
 import { CacheKeys } from "../lib/cacheKeys.js";
-import { Logger } from "../lib/logger.js";
 // 相对导入
 import { ErrorResponse } from "../utils/response.js";
-import { isNonEmptyString, isString, isValidPositiveInt } from "../utils/is.js";
+import { isValidPositiveInt } from "../utils/is.js";
 
 /**
  * 权限检查钩子
@@ -16,7 +15,7 @@ export default {
     deps: ["validator"],
     handler: async (befly, ctx) => {
         // 1. 接口无需权限
-        if (ctx.auth === false) {
+        if (ctx.apiAuth === false) {
             return;
         }
 
@@ -31,8 +30,8 @@ export default {
             return;
         }
 
-        // 3.5 auth 为角色类型白名单时，仅做 ctx.roleType 校验
-        if (Array.isArray(ctx.auth) && ctx.auth.includes(ctx.roleType) === false) {
+        // 3.5 apiAuth 为角色类型白名单时，仅做 ctx.roleType 校验
+        if (Array.isArray(ctx.apiAuth) && ctx.apiAuth.includes(ctx.roleType) === false) {
             ctx.response = ErrorResponse(
                 ctx,
                 `无权访问 ${ctx.apiName} 接口`,

package/hooks/validator.js

@@ -15,7 +15,7 @@ export default {
         const rawBody = isPlainObject(ctx.body) ? ctx.body : {};
         const nextBody = {};
 
-        for (const [field] of Object.entries(ctx.fields)) {
+        for (const [field] of Object.entries(ctx.apiFields)) {
             let value = rawBody[field];
 
             if (value === undefined) {
@@ -33,7 +33,7 @@ export default {
         ctx.body = nextBody;
 
         // 验证参数
-        const result = Validator.validate(ctx.body, ctx.fields, ctx.required || []);
+        const result = Validator.validate(ctx.body, ctx.apiFields, ctx.apiRequired);
 
         if (result.code !== 0) {
             ctx.response = ErrorResponse(ctx, result.firstError || "参数验证失败", 1, null, result.fieldErrors, "validator");

package/index.js

@@ -32,7 +32,6 @@ import { calcPerfTime } from "./utils/calcPerfTime.js";
 import { scanSources } from "./utils/scanSources.js";
 import { isPrimaryProcess } from "./utils/is.js";
 import { deepMerge } from "./utils/deepMerge.js";
-import { omit } from "./utils/util.js";
 import { sortModules } from "./utils/sortModules.js";
 
 function prefixMenuPaths(menus, prefix) {

package/lib/connect.js

@@ -87,7 +87,7 @@ export class Connect {
             };
 
             // Called when disconnected from Redis server
-            this.redisClient.onclose = (error) => {
+            this.redisClient.onclose = () => {
                 Logger.warn("Redis 断开连接");
             };
         } catch (error) {

package/lib/dbHelper/dataOps.js

@@ -1,4 +1,4 @@
-import { isNullable, isNumber } from "../../utils/is.js";
+import { isNumber } from "../../utils/is.js";
 import { snakeCase } from "../../utils/util.js";
 import { Logger } from "../logger.js";
 import { SqlBuilder } from "../sqlBuilder/index.js";

package/lib/logger.js

@@ -4,7 +4,7 @@
 
 import { createWriteStream, existsSync, mkdirSync } from "node:fs";
 import { stat } from "node:fs/promises";
-import { isAbsolute as nodePathIsAbsolute, join as nodePathJoin, resolve as nodePathResolve } from "node:path";
+import { join as nodePathJoin, resolve as nodePathResolve } from "node:path";
 
 import { formatYmdHms } from "../utils/formatYmdHms.js";
 import { buildSensitiveKeyMatcher, sanitizeLogObject } from "../utils/loggerUtils.js";
@@ -132,7 +132,7 @@ class LogFileSink {
         this.scheduledTimer = setTimeout(() => {
             // timer 触发时先清空句柄，避免 flush 内再次 schedule 时被认为“已安排”。
             this.scheduledTimer = null;
-            void this.flush();
+            this.flush();
         }, this.flushDelayMs);
     }
 
@@ -220,7 +220,7 @@ class LogFileSink {
             this.stream.on("error", (error) => {
                 safeWriteStderr(`[Logger] file sink error (${this.prefix}): ${error?.message || error}`);
                 this.disabled = true;
-                void this.closeStream();
+                this.closeStream();
             });
         } catch (error) {
             safeWriteStderr(`[Logger] createWriteStream failed (${this.prefix}): ${error?.message || error}`);
@@ -349,7 +349,7 @@ function ensureLogDirExists() {
  */
 export function configure(cfg) {
     // 旧实例可能仍持有文件句柄；这里异步关闭（不阻塞主流程）
-    void shutdown();
+    shutdown();
 
     // 方案B：每次 configure 都从默认配置重新构建（避免继承上一次配置造成测试/运行时污染）
     config = Object.assign(

package/lib/redisHelper.js

@@ -5,7 +5,6 @@
 
 import { Connect } from "./connect.js";
 import { Logger } from "./logger.js";
-import { isFiniteNumber, isNonEmptyString, isString } from "../utils/is.js";
 
 /**
  * Redis 助手类

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "befly",
-    "version": "3.17.13",
-    "gitHead": "1259303ee55a5aa686be914e961dc42767c0136b",
+    "version": "3.17.15",
+    "gitHead": "aa84ccde6c76bc45727464c30d4680c379815110",
     "private": false,
     "description": "Befly - 为 Bun 专属打造的 JavaScript API 接口框架核心引擎",
     "keywords": [

package/router/api.js

@@ -56,6 +56,7 @@ export function apiHandler(apis, hooks, context) {
         const ctx = {
             // 请求的参数
             method: req.method,
+            url: req.url,
             body: {},
             req: req,
             now: now,
@@ -66,13 +67,13 @@ export function apiHandler(apis, hooks, context) {
             // 接口的参数
             apiPath: apiData.apiPath,
             apiName: apiData.name,
-            filePath: apiData.filePath,
-            handler: apiData.handler,
-            method: apiData.method,
-            body: apiData.body,
-            auth: apiData.auth,
-            fields: apiData.fields,
-            required: apiData.required
+            apiMethod: apiData.method,
+            apiBody: apiData.body,
+            apiHandler: apiData.handler,
+            apiAuth: apiData.auth,
+            apiFields: apiData.fields,
+            apiRequired: apiData.required,
+            apiFile: apiData.filePath
         };
 
         try {
@@ -108,7 +109,7 @@ export function apiHandler(apis, hooks, context) {
             Logger.info("请求", logData);
 
             // 5. 执行 API handler
-            const result = await ctx.handler(context, ctx);
+            const result = await ctx.apiHandler(context, ctx);
 
             if (result instanceof Response) {
                 ctx.response = result;
@@ -120,9 +121,8 @@ export function apiHandler(apis, hooks, context) {
             return FinalResponse(ctx);
         } catch (err) {
             // 全局错误处理
-            const errorPath = ctx.apiPath ? ctx.apiPath : req.url;
             Logger.error("请求错误", err, {
-                path: errorPath,
+                path: ctx.apiPath,
                 requestId: requestId,
                 method: req.method,
                 apiPath: ctx.apiPath,

package/scripts/syncDb/diff.js

@@ -57,7 +57,7 @@ export function buildSyncDbDiff(groupedDbColumns, existingTableMap) {
         const missingFields = [];
         for (const columnMeta of columns) {
             const fieldInfo = toSyncDbFieldDef(columnMeta);
-            if (Object.prototype.hasOwnProperty.call(existingFields, fieldInfo.fieldName)) {
+            if (Object.hasOwn(existingFields, fieldInfo.fieldName)) {
                 continue;
             }
 

package/sql/befly.sql

@@ -23,6 +23,7 @@ CREATE TABLE IF NOT EXISTS `befly_api` (
     `auth` VARCHAR(200) NOT NULL DEFAULT '',
     `path` VARCHAR(200) NOT NULL DEFAULT '',
     `parent_path` VARCHAR(200) NOT NULL DEFAULT '',
+    `method` VARCHAR(20) NOT NULL DEFAULT '',
     `state` TINYINT NOT NULL DEFAULT 1,
     `created_at` BIGINT NOT NULL DEFAULT 0,
     `updated_at` BIGINT NOT NULL DEFAULT 0,

package/sync/api.js

@@ -57,6 +57,7 @@ export async function syncApi(ctx, apis) {
                 data: {
                     name: api.name,
                     path: api.apiPath,
+                    method: api.method,
                     parentPath: parentPath,
                     auth: auth
                 }
@@ -67,6 +68,7 @@ export async function syncApi(ctx, apis) {
         insList.push({
             name: api.name,
             path: api.apiPath,
+            method: api.method,
             parentPath: parentPath,
             auth: auth
         });

package/tables/api.json

@@ -11,6 +11,12 @@
         "min": 1,
         "max": 200
     },
+    "method": {
+        "name": "请求方式",
+        "input": "string",
+        "min": 1,
+        "max": 20
+    },
     "path": {
         "name": "接口路径",
         "input": "string",

package/utils/formatZodIssues.js

@@ -1,14 +1,3 @@
-function getValueByPath(source, path) {
-    if (!Array.isArray(path)) return undefined;
-
-    let current = source;
-    for (const segment of path) {
-        if (current === null || current === undefined) return undefined;
-        current = current[segment];
-    }
-    return current;
-}
-
 function formatValue(value) {
     if (value === undefined) return "undefined";
     if (value === null) return "null";

package/utils/scanSources.js

@@ -1,5 +1,3 @@
-import { join } from "pathe";
-
 import {
     //
     coreTableDir,