befly 3.36.0 → 3.37.0

package/apis/tongJi/infoStats.js

@@ -1,227 +1,192 @@
-import { getDateYmdNumber } from "#befly/utils/datetime.js";
-
-import { getTongJiMonthStartDate, getTongJiWeekStartDate } from "./_tongJi.js";
-
-const INFO_STATS_FIELDS = [
-    { dbField: "source", key: "sources" },
-    { dbField: "product_name", key: "productNames" },
-    { dbField: "product_code", key: "productCodes" },
-    { dbField: "product_version", key: "productVersions" },
-    { dbField: "page_path", key: "pagePaths" },
-    { dbField: "page_name", key: "pageNames" },
-    { dbField: "device_type", key: "deviceTypes" },
-    { dbField: "browser_name", key: "browsers" },
-    { dbField: "browser_version", key: "browserVersions" },
-    { dbField: "os_name", key: "osList" },
-    { dbField: "os_version", key: "osVersions" },
-    { dbField: "device_vendor", key: "deviceVendors" },
-    { dbField: "device_model", key: "deviceModels" },
-    { 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 formatInfoStatsList(rows = []) {
-    const list = [];
+import { addDays, getDateYmdNumber, getDayStartTime } from "#befly/utils/datetime.js";
 
-    for (const item of rows) {
-        const name = String(item.name || "").trim();
-        const count = Number(item.count || 0);
-
-        if (!name || count <= 0) {
-            continue;
-        }
+import { getTongJiMonthStartDate, getTongJiNumber, getTongJiRecentDateList, getVisitStatsDayMembersKey, getVisitStatsDayProductMembersKey, getVisitStatsMonthMembersKey, getVisitStatsMonthProductMembersKey, getVisitStatsRecentMembersKey, getVisitStatsRecentProductMembersKey } from "./_tongJi.js";
 
-        list.push({
-            name: name,
-            count: count
-        });
-    }
+const VISIT_STATS_DAY_LIMIT = 30;
 
-    return list;
+async function getRedisSetCount(befly, key) {
+    return getTongJiNumber(await befly.redis.scard(key));
 }
 
-function getInfoStatsNamesKey(periodType, periodValue, fieldKey) {
-    return `info:${periodType}:${periodValue}:${fieldKey}:names`;
-}
+async function getRedisRecentCount(befly, key, now) {
+    const cutoffTime = getDayStartTime(addDays(now, -29));
 
-function getInfoStatsCountKey(periodType, periodValue, fieldKey, value) {
-    return `info:${periodType}:${periodValue}:${fieldKey}:count:${encodeURIComponent(String(value || ""))}`;
+    await befly.redis.zremrangebyscore(key, "-inf", cutoffTime - 1);
+    return getTongJiNumber(await befly.redis.zcard(key));
 }
 
-function getInfoStatsReportTimeKey(periodType, periodValue) {
-    return `info:${periodType}:${periodValue}:reportTime`;
-}
+async function getVisitStatsDays(befly, recentDateList, productCode) {
+    const days = [];
 
-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
+    for (const reportDate of recentDateList) {
+        days.push({
+            reportDate: reportDate,
+            count: await getRedisSetCount(befly, productCode ? getVisitStatsDayProductMembersKey(reportDate, productCode) : getVisitStatsDayMembersKey(reportDate))
         });
     }
 
-    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);
+    return days;
 }
 
-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);
+async function getVisitStatsSummary(befly, now, reportDate, monthStartDate, recentDateList, productCode) {
+    const yesterdayDate = recentDateList[recentDateList.length - 2] || reportDate;
+    const dayBeforeYesterdayDate = recentDateList[recentDateList.length - 3] || yesterdayDate;
 
-    return formatInfoStatsList(result.data || []);
+    return {
+        today: {
+            reportDate: reportDate,
+            count: await getRedisSetCount(befly, productCode ? getVisitStatsDayProductMembersKey(reportDate, productCode) : getVisitStatsDayMembersKey(reportDate))
+        },
+        yesterday: {
+            reportDate: yesterdayDate,
+            count: await getRedisSetCount(befly, productCode ? getVisitStatsDayProductMembersKey(yesterdayDate, productCode) : getVisitStatsDayMembersKey(yesterdayDate))
+        },
+        dayBeforeYesterday: {
+            reportDate: dayBeforeYesterdayDate,
+            count: await getRedisSetCount(befly, productCode ? getVisitStatsDayProductMembersKey(dayBeforeYesterdayDate, productCode) : getVisitStatsDayMembersKey(dayBeforeYesterdayDate))
+        },
+        month: {
+            startDate: monthStartDate,
+            endDate: reportDate,
+            count: await getRedisSetCount(befly, productCode ? getVisitStatsMonthProductMembersKey(monthStartDate, productCode) : getVisitStatsMonthMembersKey(monthStartDate))
+        },
+        recent30: {
+            startDate: recentDateList[0],
+            endDate: reportDate,
+            count: await getRedisRecentCount(befly, productCode ? getVisitStatsRecentProductMembersKey(productCode) : getVisitStatsRecentMembersKey(), now)
+        },
+        days: await getVisitStatsDays(befly, recentDateList, productCode)
+    };
 }
 
-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, productName);
+function buildEmptyVisitStats(reportDate, monthStartDate, recentDateList, projectLists) {
+    const yesterdayDate = recentDateList[recentDateList.length - 2] || reportDate;
+    const dayBeforeYesterdayDate = recentDateList[recentDateList.length - 3] || yesterdayDate;
+    const days = recentDateList.map((item) => {
+        return {
+            reportDate: item,
+            count: 0
+        };
+    });
+    const products = [];
+
+    for (const item of projectLists) {
+        products.push({
+            key: item.productCode,
+            productName: item.productName,
+            productCode: item.productCode,
+            productVersion: item.productVersion || "",
+            today: 0,
+            yesterday: 0,
+            dayBeforeYesterday: 0,
+            month: 0,
+            recent30: 0,
+            days: days
+        });
     }
 
-    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
+    return {
+        today: {
+            reportDate: reportDate,
+            count: 0
+        },
+        yesterday: {
+            reportDate: yesterdayDate,
+            count: 0
+        },
+        dayBeforeYesterday: {
+            reportDate: dayBeforeYesterdayDate,
+            count: 0
+        },
+        month: {
+            startDate: monthStartDate,
+            endDate: reportDate,
+            count: 0
+        },
+        recent30: {
+            startDate: recentDateList[0],
+            endDate: reportDate,
+            count: 0
+        },
+        days: days,
+        products: products
     };
+}
 
-    if (reportDate !== null) {
-        result.reportDate = reportDate;
-    }
-
-    if (startDate !== null && endDate !== null) {
-        result.startDate = startDate;
-        result.endDate = endDate;
+async function buildVisitStatsProducts(befly, now, reportDate, monthStartDate, recentDateList, projectLists) {
+    const products = [];
+
+    for (const item of projectLists) {
+        const summary = await getVisitStatsSummary(befly, now, reportDate, monthStartDate, recentDateList, item.productCode);
+
+        products.push({
+            key: item.productCode,
+            productName: item.productName,
+            productCode: item.productCode,
+            productVersion: item.productVersion || "",
+            today: summary.today.count,
+            yesterday: summary.yesterday.count,
+            dayBeforeYesterday: summary.dayBeforeYesterday.count,
+            month: summary.month.count,
+            recent30: summary.recent30.count,
+            days: summary.days
+        });
     }
 
-    return result;
-}
+    return products.toSorted((a, b) => {
+        if (b.recent30 !== a.recent30) {
+            return b.recent30 - a.recent30;
+        }
 
-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)
-    };
+        return String(a.productName).localeCompare(String(b.productName), "zh-CN");
+    });
 }
 
 export default {
-    name: "获取访问信息统计",
+    name: "获取独立访客统计",
     method: "POST",
     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 productName = ctx?.body?.productName ?? "";
-        const hasProductFilter = productName.length > 0;
-
-        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));
-            }
+        const recentDateList = getTongJiRecentDateList(now, VISIT_STATS_DAY_LIMIT);
+        const productCode = ctx?.body?.productCode ?? "";
+        const hasProductFilter = productCode.length > 0;
+        const projectLists = hasProductFilter ? [] : befly.config?.projectLists || [];
+
+        if (!befly.redis) {
+            const emptyStats = buildEmptyVisitStats(reportDate, monthStartDate, recentDateList, projectLists);
+
+            return befly.tool.Yes("获取成功", {
+                queryTime: now,
+                today: emptyStats.today,
+                yesterday: emptyStats.yesterday,
+                dayBeforeYesterday: emptyStats.dayBeforeYesterday,
+                month: emptyStats.month,
+                recent30: emptyStats.recent30,
+                days: emptyStats.days,
+                products: emptyStats.products
+            });
         }
 
