befly 3.9.38 → 3.9.40

package/main.ts

@@ -1,31 +1,34 @@
-/**
+/**
  * Befly 框架主入口文件
  * 提供简洁的框架接口，核心逻辑已提取到 loader 层
  */
 
-// ========== 外部依赖 ==========
-import { calcPerfTime } from 'befly-shared/calcPerfTime';
-
-// ========== 相对导入 ==========
-import { Logger } from './lib/logger.js';
-import { Connect } from './lib/connect.js';
-import { loadPlugins } from './loader/loadPlugins.js';
-import { loadHooks } from './loader/loadHooks.js';
-import { loadApis } from './loader/loadApis.js';
-import { apiHandler } from './router/api.js';
-import { staticHandler } from './router/static.js';
-import { checkApp } from './checks/checkApp.js';
-import { checkTable } from './checks/checkTable.js';
-import { checkApi } from './checks/checkApi.js';
-import { syncAllCommand } from './sync/syncAll.js';
-import { isPrimaryProcess, getProcessRole } from './util.js';
-
 // ========== 类型导入 ==========
-import type { Server } from 'bun';
-import type { BeflyContext, BeflyOptions } from './types/befly.js';
-import type { Plugin } from './types/plugin.js';
-import type { Hook } from './types/hook.js';
-import type { ApiRoute } from './types/api.js';
+import type { ApiRoute } from "./types/api.js";
+import type { BeflyContext, BeflyOptions } from "./types/befly.js";
+import type { Hook } from "./types/hook.js";
+import type { Plugin } from "./types/plugin.js";
+
+// ========== 相对导入（项目内部文件） ==========
+// 启动检查
+import { checkApi } from "./checks/checkApi.js";
+import { checkApp } from "./checks/checkApp.js";
+import { checkTable } from "./checks/checkTable.js";
+// 基础设施
+import { Connect } from "./lib/connect.js";
+import { Logger } from "./lib/logger.js";
+// 加载器
+import { loadApis } from "./loader/loadApis.js";
+import { loadHooks } from "./loader/loadHooks.js";
+import { loadPlugins } from "./loader/loadPlugins.js";
+// 路由处理
+import { apiHandler } from "./router/api.js";
+import { staticHandler } from "./router/static.js";
+// 同步
+import { syncAllCommand } from "./sync/syncAll.js";
+// 工具
+import { calcPerfTime } from "./utils/calcPerfTime.js";
+import { isPrimaryProcess, getProcessRole } from "./utils/process.js";
 
 /**
  * Befly 框架核心类
@@ -56,7 +59,7 @@ export class Befly {
             const serverStartTime = Bun.nanoseconds();
 
             // 0. 延迟加载配置（避免循环依赖）
-            const { beflyConfig } = await import('./befly.config.js');
+            const { beflyConfig } = await import("./befly.config.js");
             this.config = beflyConfig;
 
             // 1. 执行启动检查
@@ -79,44 +82,51 @@ export class Befly {
             }
 
             // 6. 启动 HTTP 服务器
+            const apiFetch = apiHandler(this.apis, this.hooks, this.context as BeflyContext);
+            const staticFetch = staticHandler();
+
             const server = Bun.serve({
                 port: this.config!.appPort,
                 hostname: this.config!.appHost,
                 // 开发模式下启用详细错误信息
-                development: this.config!.nodeEnv === 'development',
+                development: this.config!.nodeEnv === "development",
                 // 空闲连接超时时间（秒），防止恶意连接占用资源
                 idleTimeout: 30,
-                routes: {
-                    '/': () => Response.json({ code: 0, msg: `${this.config!.appName} 接口服务已启动` }),
-                    '/api/*': apiHandler(this.apis, this.hooks, this.context as BeflyContext),
-                    '/*': staticHandler()
-                },
-                // 未匹配路由的兜底处理
-                fetch: () => {
-                    return Response.json({ code: 1, msg: '路由未找到' }, { status: 404 });
+                fetch: async (req, bunServer) => {
+                    const url = new URL(req.url);
+
+                    if (url.pathname === "/") {
+                        return Response.json({ code: 0, msg: `${this.config!.appName} 接口服务已启动` });
+                    }
+
+                    if (url.pathname.startsWith("/api/")) {
+                        return apiFetch(req, bunServer);
+                    }
+
+                    return staticFetch(req);
                 },
                 error: (error: Error) => {
-                    Logger.error({ err: error }, '服务启动时发生错误');
+                    Logger.error({ err: error }, "服务启动时发生错误");
                     // 开发模式下返回详细错误信息
-                    if (this.config!.nodeEnv === 'development') {
+                    if (this.config!.nodeEnv === "development") {
                         return Response.json(
                             {
                                 code: 1,
-                                msg: '内部服务器错误',
+                                msg: "内部服务器错误",
                                 error: error.message,
                                 stack: error.stack
                             },
                             { status: 200 }
                         );
                     }
-                    return Response.json({ code: 1, msg: '内部服务器错误' }, { status: 200 });
+                    return Response.json({ code: 1, msg: "内部服务器错误" }, { status: 200 });
                 }
             });
 
             const finalStartupTime = calcPerfTime(serverStartTime);
             const processRole = getProcessRole();
-            const roleLabel = processRole.role === 'primary' ? '主进程' : `工作进程 #${processRole.instanceId}`;
-            const envLabel = processRole.env === 'standalone' ? '' : ` [${processRole.env}]`;
+            const roleLabel = processRole.role === "primary" ? "主进程" : `工作进程 #${processRole.instanceId}`;
+            const envLabel = processRole.env === "standalone" ? "" : ` [${processRole.env}]`;
 
             Logger.info(`${this.config!.appName} 启动成功! (${roleLabel}${envLabel})`);
             Logger.info(`服务器启动耗时: ${finalStartupTime}`);
@@ -129,29 +139,29 @@ export class Befly {
                 // 优雅停止（等待进行中的请求完成）
                 try {
                     await server.stop();
-                    Logger.info('HTTP 服务器已停止');
+                    Logger.info("HTTP 服务器已停止");
                 } catch (error: any) {
-                    Logger.error({ err: error }, '停止 HTTP 服务器时出错');
+                    Logger.error({ err: error }, "停止 HTTP 服务器时出错");
                 }
 
                 // 关闭数据库连接
                 try {
                     await Connect.disconnect();
-                    Logger.info('数据库连接已关闭');
+                    Logger.info("数据库连接已关闭");
                 } catch (error: any) {
-                    Logger.error({ err: error }, '关闭数据库连接时出错');
+                    Logger.error({ err: error }, "关闭数据库连接时出错");
                 }
 
-                Logger.info('服务器已优雅关闭');
+                Logger.info("服务器已优雅关闭");
                 process.exit(0);
             };
 
-            process.on('SIGTERM', () => gracefulShutdown('SIGTERM'));
-            process.on('SIGINT', () => gracefulShutdown('SIGINT'));
+            process.on("SIGTERM", () => gracefulShutdown("SIGTERM"));
+            process.on("SIGINT", () => gracefulShutdown("SIGINT"));
 
             return server;
         } catch (error: any) {
-            Logger.error({ err: error }, '项目启动失败');
+            Logger.error({ err: error }, "项目启动失败");
             process.exit(1);
         }
     }

package/package.json

@@ -1,81 +1,83 @@
 {
     "name": "befly",
-    "version": "3.9.38",
-    "description": "Befly - 为 Bun 专属打造的 TypeScript API 接口框架核心引擎",
-    "type": "module",
+    "version": "3.9.40",
     "private": false,
-    "publishConfig": {
-        "access": "public",
-        "registry": "https://registry.npmjs.org"
-    },
-    "main": "main.ts",
-    "types": "main.ts",
-    "exports": {
-        ".": {
-            "types": "./main.ts",
-            "default": "./main.ts"
-        },
-        "./*": "./*"
-    },
-    "scripts": {
-        "test": "bun test",
-        "bundler": "bun build ./main.ts --outfile ./main.single.ts --minify --target bun"
-    },
+    "description": "Befly - 为 Bun 专属打造的 TypeScript API 接口框架核心引擎",
     "keywords": [
-        "bun",
         "api",
-        "framework",
+        "backend",
+        "bun",
         "core",
-        "typescript",
+        "framework",
+        "http",
         "javascript",
-        "backend",
         "rest",
-        "http",
-        "type-safe"
+        "type-safe",
+        "typescript"
     ],
-    "author": "chensuiyi <bimostyle@qq.com>",
     "homepage": "https://chensuiyi.me",
+    "author": "chensuiyi <bimostyle@qq.com>",
     "license": "Apache-2.0",
+    "type": "module",
+    "main": "main.ts",
+    "exports": {
+        ".": {
+            "types": "./main.ts",
+            "default": "./main.ts"
+        },
+        "./lib/*": "./lib/*.ts",
+        "./types/*": "./types/*.d.ts",
+        "./utils/*": "./utils/*.ts"
+    },
+    "types": "main.ts",
     "files": [
+        ".npmrc",
+        ".prettierignore",
+        ".prettierrc",
+        "LICENSE",
+        "README.md",
+        "befly.config.ts",
+        "bunfig.toml",
         "checks",
-        "docs",
         "dist",
+        "docs",
         "hooks",
         "lib",
         "loader",
+        "main.ts",
+        "package.json",
+        "paths.ts",
         "plugins",
         "router",
         "sync",
         "tests",
-        "types",
-        ".npmrc",
-        ".prettierignore",
-        ".prettierrc",
-        "befly.config.ts",
-        "bunfig.toml",
-        "LICENSE",
-        "main.ts",
-        "paths.ts",
-        "package.json",
-        "README.md",
         "tsconfig.json",
-        "util.ts"
+        "types",
+        "utils"
     ],
-    "engines": {
-        "bun": ">=1.3.0"
+    "scripts": {
+        "test": "bun test",
+        "bundler": "bun build ./main.ts --outfile ./main.single.ts --minify --target bun"
     },
     "dependencies": {
-        "befly-shared": "^1.2.8",
         "chalk": "^5.6.2",
         "es-toolkit": "^1.43.0",
         "fast-jwt": "^6.1.0",
         "fast-xml-parser": "^5.3.3",
+        "merge-anything": "^6.0.6",
         "pathe": "^2.0.3",
         "pino": "^10.1.0",
         "pino-roll": "^4.0.0"
     },
-    "gitHead": "8cb371928961c63d6c3c416c6dd667f8fe285376",
     "devDependencies": {
         "typescript": "^5.9.3"
-    }
+    },
+    "engines": {
+        "bun": ">=1.3.0"
+    },
+    "publishConfig": {
+        "access": "public",
+        "registry": "https://registry.npmjs.org"
+    },
+    "gitHead": "0ba53d2bbdc6a7f2659ef60256cda7302fe585b0"
 }

package/paths.ts

@@ -1,4 +1,4 @@
-/**
+/**
  * Befly 框架路径配置
  *
  * 提供统一的路径常量，供整个框架使用
@@ -10,8 +10,9 @@
  *
  */
 
