befly 3.8.29 → 3.8.30

package/main.ts

@@ -4,12 +4,11 @@
  */
 
 // ========== 外部依赖 ==========
-import { calcPerfTime } from 'befly-util';
+import { calcPerfTime } from 'befly-shared/calcPerfTime';
 
 // ========== 相对导入 ==========
 import { Logger } from './lib/logger.js';
 import { Cipher } from './lib/cipher.js';
-import { Jwt } from './lib/jwt.js';
 import { Connect } from './lib/connect.js';
 import { DbHelper } from './lib/dbHelper.js';
 import { RedisHelper } from './lib/redisHelper.js';
@@ -103,7 +102,7 @@ export class Befly {
                     '/*': staticHandler(this.config)
                 },
                 error: (error: Error) => {
-                    Logger.error('服务启动时发生错误', error);
+                    Logger.error({ err: error }, '服务启动时发生错误');
                     return Response.json({ code: 1, msg: '内部服务器错误' });
                 }
             });
@@ -128,7 +127,7 @@ export class Befly {
                     await Connect.disconnect();
                     Logger.info('数据库连接已关闭');
                 } catch (error: any) {
-                    Logger.error('关闭数据库连接时出错:', error);
+                    Logger.error({ err: error }, '关闭数据库连接时出错');
                 }
 
                 Logger.info('服务器已优雅关闭');
@@ -140,20 +139,8 @@ export class Befly {
 
             return server;
         } catch (error: any) {
-            Logger.error('项目启动失败', error);
+            Logger.error({ err: error }, '项目启动失败');
             process.exit(1);
         }
     }
 }
-
-// 核心类和工具导出
-export {
-    // 配置
-    Logger,
-    Cipher,
-    Jwt,
-    Database,
-    DbHelper,
-    RedisHelper,
-    coreDir
-};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly",
-    "version": "3.8.29",
+    "version": "3.8.30",
     "description": "Befly - 为 Bun 专属打造的 TypeScript API 接口框架核心引擎",
     "type": "module",
     "private": false,
@@ -15,10 +15,7 @@
             "types": "./main.ts",
             "default": "./main.ts"
         },
-        "./types": {
-            "types": "./types/index.ts",
-            "default": "./types/index.ts"
-        }
+        "./*": "./*"
     },
     "scripts": {
         "bundler": "bun build ./main.ts --outfile ./main.single.ts --minify --target bun"
@@ -66,12 +63,16 @@
         "bun": ">=1.3.0"
     },
     "dependencies": {
-        "befly-util": "^1.0.7",
+        "befly-shared": "^1.1.1",
         "chalk": "^5.6.2",
         "es-toolkit": "^1.42.0",
-        "pathe": "^2.0.3"
+        "fast-jwt": "^6.0.2",
+        "fast-xml-parser": "^5.3.2",
+        "pathe": "^2.0.3",
+        "pino": "^10.1.0",
+        "pino-roll": "^4.0.0"
     },
-    "gitHead": "1f3cacbe4134ee60654b75338bcaeda535898a84",
+    "gitHead": "2031550167896390ac58c50aeb52b8c23426844e",
     "devDependencies": {
         "typescript": "^5.9.3"
     }

package/paths.ts

@@ -46,9 +46,6 @@ export const corePluginDir = join(__dirname, 'plugins');
  */
 export const coreHookDir = join(__dirname, 'hooks');
 
-/**
- * Core 框架 API 目录
-
 /**
  * Core 框架 API 目录
  * @description packages/core/apis/
@@ -93,9 +90,6 @@ export const projectPluginDir = join(projectDir, 'plugins');
  */
 export const projectHookDir = join(projectDir, 'hooks');
 
-/**
- * 项目 API 目录
-
 /**
  * 项目 API 目录
  * @description {projectDir}/apis/

package/plugins/db.ts

@@ -26,14 +26,14 @@ const dbPlugin: Plugin = {
 
             return dbManager;
         } catch (error: any) {
-            Logger.error('数据库初始化失败', error);
+            Logger.error({ err: error }, '数据库初始化失败');
 
             // 清理资源
             if (sql) {
                 try {
                     await sql.close();
                 } catch (cleanupError: any) {
-                    Logger.error('清理连接池失败:', cleanupError);
+                    Logger.error({ err: cleanupError }, '清理连接池失败');
                 }
             }
 

package/plugins/jwt.ts

@@ -1,15 +1,15 @@
 /**
  * JWT 插件
- * 提供 JSON Web Token 签名和验证功能
  */
 
 import { Jwt } from '../lib/jwt.js';
 
 import type { Plugin } from '../types/plugin.js';
 
