befly 3.24.18 → 3.24.20

package/apis/tongJi/infoStats.js

@@ -1,4 +1,6 @@
-import { addDays, getDateYmdNumber } from "#root/utils/datetime.js";
+import { getDateYmdNumber } from "#root/utils/datetime.js";
+
+import { getTongJiMonthStartDate, getTongJiWeekStartDate } from "./_tongJi.js";
 
 const INFO_STATS_FIELDS = [
     { dbField: "source", key: "sources" },
@@ -17,25 +19,18 @@ 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 getInfoStatsWeekStartDate(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 getInfoStatsMonthStartDate(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 getInfoStatsFallbackDailyCountKey(reportDate) {
+    return `${INFO_STATS_FALLBACK_DAILY_COUNT_KEY_PREFIX}${reportDate}`;
 }
 
 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 +47,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 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
+        const weekStartDate = getTongJiWeekStartDate(now);
+        const monthStartDate = getTongJiMonthStartDate(now);
+        const productName = String(ctx?.body?.productName || "").trim();
+        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));
             }
-        });
+        }
+
+        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

@@ -1,97 +1,77 @@
-import { addDays, getDateYmdNumber } from "#root/utils/datetime.js";
+import { getDateYmdNumber } from "#root/utils/datetime.js";
 import { isValidPositiveInt } from "#root/utils/is.js";
 
+import { expireTongJiRedisKeys, getTongJiMonthStartDate, getTongJiWeekStartDate } 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)) {
         return `user:${ctx.userId}`;
     }
 
-    return `ip:${ctx.ip || "unknown"}`;
-}
-
-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 getPeriodKeys(periodType, periodValue) {
-    return {
-        pv: `online:${periodType}:${periodValue}:pv`,
-        members: `online:${periodType}:${periodValue}:members`,
-        reportTime: `online:${periodType}:${periodValue}:reportTime`
-    };
-}
+    const clientId = String(ctx.body.clientId || "").trim();
 
-function getOnlineStatsProductKey(productName) {
-    return encodeURIComponent(String(productName || ""));
-}
-
-function getOnlineStatsProductPeriodKeys(periodType, periodValue, productName) {
-    const productKey = getOnlineStatsProductKey(productName);
+    if (clientId) {
+        return `client:${clientId}`;
+    }
 
-    return {
-        pv: `online:${periodType}:${periodValue}:product:${productKey}:pv`,
-        members: `online:${periodType}:${periodValue}:product:${productKey}:members`,
-        reportTime: `online:${periodType}:${periodValue}:product:${productKey}:reportTime`
-    };
+    return `ip:${ctx.ip || "unknown"}`;
 }
 