-        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));
+        const summary = await getVisitStatsSummary(befly, now, reportDate, monthStartDate, recentDateList, productCode);
+        const products = await buildVisitStatsProducts(befly, now, reportDate, monthStartDate, recentDateList, projectLists);
+
+        return befly.tool.Yes("获取成功", {
+            queryTime: now,
+            today: summary.today,
+            yesterday: summary.yesterday,
+            dayBeforeYesterday: summary.dayBeforeYesterday,
+            month: summary.month,
+            recent30: summary.recent30,
+            days: summary.days,
+            products: products
+        });
     }
 };

package/apis/tongJi/onlineReport.js

@@ -1,42 +1,41 @@
 import { getDateYmdNumber } from "#befly/utils/datetime.js";
 import { isValidPositiveInt } from "#befly/utils/is.js";
 
-import { expireTongJiRedisKeys, getTongJiMonthStartDate, getTongJiWeekStartDate } from "./_tongJi.js";
+import { getOnlineStatsActiveProductKey } from "./_tongJi.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)) {
+    if (isValidPositiveInt(ctx?.userId)) {
         return `user:${ctx.userId}`;
     }
 
-    const clientId = ctx.body.clientId ?? "";
+    const clientId = ctx?.body?.clientId ?? "";
 
     if (clientId) {
         return `client:${clientId}`;
     }
 
