befly 3.17.11 → 3.17.13

package/hooks/auth.js

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

package/package.json

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

package/router/api.js

@@ -5,6 +5,7 @@
 
 import { Logger } from "../lib/logger.js";
 // 相对导入
+import { setCorsOptions } from "../utils/cors.js";
 import { getClientIp } from "../utils/getClientIp.js";
 import { FinalResponse } from "../utils/response.js";
 import { genShortId } from "../utils/util.js";
@@ -19,17 +20,41 @@ export function apiHandler(apis, hooks, context) {
     return async (req, server) => {
         // 1. 生成请求 ID
         const requestId = genShortId();
+        const now = Date.now();
+
+        const corsHeaders = setCorsOptions(req, context.config?.cors || {});
+        corsHeaders["X-Request-ID"] = requestId;
 
-        // 2. 创建请求上下文
+        // 2. OPTIONS 预检请求：直接返回，不走 hooks，不打日志
+        if (req.method === "OPTIONS") {
+            return new Response(null, {
+                status: 204,
+                headers: corsHeaders
+            });
+        }
+
+        // 3. 创建请求上下文
         const url = new URL(req.url);
         // 只用接口路径做存在性判断与匹配：不要把 method 拼进 key
         // 说明：apisMap 的 key 来源于 scanFiles/loadApis 生成的 path（例如 /api/core/xxx）
 
         const clientIp = getClientIp(req, server);
 
-        const now = Date.now();
+        const apiData = apis[url.pathname];
+        if (!apiData) {
+            return Response.json(
+                {
+                    code: 1,
+                    msg: "接口不存在"
+                },
+                {
+                    headers: corsHeaders
+                }
+            );
+        }
 
         const ctx = {
+            // 请求的参数
             method: req.method,
             body: {},
             req: req,
@@ -37,24 +62,19 @@ export function apiHandler(apis, hooks, context) {
             ip: clientIp,
             headers: req.headers,
             requestId: requestId,
-            corsHeaders: {
-                "X-Request-ID": requestId
-            }
+            corsHeaders: corsHeaders,
+            // 接口的参数
+            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
         };
 
-        const apiData = apis[url.pathname];
-        if (apiData) {
-            ctx.apiPath = apiData.apiPath;
-            ctx.apiName = apiData.name;
-            ctx.filePath = apiData.filePath;
-            ctx.handler = apiData.handler;
-            ctx.method = apiData.method;
-            ctx.body = apiData.body;
-            ctx.auth = apiData.auth;
-            ctx.fields = apiData.fields;
-            ctx.required = apiData.required;
-        }
-
         try {
             // 4. 串联执行所有钩子
             for (const hook of hooks) {
@@ -67,49 +87,33 @@ export function apiHandler(apis, hooks, context) {
             }
 
             // hooks 全部通过后记录请求日志（拦截请求仅由 ErrorResponse 记录）
-            if (ctx.handler && req.method !== "OPTIONS") {
-                const logData = {
-                    event: "request",
-                    requestId: requestId,
-                    method: req.method,
-                    apiPath: ctx.apiPath,
-                    apiName: ctx.apiName,
-                    ip: clientIp,
-                    now: now,
-                    userId: ctx.userId,
-                    nickname: ctx.nickname,
-                    roleCode: ctx.roleCode,
-                    roleType: ctx.roleType
-                };
-
-                if (ctx.body && Object.keys(ctx.body).length > 0) {
-                    logData["body"] = ctx.body;
-                }
+            const logData = {
+                event: "request",
+                requestId: requestId,
+                method: req.method,
+                apiPath: ctx.apiPath,
+                apiName: ctx.apiName,
+                ip: clientIp,
+                now: now,
+                userId: ctx.userId,
+                nickname: ctx.nickname,
+                roleCode: ctx.roleCode,
+                roleType: ctx.roleType
+            };
 
-                Logger.info("请求", logData);
+            if (ctx.body && Object.keys(ctx.body).length > 0) {
+                logData["body"] = ctx.body;
             }
 
+            Logger.info("请求", logData);
+
             // 5. 执行 API handler
-            if (!ctx.handler) {
-                if (req.method !== "OPTIONS") {
-                    ctx.response = Response.json(
-                        {
-                            code: 1,
-                            msg: "接口不存在"
-                        },
-                        {
-                            headers: ctx.corsHeaders
-                        }
-                    );
-                }
-            } else if (ctx.handler) {
-                const result = await ctx.handler(context, ctx);
+            const result = await ctx.handler(context, ctx);
 
-                if (result instanceof Response) {
-                    ctx.response = result;
-                } else {
-                    ctx.result = result;
-                }
+            if (result instanceof Response) {
+                ctx.response = result;
+            } else {
+                ctx.result = result;
             }
 
             // 7. 返回响应（自动处理 response/result/日志）

package/utils/cors.js

@@ -5,13 +5,24 @@
  * @returns CORS 响应头对象
  */
 export function setCorsOptions(req, config = {}) {
-    const origin = config.origin || "*";
+    const defaultConfig = {
+        origin: "*",
+        methods: "GET, POST, OPTIONS",
+        allowedHeaders: "Content-Type, Authorization, authorization, token",
+        exposedHeaders: "Content-Range, X-Content-Range, Authorization, authorization, token",
+        maxAge: 86400,
+        credentials: "true"
+    };
+
+    const merged = Object.assign({}, defaultConfig, config || {});
+    const origin = merged.origin;
+
     return {
         "Access-Control-Allow-Origin": origin === "*" ? req.headers.get("origin") || "*" : origin,
-        "Access-Control-Allow-Methods": config.methods || "GET, POST, PUT, DELETE, OPTIONS",
-        "Access-Control-Allow-Headers": config.allowedHeaders || "Content-Type, Authorization, authorization, token",
-        "Access-Control-Expose-Headers": config.exposedHeaders || "Content-Range, X-Content-Range, Authorization, authorization, token",
-        "Access-Control-Max-Age": String(config.maxAge || 86400),
-        "Access-Control-Allow-Credentials": config.credentials || "true"
+        "Access-Control-Allow-Methods": merged.methods,
+        "Access-Control-Allow-Headers": merged.allowedHeaders,
+        "Access-Control-Expose-Headers": merged.exposedHeaders,
+        "Access-Control-Max-Age": String(merged.maxAge),
+        "Access-Control-Allow-Credentials": merged.credentials
     };
 }

package/utils/response.js

@@ -9,17 +9,17 @@ import { isString } from "./is.js";
  * @param code - 错误码，默认 1
  * @param data - 附加数据，默认 null
  * @param detail - 详细信息，用于标记具体提示位置，默认 null
- * @param reasonCode - 拦截原因标识（用于统计/聚合），默认 null
+ * @param reason - 拦截原因标识（用于统计/聚合），默认 null
  * @returns Response 对象
  */
-export function ErrorResponse(ctx, msg, code = 1, data = null, detail = null, reasonCode = null) {
+export function ErrorResponse(ctx, msg, code = 1, data = null, detail = null, reason = null) {
     // 记录拦截日志
     if (ctx.requestId) {
         // requestId/apiPath/user/duration 等字段由调用方显式写入日志上下文，避免在 msg 中重复拼接
         Logger.info("请求已拦截", {
             event: "request_blocked",
-            reason: msg,
-            reasonCode: reasonCode,
+            msg: msg,
+            reason: reason,
             code: code,
             detail: detail
         });
@@ -30,7 +30,8 @@ export function ErrorResponse(ctx, msg, code = 1, data = null, detail = null, re
             code: code,
             msg: msg,
             data: data,
-            detail: detail
+            detail: detail,
+            reason: reason
         },
         {
             headers: ctx.corsHeaders

package/hooks/cors.js

@@ -1,39 +0,0 @@
-// 相对导入
-import { setCorsOptions } from "../utils/cors.js";
-
-/**
- * CORS 跨域处理钩子
- * 设置跨域响应头并处理 OPTIONS 预检请求
- */
-export default {
-    deps: [],
-    handler: async (befly, ctx) => {
-        const req = ctx.req;
-
-        // 合并默认配置和用户配置
-        const defaultConfig = {
-            origin: "*",
-            methods: "GET, POST, OPTIONS",
-            allowedHeaders: "Content-Type, Authorization, authorization, token",
-            exposedHeaders: "Content-Range, X-Content-Range, Authorization, authorization, token",
-            maxAge: 86400,
-            credentials: "true"
-        };
-
-        const corsConfig = Object.assign({}, defaultConfig, befly.config && befly.config.cors ? befly.config.cors : {});
-
-        // 设置 CORS 响应头
-        const headers = setCorsOptions(req, corsConfig);
-
-        ctx.corsHeaders = headers;
-
-        // 处理 OPTIONS 预检请求
-        if (req.method === "OPTIONS") {
-            ctx.response = new Response(null, {
-                status: 204,
-                headers: headers
-            });
-            return;
-        }
-    }
-};