befly-admin 3.14.5 → 3.14.7

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "befly-admin",
-    "version": "3.14.5",
-    "gitHead": "ba7fa7cc0534c48de2df4970d69a14853cf6b2a6",
+    "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.32",
+        "befly-admin-ui": "^1.8.34",
         "befly-shared": "2.0.3",
         "befly-vite": "^1.5.15",
         "pinia": "^3.0.4",

package/src/main.js

@@ -5,7 +5,6 @@ import "befly-admin-ui/styles/variables.scss";
 // 引入全局基础样式（reset、通用类、滚动条等）
 import "@/styles/global.scss";
 import App from "./App.vue";
-import { setupErrorReport } from "@/plugins/errorReport.js";
 
 const app = createApp(App);
 
@@ -14,7 +13,6 @@ app.use(createPinia());
 
 // 使用路由
 app.use($Router);
-
-setupErrorReport(app);
+setupReport(app);
 
 app.mount("#app");

package/src/plugins/report.js

@@ -0,0 +1,372 @@
+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 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 {
+        pagePath: String(currentRoute.fullPath || currentRoute.path || window.location.hash || window.location.pathname || ""),
+        pageName: String(currentRoute.name || currentRoute.meta?.title || currentRoute.path || document.title || "")
+    };
+}
+
+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;
+    }
+
+    if (error && typeof error.message === "string") {
+        return error.message;
+    }
+
+    return "未知错误";
+}
+
+function getErrorDetail(error) {
+    if (!error) {
+        return "";
+    }
+
+    if (typeof error === "string") {
+        return error;
+    }
+
+    if (typeof error.stack === "string" && error.stack) {
+        return error.stack;
+    }
+
+    try {
+        return JSON.stringify(error);
+    } catch {
+        return String(error);
+    }
+}
+
+function shouldSkipError(message, detail, errorType) {
+    const now = Date.now();
+    const key = `${errorType}|${message}|${detail}`;
+
+    if (key === lastErrorKey && now - lastErrorTime < ERROR_REPORT_DEDUP_GAP) {
+        return true;
+    }
+
+    lastErrorKey = key;
+    lastErrorTime = now;
+    return false;
+}
+
+export function reportClientError(errorType, message, detail) {
+    const safeMessage = String(message || "未知错误");
+    const safeDetail = String(detail || "");
+
+    if (shouldSkipError(safeMessage, safeDetail, errorType)) {
+        return;
+    }
+
+    if (isReportingError) {
+        return;
+    }
+
+    const routeInfo = getCurrentRouteInfo();
+    isReportingError = true;
+
+    void $Http(
+        "/core/tongJi/errorReport",
+        {
+            pagePath: routeInfo.pagePath,
+            pageName: routeInfo.pageName,
+            source: "admin",
+            productName: $Config.productName,
+            productCode: $Config.productCode,
+            productVersion: $Config.productVersion,
+            errorType: String(errorType || "unknown"),
+            message: safeMessage,
+            detail: safeDetail
+        },
+        [""]
+    )
+        .catch(() => {
+            // 静默失败：避免错误上报再次制造错误
+        })
+        .finally(() => {
+            isReportingError = false;
+        });
+}
+
+function setupFetchErrorReport() {
+    if (fetchWrapped) {
+        return;
+    }
+
+    if (typeof window.fetch !== "function") {
+        return;
+    }
+
+    const originalFetch = window.fetch.bind(window);
+
+    window.fetch = async (...args) => {
+        const input = args[0];
+        const url = typeof input === "string" ? input : input && typeof input.url === "string" ? input.url : "";
+        const apiPath = String($Config.apiPath || "");
+        const isApiRequest = Boolean(apiPath) && String(url || "").startsWith(apiPath);
+        const isErrorReportRequest = String(url || "").includes("/core/tongJi/errorReport");
+
+        try {
+            const response = await originalFetch(...args);
+
+            if (isApiRequest && !isErrorReportRequest) {
+                if (!response.ok) {
+                    const parts = [];
+
+                    if (url) {
+                        parts.push(`url: ${url}`);
+                    }
+
+                    if (response.status) {
+                        parts.push(`status: ${response.status}`);
+                    }
+
+                    reportClientError("http", `请求失败：HTTP ${response.status}`, parts.join("\n"));
+                } else {
+                    try {
+                        const payload = await response.clone().json();
+
+                        if (payload?.code !== 0) {
+                            const parts = [];
+
+                            if (url) {
+                                parts.push(`url: ${url}`);
+                            }
+
+                            if (response.status) {
+                                parts.push(`status: ${response.status}`);
+                            }
+
+                            if (payload?.code !== undefined) {
+                                parts.push(`code: ${payload.code}`);
+                            }
+
+                            if (payload?.msg) {
+                                parts.push(`msg: ${payload.msg}`);
+                            }
+
+                            if (payload?.detail) {
+                                parts.push(`detail: ${payload.detail}`);
+                            }
+
+                            reportClientError("http", payload.msg || "请求失败", parts.join("\n"));
+                        }
+                    } catch {
+                        // 忽略非 JSON 响应
+                    }
+                }
+            }
+
+            return response;
+        } catch (error) {
+            if (isApiRequest && !isErrorReportRequest) {
+                const parts = [];
+
+                if (url) {
+                    parts.push(`url: ${url}`);
+                }
+
+                const errorDetail = getErrorDetail(error);
+
+                if (errorDetail) {
+                    parts.push(`detail: ${errorDetail}`);
+                }
+
+                reportClientError("http", getErrorMessage(error), parts.join("\n"));
+            }
+
+            throw error;
+        }
+    };
+
+    fetchWrapped = true;
+}
+
+function setupErrorReport(app) {
+    setupFetchErrorReport();
+
+    app.config.errorHandler = (error, _instance, info) => {
+        const message = getErrorMessage(error);
+        const detail = `${String(info || "")}${info ? "\n" : ""}${getErrorDetail(error)}`;
+
+        reportClientError("vue", message, detail);
+    };
+
+    window.addEventListener(
+        "error",
+        (event) => {
+            const target = event.target;
+
+            if (target && target !== window) {
+                const resourceName = target.tagName ? `${String(target.tagName).toLowerCase()} 资源加载失败` : "资源加载失败";
+                const parts = [];
+
+                if (target?.tagName) {
+                    parts.push(`tag: ${String(target.tagName).toLowerCase()}`);
+                }
+
+                if (target?.src) {
+                    parts.push(`src: ${target.src}`);
+                }
+
+                if (target?.href) {
+                    parts.push(`href: ${target.href}`);
+                }
+
+                reportClientError("resource", resourceName, parts.join("\n"));
+                return;
+            }
+
+            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);
+            }
+
+            reportClientError("window", getErrorMessage(event.message || event.error), parts.join("\n"));
+        },
+        true
+    );
+
+    window.addEventListener("unhandledrejection", (event) => {
+        const reason = event.reason;
+
+        reportClientError("promise", getErrorMessage(reason), getErrorDetail(reason));
+    });
+
+    $Router.onError((error) => {
+        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,21 +52,3 @@ $Router.beforeEach((to, _from) => {
 
     return true;
 });
-
-// 路由就绪后处理
-$Router.afterEach((to) => {
-    void $Http(
-        "/core/tongJi/visitReport",
-        {
-            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(() => {
-        // 静默失败：不阻断路由切换
-    });
-});

package/src/plugins/errorReport.js

@@ -1,128 +0,0 @@
-import { $Http } from "@/plugins/http.js";
-import { $Config } from "@/plugins/config.js";
-import { $Router } from "@/plugins/router.js";
-
-let isReportingError = false;
-let lastErrorKey = "";
-let lastErrorTime = 0;
-
-function getRouteInfo() {
-    const currentRoute = $Router.currentRoute.value || {};
-
-    return {
-        pagePath: String(currentRoute.fullPath || currentRoute.path || window.location.hash || window.location.pathname || ""),
-        pageName: String(currentRoute.name || currentRoute.meta?.title || currentRoute.path || document.title || "")
-    };
-}
-
-function getErrorMessage(error) {
-    if (typeof error === "string") {
-        return error;
-    }
-
-    if (error && typeof error.message === "string") {
-        return error.message;
-    }
-
-    return "未知错误";
-}
-
-function getErrorDetail(error) {
-    if (!error) {
-        return "";
-    }
-
-    if (typeof error === "string") {
-        return error;
-    }
-
-    if (typeof error.stack === "string" && error.stack) {
-        return error.stack;
-    }
-
-    try {
-        return JSON.stringify(error);
-    } catch {
-        return String(error);
-    }
-}
-
-function shouldSkipError(message, detail, errorType) {
-    const now = Date.now();
-    const key = `${errorType}|${message}|${detail}`;
-    if (key === lastErrorKey && now - lastErrorTime < 3000) {
-        return true;
-    }
-
-    lastErrorKey = key;
-    lastErrorTime = now;
-    return false;
-}
-
-function reportClientError(errorType, message, detail) {
-    const safeMessage = String(message || "未知错误").slice(0, 500);
-    const safeDetail = String(detail || "").slice(0, 5000);
-    if (shouldSkipError(safeMessage, safeDetail, errorType)) {
-        return;
-    }
-
-    if (isReportingError) {
-        return;
-    }
-
-    const routeInfo = getRouteInfo();
-    isReportingError = true;
-
-    void $Http(
-        "/core/tongJi/errorReport",
-        {
-            pagePath: routeInfo.pagePath,
-            pageName: routeInfo.pageName,
-            source: "admin",
-            productName: $Config.productName,
-            productCode: $Config.productCode,
-            productVersion: $Config.productVersion,
-            errorType: String(errorType || "unknown"),
-            message: safeMessage,
-            detail: safeDetail
-        },
-        [""]
-    )
-        .catch(() => {
-            // 静默失败：避免错误上报再次制造错误
-        })
-        .finally(() => {
-            isReportingError = false;
-        });
-}
-
-export function setupErrorReport(app) {
-    app.config.errorHandler = (error, _instance, info) => {
-        const message = getErrorMessage(error);
-        const detail = `${String(info || "")}${info ? "\n" : ""}${getErrorDetail(error)}`;
-
-        reportClientError("vue", message, detail);
-    };
-
-    window.addEventListener("error", (event) => {
-        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);
-        }
-
-        reportClientError("window", getErrorMessage(event.message || event.error), parts.join("\n"));
-    });
-
-    window.addEventListener("unhandledrejection", (event) => {
-        const reason = event.reason;
-
-        reportClientError("promise", getErrorMessage(reason), getErrorDetail(reason));
-    });
-}