befly-admin 3.14.6 → 3.14.7

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "befly-admin",
-    "version": "3.14.6",
-    "gitHead": "84b6e4e0adde7f566cfc890887b024ccf10b0516",
+    "version": "3.14.7",
+    "gitHead": "c47d1e515dabe142531e0a8415979cccb2729259",
     "private": false,
     "description": "Befly Admin - 基于 Vue3 + TDesign Vue Next 的后台管理系统",
     "files": [
@@ -28,7 +28,7 @@
         "preview": "bunx --bun vite preview"
     },
     "dependencies": {
-        "befly-admin-ui": "^1.8.33",
+        "befly-admin-ui": "^1.8.34",
         "befly-shared": "2.0.3",
         "befly-vite": "^1.5.15",
         "pinia": "^3.0.4",

package/src/main.js

@@ -13,7 +13,6 @@ app.use(createPinia());
 
 // 使用路由
 app.use($Router);
-
-setupErrorReport(app);
+setupReport(app);
 
 app.mount("#app");

package/src/plugins/{errorReport.js → report.js}

@@ -1,9 +1,32 @@
+import { $Config } from "@/plugins/config.js";
+import { $Http } from "@/plugins/http.js";
+import { $Router } from "@/plugins/router.js";
+
+const ONLINE_REPORT_MIN_GAP = 15 * 1000;
+const ONLINE_REPORT_HEARTBEAT_INTERVAL = 60 * 1000;
+const ERROR_REPORT_DEDUP_GAP = 3000;
+
+let onlineReportHeartbeatStarted = false;
+let lastOnlineReportTime = 0;
+let onlineReportTimeoutId = 0;
+let routeReportBound = false;
 let isReportingError = false;
 let lastErrorKey = "";
 let lastErrorTime = 0;
 let fetchWrapped = false;
 
-function getRouteInfo() {
+function getRouteReportData(route) {
+    return {
+        pagePath: route?.fullPath || route?.path || "",
+        pageName: String(route?.name || route?.meta?.title || route?.path || ""),
+        source: "admin",
+        productName: $Config.productName,
+        productCode: $Config.productCode,
+        productVersion: $Config.productVersion
+    };
+}
+
+function getCurrentRouteInfo() {
     const currentRoute = $Router.currentRoute.value || {};
 
     return {
@@ -12,6 +35,92 @@ function getRouteInfo() {
     };
 }
 
+function reportOnline(route) {
+    return $Http("/core/tongJi/onlineReport", getRouteReportData(route), [""]);
+}
+
+function reportInfo(route) {
+    return $Http("/core/tongJi/infoReport", getRouteReportData(route), [""]);
+}
+
+function triggerActiveOnlineReport(force = false) {
+    if (typeof document === "undefined") {
+        return;
+    }
+
+    if (document.visibilityState !== "visible") {
+        return;
+    }
+
+    if (typeof document.hasFocus === "function" && document.hasFocus() !== true) {
+        return;
+    }
+
+    const now = Date.now();
+
+    if (!force && now - lastOnlineReportTime < ONLINE_REPORT_MIN_GAP) {
+        return;
+    }
+
+    lastOnlineReportTime = now;
+
+    const currentRoute = $Router.currentRoute.value;
+
+    void reportOnline(currentRoute).catch(() => {
+        // 静默失败：不阻断页面交互
+    });
+}
+
+function queueOnlineReportHeartbeat() {
+    if (typeof window === "undefined") {
+        return;
+    }
+
+    if (onlineReportTimeoutId) {
+        window.clearTimeout(onlineReportTimeoutId);
+    }
+
+    onlineReportTimeoutId = window.setTimeout(() => {
+        triggerActiveOnlineReport();
+        queueOnlineReportHeartbeat();
+    }, ONLINE_REPORT_HEARTBEAT_INTERVAL);
+}
+
+function setupOnlineReportHeartbeat() {
+    if (onlineReportHeartbeatStarted || typeof window === "undefined") {
+        return;
+    }
+
+    onlineReportHeartbeatStarted = true;
+
+    window.addEventListener("focus", () => {
+        triggerActiveOnlineReport();
+    });
+
+    document.addEventListener("visibilitychange", () => {
+        triggerActiveOnlineReport();
+    });
+
+    triggerActiveOnlineReport(true);
+    queueOnlineReportHeartbeat();
+}
+
+function bindRouteReport() {
+    if (routeReportBound) {
+        return;
+    }
+
+    routeReportBound = true;
+
+    $Router.afterEach((to) => {
+        lastOnlineReportTime = Date.now();
+
+        void Promise.allSettled([reportOnline(to), reportInfo(to)]).catch(() => {
+            // 静默失败：不阻断路由切换
+        });
+    });
+}
+
 function getErrorMessage(error) {
     if (typeof error === "string") {
         return error;
@@ -47,7 +156,8 @@ function getErrorDetail(error) {
 function shouldSkipError(message, detail, errorType) {
     const now = Date.now();
     const key = `${errorType}|${message}|${detail}`;
-    if (key === lastErrorKey && now - lastErrorTime < 3000) {
+
+    if (key === lastErrorKey && now - lastErrorTime < ERROR_REPORT_DEDUP_GAP) {
         return true;
     }
 
@@ -57,8 +167,9 @@ function shouldSkipError(message, detail, errorType) {
 }
 
 export function reportClientError(errorType, message, detail) {
-    const safeMessage = String(message || "未知错误").slice(0, 500);
-    const safeDetail = String(detail || "").slice(0, 5000);
+    const safeMessage = String(message || "未知错误");
+    const safeDetail = String(detail || "");
+
     if (shouldSkipError(safeMessage, safeDetail, errorType)) {
         return;
     }
@@ -67,7 +178,7 @@ export function reportClientError(errorType, message, detail) {
         return;
     }
 
-    const routeInfo = getRouteInfo();
+    const routeInfo = getCurrentRouteInfo();
     isReportingError = true;
 
     void $Http(
@@ -172,6 +283,7 @@ function setupFetchErrorReport() {
                 }
 
                 const errorDetail = getErrorDetail(error);
+
                 if (errorDetail) {
                     parts.push(`detail: ${errorDetail}`);
                 }
@@ -186,7 +298,7 @@ function setupFetchErrorReport() {
     fetchWrapped = true;
 }
 
-export function setupErrorReport(app) {
+function setupErrorReport(app) {
     setupFetchErrorReport();
 
     app.config.errorHandler = (error, _instance, info) => {
@@ -222,13 +334,17 @@ export function setupErrorReport(app) {
             }
 
             const parts = [];
+
             if (event.filename) {
                 parts.push(`file: ${event.filename}`);
             }
+
             if (event.lineno || event.colno) {
                 parts.push(`line: ${event.lineno || 0}, col: ${event.colno || 0}`);
             }
+
             const stack = getErrorDetail(event.error);
+
             if (stack) {
                 parts.push(stack);
             }
@@ -248,3 +364,9 @@ export function setupErrorReport(app) {
         reportClientError("router", getErrorMessage(error), getErrorDetail(error));
     });
 }
+
+export function setupReport(app) {
+    bindRouteReport();
+    setupOnlineReportHeartbeat();
+    setupErrorReport(app);
+}

package/src/plugins/router.js

@@ -2,7 +2,6 @@ import { Layouts } from "befly-vite";
 import { createRouter, createWebHashHistory } from "vue-router";
 import { routes } from "vue-router/auto-routes";
 import { $Config } from "@/plugins/config.js";
-import { $Http } from "@/plugins/http.js";
 
 // 应用自定义布局系统（同时可选注入根路径重定向）
 const finalRoutes = Layouts(routes, $Config.homePath, (layoutName) => {
@@ -53,35 +52,3 @@ $Router.beforeEach((to, _from) => {
 
     return true;
 });
-
-// 路由就绪后处理
-$Router.afterEach((to) => {
-    void Promise.allSettled([
-        $Http(
-            "/core/tongJi/onlineReport",
-            {
-                pagePath: to.fullPath || to.path || "",
-                pageName: String(to.name || to.meta?.title || to.path || ""),
-                source: "admin",
-                productName: $Config.productName,
-                productCode: $Config.productCode,
-                productVersion: $Config.productVersion
-            },
-            [""]
-        ),
-        $Http(
-            "/core/tongJi/infoReport",
-            {
-                pagePath: to.fullPath || to.path || "",
-                pageName: String(to.name || to.meta?.title || to.path || ""),
-                source: "admin",
-                productName: $Config.productName,
-                productCode: $Config.productCode,
-                productVersion: $Config.productVersion
-            },
-            [""]
-        )
-    ]).catch(() => {
-        // 静默失败：不阻断路由切换
-    });
-});