befly 3.19.5 → 3.19.6

package/apis/tongJi/errorList.js

@@ -89,7 +89,10 @@ export default {
         const lists = [];
         for (const item of result.data?.lists || []) {
             const row = Object.assign({}, item);
+            row.reportTime = Number(item.reportTime || 0);
             row.firstReportTime = Number(item.firstReportTime || 0);
+            row.bucketTime = Number(item.bucketTime || 0);
+            row.bucketDate = Number(item.bucketDate || 0);
             row.hitCount = Number(item.hitCount || 0) || 1;
             lists.push(row);
         }

package/apis/tongJi/errorReport.js

@@ -1,6 +1,7 @@
 import { UAParser } from "ua-parser-js";
 import { getDateYmdNumber, getTimeBucketStart } from "../../utils/datetime.js";
-import { VISIT_STATS_BUCKET_MS } from "../../utils/visitStats.js";
+
+const VISIT_STATS_BUCKET_MS = 30 * 60 * 1000;
 
 function getErrorReportUaData(ctx) {
     let userAgent = "";

package/apis/tongJi/errorStats.js

@@ -1,5 +1,7 @@
 import { getDateYmdNumber } from "../../utils/datetime.js";
 
+const ERROR_STATS_DAY_LIMIT = 30;
+
 function toNumber(value) {
     const num = Number(value);
     if (!Number.isFinite(num)) {
@@ -9,6 +11,39 @@ function toNumber(value) {
     return num;
 }
 
+function getErrorStatsWeekStartDate(timestamp = Date.now()) {
+    const date = Reflect.construct(Date, [timestamp]);
+    const day = date.getDay();
+    const offset = day === 0 ? -6 : 1 - day;
+
+    return getDateYmdNumber(timestamp + offset * 24 * 60 * 60 * 1000);
+}
+
+function getErrorStatsMonthStartDate(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 getErrorStatsRecentDateList(now = Date.now(), limit = ERROR_STATS_DAY_LIMIT) {
+    const list = [];
+
+    for (let i = limit - 1; i >= 0; i--) {
+        list.push(getDateYmdNumber(now - i * 24 * 60 * 60 * 1000));
+    }
+
+    return list;
+}
+
+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] || {};
+
+    return {
+        count: toNumber(detail.count)
+    };
+}
+
 export default {
     name: "获取错误统计",
     method: "POST",
@@ -24,14 +59,34 @@ export default {
 
         if (!tableReady) {
             return befly.tool.Yes("获取成功", {
+                today: {
+                    bucketDate: bucketDate,
+                    count: 0
+                },
+                week: {
+                    startDate: getErrorStatsWeekStartDate(now),
+                    endDate: bucketDate,
+                    count: 0
+                },
+                month: {
+                    startDate: getErrorStatsMonthStartDate(now),
+                    endDate: bucketDate,
+                    count: 0
+                },
                 trend: [],
                 days: [],
                 topTypes: []
             });
         }
 
+        const weekStartDate = getErrorStatsWeekStartDate(now);
+        const monthStartDate = getErrorStatsMonthStartDate(now);
+        const recentDateList = getErrorStatsRecentDateList(now);
+        const todaySummary = await getErrorStatsSummary(befly, bucketDate, bucketDate);
+        const weekSummary = await getErrorStatsSummary(befly, weekStartDate, bucketDate);
+        const monthSummary = await getErrorStatsSummary(befly, monthStartDate, 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 GROUP BY bucket_date ORDER BY bucket_date DESC LIMIT 7", []);
+        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 = [];
@@ -43,15 +98,29 @@ export default {
             });
         }
 
-        const days = [];
+        const daysMap = new Map();
+
+        for (const item of recentDateList) {
+            daysMap.set(item, {
+                bucketDate: item,
+                count: 0
+            });
+        }
+
         for (const item of daysRes.data || []) {
-            days.push({
-                bucketDate: toNumber(item.bucketDate),
+            const itemBucketDate = toNumber(item.bucketDate);
+
+            if (!daysMap.has(itemBucketDate)) {
+                continue;
+            }
+
+            daysMap.set(itemBucketDate, {
+                bucketDate: itemBucketDate,
                 count: toNumber(item.count)
             });
         }
 
-        days.sort((a, b) => a.bucketDate - b.bucketDate);
+        const days = Array.from(daysMap.values());
 
         const topTypes = [];
         for (const item of topTypesRes.data || []) {
@@ -62,6 +131,20 @@ export default {
         }
 
         return befly.tool.Yes("获取成功", {
+            today: {
+                bucketDate: bucketDate,
+                count: todaySummary.count
+            },
+            week: {
+                startDate: weekStartDate,
+                endDate: bucketDate,
+                count: weekSummary.count
+            },
+            month: {
+                startDate: monthStartDate,
+                endDate: bucketDate,
+                count: monthSummary.count
+            },
             trend: trend,
             days: days,
             topTypes: topTypes

package/apis/tongJi/infoReport.js

@@ -0,0 +1,104 @@
+import { UAParser } from "ua-parser-js";
+
+import { isValidPositiveInt } from "../../utils/is.js";
+import { getDateYmdNumber } from "../../utils/datetime.js";
+
+function getInfoStatsMember(ctx) {
+    if (isValidPositiveInt(ctx.userId)) {
+        return `user:${ctx.userId}`;
+    }
+
+    return `ip:${ctx.ip || "unknown"}`;
+}
+
+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: 5000 }
+    },
+    required: [],
+    handler: async (befly, ctx) => {
+        const now = Date.now();
+        const reportDate = getDateYmdNumber(now);
+        const member = getInfoStatsMember(ctx);
+        const tableReady = (await befly.mysql.tableExists("beflyInfoReport")).data === true;
+        const body = ctx.body || {};
+        let userAgent = "";
+
+        if (!tableReady) {
+            return befly.tool.Yes("上报成功", {
+                reportTime: now,
+                reportDate: reportDate,
+                counted: false,
+                stored: false
+            });
+        }
+
+        if (typeof ctx.req?.headers?.get === "function") {
+            userAgent = ctx.req.headers.get("user-agent") || "";
+        } else if (typeof ctx.headers?.get === "function") {
+            userAgent = ctx.headers.get("user-agent") || "";
+        }
+
+        const uaResult = UAParser(userAgent);
+
+        const detail = await befly.mysql.getOne({
+            table: "beflyInfoReport",
+            where: {
+                reportDate: reportDate,
+                memberKey: member
+            }
+        });
+
+        if (detail.data?.id) {
+            return befly.tool.Yes("上报成功", {
+                reportTime: now,
+                reportDate: reportDate,
+                counted: false,
+                stored: false
+            });
+        }
+
+        await befly.mysql.insData({
+            table: "beflyInfoReport",
+            data: {
+                reportTime: now,
+                reportDate: reportDate,
+                memberKey: member,
+                source: body.source || "",
+                productName: body.productName || "",
+                productCode: body.productCode || "",
+                productVersion: body.productVersion || "",
+                pagePath: body.pagePath || "",
+                pageName: body.pageName || "",
+                detail: body.detail || "",
+                userAgent: userAgent,
+                deviceType: uaResult.device.type || "desktop",
+                browserName: uaResult.browser.name || "",
+                browserVersion: uaResult.browser.version || "",
+                osName: uaResult.os.name || "",
+                osVersion: uaResult.os.version || "",
+                deviceVendor: uaResult.device.vendor || "",
+                deviceModel: uaResult.device.model || "",
+                engineName: uaResult.engine.name || "",
+                cpuArchitecture: uaResult.cpu.architecture || ""
+            }
+        });
+
+        return befly.tool.Yes("上报成功", {
+            reportTime: now,
+            reportDate: reportDate,
+            counted: true,
+            stored: true
+        });
+    }
+};

package/apis/tongJi/infoStats.js

@@ -0,0 +1,147 @@
+import { addDays, getDateYmdNumber } from "../../utils/datetime.js";
+
+const INFO_STATS_FIELDS = [
+    { dbField: "source", key: "sources" },
+    { dbField: "product_name", key: "productNames" },
+    { dbField: "product_code", key: "productCodes" },
+    { dbField: "product_version", key: "productVersions" },
+    { dbField: "page_path", key: "pagePaths" },
+    { dbField: "page_name", key: "pageNames" },
+    { dbField: "device_type", key: "deviceTypes" },
+    { dbField: "browser_name", key: "browsers" },
+    { dbField: "browser_version", key: "browserVersions" },
+    { dbField: "os_name", key: "osList" },
+    { dbField: "os_version", key: "osVersions" },
+    { dbField: "device_vendor", key: "deviceVendors" },
+    { dbField: "device_model", key: "deviceModels" },
+    { dbField: "engine_name", key: "engines" },
+    { dbField: "cpu_architecture", key: "cpuArchitectures" }
+];
+
+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 formatInfoStatsList(rows = []) {
+    const list = [];
+
+    for (const item of rows || []) {
+        const name = String(item.name || "").trim();
+        const count = Number(item.count || 0);
+
+        if (!name || count <= 0) {
+            continue;
+        }
+
+        list.push({
+            name: name,
+            count: count
+        });
+    }
+
+    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]);
+
+    return formatInfoStatsList(result.data || []);
+}
+
+async function getInfoStatsRange(befly, startDate, endDate) {
+    const data = {};
+
+    for (const item of INFO_STATS_FIELDS) {
+        data[item.key] = await getInfoStatsFieldList(befly, startDate, endDate, item.dbField);
+    }
+
+    return data;
+}
+
+export default {
+    name: "获取访问信息统计",
+    method: "POST",
+    body: "none",
+    auth: true,
+    fields: {},
+    required: [],
+    handler: async (befly) => {
+        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
+            }
+        });
+    }
+};

package/apis/tongJi/onlineReport.js

@@ -0,0 +1,110 @@
+import { addDays, getDateYmdNumber } from "../../utils/datetime.js";
+import { isValidPositiveInt } from "../../utils/is.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;
+
+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`
+    };
+}
+
+async function touchRedisKeys(befly, keys, ttl) {
+    for (const key of keys) {
+        await befly.redis.expire(key, ttl);
+    }
+}
+
+async function getOnlineStatsOnlineCount(befly) {
+    const members = await befly.redis.smembers("online:visitors");
+    if (members.length === 0) {
+        return 0;
+    }
+
+    const existsList = await befly.redis.existsBatch(members.map((member) => `online:visitor:${member}`));
+    const expiredMembers = [];
+    let onlineCount = 0;
+
+    for (let i = 0; i < members.length; i++) {
+        if (existsList[i]) {
+            onlineCount += 1;
+            continue;
+        }
+
+        expiredMembers.push(members[i]);
+    }
+
+    if (expiredMembers.length > 0) {
+        await befly.redis.srem("online:visitors", expiredMembers);
+    }
+
+    return onlineCount;
+}
+
+async function updateOnlineStatsPeriod(befly, periodType, periodValue, member) {
+    const keys = getPeriodKeys(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 touchRedisKeys(befly, Object.values(keys), ONLINE_STATS_TEMP_TTL_SECONDS);
+}
+
+export default {
+    name: "上报在线统计",
+    method: "POST",
+    body: "none",
+    auth: false,
+    fields: {},
+    required: [],
+    handler: async (befly, ctx) => {
+        const now = Date.now();
+        const reportDate = getDateYmdNumber(now);
+        const weekStartDate = getOnlineStatsWeekStartDate(now);
+        const monthStartDate = getOnlineStatsMonthStartDate(now);
+        const member = getOnlineStatsMember(ctx);
+
+        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);
+
+        const onlineCount = await getOnlineStatsOnlineCount(befly);
+
+        await updateOnlineStatsPeriod(befly, "day", reportDate, member);
+        await updateOnlineStatsPeriod(befly, "week", weekStartDate, member);
+        await updateOnlineStatsPeriod(befly, "month", monthStartDate, member);
+
+        return befly.tool.Yes("上报成功", {
+            reportTime: now,
+            reportDate: reportDate,
+            onlineCount: onlineCount,
+            stored: true
+        });
+    }
+};

package/apis/tongJi/onlineStats.js

@@ -0,0 +1,147 @@
+import { addDays, getDateYmdNumber } from "../../utils/datetime.js";
+
+const ONLINE_STATS_DAY_LIMIT = 30;
+
+function toOnlineStatsNumber(value) {
+    const num = Number(value);
+
+    if (!Number.isFinite(num)) {
+        return 0;
+    }
+
+    return num;
+}
+
+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 getOnlineStatsRecentDateList(now = Date.now(), limit = ONLINE_STATS_DAY_LIMIT) {
+    const list = [];
+
+    for (let i = limit - 1; i >= 0; i--) {
+        list.push(getDateYmdNumber(addDays(now, -i)));
+    }
+
+    return list;
+}
+
+function getPeriodKeys(periodType, periodValue) {
+    return {
+        pv: `online:${periodType}:${periodValue}:pv`,
+        members: `online:${periodType}:${periodValue}:members`,
+        reportTime: `online:${periodType}:${periodValue}:reportTime`
+    };
+}
+
+async function getRedisNumber(befly, key) {
+    return toOnlineStatsNumber(await befly.redis.getString(key));
+}
+
+async function getOnlineStatsPeriodData(befly, periodType, periodValue) {
+    const keys = getPeriodKeys(periodType, periodValue);
+    return {
+        reportTime: await getRedisNumber(befly, keys.reportTime),
+        pv: await getRedisNumber(befly, keys.pv),
+        uv: toOnlineStatsNumber(await befly.redis.scard(keys.members))
+    };
+}
+
+async function getOnlineStatsOnlineCount(befly) {
+    const members = await befly.redis.smembers("online:visitors");
+    if (members.length === 0) {
+        return 0;
+    }
+
+    const existsList = await befly.redis.existsBatch(members.map((member) => `online:visitor:${member}`));
+    const expiredMembers = [];
+    let onlineCount = 0;
+
+    for (let i = 0; i < members.length; i++) {
+        if (existsList[i]) {
+            onlineCount += 1;
+            continue;
+        }
+
+        expiredMembers.push(members[i]);
+    }
+
+    if (expiredMembers.length > 0) {
+        await befly.redis.srem("online:visitors", expiredMembers);
+    }
+
+    return onlineCount;
+}
+
+export default {
+    name: "获取在线统计",
+    method: "POST",
+    body: "none",
+    auth: true,
+    fields: {},
+    required: [],
+    handler: async (befly) => {
+        const now = Date.now();
+        const reportDate = getDateYmdNumber(now);
+        const weekStartDate = getOnlineStatsWeekStartDate(now);
+        const monthStartDate = getOnlineStatsMonthStartDate(now);
+        const recentDateList = getOnlineStatsRecentDateList(now, ONLINE_STATS_DAY_LIMIT);
+        const days = [];
+
+        for (const item of recentDateList) {
+            const dayData = await getOnlineStatsPeriodData(befly, "day", item);
+
+            if (dayData.reportTime <= 0) {
+                continue;
+            }
+
+            days.push({
+                reportDate: item,
+                reportTime: dayData.reportTime,
+                pv: dayData.pv,
+                uv: dayData.uv
+            });
+        }
+
+        const currentDay = await getOnlineStatsPeriodData(befly, "day", reportDate);
+        const weekCurrent = await getOnlineStatsPeriodData(befly, "week", weekStartDate);
+        const monthCurrent = await getOnlineStatsPeriodData(befly, "month", monthStartDate);
+        const onlineCount = await getOnlineStatsOnlineCount(befly);
+
+        return befly.tool.Yes("获取成功", {
+            queryTime: now,
+            onlineCount: onlineCount,
+            today: {
+                reportDate: reportDate,
+                reportTime: currentDay.reportTime,
+                pv: currentDay.pv,
+                uv: currentDay.uv
+            },
+            week: {
+                startDate: weekStartDate,
+                endDate: reportDate,
+                reportTime: weekCurrent.reportTime,
+                pv: weekCurrent.pv,
+                uv: weekCurrent.uv
+            },
+            month: {
+                startDate: monthStartDate,
+                endDate: reportDate,
+                reportTime: monthCurrent.reportTime,
+                pv: monthCurrent.pv,
+                uv: monthCurrent.uv
+            },
+            days: days
+        });
+    }
+};