befly 3.24.18 → 3.24.20

package/apis/tongJi/onlineStats.js

@@ -1,41 +1,11 @@
-import { addDays, getDateYmdNumber } from "#root/utils/datetime.js";
+import { getDateYmdNumber } from "#root/utils/datetime.js";
 
-const ONLINE_STATS_DAY_LIMIT = 30;
-
-function toOnlineStatsNumber(value) {
-    const num = Number(value);
-
-    if (!Number.isFinite(num)) {
-        return 0;
-    }
-
-    return num;
-}
-
-function getOnlineStatsWeekStartDate(timestamp = Date.now()) {
-    const date = Reflect.construct(Date, [timestamp]);
-    const day = date.getDay();
-    const offset = day === 0 ? -6 : 1 - day;
-
-    return getDateYmdNumber(addDays(timestamp, offset));
-}
-
-function getOnlineStatsMonthStartDate(timestamp = Date.now()) {
-    const date = Reflect.construct(Date, [timestamp]);
-
-    return getDateYmdNumber(Reflect.construct(Date, [date.getFullYear(), date.getMonth(), 1, 0, 0, 0, 0]).getTime());
-}
-
-function getOnlineStatsRecentDateList(now = Date.now(), limit = ONLINE_STATS_DAY_LIMIT) {
-    const list = [];
+import { getTongJiMonthStartDate, getTongJiNumber, getTongJiRecentDateList, getTongJiWeekStartDate } from "./_tongJi.js";
 
-    for (let i = limit - 1; i >= 0; i--) {
-        list.push(getDateYmdNumber(addDays(now, -i)));
-    }
-
-    return list;
-}
+const ONLINE_STATS_DAY_LIMIT = 30;
+const ONLINE_STATS_ACTIVE_KEY = "online:active";
 
