befly 3.18.23 → 3.19.5

package/apis/auth/login.js

@@ -18,7 +18,8 @@ export default {
         password: adminTable.password,
         loginType: {
             name: "登录类型",
-            input: "/^(username|email|phone)$/",
+            input: "enum",
+            check: "username|email|phone",
             min: null,
             max: null
         }
@@ -96,7 +97,6 @@ export default {
             id: admin.data.id,
             username: admin.data.username,
             nickname: admin.data.nickname,
-            state: admin.data.state,
             roleCode: admin.data.roleCode,
             roleType: admin.data.roleType,
             loginAt: Date.now()
@@ -113,7 +113,6 @@ export default {
                 id: sessionData.id,
                 username: sessionData.username,
                 nickname: sessionData.nickname,
-                state: sessionData.state,
                 roleCode: sessionData.roleCode,
                 roleType: sessionData.roleType
             }

package/apis/tongJi/errorList.js

@@ -0,0 +1,102 @@
+export default {
+    name: "获取错误报告列表",
+    method: "POST",
+    body: "none",
+    auth: true,
+    fields: {
+        page: { name: "页码", input: "integer", min: 1, max: 9999 },
+        limit: { name: "每页数量", input: "integer", min: 1, max: 100 },
+        keyword: { name: "关键词", input: "string", min: 0, max: 100 },
+        errorType: { name: "错误类型", input: "string", min: 0, max: 50 },
+        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 },
+        deviceType: { name: "设备类型", input: "string", min: 0, max: 50 },
+        browserName: { name: "浏览器", input: "string", min: 0, max: 100 },
+        osName: { name: "操作系统", input: "string", min: 0, max: 100 }
+    },
+    required: [],
+    handler: async (befly, ctx) => {
+        const tableExistsResult = await befly.mysql.tableExists("beflyErrorReport");
+        const page = Number(ctx.body.page || 1);
+        const limit = Number(ctx.body.limit || 20);
+
+        if (tableExistsResult.data !== true) {
+            return befly.tool.Yes("获取成功", {
+                lists: [],
+                total: 0,
+                page: page,
+                limit: limit
+            });
+        }
+
+        const keyword = String(ctx.body.keyword || "").trim();
+        const errorType = String(ctx.body.errorType || "").trim();
+        const source = String(ctx.body.source || "").trim();
+        const productName = String(ctx.body.productName || "").trim();
+        const productCode = String(ctx.body.productCode || "").trim();
+        const productVersion = String(ctx.body.productVersion || "").trim();
+        const deviceType = String(ctx.body.deviceType || "").trim();
+        const browserName = String(ctx.body.browserName || "").trim();
+        const osName = String(ctx.body.osName || "").trim();
+        const where = {};
+
+        if (keyword) {
+            where["$or"] = [{ pagePath$like: keyword }, { pageName$like: keyword }, { message$like: keyword }, { errorType$like: keyword }, { productName$like: keyword }, { productCode$like: keyword }, { productVersion$like: keyword }, { browserName$like: keyword }, { osName$like: keyword }, { deviceType$like: keyword }, { deviceVendor$like: keyword }, { deviceModel$like: keyword }];
+        }
+
+        if (errorType) {
+            where.errorType = errorType;
+        }
+
+        if (source) {
+            where.source = source;
+        }
+
+        if (productName) {
+            where.productName = productName;
+        }
+
+        if (productCode) {
+            where.productCode = productCode;
+        }
+
+        if (productVersion) {
+            where.productVersion = productVersion;
+        }
+
+        if (deviceType) {
+            where.deviceType = deviceType;
+        }
+
+        if (browserName) {
+            where.browserName = browserName;
+        }
+
+        if (osName) {
+            where.osName = osName;
+        }
+
+        const result = await befly.mysql.getList({
+            table: "beflyErrorReport",
+            where: where,
+            page: page,
+            limit: limit,
+            orderBy: ["reportTime#DESC"]
+        });
+
+        const lists = [];
+        for (const item of result.data?.lists || []) {
+            const row = Object.assign({}, item);
+            row.firstReportTime = Number(item.firstReportTime || 0);
+            row.hitCount = Number(item.hitCount || 0) || 1;
+            lists.push(row);
+        }
+
+        const data = Object.assign({}, result.data);
+        data.lists = lists;
+
+        return befly.tool.Yes("获取成功", data);
+    }
+};

package/apis/tongJi/errorReport.js

@@ -0,0 +1,90 @@
+import { UAParser } from "ua-parser-js";
+import { getDateYmdNumber, getTimeBucketStart } from "../../utils/datetime.js";
+import { VISIT_STATS_BUCKET_MS } from "../../utils/visitStats.js";
+
+function getErrorReportUaData(ctx) {
+    let userAgent = "";
+
+    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);
+
+    return {
+        userAgent: userAgent,
+        browserName: uaResult.browser.name || "",
+        browserVersion: uaResult.browser.version || "",
+        osName: uaResult.os.name || "",
+        osVersion: uaResult.os.version || "",
+        deviceType: uaResult.device.type || "desktop",
+        deviceVendor: uaResult.device.vendor || "",
+        deviceModel: uaResult.device.model || "",
+        engineName: uaResult.engine.name || "",
+        cpuArchitecture: uaResult.cpu.architecture || ""
+    };
+}
+
+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 },
+        errorType: { name: "错误类型", input: "string", min: 0, max: 50 },
+        message: { name: "错误信息", input: "string", min: 0, max: 500 },
+        detail: { name: "错误详情", input: "string", min: 0, max: 5000 }
+    },
+    required: [],
+    handler: async (befly, ctx) => {
+        const now = Date.now();
+        const bucketTime = getTimeBucketStart(now, VISIT_STATS_BUCKET_MS);
+        const bucketDate = getDateYmdNumber(now);
+        const uaData = getErrorReportUaData(ctx);
+
+        await befly.mysql.insData({
+            table: "beflyErrorReport",
+            data: {
+                reportTime: now,
+                firstReportTime: now,
+                bucketTime: bucketTime,
+                bucketDate: bucketDate,
+                hitCount: 1,
+                source: ctx.body?.source,
+                productName: ctx.body?.productName || "",
+                productCode: ctx.body?.productCode || "",
+                productVersion: ctx.body?.productVersion || "",
+                pagePath: ctx.body?.pagePath || "",
+                pageName: ctx.body?.pageName || "",
+                errorType: ctx.body?.errorType || "",
+                message: ctx.body?.message || "",
+                detail: ctx.body?.detail || "",
+                userAgent: uaData.userAgent,
+                browserName: uaData.browserName,
+                browserVersion: uaData.browserVersion,
+                osName: uaData.osName,
+                osVersion: uaData.osVersion,
+                deviceType: uaData.deviceType,
+                deviceVendor: uaData.deviceVendor,
+                deviceModel: uaData.deviceModel,
+                engineName: uaData.engineName,
+                cpuArchitecture: uaData.cpuArchitecture
+            }
+        });
+
+        return befly.tool.Yes("上报成功", {
+            reportTime: now,
+            bucketTime: bucketTime,
+            bucketDate: bucketDate,
+            stored: true
+        });
+    }
+};