-import { fileURLToPath } from 'node:url';
-import { dirname, join } from 'pathe';
+import { fileURLToPath } from "node:url";
+
+import { dirname, join } from "pathe";
 
 // 当前文件的路径信息
 const __filename = fileURLToPath(import.meta.url);
@@ -30,35 +31,35 @@ export const coreDir = __dirname;
  * @description packages/core/checks/
  * @usage 存放启动检查模块（返回 boolean 的 default 函数）
  */
-export const coreCheckDir = join(__dirname, 'checks');
+export const coreCheckDir = join(__dirname, "checks");
 
 /**
  * Core 框架插件目录
  * @description packages/core/plugins/
  * @usage 存放内置插件（db, logger, redis, tool 等）
  */
-export const corePluginDir = join(__dirname, 'plugins');
+export const corePluginDir = join(__dirname, "plugins");
 
 /**
  * Core 框架钩子目录
  * @description packages/core/hooks/
  * @usage 存放内置钩子（auth, cors, parser 等）
  */
-export const coreHookDir = join(__dirname, 'hooks');
+export const coreHookDir = join(__dirname, "hooks");
 
 /**
  * Core 框架 API 目录
  * @description packages/core/apis/
  * @usage 存放框架级别的 API 接口
  */
-export const coreApiDir = join(__dirname, 'apis');
+export const coreApiDir = join(__dirname, "apis");
 
 /**
  * Core 框架表定义目录
  * @description packages/core/tables/
  * @usage 存放框架核心表定义（JSON 格式）
  */