-export default {
-    name: 'jwt',
+const jwtPlugin: Plugin = {
     handler: (context, config) => {
-        return Jwt;
+        return new Jwt(config?.auth);
     }
-} as Plugin;
+};
+
+export default jwtPlugin;

package/plugins/redis.ts

@@ -26,7 +26,7 @@ const redisPlugin: Plugin = {
             // 返回 RedisHelper 实例
             return new RedisHelper(config.prefix);
         } catch (error: any) {
-            Logger.error('Redis 初始化失败', error);
+            Logger.error({ err: error }, 'Redis 初始化失败');
 
             // 插件内禁止直接退出进程，抛出异常交由主流程统一处理
             throw error;

package/router/api.ts

@@ -4,7 +4,7 @@
  */
 
 // 外部依赖
-import { genShortId } from 'befly-util';
+import { genShortId } from 'befly-shared/genShortId';
 
 // 相对导入
 import { FinalResponse } from '../util.js';
@@ -88,7 +88,7 @@ export function apiHandler(apis: Map<string, ApiRoute>, hooks: Hook[], context:
         } catch (err: any) {
             // 全局错误处理
             const errorPath = ctx.api ? apiPath : req.url;
-            Logger.error(`请求错误: ${errorPath}`, err);
+            Logger.error({ err: err, path: errorPath }, '请求错误');
             ctx.result = {
                 code: 1,
                 msg: '内部服务错误'

package/router/static.ts

@@ -55,8 +55,7 @@ export function staticHandler(config: BeflyOptions) {
                 );
             }
         } catch (error: any) {
-            // 记录详细的错误日志
-            Logger.error('静态文件处理失败', error);
+            Logger.error({ err: error }, '静态文件处理失败');
 
             return Response.json(
                 {

package/sync/syncAll.ts

@@ -32,9 +32,9 @@ export async function syncAllCommand(config: BeflyOptions, options: SyncOptions
 
         // 输出总结
         const totalTimeSeconds = ((Date.now() - startTime) / 1000).toFixed(2);
-        Logger.info(`同步完成 (耗时 ${totalTimeSeconds}s)`);
+        Logger.info({ duration: totalTimeSeconds }, '同步完成');
     } catch (error: any) {
-        Logger.error('同步过程中发生错误', error);
+        Logger.error({ err: error }, '同步过程中发生错误');
         throw error;
     }
 }

package/sync/syncApi.ts

@@ -13,8 +13,11 @@
 import { readdirSync, statSync } from 'node:fs';
 import { join, dirname, relative, basename } from 'pathe';
 import { Connect } from '../lib/connect.js';
+import { DbHelper } from '../lib/dbHelper.js';
 import { RedisHelper } from '../lib/redisHelper.js';
-import { scanFiles, scanAddons, addonDirExists, getAddonDir } from 'befly-util';
+import { RedisKeys } from 'befly-shared/redisKeys';
+import { scanFiles } from 'befly-shared/scanFiles';
+import { scanAddons, addonDirExists, getAddonDir } from 'befly-shared/addonHelper';
 
 import { Logger } from '../lib/logger.js';
 import { projectDir } from '../paths.js';
@@ -59,7 +62,7 @@ async function extractApiInfo(filePath: string, apiRoot: string, type: 'app' | '
             addonTitle: addonTitle || addonName
         };
     } catch (error: any) {
-        Logger.error('同步 API 失败:', error);
+        Logger.error({ err: error }, '同步 API 失败');
         throw error;
     }
 }
@@ -136,7 +139,7 @@ async function scanAllApis(projectRoot: string): Promise<ApiInfo[]> {
 
         return apis;
     } catch (error: any) {
-        Logger.error(`接口扫描失败:`, error);
+        Logger.error({ err: error }, '接口扫描失败');
         return apis;
     }
 }
@@ -184,7 +187,7 @@ async function syncApis(helper: any, apis: ApiInfo[]): Promise<void> {
                 });
             }
         } catch (error: any) {
-            Logger.error(`同步接口 "${api.name}" 失败:`, error);
+            Logger.error({ err: error, api: api.name }, '同步接口失败');
         }
     }
 }
@@ -222,7 +225,7 @@ export async function syncApiCommand(config: BeflyOptions, options: SyncApiOptio
         // 连接数据库（SQL + Redis）
         await Connect.connect(config);
 
-        const helper = Connect.getDbHelper();
+        const helper = new DbHelper({ redis: new RedisHelper() } as any, Connect.getSql());
 
         // 1. 检查表是否存在（addon_admin_api 来自 addon-admin 组件）
         const exists = await helper.tableExists('addon_admin_api');
@@ -251,12 +254,12 @@ export async function syncApiCommand(config: BeflyOptions, options: SyncApiOptio
             });
 
             const redisHelper = new RedisHelper();
