befly 3.62.0 → 3.64.0

package/apis/tongJi/errorStats.js

@@ -1,74 +1,14 @@
-import { getDateYmdNumber } from "#befly/utils/datetime.js";
-
-import { getErrorStatsDayBucketCountKey, getErrorStatsDayBucketsKey, getErrorStatsDayTypeCountKey, getErrorStatsDayTypesKey, getErrorStatsPeriodCountKey, getTongJiDateRangeList, getTongJiMonthStartDate, getTongJiNumber, getTongJiRecentDateList, getTongJiWeekStartDate } from "./_tongJi.js";
+import { getTongJiDateRangeList, getTongJiDateYmdNumber, getTongJiMonthStartDate, getTongJiRecentDateList } from "./_tongJi.js";
 
 const ERROR_STATS_DAY_LIMIT = 30;
 
-function sumCounts(items) {
-    return items.reduce((sum, item) => sum + item.count, 0);
-}
-
-async function getErrorStatsRedisSummary(befly, periodType, periodValue) {
-    return {
-        count: getTongJiNumber(await befly.redis.getString(getErrorStatsPeriodCountKey(periodType, periodValue)))
-    };
-}
-
-async function getErrorStatsRedisTrend(befly, bucketDate) {
-    const bucketSet = await befly.redis.smembers(getErrorStatsDayBucketsKey(bucketDate));
-    const trend = await Promise.all(
-        bucketSet.map(async (bucketTime) => {
-            const itemBucketTime = getTongJiNumber(bucketTime);
-
-            return {
-                bucketTime: itemBucketTime,
-                bucketDate: bucketDate,
-                count: getTongJiNumber(await befly.redis.getString(getErrorStatsDayBucketCountKey(bucketDate, itemBucketTime)))
-            };
-        })
-    );
+function toCount(value) {
+    const num = Number(value);
 
-    trend.sort((a, b) => a.bucketTime - b.bucketTime);
-    return trend;
+    return Number.isFinite(num) ? num : 0;
 }
 
-async function getErrorStatsRedisDays(befly, recentDateList) {
-    return Promise.all(
-        recentDateList.map(async (item) => {
-            return {
-                bucketDate: item,
-                count: getTongJiNumber(await befly.redis.getString(getErrorStatsPeriodCountKey("day", item)))
-            };
-        })
-    );
-}
-
-async function getErrorStatsRedisTopTypes(befly, bucketDate) {
-    const typeSet = await befly.redis.smembers(getErrorStatsDayTypesKey(bucketDate));
-    const topTypes = await Promise.all(
-        typeSet.map(async (errorType) => {
-            const name = String(errorType || "unknown");
-
-            return {
-                errorType: name,
-                count: getTongJiNumber(await befly.redis.getString(getErrorStatsDayTypeCountKey(bucketDate, name)))
-            };
-        })
-    );
-
-    return topTypes
-        .filter((item) => item.count > 0)
-        .toSorted((a, b) => {
-            if (b.count !== a.count) {
-                return b.count - a.count;
-            }
-
-            return String(a.errorType).localeCompare(String(b.errorType), "zh-CN");
-        })
-        .slice(0, 5);
-}
-
-function buildErrorStatsResponse(bucketDate, weekStartDate, monthStartDate, recentDateList, todaySummary, yesterdaySummary, dayBeforeYesterdaySummary, weekSummary, monthSummary, recent30Count, trend, days, topTypes) {
+function buildErrorStatsResponse(bucketDate, monthStartDate, recentDateList, todaySummary, yesterdaySummary, dayBeforeYesterdaySummary, monthSummary, recent30Count, trend, days, topTypes) {
     return {
         today: {
             bucketDate: bucketDate,
@@ -82,11 +22,6 @@ function buildErrorStatsResponse(bucketDate, weekStartDate, monthStartDate, rece
             bucketDate: recentDateList[recentDateList.length - 3] || recentDateList[recentDateList.length - 2] || bucketDate,
             count: dayBeforeYesterdaySummary.count
         },
-        week: {
-            startDate: weekStartDate,
-            endDate: bucketDate,
-            count: weekSummary.count
-        },
         month: {
             startDate: monthStartDate,
             endDate: bucketDate,
@@ -103,37 +38,12 @@ function buildErrorStatsResponse(bucketDate, weekStartDate, monthStartDate, rece
     };
 }
 
-function isRedisResultEmpty(todaySummary, yesterdaySummary, dayBeforeYesterdaySummary, weekSummary, monthSummary, recent30Count, trend, topTypes) {
-    return todaySummary.count <= 0 && yesterdaySummary.count <= 0 && dayBeforeYesterdaySummary.count <= 0 && weekSummary.count <= 0 && monthSummary.count <= 0 && recent30Count <= 0 && trend.length === 0 && topTypes.length === 0;
-}
-
-async function getErrorStatsFromRedis(befly, bucketDate, weekStartDate, monthStartDate, recentDateList) {
-    const [todaySummary, yesterdaySummary, dayBeforeYesterdaySummary, weekSummary, monthSummary, trend, days, topTypes] = await Promise.all([
-        getErrorStatsRedisSummary(befly, "day", bucketDate),
-        getErrorStatsRedisSummary(befly, "day", recentDateList[recentDateList.length - 2] || bucketDate),
-        getErrorStatsRedisSummary(befly, "day", recentDateList[recentDateList.length - 3] || recentDateList[recentDateList.length - 2] || bucketDate),
-        getErrorStatsRedisSummary(befly, "week", weekStartDate),
-        getErrorStatsRedisSummary(befly, "month", monthStartDate),
-        getErrorStatsRedisTrend(befly, bucketDate),
-        getErrorStatsRedisDays(befly, recentDateList),
-        getErrorStatsRedisTopTypes(befly, bucketDate)
-    ]);
-
-    const recent30Count = sumCounts(days);
-
-    if (isRedisResultEmpty(todaySummary, yesterdaySummary, dayBeforeYesterdaySummary, weekSummary, monthSummary, recent30Count, trend, topTypes)) {
-        return null;
-    }
-
-    return buildErrorStatsResponse(bucketDate, weekStartDate, monthStartDate, recentDateList, todaySummary, yesterdaySummary, dayBeforeYesterdaySummary, weekSummary, monthSummary, recent30Count, trend, days, topTypes);
-}
-
 async function getErrorStatsDayCountMap(befly, startDate, endDate) {
-    const result = await befly.mysql.execute("SELECT bucket_date as bucketDate, SUM(hit_count) as count FROM befly_error_report WHERE state = 1 AND bucket_date BETWEEN ? AND ? GROUP BY bucket_date", [startDate, endDate]);
+    const result = await befly.mysql.execute("SELECT bucket_date as bucketDate, COUNT(*) as count FROM befly_error_report WHERE state = 1 AND bucket_date BETWEEN ? AND ? GROUP BY bucket_date", [startDate, endDate]);
     const map = new Map();
 
     for (const item of result.data || []) {
-        map.set(Number(item.bucketDate), getTongJiNumber(item.count));
+        map.set(Number(item.bucketDate), toCount(item.count));
     }
 
     return map;
@@ -143,37 +53,35 @@ function sumDateCounts(map, dateList) {
     return dateList.reduce((sum, date) => sum + (map.get(date) || 0), 0);
 }
 
-async function getErrorStatsFromMysql(befly, bucketDate, weekStartDate, monthStartDate, recentDateList) {
+async function getErrorStatsFromMysql(befly, bucketDate, monthStartDate, recentDateList) {
     const yesterdayDate = recentDateList[recentDateList.length - 2] || bucketDate;
     const dayBeforeYesterdayDate = recentDateList[recentDateList.length - 3] || yesterdayDate;
-    const weekDateList = getTongJiDateRangeList(weekStartDate, bucketDate);
     const monthDateList = getTongJiDateRangeList(monthStartDate, bucketDate);
 
     const [dayCountMap, trendRes, topTypesRes] = await Promise.all([
         getErrorStatsDayCountMap(befly, recentDateList[0], bucketDate),
-        befly.mysql.execute("SELECT bucket_time as bucketTime, bucket_date as bucketDate, SUM(hit_count) as count FROM befly_error_report WHERE state = 1 AND bucket_date = ? GROUP BY bucket_time, bucket_date ORDER BY bucket_time ASC", [bucketDate]),
-        befly.mysql.execute("SELECT error_type as errorType, SUM(hit_count) as count FROM befly_error_report WHERE state = 1 AND bucket_date = ? GROUP BY error_type ORDER BY count DESC LIMIT 5", [bucketDate])
+        befly.mysql.execute("SELECT bucket_time as bucketTime, bucket_date as bucketDate, COUNT(*) as count FROM befly_error_report WHERE state = 1 AND bucket_date = ? GROUP BY bucket_time, bucket_date ORDER BY bucket_time ASC", [bucketDate]),
+        befly.mysql.execute("SELECT error_type as errorType, COUNT(*) as count FROM befly_error_report WHERE state = 1 AND bucket_date = ? GROUP BY error_type ORDER BY count DESC LIMIT 5", [bucketDate])
     ]);
 
     const todaySummary = { count: dayCountMap.get(bucketDate) || 0 };
     const yesterdaySummary = { count: dayCountMap.get(yesterdayDate) || 0 };
     const dayBeforeYesterdaySummary = { count: dayCountMap.get(dayBeforeYesterdayDate) || 0 };
-    const weekSummary = { count: sumDateCounts(dayCountMap, weekDateList) };
     const monthSummary = { count: sumDateCounts(dayCountMap, monthDateList) };
     const recent30Count = sumDateCounts(dayCountMap, recentDateList);
 
     const trend = (trendRes.data || []).map((item) => {
         return {
-            bucketTime: getTongJiNumber(item.bucketTime),
-            bucketDate: getTongJiNumber(item.bucketDate),
-            count: getTongJiNumber(item.count)
+            bucketTime: toCount(item.bucketTime),
+            bucketDate: toCount(item.bucketDate),
+            count: toCount(item.count)
         };
     });
 
     const topTypes = (topTypesRes.data || []).map((item) => {
         return {
             errorType: String(item.errorType || "unknown"),
-            count: getTongJiNumber(item.count)
+            count: toCount(item.count)
         };
     });
 
@@ -184,7 +92,7 @@ async function getErrorStatsFromMysql(befly, bucketDate, weekStartDate, monthSta
         };
     });
 
-    return buildErrorStatsResponse(bucketDate, weekStartDate, monthStartDate, recentDateList, todaySummary, yesterdaySummary, dayBeforeYesterdaySummary, weekSummary, monthSummary, recent30Count, trend, days, topTypes);
+    return buildErrorStatsResponse(bucketDate, monthStartDate, recentDateList, todaySummary, yesterdaySummary, dayBeforeYesterdaySummary, monthSummary, recent30Count, trend, days, topTypes);
 }
 
 function buildEmptyDays(recentDateList) {
@@ -196,7 +104,7 @@ function buildEmptyDays(recentDateList) {
     });
 }
 
-function buildEmptyErrorStats(bucketDate, weekStartDate, monthStartDate, recentDateList) {
+function buildEmptyErrorStats(bucketDate, monthStartDate, recentDateList) {
     return {
         today: {
             bucketDate: bucketDate,
@@ -210,11 +118,6 @@ function buildEmptyErrorStats(bucketDate, weekStartDate, monthStartDate, recentD
             bucketDate: recentDateList[recentDateList.length - 3] || recentDateList[recentDateList.length - 2] || bucketDate,
             count: 0
         },
-        week: {
-            startDate: weekStartDate,
-            endDate: bucketDate,
-            count: 0
-        },
         month: {
             startDate: monthStartDate,
             endDate: bucketDate,
@@ -242,23 +145,14 @@ export default {
         const tableExistsResult = await befly.mysql.tableExists("beflyErrorReport");
         const tableReady = tableExistsResult.data === true;
         const now = Date.now();
-        const bucketDate = getDateYmdNumber(now);
-        const weekStartDate = getTongJiWeekStartDate(now);
+        const bucketDate = getTongJiDateYmdNumber(now);
         const monthStartDate = getTongJiMonthStartDate(now);
         const recentDateList = getTongJiRecentDateList(now, ERROR_STATS_DAY_LIMIT);
 
         if (!tableReady) {
-            return befly.tool.Yes("获取成功", buildEmptyErrorStats(bucketDate, weekStartDate, monthStartDate, recentDateList));
-        }
-
-        if (befly.redis) {
-            const redisResult = await getErrorStatsFromRedis(befly, bucketDate, weekStartDate, monthStartDate, recentDateList);
-
-            if (redisResult) {
-                return befly.tool.Yes("获取成功", redisResult);
-            }
+            return befly.tool.Yes("获取成功", buildEmptyErrorStats(bucketDate, monthStartDate, recentDateList));
         }
 
-        return befly.tool.Yes("获取成功", await getErrorStatsFromMysql(befly, bucketDate, weekStartDate, monthStartDate, recentDateList));
+        return befly.tool.Yes("获取成功", await getErrorStatsFromMysql(befly, bucketDate, monthStartDate, recentDateList));
     }
 };

package/apis/tongJi/projectDelete.js

@@ -0,0 +1,20 @@
+import projectTable from "#befly/tables/project.json";
+
+export default {
+    name: "删除产品",
+    method: "POST",
+    body: "none",
+    auth: true,
+    fields: {
+        id: projectTable.id
+    },
+    required: ["id"],
+    handler: async (befly, ctx) => {
+        await befly.mysql.delData({
+            table: "beflyProject",
+            where: { id: ctx.body.id }
+        });
+
+        return befly.tool.Yes("删除成功");
+    }
+};

package/apis/tongJi/projectInsert.js

@@ -0,0 +1,35 @@
+import projectTable from "#befly/tables/project.json";
+
+export default {
+    name: "添加产品",
+    method: "POST",
+    body: "none",
+    auth: true,
+    fields: {
+        code: projectTable.code,
+        name: projectTable.name,
+        sort: projectTable.sort
+    },
+    required: ["code", "name"],
+    handler: async (befly, ctx) => {
+        const existing = await befly.mysql.getOne({
+            table: "beflyProject",
+            where: { code: ctx.body.code }
+        });
+
+        if (existing.data?.id) {
+            return befly.tool.No("产品代号已存在");
+        }
+
+        const projectId = await befly.mysql.insData({
+            table: "beflyProject",
+            data: {
+                code: ctx.body.code,
+                name: ctx.body.name,
+                sort: ctx.body.sort
+            }
+        });
+
+        return befly.tool.Yes("添加成功", { id: projectId.data });
+    }
+};

package/apis/tongJi/projectSelect.js

@@ -0,0 +1,31 @@
+import { queryFields } from "#befly/apis/_apis.js";
+import projectTable from "#befly/tables/project.json";
+
+export default {
+    name: "获取产品列表",
+    method: "POST",
+    body: "none",
+    auth: true,
+    fields: {
+        ...queryFields,
+        code: projectTable.code,
+        state: projectTable.state
+    },
+    required: [],
+    handler: async (befly, ctx) => {
+        const result = await befly.mysql.getList({
+            table: "beflyProject",
+            fields: ["id", "code", "name", "sort", "state", "createdAt", "updatedAt"],
+            where: {
+                code$like$or: ctx.body.code,
+                name$like$or: ctx.body.keyword,
+                state: ctx.body.state
+            },
+            page: ctx.body.page,
+            limit: ctx.body.limit,
+            orderBy: ["sort#asc"]
+        });
+
+        return befly.tool.Yes("获取成功", result.data);
+    }
+};

package/apis/tongJi/projectUpdate.js

@@ -0,0 +1,52 @@
+import projectTable from "#befly/tables/project.json";
+
+export default {
+    name: "更新产品",
+    method: "POST",
+    body: "none",
+    auth: true,
+    fields: {
+        id: projectTable.id,
+        code: projectTable.code,
+        name: projectTable.name,
+        sort: projectTable.sort,
+        state: projectTable.state
+    },
+    required: ["id"],
+    handler: async (befly, ctx) => {
+        const current = await befly.mysql.getOne({
+            table: "beflyProject",
+            where: { id: ctx.body.id }
+        });
+
+        if (!current.data?.id) {
+            return befly.tool.No("产品不存在");
+        }
+
+        if (ctx.body.code !== undefined && ctx.body.code !== current.data.code) {
+            const existing = await befly.mysql.getOne({
+                table: "beflyProject",
+                where: { code: ctx.body.code }
+            });
+
+            if (existing.data?.id) {
+                return befly.tool.No("产品代号已存在");
+            }
+        }
+
+        const updateData = {};
+
+        if (ctx.body.code !== undefined) updateData.code = ctx.body.code;
+        if (ctx.body.name !== undefined) updateData.name = ctx.body.name;
+        if (ctx.body.sort !== undefined) updateData.sort = ctx.body.sort;
+        if (ctx.body.state !== undefined) updateData.state = ctx.body.state;
+
+        await befly.mysql.updData({
+            table: "beflyProject",
+            data: updateData,
+            where: { id: ctx.body.id }
+        });
+
+        return befly.tool.Yes("更新成功");
+    }
+};

package/configs/beflyMenus.json

@@ -5,9 +5,26 @@
         "sort": 0
     },
     {
-        "name": "项目统计",
-        "path": "/project-stats",
-        "sort": 1
+        "name": "统计管理",
+        "path": "/tong-ji",
+        "sort": 2,
+        "children": [
+            {
+                "name": "统计数据",
+                "path": "/statistics-data",
+                "sort": 1
+            },
+            {
+                "name": "项目管理",
+                "path": "/project-manage",
+                "sort": 2
+            },
+            {
+                "name": "统计记录",
+                "path": "/statistics-record",
+                "sort": 3
+            }
+        ]
     },
     {
         "name": "人员管理",

package/index.js

@@ -120,6 +120,11 @@ export async function createBefly(env = {}, config = {}, menus = []) {
     const mergedMenus = deepMerge(prefixMenuPaths(beflyMenus, "core"), menus);
     mergedConfig.projectLists = mergeProjectListsByCode(mergedConfig.projectLists);
 
+    Logger.configure({
+        runtimeEnv: mergedConfig.runMode,
+        ...mergedConfig.logger
+    });
+
     const configHasError = await checkConfig(mergedConfig);
     const { apis, tables, plugins, hooks } = await scanSources();
 
@@ -138,12 +143,6 @@ export async function createBefly(env = {}, config = {}, menus = []) {
         });
     }
 
-    // 在插件加载前用项目 runMode 初始化 Logger，确保后续所有日志目录正确
-    Logger.configure({
-        runtimeEnv: mergedConfig.runMode,
-        ...mergedConfig.logger
-    });
-
     return new Befly({
         env: env,
         config: mergedConfig,

package/lib/logger.js

@@ -69,6 +69,10 @@ class LogFileSink {
     }
 
     getFilePath(date, index) {
+        if (this.prefix === "debug") {
+            return nodePathJoin(config.dir, "dev.log");
+        }
+
         const suffix = index > 0 ? `.${index}` : "";
         const filename = this.prefix === "app" ? `${date}${suffix}.log` : `${this.prefix}.${date}${suffix}.log`;
         return nodePathJoin(config.dir, filename);
@@ -89,6 +93,10 @@ class LogFileSink {
             this.openStream(this.getFilePath(date, 0));
         }
 
+        if (this.prefix === "debug") {
+            return;
+        }
+
         if (this.stream && this.streamSizeBytes + nextChunkBytes > MAX_FILE_BYTES) {
             this.closeStreamSync();
             this.streamIndex += 1;
@@ -177,28 +185,20 @@ export async function shutdown() {
     }
 }
 
-function getRuntimeLogDir(runtimeEnv) {
-    const cwd = process.cwd();
-    if (runtimeEnv === "development") {
-        return nodePathResolve(cwd, "logsDev");
-    }
-    return nodePathResolve(cwd, "logs");
+function getRuntimeLogDir() {
+    return nodePathResolve(process.cwd(), "logs");
 }
 
 function prepareLogDir(runtimeEnv, shouldClearDev = false) {
     const logDir = getRuntimeLogDir(runtimeEnv);
-    const devLogDir = nodePathResolve(process.cwd(), "logsDev");
+    const devLogPath = nodePathResolve(logDir, "dev.log");
 
     try {
         if (!existsSync(logDir)) {
             mkdirSync(logDir, { recursive: true });
         }
-        if (!existsSync(devLogDir)) {
-            mkdirSync(devLogDir, { recursive: true });
-        }
-        if (shouldClearDev && runtimeEnv === "development" && existsSync(devLogDir)) {
-            rmSync(devLogDir, { recursive: true, force: true });
-            mkdirSync(devLogDir, { recursive: true });
+        if (shouldClearDev && runtimeEnv === "development" && existsSync(devLogPath)) {
+            rmSync(devLogPath, { force: true });
         }
     } catch (error) {
         throw new Error(`创建日志目录失败: ${logDir}. ${error?.message || error}`, {
@@ -214,8 +214,6 @@ function ensureLogDirExists() {
     config.dir = prepareLogDir(config.runtimeEnv);
 }
 
-// 方案B：删除“启动时清理旧日志”功能（减少 I/O 与复杂度）。
-
 /**
  * 配置日志
  */
@@ -285,6 +283,13 @@ function buildJsonLine(level, timeMs, record) {
 function ensureSinksReady(kind) {
     ensureLogDirExists();
 
+    if (config.runtimeEnv === "development") {
+        if (!appFileSink) {
+            appFileSink = new LogFileSink("debug");
+        }
+        return appFileSink;
+    }
+
     if (kind === "app") {
         if (!appFileSink) {
             appFileSink = new LogFileSink("app");

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly",
-    "version": "3.62.0",
+    "version": "3.64.0",
     "gitHead": "49c39d36695036e85fc64083cc43c1652fff96cb",
     "private": false,
     "description": "Befly - 为 Bun 专属打造的 JavaScript API 接口框架核心引擎",

package/plugins/cron.js

@@ -0,0 +1,96 @@
+/**
+ * 定时任务插件
+ * 基于 Bun.cron 提供进程内定时任务能力。
+ */
+
+import { Logger } from "../lib/logger.js";
+import { isPrimaryProcess } from "../utils/is.js";
+
+const jobs = new Map();
+
+/**
+ * 注册一个定时任务
+ * @param {string} name - 任务名称，用于日志标识
+ * @param {string} schedule - cron 表达式或预定义昵称
+ * @param {function} task - 任务函数，接收 befly 上下文
+ * @returns {CronJob|null}
+ */
+function register(name, schedule, task) {
+    if (!isPrimaryProcess(this.env)) {
+        return null;
+    }
+
+    if (jobs.has(name)) {
+        return jobs.get(name);
+    }
+
+    const context = this;
+    const job = Bun.cron(schedule, async function () {
+        Logger.info(`[定时任务] ${name} 开始执行`);
+        try {
+            await task(context);
+            Logger.info(`[定时任务] ${name} 执行完成`);
+        } catch (error) {
+            Logger.error(`[定时任务] ${name} 执行失败`, error);
+        }
+    });
+
+    jobs.set(name, job);
+    return job;
+}
+
+/**
+ * 注册一个按秒执行的定时任务
+ */
+function second(name, seconds, task) {
+    if (!isPrimaryProcess(this.env)) {
+        return null;
+    }
+
+    if (jobs.has(name)) {
+        return jobs.get(name);
+    }
+
+    const context = this;
+    let running = false;
+    const timer = setInterval(async () => {
+        if (running) {
+            return;
+        }
+
+        running = true;
+        try {
+            await task(context);
+        } catch (error) {
+            Logger.error(`[定时任务] ${name} 执行失败`, error);
+        } finally {
+            running = false;
+        }
+    }, seconds * 1000);
+    const job = {
+        stop: () => clearInterval(timer)
+    };
+
+    jobs.set(name, job);
+    return job;
+}
+
+/**
+ * 停止所有已注册的定时任务
+ */
+export function stopAll() {
+    for (const job of jobs.values()) {
+        job.stop();
+    }
+    jobs.clear();
+}
+
+export default {
+    order: 8,
+    handler: async function (befly) {
+        return {
+            register: register.bind(befly),
+            second: second.bind(befly)
+        };
+    }
+};