befly 3.19.7 → 3.19.9

package/lib/redisHelper.js

@@ -501,15 +501,19 @@ export class RedisHelper {
     async info(section) {
         try {
             const client = this.client;
-            if (typeof client.info !== "function") {
-                throw new Error("Redis info 不支持", {
-                    cause: null,
-                    code: "runtime"
-                });
+
+            if (typeof client.info === "function") {
+                return await client.info(section);
             }
 
-            const res = await client.info(section);
-            return res;
+            if (typeof client.send === "function") {
+                return await client.send("INFO", section ? [String(section)] : []);
+            }
+
+            throw new Error("Redis info 不支持", {
+                cause: null,
+                code: "runtime"
+            });
         } catch (error) {
             Logger.error("Redis info 错误", error);
             return "";

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "befly",
-    "version": "3.19.7",
-    "gitHead": "c47d1e515dabe142531e0a8415979cccb2729259",
+    "version": "3.19.9",
+    "gitHead": "558ea1598bb0547b5b068a1c014ea1f4d48939d5",
     "private": false,
     "description": "Befly - 为 Bun 专属打造的 JavaScript API 接口框架核心引擎",
     "keywords": [

package/scripts/syncDb/context.js

@@ -9,6 +9,7 @@ import { isNonEmptyString, isPlainObject } from "../../utils/is.js";
 import { camelCase } from "../../utils/util.js";
 import { buildSyncDbDiff, groupSyncDbColumns } from "./diff.js";
 import { querySyncDbColumns } from "./query.js";
+import { printSyncDbProcessLog } from "./report.js";
 
 async function loadSyncDbTableDefs(tablesDir) {
     const tableMap = new Map();
@@ -52,6 +53,7 @@ async function loadSyncDbTableDefs(tablesDir) {
 export async function prepareSyncDbBaseContext(mysqlConfig) {
     const tablesDir = resolve(join(process.cwd(), "tables"));
     await mkdir(tablesDir, { recursive: true });
+    printSyncDbProcessLog(`tables目录=${tablesDir}`);
 
     if (!isPlainObject(mysqlConfig)) {
         throw new Error("syncDb 缺少 mysql 配置", {
@@ -62,6 +64,7 @@ export async function prepareSyncDbBaseContext(mysqlConfig) {
         });
     }
 
+    printSyncDbProcessLog(`连接 MySQL，database=${mysqlConfig.database}`);
     await Connect.connectMysql(mysqlConfig);
     const mysql = new DbHelper({
         redis: null,
@@ -71,7 +74,9 @@ export async function prepareSyncDbBaseContext(mysqlConfig) {
         beflyMode: mysqlConfig.beflyMode
     });
 
+    printSyncDbProcessLog("开始读取数据库字段信息");
     const dbColumns = await querySyncDbColumns(mysql);
+    printSyncDbProcessLog(`数据库字段读取完成，columnCount=${dbColumns.length}`);
     const skippedBeflyTables = new Set();
     for (const row of dbColumns) {
         const tableName = String(row?.tableName || "");
@@ -90,6 +95,8 @@ export async function prepareSyncDbBaseContext(mysqlConfig) {
     const groupedDbColumns = groupSyncDbColumns(dbColumns);
     const existingTableMap = await loadSyncDbTableDefs(tablesDir);
     const diff = buildSyncDbDiff(groupedDbColumns, existingTableMap);
+    printSyncDbProcessLog(`tables定义文件数量=${existingTableMap.size}`);
+    printSyncDbProcessLog(`差异扫描完成，missingTableCount=${diff.missingTables.length}，missingFieldCount=${Object.values(diff.missingFieldsByTable).reduce((sum, item) => sum + item.fields.length, 0)}`);
 
     return {
         diff: diff,

package/scripts/syncDb/diff.js

@@ -2,6 +2,7 @@ import { join } from "node:path";
 
 import { isNonEmptyString, isPlainObject } from "../../utils/is.js";
 import { camelCase } from "../../utils/util.js";
+import { printSyncDbProcessLog } from "./report.js";
 import { toSyncDbFieldDef } from "./transform.js";
 
 export function groupSyncDbColumns(rows) {
@@ -103,6 +104,7 @@ export async function applySyncDbDiff(diff, tablesDir, existingTableMap) {
         const filePath = join(tablesDir, `${missingTable.tableFileName}.json`);
         await Bun.write(filePath, `${JSON.stringify(tableDef, null, 4)}\n`);
         createdTableFileCount = createdTableFileCount + 1;
+        printSyncDbProcessLog(`已生成表映射 ${filePath}`);
     }
 
     for (const [tableFileName, tableInfo] of Object.entries(diff.missingFieldsByTable)) {
@@ -116,6 +118,7 @@ export async function applySyncDbDiff(diff, tablesDir, existingTableMap) {
         }
 
         await Bun.write(targetFilePath, `${JSON.stringify(currentTableDef, null, 4)}\n`);
+        printSyncDbProcessLog(`已补充字段映射 ${targetFilePath}，fieldCount=${tableInfo.fields.length}`);
     }
 
     return {

package/scripts/syncDb/index.js

@@ -5,10 +5,11 @@ import { Connect } from "../../lib/connect.js";
 import { Logger } from "../../lib/logger.js";
 import { applySyncDbDiff, countSyncDbMissingFields } from "./diff.js";
 import { prepareSyncDbBaseContext } from "./context.js";
-import { printSyncDbDiffSummary, writeSyncDbCheckReport } from "./report.js";
+import { printSyncDbDiffSummary, printSyncDbProcessLog, writeSyncDbCheckReport } from "./report.js";
 
 export async function syncDbCheck(mysqlConfig) {
     try {
+        printSyncDbProcessLog("开始执行 check");
         const reportPath = resolve(join(process.cwd(), "db.check.md"));
         await mkdir(dirname(reportPath), { recursive: true });
         await Bun.write(reportPath, "");
@@ -17,6 +18,7 @@ export async function syncDbCheck(mysqlConfig) {
         const missingFieldCount = countSyncDbMissingFields(diff);
         const writtenReportPath = await writeSyncDbCheckReport(reportPath, diff, groupedDbColumns, existingTableMap);
         printSyncDbDiffSummary("check", diff);
+        printSyncDbProcessLog(`check完成，missingTableCount=${diff.missingTables.length}，missingFieldCount=${missingFieldCount}`);
 
         return {
             mode: "check",
@@ -42,10 +44,12 @@ export async function syncDbCheck(mysqlConfig) {
 
 export async function syncDbApply(mysqlConfig) {
     try {
+        printSyncDbProcessLog("开始执行 apply");
         const { diff, tablesDir, existingTableMap } = await prepareSyncDbBaseContext(mysqlConfig);
         printSyncDbDiffSummary("check", diff);
         const applyResult = await applySyncDbDiff(diff, tablesDir, existingTableMap);
         printSyncDbDiffSummary("apply", diff);
+        printSyncDbProcessLog(`apply完成，createdTableFileCount=${applyResult.createdTableFileCount}，appendedFieldCount=${applyResult.appendedFieldCount}`);
 
         return {
             mode: "apply",

package/scripts/syncDb/report.js

@@ -7,6 +7,10 @@ import { camelCase } from "../../utils/util.js";
 import { countSyncDbMissingFields } from "./diff.js";
 import { toSyncDbFieldDef } from "./transform.js";
 
+export function printSyncDbProcessLog(message) {
+    process.stdout.write(`[syncDb] ${message}\n`);
+}
+
 export function printSyncDbDiffSummary(mode, diff) {
     const tableNames = diff.missingTables.map((item) => item.tableName);
     const missingFieldGroups = Object.values(diff.missingFieldsByTable);
@@ -182,6 +186,7 @@ export async function writeSyncDbCheckReport(reportPath, diff, groupedDbColumns,
     await mkdir(dirname(reportPath), { recursive: true });
     const markdown = buildSyncDbCheckMarkdown(diff, groupedDbColumns, existingTableMap);
     await Bun.write(reportPath, markdown);
+    printSyncDbProcessLog(`差异报告已写入 ${reportPath}`);
     Logger.info("差异报告写入完成", {
         reportPath: reportPath
     });