befly 3.9.40 → 3.10.1

package/package.json

@@ -1,6 +1,7 @@
 {
     "name": "befly",
-    "version": "3.9.40",
+    "version": "3.10.1",
+    "gitHead": "123125b9d7a6c26879a5b5c9d3ac05e2082141c6",
     "private": false,
     "description": "Befly - 为 Bun 专属打造的 TypeScript API 接口框架核心引擎",
     "keywords": [
@@ -16,26 +17,10 @@
         "typescript"
     ],
     "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",
+    "author": "chensuiyi <bimostyle@qq.com>",
     "files": [
         ".npmrc",
-        ".prettierignore",
-        ".prettierrc",
-        "LICENSE",
-        "README.md",
         "befly.config.ts",
         "bunfig.toml",
         "checks",
@@ -43,11 +28,13 @@
         "docs",
         "hooks",
         "lib",
+        "LICENSE",
         "loader",
         "main.ts",
         "package.json",
         "paths.ts",
         "plugins",
+        "README.md",
         "router",
         "sync",
         "tests",
@@ -55,11 +42,28 @@
         "types",
         "utils"
     ],
+    "type": "module",
+    "main": "main.ts",
+    "types": "main.ts",
+    "exports": {
+        ".": {
+            "types": "./main.ts",
+            "default": "./main.ts"
+        },
+        "./lib/*": "./lib/*.ts",
+        "./types/*": "./types/*.d.ts",
+        "./utils/*": "./utils/*.ts"
+    },
+    "publishConfig": {
+        "access": "public",
+        "registry": "https://registry.npmjs.org"
+    },
     "scripts": {
         "test": "bun test",
-        "bundler": "bun build ./main.ts --outfile ./main.single.ts --minify --target bun"
+        "typecheck": "bunx tsgo --noEmit"
     },
     "dependencies": {
+        "befly-shared": "1.3.0",
         "chalk": "^5.6.2",
         "es-toolkit": "^1.43.0",
         "fast-jwt": "^6.1.0",
@@ -74,10 +78,5 @@
     },
     "engines": {
         "bun": ">=1.3.0"
-    },
-    "publishConfig": {
-        "access": "public",
-        "registry": "https://registry.npmjs.org"
-    },
-    "gitHead": "0ba53d2bbdc6a7f2659ef60256cda7302fe585b0"
+    }
 }

package/paths.ts

@@ -6,7 +6,7 @@
  *
  * 路径分类：
  * - root* 系列：Core 框架内部路径（packages/core/*）
- * - project* 系列：用户项目路径（process.cwd()/*）
+ * - app* 系列：用户项目路径（process.cwd()/*）
  *
  */
 
@@ -68,46 +68,46 @@ export const coreTableDir = join(__dirname, "tables");
  * @description process.cwd()
  * @usage 用户项目的根目录
  */
-export const projectDir = process.cwd();
+export const appDir = process.cwd();
 
 /**
  * 项目检查目录
- * @description {projectDir}/checks/
+ * @description {appDir}/checks/
  * @usage 存放用户自定义启动检查模块
  */
-export const projectCheckDir = join(projectDir, "checks");
+export const appCheckDir = join(appDir, "checks");
 
 /**
  * 项目插件目录
- * @description {projectDir}/plugins/
+ * @description {appDir}/plugins/
  * @usage 存放用户自定义插件
  */
-export const projectPluginDir = join(projectDir, "plugins");
+export const appPluginDir = join(appDir, "plugins");
 
 /**
  * 项目钩子目录
- * @description {projectDir}/hooks/
+ * @description {appDir}/hooks/
  * @usage 存放用户自定义钩子
  */
-export const projectHookDir = join(projectDir, "hooks");
+export const appHookDir = join(appDir, "hooks");
 
 /**
  * 项目 API 目录
- * @description {projectDir}/apis/
+ * @description {appDir}/apis/
  * @usage 存放用户业务 API 接口
  */
-export const projectApiDir = join(projectDir, "apis");
+export const appApiDir = join(appDir, "apis");
 
 /**
  * 项目表定义目录
- * @description {projectDir}/tables/
+ * @description {appDir}/tables/
  * @usage 存放用户业务表定义（JSON 格式）
  */
-export const projectTableDir = join(projectDir, "tables");
+export const appTableDir = join(appDir, "tables");
 
 /**
  * 项目组件目录
- * @description {projectDir}/addons/
+ * @description {appDir}/addons/
  * @usage 存放本地组件（优先级高于 node_modules 中的组件）
  */