-            await redisHelper.setObject('apis:all', apiList);
+            await redisHelper.setObject(RedisKeys.apisAll(), apiList);
         } catch (error: any) {
             // 忽略缓存错误
         }
     } catch (error: any) {
-        Logger.error('API 同步失败:', error);
+        Logger.error({ err: error }, 'API 同步失败');
         throw error;
     } finally {
         await Connect.disconnect();

package/sync/syncDb/apply.ts

@@ -175,8 +175,7 @@ export async function applyTablePlan(sql: SQL, tableName: string, fields: Record
                     Logger.debug(`[索引变化] 删除索引 ${tableName}.${act.indexName} (${act.fieldName})`);
                 }
             } catch (error: any) {
-                Logger.error(`${act.action === 'create' ? '创建' : '删除'}索引失败`, error);
-                Logger.warn(`表名: ${tableName}, 索引名: ${act.indexName}, 字段: ${act.fieldName}`);
+                Logger.error({ err: error, table: tableName, index: act.indexName, field: act.fieldName }, `${act.action === 'create' ? '创建' : '删除'}索引失败`);
                 throw error;
             }
         }

package/sync/syncDb.ts

@@ -13,7 +13,9 @@ import { snakeCase } from 'es-toolkit/string';
 import { Connect } from '../lib/connect.js';
 import { RedisHelper } from '../lib/redisHelper.js';
 import { checkTable } from '../checks/checkTable.js';
-import { scanFiles, scanAddons, addonDirExists, getAddonDir } from 'befly-util';
+import { scanFiles } from 'befly-shared/scanFiles';
+import { scanAddons, addonDirExists, getAddonDir } from 'befly-shared/addonHelper';
+import { RedisKeys } from 'befly-shared/redisKeys';
 import { Logger } from '../lib/logger.js';
 import { projectDir } from '../paths.js';
 
