befly 3.8.30 → 3.8.31

package/loader/loadPlugins.ts

@@ -8,28 +8,29 @@ import { scanAddons, getAddonDir } from 'befly-shared/addonHelper';
 import { Logger } from '../lib/logger.js';
 import { corePluginDir, projectPluginDir } from '../paths.js';
 import { sortModules, scanModules } from '../util.js';
+import { beflyConfig } from '../befly.config.js';
 
 import type { Plugin } from '../types/plugin.js';
 import type { BeflyContext } from '../types/befly.js';
 
-export async function loadPlugins(config: Record<string, any> | undefined, plugins: Plugin[], context: BeflyContext): Promise<void> {
+export async function loadPlugins(plugins: Plugin[], context: BeflyContext): Promise<void> {
     try {
         const allPlugins: Plugin[] = [];
 
         // 1. 扫描核心插件
-        const corePlugins = await scanModules<Plugin>(corePluginDir, 'core', '插件', config);
+        const corePlugins = await scanModules<Plugin>(corePluginDir, 'core', '插件');
 
         // 2. 扫描组件插件
         const addonPlugins: Plugin[] = [];
         const addons = scanAddons();
         for (const addon of addons) {
             const dir = getAddonDir(addon, 'plugins');
-            const plugins = await scanModules<Plugin>(dir, 'addon', '插件', config, addon);
+            const plugins = await scanModules<Plugin>(dir, 'addon', '插件', addon);
             addonPlugins.push(...plugins);
         }
 
         // 3. 扫描项目插件
-        const appPlugins = await scanModules<Plugin>(projectPluginDir, 'app', '插件', config);
+        const appPlugins = await scanModules<Plugin>(projectPluginDir, 'app', '插件');
 
         // 4. 合并所有插件
         allPlugins.push(...corePlugins);
@@ -37,7 +38,7 @@ export async function loadPlugins(config: Record<string, any> | undefined, plugi
         allPlugins.push(...appPlugins);
 
         // 5. 过滤禁用的插件
-        const disablePlugins = (config as any)?.disablePlugins || [];
+        const disablePlugins = beflyConfig.disablePlugins || [];
         const enabledPlugins = allPlugins.filter((plugin) => !disablePlugins.includes(plugin.name));
 
         if (disablePlugins.length > 0) {
@@ -55,7 +56,7 @@ export async function loadPlugins(config: Record<string, any> | undefined, plugi
             try {
                 plugins.push(plugin);
 
-                const pluginInstance = typeof plugin.handler === 'function' ? await plugin.handler(context, config) : {};
+                const pluginInstance = typeof plugin.handler === 'function' ? await plugin.handler(context) : {};
 
                 // 直接挂载到 befly 下
                 (context as any)[plugin.name!] = pluginInstance;
@@ -69,6 +70,3 @@ export async function loadPlugins(config: Record<string, any> | undefined, plugi
         process.exit(1);
     }
 }
-
-// ==================== 钩子加载逻辑 ====================
-// 已移动到 loadHooks.ts

package/main.ts

@@ -8,10 +8,7 @@ import { calcPerfTime } from 'befly-shared/calcPerfTime';
 
 // ========== 相对导入 ==========
 import { Logger } from './lib/logger.js';
-import { Cipher } from './lib/cipher.js';
 import { Connect } from './lib/connect.js';
-import { DbHelper } from './lib/dbHelper.js';
-import { RedisHelper } from './lib/redisHelper.js';
 import { loadPlugins } from './loader/loadPlugins.js';
 import { loadHooks } from './loader/loadHooks.js';
 import { loadApis } from './loader/loadApis.js';
@@ -21,8 +18,6 @@ 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 { coreDir } from './paths.js';
-import { defaultOptions } from './config.js';
 import { isPrimaryProcess, getProcessRole } from './util.js';
 
 // ========== 类型导入 ==========
@@ -31,6 +26,7 @@ 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';
+
 /**
  * Befly 框架核心类
  * 职责：管理应用上下文和生命周期
@@ -48,22 +44,8 @@ export class Befly {
     /** 应用上下文 */
     public context: BeflyContext = {};
 
-    /** 最终配置（合并默认值后） */
-    public config: BeflyOptions = { ...defaultOptions };
-
-    constructor(options: BeflyOptions = {}) {
-        // 合并用户配置：用户配置 > 默认配置（最多 2 级）
-        for (const key in options) {
-            const value = options[key as keyof BeflyOptions];
-            if (value !== undefined && value !== null) {
-                if (typeof value === 'object' && !Array.isArray(value)) {
-                    this.config[key as keyof BeflyOptions] = { ...defaultOptions[key as keyof typeof defaultOptions], ...value } as any;
-                } else {
-                    this.config[key as keyof BeflyOptions] = value as any;
-                }
-            }
-        }
-    }
+    /** 配置引用（延迟加载） */
+    private config: BeflyOptions | null = null;
 
     /**
      * 启动完整的生命周期流程
@@ -73,33 +55,37 @@ export class Befly {
         try {
             const serverStartTime = Bun.nanoseconds();
 
+            // 0. 延迟加载配置（避免循环依赖）
+            const { beflyConfig } = await import('./befly.config.js');
+            this.config = beflyConfig;
+
             // 1. 执行启动检查
             await checkApp();
             await checkTable();
             await checkApi();
 
-            // 4. 加载插件
-            await loadPlugins(this.config as any, this.plugins, this.context);
+            // 2. 加载插件
+            await loadPlugins(this.plugins, this.context);
 
-            // 5. 加载钩子
-            await loadHooks(this.config as any, this.hooks);
+            // 3. 加载钩子
+            await loadHooks(this.hooks);
 
-            // 6. 加载所有 API
+            // 4. 加载所有 API
             await loadApis(this.apis);
 
-            // 7. 自动同步 (仅主进程执行，避免集群模式下重复执行)
+            // 5. 自动同步 (仅主进程执行，避免集群模式下重复执行)
             if (isPrimaryProcess()) {
-                await syncAllCommand(this.config);
+                await syncAllCommand();
             }
 
-            // 8. 启动 HTTP 服务器
+            // 6. 启动 HTTP 服务器
             const server = Bun.serve({
-                port: this.config.appPort,
-                hostname: this.config.appHost,
+                port: this.config!.appPort,
+                hostname: this.config!.appHost,
                 routes: {
-                    '/': () => Response.json({ code: 0, msg: `${this.config.appName} 接口服务已启动` }),
+                    '/': () => Response.json({ code: 0, msg: `${this.config!.appName} 接口服务已启动` }),
                     '/api/*': apiHandler(this.apis, this.hooks, this.context),
-                    '/*': staticHandler(this.config)
+                    '/*': staticHandler()
                 },
                 error: (error: Error) => {
                     Logger.error({ err: error }, '服务启动时发生错误');
@@ -112,11 +98,11 @@ export class Befly {
             const roleLabel = processRole.role === 'primary' ? '主进程' : `工作进程 #${processRole.instanceId}`;
             const envLabel = processRole.env === 'standalone' ? '' : ` [${processRole.env}]`;
 
-            Logger.info(`${this.config.appName} 启动成功! (${roleLabel}${envLabel})`);
+            Logger.info(`${this.config!.appName} 启动成功! (${roleLabel}${envLabel})`);
             Logger.info(`服务器启动耗时: ${finalStartupTime}`);
-            Logger.info(`服务器监听地址: http://${this.config.appHost}:${this.config.appPort}`);
+            Logger.info(`服务器监听地址: http://${this.config!.appHost}:${this.config!.appPort}`);
 
-            // 9. 注册优雅关闭处理
+            // 7. 注册优雅关闭处理
             const gracefulShutdown = async (signal: string) => {
                 // 停止接收新请求
                 server.stop(true);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly",
-    "version": "3.8.30",
+    "version": "3.8.31",
     "description": "Befly - 为 Bun 专属打造的 TypeScript API 接口框架核心引擎",
     "type": "module",
     "private": false,
@@ -18,6 +18,7 @@
         "./*": "./*"
     },
     "scripts": {
+        "test": "bun test",
         "bundler": "bun build ./main.ts --outfile ./main.single.ts --minify --target bun"
     },
     "keywords": [
@@ -63,7 +64,7 @@
         "bun": ">=1.3.0"
     },
     "dependencies": {
-        "befly-shared": "^1.1.1",
+        "befly-shared": "^1.1.2",
         "chalk": "^5.6.2",
         "es-toolkit": "^1.42.0",
         "fast-jwt": "^6.0.2",
@@ -72,7 +73,7 @@
         "pino": "^10.1.0",
         "pino-roll": "^4.0.0"
     },
-    "gitHead": "2031550167896390ac58c50aeb52b8c23426844e",
+    "gitHead": "d9a4c57539f6eb692d7db6c7fd800e021891a07c",
     "devDependencies": {
         "typescript": "^5.9.3"
     }

package/plugins/cipher.ts

@@ -9,7 +9,7 @@ import type { Plugin } from '../types/plugin.js';
 
 export default {
     name: 'cipher',
-    handler: (context, config) => {
+    handler: () => {
         return Cipher;
     }
 } as Plugin;

package/plugins/config.ts

@@ -2,14 +2,13 @@
  * 配置插件
  * 提供访问项目配置的能力
  */
+import { beflyConfig } from '../befly.config.js';
 
-// 类型导入
 import type { Plugin } from '../types/plugin.js';
 
 const plugin: Plugin = {
-    handler: (context, config) => {
-        // 直接返回第二个参数中的配置
-        return config || {};
+    handler: () => {
+        return beflyConfig;
     }
 };
 

package/plugins/db.ts

@@ -1,11 +1,12 @@
 /**
- * 数据库插件 - TypeScript 版本
+ * 数据库插件
  * 初始化数据库连接和 SQL 管理器
  */
 
 import { Logger } from '../lib/logger.js';
 import { Connect } from '../lib/connect.js';
 import { DbHelper } from '../lib/dbHelper.js';
+
 import type { Plugin } from '../types/plugin.js';
 import type { BeflyContext } from '../types/befly.js';
 
@@ -14,12 +15,11 @@ import type { BeflyContext } from '../types/befly.js';
  */
 const dbPlugin: Plugin = {
     after: ['logger'],
-    async handler(this: Plugin, befly: BeflyContext): Promise<DbHelper> {
+    async handler(befly: BeflyContext): Promise<DbHelper> {
         let sql: any = null;
-        const config = this.config || {};
 
         try {
-            sql = await Connect.connectSql(config);
+            sql = await Connect.connectSql();
 
             // 创建数据库管理器实例，直接传入 sql 对象
             const dbManager = new DbHelper(befly, sql);
@@ -37,7 +37,6 @@ const dbPlugin: Plugin = {
                 }
             }
 
-            // 插件内禁止直接退出进程，抛出异常交由主流程统一处理
             throw error;
         }
     }

package/plugins/jwt.ts

@@ -3,12 +3,13 @@
  */
 
 import { Jwt } from '../lib/jwt.js';
+import { beflyConfig } from '../befly.config.js';
 
 import type { Plugin } from '../types/plugin.js';
 
 const jwtPlugin: Plugin = {
-    handler: (context, config) => {
-        return new Jwt(config?.auth);
+    handler: () => {
+        return new Jwt(beflyConfig.auth);
     }
 };
 

package/plugins/logger.ts

@@ -1,26 +1,26 @@
 /**
- * 日志插件 - TypeScript 版本
+ * 日志插件
  * 提供全局日志功能
  */
 
 import { Logger } from '../lib/logger.js';
+import { beflyConfig } from '../befly.config.js';
+
 import type { Plugin } from '../types/plugin.js';
-import type { BeflyContext } from '../types/befly.js';
 
 /**
  * 日志插件
  */
 const loggerPlugin: Plugin = {
     after: [],
-    async handler(this: Plugin, befly: BeflyContext): Promise<typeof Logger> {
+    async handler(): Promise<typeof Logger> {
         try {
             // 配置 Logger
-            if (this.config) {
-                Logger.configure(this.config);
+            if (beflyConfig.logger) {
+                Logger.configure(beflyConfig.logger);
             }
             return Logger;
         } catch (error: any) {
-            // 插件内禁止直接退出进程，抛出异常交由主流程统一处理
             throw error;
         }
     }

package/plugins/redis.ts

@@ -1,34 +1,30 @@
 /**
- * Redis 插件 - TypeScript 版本
+ * 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 { BeflyContext } from '../types/befly.js';
 
 /**
  * Redis 插件
  */
 const redisPlugin: Plugin = {
     after: ['logger'],
-    async handler(this: Plugin, befly: BeflyContext): Promise<RedisHelper | Record<string, never>> {
-        const config = this.config || {};
+    async handler(): Promise<RedisHelper | Record<string, never>> {
+        const redisConfig = beflyConfig.redis || {};
         try {
-            // 默认启用，除非显式禁用 (这里假设只要配置了 redis 插件就启用，或者检查 enable 字段)
-            // 为了兼容性，如果 config 为空，可能意味着使用默认值连接本地 redis
-
-            // 初始化 Redis 客户端（统一使用 connect.ts 的连接管理）
-            await Connect.connectRedis(config);
+            // 初始化 Redis 客户端
+            await Connect.connectRedis();
 
             // 返回 RedisHelper 实例
-            return new RedisHelper(config.prefix);
+            return new RedisHelper(redisConfig.prefix);
         } catch (error: any) {
             Logger.error({ err: error }, 'Redis 初始化失败');
-
-            // 插件内禁止直接退出进程，抛出异常交由主流程统一处理
             throw error;
         }
     }

package/router/static.ts

@@ -10,18 +10,15 @@ import { join } from 'pathe';
 import { projectDir } from '../paths.js';
 import { Logger } from '../lib/logger.js';
 import { setCorsOptions } from '../util.js';
-
-// 类型导入
-import type { BeflyOptions } from '../types/befly.js';
+import { beflyConfig } from '../befly.config.js';
 
 /**
  * 静态文件处理器工厂
- * @param config - Befly 配置
  */
-export function staticHandler(config: BeflyOptions) {
+export function staticHandler() {
     return async (req: Request): Promise<Response> => {
         // 设置 CORS 响应头
-        const corsHeaders = setCorsOptions(req, config.cors);
+        const corsHeaders = setCorsOptions(req, beflyConfig.cors);
 
         const url = new URL(req.url);
         const filePath = join(projectDir, 'public', url.pathname);

package/sync/syncAll.ts

@@ -9,30 +9,25 @@ import { syncDbCommand } from './syncDb.js';
 import { syncApiCommand } from './syncApi.js';
 import { syncMenuCommand } from './syncMenu.js';
 import { syncDevCommand } from './syncDev.js';
-import type { SyncOptions, BeflyOptions } from '../types/index.js';
+import { beflyConfig } from '../befly.config.js';
+import type { SyncOptions } from '../types/index.js';
 
-export async function syncAllCommand(config: BeflyOptions, options: SyncOptions = {}) {
+export async function syncAllCommand(options: SyncOptions = {}) {
     try {
-        const startTime = Date.now();
-
         // 0. 检查项目结构
         await checkApp();
 
         // 1. 同步数据库表结构
-        await syncDbCommand(config, { dryRun: false, force: options.force || false });
+        await syncDbCommand({ dryRun: false, force: options.force || false });
 
         // 2. 同步接口（并缓存）
-        await syncApiCommand(config);
+        await syncApiCommand();
 
         // 3. 同步菜单（并缓存）
-        await syncMenuCommand(config);
+        await syncMenuCommand();
 
         // 4. 同步开发管理员（并缓存角色权限）
-        await syncDevCommand(config);
-
-        // 输出总结
-        const totalTimeSeconds = ((Date.now() - startTime) / 1000).toFixed(2);
-        Logger.info({ duration: totalTimeSeconds }, '同步完成');
+        await syncDevCommand();
     } catch (error: any) {
         Logger.error({ err: error }, '同步过程中发生错误');
         throw error;

package/sync/syncApi.ts

@@ -21,8 +21,9 @@ import { scanAddons, addonDirExists, getAddonDir } from 'befly-shared/addonHelpe
 
 import { Logger } from '../lib/logger.js';
 import { projectDir } from '../paths.js';
+import { beflyConfig } from '../befly.config.js';
 
-import type { SyncApiOptions, ApiInfo, BeflyOptions } from '../types/index.js';
+import type { SyncApiOptions, ApiInfo } from '../types/index.js';
 
 /**
  * 从 API 文件中提取接口信息
@@ -215,7 +216,7 @@ async function deleteObsoleteRecords(helper: any, apiPaths: Set<string>): Promis
 /**
  * SyncApi 命令主函数
  */
-export async function syncApiCommand(config: BeflyOptions, options: SyncApiOptions = {}): Promise<void> {
+export async function syncApiCommand(options: SyncApiOptions = {}): Promise<void> {
     try {
         if (options.plan) {
             Logger.debug('[计划] 同步 API 接口到数据库（plan 模式不执行）');
@@ -223,7 +224,7 @@ export async function syncApiCommand(config: BeflyOptions, options: SyncApiOptio
         }
 
         // 连接数据库（SQL + Redis）
-        await Connect.connect(config);
+        await Connect.connect();
 
         const helper = new DbHelper({ redis: new RedisHelper() } as any, Connect.getSql());
 

package/sync/syncDb.ts

@@ -26,8 +26,9 @@ import { modifyTable } from './syncDb/table.js';
 import { createTable } from './syncDb/tableCreate.js';
 import { applyFieldDefaults } from './syncDb/helpers.js';
 import { setDbType } from './syncDb/constants.js';
+import { beflyConfig } from '../befly.config.js';
 import type { SQL } from 'bun';
-import type { BeflyOptions, SyncDbOptions } from '../types/index.js';
+import type { SyncDbOptions } from '../types/index.js';
 
 // 全局 SQL 客户端实例
 let sql: SQL | null = null;
@@ -44,20 +45,20 @@ const processedTables: string[] = [];
  * 3. 扫描表定义文件（核心表、项目表、addon表）
  * 4. 对比并应用表结构变更
  */
-export async function syncDbCommand(config: BeflyOptions, options: SyncDbOptions = {}): Promise<void> {
+export async function syncDbCommand(options: SyncDbOptions = {}): Promise<void> {
     try {
         // 清空处理记录
         processedTables.length = 0;
 
         // 设置数据库类型（从配置获取）
-        const dbType = config.db?.type || 'mysql';
+        const dbType = beflyConfig.db?.type || 'mysql';
         setDbType(dbType);
 
         // 验证表定义文件
         await checkTable();
 
         // 建立数据库连接并检查版本
-        sql = await Connect.connectSql({ max: 1 });
+        sql = await Connect.connectSql();
         await ensureDbVersion(sql);
 
         // 初始化 Redis 连接（用于清理缓存）
@@ -116,7 +117,7 @@ export async function syncDbCommand(config: BeflyOptions, options: SyncDbOptions
                     applyFieldDefaults(fieldDef);
                 }
 
-                const dbName = config.db?.database;
+                const dbName = beflyConfig.db?.database;
                 const existsTable = await tableExists(sql!, tableName, dbName);
 
                 // 读取 force 参数

package/sync/syncDev.ts

@@ -15,26 +15,27 @@ import { Connect } from '../lib/connect.js';
 import { DbHelper } from '../lib/dbHelper.js';
 import { RedisHelper } from '../lib/redisHelper.js';
 import { CacheHelper } from '../lib/cacheHelper.js';
+import { beflyConfig } from '../befly.config.js';
 
-import type { SyncDevOptions, SyncDevStats, BeflyOptions } from '../types/index.js';
+import type { SyncDevOptions, SyncDevStats } from '../types/index.js';
 
 /**
  * SyncDev 命令主函数
  */
-export async function syncDevCommand(config: BeflyOptions, options: SyncDevOptions = {}): Promise<void> {
+export async function syncDevCommand(options: SyncDevOptions = {}): Promise<void> {
     try {
         if (options.plan) {
             Logger.debug('[计划] 同步完成后将初始化/更新开发管理员账号（plan 模式不执行）');
             return;
         }
 
-        if (!config.devPassword) {
+        if (!beflyConfig.devPassword) {
             // 未配置开发者密码，跳过同步
             return;
         }
 
         // 连接数据库（SQL + Redis）
-        await Connect.connect(config);
+        await Connect.connect();
 
         const helper = new DbHelper({ redis: new RedisHelper() } as any, Connect.getSql());
 
@@ -121,12 +122,12 @@ export async function syncDevCommand(config: BeflyOptions, options: SyncDevOptio
         }
 
         // 使用 bcrypt 加密密码
-        const hashed = await Cipher.hashPassword(config.devPassword);
+        const hashed = await Cipher.hashPassword(beflyConfig.devPassword);
 
         // 准备开发管理员数据
         const devData = {
             nickname: '开发者',
-            email: config.devEmail,
+            email: beflyConfig.devEmail,
             username: 'dev',
             password: hashed,
             roleId: devRole.id,
@@ -137,14 +138,14 @@ export async function syncDevCommand(config: BeflyOptions, options: SyncDevOptio
         // 查询现有账号
         const existing = await helper.getOne({
             table: 'addon_admin_admin',
-            where: { email: config.devEmail }
+            where: { email: beflyConfig.devEmail }
         });
 
         if (existing) {
             // 更新现有账号
             await helper.updData({
                 table: 'addon_admin_admin',
-                where: { email: config.devEmail },
+                where: { email: beflyConfig.devEmail },
                 data: devData
             });
         } else {