+// 构造全量统计的 Redis 键。
 function getPeriodKeys(periodType, periodValue) {
     return {
         pv: `online:${periodType}:${periodValue}:pv`,
@@ -44,12 +14,9 @@ function getPeriodKeys(periodType, periodValue) {
     };
 }
 
-function getOnlineStatsProductKey(productName) {
-    return encodeURIComponent(String(productName || ""));
-}
-
+// 构造单产品统计的 Redis 键。
 function getOnlineStatsProductPeriodKeys(periodType, periodValue, productName) {
-    const productKey = getOnlineStatsProductKey(productName);
+    const productKey = encodeURIComponent(productName);
 
     return {
         pv: `online:${periodType}:${periodValue}:product:${productKey}:pv`,
@@ -58,83 +25,153 @@ function getOnlineStatsProductPeriodKeys(periodType, periodValue, productName) {
     };
 }
 
-function getOnlineStatsProductsKey(periodType, periodValue) {
-    return `online:${periodType}:${periodValue}:products`;
+// 构造单产品实时在线集合的 Redis 键。
+function getOnlineStatsActiveProductKey(productName) {
+    const productKey = encodeURIComponent(productName);
+
+    return `online:active:product:${productKey}`;
 }
 
+// 读取 Redis 字符串并转成统计数字。
 async function getRedisNumber(befly, key) {
-    return toOnlineStatsNumber(await befly.redis.getString(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: toOnlineStatsNumber(await befly.redis.scard(keys.members))
+        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: toOnlineStatsNumber(await befly.redis.scard(keys.members))
+        uv: getTongJiNumber(await befly.redis.scard(keys.members))
     };
 }
 
-async function getOnlineStatsProductNames(befly, recentDateList) {
-    const productSet = new Set();
+// 清理过期成员后返回全站实时在线人数。
+async function getOnlineStatsTotalOnlineCount(befly) {
+    const now = Date.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);
+
+    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) {
-        for (const productName of await befly.redis.smembers(getOnlineStatsProductsKey("day", item))) {
-            if (!productName) {
-                continue;
-            }
+        const dayData = await getOnlineStatsPeriodData(befly, "day", item);
 
-            productSet.add(String(productName));
+        if (dayData.reportTime <= 0) {
+            continue;
         }
+
+        days.push({
+            reportDate: item,
+            reportTime: dayData.reportTime,
+            pv: dayData.pv,
+            uv: dayData.uv
+        });
     }
 
-    return Array.from(productSet.values());
+    return days;
 }
 
-async function getOnlineStatsOnlineCount(befly) {
-    const members = await befly.redis.smembers("online:visitors");
-    if (members.length === 0) {
-        return 0;
-    }
+// 构造单产品统计的按天趋势列表。
+async function buildOnlineStatsProductDays(befly, recentDateList, productName) {
+    const days = [];
 
-    const existsList = await befly.redis.existsBatch(members.map((member) => `online:visitor:${member}`));
-    const expiredMembers = [];
-    let onlineCount = 0;
+    for (const item of recentDateList) {
+        const dayData = await getOnlineStatsProductPeriodData(befly, "day", item, productName);
 
-    for (let i = 0; i < members.length; i++) {
-        if (existsList[i]) {
-            onlineCount += 1;
+        if (dayData.reportTime <= 0) {
             continue;
         }
 
-        expiredMembers.push(members[i]);
+        days.push({
+            reportDate: item,
+            reportTime: dayData.reportTime,
+            pv: dayData.pv,
+            uv: dayData.uv
+        });
     }
 
-    if (expiredMembers.length > 0) {
-        await befly.redis.srem("online:visitors", expiredMembers);
+    return days;
+}
+
+// 按配置项目列表构造项目统计，并按近 30 天 PV 排序。
+async function buildOnlineStatsProducts(befly, recentDateList, reportDate, weekStartDate, monthStartDate, 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
+        });
     }
 
-    return onlineCount;
-}
+    const sortedProducts = products.toSorted((a, b) => {
+        if (b.totalPv !== a.totalPv) {
+            return b.totalPv - a.totalPv;
+        }
 
-function sumProductTrendField(list, field) {
-    let total = 0;
+        return String(a.productName).localeCompare(String(b.productName), "zh-CN");
+    });
 
-    for (const item of list) {
-        total += toOnlineStatsNumber(item?.[field]);
+    for (const item of sortedProducts) {
+        delete item.totalPv;
     }
 
-    return total;
+    return sortedProducts;
 }
 
 export default {
@@ -142,88 +179,40 @@ export default {
     method: "POST",
     body: "none",
     auth: true,
-    fields: {},
+    fields: {
+        productName: { name: "产品名称", input: "string", min: 0, max: 100 }
+    },
     required: [],
-    handler: async (befly) => {
+    // 汇总当前查询范围的在线统计，并在未筛选产品时附带配置项目统计。
+    handler: async (befly, ctx) => {
         const now = Date.now();
         const reportDate = getDateYmdNumber(now);
-        const weekStartDate = getOnlineStatsWeekStartDate(now);
-        const monthStartDate = getOnlineStatsMonthStartDate(now);
-        const recentDateList = getOnlineStatsRecentDateList(now, ONLINE_STATS_DAY_LIMIT);
-        const days = [];
-        const products = [];
-
-        for (const item of recentDateList) {
-            const dayData = await getOnlineStatsPeriodData(befly, "day", item);
-
-            if (dayData.reportTime <= 0) {
-                continue;
-            }
-
-            days.push({
-                reportDate: item,
-                reportTime: dayData.reportTime,
-                pv: dayData.pv,
-                uv: dayData.uv
-            });
-        }
-
-        const currentDay = await getOnlineStatsPeriodData(befly, "day", reportDate);
-        const weekCurrent = await getOnlineStatsPeriodData(befly, "week", weekStartDate);
-        const monthCurrent = await getOnlineStatsPeriodData(befly, "month", monthStartDate);
-        const onlineCount = await getOnlineStatsOnlineCount(befly);
-        const productNames = await getOnlineStatsProductNames(befly, recentDateList);
-
-        for (const productName of productNames) {
-            const productDays = [];
-
-            for (const item of recentDateList) {
-                const dayData = await getOnlineStatsProductPeriodData(befly, "day", item, productName);
-
-                if (dayData.reportTime <= 0) {
-                    continue;
-                }
-
-                productDays.push({
-                    reportDate: item,
-                    reportTime: dayData.reportTime,
-                    pv: dayData.pv,
-                    uv: dayData.uv
-                });
-            }
-
-            const productToday = await getOnlineStatsProductPeriodData(befly, "day", reportDate, productName);
-            const productWeek = await getOnlineStatsProductPeriodData(befly, "week", weekStartDate, productName);
-            const productMonth = await getOnlineStatsProductPeriodData(befly, "month", monthStartDate, productName);
-
-            products.push({
-                key: productName,
-                productName: productName,
-                today: {
-                    pv: productToday.pv,
-                    uv: productToday.uv
-                },
-                week: {
-                    pv: productWeek.pv,
-                    uv: productWeek.uv
-                },
-                month: {
-                    pv: productMonth.pv,
-                    uv: productMonth.uv
-                },
-                days: productDays,
-                totalPv: sumProductTrendField(productDays, "pv"),
-                totalUv: sumProductTrendField(productDays, "uv")
-            });
+        const weekStartDate = getTongJiWeekStartDate(now);
+        const monthStartDate = getTongJiMonthStartDate(now);
+        const recentDateList = getTongJiRecentDateList(now, ONLINE_STATS_DAY_LIMIT);
+        const productName = String(ctx?.body?.productName || "").trim();
+        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);
         }
 
-        products.sort((a, b) => {
-            if (b.totalPv !== a.totalPv) {
-                return b.totalPv - a.totalPv;
-            }
-
-            return String(a.productName).localeCompare(String(b.productName), "zh-CN");
-        });
+        const projectLists = hasProductFilter ? [] : befly.config.projectLists;
+        const products = await buildOnlineStatsProducts(befly, recentDateList, reportDate, weekStartDate, monthStartDate, projectLists);
 
         return befly.tool.Yes("获取成功", {
             queryTime: now,

package/checks/config.js

@@ -10,6 +10,47 @@ z.config(z.locales.zhCN());
 const boolIntSchema = z.union([z.literal(0), z.literal(1), z.literal(true), z.literal(false)]);
 const noTrimString = z.string().refine(isNoTrimStringAllowEmpty, "不允许首尾空格");
 const beflyModeSchema = z.union([z.literal("manual"), z.literal("auto")]);
+const projectListCodeSchema = z.string().regex(/^[a-z][a-zA-Z0-9]*$/, "必须是小驼峰命名");
+const projectListItemSchema = z
+    .object({
+        code: projectListCodeSchema,
+        name: noTrimString.min(1),
+        productName: noTrimString.min(1),
+        productCode: noTrimString.min(1),
+        productVersion: noTrimString.optional()
+    })
+    .strict();
+const projectListsSchema = z.array(projectListItemSchema).superRefine((projectLists, ctx) => {
+    const codeSet = new Set();
+    const productCodeSet = new Set();
+
+    for (let index = 0; index < projectLists.length; index += 1) {
+        const code = projectLists[index].code;
+        const productCode = projectLists[index].productCode;
+
+        if (codeSet.has(code)) {
+            ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                message: `projectLists[${index}].code 重复`,
+                path: [index, "code"]
+            });
+            continue;
+        }
+
+        codeSet.add(code);
+
+        if (productCodeSet.has(productCode)) {
+            ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                message: `projectLists[${index}].productCode 重复`,
+                path: [index, "productCode"]
+            });
+            continue;
+        }
+
+        productCodeSet.add(productCode);
+    }
+});
 
 const configSchema = z
     .object({
@@ -98,7 +139,9 @@ const configSchema = z
                 skipRoutes: z.array(noTrimString),
                 rules: z.array(z.object({}).passthrough())
             })
-            .strict()
+            .strict(),
+
+        projectLists: projectListsSchema
     })
     .strict();
 

package/configs/beflyConfig.json

@@ -68,5 +68,14 @@
         "key": "ip",
         "skipRoutes": [],
         "rules": []
-    }
+    },
+    "projectLists": [
+        {
+            "code": "beflyCore",
+            "name": "后台管理",
+            "productName": "后台管理",
+            "productCode": "beflyCore",
+            "productVersion": "1.0.0"
+        }
+    ]
 }

package/hooks/permission.js

@@ -47,9 +47,13 @@ export default {
 
         // 4. 角色权限检查
         // apiPath 在 apiHandler 中已统一生成并写入 ctx.apiPath
+        let hasPermission = false;
 
-        // 极简方案：每个角色一个 Set，直接判断成员是否存在
-        const hasPermission = await befly.redis.sismember(`role:apis:${ctx.roleCode}`, ctx.apiPath);
+        if (befly.cache && typeof befly.cache.checkRoleApis === "function") {
+            hasPermission = await befly.cache.checkRoleApis(ctx.roleCode, ctx.apiPath);
+        } else {
+            hasPermission = await befly.redis.sismember(`role:apis:${ctx.roleCode}`, ctx.apiPath);
+        }
 
         if (!hasPermission) {
             ctx.response = ErrorResponse(