befly 3.24.17 → 3.24.19

package/apis/tongJi/infoStats.js

@@ -17,6 +17,13 @@ const INFO_STATS_FIELDS = [
     { dbField: "engine_name", key: "engines" },
     { dbField: "cpu_architecture", key: "cpuArchitectures" }
 ];
+const INFO_STATS_FALLBACK_COUNT_KEY = "stats:fallback:infoStats:count";
+const INFO_STATS_FALLBACK_DAILY_COUNT_KEY_PREFIX = "stats:fallback:infoStats:count:day:";
+const INFO_STATS_FALLBACK_TTL_SECONDS = 7 * 24 * 60 * 60;
+
+function getInfoStatsFallbackDailyCountKey(reportDate) {
+    return `${INFO_STATS_FALLBACK_DAILY_COUNT_KEY_PREFIX}${reportDate}`;
+}
 
 function getInfoStatsWeekStartDate(timestamp = Date.now()) {
     const date = Reflect.construct(Date, [timestamp]);
@@ -35,7 +42,7 @@ function getInfoStatsMonthStartDate(timestamp = Date.now()) {
 function formatInfoStatsList(rows = []) {
     const list = [];
 
-    for (const item of rows || []) {
+    for (const item of rows) {
         const name = String(item.name || "").trim();
         const count = Number(item.count || 0);
 
@@ -52,96 +59,181 @@ function formatInfoStatsList(rows = []) {
     return list;
 }
 
-async function getInfoStatsFieldList(befly, startDate, endDate, dbField) {
-    const result = await befly.mysql.execute(`SELECT ${dbField} as name, COUNT(*) as count FROM befly_info_report WHERE state = 1 AND report_date BETWEEN ? AND ? AND ${dbField} <> '' GROUP BY ${dbField} ORDER BY count DESC, name ASC LIMIT 10`, [startDate, endDate]);
+function getInfoStatsNamesKey(periodType, periodValue, fieldKey) {
+    return `info:${periodType}:${periodValue}:${fieldKey}:names`;
+}
+
+function getInfoStatsCountKey(periodType, periodValue, fieldKey, value) {
+    return `info:${periodType}:${periodValue}:${fieldKey}:count:${encodeURIComponent(String(value || ""))}`;
+}
+
+function getInfoStatsReportTimeKey(periodType, periodValue) {
+    return `info:${periodType}:${periodValue}:reportTime`;
+}
+
+async function getInfoStatsFieldListFromRedis(befly, periodType, periodValue, fieldKey) {
+    const values = await befly.redis.smembers(getInfoStatsNamesKey(periodType, periodValue, fieldKey));
+    const rows = [];
+
+    for (const value of values) {
+        const name = String(value || "").trim();
+
+        if (!name) {
+            continue;
+        }
+
+        rows.push({
+            name: name,
+            count: Number(await befly.redis.getString(getInfoStatsCountKey(periodType, periodValue, fieldKey, name))) || 0
+        });
+    }
+
+    rows.sort((a, b) => {
+        if (b.count !== a.count) {
+            return b.count - a.count;
+        }
+
+        return String(a.name).localeCompare(String(b.name), "zh-CN");
+    });
+
+    return formatInfoStatsList(rows.slice(0, 10));
+}
+
+async function getInfoStatsPeriodFromRedis(befly, periodType, periodValue) {
+    const reportTime = Number(await befly.redis.getString(getInfoStatsReportTimeKey(periodType, periodValue))) || 0;
+
+    if (reportTime <= 0) {
+        return null;
+    }
+
+    const data = {};
+
+    for (const item of INFO_STATS_FIELDS) {
+        data[item.key] = await getInfoStatsFieldListFromRedis(befly, periodType, periodValue, item.key);
+    }
+
+    return data;
+}
+
+async function incrInfoStatsFallbackCount(befly, reportDate) {
+    if (!befly.redis) {
+        return;
+    }
+
+    const dailyKey = getInfoStatsFallbackDailyCountKey(reportDate);
+
+    if (typeof befly.redis.incrWithExpire === "function") {
+        await befly.redis.incrWithExpire(INFO_STATS_FALLBACK_COUNT_KEY, INFO_STATS_FALLBACK_TTL_SECONDS);
+        await befly.redis.incrWithExpire(dailyKey, INFO_STATS_FALLBACK_TTL_SECONDS);
+        return;
+    }
+
+    await befly.redis.incr(INFO_STATS_FALLBACK_COUNT_KEY);
+    await befly.redis.expire(INFO_STATS_FALLBACK_COUNT_KEY, INFO_STATS_FALLBACK_TTL_SECONDS);
+    await befly.redis.incr(dailyKey);
+    await befly.redis.expire(dailyKey, INFO_STATS_FALLBACK_TTL_SECONDS);
+}
+
+async function getInfoStatsFieldList(befly, startDate, endDate, dbField, productName) {
+    const queryParams = [startDate, endDate];
+    let sql = `SELECT ${dbField} as name, COUNT(*) as count FROM befly_info_report WHERE state = 1 AND report_date BETWEEN ? AND ?`;
+
+    if (productName) {
+        sql += " AND product_name = ?";
+        queryParams.push(productName);
+    }
+
+    sql += ` AND ${dbField} <> '' GROUP BY ${dbField} ORDER BY count DESC, name ASC LIMIT 10`;
+
+    const result = await befly.mysql.execute(sql, queryParams);
 
     return formatInfoStatsList(result.data || []);
 }
 
-async function getInfoStatsRange(befly, startDate, endDate) {
+async function getInfoStatsRange(befly, startDate, endDate, productName) {
     const data = {};
 
     for (const item of INFO_STATS_FIELDS) {
-        data[item.key] = await getInfoStatsFieldList(befly, startDate, endDate, item.dbField);
+        data[item.key] = await getInfoStatsFieldList(befly, startDate, endDate, item.dbField, productName);
     }
 
     return data;
 }
 
+function buildInfoStatsPeriod(periodData, startDate = null, endDate = null, reportDate = null) {
+    const result = {
+        sources: periodData.sources,
+        productNames: periodData.productNames,
+        productCodes: periodData.productCodes,
+        productVersions: periodData.productVersions,
+        pagePaths: periodData.pagePaths,
+        pageNames: periodData.pageNames,
+        deviceTypes: periodData.deviceTypes,
+        browsers: periodData.browsers,
+        browserVersions: periodData.browserVersions,
+        osList: periodData.osList,
+        osVersions: periodData.osVersions,
+        deviceVendors: periodData.deviceVendors,
+        deviceModels: periodData.deviceModels,
+        engines: periodData.engines,
+        cpuArchitectures: periodData.cpuArchitectures
+    };
+
+    if (reportDate !== null) {
+        result.reportDate = reportDate;
+    }
+
+    if (startDate !== null && endDate !== null) {
+        result.startDate = startDate;
+        result.endDate = endDate;
+    }
+
+    return result;
+}
+
+function buildInfoStatsResult(today, week, month, reportDate, weekStartDate, monthStartDate) {
+    return {
+        today: buildInfoStatsPeriod(today, null, null, reportDate),
+        week: buildInfoStatsPeriod(week, weekStartDate, reportDate, null),
+        month: buildInfoStatsPeriod(month, monthStartDate, reportDate, null)
+    };
+}
+
 export default {
     name: "获取访问信息统计",
     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 = getInfoStatsWeekStartDate(now);
         const monthStartDate = getInfoStatsMonthStartDate(now);
+        const productName = String(ctx?.body?.productName || "").trim();
+        const hasProductFilter = productName.length > 0;
 
-        const today = await getInfoStatsRange(befly, reportDate, reportDate);
-        const week = await getInfoStatsRange(befly, weekStartDate, reportDate);
-        const month = await getInfoStatsRange(befly, monthStartDate, reportDate);
-
-        return befly.tool.Yes("获取成功", {
-            today: {
-                reportDate: reportDate,
-                sources: today.sources,
-                productNames: today.productNames,
-                productCodes: today.productCodes,
-                productVersions: today.productVersions,
-                pagePaths: today.pagePaths,
-                pageNames: today.pageNames,
-                deviceTypes: today.deviceTypes,
-                browsers: today.browsers,
-                browserVersions: today.browserVersions,
-                osList: today.osList,
-                osVersions: today.osVersions,
-                deviceVendors: today.deviceVendors,
-                deviceModels: today.deviceModels,
-                engines: today.engines,
-                cpuArchitectures: today.cpuArchitectures
-            },
-            week: {
-                startDate: weekStartDate,
-                endDate: reportDate,
-                sources: week.sources,
-                productNames: week.productNames,
-                productCodes: week.productCodes,
-                productVersions: week.productVersions,
-                pagePaths: week.pagePaths,
-                pageNames: week.pageNames,
-                deviceTypes: week.deviceTypes,
-                browsers: week.browsers,
-                browserVersions: week.browserVersions,
-                osList: week.osList,
-                osVersions: week.osVersions,
-                deviceVendors: week.deviceVendors,
-                deviceModels: week.deviceModels,
-                engines: week.engines,
-                cpuArchitectures: week.cpuArchitectures
-            },
-            month: {
-                startDate: monthStartDate,
-                endDate: reportDate,
-                sources: month.sources,
-                productNames: month.productNames,
-                productCodes: month.productCodes,
-                productVersions: month.productVersions,
-                pagePaths: month.pagePaths,
-                pageNames: month.pageNames,
-                deviceTypes: month.deviceTypes,
-                browsers: month.browsers,
-                browserVersions: month.browserVersions,
-                osList: month.osList,
-                osVersions: month.osVersions,
-                deviceVendors: month.deviceVendors,
-                deviceModels: month.deviceModels,
-                engines: month.engines,
-                cpuArchitectures: month.cpuArchitectures
+        if (befly.redis && !hasProductFilter) {
+            const today = await getInfoStatsPeriodFromRedis(befly, "day", reportDate);
+            const week = await getInfoStatsPeriodFromRedis(befly, "week", weekStartDate);
+            const month = await getInfoStatsPeriodFromRedis(befly, "month", monthStartDate);
+
+            if (today && week && month) {
+                return befly.tool.Yes("获取成功", buildInfoStatsResult(today, week, month, reportDate, weekStartDate, monthStartDate));
             }
-        });
+        }
+
+        if (befly.redis && !hasProductFilter) {
+            await incrInfoStatsFallbackCount(befly, reportDate);
+        }
+
+        const today = await getInfoStatsRange(befly, reportDate, reportDate, productName);
+        const week = await getInfoStatsRange(befly, weekStartDate, reportDate, productName);
+        const month = await getInfoStatsRange(befly, monthStartDate, reportDate, productName);
+
+        return befly.tool.Yes("获取成功", buildInfoStatsResult(today, week, month, reportDate, weekStartDate, monthStartDate));
     }
 };

package/apis/tongJi/onlineReport.js

@@ -4,6 +4,7 @@ import { isValidPositiveInt } from "#root/utils/is.js";
 const ONLINE_STATS_ONLINE_TTL_SECONDS = 10 * 60;
 const ONLINE_STATS_REDIS_TTL_SECONDS = 7 * 24 * 60 * 60;
 const ONLINE_STATS_TEMP_TTL_SECONDS = 45 * 24 * 60 * 60;
+const ONLINE_STATS_ACTIVE_KEY = "online:active";
 
 function getOnlineStatsMember(ctx) {
     if (isValidPositiveInt(ctx.userId)) {
@@ -60,29 +61,21 @@ async function touchRedisKeys(befly, keys, ttl) {
 }
 
 async function getOnlineStatsOnlineCount(befly) {
-    const members = await befly.redis.smembers("online:visitors");
-    if (members.length === 0) {
-        return 0;
-    }
+    const now = Date.now();
+    await befly.redis.zremrangebyscore(ONLINE_STATS_ACTIVE_KEY, "-inf", now);
+    return await befly.redis.zcard(ONLINE_STATS_ACTIVE_KEY);
+}
 
-    const existsList = await befly.redis.existsBatch(members.map((member) => `online:visitor:${member}`));
-    const expiredMembers = [];
-    let onlineCount = 0;
+async function updateOnlineStatsActiveMember(befly, member, now) {
+    const expireAt = now + ONLINE_STATS_ONLINE_TTL_SECONDS * 1000;
 
-    for (let i = 0; i < members.length; i++) {
-        if (existsList[i]) {
-            onlineCount += 1;
-            continue;
+    await befly.redis.zadd(ONLINE_STATS_ACTIVE_KEY, [
+        {
+            score: expireAt,
+            member: member
         }
-
-        expiredMembers.push(members[i]);
-    }
-
-    if (expiredMembers.length > 0) {
-        await befly.redis.srem("online:visitors", expiredMembers);
-    }
-
-    return onlineCount;
+    ]);
+    await befly.redis.expire(ONLINE_STATS_ACTIVE_KEY, ONLINE_STATS_REDIS_TTL_SECONDS);
 }
 
 async function updateOnlineStatsPeriod(befly, periodType, periodValue, member) {
@@ -131,9 +124,7 @@ export default {
         const member = getOnlineStatsMember(ctx);
         const productName = ctx.body?.productName || "";
 
-        await befly.redis.setString(`online:visitor:${member}`, "1", ONLINE_STATS_ONLINE_TTL_SECONDS);
-        await befly.redis.sadd("online:visitors", [member]);
-        await befly.redis.expire("online:visitors", ONLINE_STATS_REDIS_TTL_SECONDS);
+        await updateOnlineStatsActiveMember(befly, member, now);
 
         const onlineCount = await getOnlineStatsOnlineCount(befly);
 

package/apis/tongJi/onlineStats.js

@@ -1,6 +1,7 @@
 import { addDays, getDateYmdNumber } from "#root/utils/datetime.js";
 
 const ONLINE_STATS_DAY_LIMIT = 30;
+const ONLINE_STATS_ACTIVE_KEY = "online:active";
 
 function toOnlineStatsNumber(value) {
     const num = Number(value);
@@ -75,6 +76,14 @@ async function getOnlineStatsPeriodData(befly, periodType, periodValue) {
     };
 }
 
+async function getOnlineStatsPeriodDataByProduct(befly, periodType, periodValue, productName) {
+    if (!productName) {
+        return await getOnlineStatsPeriodData(befly, periodType, periodValue);
+    }
+
+    return await getOnlineStatsProductPeriodData(befly, periodType, periodValue, productName);
+}
+
 async function getOnlineStatsProductPeriodData(befly, periodType, periodValue, productName) {
     const keys = getOnlineStatsProductPeriodKeys(periodType, periodValue, productName);
 
@@ -102,29 +111,9 @@ async function getOnlineStatsProductNames(befly, recentDateList) {
 }
 
 async function getOnlineStatsOnlineCount(befly) {
-    const members = await befly.redis.smembers("online:visitors");
-    if (members.length === 0) {
-        return 0;
-    }
-
-    const existsList = await befly.redis.existsBatch(members.map((member) => `online:visitor:${member}`));
-    const expiredMembers = [];
-    let onlineCount = 0;
-
-    for (let i = 0; i < members.length; i++) {
-        if (existsList[i]) {
-            onlineCount += 1;
-            continue;
-        }
-
-        expiredMembers.push(members[i]);
-    }
-
-    if (expiredMembers.length > 0) {
-        await befly.redis.srem("online:visitors", expiredMembers);
-    }
-
-    return onlineCount;
+    const now = Date.now();
+    await befly.redis.zremrangebyscore(ONLINE_STATS_ACTIVE_KEY, "-inf", now);
+    return await befly.redis.zcard(ONLINE_STATS_ACTIVE_KEY);
 }
 
 function sumProductTrendField(list, field) {
@@ -137,30 +126,41 @@ function sumProductTrendField(list, field) {
     return total;
 }
 
-export default {
-    name: "获取在线统计",
-    method: "POST",
-    body: "none",
-    auth: true,
-    fields: {},
-    required: [],
-    handler: async (befly) => {
-        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 = [];
+async function buildOnlineStatsDays(befly, recentDateList, productName) {
+    const days = [];
+
+    for (const item of recentDateList) {
+        const dayData = await getOnlineStatsPeriodDataByProduct(befly, "day", item, productName);
+
+        if (dayData.reportTime <= 0) {
+            continue;
+        }
+
+        days.push({
+            reportDate: item,
+            reportTime: dayData.reportTime,
+            pv: dayData.pv,
+            uv: dayData.uv
+        });
+    }
+
+    return days;
+}
+
+async function buildOnlineStatsProducts(befly, recentDateList, reportDate, weekStartDate, monthStartDate, productNames) {
+    const products = [];
+
+    for (const productItemName of productNames) {
+        const productDays = [];
 
         for (const item of recentDateList) {
-            const dayData = await getOnlineStatsPeriodData(befly, "day", item);
+            const dayData = await getOnlineStatsProductPeriodData(befly, "day", item, productItemName);
 
             if (dayData.reportTime <= 0) {
                 continue;
             }
 
-            days.push({
+            productDays.push({
                 reportDate: item,
                 reportTime: dayData.reportTime,
                 pv: dayData.pv,
@@ -168,62 +168,65 @@ export default {
             });
         }
 
-        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);
+        const productToday = await getOnlineStatsProductPeriodData(befly, "day", reportDate, productItemName);
+        const productWeek = await getOnlineStatsProductPeriodData(befly, "week", weekStartDate, productItemName);
+        const productMonth = await getOnlineStatsProductPeriodData(befly, "month", monthStartDate, productItemName);
 
-        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
-                });
-            }
+        products.push({
+            key: productItemName,
+            productName: productItemName,
+            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 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")
-            });
+    return products.toSorted((a, b) => {
+        if (b.totalPv !== a.totalPv) {
+            return b.totalPv - a.totalPv;
         }
 
-        products.sort((a, b) => {
-            if (b.totalPv !== a.totalPv) {
-                return b.totalPv - a.totalPv;
-            }
+        return String(a.productName).localeCompare(String(b.productName), "zh-CN");
+    });
+}
 
-            return String(a.productName).localeCompare(String(b.productName), "zh-CN");
-        });
+export default {
+    name: "获取在线统计",
+    method: "POST",
+    body: "none",
+    auth: true,
+    fields: {
+        productName: { name: "产品名称", input: "string", min: 0, max: 100 }
+    },
+    required: [],
+    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 productName = String(ctx?.body?.productName || "").trim();
+        const hasProductFilter = productName.length > 0;
+        const days = await buildOnlineStatsDays(befly, recentDateList, productName);
+
+        const currentDay = await getOnlineStatsPeriodDataByProduct(befly, "day", reportDate, productName);
+        const weekCurrent = await getOnlineStatsPeriodDataByProduct(befly, "week", weekStartDate, productName);
+        const monthCurrent = await getOnlineStatsPeriodDataByProduct(befly, "month", monthStartDate, productName);
+        const onlineCount = await getOnlineStatsOnlineCount(befly);
+        const productNames = hasProductFilter ? [] : await getOnlineStatsProductNames(befly, recentDateList);
+        const products = await buildOnlineStatsProducts(befly, recentDateList, reportDate, weekStartDate, monthStartDate, productNames);
 
         return befly.tool.Yes("获取成功", {
             queryTime: now,

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(