befly 3.56.0 → 3.58.0

package/apis/tongJi/errorStats.js

@@ -1,9 +1,13 @@
 import { getDateYmdNumber } from "#befly/utils/datetime.js";
 
-import { getErrorStatsDayBucketCountKey, getErrorStatsDayBucketsKey, getErrorStatsDayTypeCountKey, getErrorStatsDayTypesKey, getErrorStatsPeriodCountKey, getTongJiMonthStartDate, getTongJiNumber, getTongJiRecentDateList, getTongJiWeekStartDate } from "./_tongJi.js";
+import { getErrorStatsDayBucketCountKey, getErrorStatsDayBucketsKey, getErrorStatsDayTypeCountKey, getErrorStatsDayTypesKey, getErrorStatsPeriodCountKey, getTongJiDateRangeList, getTongJiMonthStartDate, getTongJiNumber, getTongJiRecentDateList, getTongJiWeekStartDate } from "./_tongJi.js";
 
 const ERROR_STATS_DAY_LIMIT = 30;
 
+function sumCounts(items) {
+    return items.reduce((sum, item) => sum + item.count, 0);
+}
+
 async function getErrorStatsRedisSummary(befly, periodType, periodValue) {
     return {
         count: getTongJiNumber(await befly.redis.getString(getErrorStatsPeriodCountKey(periodType, periodValue)))
@@ -12,96 +16,70 @@ async function getErrorStatsRedisSummary(befly, periodType, periodValue) {
 
 async function getErrorStatsRedisTrend(befly, bucketDate) {
     const bucketSet = await befly.redis.smembers(getErrorStatsDayBucketsKey(bucketDate));
-    const trend = [];
-
-    for (const bucketTime of bucketSet) {
-        const itemBucketTime = getTongJiNumber(bucketTime);
+    const trend = await Promise.all(
+        bucketSet.map(async (bucketTime) => {
+            const itemBucketTime = getTongJiNumber(bucketTime);
 
-        trend.push({
-            bucketTime: itemBucketTime,
-            bucketDate: bucketDate,
-            count: getTongJiNumber(await befly.redis.getString(getErrorStatsDayBucketCountKey(bucketDate, itemBucketTime)))
-        });
-    }
+            return {
+                bucketTime: itemBucketTime,
+                bucketDate: bucketDate,
+                count: getTongJiNumber(await befly.redis.getString(getErrorStatsDayBucketCountKey(bucketDate, itemBucketTime)))
+            };
+        })
+    );
 
     trend.sort((a, b) => a.bucketTime - b.bucketTime);
     return trend;
 }
 
 async function getErrorStatsRedisDays(befly, recentDateList) {
-    const days = [];
-
-    for (const item of recentDateList) {
-        days.push({
-            bucketDate: item,
-            count: getTongJiNumber(await befly.redis.getString(getErrorStatsPeriodCountKey("day", item)))
-        });
-    }
-
-    return days;
+    return Promise.all(
+        recentDateList.map(async (item) => {
+            return {
+                bucketDate: item,
+                count: getTongJiNumber(await befly.redis.getString(getErrorStatsPeriodCountKey("day", item)))
+            };
+        })
+    );
 }
 
 async function getErrorStatsRedisTopTypes(befly, bucketDate) {
     const typeSet = await befly.redis.smembers(getErrorStatsDayTypesKey(bucketDate));
-    const topTypes = [];
-
-    for (const errorType of typeSet) {
-        const name = String(errorType || "unknown");
-        const count = getTongJiNumber(await befly.redis.getString(getErrorStatsDayTypeCountKey(bucketDate, name)));
-
-        if (count <= 0) {
-            continue;
-        }
-
-        topTypes.push({
-            errorType: name,
-            count: count
-        });
-    }
-
-    topTypes.sort((a, b) => {
-        if (b.count !== a.count) {
-            return b.count - a.count;
-        }
-
-        return String(a.errorType).localeCompare(String(b.errorType), "zh-CN");
-    });
+    const topTypes = await Promise.all(
+        typeSet.map(async (errorType) => {
+            const name = String(errorType || "unknown");
+
+            return {
+                errorType: name,
+                count: getTongJiNumber(await befly.redis.getString(getErrorStatsDayTypeCountKey(bucketDate, name)))
+            };
+        })
+    );
+
+    return topTypes
+        .filter((item) => item.count > 0)
+        .toSorted((a, b) => {
+            if (b.count !== a.count) {
+                return b.count - a.count;
+            }
 
-    return topTypes.slice(0, 5);
+            return String(a.errorType).localeCompare(String(b.errorType), "zh-CN");
+        })
+        .slice(0, 5);
 }
 
-async function getErrorStatsFromRedis(befly, bucketDate, weekStartDate, monthStartDate, recentDateList) {
-    const todaySummary = await getErrorStatsRedisSummary(befly, "day", bucketDate);
-    const yesterdayDate = recentDateList[recentDateList.length - 2] || bucketDate;
-    const dayBeforeYesterdayDate = recentDateList[recentDateList.length - 3] || yesterdayDate;
-    const yesterdaySummary = await getErrorStatsRedisSummary(befly, "day", yesterdayDate);
-    const dayBeforeYesterdaySummary = await getErrorStatsRedisSummary(befly, "day", dayBeforeYesterdayDate);
-    const weekSummary = await getErrorStatsRedisSummary(befly, "week", weekStartDate);
-    const monthSummary = await getErrorStatsRedisSummary(befly, "month", monthStartDate);
-    const trend = await getErrorStatsRedisTrend(befly, bucketDate);
-    const days = await getErrorStatsRedisDays(befly, recentDateList);
-    const topTypes = await getErrorStatsRedisTopTypes(befly, bucketDate);
-    let recent30Count = 0;
-
-    for (const item of days) {
-        recent30Count += item.count;
-    }
-
-    if (todaySummary.count <= 0 && yesterdaySummary.count <= 0 && dayBeforeYesterdaySummary.count <= 0 && weekSummary.count <= 0 && monthSummary.count <= 0 && recent30Count <= 0 && trend.length === 0 && topTypes.length === 0) {
-        return null;
-    }
-
+function buildErrorStatsResponse(bucketDate, weekStartDate, monthStartDate, recentDateList, todaySummary, yesterdaySummary, dayBeforeYesterdaySummary, weekSummary, monthSummary, recent30Count, trend, days, topTypes) {
     return {
         today: {
             bucketDate: bucketDate,
             count: todaySummary.count
         },
         yesterday: {
-            bucketDate: yesterdayDate,
+            bucketDate: recentDateList[recentDateList.length - 2] || bucketDate,
             count: yesterdaySummary.count
         },
         dayBeforeYesterday: {
-            bucketDate: dayBeforeYesterdayDate,
+            bucketDate: recentDateList[recentDateList.length - 3] || recentDateList[recentDateList.length - 2] || bucketDate,
             count: dayBeforeYesterdaySummary.count
         },
         week: {
@@ -125,12 +103,131 @@ async function getErrorStatsFromRedis(befly, bucketDate, weekStartDate, monthSta
     };
 }
 
-async function getErrorStatsSummary(befly, startDate, endDate) {
-    const result = await befly.mysql.execute("SELECT SUM(hit_count) as count FROM befly_error_report WHERE state = 1 AND bucket_date BETWEEN ? AND ?", [startDate, endDate]);
-    const detail = result.data?.[0] || {};
+function isRedisResultEmpty(todaySummary, yesterdaySummary, dayBeforeYesterdaySummary, weekSummary, monthSummary, recent30Count, trend, topTypes) {
+    return todaySummary.count <= 0 && yesterdaySummary.count <= 0 && dayBeforeYesterdaySummary.count <= 0 && weekSummary.count <= 0 && monthSummary.count <= 0 && recent30Count <= 0 && trend.length === 0 && topTypes.length === 0;
+}
+
+async function getErrorStatsFromRedis(befly, bucketDate, weekStartDate, monthStartDate, recentDateList) {
+    const [todaySummary, yesterdaySummary, dayBeforeYesterdaySummary, weekSummary, monthSummary, trend, days, topTypes] = await Promise.all([
+        getErrorStatsRedisSummary(befly, "day", bucketDate),
+        getErrorStatsRedisSummary(befly, "day", recentDateList[recentDateList.length - 2] || bucketDate),
+        getErrorStatsRedisSummary(befly, "day", recentDateList[recentDateList.length - 3] || recentDateList[recentDateList.length - 2] || bucketDate),
+        getErrorStatsRedisSummary(befly, "week", weekStartDate),
+        getErrorStatsRedisSummary(befly, "month", monthStartDate),
+        getErrorStatsRedisTrend(befly, bucketDate),
+        getErrorStatsRedisDays(befly, recentDateList),
+        getErrorStatsRedisTopTypes(befly, bucketDate)
+    ]);
+
+    const recent30Count = sumCounts(days);
+
+    if (isRedisResultEmpty(todaySummary, yesterdaySummary, dayBeforeYesterdaySummary, weekSummary, monthSummary, recent30Count, trend, topTypes)) {
+        return null;
+    }
+
+    return buildErrorStatsResponse(bucketDate, weekStartDate, monthStartDate, recentDateList, todaySummary, yesterdaySummary, dayBeforeYesterdaySummary, weekSummary, monthSummary, recent30Count, trend, days, topTypes);
+}
+
+async function getErrorStatsDayCountMap(befly, startDate, endDate) {
+    const result = await befly.mysql.execute("SELECT bucket_date as bucketDate, SUM(hit_count) as count FROM befly_error_report WHERE state = 1 AND bucket_date BETWEEN ? AND ? GROUP BY bucket_date", [startDate, endDate]);
+    const map = new Map();
+
+    for (const item of result.data || []) {
+        map.set(Number(item.bucketDate), getTongJiNumber(item.count));
+    }
+
+    return map;
+}
+
+function sumDateCounts(map, dateList) {
+    return dateList.reduce((sum, date) => sum + (map.get(date) || 0), 0);
+}
+
+async function getErrorStatsFromMysql(befly, bucketDate, weekStartDate, monthStartDate, recentDateList) {
+    const yesterdayDate = recentDateList[recentDateList.length - 2] || bucketDate;
+    const dayBeforeYesterdayDate = recentDateList[recentDateList.length - 3] || yesterdayDate;
+    const weekDateList = getTongJiDateRangeList(weekStartDate, bucketDate);
+    const monthDateList = getTongJiDateRangeList(monthStartDate, bucketDate);
+
+    const [dayCountMap, trendRes, topTypesRes] = await Promise.all([
+        getErrorStatsDayCountMap(befly, recentDateList[0], bucketDate),
+        befly.mysql.execute("SELECT bucket_time as bucketTime, bucket_date as bucketDate, SUM(hit_count) as count FROM befly_error_report WHERE state = 1 AND bucket_date = ? GROUP BY bucket_time, bucket_date ORDER BY bucket_time ASC", [bucketDate]),
+        befly.mysql.execute("SELECT error_type as errorType, SUM(hit_count) as count FROM befly_error_report WHERE state = 1 AND bucket_date = ? GROUP BY error_type ORDER BY count DESC LIMIT 5", [bucketDate])
+    ]);
+
+    const todaySummary = { count: dayCountMap.get(bucketDate) || 0 };
+    const yesterdaySummary = { count: dayCountMap.get(yesterdayDate) || 0 };
+    const dayBeforeYesterdaySummary = { count: dayCountMap.get(dayBeforeYesterdayDate) || 0 };
+    const weekSummary = { count: sumDateCounts(dayCountMap, weekDateList) };
+    const monthSummary = { count: sumDateCounts(dayCountMap, monthDateList) };
+    const recent30Count = sumDateCounts(dayCountMap, recentDateList);
+
+    const trend = (trendRes.data || []).map((item) => {
+        return {
+            bucketTime: getTongJiNumber(item.bucketTime),
+            bucketDate: getTongJiNumber(item.bucketDate),
+            count: getTongJiNumber(item.count)
+        };
+    });
+
+    const topTypes = (topTypesRes.data || []).map((item) => {
+        return {
+            errorType: String(item.errorType || "unknown"),
+            count: getTongJiNumber(item.count)
+        };
+    });
+
+    const days = recentDateList.map((date) => {
+        return {
+            bucketDate: date,
+            count: dayCountMap.get(date) || 0
+        };
+    });
+
+    return buildErrorStatsResponse(bucketDate, weekStartDate, monthStartDate, recentDateList, todaySummary, yesterdaySummary, dayBeforeYesterdaySummary, weekSummary, monthSummary, recent30Count, trend, days, topTypes);
+}
+
+function buildEmptyDays(recentDateList) {
+    return recentDateList.map((date) => {
+        return {
+            bucketDate: date,
+            count: 0
+        };
+    });
+}
 
+function buildEmptyErrorStats(bucketDate, weekStartDate, monthStartDate, recentDateList) {
     return {
-        count: getTongJiNumber(detail.count)
+        today: {
+            bucketDate: bucketDate,
+            count: 0
+        },
+        yesterday: {
+            bucketDate: recentDateList[recentDateList.length - 2] || bucketDate,
+            count: 0
+        },
+        dayBeforeYesterday: {
+            bucketDate: recentDateList[recentDateList.length - 3] || recentDateList[recentDateList.length - 2] || bucketDate,
+            count: 0
+        },
+        week: {
+            startDate: weekStartDate,
+            endDate: bucketDate,
+            count: 0
+        },
+        month: {
+            startDate: monthStartDate,
+            endDate: bucketDate,
+            count: 0
+        },
+        recent30: {
+            startDate: recentDateList[0],
+            endDate: bucketDate,
+            count: 0
+        },
+        trend: [],
+        days: buildEmptyDays(recentDateList),
+        topTypes: []
     };
 }
 
@@ -149,51 +246,9 @@ export default {
         const weekStartDate = getTongJiWeekStartDate(now);
         const monthStartDate = getTongJiMonthStartDate(now);
         const recentDateList = getTongJiRecentDateList(now, ERROR_STATS_DAY_LIMIT);
-        const yesterdayDate = recentDateList[recentDateList.length - 2] || bucketDate;
-        const dayBeforeYesterdayDate = recentDateList[recentDateList.length - 3] || yesterdayDate;
 
         if (!tableReady) {
-            const days = [];
-
-            for (const item of recentDateList) {
-                days.push({
-                    bucketDate: item,
-                    count: 0
-                });
-            }
-
-            return befly.tool.Yes("获取成功", {
-                today: {
-                    bucketDate: bucketDate,
-                    count: 0
-                },
-                yesterday: {
-                    bucketDate: yesterdayDate,
-                    count: 0
-                },
-                dayBeforeYesterday: {
-                    bucketDate: dayBeforeYesterdayDate,
-                    count: 0
-                },
-                week: {
-                    startDate: weekStartDate,
-                    endDate: bucketDate,
-                    count: 0
-                },
-                month: {
-                    startDate: monthStartDate,
-                    endDate: bucketDate,
-                    count: 0
-                },
-                recent30: {
-                    startDate: recentDateList[0],
-                    endDate: bucketDate,
-                    count: 0
-                },
-                trend: [],
-                days: days,
-                topTypes: []
-            });
+            return befly.tool.Yes("获取成功", buildEmptyErrorStats(bucketDate, weekStartDate, monthStartDate, recentDateList));
         }
 
         if (befly.redis) {
@@ -204,88 +259,6 @@ export default {
             }
         }
 
-        const todaySummary = await getErrorStatsSummary(befly, bucketDate, bucketDate);
-        const yesterdaySummary = await getErrorStatsSummary(befly, yesterdayDate, yesterdayDate);
-        const dayBeforeYesterdaySummary = await getErrorStatsSummary(befly, dayBeforeYesterdayDate, dayBeforeYesterdayDate);
-        const weekSummary = await getErrorStatsSummary(befly, weekStartDate, bucketDate);
-        const monthSummary = await getErrorStatsSummary(befly, monthStartDate, bucketDate);
-        const recent30Summary = await getErrorStatsSummary(befly, recentDateList[0], bucketDate);
-        const trendRes = await befly.mysql.execute("SELECT bucket_time as bucketTime, bucket_date as bucketDate, SUM(hit_count) as count FROM befly_error_report WHERE state = 1 AND bucket_date = ? GROUP BY bucket_time, bucket_date ORDER BY bucket_time ASC", [bucketDate]);
-        const daysRes = await befly.mysql.execute("SELECT bucket_date as bucketDate, SUM(hit_count) as count FROM befly_error_report WHERE state = 1 AND bucket_date >= ? GROUP BY bucket_date ORDER BY bucket_date ASC", [recentDateList[0]]);
-        const topTypesRes = await befly.mysql.execute("SELECT error_type as errorType, SUM(hit_count) as count FROM befly_error_report WHERE state = 1 AND bucket_date = ? GROUP BY error_type ORDER BY count DESC LIMIT 5", [bucketDate]);
-
-        const trend = [];
-        for (const item of trendRes.data || []) {
-            trend.push({
-                bucketTime: getTongJiNumber(item.bucketTime),
-                bucketDate: getTongJiNumber(item.bucketDate),
-                count: getTongJiNumber(item.count)
-            });
-        }
-
-        const daysMap = new Map();
-
-        for (const item of recentDateList) {
-            daysMap.set(item, {
-                bucketDate: item,
-                count: 0
-            });
-        }
-
-        for (const item of daysRes.data || []) {
-            const itemBucketDate = getTongJiNumber(item.bucketDate);
-
-            if (!daysMap.has(itemBucketDate)) {
-                continue;
-            }
-
-            daysMap.set(itemBucketDate, {
-                bucketDate: itemBucketDate,
-                count: getTongJiNumber(item.count)
-            });
-        }
-
-        const days = Array.from(daysMap.values());
-
-        const topTypes = [];
-        for (const item of topTypesRes.data || []) {
-            topTypes.push({
-                errorType: String(item.errorType || "unknown"),
-                count: getTongJiNumber(item.count)
-            });
-        }
-
-        return befly.tool.Yes("获取成功", {
-            today: {
-                bucketDate: bucketDate,
-                count: todaySummary.count
-            },
-            yesterday: {
-                bucketDate: yesterdayDate,
-                count: yesterdaySummary.count
-            },
-            dayBeforeYesterday: {
-                bucketDate: dayBeforeYesterdayDate,
-                count: dayBeforeYesterdaySummary.count
-            },
-            week: {
-                startDate: weekStartDate,
-                endDate: bucketDate,
-                count: weekSummary.count
-            },
-            month: {
-                startDate: monthStartDate,
-                endDate: bucketDate,
-                count: monthSummary.count
-            },
-            recent30: {
-                startDate: recentDateList[0],
-                endDate: bucketDate,
-                count: recent30Summary.count
-            },
-            trend: trend,
-            days: days,
-            topTypes: topTypes
-        });
+        return befly.tool.Yes("获取成功", await getErrorStatsFromMysql(befly, bucketDate, weekStartDate, monthStartDate, recentDateList));
     }
 };

package/checks/config.js

@@ -12,7 +12,7 @@ const noTrimString = z.string().refine(isNoTrimStringAllowEmpty, "不允许首
 const beflyModeSchema = z.union([z.literal("manual"), z.literal("auto")]);
 const uploadExtensionListSchema = noTrimString.regex(/^\.[a-z0-9]+(?:,\.[a-z0-9]+)*$/);
 const uploadMimeTypeListSchema = noTrimString.regex(/^[a-z0-9][a-z0-9.+-]*\/[a-z0-9][a-z0-9.+-]*(?:,[a-z0-9][a-z0-9.+-]*\/[a-z0-9][a-z0-9.+-]*)*$/);
-const projectListCodeSchema = z.string().regex(/^[a-z][a-zA-Z0-9]*$/, "必须是小驼峰命名");
+const projectListCodeSchema = z.string().regex(/^[a-zA-Z][a-zA-Z0-9_-]*$/, "必须以字母开头，只允许字母、数字、短横线、下划线");
 const projectListItemSchema = z
     .object({
         code: projectListCodeSchema,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly",
-    "version": "3.56.0",
+    "version": "3.58.0",
     "gitHead": "49c39d36695036e85fc64083cc43c1652fff96cb",
     "private": false,
     "description": "Befly - 为 Bun 专属打造的 JavaScript API 接口框架核心引擎",

package/apis/tongJi/infoReport.js

@@ -1,91 +0,0 @@
-import { addDays, getDateYmdNumber, getDayStartTime } from "#befly/utils/datetime.js";
-import { isValidPositiveInt } from "#befly/utils/is.js";
-
-import { expireTongJiRedisKeys, getTongJiMonthStartDate, getVisitStatsDayMembersKey, getVisitStatsDayProductMembersKey, getVisitStatsMonthMembersKey, getVisitStatsMonthProductMembersKey, getVisitStatsRecentMembersKey, getVisitStatsRecentProductMembersKey } from "./_tongJi.js";
-
-const VISIT_STATS_REDIS_TTL_SECONDS = 45 * 24 * 60 * 60;
-
-function getVisitStatsMember(ctx) {
-    if (isValidPositiveInt(ctx?.userId)) {
-        return `user:${ctx.userId}`;
-    }
-
-    return `ip:${ctx?.ip || "unknown"}`;
-}
-
-async function addRecentVisitMember(befly, key, member, now) {
-    const cutoffTime = getDayStartTime(addDays(now, -29));
-
-    await befly.redis.zadd(key, [
-        {
-            score: now,
-            member: member
-        }
-    ]);
-    await befly.redis.zremrangebyscore(key, "-inf", cutoffTime - 1);
-    await befly.redis.expire(key, VISIT_STATS_REDIS_TTL_SECONDS);
-}
-
-async function updateVisitStatsRedis(befly, now, reportDate, member, productCode) {
-    const monthStartDate = getTongJiMonthStartDate(now);
-    const dayKey = getVisitStatsDayMembersKey(reportDate);
-    const monthKey = getVisitStatsMonthMembersKey(monthStartDate);
-    const recentKey = getVisitStatsRecentMembersKey();
-    const dayAdded = await befly.redis.sadd(dayKey, [member]);
-
-    await befly.redis.sadd(monthKey, [member]);
-    await addRecentVisitMember(befly, recentKey, member, now);
-    await expireTongJiRedisKeys(befly, [dayKey, monthKey], VISIT_STATS_REDIS_TTL_SECONDS);
-
-    if (productCode) {
-        const dayProductKey = getVisitStatsDayProductMembersKey(reportDate, productCode);
-        const monthProductKey = getVisitStatsMonthProductMembersKey(monthStartDate, productCode);
-        const recentProductKey = getVisitStatsRecentProductMembersKey(productCode);
-
-        await befly.redis.sadd(dayProductKey, [member]);
-        await befly.redis.sadd(monthProductKey, [member]);
-        await addRecentVisitMember(befly, recentProductKey, member, now);
-        await expireTongJiRedisKeys(befly, [dayProductKey, monthProductKey], VISIT_STATS_REDIS_TTL_SECONDS);
-    }
-
-    return dayAdded > 0;
-}
-
-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 },
-        productName: { name: "产品名称", input: "string", min: 0, max: 100 },
-        productCode: { name: "产品代号", input: "string", min: 0, max: 100 },
-        productVersion: { name: "产品版本", input: "string", min: 0, max: 100 },
-        detail: { name: "扩展详情", input: "string", min: 0, max: 1000 }
-    },
-    required: [],
-    handler: async (befly, ctx) => {
-        const now = Date.now();
-        const reportDate = getDateYmdNumber(now);
-
-        if (!befly.redis) {
-            return befly.tool.Yes("上报成功", {
-                reportTime: now,
-                reportDate: reportDate,
-                counted: false,
-                stored: false
-            });
-        }
-
-        const counted = await updateVisitStatsRedis(befly, now, reportDate, getVisitStatsMember(ctx), ctx.body?.productCode || "");
-
-        return befly.tool.Yes("上报成功", {
-            reportTime: now,
-            reportDate: reportDate,
-            counted: counted,
-            stored: true
-        });
-    }
-};