befly 3.56.0 → 3.58.0

package/apis/tongJi/infoStats.js

@@ -1,190 +0,0 @@
-import { addDays, getDateYmdNumber, getDayStartTime } from "#befly/utils/datetime.js";
-
-import { getTongJiMonthStartDate, getTongJiNumber, getTongJiRecentDateList, getVisitStatsDayMembersKey, getVisitStatsDayProductMembersKey, getVisitStatsMonthMembersKey, getVisitStatsMonthProductMembersKey, getVisitStatsRecentMembersKey, getVisitStatsRecentProductMembersKey } from "./_tongJi.js";
-
-const VISIT_STATS_DAY_LIMIT = 30;
-
-async function getRedisSetCount(befly, key) {
-    return getTongJiNumber(await befly.redis.scard(key));
-}
-
-async function getRedisRecentCount(befly, key, now) {
-    const cutoffTime = getDayStartTime(addDays(now, -29));
-
-    await befly.redis.zremrangebyscore(key, "-inf", cutoffTime - 1);
-    return getTongJiNumber(await befly.redis.zcard(key));
-}
-
-async function getVisitStatsDays(befly, recentDateList, productCode) {
-    const days = [];
-
-    for (const reportDate of recentDateList) {
-        days.push({
-            reportDate: reportDate,
-            count: await getRedisSetCount(befly, productCode ? getVisitStatsDayProductMembersKey(reportDate, productCode) : getVisitStatsDayMembersKey(reportDate))
-        });
-    }
-
-    return days;
-}
-
-async function getVisitStatsSummary(befly, now, reportDate, monthStartDate, recentDateList, productCode) {
-    const yesterdayDate = recentDateList[recentDateList.length - 2] || reportDate;
-    const dayBeforeYesterdayDate = recentDateList[recentDateList.length - 3] || yesterdayDate;
-
-    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)
-    };
-}
-
-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.code,
-            productName: item.name,
-            productCode: item.code,
-            today: 0,
-            yesterday: 0,
-            dayBeforeYesterday: 0,
-            month: 0,
-            recent30: 0,
-            days: days
-        });
-    }
-
-    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
-    };
-}
-
-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.code);
-
-        products.push({
-            key: item.code,
-            productName: item.name,
-            productCode: item.code,
-            today: summary.today.count,
-            yesterday: summary.yesterday.count,
-            dayBeforeYesterday: summary.dayBeforeYesterday.count,
-            month: summary.month.count,
-            recent30: summary.recent30.count,
-            days: summary.days
-        });
-    }
-
-    return products.toSorted((a, b) => {
-        if (b.recent30 !== a.recent30) {
-            return b.recent30 - a.recent30;
-        }
-
-        return String(a.productName).localeCompare(String(b.productName), "zh-CN");
-    });
-}
-
-export default {
-    name: "获取独立访客统计",
-    method: "POST",
-    body: "none",
-    auth: true,
-    fields: {
-        productCode: { name: "产品代号", input: "string", min: 0, max: 100 }
-    },
-    required: [],
-    handler: async (befly, ctx) => {
-        const now = Date.now();
-        const reportDate = getDateYmdNumber(now);
-        const monthStartDate = getTongJiMonthStartDate(now);
-        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
-            });
-        }
-
-        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,102 +0,0 @@
-import { getDateYmdNumber } from "#befly/utils/datetime.js";
-import { isValidPositiveInt } from "#befly/utils/is.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_ACTIVE_KEY = "online:active";
-
-function getOnlineStatsMember(ctx) {
-    if (isValidPositiveInt(ctx?.userId)) {
-        return `user:${ctx.userId}`;
-    }
-
-    const clientId = ctx?.body?.clientId ?? "";
-
-    if (clientId) {
-        return `client:${clientId}`;
-    }
-
-    return `ip:${ctx?.ip || "unknown"}`;
-}
-
-async function updateOnlineStatsActiveMemberProduct(befly, member, productCode, expireAt) {
-    if (!productCode) {
-        return;
-    }
-
-    const memberProductKey = `online:active:member:${encodeURIComponent(member)}:product`;
-    const previousProductCode = String((await befly.redis.getString(memberProductKey)) || "").trim();
-
-    if (previousProductCode && previousProductCode !== productCode) {
-        await befly.redis.zrem(getOnlineStatsActiveProductKey(previousProductCode), [member]);
-    }
-
-    const activeProductKey = getOnlineStatsActiveProductKey(productCode);
-
-    await befly.redis.setString(memberProductKey, productCode, ONLINE_STATS_ONLINE_TTL_SECONDS);
-    await befly.redis.zadd(activeProductKey, [
-        {
-            score: expireAt,
-            member: member
-        }
-    ]);
-    await befly.redis.expire(activeProductKey, ONLINE_STATS_REDIS_TTL_SECONDS);
-}
-
-async function updateOnlineStatsActiveMember(befly, member, now, productCode) {
-    const expireAt = now + ONLINE_STATS_ONLINE_TTL_SECONDS * 1000;
-
-    await befly.redis.zadd(ONLINE_STATS_ACTIVE_KEY, [
-        {
-            score: expireAt,
-            member: member
-        }
-    ]);
-    await updateOnlineStatsActiveMemberProduct(befly, member, productCode, expireAt);
-    await befly.redis.expire(ONLINE_STATS_ACTIVE_KEY, ONLINE_STATS_REDIS_TTL_SECONDS);
-}
-
-export default {
-    name: "上报在线统计",
-    method: "POST",
-    body: "none",
-    auth: false,
-    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 },
-        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 }
-    },
-    required: [],
-    handler: async (befly, ctx) => {
-        const now = Date.now();
-        const reportDate = getDateYmdNumber(now);
-        const productCode = ctx?.body?.productCode ?? "";
-
-        if (!befly.redis) {
-            return befly.tool.Yes("上报成功", {
-                reportTime: now,
-                reportDate: reportDate,
-                onlineCount: 0,
-                stored: false
-            });
-        }
-
-        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);
-
-        return befly.tool.Yes("上报成功", {
-            reportTime: now,
-            reportDate: reportDate,
-            onlineCount: onlineCount,
-            stored: true
-        });
-    }
-};

