befly 3.5.6 → 3.6.0

package/lib/addon.ts

@@ -0,0 +1,77 @@
+/**
+ * Addon 管理工具类
+ * 提供 addon 的扫描、路径获取等功能
+ */
+
+import fs from 'node:fs';
+import { join } from 'pathe';
+import { existsSync, statSync, readdirSync } from 'node:fs';
+import { projectDir } from '../paths.js';
+
+/**
+ * Addon 管理类
+ */
+export class Addon {
+    /**
+     * 扫描所有可用的 addon
+     * @returns addon 名称数组
+     */
+    static scan(): string[] {
+        const beflyDir = join(projectDir, 'node_modules', '@befly-addon');
+
+        if (!existsSync(beflyDir)) {
+            return [];
+        }
+
+        try {
+            return fs
+                .readdirSync(beflyDir)
+                .filter((name) => {
+                    // addon 名称格式：admin, demo 等（不带 addon- 前缀）
+                    const fullPath = join(beflyDir, name);
+                    try {
+                        const stat = statSync(fullPath);
+                        return stat.isDirectory();
+                    } catch {
+                        return false;
+                    }
+                })
+                .sort();
+        } catch {
+            return [];
+        }
+    }
+
+    /**
+     * 获取 addon 的指定子目录路径
+     * @param name - addon 名称
+     * @param subDir - 子目录名称
+     * @returns 完整路径
+     */
+    static getDir(name: string, subDir: string): string {
+        return join(projectDir, 'node_modules', '@befly-addon', name, subDir);
+    }
+
+    /**
+     * 检查 addon 子目录是否存在
+     * @param name - addon 名称
+     * @param subDir - 子目录名称
+     * @returns 是否存在
+     */
+    static dirExists(name: string, subDir: string): boolean {
+        const dir = this.getDir(name, subDir);
+        return existsSync(dir) && statSync(dir).isDirectory();
+    }
+
+    /**
+     * 获取插件目录列表
+     * @param addonsDir - addons 根目录路径
+     * @returns 插件名称数组
+     */
+    static getDirs(addonsDir: string): string[] {
+        return readdirSync(addonsDir).filter((name) => {
+            const addonPath = join(addonsDir, name);
+            return statSync(addonPath).isDirectory() && !name.startsWith('_');
+        });
+    }
+}

package/lib/database.ts