-    return `ip:${ctx.ip || "unknown"}`;
+    return `ip:${ctx?.ip || "unknown"}`;
 }
 
-async function updateOnlineStatsActiveMemberProduct(befly, member, productName, expireAt) {
-    if (!productName) {
+async function updateOnlineStatsActiveMemberProduct(befly, member, productCode, expireAt) {
+    if (!productCode) {
         return;
     }
 
     const memberProductKey = `online:active:member:${encodeURIComponent(member)}:product`;
-    const previousProductName = String((await befly.redis.getString(memberProductKey)) || "").trim();
+    const previousProductCode = String((await befly.redis.getString(memberProductKey)) || "").trim();
 
-    if (previousProductName && previousProductName !== productName) {
-        await befly.redis.zrem(`online:active:product:${encodeURIComponent(previousProductName)}`, [member]);
+    if (previousProductCode && previousProductCode !== productCode) {
+        await befly.redis.zrem(getOnlineStatsActiveProductKey(previousProductCode), [member]);
     }
 
-    const activeProductKey = `online:active:product:${encodeURIComponent(productName)}`;
+    const activeProductKey = getOnlineStatsActiveProductKey(productCode);
 
-    await befly.redis.setString(memberProductKey, productName, ONLINE_STATS_ONLINE_TTL_SECONDS);
+    await befly.redis.setString(memberProductKey, productCode, ONLINE_STATS_ONLINE_TTL_SECONDS);
     await befly.redis.zadd(activeProductKey, [
         {
             score: expireAt,
@@ -46,7 +45,7 @@ async function updateOnlineStatsActiveMemberProduct(befly, member, productName,
     await befly.redis.expire(activeProductKey, ONLINE_STATS_REDIS_TTL_SECONDS);
 }
 
-async function updateOnlineStatsActiveMember(befly, member, now, productName) {
+async function updateOnlineStatsActiveMember(befly, member, now, productCode) {
     const expireAt = now + ONLINE_STATS_ONLINE_TTL_SECONDS * 1000;
 
     await befly.redis.zadd(ONLINE_STATS_ACTIVE_KEY, [
@@ -55,43 +54,10 @@ async function updateOnlineStatsActiveMember(befly, member, now, productName) {
             member: member
         }
     ]);
-    await updateOnlineStatsActiveMemberProduct(befly, member, productName, expireAt);
+    await updateOnlineStatsActiveMemberProduct(befly, member, productCode, expireAt);
     await befly.redis.expire(ONLINE_STATS_ACTIVE_KEY, ONLINE_STATS_REDIS_TTL_SECONDS);
 }
 
-async function updateOnlineStatsPeriod(befly, periodType, periodValue, member) {
-    const keys = {
-        pv: `online:${periodType}:${periodValue}:pv`,
-        members: `online:${periodType}:${periodValue}:members`,
-        reportTime: `online:${periodType}:${periodValue}:reportTime`
-    };
-
-    await befly.redis.incr(keys.pv);
-    await befly.redis.sadd(keys.members, [member]);
-    await befly.redis.setString(keys.reportTime, String(Date.now()), ONLINE_STATS_TEMP_TTL_SECONDS);
-    await expireTongJiRedisKeys(befly, Object.values(keys), ONLINE_STATS_TEMP_TTL_SECONDS);
-}
-
-async function updateOnlineStatsProductPeriod(befly, periodType, periodValue, member, productName) {
-    if (!productName) {
-        return;
-    }
-
-    const productKey = encodeURIComponent(productName);
-    const keys = {
-        pv: `online:${periodType}:${periodValue}:product:${productKey}:pv`,
-        members: `online:${periodType}:${periodValue}:product:${productKey}:members`,
-        reportTime: `online:${periodType}:${periodValue}:product:${productKey}:reportTime`
-    };
-    const productsKey = `online:${periodType}:${periodValue}:products`;
-
-    await befly.redis.incr(keys.pv);
-    await befly.redis.sadd(keys.members, [member]);
-    await befly.redis.setString(keys.reportTime, String(Date.now()), ONLINE_STATS_TEMP_TTL_SECONDS);
-    await befly.redis.sadd(productsKey, [productName]);
-    await expireTongJiRedisKeys(befly, [...Object.values(keys), productsKey], ONLINE_STATS_TEMP_TTL_SECONDS);
-}
-
 export default {
     name: "上报在线统计",
     method: "POST",
@@ -110,23 +76,22 @@ export default {
     handler: async (befly, ctx) => {
         const now = Date.now();
         const reportDate = getDateYmdNumber(now);
-        const weekStartDate = getTongJiWeekStartDate(now);
-        const monthStartDate = getTongJiMonthStartDate(now);
-        const member = getOnlineStatsMember(ctx);
-        const productName = ctx.body.productName ?? "";
+        const productCode = ctx?.body?.productCode ?? "";
+
+        if (!befly.redis) {
+            return befly.tool.Yes("上报成功", {
+                reportTime: now,
+                reportDate: reportDate,
+                onlineCount: 0,
+                stored: false
+            });
+        }
 
-        await updateOnlineStatsActiveMember(befly, member, now, productName);
+        await updateOnlineStatsActiveMember(befly, getOnlineStatsMember(ctx), now, productCode);
 
         await befly.redis.zremrangebyscore(ONLINE_STATS_ACTIVE_KEY, "-inf", now);
         const onlineCount = await befly.redis.zcard(ONLINE_STATS_ACTIVE_KEY);
 
-        await updateOnlineStatsPeriod(befly, "day", reportDate, member);
-        await updateOnlineStatsPeriod(befly, "week", weekStartDate, member);
-        await updateOnlineStatsPeriod(befly, "month", monthStartDate, member);
-        await updateOnlineStatsProductPeriod(befly, "day", reportDate, member, productName);
-        await updateOnlineStatsProductPeriod(befly, "week", weekStartDate, member, productName);
-        await updateOnlineStatsProductPeriod(befly, "month", monthStartDate, member, productName);
-
         return befly.tool.Yes("上报成功", {
             reportTime: now,
             reportDate: reportDate,