-function getOnlineStatsProductsKey(periodType, periodValue) {
-    return `online:${periodType}:${periodValue}:products`;
-}
+async function updateOnlineStatsActiveMemberProduct(befly, member, productName, expireAt) {
+    const normalizedProductName = String(productName || "").trim();
 
-async function touchRedisKeys(befly, keys, ttl) {
-    for (const key of keys) {
-        await befly.redis.expire(key, ttl);
+    if (!normalizedProductName) {
+        return;
     }
-}
 
-async function getOnlineStatsOnlineCount(befly) {
-    const members = await befly.redis.smembers("online:visitors");
-    if (members.length === 0) {
-        return 0;
+    const memberProductKey = `online:active:member:${encodeURIComponent(member)}:product`;
+    const previousProductName = String((await befly.redis.getString(memberProductKey)) || "").trim();
+
+    if (previousProductName && previousProductName !== normalizedProductName) {
+        await befly.redis.zrem(`online:active:product:${encodeURIComponent(previousProductName)}`, [member]);
     }
 
-    const existsList = await befly.redis.existsBatch(members.map((member) => `online:visitor:${member}`));
-    const expiredMembers = [];
-    let onlineCount = 0;
+    const activeProductKey = `online:active:product:${encodeURIComponent(normalizedProductName)}`;
 
-    for (let i = 0; i < members.length; i++) {
-        if (existsList[i]) {
-            onlineCount += 1;
-            continue;
+    await befly.redis.setString(memberProductKey, normalizedProductName, ONLINE_STATS_ONLINE_TTL_SECONDS);
+    await befly.redis.zadd(activeProductKey, [
+        {
+            score: expireAt,
+            member: member
         }
+    ]);
+    await befly.redis.expire(activeProductKey, ONLINE_STATS_REDIS_TTL_SECONDS);
+}
 
-        expiredMembers.push(members[i]);
-    }
-
-    if (expiredMembers.length > 0) {
-        await befly.redis.srem("online:visitors", expiredMembers);
-    }
+async function updateOnlineStatsActiveMember(befly, member, now, productName) {
+    const expireAt = now + ONLINE_STATS_ONLINE_TTL_SECONDS * 1000;
 
-    return onlineCount;
+    await befly.redis.zadd(ONLINE_STATS_ACTIVE_KEY, [
+        {
+            score: expireAt,
+            member: member
+        }
+    ]);
+    await updateOnlineStatsActiveMemberProduct(befly, member, productName, expireAt);
+    await befly.redis.expire(ONLINE_STATS_ACTIVE_KEY, ONLINE_STATS_REDIS_TTL_SECONDS);
 }
 
 async function updateOnlineStatsPeriod(befly, periodType, periodValue, member) {
-    const keys = getPeriodKeys(periodType, periodValue);
+    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 touchRedisKeys(befly, Object.values(keys), ONLINE_STATS_TEMP_TTL_SECONDS);
+    await expireTongJiRedisKeys(befly, Object.values(keys), ONLINE_STATS_TEMP_TTL_SECONDS);
 }
 
 async function updateOnlineStatsProductPeriod(befly, periodType, periodValue, member, productName) {
@@ -99,14 +79,19 @@ async function updateOnlineStatsProductPeriod(befly, periodType, periodValue, me
         return;
     }
 
-    const keys = getOnlineStatsProductPeriodKeys(periodType, periodValue, productName);
-    const productsKey = getOnlineStatsProductsKey(periodType, periodValue);
+    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 touchRedisKeys(befly, [...Object.values(keys), productsKey], ONLINE_STATS_TEMP_TTL_SECONDS);
+    await expireTongJiRedisKeys(befly, [...Object.values(keys), productsKey], ONLINE_STATS_TEMP_TTL_SECONDS);
 }
 
 export default {
@@ -118,6 +103,7 @@ export default {
         pagePath: { name: "页面路径", input: "string", min: 0, max: 200 },
         pageName: { name: "页面名称", input: "string", min: 0, max: 100 },
         source: { name: "来源", input: "string", min: 0, max: 50 },
+        clientId: { name: "客户端标识", input: "string", min: 0, max: 120 },
         productName: { name: "产品名称", input: "string", min: 0, max: 100 },
         productCode: { name: "产品代号", input: "string", min: 0, max: 100 },
         productVersion: { name: "产品版本", input: "string", min: 0, max: 50 }
@@ -126,16 +112,15 @@ export default {
     handler: async (befly, ctx) => {
         const now = Date.now();
         const reportDate = getDateYmdNumber(now);
-        const weekStartDate = getOnlineStatsWeekStartDate(now);
-        const monthStartDate = getOnlineStatsMonthStartDate(now);
+        const weekStartDate = getTongJiWeekStartDate(now);
+        const monthStartDate = getTongJiMonthStartDate(now);
         const member = getOnlineStatsMember(ctx);
-        const productName = ctx.body?.productName || "";
+        const productName = String(ctx.body.productName || "").trim();
 
-        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, productName);
 
-        const onlineCount = await getOnlineStatsOnlineCount(befly);
+        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);