befly 3.19.0 → 3.19.5

package/apis/tongJi/visitStats.js

@@ -0,0 +1,380 @@
+import { addDays, getDateYmdNumber, getTimeBucketStart } from "../../utils/datetime.js";
+import { VISIT_STATS_BUCKET_MS, VISIT_STATS_REDIS_TTL_SECONDS, VISIT_STATS_UA_FIELDS, getVisitStatsBucketKey, getVisitStatsBucketProductPvKey, getVisitStatsBucketProductUvKey, getVisitStatsDayKey, getVisitStatsDayProductKeysKey, getVisitStatsDayProductPvKey, getVisitStatsDayProductUvKey, getVisitStatsDayUaCountKey, getVisitStatsDayUaValuesKey, getVisitStatsProductMetaKey, normalizeVisitStatsUaValue, parseVisitStatsProductKey, toVisitStatsNumber } from "../../utils/visitStats.js";
+
+const VISIT_STATS_DAY_LIMIT = 30;
+
+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 - VISIT_STATS_BUCKET_MS);
+}
+
+async function getVisitStatsOnlineCount(befly) {
+    const members = await befly.redis.smembers("visitStats:online:visitors");
+    if (members.length === 0) {
+        return 0;
+    }
+
+    const existsList = await befly.redis.existsBatch(members.map((member) => `visitStats: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("visitStats:online:visitors", expiredMembers);
+    }
+
+    return onlineCount;
+}
+
+async function getVisitStatsUaFieldList(befly, bucketDate, field, defaultValue) {
+    const valuesKey = getVisitStatsDayUaValuesKey(bucketDate, field);
+    const values = await befly.redis.smembers(valuesKey);
+    const list = [];
+
+    for (const rawValue of values) {
+        const value = normalizeVisitStatsUaValue(rawValue, defaultValue);
+        const count = toVisitStatsNumber(await befly.redis.getString(getVisitStatsDayUaCountKey(bucketDate, field, value)));
+        if (count <= 0) {
+            continue;
+        }
+
+        list.push({
+            name: value,
+            count: count
+        });
+    }
+
+    list.sort((a, b) => {
+        if (b.count !== a.count) {
+            return b.count - a.count;
+        }
+
+        return String(a.name).localeCompare(String(b.name));
+    });
+
+    return list.slice(0, 10);
+}
+
+async function getVisitStatsUaStats(befly, bucketDate) {
+    const data = {};
+
+    for (const item of VISIT_STATS_UA_FIELDS) {
+        const field = item.field;
+        const defaultValue = item.defaultValue;
+        data[field] = await getVisitStatsUaFieldList(befly, bucketDate, field, defaultValue);
+    }
+
+    return {
+        deviceTypes: data.deviceType || [],
+        browsers: data.browserName || [],
+        browserVersions: data.browserVersion || [],
+        osList: data.osName || [],
+        osVersions: data.osVersion || [],
+        deviceVendors: data.deviceVendor || [],
+        deviceModels: data.deviceModel || [],
+        engines: data.engineName || [],
+        cpuArchitectures: data.cpuArchitecture || []
+    };
+}
+
+function getVisitStatsRecentDayList(now, limit = VISIT_STATS_DAY_LIMIT) {
+    const list = [];
+
+    for (let i = limit - 1; i >= 0; i--) {
+        list.push(getDateYmdNumber(addDays(now, -i)));
+    }
+
+    return list;
+}
+
+function getVisitStatsBucketList(bucketDate, currentBucketTime) {
+    const list = [];
+    let startBucketTime = currentBucketTime;
+
+    while (getDateYmdNumber(startBucketTime - VISIT_STATS_BUCKET_MS) === bucketDate) {
+        startBucketTime -= VISIT_STATS_BUCKET_MS;
+    }
+
+    for (let bucketTime = startBucketTime; bucketTime <= currentBucketTime; bucketTime += VISIT_STATS_BUCKET_MS) {
+        list.push(bucketTime);
+    }
+
+    return list;
+}
+
+async function getVisitStatsProductMeta(befly, productKey) {
+    const metaText = await befly.redis.getString(getVisitStatsProductMetaKey(productKey));
+
+    if (!metaText) {
+        return parseVisitStatsProductKey(productKey);
+    }
+
+    try {
+        const meta = JSON.parse(metaText);
+        return {
+            ...parseVisitStatsProductKey(productKey),
+            ...meta
+        };
+    } catch (_error) {
+        return parseVisitStatsProductKey(productKey);
+    }
+}
+
+async function getVisitStatsProducts(befly, now, bucketDate, currentBucketTime) {
+    const recentDayList = getVisitStatsRecentDayList(now);
+    const productKeySet = new Set();
+
+    for (const itemBucketDate of recentDayList) {
+        const productKeys = await befly.redis.smembers(getVisitStatsDayProductKeysKey(itemBucketDate));
+
+        for (const productKey of productKeys) {
+            if (productKey) {
+                productKeySet.add(productKey);
+            }
+        }
+    }
+
+    const bucketList = getVisitStatsBucketList(bucketDate, currentBucketTime);
+    const products = [];
+
+    for (const productKey of productKeySet) {
+        const meta = await getVisitStatsProductMeta(befly, productKey);
+        const trend = [];
+        const days = [];
+        let totalPv = 0;
+        let totalUv = 0;
+
+        for (const itemBucketTime of bucketList) {
+            trend.push({
+                bucketTime: itemBucketTime,
+                bucketDate: bucketDate,
+                pv: toVisitStatsNumber(await befly.redis.getString(getVisitStatsBucketProductPvKey(itemBucketTime, productKey))),
+                uv: await befly.redis.scard(getVisitStatsBucketProductUvKey(itemBucketTime, productKey))
+            });
+        }
+
+        for (const itemBucketDate of recentDayList) {
+            const pv = toVisitStatsNumber(await befly.redis.getString(getVisitStatsDayProductPvKey(itemBucketDate, productKey)));
+            const uv = await befly.redis.scard(getVisitStatsDayProductUvKey(itemBucketDate, productKey));
+
+            totalPv += pv;
+            totalUv += uv;
+            days.push({
+                bucketDate: itemBucketDate,
+                pv: pv,
+                uv: uv
+            });
+        }
+
+        products.push({
+            key: productKey,
+            productName: String(meta.productName || "Unknown"),
+            productCode: String(meta.productCode || "unknown"),
+            productVersion: String(meta.productVersion || "Unknown"),
+            today: days[days.length - 1] || {
+                bucketDate: bucketDate,
+                pv: 0,
+                uv: 0
+            },
+            trend: trend,
+            days: days,
+            totalPv: totalPv,
+            totalUv: totalUv
+        });
+    }
+
+    products.sort((a, b) => {
+        if (b.today.pv !== a.today.pv) {
+            return b.today.pv - a.today.pv;
+        }
+
+        if (b.totalPv !== a.totalPv) {
+            return b.totalPv - a.totalPv;
+        }
+
+        return `${a.productCode}|${a.productVersion}`.localeCompare(`${b.productCode}|${b.productVersion}`);
+    });
+
+    return products;
+}
+
+export default {
+    name: "获取访问统计",
+    method: "POST",
+    body: "none",
+    auth: true,
+    fields: {},
+    required: [],
+    handler: async (befly) => {
+        const now = Date.now();
+        await flushVisitStatsPreviousBucket(befly, now);
+        const tableReady = await ensureVisitStatsTableReady(befly);
+
+        const bucketTime = getTimeBucketStart(now, VISIT_STATS_BUCKET_MS);
+        const bucketDate = getDateYmdNumber(now);
+        const bucketKey = getVisitStatsBucketKey(bucketTime);
+        const dayKey = getVisitStatsDayKey(bucketDate);
+
+        const todayPv = toVisitStatsNumber(await befly.redis.getString(`${dayKey}:pv`));
+        const todayUv = await befly.redis.scard(`${dayKey}:uv`);
+        const trend = [];
+        const currentPv = toVisitStatsNumber(await befly.redis.getString(`${bucketKey}:pv`));
+        const currentUv = await befly.redis.scard(`${bucketKey}:uv`);
+
+        if (tableReady) {
+            const trendResult = await befly.mysql.getAll({
+                table: "beflyVisitStats",
+                where: { bucketDate: bucketDate },
+                orderBy: ["bucketTime#ASC"]
+            });
+
+            if (Array.isArray(trendResult.data?.lists)) {
+                trend.push(...trendResult.data.lists);
+            }
+        }
+
+        if (currentPv > 0 || currentUv > 0) {
+            trend.push({
+                bucketTime: bucketTime,
+                bucketDate: bucketDate,
+                pv: currentPv,
+                uv: currentUv,
+                errorCount: 0,
+                durationSum: 0,
+                durationCount: 0,
+                avgDuration: 0
+            });
+        }
+
+        const daysMap = new Map();
+
+        if (tableReady) {
+            const daysSqlRes = await befly.mysql.execute(`SELECT bucket_date as bucketDate, SUM(pv) as pv, SUM(uv) as uv FROM befly_visit_stats WHERE state = 1 GROUP BY bucket_date ORDER BY bucket_date DESC LIMIT ${VISIT_STATS_DAY_LIMIT}`, []);
+
+            for (const item of daysSqlRes.data || []) {
+                const itemBucketDate = toVisitStatsNumber(item.bucketDate);
+                daysMap.set(itemBucketDate, {
+                    bucketDate: itemBucketDate,
+                    pv: toVisitStatsNumber(item.pv),
+                    uv: toVisitStatsNumber(item.uv)
+                });
+            }
+        }
+
+        daysMap.set(bucketDate, {
+            bucketDate: bucketDate,
+            pv: todayPv,
+            uv: todayUv
+        });
+
+        const days = [];
+        for (const item of daysMap.values()) {
+            days.push(item);
+        }
+
+        days.sort((a, b) => a.bucketDate - b.bucketDate);
+        if (days.length > VISIT_STATS_DAY_LIMIT) {
+            days.splice(0, days.length - VISIT_STATS_DAY_LIMIT);
+        }
+
+        const onlineCount = await getVisitStatsOnlineCount(befly);
+        const uaStats = await getVisitStatsUaStats(befly, bucketDate);
+        const products = await getVisitStatsProducts(befly, now, bucketDate, bucketTime);
+        return befly.tool.Yes("获取成功", {
+            onlineCount: onlineCount,
+            today: {
+                bucketDate: bucketDate,
+                pv: todayPv,
+                uv: todayUv
+            },
+            trend: trend,
+            days: days,
+            uaStats: uaStats,
+            products: products
+        });
+    }
+};

package/checks/config.js

@@ -20,6 +20,7 @@ const configSchema = z
         devPassword: z.string().min(6),
         bodyLimit: z.int().min(1),
         tz: z.string().refine((value) => isValidTimeZone(value), "无效的时区"),
+        publicDir: noTrimString.min(1),
 
         logger: z
             .object({

package/configs/beflyConfig.json

@@ -7,6 +7,7 @@
     "devPassword": "111111",
     "bodyLimit": 1048576,
     "tz": "Asia/Shanghai",
+    "publicDir": "./public",
 
     "logger": {
         "debug": 1,

package/configs/beflyMenus.json

@@ -65,20 +65,30 @@
         "path": "/log",
         "sort": 9003,
         "children": [
+            {
+                "name": "访问统计",
+                "path": "/visit",
+                "sort": 1
+            },
             {
                 "name": "登录日志",
                 "path": "/login",
-                "sort": 1
+                "sort": 2
             },
             {
                 "name": "邮件日志",
                 "path": "/email",
-                "sort": 2
+                "sort": 3
             },
             {
                 "name": "操作日志",
                 "path": "/operate",
-                "sort": 3
+                "sort": 4
+            },
+            {
+                "name": "错误报告",
+                "path": "/error",
+                "sort": 5
             }
         ]
     }

package/index.js

@@ -202,7 +202,7 @@ export class Befly {
 
             // 启动 HTTP服务器
             const apiFetch = apiHandler(this.apis, this.hooks, this.context);
-            const staticFetch = staticHandler(this.context.config.cors);
+            const staticFetch = staticHandler(this.context.config.cors, this.context.config.publicDir);
 
             const server = Bun.serve({
                 port: this.context.config.appPort || 3000,

package/lib/logger.js

@@ -6,7 +6,7 @@ import { createWriteStream, existsSync, mkdirSync } from "node:fs";
 import { stat } from "node:fs/promises";
 import { join as nodePathJoin, resolve as nodePathResolve } from "node:path";
 
-import { formatYmdHms } from "../utils/formatYmdHms.js";
+import { formatYmdHms } from "../utils/datetime.js";
 import { buildSensitiveKeyMatcher, sanitizeLogObject } from "../utils/loggerUtils.js";
 import { isFiniteNumber, isNumber, isPlainObject, isString } from "../utils/is.js";
 import { normalizePositiveInt } from "../utils/util.js";
@@ -236,7 +236,7 @@ class LogFileSink {
     }
 
     async ensureStreamReady(nextChunkBytes) {
-        const date = formatYmdHms(Reflect.construct(Date, []), "date");
+        const date = formatYmdHms(Date.now(), "date");
 
         // 日期变化：切新文件
         if (this.stream && this.streamDate && date !== this.streamDate) {
@@ -403,7 +403,7 @@ export function setMockLogger(mock) {
 function buildJsonLine(level, timeMs, record) {
     const base = {
         level: level,
-        time: formatYmdHms(Reflect.construct(Date, [timeMs])),
+        time: formatYmdHms(timeMs),
         pid: process.pid
     };
 

package/lib/redisHelper.js

@@ -169,6 +169,22 @@ export class RedisHelper {
         }
     }
 
+    /**
+     * 原子按指定值自增
+     * @param key - 键名
+     * @param value - 自增值
+     * @returns 自增后的值
+     */
+    async incrBy(key, value) {
+        try {
+            const pkey = `${this.prefix}${key}`;
+            return await this.client.incrby(pkey, value);
+        } catch (error) {
+            Logger.error("Redis incrBy 错误", error);
+            return 0;
+        }
+    }
+
     /**
      * 原子自增并在首次自增时设置过期时间（常用于限流/计数）
      * @param key - 键名
@@ -305,6 +321,28 @@ export class RedisHelper {
         }
     }
 
+    /**
+     * 从 Set 中删除一个或多个成员
+     * @param key - 键名
+     * @param members - 成员数组
+     * @returns 删除的成员数量
+     */
+    async srem(key, members) {
+        try {
+            if (members.length === 0) return 0;
+
+            const pkey = `${this.prefix}${key}`;
+            const args = [pkey];
+            for (const member of members) {
+                args.push(member);
+            }
+            return await this.client.srem.apply(this.client, args);
+        } catch (error) {
+            Logger.error("Redis srem 错误", error);
+            return 0;
+        }
+    }
+
     /**
      * 批量向多个 Set 添加成员（利用 Bun Redis 自动管道优化）
      * @param items - [{ key, members }] 数组

package/lib/sqlBuilder/compiler.js

@@ -48,15 +48,6 @@ export function compileSelect(model, quoteIdent) {
         }
     }
 
-    if (model.groupBy.length > 0) {
-        const groupSql = model.groupBy.map((field) => escapeField(field, quoteIdent)).join(", ");
-        sql += ` GROUP BY ${groupSql}`;
-    }
-
-    if (model.having.length > 0) {
-        sql += ` HAVING ${model.having.join(" AND ")}`;
-    }
-
     if (model.orderBy.length > 0) {
         const orderSql = model.orderBy
             .map((item) => {

package/lib/sqlBuilder/index.js

@@ -4,7 +4,7 @@
  */
 
 import { resolveQuoteIdent, normalizeLimitValue, normalizeOffsetValue } from "./util.js";
-import { appendGroupByItems, appendHavingItems, appendJoinItem, appendOrderByItems, appendSelectItems, appendSelectRaw, appendWhereInput, appendWhereRaw, createWhereRoot, setFromValue } from "./parser.js";
+import { appendJoinItem, appendOrderByItems, appendSelectItems, appendSelectRaw, appendWhereInput, appendWhereRaw, createWhereRoot, setFromValue } from "./parser.js";
 import { compileCount, compileDelete, compileInsert, compileSelect, compileUpdate, compileWhere } from "./compiler.js";
 import { toDeleteInSql, toUpdateCaseByIdSql } from "./batch.js";
 
@@ -15,8 +15,6 @@ function createModel() {
         where: createWhereRoot(),
         joins: [],
         orderBy: [],
-        groupBy: [],
-        having: [],
         limit: null,
         offset: null
     };
@@ -131,22 +129,6 @@ export class SqlBuilder {
         return this;
     }
 
-    /**
-     * GROUP BY
-     */
-    groupBy(field) {
-        appendGroupByItems(this._model.groupBy, field);
-        return this;
-    }
-
-    /**
-     * HAVING
-     */
-    having(condition) {
-        appendHavingItems(this._model.having, condition);
-        return this;
-    }
-
     /**
      * LIMIT
      */

package/lib/sqlBuilder/parser.js

@@ -105,27 +105,6 @@ export function appendOrderByItems(list, fields) {
     }
 }
 
-export function appendGroupByItems(list, field) {
-    if (Array.isArray(field)) {
-        for (const item of field) {
-            if (isString(item)) {
-                list.push(item);
-            }
-        }
-        return;
-    }
-
-    if (isString(field)) {
-        list.push(field);
-    }
-}
-
-export function appendHavingItems(list, condition) {
-    if (isString(condition)) {
-        list.push(condition);
-    }
-}
-
 export function appendWhereInput(root, conditionOrField, value) {
     if (conditionOrField && typeof conditionOrField === "object" && !Array.isArray(conditionOrField)) {
         const node = parseWhereObject(conditionOrField);

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "befly",
-    "version": "3.19.0",
-    "gitHead": "ccc66d5da9c6b84f8346087adc1d24412ce65bec",
+    "version": "3.19.5",
+    "gitHead": "ba7fa7cc0534c48de2df4970d69a14853cf6b2a6",
     "private": false,
     "description": "Befly - 为 Bun 专属打造的 JavaScript API 接口框架核心引擎",
     "keywords": [
@@ -52,8 +52,8 @@
         "test": "bun test"
     },
     "dependencies": {
-        "fast-xml-parser": "^5.4.2",
-        "nodemailer": "^8.0.1",
+        "fast-xml-parser": "^5.5.4",
+        "nodemailer": "^8.0.2",
         "pathe": "^2.0.3",
         "ua-parser-js": "^2.0.9",
         "zod": "^4.0.0"

package/paths.js

@@ -12,7 +12,7 @@
 
 import { fileURLToPath } from "node:url";
 
-import { dirname, join, normalize } from "pathe";
+import { dirname, isAbsolute, join, normalize, resolve } from "pathe";
 
 // 当前文件的路径信息
 const __filename = fileURLToPath(import.meta.url);
@@ -110,3 +110,16 @@ export const appApiDir = join(appDir, "apis");
  * @usage 存放用户业务表定义（JSON 格式）
  */
 export const appTableDir = join(appDir, "tables");
+
+/**
+ * 项目公共静态目录
+ * @description 默认 {appDir}/public，可通过 config.publicDir 覆盖
+ * @usage 用于静态文件访问与本地上传保存目录解析
+ */
+export function getAppPublicDir(publicDir = "./public") {
+    if (isAbsolute(publicDir)) {
+        return resolve(publicDir);
+    }
+
+    return resolve(appDir, publicDir);
+}

package/router/static.js

@@ -8,19 +8,19 @@ import { join } from "pathe";
 
 import { Logger } from "../lib/logger.js";
 // 相对导入
-import { appDir } from "../paths.js";
+import { getAppPublicDir } from "../paths.js";
 import { setCorsOptions } from "../utils/cors.js";
 
 /**
  * 静态文件处理器工厂
  */
-export function staticHandler(corsConfig = undefined) {
+export function staticHandler(corsConfig = undefined, publicDir = "./public") {
     return async (req) => {
         // 设置 CORS 响应头
         const corsHeaders = setCorsOptions(req, corsConfig);
 
         const url = new URL(req.url);
-        const filePath = join(appDir, "public", url.pathname);
+        const filePath = join(getAppPublicDir(publicDir), url.pathname);
 
         try {
             // OPTIONS预检请求