package/apis/tongJi/onlineStats.js

@@ -1,85 +0,0 @@
-import { getOnlineStatsActiveProductKey } from "./_tongJi.js";
-
-const ONLINE_STATS_ACTIVE_KEY = "online:active";
-
-async function getOnlineStatsTotalOnlineCount(befly, now) {
-    await befly.redis.zremrangebyscore(ONLINE_STATS_ACTIVE_KEY, "-inf", now);
-    return await befly.redis.zcard(ONLINE_STATS_ACTIVE_KEY);
-}
-
-async function getOnlineStatsProductOnlineCount(befly, productCode, now) {
-    const productKey = getOnlineStatsActiveProductKey(productCode);
-
-    await befly.redis.zremrangebyscore(productKey, "-inf", now);
-    return await befly.redis.zcard(productKey);
-}
-
-async function buildOnlineStatsProducts(befly, projectLists, now) {
-    const products = [];
-
-    for (const item of projectLists) {
-        products.push({
-            key: item.code,
-            productName: item.name,
-            productCode: item.code,
-            onlineCount: await getOnlineStatsProductOnlineCount(befly, item.code, now)
-        });
-    }
-
-    return products.toSorted((a, b) => {
-        if (b.onlineCount !== a.onlineCount) {
-            return b.onlineCount - a.onlineCount;
-        }
-
-        return String(a.productName).localeCompare(String(b.productName), "zh-CN");
-    });
-}
-
-function buildEmptyOnlineStatsProducts(projectLists) {
-    const products = [];
-
-    for (const item of projectLists) {
-        products.push({
-            key: item.code,
-            productName: item.name,
-            productCode: item.code,
-            onlineCount: 0
-        });
-    }
-
-    return products;
-}
-
-export default {
-    name: "获取在线统计",
-    method: "POST",
-    body: "none",
-    auth: true,
-    fields: {
-        productCode: { name: "产品代号", input: "string", min: 0, max: 100 }
-    },
-    required: [],
-    handler: async (befly, ctx) => {
-        const now = Date.now();
-        const productCode = ctx?.body?.productCode ?? "";
-        const hasProductFilter = productCode.length > 0;
-        const projectLists = hasProductFilter ? [] : befly.config?.projectLists || [];
-
-        if (!befly.redis) {
-            return befly.tool.Yes("获取成功", {
-                queryTime: now,
-                onlineCount: 0,
-                products: buildEmptyOnlineStatsProducts(projectLists)
-            });
-        }
-
-        const onlineCount = hasProductFilter ? await getOnlineStatsProductOnlineCount(befly, productCode, now) : await getOnlineStatsTotalOnlineCount(befly, now);
-        const products = await buildOnlineStatsProducts(befly, projectLists, now);
-
-        return befly.tool.Yes("获取成功", {
-            queryTime: now,
-            onlineCount: onlineCount,
-            products: products
-        });
-    }
-};