@@ -62,7 +62,7 @@ export class Database {
         }
 
         try {
-            const timeout = options.connectionTimeout ?? 5000;
+            const timeout = options.connectionTimeout ?? 30000;
 
             const healthCheckPromise = (async () => {
                 let version = '';
@@ -174,7 +174,7 @@ export class Database {
             const url = `redis://${auth}${REDIS_HOST}:${REDIS_PORT}/${REDIS_DB}`;
 
             const redis = new RedisClient(url, {
-                connectionTimeout: 10000,
+                connectionTimeout: 30000,
                 idleTimeout: 0,
                 autoReconnect: true,
                 maxRetries: 0,

package/lib/logger.ts

@@ -5,7 +5,6 @@
 
 import { join } from 'pathe';
 import { appendFile, stat } from 'node:fs/promises';
-import chalk from 'chalk';
 import { Env } from '../env.js';
 import type { LogLevel } from '../types/common.js';
 
@@ -54,12 +53,6 @@ export class Logger {
 
         // 格式化消息
         const timestamp = formatDate();
-        const colorMap = {
-            info: chalk.greenBright,
-            debug: chalk.cyanBright,
-            warn: chalk.yellowBright,
-            error: chalk.redBright
-        };
 
         // 处理消息内容
         let content = '';
@@ -69,19 +62,17 @@ export class Logger {
             content = String(message);
         }
 
-        // 带颜色的控制台消息
-        const coloredLevelStr = colorMap[level](level.toUpperCase().padStart(5));
-        const coloredMessage = `[${timestamp}] ${coloredLevelStr} - ${content}`;
+        // 格式化日志消息
+        const levelStr = level.toUpperCase().padStart(5);
+        const logMessage = `[${timestamp}] ${levelStr} - ${content}`;
 
         // 控制台输出
         if (this.config.toConsole) {
-            console.log(coloredMessage);
+            console.log(logMessage);
         }
 
-        // 文件输出（去除 ANSI 颜色代码）
-        const plainLevelStr = level.toUpperCase().padStart(5);
-        const plainMessage = `[${timestamp}] ${plainLevelStr} - ${content}`;
-        await this.writeToFile(plainMessage, level);
+        // 文件输出
+        await this.writeToFile(logMessage, level);
     }
 
     /**

package/lifecycle/checker.ts

@@ -6,8 +6,9 @@
 import { join, basename } from 'pathe';
 import { Logger } from '../lib/logger.js';
 import { calcPerfTime } from '../util.js';
-import { coreCheckDir } from '../paths.js';
-import { scanAddons, getAddonDir, addonDirExists } from '../util.js';
+import { projectCheckDir } from '../paths.js';
+import { checkDefault } from '../check.js';
+import { Addon } from '../lib/addon.js';
 
 /**
  * 系统检查器类
@@ -20,6 +21,9 @@ export class Checker {
         try {
             const checkStartTime = Bun.nanoseconds();
 
+            // 先执行默认检查（有异常会自动抛出）
+            await checkDefault();
+
             const glob = new Bun.Glob('*.{ts}');
 
             // 统计信息
@@ -29,50 +33,19 @@ export class Checker {
                 failedChecks: 0
             };
 
-            // 1. 优先执行资源冲突检测（如果存在）
-            try {
-                const conflictCheckPath = join(coreCheckDir, 'conflict.ts');
-                const conflictCheckFile = Bun.file(conflictCheckPath);
-
-                if (await conflictCheckFile.exists()) {
-                    stats.totalChecks++;
-                    const conflictCheckStart = Bun.nanoseconds();
+            // 检查目录列表：先项目，后 addons
+            const checkDirs: Array<{ path: string; type: 'app' | 'addon'; addonName?: string }> = [];
 
-                    const conflictModule = await import(conflictCheckPath);
-                    const conflictCheckFn = conflictModule.default;
+            // 添加项目 checks 目录
+            checkDirs.push({ path: projectCheckDir, type: 'app' });
 
-                    if (typeof conflictCheckFn === 'function') {
-                        const conflictResult = await conflictCheckFn();
-                        const conflictCheckTime = calcPerfTime(conflictCheckStart);
-
-                        if (typeof conflictResult !== 'boolean') {
-                            Logger.warn(`核心检查 conflict.ts 返回值必须为 true 或 false，当前为 ${typeof conflictResult}`);
-                            stats.failedChecks++;
-                        } else if (conflictResult === true) {
-                            stats.passedChecks++;
-                        } else {
-                            Logger.warn(`核心检查未通过: conflict.ts`);
-                            stats.failedChecks++;
-                            // 资源冲突检测失败，立即终止
-                            Logger.warn('资源冲突检测失败，无法继续启动');
-                            process.exit(1);
-                        }
-                    }
-                }
-            } catch (error: any) {
-                Logger.error('执行资源冲突检测时出错:', error);
-                stats.failedChecks++;
-            }
-
-            // 2. 检查目录列表：先核心，后项目，最后 addons
-            // 检查所有 checks 目录
-            const checkDirs = [{ path: coreCheckDir, type: 'core' as const }]; // 添加所有 addon 的 checks 目录
-            const addons = scanAddons();
+            // 添加所有 addon 的 checks 目录
+            const addons = Addon.scan();
             for (const addon of addons) {
-                if (addonDirExists(addon, 'checks')) {
+                if (Addon.dirExists(addon, 'checks')) {
                     checkDirs.push({
-                        path: getAddonDir(addon, 'checks'),
-                        type: 'addon' as const,
+                        path: Addon.getDir(addon, 'checks'),
+                        type: 'addon',
                         addonName: addon
                     });
                 }
@@ -80,9 +53,10 @@ export class Checker {
 
             // 按顺序扫描并执行检查函数
             for (const checkConfig of checkDirs) {
-                const { path: checkDir, type } = checkConfig;
+                const { path: checkDir, type: type } = checkConfig;
                 const addonName = 'addonName' in checkConfig ? checkConfig.addonName : undefined;
-                const checkTypeLabel = type === 'core' ? '核心' : type === 'project' ? '项目' : `组件${addonName}`;
+                const checkTypeLabel = type === 'app' ? '项目' : `组件${addonName}`;
+
                 for await (const file of glob.scan({
                     cwd: checkDir,
                     onlyFiles: true,
@@ -91,9 +65,6 @@ export class Checker {
                     const fileName = basename(file);
                     if (fileName.startsWith('_')) continue; // 跳过以下划线开头的文件
 
-                    // 跳过已经执行过的 conflict.ts
-                    if (type === 'core' && fileName === 'conflict.ts') continue;
-
                     try {
                         stats.totalChecks++;
                         const singleCheckStart = Bun.nanoseconds();
@@ -135,10 +106,10 @@ export class Checker {
 
             // 输出检查结果统计
             if (stats.failedChecks > 0) {
-                Logger.error(`✗ 系统检查失败: ${stats.failedChecks}/${stats.totalChecks}，耗时: ${totalCheckTime}`);
+                Logger.error(`系统检查失败: ${stats.failedChecks}/${stats.totalChecks}，耗时: ${totalCheckTime}`);
                 process.exit(1);
             } else if (stats.totalChecks > 0) {
-                Logger.info(`✓ 系统检查通过: ${stats.passedChecks}/${stats.totalChecks}，耗时: ${totalCheckTime}`);
+                Logger.info(`系统检查通过: ${stats.passedChecks}/${stats.totalChecks}，耗时: ${totalCheckTime}`);
             }
         } catch (error: any) {
             Logger.error('执行系统检查时发生错误', error);

package/lifecycle/lifecycle.ts

@@ -4,10 +4,12 @@
  */
 
 import { Logger } from '../lib/logger.js';
-import { calcPerfTime } from '../util.js';
-import { scanAddons, addonDirExists } from '../util.js';
-import { Checker } from './checker.js';
+import { Database } from '../lib/database.js';
 import { Loader } from './loader.js';
+import { Checker } from './checker.js';
+import { Env } from '../env.js';
+import { calcPerfTime } from '../util.js';
+import { Addon } from '../lib/addon.js';
 import { Bootstrap } from './bootstrap.js';
 
 import type { Server } from 'bun';
@@ -78,10 +80,10 @@ export class Lifecycle {
         }
 
         // 2. 加载 addon APIs
-        const addons = scanAddons();
+        const addons = Addon.scan();
 
         for (const addon of addons) {
-            const hasApis = addonDirExists(addon, 'apis');
+            const hasApis = Addon.dirExists(addon, 'apis');
             if (hasApis) {
                 try {
                     await Loader.loadApis(addon, this.apiRoutes, { where: 'addon', addonName: addon });

package/lifecycle/loader.ts

@@ -9,7 +9,7 @@ import { isPlainObject } from 'es-toolkit/compat';
 import { Logger } from '../lib/logger.js';
 import { calcPerfTime } from '../util.js';
 import { corePluginDir, projectPluginDir, coreApiDir, projectApiDir } from '../paths.js';
-import { scanAddons, getAddonDir, addonDirExists } from '../util.js';
+import { Addon } from '../lib/addon.js';
 import type { Plugin } from '../types/plugin.js';
 import type { ApiRoute } from '../types/api.js';
 import type { BeflyContext } from '../types/befly.js';
@@ -148,13 +148,13 @@ export class Loader {
             Logger.info(`✓ 核心插件加载完成: ${corePlugins.length} 个，耗时: ${corePluginsScanTime}`);
 
             // 扫描 addon 插件目录
-            const addons = scanAddons();
+            const addons = Addon.scan();
             if (addons.length > 0) {
                 const addonPluginsScanStart = Bun.nanoseconds();
                 for (const addon of addons) {
-                    if (!addonDirExists(addon, 'plugins')) continue;
+                    if (!Addon.dirExists(addon, 'plugins')) continue;
 
-                    const addonPluginsDir = getAddonDir(addon, 'plugins');
+                    const addonPluginsDir = Addon.getDir(addon, 'plugins');
                     for await (const file of glob.scan({
                         cwd: addonPluginsDir,
                         onlyFiles: true,
@@ -325,7 +325,7 @@ export class Loader {
             if (where === 'core') {
                 apiDir = coreApiDir;
             } else if (where === 'addon') {
-                apiDir = getAddonDir(addonName, 'apis');
+                apiDir = Addon.getDir(addonName, 'apis');
             } else {
                 apiDir = projectApiDir;
             }

package/main.ts

@@ -10,6 +10,10 @@ import { Cipher } from './lib/cipher.js';
 import { Jwt } from './lib/jwt.js';
 import { Database } from './lib/database.js';
 import { Lifecycle } from './lifecycle/lifecycle.js';
+import { coreDir } from './paths.js';
+import { DbHelper } from './lib/dbHelper.js';
+import { RedisHelper } from './lib/redisHelper.js';
+import { Addon } from './lib/addon.js';
 
 import type { Server } from 'bun';
 import type { BeflyContext, BeflyOptions } from './types/befly.js';
@@ -71,5 +75,10 @@ export {
     Cipher,
     Jwt,
     Yes,
-    No
+    No,
+    coreDir,
+    Database,
+    DbHelper,
+    RedisHelper,
+    Addon
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly",
-    "version": "3.5.6",
+    "version": "3.6.0",
     "description": "Befly - 为 Bun 专属打造的 TypeScript API 接口框架核心引擎",
     "type": "module",
     "private": false,
@@ -10,9 +10,6 @@
     },
     "main": "main.ts",
     "types": "./types/index.d.ts",
-    "bin": {
-        "befly": "./bin/index.ts"
-    },
     "exports": {
         ".": {
             "default": "./main.ts"
@@ -30,7 +27,6 @@
         "api",
         "framework",
         "core",
-        "cli",
         "typescript",
         "javascript",
         "backend",
@@ -42,10 +38,8 @@
     "homepage": "https://chensuiyi.me",
     "license": "Apache-2.0",
     "files": [
-        "bin/",
         "apis/",
         "checks/",
-        "commands/",
         "config/",
         "lib/",
         "lifecycle/",
@@ -76,9 +70,8 @@
         "bun": ">=1.3.0"
     },
     "dependencies": {
-        "chalk": "^5.6.2",
         "es-toolkit": "^1.41.0",
         "pathe": "^2.0.3"
     },
-    "gitHead": "7ef2b7ddf3c66a79d3d0af5e6f9653d7d7d02fdb"
+    "gitHead": "e6d6cd5dd4098fc9b4cf537b0dcdc7e781c0e80e"
 }

package/paths.ts

@@ -8,24 +8,6 @@
  * - root* 系列：Core 框架内部路径（packages/core/*）
  * - project* 系列：用户项目路径（process.cwd()/*）
  *
- * 目录结构：
- * ```
- * packages/core/           (coreDir)
- *   ├── scripts/           (coreScriptDir)
- *   ├── config/            (coreConfigDir)
- *   ├── checks/            (coreCheckDir)
- *   ├── plugins/           (corePluginDir)
- *   ├── apis/              (coreApiDir)
- *   └── tables/            (coreTableDir)
- *
- * project/                 (projectDir)
- *   ├── scripts/           (projectScriptDir)
- *   ├── config/            (projectConfigDir)
- *   ├── checks/            (projectCheckDir)
- *   ├── plugins/           (projectPluginDir)
- *   ├── apis/              (projectApiDir)
- *   └── tables/            (projectTableDir)
- * ```
  */
 
 import { fileURLToPath } from 'node:url';
@@ -35,9 +17,6 @@ import { dirname, join } from 'pathe';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
-// 项目根目录（befly 框架的使用方项目）
-const projectRoot = process.cwd();
-
 // ==================== Core 框架路径 ====================
 
 /**
@@ -46,20 +25,6 @@ const projectRoot = process.cwd();
  */
 export const coreDir = __dirname;
 
-/**
- * Core 框架脚本目录
- * @description packages/core/scripts/
- * @usage 存放框架级别的脚本工具
- */
-export const coreScriptDir = join(__dirname, 'scripts');
-
-/**
- * Core 框架配置目录
- * @description packages/core/config/
- * @usage 存放框架默认配置（env.ts, fields.ts 等）
- */
-export const coreConfigDir = join(__dirname, 'config');
-
 /**
  * Core 框架检查目录
  * @description packages/core/checks/
@@ -95,46 +60,32 @@ export const coreTableDir = join(__dirname, 'tables');
  * @description process.cwd()
  * @usage 用户项目的根目录
  */
-export const projectDir = projectRoot;
-
-/**
- * 项目脚本目录
- * @description {projectDir}/scripts/
- * @usage 存放用户自定义脚本工具
- */
-export const projectScriptDir = join(projectRoot, 'scripts');
-
-/**
- * 项目配置目录
- * @description {projectDir}/config/
- * @usage 存放用户项目配置（覆盖框架默认配置）
- */
-export const projectConfigDir = join(projectRoot, 'config');
+export const projectDir = process.cwd();
 
 /**
  * 项目检查目录
  * @description {projectDir}/checks/
  * @usage 存放用户自定义启动检查模块
  */
-export const projectCheckDir = join(projectRoot, 'checks');
+export const projectCheckDir = join(projectDir, 'checks');
 
 /**
  * 项目插件目录
  * @description {projectDir}/plugins/
  * @usage 存放用户自定义插件
  */
-export const projectPluginDir = join(projectRoot, 'plugins');
+export const projectPluginDir = join(projectDir, 'plugins');
 
 /**
  * 项目 API 目录
  * @description {projectDir}/apis/
  * @usage 存放用户业务 API 接口
  */
-export const projectApiDir = join(projectRoot, 'apis');
+export const projectApiDir = join(projectDir, 'apis');
 
 /**
  * 项目表定义目录
  * @description {projectDir}/tables/
  * @usage 存放用户业务表定义（JSON 格式）
  */
-export const projectTableDir = join(projectRoot, 'tables');
+export const projectTableDir = join(projectDir, 'tables');

package/plugins/db.ts

@@ -24,7 +24,7 @@ const dbPlugin: Plugin = {
             if (Env.DB_ENABLE === 1) {
                 // 创建 Bun SQL 客户端（内置连接池），并确保连接验证成功后再继续
                 // 从环境变量读取连接超时配置
-                const connectionTimeout = Env.DB_CONNECTION_TIMEOUT ? parseInt(Env.DB_CONNECTION_TIMEOUT) : 5000;
+                const connectionTimeout = Env.DB_CONNECTION_TIMEOUT ? parseInt(Env.DB_CONNECTION_TIMEOUT) : 30000;
 
                 sql = await Database.connectSql({
                     connectionTimeout

package/types/database.d.ts

@@ -168,7 +168,7 @@ export interface SqlClientOptions {
     max?: number;
     /** 是否使用 BigInt */
     bigint?: boolean;
-    /** 连接超时时间（毫秒），默认 5000ms */
+    /** 连接超时时间（毫秒），默认 30000ms */
     connectionTimeout?: number;
     /** 其他自定义选项 */
     [key: string]: any;

package/util.ts

@@ -1,21 +1,4 @@
-/**
- * Befly 核心工具函数集合
- *
- * 本文件整合了框架核心工具函数：
- * - API 响应工具（Yes, No）
- * - 对象操作（pickFields, fieldClear）
- * - 日期时间（calcPerfTime）
- * - 表定义工具（parseRule）
- * - Addon 管理（scanAddons, getAddonDir 等）
- *
- * 注意：
- * - JWT 工具位于 lib/jwt.ts
- * - Logger 位于 lib/logger.ts
- * - Validator 位于 lib/validator.ts
- * - Database 管理位于 lib/database.ts
- */
-
-import fs from 'node:fs';
+import fs from 'node:fs';
 import { join } from 'pathe';
 import { readdirSync, statSync, readFileSync, existsSync } from 'node:fs';
 import { isEmpty, isPlainObject } from 'es-toolkit/compat';
@@ -232,68 +215,3 @@ export const parseRule = (rule: string): ParsedFieldRule => {
         regex: fieldRegx !== 'null' ? fieldRegx : null
     };
 };
-
-// ========================================
-// Addon 管理工具
-// ========================================
-
-/**
- * 扫描所有可用的 addon
- */
-export const scanAddons = (): string[] => {
-    const beflyDir = join(projectDir, 'node_modules', '@befly-addon');
-
-    if (!existsSync(beflyDir)) {
-        return [];
-    }
-
-    try {
-        return fs
-            .readdirSync(beflyDir)
-            .filter((name) => {
-                // addon 名称格式：admin, demo 等（不带 addon- 前缀）
-                const fullPath = join(beflyDir, name);
-                try {
-                    const stat = statSync(fullPath);
-                    return stat.isDirectory();
-                } catch {
-                    return false;
-                }
-            })
-            .sort();
-    } catch {
-        return [];
-    }
-};
-
-/**
- * 获取 addon 的指定子目录路径
- */
-export const getAddonDir = (addonName: string, subDir: string): string => {
-    return join(projectDir, 'node_modules', '@befly-addon', addonName, subDir);
-};
-
-/**
- * 检查 addon 子目录是否存在
- */
-export const addonDirExists = (addonName: string, subDir: string): boolean => {
-    const dir = getAddonDir(addonName, subDir);
-    return existsSync(dir) && statSync(dir).isDirectory();
-};
-
-/**
- * 获取插件目录列表
- * @param addonsDir - addons 根目录路径
- * @returns 插件名称数组
- */
-export function getAddonDirs(addonsDir: string): string[] {
-    // try {
-    return readdirSync(addonsDir).filter((name) => {
-        const addonPath = path.join(addonsDir, name);
-        return statSync(addonPath).isDirectory() && !name.startsWith('_');
-    });
-    // } catch (error: any) {
-    //     Logger.error(`读取插件目录失败: ${addonsDir}`, error.message);
-    //     return [];
-    // }
-}

package/apis/admin/del.ts

@@ -1,35 +0,0 @@
-/**
- * 删除管理员
- */
-
-import { Yes, No } from '../../util.js';
-
-export default {
-    name: '删除管理员',
-    fields: {},
-    required: ['id'],
-    handler: async (befly, ctx) => {
-        // 检查管理员是否存在
-        const admin = await befly.db.getOne({
-            table: 'core_admin',
-            where: { id: ctx.body.id }
-        });
-
-        if (!admin) {
-            return No('管理员不存在');
-        }
-
-        // 不能删除 dev 角色的管理员
-        if (admin.roleCode === 'dev') {
-            return No('不能删除开发者账号');
-        }
-
-        // 删除管理员
-        await befly.db.delData({
-            table: 'core_admin',
-            where: { id: ctx.body.id }
-        });
-
-        return Yes('删除成功');
-    }
-};