sobey-monitor-sdk 1.1.17 → 1.1.19

package/dist/index.cjs.js

@@ -427,11 +427,11 @@ if (typeof window !== 'undefined') {
     });
 }
 
+var version = "1.1.19";
+
 /**
  * 数据上报管理
  */
-// SDK 版本
-const SDK_VERSION$1 = '1.0.0';
 /**
  * 上报器类
  */
@@ -568,7 +568,7 @@ class Reporter {
             pageUrl: getPageUrl(),
             timestamp: Date.now(),
             userAgent: getUserAgent(),
-            sdkVersion: cfg.version || SDK_VERSION$1,
+            sdkVersion: cfg.version || version,
         };
     }
     /**
@@ -843,21 +843,43 @@ function shouldReportHttpError(status) {
     // 获取配置的状态码列表
     if (!config.isInitialized()) {
         // 配置未初始化时，不上报
+        console.log(`[Monitor] shouldReportHttpError: config not initialized, status=${status}, returning false`);
         return false;
     }
     const cfg = config.get();
     const httpErrorStatusCodes = cfg.error?.httpErrorStatusCodes;
     // 如果未配置状态码列表或为空数组，则不上报任何HTTP错误
     if (!httpErrorStatusCodes || httpErrorStatusCodes.length === 0) {
+        console.log(`[Monitor] shouldReportHttpError: no httpErrorStatusCodes configured, status=${status}, returning false`);
         return false;
     }
     // 只检查状态码是否在配置的列表中
     const shouldReport = httpErrorStatusCodes.includes(status);
-    if (cfg.debug) {
-        console.log(`[Monitor] HTTP status ${status} shouldReport: ${shouldReport}, configured codes:`, httpErrorStatusCodes);
-    }
+    // 临时强制输出调试日志
+    console.log(`[Monitor] HTTP status ${status} shouldReport: ${shouldReport}, configured codes:`, httpErrorStatusCodes);
     return shouldReport;
 }
+/**
+ * 根据错误类型判断是否应该上报网络类错误（status = 0）
+ * @param errorType 错误类型：'timeout' | 'abort' | 'network'
+ * @returns 是否应该上报
+ */
+function shouldReportNetworkTypeError(errorType) {
+    if (!config.isInitialized()) {
+        return false;
+    }
+    const cfg = config.get();
+    const errorConfig = cfg.error;
+    switch (errorType) {
+        case 'timeout':
+            return errorConfig?.reportTimeoutError === true;
+        case 'abort':
+            return errorConfig?.reportAbortError === true;
+        case 'network':
+        default:
+            return errorConfig?.reportNetworkError === true;
+    }
+}
 /**
  * 获取嵌套对象的字段值
  * @param obj 对象
@@ -976,7 +998,20 @@ function interceptXHR() {
         if (monitorData) {
             monitorData.startTime = Date.now();
             monitorData.requestBody = typeof body === 'string' ? body : undefined;
+            monitorData.errorType = undefined; // 初始化错误类型
         }
+        // 监听超时事件
+        this.addEventListener('timeout', function () {
+            if (monitorData) {
+                monitorData.errorType = 'timeout';
+            }
+        });
+        // 监听取消事件
+        this.addEventListener('abort', function () {
+            if (monitorData) {
+                monitorData.errorType = 'abort';
+            }
+        });
         this.addEventListener('loadend', function () {
             if (!monitorData)
                 return;
@@ -990,6 +1025,11 @@ function interceptXHR() {
             // 其他异常情况（0-网络错误、4xx-客户端错误、5xx-服务端错误）根据配置控制
             const isError = status === 0 || status < 200 || status >= 400;
             const shouldRecord = isRedirect || recordMode === 'all' || (recordMode === 'error' && isError);
+            // 确定错误类型
+            let errorType;
+            if (status === 0) {
+                errorType = monitorData.errorType || 'network';
+            }
             if (shouldRecord) {
                 context.addBreadcrumb({
                     type: 'request',
@@ -999,12 +1039,22 @@ function interceptXHR() {
                         url: monitorData.url,
                         status,
                         duration,
+                        errorType,
                     },
                 });
             }
             const responseBody = this.responseText?.substring(0, 1000);
-            // HTTP 错误（根据配置的状态码列表过滤）
-            if (shouldReportHttpError(status)) {
+            // HTTP 错误上报逻辑
+            let shouldReport = false;
+            if (status === 0) {
+                // status=0 使用独立的网络错误配置
+                shouldReport = shouldReportNetworkTypeError(errorType);
+            }
+            else {
+                // 其他状态码使用 httpErrorStatusCodes 配置
+                shouldReport = shouldReportHttpError(status);
+            }
+            if (shouldReport) {
                 reportHttpError({
                     method: monitorData.method,
                     url: monitorData.url,
@@ -1012,6 +1062,7 @@ function interceptXHR() {
                     duration,
                     requestBody: monitorData.requestBody,
                     responseBody,
+                    errorType,
                 });
             }
             else if (status >= 200 && status < 300 && detectBusinessError(responseBody)) {
@@ -1104,6 +1155,22 @@ function interceptFetch() {
         }
         catch (error) {
             const duration = Date.now() - startTime;
+            const err = error;
+            // 判断错误类型
+            // AbortError 表示请求被取消（可能是手动取消或超时）
+            // 注意：fetch 的超时通常也是通过 AbortController 实现的，所以无法区分超时和手动取消
+            // 这里将 AbortError 统一标记为 'abort'，如果需要区分超时，建议使用 XHR 或检查 error.message
+            let errorType = 'network';
+            if (err.name === 'AbortError') {
+                // 尝试通过错误消息区分超时和取消
+                // 一些超时实现会在 message 中包含 'timeout'
+                if (err.message?.toLowerCase().includes('timeout')) {
+                    errorType = 'timeout';
+                }
+                else {
+                    errorType = 'abort';
+                }
+            }
             // 网络错误时根据配置决定是否添加到面包屑
             const cfg = config.isInitialized() ? config.get() : null;
             const recordMode = cfg?.behavior?.recordRequestBreadcrumb || 'error';
@@ -1117,17 +1184,22 @@ function interceptFetch() {
                         url,
                         status: 0,
                         duration,
-                        error: error.message,
+                        error: err.message,
+                        errorType,
                     },
                 });
             }
-            reportHttpError({
-                method,
-                url,
-                status: 0,
-                duration,
-                requestBody,
-            });
+            // 网络错误使用独立的配置项判断是否上报
+            if (shouldReportNetworkTypeError(errorType)) {
+                reportHttpError({
+                    method,
+                    url,
+                    status: 0,
+                    duration,
+                    requestBody,
+                    errorType,
+                });
+            }
             throw error;
         }
     };
@@ -1136,9 +1208,23 @@ function interceptFetch() {
  * 上报 HTTP 错误
  */
 function reportHttpError(httpInfo, isBusinessError = false) {
-    const message = isBusinessError
-        ? `Business Error ${httpInfo.method} ${httpInfo.url}`
-        : `HTTP ${httpInfo.status} ${httpInfo.method} ${httpInfo.url}`;
+    let message;
+    if (isBusinessError) {
+        message = `Business Error ${httpInfo.method} ${httpInfo.url}`;
+    }
+    else if (httpInfo.status === 0 && httpInfo.errorType) {
+        // 对于 status 0，显示具体的错误类型
+        const errorTypeLabels = {
+            'timeout': 'Timeout',
+            'abort': 'Aborted',
+            'network': 'Network Error',
+        };
+        const label = errorTypeLabels[httpInfo.errorType] || 'Network Error';
+        message = `HTTP ${label} ${httpInfo.method} ${httpInfo.url}`;
+    }
+    else {
+        message = `HTTP ${httpInfo.status} ${httpInfo.method} ${httpInfo.url}`;
+    }
     const errorData = {
         type: isBusinessError ? 'business_error' : 'http_error',
         message,
@@ -1938,8 +2024,6 @@ function createUseMonitorError(React) {
  * 前端监控 SDK
  * @description 错误监控、性能监控、行为监控
  */
-// SDK 版本
-const SDK_VERSION = '1.0.0';
 /**
  * 监控 SDK 主类
  */
@@ -2017,7 +2101,7 @@ class MonitorSDK {
         // 初始化配置管理器
         config.init({
             ...finalConfig,
-            version: finalConfig.version || SDK_VERSION,
+            version: finalConfig.version || version,
         }, true);
         this.ready = true;
         this.loading = false;
@@ -2194,7 +2278,7 @@ class MonitorSDK {
      * 获取 SDK 版本
      */
     getVersion() {
-        return SDK_VERSION;
+        return version;
     }
 }
 // 导出单例