-export const projectAddonsDir = join(projectDir, "addons");
+export const appAddonsDir = join(appDir, "addons");

package/plugins/cache.ts

@@ -11,11 +11,17 @@ import { CacheHelper } from "../lib/cacheHelper.js";
 /**
  * 缓存插件
  */
-const cachePlugin: Plugin = {
-    after: [],
+export default {
+    deps: ["logger", "redis", "db"],
     async handler(befly: BeflyContext): Promise<CacheHelper> {
-        return new CacheHelper(befly);
-    }
-};
+        if (!(befly as any).db) {
+            throw new Error("缓存初始化失败：ctx.db 未初始化（Db 插件未加载或注入失败）");
+        }
+
+        if (!(befly as any).redis) {
+            throw new Error("缓存初始化失败：ctx.redis 未初始化（Redis 插件未加载或注入失败）");
+        }
 
-export default cachePlugin;
+        return new CacheHelper({ db: befly.db, redis: befly.redis });
+    }
+} satisfies Plugin;

package/plugins/cipher.ts

@@ -8,8 +8,8 @@ import type { Plugin } from "../types/plugin.js";
 import { Cipher } from "../lib/cipher.js";
 
 export default {
-    name: "cipher",
+    deps: [],
     handler: () => {
         return Cipher;
     }
-} as Plugin;
+} satisfies Plugin;

package/plugins/config.ts

@@ -2,14 +2,12 @@
  * 配置插件
  * 提供访问项目配置的能力
  */
+import type { BeflyContext } from "../types/befly.js";
 import type { Plugin } from "../types/plugin.js";
 
