befly 3.8.29 → 3.8.31

package/sync/syncApi.ts

@@ -13,13 +13,17 @@
 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';
+import { beflyConfig } from '../befly.config.js';
 
-import type { SyncApiOptions, ApiInfo, BeflyOptions } from '../types/index.js';
+import type { SyncApiOptions, ApiInfo } from '../types/index.js';
 
 /**
  * 从 API 文件中提取接口信息
@@ -59,7 +63,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 +140,7 @@ async function scanAllApis(projectRoot: string): Promise<ApiInfo[]> {
 
         return apis;
     } catch (error: any) {
-        Logger.error(`接口扫描失败:`, error);
+        Logger.error({ err: error }, '接口扫描失败');
         return apis;
     }
 }
@@ -184,7 +188,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 }, '同步接口失败');
         }
     }
 }
@@ -212,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 模式不执行）');
@@ -220,9 +224,9 @@ export async function syncApiCommand(config: BeflyOptions, options: SyncApiOptio
         }
 
         // 连接数据库（SQL + Redis）
-        await Connect.connect(config);
+        await Connect.connect();
 
-        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 +255,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';
 
@@ -24,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;
@@ -42,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 连接（用于清理缓存）
@@ -114,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 参数
@@ -134,17 +137,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,33 +7,37 @@
  * - 表名: 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 type { SyncDevOptions, SyncDevStats, BeflyOptions } from '../types/index.js';
+import { RedisHelper } from '../lib/redisHelper.js';
+import { CacheHelper } from '../lib/cacheHelper.js';
+import { beflyConfig } from '../befly.config.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 = Connect.getDbHelper();
+        const helper = new DbHelper({ redis: new RedisHelper() } as any, Connect.getSql());
 
         // 检查 addon_admin_admin 表是否存在
         const existAdmin = await helper.tableExists('addon_admin_admin');
@@ -118,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,
@@ -134,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 {
@@ -152,57 +156,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();