@@ -134,17 +136,11 @@ export async function syncDbCommand(config: BeflyOptions, options: SyncDbOptions
         // 清理 Redis 缓存（如果有表被处理）
         if (processedTables.length > 0) {
             const redisHelper = new RedisHelper();
-            for (const tableName of processedTables) {
-                const cacheKey = `table:columns:${tableName}`;
-                try {
-                    await redisHelper.del(cacheKey);
-                } catch (error: any) {
-                    Logger.warn(`清理表 ${tableName} 的缓存失败: ${error.message}`);
-                }
-            }
+            const cacheKeys = processedTables.map((tableName) => RedisKeys.tableColumns(tableName));
+            await redisHelper.delBatch(cacheKeys);
         }
     } catch (error: any) {
-        Logger.error('数据库同步失败', error);
+        Logger.error({ err: error }, '数据库同步失败');
         throw error;
     } finally {
         if (sql) {

package/sync/syncDev.ts

@@ -7,12 +7,15 @@
  * - 表名: addon_admin_admin
  */
 
-import { scanAddons, getAddonDir, normalizeModuleForSync } from 'befly-util';
+import { scanAddons, getAddonDir, normalizeModuleForSync } from 'befly-shared/addonHelper';
 
 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 { CacheHelper } from '../lib/cacheHelper.js';
+
 import type { SyncDevOptions, SyncDevStats, BeflyOptions } from '../types/index.js';
 
 /**
@@ -33,7 +36,7 @@ export async function syncDevCommand(config: BeflyOptions, options: SyncDevOptio
         // 连接数据库（SQL + Redis）
         await Connect.connect(config);
 
-        const helper = Connect.getDbHelper();
+        const helper = new DbHelper({ redis: new RedisHelper() } as any, Connect.getSql());
 
         // 检查 addon_admin_admin 表是否存在
         const existAdmin = await helper.tableExists('addon_admin_admin');
@@ -152,57 +155,16 @@ export async function syncDevCommand(config: BeflyOptions, options: SyncDevOptio
             });
         }
 
-        // 缓存角色权限数据到 Redis
+        // 缓存角色权限数据到 Redis（复用 CacheHelper 逻辑）
         try {
-            // 检查必要的表是否存在
-            const apiTableExists = await helper.tableExists('addon_admin_api');
-            const roleTableExists = await helper.tableExists('addon_admin_role');
-
-            if (apiTableExists && roleTableExists) {
-                // 查询所有角色
-                const roles = await helper.getAll({
-                    table: 'addon_admin_role',
-                    fields: ['id', 'code', 'apis']
-                });
-
-                // 查询所有接口
-                const allApis = await helper.getAll({
-                    table: 'addon_admin_api',
-                    fields: ['id', 'name', 'path', 'method', 'description', 'addonName']
-                });
-
-                const redis = Connect.getRedis();
-
-                // 为每个角色缓存接口权限
-                for (const role of roles) {
-                    if (!role.apis) continue;
-
-                    // 解析角色的接口 ID 列表
-                    const apiIds = role.apis
-                        .split(',')
-                        .map((id: string) => parseInt(id.trim()))
-                        .filter((id: number) => !isNaN(id));
-
-                    // 根据 ID 过滤出接口路径
-                    const roleApiPaths = allApis.filter((api: any) => apiIds.includes(api.id)).map((api: any) => `${api.method}${api.path}`);
-
-                    if (roleApiPaths.length === 0) continue;
-
-                    // 使用 Redis Set 缓存角色权限
-                    const redisKey = `role:apis:${role.code}`;
-
-                    // 先删除旧数据
-                    await redis.del(redisKey);
-
-                    // 批量添加到 Set（使用扩展运算符展开数组）
-                    await redis.sadd(redisKey, ...roleApiPaths);
-                }
-            }
+            const tempBefly = { db: helper, redis: new RedisHelper() } as any;
+            const cacheHelper = new CacheHelper(tempBefly);
+            await cacheHelper.cacheRolePermissions();
         } catch (error: any) {
             // 忽略缓存错误
         }
     } catch (error: any) {
-        Logger.error('同步开发者管理员失败', error);
+        Logger.error({ err: error }, '同步开发者管理员失败');
         throw error;
     } finally {
         await Connect.disconnect();

package/sync/syncMenu.ts

@@ -17,8 +17,11 @@
 import { join } from 'pathe';
 import { cloneDeep } from 'es-toolkit';
 import { Connect } from '../lib/connect.js';
+import { DbHelper } from '../lib/dbHelper.js';
 import { RedisHelper } from '../lib/redisHelper.js';
-import { scanAddons, getAddonDir, scanConfig } from 'befly-util';
+import { RedisKeys } from 'befly-shared/redisKeys';
+import { scanAddons, getAddonDir } from 'befly-shared/addonHelper';
+import { scanConfig } from 'befly-shared/scanConfig';
 import { Logger } from '../lib/logger.js';
 import { projectDir } from '../paths.js';
 
@@ -204,7 +207,7 @@ async function syncMenus(helper: any, menus: MenuConfig[]): Promise<void> {
         try {
             await syncMenuRecursive(helper, menu, 0, existingMenuMap, 1);
         } catch (error: any) {
-            Logger.error(`同步菜单 "${menu.name}" 失败`, error.message || String(error));
+            Logger.error({ err: error, menu: menu.name }, '同步菜单失败');
             throw error;
         }
     }
@@ -257,7 +260,7 @@ async function loadMenuConfigs(): Promise<Array<{ menus: MenuConfig[]; addonName
                 allMenus.push({ menus: menusWithPrefix, addonName: addonName });
             }
         } catch (error: any) {
-            Logger.warn(`读取 addon 配置失败 ${addonName}: ${error.message}`);
+            Logger.warn({ err: error, addon: addonName }, '读取 addon 配置失败');
         }
     }
 
@@ -276,7 +279,7 @@ async function loadMenuConfigs(): Promise<Array<{ menus: MenuConfig[]; addonName
             allMenus.push({ menus: appMenus, addonName: 'app' });
         }
     } catch (error: any) {
-        Logger.warn(`读取项目配置失败: ${error.message}`);
+        Logger.warn({ err: error }, '读取项目配置失败');
     }
 
     return allMenus;
@@ -301,7 +304,7 @@ export async function syncMenuCommand(config: BeflyOptions, options: SyncMenuOpt
         // 连接数据库（SQL + Redis）
         await Connect.connect(config);
 
-        const helper = Connect.getDbHelper();
+        const helper = new DbHelper({ redis: new RedisHelper() } as any, Connect.getSql());
 
         // 3. 检查表是否存在（addon_admin_menu 来自 addon-admin 组件）
         const exists = await helper.tableExists('addon_admin_menu');
@@ -330,12 +333,12 @@ export async function syncMenuCommand(config: BeflyOptions, options: SyncMenuOpt
         // 8. 缓存菜单数据到 Redis
         try {
             const redisHelper = new RedisHelper();
-            await redisHelper.setObject('menus:all', allMenusData);
+            await redisHelper.setObject(RedisKeys.menusAll(), allMenusData);
         } catch (error: any) {
-            Logger.warn(`Redis 缓存菜单数据失败: ${error.message}`);
+            Logger.warn({ err: error }, 'Redis 缓存菜单数据失败');
         }
     } catch (error: any) {
-        Logger.error('菜单同步失败', error);
+        Logger.error({ err: error }, '菜单同步失败');
         throw error;
     } finally {
         await Connect.disconnect();