-import { beflyConfig } from "../befly.config.js";
-
-const plugin: Plugin = {
-    handler: () => {
-        return beflyConfig;
+export default {
+    deps: [],
+    handler: (context: BeflyContext) => {
+        return context.config;
     }
-};
-
-export default plugin;
+} satisfies Plugin;

package/plugins/db.ts

@@ -7,39 +7,34 @@ import type { BeflyContext } from "../types/befly.js";
 import type { Plugin } from "../types/plugin.js";
 
 import { Connect } from "../lib/connect.js";
+import { getDialectByName } from "../lib/dbDialect.js";
 import { DbHelper } from "../lib/dbHelper.js";
 import { Logger } from "../lib/logger.js";
 
 /**
  * 数据库插件
  */
-const dbPlugin: Plugin = {
-    after: ["logger"],
+export default {
+    deps: ["logger", "redis"],
     async handler(befly: BeflyContext): Promise<DbHelper> {
-        let sql: any = null;
+        if (!(befly as any).redis) {
+            throw new Error("数据库初始化失败：ctx.redis 未初始化（Redis 插件未加载或注入失败）");
+        }
 
         try {
-            sql = await Connect.connectSql();
+            const sql = Connect.getSql();
+
+            const rawDbType = befly.config && befly.config.db ? befly.config.db.type : undefined;
+            const resolvedDbType = rawDbType === "postgres" ? "postgresql" : rawDbType;
+            const dialect = getDialectByName(resolvedDbType === "postgresql" || resolvedDbType === "sqlite" ? resolvedDbType : "mysql");
 
-            // 创建数据库管理器实例，直接传入 sql 对象
-            const dbManager = new DbHelper(befly, sql);
+            // 创建数据库管理器实例
+            const dbManager = new DbHelper({ redis: befly.redis, sql: sql, dialect: dialect });
 
             return dbManager;
         } catch (error: any) {
             Logger.error({ err: error }, "数据库初始化失败");
-
-            // 清理资源
-            if (sql) {
-                try {
-                    await sql.close();
-                } catch (cleanupError: any) {
-                    Logger.error({ err: cleanupError }, "清理连接池失败");
-                }
-            }
-
             throw error;
         }
     }
-};
-
-export default dbPlugin;
+} satisfies Plugin;

package/plugins/jwt.ts

@@ -2,15 +2,14 @@
  * JWT 插件
  */
 
+import type { BeflyContext } from "../types/befly.js";
 import type { Plugin } from "../types/plugin.js";
 
-import { beflyConfig } from "../befly.config.js";
 import { Jwt } from "../lib/jwt.js";
 
-const jwtPlugin: Plugin = {
-    handler: () => {
-        return new Jwt(beflyConfig.auth);
+export default {
+    deps: [],
+    handler: (context: BeflyContext) => {
+        return new Jwt(context.config ? context.config.auth : undefined);
     }
-};
-
-export default jwtPlugin;
+} satisfies Plugin;

package/plugins/logger.ts

@@ -3,23 +3,21 @@
  * 提供全局日志功能
  */
 
+import type { BeflyContext } from "../types/befly.js";
 import type { Plugin } from "../types/plugin.js";
 
-import { beflyConfig } from "../befly.config.js";
 import { Logger } from "../lib/logger.js";
 
 /**
  * 日志插件
  */
-const loggerPlugin: Plugin = {
-    after: [],
-    async handler(): Promise<typeof Logger> {
+export default {
+    deps: [],
+    async handler(context: BeflyContext): Promise<typeof Logger> {
         // 配置 Logger
-        if (beflyConfig.logger) {
-            Logger.configure(beflyConfig.logger);
+        if (context.config && context.config.logger) {
+            Logger.configure(context.config.logger);
         }
         return Logger;
     }
-};
-
-export default loggerPlugin;
+} satisfies Plugin;

package/plugins/redis.ts

@@ -3,9 +3,9 @@
  * 初始化 Redis 连接和助手工具
  */
 
+import type { BeflyContext } from "../types/befly.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";
@@ -13,13 +13,13 @@ import { RedisHelper } from "../lib/redisHelper.js";
 /**
  * Redis 插件
  */
-const redisPlugin: Plugin = {
-    after: ["logger"],
-    async handler(): Promise<RedisHelper | Record<string, never>> {
-        const redisConfig = beflyConfig.redis || {};
+export default {
+    deps: ["logger"],
+    async handler(context: BeflyContext): Promise<RedisHelper | Record<string, never>> {
+        const redisConfig = context.config && context.config.redis ? context.config.redis : {};
         try {
-            // 初始化 Redis 客户端
-            await Connect.connectRedis();
+            // 启动期已建立 Redis 连接；这里仅校验连接存在
+            Connect.getRedis();
 
             // 返回 RedisHelper 实例
             return new RedisHelper(redisConfig.prefix);
@@ -28,6 +28,4 @@ const redisPlugin: Plugin = {
             throw error;
         }
     }
-};
-
-export default redisPlugin;
+} satisfies Plugin;

package/plugins/tool.ts

@@ -113,7 +113,8 @@ export function Raw(ctx: RequestContext, data: Record<string, any> | string, opt
     });
 }
 
-const plugin: Plugin = {
+export default {
+    deps: [],
     handler: () => {
         return {
             Yes: Yes,
@@ -121,6 +122,4 @@ const plugin: Plugin = {
             Raw: Raw
         };
     }
-};
-
-export default plugin;
+} satisfies Plugin;

package/router/api.ts

@@ -15,7 +15,6 @@ import { Logger } from "../lib/logger.js";
 import { genShortId } from "../utils/genShortId.js";
 import { getClientIp } from "../utils/getClientIp.js";
 import { FinalResponse } from "../utils/response.js";
-import { makeRouteKey } from "../utils/route.js";
 
 /**
  * API处理器工厂函数
@@ -30,7 +29,9 @@ export function apiHandler(apis: Map<string, ApiRoute>, hooks: Hook[], context:
 
         // 2. 创建请求上下文
         const url = new URL(req.url);
-        const apiPath = makeRouteKey(req.method, url.pathname);
+        // 只用接口路径做存在性判断与匹配：不要把 method 拼进 key
+        // 说明：apisMap 的 key 来源于 scanFiles/loadApis 生成的 routePath（例如 /api/core/xxx）
+        const apiPath = url.pathname || "/";
 
         const clientIp = getClientIp(req, server);
 

package/router/static.ts

@@ -3,25 +3,27 @@
  * 处理 /* 路径的静态文件请求
  */
 
+// 类型导入
+import type { CorsConfig } from "../types/befly.js";
+
 // 外部依赖
 import { join } from "pathe";
 
-import { beflyConfig } from "../befly.config.js";
 import { Logger } from "../lib/logger.js";
 // 相对导入
-import { projectDir } from "../paths.js";
+import { appDir } from "../paths.js";
 import { setCorsOptions } from "../utils/cors.js";
 
 /**
  * 静态文件处理器工厂
  */
-export function staticHandler() {
+export function staticHandler(corsConfig: CorsConfig | undefined = undefined) {
     return async (req: Request): Promise<Response> => {
         // 设置 CORS 响应头
-        const corsHeaders = setCorsOptions(req, beflyConfig.cors);
+        const corsHeaders = setCorsOptions(req, corsConfig);
 
         const url = new URL(req.url);
-        const filePath = join(projectDir, "public", url.pathname);
+        const filePath = join(appDir, "public", url.pathname);
 
         try {
             // OPTIONS预检请求