befly 3.61.0 → 3.63.0

package/apis/tongJi/errorStats.js

@@ -1,74 +1,14 @@
-import { getDateYmdNumber } from "#befly/utils/datetime.js";
-
-import { getErrorStatsDayBucketCountKey, getErrorStatsDayBucketsKey, getErrorStatsDayTypeCountKey, getErrorStatsDayTypesKey, getErrorStatsPeriodCountKey, getTongJiDateRangeList, getTongJiMonthStartDate, getTongJiNumber, getTongJiRecentDateList, getTongJiWeekStartDate } from "./_tongJi.js";
+import { getTongJiDateRangeList, getTongJiDateYmdNumber, getTongJiMonthStartDate, getTongJiRecentDateList } 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)))
-    };
-}
-
-async function getErrorStatsRedisTrend(befly, bucketDate) {
-    const bucketSet = await befly.redis.smembers(getErrorStatsDayBucketsKey(bucketDate));
-    const trend = await Promise.all(
-        bucketSet.map(async (bucketTime) => {
-            const itemBucketTime = getTongJiNumber(bucketTime);
-
-            return {
-                bucketTime: itemBucketTime,
-                bucketDate: bucketDate,
-                count: getTongJiNumber(await befly.redis.getString(getErrorStatsDayBucketCountKey(bucketDate, itemBucketTime)))
-            };
-        })
-    );
+function toCount(value) {
+    const num = Number(value);
 
-    trend.sort((a, b) => a.bucketTime - b.bucketTime);
-    return trend;
+    return Number.isFinite(num) ? num : 0;
 }
 
-async function getErrorStatsRedisDays(befly, recentDateList) {
-    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 = 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 String(a.errorType).localeCompare(String(b.errorType), "zh-CN");
-        })
-        .slice(0, 5);
-}
-
-function buildErrorStatsResponse(bucketDate, weekStartDate, monthStartDate, recentDateList, todaySummary, yesterdaySummary, dayBeforeYesterdaySummary, weekSummary, monthSummary, recent30Count, trend, days, topTypes) {
+function buildErrorStatsResponse(bucketDate, monthStartDate, recentDateList, todaySummary, yesterdaySummary, dayBeforeYesterdaySummary, monthSummary, recent30Count, trend, days, topTypes) {
     return {
         today: {
             bucketDate: bucketDate,
@@ -82,11 +22,6 @@ function buildErrorStatsResponse(bucketDate, weekStartDate, monthStartDate, rece
             bucketDate: recentDateList[recentDateList.length - 3] || recentDateList[recentDateList.length - 2] || bucketDate,
             count: dayBeforeYesterdaySummary.count
         },
-        week: {
-            startDate: weekStartDate,
-            endDate: bucketDate,
-            count: weekSummary.count
-        },
         month: {
             startDate: monthStartDate,
             endDate: bucketDate,
@@ -103,37 +38,12 @@ function buildErrorStatsResponse(bucketDate, weekStartDate, monthStartDate, rece
     };
 }
 
-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 result = await befly.mysql.execute("SELECT bucket_date as bucketDate, 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));
+        map.set(Number(item.bucketDate), toCount(item.count));
     }
 
     return map;
@@ -143,37 +53,35 @@ function sumDateCounts(map, dateList) {
     return dateList.reduce((sum, date) => sum + (map.get(date) || 0), 0);
 }
 
-async function getErrorStatsFromMysql(befly, bucketDate, weekStartDate, monthStartDate, recentDateList) {
+async function getErrorStatsFromMysql(befly, bucketDate, 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])
+        befly.mysql.execute("SELECT bucket_time as bucketTime, bucket_date as bucketDate, 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, 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)
+            bucketTime: toCount(item.bucketTime),
+            bucketDate: toCount(item.bucketDate),
+            count: toCount(item.count)
         };
     });
 
     const topTypes = (topTypesRes.data || []).map((item) => {
         return {
             errorType: String(item.errorType || "unknown"),
-            count: getTongJiNumber(item.count)
+            count: toCount(item.count)
         };
     });
 
@@ -184,7 +92,7 @@ async function getErrorStatsFromMysql(befly, bucketDate, weekStartDate, monthSta
         };
     });
 
