befly 3.61.0 → 3.63.0

package/apis/auth/login.js

@@ -1,5 +1,4 @@
 import adminTable from "#befly/tables/admin.json";
-import { parseUserAgent } from "#befly/utils/userAgent.js";
 import { toSessionTtlSeconds } from "#befly/utils/util.js";
 
 export default {
@@ -21,28 +20,81 @@ export default {
             check: "username|email|phone",
             min: null,
             max: null
+        },
+        clientType: {
+            name: "客户端类型",
+            input: "enum",
+            check: "browser|vscode|desktop|miniapp|app",
+            min: 3,
+            max: 20
+        },
+        productName: {
+            name: "产品名称",
+            input: "string",
+            min: 0,
+            max: 100
+        },
+        productCode: {
+            name: "产品代号",
+            input: "string",
+            min: 0,
+            max: 100
+        },
+        productVersion: {
+            name: "产品版本",
+            input: "string",
+            min: 0,
+            max: 50
+        },
+        clientVersion: {
+            name: "客户端版本",
+            input: "string",
+            min: 0,
+            max: 100
+        },
+        os: {
+            name: "操作系统",
+            input: "string",
+            min: 0,
+            max: 100
+        },
+        system: {
+            name: "系统",
+            input: "string",
+            min: 0,
+            max: 100
+        },
+        brand: {
+            name: "设备品牌",
+            input: "string",
+            min: 0,
+            max: 100
+        },
+        model: {
+            name: "设备型号",
+            input: "string",
+            min: 0,
+            max: 100
         }
     },
     required: ["account", "password", "loginType"],
     handler: async (befly, ctx) => {
-        const userAgent = ctx.req.headers.get("user-agent") || "";
-        const uaData = parseUserAgent(userAgent);
+        const body = ctx.body || {};
 
         const logData = {
             adminId: 0,
             username: ctx.body.account,
             nickname: "",
             ip: ctx.ip || "",
-            userAgent: userAgent.substring(0, 500),
-            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,
+            clientType: body.clientType,
+            productName: body.productName || null,
+            productCode: body.productCode || null,
+            productVersion: body.productVersion || null,
+            clientVersion: body.clientVersion || null,
+            os: body.os || null,
+            system: body.system || null,
+            brand: body.brand || null,
+            model: body.model || null,
             loginTime: Date.now(),
             loginResult: 0,
             failReason: ""

package/apis/tongJi/_tongJi.js

@@ -1,69 +1,120 @@
-import { addDays, getDateYmdNumber } from "#befly/utils/datetime.js";
+import { DAY_MS } from "#befly/utils/datetime.js";
+
+const DEFAULT_TIME_ZONE = "Asia/Shanghai";
+
+function getTimeZoneDateParts(timestamp, timeZone) {
+    const formatter = new Intl.DateTimeFormat("en-CA", {
+        timeZone: timeZone,
+        year: "numeric",
+        month: "2-digit",
+        day: "2-digit"
+    });
+    const parts = formatter.formatToParts(timestamp);
+    const result = {};
+
+    for (const part of parts) {
+        if (part.type !== "literal") {
+            result[part.type] = Number(part.value);
+        }
+    }
+
+    return result;
+}
 
-export function getTongJiNumber(value) {
-    const num = Number(value);
+function buildYmdNumber(year, month, day) {
+    return year * 10000 + month * 100 + day;
+}
 
-    return Number.isFinite(num) ? num : 0;
+function normalizeTimeZone(timeZone) {
+    return typeof timeZone === "string" && timeZone.trim().length > 0 ? timeZone.trim() : DEFAULT_TIME_ZONE;
 }
 
-export function getTongJiWeekStartDate(timestamp = Date.now()) {
-    const date = Reflect.construct(Date, [timestamp]);
-    const day = date.getDay();
-    const offset = day === 0 ? -6 : 1 - day;
+function findTimestampInDay(targetYmd, timeZone) {
+    const year = Math.floor(targetYmd / 10000);
+    const month = Math.floor((targetYmd % 10000) / 100);
+    const day = targetYmd % 100;
+    // 取当天正午作为锚点，再向前/后逐小时修正，确保落在目标日期内
+    let utc = Date.UTC(year, month - 1, day, 12, 0, 0, 0);
+    const ymdAtUtc = getTongJiDateYmdNumber(utc, timeZone);
+
+    if (ymdAtUtc === targetYmd) {
+        return utc;
+    }
+
+    const step = ymdAtUtc < targetYmd ? 3600000 : -3600000;
 
-    return getDateYmdNumber(addDays(timestamp, offset));
+    do {
+        utc += step;
+    } while (getTongJiDateYmdNumber(utc, timeZone) !== targetYmd);
+
+    return utc;
 }
 
-export function getTongJiMonthStartDate(timestamp = Date.now()) {
-    const date = Reflect.construct(Date, [timestamp]);
+export function getTongJiDateYmdNumber(timestamp = Date.now(), timeZone = DEFAULT_TIME_ZONE) {
+    const parts = getTimeZoneDateParts(timestamp, normalizeTimeZone(timeZone));
 
-    return getDateYmdNumber(Reflect.construct(Date, [date.getFullYear(), date.getMonth(), 1, 0, 0, 0, 0]).getTime());
+    return buildYmdNumber(parts.year, parts.month, parts.day);
 }
 
-export function getTongJiRecentDateList(now = Date.now(), limit = 30) {
-    const list = [];
+export function getTongJiDayStartTime(timestamp = Date.now(), timeZone = DEFAULT_TIME_ZONE) {
+    const zone = normalizeTimeZone(timeZone);
+    const targetYmd = getTongJiDateYmdNumber(timestamp, zone);
+    const timestampInDay = findTimestampInDay(targetYmd, zone);
+    let low = timestampInDay - DAY_MS;
+    let high = timestampInDay + DAY_MS;
 
-    for (let i = limit - 1; i >= 0; i -= 1) {
-        list.push(getDateYmdNumber(addDays(now, -i)));
+    while (getTongJiDateYmdNumber(low, zone) >= targetYmd) {
+        low -= DAY_MS;
     }
 
-    return list;
-}
+    while (getTongJiDateYmdNumber(high, zone) <= targetYmd) {
+        high += DAY_MS;
+    }
 
-export function getTongJiDateRangeList(startDate, endDate) {
-    const list = [];
-    const start = new Date(Math.floor(startDate / 10000), Math.floor((startDate % 10000) / 100) - 1, startDate % 100);
-    const end = new Date(Math.floor(endDate / 10000), Math.floor((endDate % 10000) / 100) - 1, endDate % 100);
-    const current = new Date(start);
+    while (low + 1 < high) {
+        const mid = Math.floor((low + high) / 2);
 
-    while (current.getTime() <= end.getTime()) {
-        list.push(getDateYmdNumber(current.getTime()));
-        current.setDate(current.getDate() + 1);
+        if (getTongJiDateYmdNumber(mid, zone) < targetYmd) {
+            low = mid;
+        } else {
+            high = mid;
+        }
     }
 
-    return list;
+    return high;
 }
 
-export async function expireRedisKeys(befly, keys, ttl) {
-    await Promise.all(keys.map((key) => befly.redis.expire(key, ttl)));
-}
+export function getTongJiMonthStartDate(timestamp = Date.now(), timeZone = DEFAULT_TIME_ZONE) {
+    const parts = getTimeZoneDateParts(timestamp, normalizeTimeZone(timeZone));
 
-export function getErrorStatsPeriodCountKey(periodType, periodValue) {
-    return `error:${periodType}:${periodValue}:count`;
+    return buildYmdNumber(parts.year, parts.month, 1);
 }
 
-export function getErrorStatsDayBucketsKey(bucketDate) {
-    return `error:day:${bucketDate}:buckets`;
-}
+export function getTongJiRecentDateList(timestamp = Date.now(), limit = 30, timeZone = DEFAULT_TIME_ZONE) {
+    const zone = normalizeTimeZone(timeZone);
+    const dayStart = getTongJiDayStartTime(timestamp, zone);
+    const list = [];
+
+    for (let i = limit - 1; i >= 0; i -= 1) {
+        list.push(getTongJiDateYmdNumber(dayStart - i * DAY_MS, zone));
+    }
 
-export function getErrorStatsDayBucketCountKey(bucketDate, bucketTime) {
-    return `error:day:${bucketDate}:bucket:${bucketTime}:count`;
+    return list;
 }
 
-export function getErrorStatsDayTypesKey(bucketDate) {
-    return `error:day:${bucketDate}:types`;
+export function getTongJiDayStartTimeForYmd(reportDate, timeZone = DEFAULT_TIME_ZONE) {
+    return getTongJiDayStartTime(findTimestampInDay(reportDate, normalizeTimeZone(timeZone)), timeZone);
 }
 
-export function getErrorStatsDayTypeCountKey(bucketDate, errorType) {
-    return `error:day:${bucketDate}:type:${encodeURIComponent(String(errorType || "unknown"))}:count`;
+export function getTongJiDateRangeList(startDateYmd, endDateYmd, timeZone = DEFAULT_TIME_ZONE) {
+    const zone = normalizeTimeZone(timeZone);
+    const startDayStart = getTongJiDayStartTimeForYmd(startDateYmd, zone);
+    const endDayStart = getTongJiDayStartTimeForYmd(endDateYmd, zone);
+    const list = [];
+
+    for (let t = startDayStart; t <= endDayStart; t += DAY_MS) {
+        list.push(getTongJiDateYmdNumber(t, zone));
+    }
+
+    return list;
 }

package/apis/tongJi/dailyReport.js

@@ -1,38 +1,9 @@
+import { Logger } from "#befly/lib/logger.js";
 import { isValidPositiveInt } from "#befly/utils/is.js";
 
-import { getDailyDateYmdNumber, getDailyStatsDayMembersKey, getDailyStatsDayProductMembersKey } from "./_daily.js";
-import { expireRedisKeys } from "./_tongJi.js";
+import { getTongJiDateYmdNumber } from "./_tongJi.js";
 
-const DAILY_STATS_REDIS_TTL_SECONDS = 90 * 24 * 60 * 60;
-
-function getDailyStatsMember(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 updateDailyStatsRedis(befly, reportDate, member, productCode) {
-    const dayKey = getDailyStatsDayMembersKey(reportDate);
-    const keys = [dayKey];
-
-    if (productCode) {
-        keys.push(getDailyStatsDayProductMembersKey(reportDate, productCode));
-    }
-
-    const results = await Promise.all(keys.map((key) => befly.redis.sadd(key, [member])));
-
-    await expireRedisKeys(befly, keys, DAILY_STATS_REDIS_TTL_SECONDS);
-
-    return results[0] > 0;
-}
+const DAILY_STATS_REDIS_TTL_SECONDS = 24 * 60 * 60;
 
 export default {
     name: "上报日在线统计",
@@ -40,37 +11,88 @@ export default {
     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 },
+        clientType: { name: "客户端类型", input: "enum", check: "browser|vscode|desktop|miniapp|app", min: 3, max: 20 },
         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 }
+        productVersion: { name: "产品版本", input: "string", min: 0, max: 50 },
+        clientVersion: { name: "客户端版本", input: "string", min: 0, max: 100 },
+        os: { name: "操作系统", input: "string", min: 0, max: 100 },
+        deviceId: { name: "设备标识", input: "string", min: 0, max: 120 },
+        brand: { name: "设备品牌", input: "string", min: 0, max: 100 },
+        model: { name: "设备型号", input: "string", min: 0, max: 100 },
+        system: { name: "系统", input: "string", min: 0, max: 100 }
     },
-    required: [],
+    required: ["clientType"],
     handler: async (befly, ctx) => {
-        const now = Date.now();
-        const timeZone = befly.config?.tz;
-        const reportDate = getDailyDateYmdNumber(now, timeZone);
-        const productCode = ctx?.body?.productCode ?? "";
+        const reportTime = Date.now();
+        const reportDate = getTongJiDateYmdNumber(reportTime, befly.config?.tz);
 
-        if (!befly.redis) {
-            return befly.tool.Yes("上报成功", {
-                reportTime: now,
-                reportDate: reportDate,
-                counted: false,
-                stored: false
-            });
+        const productCode = ctx.body?.productCode || "";
+
+        let memberMeta;
+
+        if (isValidPositiveInt(ctx?.userId)) {
+            memberMeta = { type: "user", value: `user:${ctx.userId}:${productCode}`, userId: ctx.userId };
+        } else {
+            const clientId = ctx.body?.clientId ?? "";
+
+            if (clientId) {
+                memberMeta = { type: "client", value: `client:${clientId}:${productCode}`, clientId: clientId };
+            } else {
+                memberMeta = { type: "ip", value: `ip:${ctx?.ip || "unknown"}:${productCode}`, ip: ctx?.ip || "unknown" };
+            }
+        }
+
+        let counted = false;
+
+        if (befly.redis) {
+            const key = `daily:day:${reportDate}:members:${productCode}`;
+            const added = await befly.redis.sadd(key, [memberMeta.value]);
+
+            if (added > 0) {
+                await befly.redis.expire(key, DAILY_STATS_REDIS_TTL_SECONDS);
+                counted = true;
+            }
         }
 
-        const counted = await updateDailyStatsRedis(befly, reportDate, getDailyStatsMember(ctx), productCode);
+        let stored = false;
+
+        if (counted && befly.mysql) {
+            const body = ctx.body || {};
+
+            const row = {
+                reportTime: reportTime,
+                reportDate: reportDate,
+                memberType: memberMeta.type,
+                member: memberMeta.value,
+                userId: memberMeta.userId || 0,
+                clientId: memberMeta.clientId || body.clientId || body.deviceId || "",
+                ip: ctx?.ip || "",
+                clientType: body.clientType,
+                productName: body.productName || "",
+                productCode: body.productCode || "",
+                productVersion: body.productVersion || "",
+                clientVersion: body.clientVersion || "",
+                os: body.os || "",
+                system: body.system || "",
+                brand: body.brand || "",
+                model: body.model || ""
+            };
+
+            try {
+                await befly.mysql.insData({ table: "beflyDailyReport", data: row });
+                stored = true;
+            } catch (error) {
+                Logger.error("daily_report 落盘失败", error);
+            }
+        }
 
         return befly.tool.Yes("上报成功", {
-            reportTime: now,
+            reportTime: reportTime,
             reportDate: reportDate,
             counted: counted,
-            stored: true
+            stored: stored
         });
     }
 };