package/apis/tongJi/errorStats.js

@@ -0,0 +1,70 @@
+import { getDateYmdNumber } from "../../utils/datetime.js";
+
+function toNumber(value) {
+    const num = Number(value);
+    if (!Number.isFinite(num)) {
+        return 0;
+    }
+
+    return num;
+}
+
+export default {
+    name: "获取错误统计",
+    method: "POST",
+    body: "none",
+    auth: true,
+    fields: {},
+    required: [],
+    handler: async (befly) => {
+        const tableExistsResult = await befly.mysql.tableExists("beflyErrorReport");
+        const tableReady = tableExistsResult.data === true;
+        const now = Date.now();
+        const bucketDate = getDateYmdNumber(now);
+
+        if (!tableReady) {
+            return befly.tool.Yes("获取成功", {
+                trend: [],
+                days: [],
+                topTypes: []
+            });
+        }
+
+        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 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: toNumber(item.bucketTime),
+                bucketDate: toNumber(item.bucketDate),
+                count: toNumber(item.count)
+            });
+        }
+
+        const days = [];
+        for (const item of daysRes.data || []) {
+            days.push({
+                bucketDate: toNumber(item.bucketDate),
+                count: toNumber(item.count)
+            });
+        }
+
+        days.sort((a, b) => a.bucketDate - b.bucketDate);
+
+        const topTypes = [];
+        for (const item of topTypesRes.data || []) {
+            topTypes.push({
+                errorType: String(item.errorType || "unknown"),
+                count: toNumber(item.count)
+            });
+        }
+
+        return befly.tool.Yes("获取成功", {
+            trend: trend,
+            days: days,
+            topTypes: topTypes
+        });
+    }
+};

