befly 3.19.6 → 3.19.7

package/apis/tongJi/onlineReport.js

@@ -35,6 +35,24 @@ function getPeriodKeys(periodType, periodValue) {
     };
 }
 
+function getOnlineStatsProductKey(productName) {
+    return encodeURIComponent(String(productName || ""));
+}
+
+function getOnlineStatsProductPeriodKeys(periodType, periodValue, productName) {
+    const productKey = getOnlineStatsProductKey(productName);
+
+    return {
+        pv: `online:${periodType}:${periodValue}:product:${productKey}:pv`,
+        members: `online:${periodType}:${periodValue}:product:${productKey}:members`,
+        reportTime: `online:${periodType}:${periodValue}:product:${productKey}:reportTime`
+    };
+}
+
+function getOnlineStatsProductsKey(periodType, periodValue) {
+    return `online:${periodType}:${periodValue}:products`;
+}
+
 async function touchRedisKeys(befly, keys, ttl) {
     for (const key of keys) {
         await befly.redis.expire(key, ttl);
@@ -76,12 +94,34 @@ async function updateOnlineStatsPeriod(befly, periodType, periodValue, member) {
     await touchRedisKeys(befly, Object.values(keys), ONLINE_STATS_TEMP_TTL_SECONDS);
 }
 
+async function updateOnlineStatsProductPeriod(befly, periodType, periodValue, member, productName) {
+    if (!productName) {
+        return;
+    }
+
+    const keys = getOnlineStatsProductPeriodKeys(periodType, periodValue, productName);
+    const productsKey = getOnlineStatsProductsKey(periodType, periodValue);
+
+    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);
+}
+
 export default {
     name: "上报在线统计",
     method: "POST",
     body: "none",
     auth: false,
-    fields: {},
+    fields: {
+        pagePath: { name: "页面路径", input: "string", min: 0, max: 200 },
+        pageName: { name: "页面名称", input: "string", min: 0, max: 100 },
+        source: { name: "来源", input: "string", min: 0, max: 50 },
+        productName: { name: "产品名称", input: "string", min: 0, max: 100 },
+        productCode: { name: "产品代号", input: "string", min: 0, max: 100 },
+        productVersion: { name: "产品版本", input: "string", min: 0, max: 50 }
+    },
     required: [],
     handler: async (befly, ctx) => {
         const now = Date.now();
@@ -89,6 +129,7 @@ export default {
         const weekStartDate = getOnlineStatsWeekStartDate(now);
         const monthStartDate = getOnlineStatsMonthStartDate(now);
         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]);
@@ -99,6 +140,9 @@ export default {
         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,

package/apis/tongJi/onlineStats.js

@@ -44,6 +44,24 @@ function getPeriodKeys(periodType, periodValue) {
     };
 }
 
+function getOnlineStatsProductKey(productName) {
+    return encodeURIComponent(String(productName || ""));
+}
+
+function getOnlineStatsProductPeriodKeys(periodType, periodValue, productName) {
+    const productKey = getOnlineStatsProductKey(productName);
+
+    return {
+        pv: `online:${periodType}:${periodValue}:product:${productKey}:pv`,
+        members: `online:${periodType}:${periodValue}:product:${productKey}:members`,
+        reportTime: `online:${periodType}:${periodValue}:product:${productKey}:reportTime`
+    };
+}
+
+function getOnlineStatsProductsKey(periodType, periodValue) {
+    return `online:${periodType}:${periodValue}:products`;
+}
+
 async function getRedisNumber(befly, key) {
     return toOnlineStatsNumber(await befly.redis.getString(key));
 }
@@ -57,6 +75,32 @@ async function getOnlineStatsPeriodData(befly, periodType, periodValue) {
     };
 }
 
+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))
+    };
+}
+
+async function getOnlineStatsProductNames(befly, recentDateList) {
+    const productSet = new Set();
+
+    for (const item of recentDateList) {
+        for (const productName of await befly.redis.smembers(getOnlineStatsProductsKey("day", item))) {
+            if (!productName) {
+                continue;
+            }
+
+            productSet.add(String(productName));
+        }
+    }
+
+    return Array.from(productSet.values());
+}
+
 async function getOnlineStatsOnlineCount(befly) {
     const members = await befly.redis.smembers("online:visitors");
     if (members.length === 0) {
@@ -83,6 +127,16 @@ async function getOnlineStatsOnlineCount(befly) {
     return onlineCount;
 }
 
+function sumProductTrendField(list, field) {
+    let total = 0;
+
+    for (const item of list) {
+        total += toOnlineStatsNumber(item?.[field]);
+    }
+
+    return total;
+}
+
 export default {
     name: "获取在线统计",
     method: "POST",
@@ -97,6 +151,7 @@ export default {
         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);
@@ -117,6 +172,58 @@ export default {
         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")
+            });
+        }
+
+        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 befly.tool.Yes("获取成功", {
             queryTime: now,
@@ -141,7 +248,8 @@ export default {
                 pv: monthCurrent.pv,
                 uv: monthCurrent.uv
             },
-            days: days
+            days: days,
+            products: products
         });
     }
 };

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "befly",
-    "version": "3.19.6",
-    "gitHead": "84b6e4e0adde7f566cfc890887b024ccf10b0516",
+    "version": "3.19.7",
+    "gitHead": "c47d1e515dabe142531e0a8415979cccb2729259",
     "private": false,
     "description": "Befly - 为 Bun 专属打造的 JavaScript API 接口框架核心引擎",
     "keywords": [