-    return buildErrorStatsResponse(bucketDate, weekStartDate, monthStartDate, recentDateList, todaySummary, yesterdaySummary, dayBeforeYesterdaySummary, weekSummary, monthSummary, recent30Count, trend, days, topTypes);
+    return buildErrorStatsResponse(bucketDate, monthStartDate, recentDateList, todaySummary, yesterdaySummary, dayBeforeYesterdaySummary, monthSummary, recent30Count, trend, days, topTypes);
 }
 
 function buildEmptyDays(recentDateList) {
@@ -196,7 +104,7 @@ function buildEmptyDays(recentDateList) {
     });
 }
 
-function buildEmptyErrorStats(bucketDate, weekStartDate, monthStartDate, recentDateList) {
+function buildEmptyErrorStats(bucketDate, monthStartDate, recentDateList) {
     return {
         today: {
             bucketDate: bucketDate,
@@ -210,11 +118,6 @@ function buildEmptyErrorStats(bucketDate, weekStartDate, monthStartDate, recentD
             bucketDate: recentDateList[recentDateList.length - 3] || recentDateList[recentDateList.length - 2] || bucketDate,
             count: 0
         },
-        week: {
-            startDate: weekStartDate,
-            endDate: bucketDate,
-            count: 0
-        },
         month: {
             startDate: monthStartDate,
             endDate: bucketDate,
@@ -242,23 +145,14 @@ export default {
         const tableExistsResult = await befly.mysql.tableExists("beflyErrorReport");
         const tableReady = tableExistsResult.data === true;
         const now = Date.now();
-        const bucketDate = getDateYmdNumber(now);
-        const weekStartDate = getTongJiWeekStartDate(now);
+        const bucketDate = getTongJiDateYmdNumber(now);
         const monthStartDate = getTongJiMonthStartDate(now);
         const recentDateList = getTongJiRecentDateList(now, ERROR_STATS_DAY_LIMIT);
 
         if (!tableReady) {
-            return befly.tool.Yes("获取成功", buildEmptyErrorStats(bucketDate, weekStartDate, monthStartDate, recentDateList));
-        }
-
-        if (befly.redis) {
-            const redisResult = await getErrorStatsFromRedis(befly, bucketDate, weekStartDate, monthStartDate, recentDateList);
-
-            if (redisResult) {
-                return befly.tool.Yes("获取成功", redisResult);
-            }
+            return befly.tool.Yes("获取成功", buildEmptyErrorStats(bucketDate, monthStartDate, recentDateList));
         }
 
-        return befly.tool.Yes("获取成功", await getErrorStatsFromMysql(befly, bucketDate, weekStartDate, monthStartDate, recentDateList));
+        return befly.tool.Yes("获取成功", await getErrorStatsFromMysql(befly, bucketDate, monthStartDate, recentDateList));
     }
 };

package/checks/config.js

@@ -63,10 +63,7 @@ const configSchema = z
         logger: z
             .object({
                 debug: boolIntSchema,
-                excludeFields: z.array(noTrimString),
-                dir: noTrimString,
-                console: boolIntSchema,
-                maxSize: z.int().min(1)
+                excludeFields: z.array(noTrimString)
             })
             .strict(),
 

package/configs/beflyConfig.json

@@ -19,10 +19,7 @@
     "excludeApisLog": ["/api/core/tongJi/*Report"],
     "logger": {
         "debug": 1,
-        "excludeFields": ["password", "token", "secret"],
-        "dir": "./logs",
-        "console": 1,
-        "maxSize": 20
+        "excludeFields": ["password", "token", "secret"]
     },
 
     "mysql": {

package/index.js

@@ -120,6 +120,11 @@ export async function createBefly(env = {}, config = {}, menus = []) {
     const mergedMenus = deepMerge(prefixMenuPaths(beflyMenus, "core"), menus);
     mergedConfig.projectLists = mergeProjectListsByCode(mergedConfig.projectLists);
 
+    Logger.configure({
+        runtimeEnv: mergedConfig.runMode,
+        ...mergedConfig.logger
+    });
+
     const configHasError = await checkConfig(mergedConfig);
     const { apis, tables, plugins, hooks } = await scanSources();