package/apis/tongJi/visitReport.js

@@ -0,0 +1,241 @@
+import { UAParser } from "ua-parser-js";
+
+import { isValidPositiveInt } from "../../utils/is.js";
+import { getDateYmdNumber, getTimeBucketStart } from "../../utils/datetime.js";
+import { VISIT_STATS_BUCKET_MS, VISIT_STATS_ONLINE_TTL_SECONDS, VISIT_STATS_PRODUCT_FIELDS, VISIT_STATS_REDIS_TTL_SECONDS, VISIT_STATS_UA_FIELDS, getVisitStatsBucketKey, getVisitStatsBucketProductPvKey, getVisitStatsBucketProductUvKey, getVisitStatsDayKey, getVisitStatsDayProductCountKey, getVisitStatsDayProductKeysKey, getVisitStatsDayProductPvKey, getVisitStatsDayProductUvKey, getVisitStatsDayProductValuesKey, getVisitStatsDayUaCountKey, getVisitStatsDayUaValuesKey, getVisitStatsProductKey, getVisitStatsProductMeta, getVisitStatsProductMetaKey, normalizeVisitStatsProductValue, normalizeVisitStatsUaValue, toVisitStatsNumber } from "../../utils/visitStats.js";
+
+function getVisitStatsMember(ctx) {
+    if (isValidPositiveInt(ctx.userId)) {
+        return `user:${ctx.userId}`;
+    }
+
+    return `ip:${ctx.ip || "unknown"}`;
+}
+
+function getVisitStatsUaData(ctx) {
+    let userAgent = "";
+
+    if (typeof ctx.req?.headers?.get === "function") {
+        userAgent = String(ctx.req.headers.get("user-agent") || "");
+    } else if (typeof ctx.headers?.get === "function") {
+        userAgent = String(ctx.headers.get("user-agent") || "");
+    }
+
+    const uaResult = UAParser(userAgent);
+
+    return {
+        deviceType: normalizeVisitStatsUaValue(uaResult.device.type, "desktop"),
+        browserName: normalizeVisitStatsUaValue(uaResult.browser.name),
+        browserVersion: normalizeVisitStatsUaValue(uaResult.browser.version),
+        osName: normalizeVisitStatsUaValue(uaResult.os.name),
+        osVersion: normalizeVisitStatsUaValue(uaResult.os.version),
+        deviceVendor: normalizeVisitStatsUaValue(uaResult.device.vendor),
+        deviceModel: normalizeVisitStatsUaValue(uaResult.device.model),
+        engineName: normalizeVisitStatsUaValue(uaResult.engine.name),
+        cpuArchitecture: normalizeVisitStatsUaValue(uaResult.cpu.architecture)
+    };
+}
+
+function getVisitStatsProductData(ctx) {
+    return getVisitStatsProductMeta({
+        productName: ctx.body?.productName,
+        productCode: ctx.body?.productCode,
+        productVersion: ctx.body?.productVersion
+    });
+}
+
+async function saveVisitStatsUaData(befly, bucketDate, uaData) {
+    const saddItems = [];
+    const expireItems = [];
+    const countTasks = [];
+
+    for (const item of VISIT_STATS_UA_FIELDS) {
+        const field = item.field;
+        const defaultValue = item.defaultValue;
+        const value = normalizeVisitStatsUaValue(uaData[field], defaultValue);
+        const valuesKey = getVisitStatsDayUaValuesKey(bucketDate, field);
+        const countKey = getVisitStatsDayUaCountKey(bucketDate, field, value);
+
+        saddItems.push({ key: valuesKey, members: [value] });
+        expireItems.push({ key: valuesKey, seconds: VISIT_STATS_REDIS_TTL_SECONDS });
+        countTasks.push(befly.redis.incrWithExpire(countKey, VISIT_STATS_REDIS_TTL_SECONDS));
+    }
+
+    await befly.redis.saddBatch(saddItems);
+    await befly.redis.expireBatch(expireItems);
+    await Promise.all(countTasks);
+}
+
+async function saveVisitStatsProductData(befly, bucketDate, productData) {
+    const saddItems = [];
+    const expireItems = [];
+    const countTasks = [];
+
+    for (const item of VISIT_STATS_PRODUCT_FIELDS) {
+        const field = item.field;
+        const defaultValue = item.defaultValue;
+        const value = normalizeVisitStatsProductValue(productData[field], defaultValue);
+        const valuesKey = getVisitStatsDayProductValuesKey(bucketDate, field);
+        const countKey = getVisitStatsDayProductCountKey(bucketDate, field, value);
+
+        saddItems.push({ key: valuesKey, members: [value] });
+        expireItems.push({ key: valuesKey, seconds: VISIT_STATS_REDIS_TTL_SECONDS });
+        countTasks.push(befly.redis.incrWithExpire(countKey, VISIT_STATS_REDIS_TTL_SECONDS));
+    }
+
+    await befly.redis.saddBatch(saddItems);
+    await befly.redis.expireBatch(expireItems);
+    await Promise.all(countTasks);
+}
+
+async function saveVisitStatsProductSummary(befly, bucketTime, bucketDate, member, productData) {
+    const productKey = getVisitStatsProductKey(productData);
+    const metaKey = getVisitStatsProductMetaKey(productKey);
+    const dayKeysKey = getVisitStatsDayProductKeysKey(bucketDate);
+    const bucketPvKey = getVisitStatsBucketProductPvKey(bucketTime, productKey);
+    const bucketUvKey = getVisitStatsBucketProductUvKey(bucketTime, productKey);
+    const dayPvKey = getVisitStatsDayProductPvKey(bucketDate, productKey);
+    const dayUvKey = getVisitStatsDayProductUvKey(bucketDate, productKey);
+
+    await befly.redis.setString(metaKey, JSON.stringify(productData), VISIT_STATS_REDIS_TTL_SECONDS);
+    await befly.redis.sadd(dayKeysKey, [productKey]);
+    await befly.redis.expire(dayKeysKey, VISIT_STATS_REDIS_TTL_SECONDS);
+    await befly.redis.incrWithExpire(bucketPvKey, VISIT_STATS_REDIS_TTL_SECONDS);
+    await befly.redis.sadd(bucketUvKey, [member]);
+    await befly.redis.expire(bucketUvKey, VISIT_STATS_REDIS_TTL_SECONDS);
+    await befly.redis.incrWithExpire(dayPvKey, VISIT_STATS_REDIS_TTL_SECONDS);
+    await befly.redis.sadd(dayUvKey, [member]);
+    await befly.redis.expire(dayUvKey, VISIT_STATS_REDIS_TTL_SECONDS);
+}
+
+async function ensureVisitStatsTableReady(befly) {
+    if (befly.visitStatsTableReady !== undefined) {
+        return befly.visitStatsTableReady;
+    }
+
+    const tableExistsResult = await befly.mysql.tableExists("beflyVisitStats");
+    befly.visitStatsTableReady = tableExistsResult.data === true;
+    return befly.visitStatsTableReady;
+}
+
+async function flushVisitStatsBucket(befly, bucketTime) {
+    if (bucketTime <= 0) {
+        return;
+    }
+
+    const currentBucketTime = getTimeBucketStart(Date.now(), VISIT_STATS_BUCKET_MS);
+    if (bucketTime >= currentBucketTime) {
+        return;
+    }
+
+    const tableReady = await ensureVisitStatsTableReady(befly);
+    if (!tableReady) {
+        return;
+    }
+
+    const flushedKey = `visitStats:flushed:${bucketTime}`;
+    const flushed = await befly.redis.exists(flushedKey);
+    if (flushed) {
+        return;
+    }
+
+    const bucketDate = getDateYmdNumber(bucketTime);
+    const bucketKey = getVisitStatsBucketKey(bucketTime);
+    const pv = toVisitStatsNumber(await befly.redis.getString(`${bucketKey}:pv`));
+    const uv = await befly.redis.scard(`${bucketKey}:uv`);
+    const errorCount = toVisitStatsNumber(await befly.redis.getString(`${bucketKey}:errorCount`));
+    const durationSum = toVisitStatsNumber(await befly.redis.getString(`${bucketKey}:durationSum`));
+    const durationCount = toVisitStatsNumber(await befly.redis.getString(`${bucketKey}:durationCount`));
+    const avgDuration = durationCount > 0 ? Math.round(durationSum / durationCount) : 0;
+
+    if (pv <= 0 && uv <= 0 && errorCount <= 0 && durationCount <= 0) {
+        await befly.redis.setString(flushedKey, "1", VISIT_STATS_REDIS_TTL_SECONDS);
+        return;
+    }
+
+    const data = {
+        bucketTime: bucketTime,
+        bucketDate: bucketDate,
+        pv: pv,
+        uv: uv,
+        errorCount: errorCount,
+        durationSum: durationSum,
+        durationCount: durationCount,
+        avgDuration: avgDuration
+    };
+
+    const detail = await befly.mysql.getOne({
+        table: "beflyVisitStats",
+        where: { bucketTime: bucketTime }
+    });
+
+    if (detail.data?.id) {
+        await befly.mysql.updData({
+            table: "beflyVisitStats",
+            data: data,
+            where: { bucketTime: bucketTime }
+        });
+    } else {
+        await befly.mysql.insData({
+            table: "beflyVisitStats",
+            data: data
+        });
+    }
+
+    await befly.redis.setString(flushedKey, "1", VISIT_STATS_REDIS_TTL_SECONDS);
+}
+
+async function flushVisitStatsPreviousBucket(befly, now = Date.now()) {
+    const currentBucketTime = getTimeBucketStart(now, VISIT_STATS_BUCKET_MS);
+    await flushVisitStatsBucket(befly, currentBucketTime - 30 * 60 * 1000);
+}
+
+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 }
+    },
+    required: [],
+    handler: async (befly, ctx) => {
+        const now = Date.now();
+        const bucketTime = getTimeBucketStart(now, VISIT_STATS_BUCKET_MS);
+        const bucketDate = getDateYmdNumber(now);
+        const bucketKey = getVisitStatsBucketKey(bucketTime);
+        const dayKey = getVisitStatsDayKey(bucketDate);
+        const member = getVisitStatsMember(ctx);
+        const uaData = getVisitStatsUaData(ctx);
+        const productData = getVisitStatsProductData(ctx);
+
+        await flushVisitStatsPreviousBucket(befly, now);
+
+        await befly.redis.incrWithExpire(`${bucketKey}:pv`, VISIT_STATS_REDIS_TTL_SECONDS);
+        await befly.redis.incrWithExpire(`${dayKey}:pv`, VISIT_STATS_REDIS_TTL_SECONDS);
+
+        await befly.redis.sadd(`${bucketKey}:uv`, [member]);
+        await befly.redis.expire(`${bucketKey}:uv`, VISIT_STATS_REDIS_TTL_SECONDS);
+        await befly.redis.sadd(`${dayKey}:uv`, [member]);
+        await befly.redis.expire(`${dayKey}:uv`, VISIT_STATS_REDIS_TTL_SECONDS);
+
+        await befly.redis.setString(`visitStats:online:visitor:${member}`, "1", VISIT_STATS_ONLINE_TTL_SECONDS);
+        await befly.redis.sadd("visitStats:online:visitors", [member]);
+        await befly.redis.expire("visitStats:online:visitors", VISIT_STATS_REDIS_TTL_SECONDS);
+        await saveVisitStatsUaData(befly, bucketDate, uaData);
+        await saveVisitStatsProductData(befly, bucketDate, productData);
+        await saveVisitStatsProductSummary(befly, bucketTime, bucketDate, member, productData);
+
+        const result = {
+            bucketTime: bucketTime,
+            bucketDate: bucketDate
+        };
+
+        return befly.tool.Yes("上报成功", result);
+    }
+};