befly 1.2.2 → 1.2.4

package/apis/tool/tokenCheck.js

@@ -5,22 +5,18 @@ import { Jwt } from '../../utils/jwt.js';
 
 export default Api.POST('令牌检测', false, {}, [], async (befly, ctx) => {
     try {
-        const jwtData = await Jwt.verify(ctx.headers?.authorization?.split(' ')[1] || '');
-        return RYes(
-            '令牌有效',
-            {
-                state: 'yes'
-            },
-            {
-                detail: jwtData
-            }
-        );
+        const token = ctx.headers?.authorization?.split(' ')[1] || '';
+        if (!token) {
+            return RNo('令牌不能为空');
+        }
+        const jwtData = await Jwt.verify(token);
+        return RYes('令牌有效');
     } catch (error) {
         befly.logger.error({
             msg: '令牌检测失败',
             error: error.message,
             stack: error.stack
         });
-        return RNo('令牌检测失败', { state: 'no' });
+        return RNo('令牌检测失败');
     }
 });

package/main.js

@@ -319,6 +319,7 @@ class Befly {
             hostname: Env.APP_HOST,
             routes: {
                 '/': async (req) => {
+                    const corsOptions = setCorsOptions(req);
                     return Response.json(
                         {
                             code: 0,
@@ -335,6 +336,7 @@ class Befly {
                 '/api/*': async (req) => {
                     try {
                         const corsOptions = setCorsOptions(req);
+
                         // 直接返回options请求
                         if (req.method === 'OPTIONS') {
                             return new Response(null, {
@@ -342,6 +344,7 @@ class Befly {
                                 headers: corsOptions.headers
                             });
                         }
+
                         // 初始化请求数据存储
                         const ctx = {
                             headers: Object.fromEntries(req.headers.entries()),
@@ -448,7 +451,15 @@ class Befly {
                             });
                         }
 
-                        if (api.auth && api.auth !== true && ctx.user.role !== api.auth) {
+                        // 如果为字符串，则判断是否等于角色类型
+                        if (isType(api.auth, 'string') && api.auth !== ctx.user?.role_type) {
+                            return Response.json(RNo('没有权限'), {
+                                headers: corsOptions.headers
+                            });
+                        }
+
+                        // 如果为数组，则判断角色是否在数组中
+                        if (isType(api.auth, 'array') && !api.auth.includes(ctx.user?.role)) {
                             return Response.json(RNo('没有权限'), {
                                 headers: corsOptions.headers
                             });
@@ -489,6 +500,15 @@ class Befly {
                 },
                 '/*': async (req) => {
                     const corsOptions = setCorsOptions(req);
+
+                    // 直接返回options请求
+                    if (req.method === 'OPTIONS') {
+                        return new Response(null, {
+                            status: 204,
+                            headers: corsOptions.headers
+                        });
+                    }
+
                     const url = new URL(req.url);
                     const filePath = path.join(process.cwd(), 'public', url.pathname);
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly",
-    "version": "1.2.2",
+    "version": "1.2.4",
     "description": "Buma - 为 Bun 专属打造的 API 接口框架核心引擎",
     "type": "module",
     "private": false,
@@ -49,5 +49,5 @@
         "README.md",
         "vitest.config.js"
     ],
-    "gitHead": "2fc8a0aa987c42e983e0e2ce2e74cddbfed53a7f"
+    "gitHead": "2615f45da0551949dee6f75123c54259b91c05ef"
 }