befly-shared 2.28.0 → 2.30.0

package/internal/reportUtil.js

@@ -7,10 +7,7 @@ async function returnPayload(payload) {
 export function assertReportRequest(options, operation) {
     if (!options || (typeof options.request !== "function" && typeof options.apiPath !== "string")) {
         throw new Error(`${operation}.options 必须提供 request 函数或 apiPath 字符串`, {
-            cause: null,
-            code: "validation",
-            subsystem: "shared",
-            operation: operation
+            cause: { code: "validation", subsystem: "shared", operation: operation }
         });
     }
 }
@@ -34,9 +31,9 @@ export function copyReportData(target, source) {
         return;
     }
 
-    for (const key of Object.keys(source)) {
-        if (source[key] !== undefined) {
-            target[key] = source[key];
+    for (const [key, value] of Object.entries(source)) {
+        if (value !== undefined) {
+            target[key] = value;
         }
     }
 }
@@ -68,16 +65,8 @@ export function getRouteReportData(route) {
 
 export function getCurrentRouterData(router) {
     const currentRoute = router?.currentRoute?.value || {};
-    let fallbackPath = "";
-    let fallbackTitle = "";
-
-    if (typeof globalThis.window !== "undefined") {
-        fallbackPath = globalThis.window.location.hash || globalThis.window.location.pathname || "";
-    }
-
-    if (typeof globalThis.document !== "undefined") {
-        fallbackTitle = globalThis.document.title || "";
-    }
+    const fallbackPath = typeof globalThis.window !== "undefined" ? globalThis.window.location.hash || globalThis.window.location.pathname || "" : "";
+    const fallbackTitle = typeof globalThis.document !== "undefined" ? globalThis.document.title || "" : "";
 
     return {
         pagePath: String(currentRoute.fullPath || currentRoute.path || fallbackPath),

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly-shared",
-    "version": "2.28.0",
+    "version": "2.30.0",
     "gitHead": "70c48ac058875255ac8b54c5f4b5987b997c3bfd",
     "private": false,
     "description": "Befly Shared - 通用工具函数库",

package/utils/{onlineReport.js → dailyReport.js}

@@ -1,11 +1,11 @@
 import { appendPageAndExtraData, createCommonReportData, getReportRequest } from "../internal/reportUtil.js";
 
-const ONLINE_REPORT_PATH = "/core/tongJi/onlineReport";
-const ONLINE_REPORT_MIN_GAP = 15 * 1000;
-const ONLINE_REPORT_HEARTBEAT_INTERVAL = 60 * 1000;
-const ONLINE_REPORT_CLIENT_ID_KEY = "befly-online-client-id";
+const DAILY_REPORT_PATH = "/core/tongJi/dailyReport";
+const DAILY_REPORT_MIN_GAP = 15 * 1000;
+const DAILY_REPORT_HEARTBEAT_INTERVAL = 10 * 60 * 1000;
+const DAILY_REPORT_CLIENT_ID_KEY = "befly-daily-client-id";
 
-function generateOnlineClientId() {
+function generateDailyClientId() {
     return `${Date.now()}-${Math.random().toString(16).slice(2)}`;
 }
 
@@ -48,8 +48,8 @@ function isDocumentActive() {
     return true;
 }
 
-export function createOnlineReport(options) {
-    const request = getReportRequest(options, "createOnlineReport");
+export function createDailyReport(options) {
+    const request = getReportRequest(options, "createDailyReport");
 
     let heartbeatStarted = false;
     let lastReportTime = 0;
@@ -60,13 +60,13 @@ export function createOnlineReport(options) {
             return String(options.getClientId() || "");
         }
 
-        const storedClientId = readStoredClientId(ONLINE_REPORT_CLIENT_ID_KEY);
+        const storedClientId = readStoredClientId(DAILY_REPORT_CLIENT_ID_KEY);
         if (storedClientId) {
             return storedClientId;
         }
 
-        const clientId = generateOnlineClientId();
-        writeStoredClientId(ONLINE_REPORT_CLIENT_ID_KEY, clientId);
+        const clientId = generateDailyClientId();
+        writeStoredClientId(DAILY_REPORT_CLIENT_ID_KEY, clientId);
         return clientId;
     }
 
@@ -88,29 +88,29 @@ export function createOnlineReport(options) {
         clearHeartbeatTimer();
 
         timeoutId = globalThis.setTimeout(() => {
-            void triggerOnlineReport();
+            void triggerDailyReport();
             queueHeartbeat();
-        }, ONLINE_REPORT_HEARTBEAT_INTERVAL);
+        }, DAILY_REPORT_HEARTBEAT_INTERVAL);
     }
 
-    async function reportOnline(extraData = {}) {
-        lastReportTime = Date.now();
-        return request(ONLINE_REPORT_PATH, buildReportData(options, getClientId(), extraData));
+    async function reportDaily(extraData = {}) {
+        return request(DAILY_REPORT_PATH, buildReportData(options, getClientId(), extraData));
     }
 
-    async function triggerOnlineReport(force = false, extraData = {}) {
+    async function triggerDailyReport(force = false, extraData = {}) {
         if (!isDocumentActive()) {
             return false;
         }
 
         const now = Date.now();
 
-        if (!force && now - lastReportTime < ONLINE_REPORT_MIN_GAP) {
+        if (!force && now - lastReportTime < DAILY_REPORT_MIN_GAP) {
             return false;
         }
 
         try {
-            await reportOnline(extraData);
+            await reportDaily(extraData);
+            lastReportTime = Date.now();
             return true;
         } catch {
             return false;
@@ -126,30 +126,30 @@ export function createOnlineReport(options) {
 
         if (typeof window !== "undefined" && typeof window.addEventListener === "function") {
             window.addEventListener("focus", () => {
-                void triggerOnlineReport();
+                void triggerDailyReport();
             });
         }
 
         if (typeof document !== "undefined" && typeof document.addEventListener === "function") {
             document.addEventListener("visibilitychange", () => {
-                void triggerOnlineReport();
+                void triggerDailyReport();
             });
         }
 
-        void triggerOnlineReport(true);
+        void triggerDailyReport(true);
         queueHeartbeat();
     }
 
     return {
-        reportOnline: reportOnline,
+        reportDaily: reportDaily,
         startHeartbeat: startHeartbeat
     };
 }
 
-export function setupOnlineReport(options) {
-    const onlineReporter = createOnlineReport(options);
+export function setupDailyReport(options) {
+    const dailyReporter = createDailyReport(options);
 
-    onlineReporter.startHeartbeat();
+    dailyReporter.startHeartbeat();
 
-    return onlineReporter;
+    return dailyReporter;
 }

package/utils/errorReport.js

@@ -48,9 +48,9 @@ export function getErrorDetail(error) {
 export function createErrorReport(options) {
     const request = getReportRequest(options, "createErrorReport");
 
-    let reporting = false;
     let lastErrorKey = "";
     let lastErrorTime = 0;
+    const pendingKeys = new Set();
 
     function shouldSkipError(errorType, message, detail) {
         const now = Date.now();
@@ -75,11 +75,11 @@ export function createErrorReport(options) {
                 return false;
             }
 
-            if (reporting) {
+            if (pendingKeys.has(safeErrorType)) {
                 return false;
             }
 
-            reporting = true;
+            pendingKeys.add(safeErrorType);
 
             try {
                 await request(ERROR_REPORT_PATH, buildReportData(options, safeErrorType, safeMessage, safeDetail, extraData));
@@ -87,7 +87,7 @@ export function createErrorReport(options) {
             } catch {
                 return false;
             } finally {
-                reporting = false;
+                pendingKeys.delete(safeErrorType);
             }
         }
     };
@@ -115,55 +115,7 @@ export function setupErrorReport(options) {
 
     if (typeof window !== "undefined" && typeof window.addEventListener === "function") {
         if (options.reportWindow !== false) {
-            window.addEventListener(
-                "error",
-                (event) => {
-                    const target = event.target;
-
-                    if (target && target !== window) {
-                        if (options.reportResource === false) {
-                            return;
-                        }
-
-                        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("error", (event) => createWindowErrorHandler(options, reportClientError, event), true);
         }
 
         if (options.reportPromise !== false) {
@@ -187,6 +139,60 @@ export function setupErrorReport(options) {
     };
 }
 
+function createWindowErrorHandler(options, reportClientError, event) {
+    const target = event.target;
+
+    if (target && target !== window) {
+        if (options.reportResource === false) {
+            return;
+        }
+
+        reportResourceError(reportClientError, target);
+        return;
+    }
+
+    reportWindowError(reportClientError, event);
+}
+
+function reportResourceError(reportClientError, target) {
+    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"));
+}
+
+function reportWindowError(reportClientError, 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"));
+}
+
 function setupFetchErrorReport(options, reportClientError) {
     if (fetchWrapped) {
         return;
@@ -198,7 +204,12 @@ function setupFetchErrorReport(options, reportClientError) {
 
     const originalFetch = window.fetch.bind(window);
 
-    window.fetch = async (...args) => {
+    window.fetch = createWrappedFetch(options, reportClientError, originalFetch);
+    fetchWrapped = true;
+}
+
+function createWrappedFetch(options, reportClientError, originalFetch) {
+    return async (...args) => {
         const input = args[0];
         const url = typeof input === "string" ? input : input && typeof input.url === "string" ? input.url : "";
         const apiPath = String(options.apiPath || "");
@@ -209,74 +220,86 @@ function setupFetchErrorReport(options, reportClientError) {
             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 {
-                        // ignore
-                    }
-                }
+                reportHttpResponseError(reportClientError, url, response);
             }
 
             return response;
         } catch (error) {
             if (isApiRequest && !isErrorReportRequest) {
-                const parts = [];
+                reportHttpFetchError(reportClientError, url, error);
+            }
 
-                if (url) {
-                    parts.push(`url: ${url}`);
-                }
+            throw error;
+        }
+    };
+}
 
-                const errorDetail = getErrorDetail(error);
+async function reportHttpResponseError(reportClientError, url, response) {
+    if (!response.ok) {
+        const parts = buildUrlParts(url);
 
-                if (errorDetail) {
-                    parts.push(`detail: ${errorDetail}`);
-                }
+        if (response.status) {
+            parts.push(`status: ${response.status}`);
+        }
 
-                reportClientError("http", getErrorMessage(error), parts.join("\n"));
-            }
+        reportClientError("http", `请求失败：HTTP ${response.status}`, parts.join("\n"));
+        return;
+    }
 
-            throw error;
+    try {
+        const payload = await response.clone().json();
+
+        if (payload?.code !== 0) {
+            reportClientError("http", payload.msg || "请求失败", buildHttpPayloadParts(url, response, payload).join("\n"));
         }
-    };
+    } catch {
+        // ignore
+    }
+}
 
-    fetchWrapped = true;
+function reportHttpFetchError(reportClientError, url, error) {
+    const parts = buildUrlParts(url);
+    const errorDetail = getErrorDetail(error);
+
+    if (errorDetail) {
+        parts.push(`detail: ${errorDetail}`);
+    }
+
+    reportClientError("http", getErrorMessage(error), parts.join("\n"));
+}
+
+function buildUrlParts(url) {
+    const parts = [];
+
+    if (url) {
+        parts.push(`url: ${url}`);
+    }
+
+    return parts;
+}
+
+function buildHttpPayloadParts(url, response, payload) {
+    const parts = buildUrlParts(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}`);
+    }
+
+    return parts;
+}
+
+export function resetFetchWrapper() {
+    fetchWrapped = false;
 }

package/utils/infoReport.js

@@ -1,31 +0,0 @@
-import { appendPageAndExtraData, createCommonReportData, getReportRequest, getRouteReportData } from "../internal/reportUtil.js";
-
-const INFO_REPORT_PATH = "/core/tongJi/infoReport";
-
-function buildReportData(options, extraData) {
-    return appendPageAndExtraData(createCommonReportData(options), options, extraData);
-}
-
-export function createInfoReport(options) {
-    const request = getReportRequest(options, "createInfoReport");
-
-    return {
-        reportInfo: function (extraData = {}) {
-            return request(INFO_REPORT_PATH, buildReportData(options, extraData));
-        }
-    };
-}
-
-export function setupInfoReport(options) {
-    const infoReporter = createInfoReport(options);
-
-    if (options.router && typeof options.router.afterEach === "function") {
-        options.router.afterEach((to) => {
-            void infoReporter.reportInfo(getRouteReportData(to)).catch(() => {
-                // ignore
-            });
-        });
-    }
-
-    return infoReporter;
-}