-export const coreTableDir = join(__dirname, 'tables');
+export const coreTableDir = join(__dirname, "tables");
 
 // ==================== 用户项目路径 ====================
 
@@ -74,39 +75,39 @@ export const projectDir = process.cwd();
  * @description {projectDir}/checks/
  * @usage 存放用户自定义启动检查模块
  */
-export const projectCheckDir = join(projectDir, 'checks');
+export const projectCheckDir = join(projectDir, "checks");
 
 /**
  * 项目插件目录
  * @description {projectDir}/plugins/
  * @usage 存放用户自定义插件
  */
-export const projectPluginDir = join(projectDir, 'plugins');
+export const projectPluginDir = join(projectDir, "plugins");
 
 /**
  * 项目钩子目录
  * @description {projectDir}/hooks/
  * @usage 存放用户自定义钩子
  */
-export const projectHookDir = join(projectDir, 'hooks');
+export const projectHookDir = join(projectDir, "hooks");
 
 /**
  * 项目 API 目录
  * @description {projectDir}/apis/
  * @usage 存放用户业务 API 接口
  */
-export const projectApiDir = join(projectDir, 'apis');
+export const projectApiDir = join(projectDir, "apis");
 
 /**
  * 项目表定义目录
  * @description {projectDir}/tables/
  * @usage 存放用户业务表定义（JSON 格式）
  */
