befly 3.36.0 → 3.37.0

package/apis/tongJi/onlineStats.js

@@ -1,177 +1,55 @@
-import { getDateYmdNumber } from "#befly/utils/datetime.js";
+import { getOnlineStatsActiveProductKey } from "./_tongJi.js";
 
-import { getTongJiMonthStartDate, getTongJiNumber, getTongJiRecentDateList, getTongJiWeekStartDate } from "./_tongJi.js";
-
-const ONLINE_STATS_DAY_LIMIT = 30;
 const ONLINE_STATS_ACTIVE_KEY = "online:active";
 
-// 构造全量统计的 Redis 键。
-function getPeriodKeys(periodType, periodValue) {
-    return {
-        pv: `online:${periodType}:${periodValue}:pv`,
-        members: `online:${periodType}:${periodValue}:members`,
-        reportTime: `online:${periodType}:${periodValue}:reportTime`
-    };
-}
-
-// 构造单产品统计的 Redis 键。
-function getOnlineStatsProductPeriodKeys(periodType, periodValue, productName) {
-    const productKey = encodeURIComponent(productName);
-
-    return {
-        pv: `online:${periodType}:${periodValue}:product:${productKey}:pv`,
-        members: `online:${periodType}:${periodValue}:product:${productKey}:members`,
-        reportTime: `online:${periodType}:${periodValue}:product:${productKey}:reportTime`
-    };
-}
-
-// 构造单产品实时在线集合的 Redis 键。
-function getOnlineStatsActiveProductKey(productName) {
-    const productKey = encodeURIComponent(productName);
-
-    return `online:active:product:${productKey}`;
-}
-
-// 读取 Redis 字符串并转成统计数字。
-async function getRedisNumber(befly, key) {
-    return getTongJiNumber(await befly.redis.getString(key));
-}
-
-// 读取某个周期的全量统计数据。
-async function getOnlineStatsPeriodData(befly, periodType, periodValue) {
-    const keys = getPeriodKeys(periodType, periodValue);
-    return {
-        reportTime: await getRedisNumber(befly, keys.reportTime),
-        pv: await getRedisNumber(befly, keys.pv),
-        uv: getTongJiNumber(await befly.redis.scard(keys.members))
-    };
-}
-
-// 读取某个周期的单产品统计数据。
-async function getOnlineStatsProductPeriodData(befly, periodType, periodValue, productName) {
-    const keys = getOnlineStatsProductPeriodKeys(periodType, periodValue, productName);
-
-    return {
-        reportTime: await getRedisNumber(befly, keys.reportTime),
-        pv: await getRedisNumber(befly, keys.pv),
-        uv: getTongJiNumber(await befly.redis.scard(keys.members))
-    };
-}
-
-// 清理过期成员后返回全站实时在线人数。
-async function getOnlineStatsTotalOnlineCount(befly) {
-    const now = Date.now();
-
+async function getOnlineStatsTotalOnlineCount(befly, now) {
     await befly.redis.zremrangebyscore(ONLINE_STATS_ACTIVE_KEY, "-inf", now);
     return await befly.redis.zcard(ONLINE_STATS_ACTIVE_KEY);
 }
 
-// 清理过期成员后返回单产品实时在线人数。
-async function getOnlineStatsProductOnlineCount(befly, productName) {
-    const now = Date.now();
-    const productKey = getOnlineStatsActiveProductKey(productName);
+async function getOnlineStatsProductOnlineCount(befly, productCode, now) {
+    const productKey = getOnlineStatsActiveProductKey(productCode);
 
     await befly.redis.zremrangebyscore(productKey, "-inf", now);
     return await befly.redis.zcard(productKey);
 }
 
-// 构造全量统计的按天趋势列表。
-async function buildOnlineStatsDays(befly, recentDateList) {
-    const days = [];
-
-    for (const item of recentDateList) {
-        const dayData = await getOnlineStatsPeriodData(befly, "day", item);
-
-        if (dayData.reportTime <= 0) {
-            continue;
-        }
+async function buildOnlineStatsProducts(befly, projectLists, now) {
+    const products = [];
 
-        days.push({
-            reportDate: item,
-            reportTime: dayData.reportTime,
-            pv: dayData.pv,
-            uv: dayData.uv
+    for (const item of projectLists) {
+        products.push({
+            key: item.productCode,
+            productName: item.productName,
+            productCode: item.productCode,
+            productVersion: item.productVersion || "",
+            onlineCount: await getOnlineStatsProductOnlineCount(befly, item.productCode, now)
         });
     }
 
-    return days;
-}
-
-// 构造单产品统计的按天趋势列表。
-async function buildOnlineStatsProductDays(befly, recentDateList, productName) {
-    const days = [];
-
-    for (const item of recentDateList) {
-        const dayData = await getOnlineStatsProductPeriodData(befly, "day", item, productName);
-
-        if (dayData.reportTime <= 0) {
-            continue;
+    return products.toSorted((a, b) => {
+        if (b.onlineCount !== a.onlineCount) {
+            return b.onlineCount - a.onlineCount;
         }
 
-        days.push({
-            reportDate: item,
-            reportTime: dayData.reportTime,
-            pv: dayData.pv,
-            uv: dayData.uv
-        });
-    }
-
-    return days;
+        return String(a.productName).localeCompare(String(b.productName), "zh-CN");
+    });
 }
 
-// 按配置项目列表构造项目统计，并按近 30 天 PV 排序。
-async function buildOnlineStatsProducts(befly, recentDateList, reportDate, weekStartDate, monthStartDate, projectLists) {
+function buildEmptyOnlineStatsProducts(projectLists) {
     const products = [];
 
     for (const item of projectLists) {
-        const productDays = await buildOnlineStatsProductDays(befly, recentDateList, item.productName);
-        let totalPv = 0;
-
-        for (const productDay of productDays) {
-            totalPv += productDay.pv;
-        }
-
-        const productToday = await getOnlineStatsProductPeriodData(befly, "day", reportDate, item.productName);
-        const productWeek = await getOnlineStatsProductPeriodData(befly, "week", weekStartDate, item.productName);
-        const productMonth = await getOnlineStatsProductPeriodData(befly, "month", monthStartDate, item.productName);
-        const productOnlineCount = await getOnlineStatsProductOnlineCount(befly, item.productName);
-
         products.push({
             key: item.productCode,
             productName: item.productName,
             productCode: item.productCode,
             productVersion: item.productVersion || "",
-            onlineCount: productOnlineCount,
-            today: {
-                pv: productToday.pv,
-                uv: productToday.uv
-            },
-            week: {
-                pv: productWeek.pv,
-                uv: productWeek.uv
-            },
-            month: {
-                pv: productMonth.pv,
-                uv: productMonth.uv
-            },
-            days: productDays,
-            totalPv: totalPv
+            onlineCount: 0
         });
     }
 
-    const sortedProducts = products.toSorted((a, b) => {
-        if (b.totalPv !== a.totalPv) {
-            return b.totalPv - a.totalPv;
-        }
-
-        return String(a.productName).localeCompare(String(b.productName), "zh-CN");
-    });
-
-    for (const item of sortedProducts) {
-        delete item.totalPv;
-    }
-
-    return sortedProducts;
+    return products;
 }
 
 export default {
@@ -180,64 +58,29 @@ export default {
     body: "none",
     auth: true,
     fields: {
-        productName: { name: "产品名称", input: "string", min: 0, max: 100 }
+        productCode: { name: "产品代号", input: "string", min: 0, max: 100 }
     },
     required: [],
-    // 汇总当前查询范围的在线统计，并在未筛选产品时附带配置项目统计。
     handler: async (befly, ctx) => {
         const now = Date.now();
-        const reportDate = getDateYmdNumber(now);
-        const weekStartDate = getTongJiWeekStartDate(now);
-        const monthStartDate = getTongJiMonthStartDate(now);
-        const recentDateList = getTongJiRecentDateList(now, ONLINE_STATS_DAY_LIMIT);
-        const productName = ctx?.body?.productName ?? "";
-        const hasProductFilter = productName.length > 0;
-        const days = hasProductFilter ? await buildOnlineStatsProductDays(befly, recentDateList, productName) : await buildOnlineStatsDays(befly, recentDateList);
-
-        let currentDay;
-        let weekCurrent;
-        let monthCurrent;
-        let onlineCount;
-
-        if (hasProductFilter) {
-            currentDay = await getOnlineStatsProductPeriodData(befly, "day", reportDate, productName);
-            weekCurrent = await getOnlineStatsProductPeriodData(befly, "week", weekStartDate, productName);
-            monthCurrent = await getOnlineStatsProductPeriodData(befly, "month", monthStartDate, productName);
-            onlineCount = await getOnlineStatsProductOnlineCount(befly, productName);
-        } else {
-            currentDay = await getOnlineStatsPeriodData(befly, "day", reportDate);
-            weekCurrent = await getOnlineStatsPeriodData(befly, "week", weekStartDate);
-            monthCurrent = await getOnlineStatsPeriodData(befly, "month", monthStartDate);
-            onlineCount = await getOnlineStatsTotalOnlineCount(befly);
+        const productCode = ctx?.body?.productCode ?? "";
+        const hasProductFilter = productCode.length > 0;
+        const projectLists = hasProductFilter ? [] : befly.config?.projectLists || [];
+
+        if (!befly.redis) {
+            return befly.tool.Yes("获取成功", {
+                queryTime: now,
+                onlineCount: 0,
+                products: buildEmptyOnlineStatsProducts(projectLists)
+            });
         }
 
-        const projectLists = hasProductFilter ? [] : befly.config.projectLists;
-        const products = await buildOnlineStatsProducts(befly, recentDateList, reportDate, weekStartDate, monthStartDate, projectLists);
+        const onlineCount = hasProductFilter ? await getOnlineStatsProductOnlineCount(befly, productCode, now) : await getOnlineStatsTotalOnlineCount(befly, now);
+        const products = await buildOnlineStatsProducts(befly, projectLists, now);
 
         return befly.tool.Yes("获取成功", {
             queryTime: now,
             onlineCount: onlineCount,
-            today: {
-                reportDate: reportDate,
-                reportTime: currentDay.reportTime,
-                pv: currentDay.pv,
-                uv: currentDay.uv
-            },
-            week: {
-                startDate: weekStartDate,
-                endDate: reportDate,
-                reportTime: weekCurrent.reportTime,
-                pv: weekCurrent.pv,
-                uv: weekCurrent.uv
-            },
-            month: {
-                startDate: monthStartDate,
-                endDate: reportDate,
-                reportTime: monthCurrent.reportTime,
-                pv: monthCurrent.pv,
-                uv: monthCurrent.uv
-            },
-            days: days,
             products: products
         });
     }

package/configs/beflyConfig.json

@@ -76,10 +76,10 @@
     },
     "projectLists": [
         {
-            "code": "beflyCore",
+            "code": "beflyAdmin",
             "name": "后台管理",
             "productName": "后台管理",
-            "productCode": "beflyCore",
+            "productCode": "beflyAdmin",
             "productVersion": "1.0.0"
         }
     ]

package/package.json

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

package/sql/befly.sql

@@ -227,35 +227,3 @@ CREATE TABLE IF NOT EXISTS `befly_error_report` (
     KEY `idx_befly_error_report_time` (`report_time`),
     KEY `idx_befly_error_report_bucket_date` (`bucket_date`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
-
-CREATE TABLE IF NOT EXISTS `befly_info_report` (
-    `id` BIGINT NOT NULL,
-    `report_time` BIGINT NOT NULL DEFAULT 0,
-    `report_date` INT NOT NULL DEFAULT 0,
-    `member_key` VARCHAR(100) NOT NULL DEFAULT '',
-    `source` VARCHAR(50) NOT NULL DEFAULT '',
-    `product_name` VARCHAR(100) NOT NULL DEFAULT '',
-    `product_code` VARCHAR(100) NOT NULL DEFAULT '',
-    `product_version` VARCHAR(100) NOT NULL DEFAULT '',
-    `page_path` VARCHAR(200) NOT NULL DEFAULT '',
-    `page_name` VARCHAR(100) NOT NULL DEFAULT '',
-    `detail` TEXT NULL,
-    `user_agent` VARCHAR(500) NOT NULL DEFAULT '',
-    `browser_name` VARCHAR(100) NOT NULL DEFAULT '',
-    `browser_version` VARCHAR(100) NOT NULL DEFAULT '',
-    `os_name` VARCHAR(100) NOT NULL DEFAULT '',
-    `os_version` VARCHAR(100) NOT NULL DEFAULT '',
-    `device_type` VARCHAR(50) NOT NULL DEFAULT '',
-    `device_vendor` VARCHAR(100) NOT NULL DEFAULT '',
-    `device_model` VARCHAR(100) NOT NULL DEFAULT '',
-    `engine_name` VARCHAR(100) NOT NULL DEFAULT '',
-    `cpu_architecture` VARCHAR(100) NOT NULL DEFAULT '',
-    `state` TINYINT NOT NULL DEFAULT 1,
-    `created_at` BIGINT NOT NULL DEFAULT 0,
-    `updated_at` BIGINT NOT NULL DEFAULT 0,
-    `deleted_at` BIGINT NULL DEFAULT NULL,
-    PRIMARY KEY (`id`),
-    UNIQUE KEY `uk_befly_info_report_date_member` (`report_date`, `member_key`),
-    KEY `idx_befly_info_report_time` (`report_time`),
-    KEY `idx_befly_info_report_date` (`report_date`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;

package/tables/errorReport.json

@@ -67,7 +67,8 @@
     },
     "detail": {
         "name": "错误详情",
-        "input": "string"
+        "input": "string",
+        "max": 5000
     },
     "userAgent": {
         "name": "用户代理",

package/apis/tongJi/cacheHealth.js

@@ -1,192 +0,0 @@
-import { getDateYmdNumber } from "#befly/utils/datetime.js";
-
-import { getTongJiMonthStartDate, getTongJiNumber, getTongJiWeekStartDate } from "./_tongJi.js";
-
-const ONLINE_ACTIVE_KEY = "online:active";
-const INFO_STATS_FALLBACK_COUNT_KEY = "stats:fallback:infoStats:count";
-const ERROR_STATS_FALLBACK_COUNT_KEY = "stats:fallback:errorStats:count";
-
-function getInfoStatsFallbackDailyCountKey(reportDate) {
-    return `stats:fallback:infoStats:count:day:${reportDate}`;
-}
-
-function getErrorStatsFallbackDailyCountKey(reportDate) {
-    return `stats:fallback:errorStats:count:day:${reportDate}`;
-}
-
-function getOnlineReportTimeKey(periodType, periodValue) {
-    return `online:${periodType}:${periodValue}:reportTime`;
-}
-
-function getInfoReportTimeKey(periodType, periodValue) {
-    return `info:${periodType}:${periodValue}:reportTime`;
-}
-
-function getErrorCountKey(periodType, periodValue) {
-    return `error:${periodType}:${periodValue}:count`;
-}
-
-async function getRedisStringNumber(redis, key) {
-    return getTongJiNumber(await redis.getString(key));
-}
-
-async function getRedisSetCount(redis, key) {
-    if (typeof redis.scard !== "function") {
-        return 0;
-    }
-
-    return getTongJiNumber(await redis.scard(key));
-}
-
-async function getRedisSortedSetCount(redis, key) {
-    if (typeof redis.zcard !== "function") {
-        return 0;
-    }
-
-    return getTongJiNumber(await redis.zcard(key));
-}
-
-async function getRedisConnectivity(redis) {
-    if (!redis || typeof redis.ping !== "function") {
-        return {
-            status: "unavailable",
-            responseTime: -1
-        };
-    }
-
-    try {
-        const start = Date.now();
-        await redis.ping();
-
-        return {
-            status: "running",
-            responseTime: Date.now() - start
-        };
-    } catch {
-        return {
-            status: "stopped",
-            responseTime: -1
-        };
-    }
-}
-
-export default {
-    name: "获取统计缓存健康状态",
-    method: "POST",
-    body: "none",
-    auth: true,
-    fields: {},
-    required: [],
-    handler: async (befly) => {
-        const now = Date.now();
-        const reportDate = getDateYmdNumber(now);
-        const weekStartDate = getTongJiWeekStartDate(now);
-        const monthStartDate = getTongJiMonthStartDate(now);
-        const redisConnectivity = await getRedisConnectivity(befly.redis);
-
-        if (!befly.redis) {
-            return befly.tool.Yes("获取成功", {
-                queryTime: now,
-                redis: redisConnectivity,
-                online: null,
-                info: null,
-                error: null,
-                roleCache: null,
-                hints: ["Redis 不可用，统计接口将回退到 MySQL 聚合"]
-            });
-        }
-
-        const onlineTodayReportTime = await getRedisStringNumber(befly.redis, getOnlineReportTimeKey("day", reportDate));
-        const onlineWeekReportTime = await getRedisStringNumber(befly.redis, getOnlineReportTimeKey("week", weekStartDate));
-        const onlineMonthReportTime = await getRedisStringNumber(befly.redis, getOnlineReportTimeKey("month", monthStartDate));
-
-        const infoTodayReportTime = await getRedisStringNumber(befly.redis, getInfoReportTimeKey("day", reportDate));
-        const infoWeekReportTime = await getRedisStringNumber(befly.redis, getInfoReportTimeKey("week", weekStartDate));
-        const infoMonthReportTime = await getRedisStringNumber(befly.redis, getInfoReportTimeKey("month", monthStartDate));
-
-        const errorDayCount = await getRedisStringNumber(befly.redis, getErrorCountKey("day", reportDate));
-        const errorWeekCount = await getRedisStringNumber(befly.redis, getErrorCountKey("week", weekStartDate));
-        const errorMonthCount = await getRedisStringNumber(befly.redis, getErrorCountKey("month", monthStartDate));
-
-        const roleApisVersion = String((await befly.redis.getString("role:apis:activeVersion")) || "");
-        const roleMenusVersion = String((await befly.redis.getString("role:menus:activeVersion")) || "");
-
-        const online = {
-            activeMembers: await getRedisSortedSetCount(befly.redis, ONLINE_ACTIVE_KEY),
-            reportTime: {
-                today: onlineTodayReportTime,
-                week: onlineWeekReportTime,
-                month: onlineMonthReportTime
-            },
-            ready: onlineTodayReportTime > 0 || onlineWeekReportTime > 0 || onlineMonthReportTime > 0
-        };
-
-        const info = {
-            reportTime: {
-                today: infoTodayReportTime,
-                week: infoWeekReportTime,
-                month: infoMonthReportTime
-            },
-            daySourcesCount: await getRedisSetCount(befly.redis, `info:day:${reportDate}:sources:names`),
-            ready: infoTodayReportTime > 0 || infoWeekReportTime > 0 || infoMonthReportTime > 0
-        };
-
-        const error = {
-            count: {
-                today: errorDayCount,
-                week: errorWeekCount,
-                month: errorMonthCount
-            },
-            ready: errorDayCount > 0 || errorWeekCount > 0 || errorMonthCount > 0
-        };
-
-        const roleCache = {
-            apis: {
-                activeVersion: roleApisVersion,
-                ready: roleApisVersion.length > 0
-            },
-            menus: {
-                activeVersion: roleMenusVersion,
-                ready: roleMenusVersion.length > 0
-            }
-        };
-
-        const fallback = {
-            infoStats: await getRedisStringNumber(befly.redis, INFO_STATS_FALLBACK_COUNT_KEY),
-            errorStats: await getRedisStringNumber(befly.redis, ERROR_STATS_FALLBACK_COUNT_KEY),
-            today: {
-                infoStats: await getRedisStringNumber(befly.redis, getInfoStatsFallbackDailyCountKey(reportDate)),
-                errorStats: await getRedisStringNumber(befly.redis, getErrorStatsFallbackDailyCountKey(reportDate))
-            }
-        };
-
-        const hints = [];
-
-        if (!online.ready) {
-            hints.push("online 统计预聚合尚未建立，onlineStats 将返回空或低命中结果");
-        }
-        if (!info.ready) {
-            hints.push("info 统计预聚合尚未建立，infoStats 将回退到 MySQL 聚合");
-        }
-        if (!error.ready) {
-            hints.push("error 统计预聚合尚未建立，errorStats 将回退到 MySQL 聚合");
-        }
-        if (!roleCache.apis.ready || !roleCache.menus.ready) {
-            hints.push("角色权限版本缓存未就绪，建议执行一次 cacheRefresh");
-        }
-        if (fallback.infoStats > 0 || fallback.errorStats > 0) {
-            hints.push("检测到统计查询回退到 MySQL，可关注预聚合写入是否稳定，必要时可执行 tongJi/fallbackReset 重置观测计数");
-        }
-
-        return befly.tool.Yes("获取成功", {
-            queryTime: now,
-            redis: redisConnectivity,
-            online: online,
-            info: info,
-            error: error,
-            roleCache: roleCache,
-            fallback: fallback,
-            hints: hints
-        });
-    }
-};

package/apis/tongJi/fallbackReset.js

@@ -1,61 +0,0 @@
-import { getDateYmdNumber } from "#befly/utils/datetime.js";
-
-import { getTongJiNumber } from "./_tongJi.js";
-
-const INFO_STATS_FALLBACK_COUNT_KEY = "stats:fallback:infoStats:count";
-const ERROR_STATS_FALLBACK_COUNT_KEY = "stats:fallback:errorStats:count";
-
-function getInfoStatsFallbackDailyCountKey(reportDate) {
-    return `stats:fallback:infoStats:count:day:${reportDate}`;
-}
-
-function getErrorStatsFallbackDailyCountKey(reportDate) {
-    return `stats:fallback:errorStats:count:day:${reportDate}`;
-}
-
-export default {
-    name: "重置统计回退计数",
-    method: "POST",
-    body: "none",
-    auth: true,
-    fields: {},
-    required: [],
-    handler: async (befly) => {
-        if (!befly.redis) {
-            return befly.tool.No("Redis 不可用，无法重置", {
-                reset: false
-            });
-        }
-
-        const reportDate = getDateYmdNumber(Date.now());
-        const infoDailyKey = getInfoStatsFallbackDailyCountKey(reportDate);
-        const errorDailyKey = getErrorStatsFallbackDailyCountKey(reportDate);
-        const resetKeys = [INFO_STATS_FALLBACK_COUNT_KEY, ERROR_STATS_FALLBACK_COUNT_KEY, infoDailyKey, errorDailyKey];
-        const before = {
-            infoStats: getTongJiNumber(await befly.redis.getString(INFO_STATS_FALLBACK_COUNT_KEY)),
-            errorStats: getTongJiNumber(await befly.redis.getString(ERROR_STATS_FALLBACK_COUNT_KEY)),
-            today: {
-                infoStats: getTongJiNumber(await befly.redis.getString(infoDailyKey)),
-                errorStats: getTongJiNumber(await befly.redis.getString(errorDailyKey))
-            }
-        };
-
-        const removedCount = await befly.redis.delBatch(resetKeys);
-
-        return befly.tool.Yes("重置成功", {
-            reset: true,
-            reportDate: reportDate,
-            removedCount: getTongJiNumber(removedCount),
-            keys: resetKeys,
-            before: before,
-            after: {
-                infoStats: 0,
-                errorStats: 0,
-                today: {
-                    infoStats: 0,
-                    errorStats: 0
-                }
-            }
-        });
-    }
-};