-export const projectTableDir = join(projectDir, 'tables');
+export const projectTableDir = join(projectDir, "tables");
 
 /**
  * 项目组件目录
  * @description {projectDir}/addons/
  * @usage 存放本地组件（优先级高于 node_modules 中的组件）
  */
-export const projectAddonsDir = join(projectDir, 'addons');
+export const projectAddonsDir = join(projectDir, "addons");

package/plugins/cache.ts

@@ -1,11 +1,12 @@
-/**
+/**
  * 缓存插件 - TypeScript 版本
  * 负责在服务器启动时缓存接口、菜单和角色权限到 Redis
  */
 
-import { CacheHelper } from '../lib/cacheHelper.js';
-import type { Plugin } from '../types/plugin.js';
-import type { BeflyContext } from '../types/befly.js';
+import type { BeflyContext } from "../types/befly.js";
+import type { Plugin } from "../types/plugin.js";
+
+import { CacheHelper } from "../lib/cacheHelper.js";
 
 /**
  * 缓存插件

package/plugins/cipher.ts

@@ -3,12 +3,12 @@
  * 提供加密解密功能
  */
 
-import { Cipher } from '../lib/cipher.js';
+import type { Plugin } from "../types/plugin.js";
 
-import type { Plugin } from '../types/plugin.js';
+import { Cipher } from "../lib/cipher.js";
 
 export default {
-    name: 'cipher',
+    name: "cipher",
     handler: () => {
         return Cipher;
     }

package/plugins/config.ts

@@ -2,9 +2,9 @@
  * 配置插件
  * 提供访问项目配置的能力
  */
-import { beflyConfig } from '../befly.config.js';
+import type { Plugin } from "../types/plugin.js";
 
-import type { Plugin } from '../types/plugin.js';
+import { beflyConfig } from "../befly.config.js";
 
 const plugin: Plugin = {
     handler: () => {

package/plugins/db.ts

@@ -1,20 +1,20 @@
-/**
+/**
  * 数据库插件
  * 初始化数据库连接和 SQL 管理器
  */
 
-import { Logger } from '../lib/logger.js';
-import { Connect } from '../lib/connect.js';
-import { DbHelper } from '../lib/dbHelper.js';
+import type { BeflyContext } from "../types/befly.js";
+import type { Plugin } from "../types/plugin.js";
 
-import type { Plugin } from '../types/plugin.js';
-import type { BeflyContext } from '../types/befly.js';
+import { Connect } from "../lib/connect.js";
+import { DbHelper } from "../lib/dbHelper.js";
+import { Logger } from "../lib/logger.js";
 
 /**
  * 数据库插件
  */
 const dbPlugin: Plugin = {
-    after: ['logger'],
+    after: ["logger"],
     async handler(befly: BeflyContext): Promise<DbHelper> {
         let sql: any = null;
 
@@ -26,14 +26,14 @@ const dbPlugin: Plugin = {
 
             return dbManager;
         } catch (error: any) {
-            Logger.error({ err: error }, '数据库初始化失败');
+            Logger.error({ err: error }, "数据库初始化失败");
 
             // 清理资源
             if (sql) {
                 try {
                     await sql.close();
                 } catch (cleanupError: any) {
-                    Logger.error({ err: cleanupError }, '清理连接池失败');
+                    Logger.error({ err: cleanupError }, "清理连接池失败");
                 }
             }
 

package/plugins/jwt.ts

@@ -2,10 +2,10 @@
  * JWT 插件
  */
 
-import { Jwt } from '../lib/jwt.js';
-import { beflyConfig } from '../befly.config.js';
+import type { Plugin } from "../types/plugin.js";
 
-import type { Plugin } from '../types/plugin.js';
+import { beflyConfig } from "../befly.config.js";
+import { Jwt } from "../lib/jwt.js";
 
 const jwtPlugin: Plugin = {
     handler: () => {

package/plugins/logger.ts

@@ -1,12 +1,12 @@
-/**
+/**
  * 日志插件
  * 提供全局日志功能
  */
 
-import { Logger } from '../lib/logger.js';
-import { beflyConfig } from '../befly.config.js';
+import type { Plugin } from "../types/plugin.js";
 
-import type { Plugin } from '../types/plugin.js';
+import { beflyConfig } from "../befly.config.js";
+import { Logger } from "../lib/logger.js";
 
 /**
  * 日志插件
@@ -14,15 +14,11 @@ import type { Plugin } from '../types/plugin.js';
 const loggerPlugin: Plugin = {
     after: [],
     async handler(): Promise<typeof Logger> {
-        try {
-            // 配置 Logger
-            if (beflyConfig.logger) {
-                Logger.configure(beflyConfig.logger);
-            }
-            return Logger;
-        } catch (error: any) {
-            throw error;
+        // 配置 Logger
+        if (beflyConfig.logger) {
+            Logger.configure(beflyConfig.logger);
         }
+        return Logger;
     }
 };
 

package/plugins/redis.ts

@@ -1,20 +1,20 @@
-/**
+/**
  * Redis 插件
  * 初始化 Redis 连接和助手工具
  */
 
-import { Logger } from '../lib/logger.js';
-import { Connect } from '../lib/connect.js';
-import { RedisHelper } from '../lib/redisHelper.js';
-import { beflyConfig } from '../befly.config.js';
+import type { Plugin } from "../types/plugin.js";
 
-import type { Plugin } from '../types/plugin.js';
+import { beflyConfig } from "../befly.config.js";
+import { Connect } from "../lib/connect.js";
+import { Logger } from "../lib/logger.js";
+import { RedisHelper } from "../lib/redisHelper.js";
 
 /**
  * Redis 插件
  */
 const redisPlugin: Plugin = {
-    after: ['logger'],
+    after: ["logger"],
     async handler(): Promise<RedisHelper | Record<string, never>> {
         const redisConfig = beflyConfig.redis || {};
         try {
@@ -24,7 +24,7 @@ const redisPlugin: Plugin = {
             // 返回 RedisHelper 实例
             return new RedisHelper(redisConfig.prefix);
         } catch (error: any) {
-            Logger.error({ err: error }, 'Redis 初始化失败');
+            Logger.error({ err: error }, "Redis 初始化失败");
             throw error;
         }
     }

package/plugins/tool.ts

@@ -3,9 +3,9 @@
  * 提供常用的工具函数
  */
 
+import type { RequestContext } from "../types/context.js";
 // 类型导入
-import type { Plugin } from '../types/plugin.js';
-import type { RequestContext } from '../types/context.js';
+import type { Plugin } from "../types/plugin.js";
 
 /**
  * 成功响应
@@ -87,23 +87,23 @@ export function Raw(ctx: RequestContext, data: Record<string, any> | string, opt
     let finalContentType = contentType;
     let body: string;
 
-    if (typeof data === 'string') {
+    if (typeof data === "string") {
         // 字符串类型
         body = data;
         if (!finalContentType) {
             // 自动判断：XML 或纯文本
-            finalContentType = data.trim().startsWith('<') ? 'application/xml' : 'text/plain';
+            finalContentType = data.trim().startsWith("<") ? "application/xml" : "text/plain";
         }
     } else {
         // 对象类型，JSON 序列化
         body = JSON.stringify(data);
-        finalContentType = finalContentType || 'application/json';
+        finalContentType = finalContentType || "application/json";
     }
 
     // 合并响应头
     const responseHeaders = {
         ...ctx.corsHeaders,
-        'Content-Type': finalContentType,
+        "Content-Type": finalContentType,
         ...headers
     };