@qiu_jun/monitors 0.0.7 → 0.0.9

package/dist/modules/timing.js

@@ -1,43 +1,30 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = onTiming;
-/** 采集并上报页面加载时序（DOMContentLoaded / load） */
+
 function reportTiming() {
-    let DOMContentLoadedTime = 0;
-    let loadTime = 0;
-    // 新版：PerformanceNavigationTiming；旧版降级 performance.timing
-    if (performance.getEntriesByType) {
-        const perfEntries = performance.getEntriesByType('navigation');
-        if (perfEntries.length > 0) {
-            const navigationEntry = perfEntries[0];
-            const { domContentLoadedEventStart, loadEventStart, fetchStart } = navigationEntry;
-            DOMContentLoadedTime = domContentLoadedEventStart - fetchStart;
-            loadTime = loadEventStart - fetchStart;
-        }
+  let t = 0, e = 0;
+  if (performance.getEntriesByType) {
+    const n = performance.getEntriesByType("navigation");
+    if (n.length > 0) {
+      const o = n[0], {domContentLoadedEventStart: i, loadEventStart: r, fetchStart: a} = o;
+      t = i - a, e = r - a;
     }
-    else {
-        const { fetchStart, domContentLoadedEventStart, loadEventStart } = performance.timing;
-        DOMContentLoadedTime = domContentLoadedEventStart - fetchStart;
-        loadTime = loadEventStart - fetchStart;
-    }
-    const log = {
-        type: 'timing',
-        DOMContentLoadedTime,
-        loadTime,
-    };
-    console.log('[monitor] timing 上报', log);
-    this.send(log);
+  } else {
+    const {fetchStart: n, domContentLoadedEventStart: o, loadEventStart: i} = performance.timing;
+    t = o - n, e = i - n;
+  }
+  const n = {
+    type: "timing",
+    DOMContentLoadedTime: t,
+    loadTime: e
+  };
+  this.send(n);
 }
-/**
- * 监听页面加载时序。
- * 若 SDK 在 window.load 之后才初始化，直接补报，避免永远收不到 timing。
- */
+
 function onTiming() {
-    const run = () => reportTiming.call(this);
-    if (document.readyState === 'complete') {
-        console.log('[monitor] 页面已 load 完成，立即补报 timing');
-        run();
-        return;
-    }
-    window.addEventListener('load', run);
+  const t = () => reportTiming.call(this);
+  "complete" !== document.readyState ? window.addEventListener("load", t) : t();
 }
+
+Object.defineProperty(exports, "__esModule", {
+  value: !0
+}), exports.default = onTiming;

package/dist/modules/xhr.js

@@ -1,6 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = onXHR;
+const businessError_1 = require("../utils/businessError");
+/** 读取 XHR 响应体：responseType 非 text/json 时访问 responseText 会抛 InvalidStateError，读不到返回 undefined */
+function readXhrBody(xhr) {
+    try {
+        if (xhr.responseType === '' || xhr.responseType === 'text')
+            return xhr.responseText;
+        return xhr.responseType === 'json' ? xhr.response : undefined;
+    }
+    catch (_a) {
+        return undefined;
+    }
+}
 function onXHR() {
     const originalXHR = window.XMLHttpRequest;
     // @ts-ignore
@@ -56,24 +68,47 @@ function onXHR() {
                     startTime: new Date().getTime()
                 });
             });
-            // xhr.addEventListener('loadend', function () {
-            //   const duration = new Date().getTime() - startTime
-            //   const status = xhr.status
-            //   const success = status >= 200 && status < 300
-            //   // 对于HTTP错误状态码，也捕获为错误
-            //   if (!success) {
-            //     _this.captureRequest({
-            //       type: 'xhr',
-            //       url: reqUrl,
-            //       method: reqMethod || 'GET',
-            //       msg: `XHR请求失败: 状态码 ${status}`,
-            //       duration,
-            //       status,
-            //       success,
-            //       startTime: new Date().getTime()
-            //     })
-            //   }
-            // })
+            // 请求完成：HTTP >= 400 与业务错误（HTTP 2xx 但响应体 code 非成功）。
+            // error/timeout 后 loadend 也会触发，但那时 status 为 0，走不进下面任一分支，不会重复上报
+            xhr.addEventListener('loadend', function () {
+                var _a;
+                const duration = new Date().getTime() - startTime;
+                const status = xhr.status;
+                const urlStr = String(reqUrl !== null && reqUrl !== void 0 ? reqUrl : '');
+                if (_this.endpoint && urlStr === _this.endpoint)
+                    return;
+                // HTTP 层失败（4xx/5xx）
+                if (status >= 400) {
+                    _this.captureRequest({
+                        type: 'xhr',
+                        url: reqUrl,
+                        method: reqMethod || 'GET',
+                        msg: `XHR请求失败: 状态码 ${status}`,
+                        duration,
+                        status,
+                        success: false,
+                        startTime
+                    });
+                    return;
+                }
+                // 业务错误：需配置 isBusinessError 才会读响应体判定
+                if (status >= 200 && status < 300 && _this.isBusinessError) {
+                    const business = (0, businessError_1.detectBusinessError)(readXhrBody(xhr), _this.isBusinessError);
+                    if (business) {
+                        _this.captureRequest({
+                            type: 'xhr',
+                            url: reqUrl,
+                            method: reqMethod || 'GET',
+                            msg: `XHR业务错误: ${(_a = business.message) !== null && _a !== void 0 ? _a : urlStr}`,
+                            duration,
+                            status,
+                            success: false,
+                            business,
+                            startTime
+                        });
+                    }
+                }
+            });
             return originalSend.apply(this, arguments);
         };
         return xhr;

package/dist/monitor.d.ts

@@ -6,6 +6,10 @@ export default class Monitor {
     endpoint: string;
     /** 接入项目 projectKey */
     projectKey: string;
+    /** 回放上传地址（fetch 拦截排除用，未开启回放为空） */
+    replayEndpoint: string;
+    /** 业务错误判定：HTTP 2xx 但响应体 code 非成功时上报（XHR/fetch/wx.request） */
+    isBusinessError?: (body: unknown) => boolean;
     timeoutDuration: number;
     errorQueue: RequestLog[];
     requestQueue: RequestLog[];
@@ -14,6 +18,8 @@ export default class Monitor {
     reporter: ExcReporter;
     private replay;
     private readonly options;
+    /** errorDedupeMs 去重状态：errorType|message|filename → 上次放行时间 */
+    private errorSentAt;
     originalXHR: {
         new (): XMLHttpRequest;
         prototype: XMLHttpRequest;
@@ -32,6 +38,8 @@ export default class Monitor {
     init(): void;
     /** 回放初始化：显式开启 + 采样命中 + 回放地址可解析 */
     private initReplay;
+    /** errorDedupeMs 窗口内同类错误（errorType+message+filename 相同）直接丢弃，连回放触发一并跳过；只在放行时刷新时间戳（非滑动窗口），与 minUploadIntervalMs 的节奏一致 */
+    private isDuplicateError;
     /** 统一上报：转异常平台格式 → reporter 批量 POST；错误触发回放切片上传并回填 device.replayId */
     send(data: MonitorTypeLog): void;
     /** 手动上报自定义事件 */

package/dist/monitor.js

@@ -1,218 +1,181 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const exception_1 = require("./exception");
-const modules_1 = require("./modules");
-const index_1 = require("./utils/index");
-const toExcEvent_1 = require("./utils/toExcEvent");
-const replay_1 = require("./replay");
+
+Object.defineProperty(exports, "__esModule", {
+  value: !0
+});
+
+const exception_1 = require("./exception"), modules_1 = require("./modules"), index_1 = require("./utils/index"), toExcEvent_1 = require("./utils/toExcEvent"), replay_1 = require("./replay");
+
 class Monitor {
-    constructor(options) {
-        var _a, _b;
-        /** 异常平台上报地址 */
-        Object.defineProperty(this, "endpoint", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        /** 接入项目 projectKey */
-        Object.defineProperty(this, "projectKey", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "timeoutDuration", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "errorQueue", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "requestQueue", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "maxQueueSize", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "sendTimer", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "reporter", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "replay", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: null
-        });
-        Object.defineProperty(this, "options", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "originalXHR", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "originalFetch", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "originalOnerror", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.options = options;
-        this.endpoint = options.endpoint;
-        this.projectKey = options.projectKey;
-        this.timeoutDuration = (_a = options.timeoutDuration) !== null && _a !== void 0 ? _a : 60000;
-        this.errorQueue = [];
-        this.requestQueue = [];
-        this.maxQueueSize = (_b = options.maxQueueSize) !== null && _b !== void 0 ? _b : 10;
-        this.sendTimer = null;
-        this.reporter = (0, exception_1.createReporter)({
-            endpoint: options.endpoint,
-            projectKey: options.projectKey,
-            release: options.release,
-            environment: options.environment,
-            maxBatch: options.maxBatch,
-            flushInterval: options.flushInterval,
-        }, (0, exception_1.makeH5Transport)(options.endpoint));
-        this.init();
-        this.initReplay();
-        this.originalXHR = window.XMLHttpRequest;
-        this.originalFetch = window.fetch;
-        this.originalOnerror = window.onerror;
-    }
-    init() {
-        modules_1.onWindowErr.call(this);
-        modules_1.onLongTask.call(this);
-        modules_1.onPaint.call(this);
-        modules_1.onTiming.call(this);
-        modules_1.onXHR.call(this);
-    }
-    /** 回放初始化：显式开启 + 采样命中 + 回放地址可解析 */
-    initReplay() {
-        var _a, _b;
-        const replayOptions = this.options.replay;
-        if (!(replayOptions === null || replayOptions === void 0 ? void 0 : replayOptions.enabled))
-            return;
-        const sampleRate = (_a = replayOptions.sampleRate) !== null && _a !== void 0 ? _a : 1;
-        if (Math.random() >= sampleRate)
-            return;
-        const replayEndpoint = (_b = replayOptions.replayEndpoint) !== null && _b !== void 0 ? _b : (0, replay_1.deriveReplayEndpoint)(this.endpoint);
-        if (!replayEndpoint) {
-            console.warn('monitor: replay.replayEndpoint 未配置且无法从 endpoint（需以 /report 结尾）推导，回放已禁用');
-            return;
-        }
-        this.replay = new replay_1.ReplayController({
-            replayEndpoint,
-            projectKey: this.projectKey,
-            bufferSeconds: replayOptions.bufferSeconds,
-            maxUploadsPerSession: replayOptions.maxUploadsPerSession,
-            minUploadIntervalMs: replayOptions.minUploadIntervalMs,
-            maxReplayBytes: replayOptions.maxReplayBytes,
-            captureRequest: replayOptions.captureRequest,
-            maskTextClass: replayOptions.maskTextClass,
-        });
-        void this.replay.start();
-    }
-    /** 统一上报：转异常平台格式 → reporter 批量 POST；错误触发回放切片上传并回填 device.replayId */
-    send(data) {
-        var _a;
-        const baseData = (0, index_1.getLogBaseData)();
-        const events = (0, toExcEvent_1.toExcEvents)(data, baseData, this.options);
-        const replayId = (_a = this.replay) === null || _a === void 0 ? void 0 : _a.captureIfTriggered(data);
-        if (replayId) {
-            for (const event of events)
-                event.device = { ...event.device, replayId };
-        }
-        for (const event of events)
-            this.reporter.capture(event);
-    }
-    /** 手动上报自定义事件 */
-    capture(event) {
-        this.reporter.capture(event);
-    }
-    reportRequest() {
-        if (this.requestQueue.length === 0)
-            return;
-        this.send({ type: 'batchXHR', requests: [...this.requestQueue] });
-        this.requestQueue = [];
-    }
-    reportError() {
-        if (this.errorQueue.length === 0)
-            return;
-        this.send({ type: 'batchXHR', requests: [...this.errorQueue] });
-        this.errorQueue = [];
-    }
-    captureRequest(requestInfo) {
-        var _a;
-        const validRequestTypes = ['xhr', 'fetch'];
-        if (!requestInfo.type || !validRequestTypes.includes(requestInfo.type)) {
-            console.warn(`监控系统: 无效的请求类型 ${requestInfo.type}，无法上报`);
-            return;
-        }
-        if ((0, toExcEvent_1.isExceptionReportUrl)(String((_a = requestInfo.url) !== null && _a !== void 0 ? _a : ''), this.endpoint))
-            return;
-        const requiredFields = ['url', 'method', 'duration', 'status', 'success', 'startTime'];
-        for (const field of requiredFields) {
-            if (requestInfo[field] === undefined) {
-                console.warn(`监控系统: 请求信息中缺少必填字段 ${field}，无法上报`);
-                return;
-            }
-        }
-        requestInfo.page = window.location.href;
-        this.requestQueue.push(requestInfo);
-        if (this.requestQueue.length >= this.maxQueueSize)
-            this.reportRequest();
-    }
-    sendQueuedData() {
-        if (this.errorQueue.length > 0)
-            this.reportError();
-        if (this.requestQueue.length > 0)
-            this.reportRequest();
-    }
-    destroy() {
-        var _a;
-        (_a = this.replay) === null || _a === void 0 ? void 0 : _a.stop();
-        this.sendQueuedData();
-        this.reporter.destroy();
-        window.XMLHttpRequest = this.originalXHR;
-        window.fetch = this.originalFetch;
-        window.onerror = this.originalOnerror;
-        if (this.sendTimer) {
-            clearInterval(this.sendTimer);
-            this.sendTimer = null;
-        }
-        this.errorQueue = [];
-        this.requestQueue = [];
-    }
+  constructor(e) {
+    var r, t;
+    Object.defineProperty(this, "endpoint", {
+      enumerable: !0,
+      configurable: !0,
+      writable: !0,
+      value: void 0
+    }), Object.defineProperty(this, "projectKey", {
+      enumerable: !0,
+      configurable: !0,
+      writable: !0,
+      value: void 0
+    }), Object.defineProperty(this, "replayEndpoint", {
+      enumerable: !0,
+      configurable: !0,
+      writable: !0,
+      value: ""
+    }), Object.defineProperty(this, "isBusinessError", {
+      enumerable: !0,
+      configurable: !0,
+      writable: !0,
+      value: void 0
+    }), Object.defineProperty(this, "timeoutDuration", {
+      enumerable: !0,
+      configurable: !0,
+      writable: !0,
+      value: void 0
+    }), Object.defineProperty(this, "errorQueue", {
+      enumerable: !0,
+      configurable: !0,
+      writable: !0,
+      value: void 0
+    }), Object.defineProperty(this, "requestQueue", {
+      enumerable: !0,
+      configurable: !0,
+      writable: !0,
+      value: void 0
+    }), Object.defineProperty(this, "maxQueueSize", {
+      enumerable: !0,
+      configurable: !0,
+      writable: !0,
+      value: void 0
+    }), Object.defineProperty(this, "sendTimer", {
+      enumerable: !0,
+      configurable: !0,
+      writable: !0,
+      value: void 0
+    }), Object.defineProperty(this, "reporter", {
+      enumerable: !0,
+      configurable: !0,
+      writable: !0,
+      value: void 0
+    }), Object.defineProperty(this, "replay", {
+      enumerable: !0,
+      configurable: !0,
+      writable: !0,
+      value: null
+    }), Object.defineProperty(this, "options", {
+      enumerable: !0,
+      configurable: !0,
+      writable: !0,
+      value: void 0
+    }), Object.defineProperty(this, "errorSentAt", {
+      enumerable: !0,
+      configurable: !0,
+      writable: !0,
+      value: new Map
+    }), Object.defineProperty(this, "originalXHR", {
+      enumerable: !0,
+      configurable: !0,
+      writable: !0,
+      value: void 0
+    }), Object.defineProperty(this, "originalFetch", {
+      enumerable: !0,
+      configurable: !0,
+      writable: !0,
+      value: void 0
+    }), Object.defineProperty(this, "originalOnerror", {
+      enumerable: !0,
+      configurable: !0,
+      writable: !0,
+      value: void 0
+    }), this.options = e, this.endpoint = e.endpoint, this.projectKey = e.projectKey, 
+    this.isBusinessError = e.isBusinessError, this.timeoutDuration = null !== (r = e.timeoutDuration) && void 0 !== r ? r : 6e4, 
+    this.errorQueue = [], this.requestQueue = [], this.maxQueueSize = null !== (t = e.maxQueueSize) && void 0 !== t ? t : 10, 
+    this.sendTimer = null, this.originalXHR = window.XMLHttpRequest, this.originalFetch = window.fetch, 
+    this.originalOnerror = window.onerror, this.reporter = (0, exception_1.createReporter)({
+      endpoint: e.endpoint,
+      projectKey: e.projectKey,
+      release: e.release,
+      environment: e.environment,
+      maxBatch: e.maxBatch,
+      flushInterval: e.flushInterval
+    }, (0, exception_1.makeH5Transport)(e.endpoint)), this.init(), this.initReplay();
+  }
+  init() {
+    modules_1.onWindowErr.call(this), modules_1.onLongTask.call(this), modules_1.onPaint.call(this), 
+    modules_1.onTiming.call(this), modules_1.onXHR.call(this), modules_1.onFetch.call(this);
+  }
+  initReplay() {
+    var e, r;
+    const t = this.options.replay;
+    if (!(null == t ? void 0 : t.enabled)) return;
+    const i = null !== (e = t.sampleRate) && void 0 !== e ? e : 1;
+    if (Math.random() >= i) return;
+    const o = null !== (r = t.replayEndpoint) && void 0 !== r ? r : (0, replay_1.deriveReplayEndpoint)(this.endpoint);
+    o && (this.replayEndpoint = o, this.replay = new replay_1.ReplayController({
+      replayEndpoint: o,
+      projectKey: this.projectKey,
+      bufferSeconds: t.bufferSeconds,
+      maxUploadsPerSession: t.maxUploadsPerSession,
+      minUploadIntervalMs: t.minUploadIntervalMs,
+      maxReplayBytes: t.maxReplayBytes,
+      captureRequest: t.captureRequest,
+      maskTextClass: t.maskTextClass
+    }), this.replay.start());
+  }
+  isDuplicateError(e) {
+    var r, t;
+    const i = null !== (r = this.options.errorDedupeMs) && void 0 !== r ? r : 0;
+    if (i <= 0 || "error" !== e.type) return !1;
+    const o = `${e.errorType}|${e.message}|${null !== (t = e.filename) && void 0 !== t ? t : ""}`, n = Date.now(), s = this.errorSentAt.get(o);
+    if (void 0 !== s && n - s < i) return !0;
+    if (this.errorSentAt.size >= 100) for (const [e, r] of this.errorSentAt) n - r >= i && this.errorSentAt.delete(e);
+    return this.errorSentAt.set(o, n), !1;
+  }
+  send(e) {
+    var r;
+    if (this.isDuplicateError(e)) return;
+    const t = (0, index_1.getLogBaseData)(), i = (0, toExcEvent_1.toExcEvents)(e, t, this.options), o = null === (r = this.replay) || void 0 === r ? void 0 : r.captureIfTriggered(e);
+    if (o) for (const e of i) e.device = {
+      ...e.device,
+      replayId: o
+    };
+    for (const e of i) this.reporter.capture(e);
+  }
+  capture(e) {
+    this.reporter.capture(e);
+  }
+  reportRequest() {
+    0 !== this.requestQueue.length && (this.send({
+      type: "batchXHR",
+      requests: [ ...this.requestQueue ]
+    }), this.requestQueue = []);
+  }
+  reportError() {
+    0 !== this.errorQueue.length && (this.send({
+      type: "batchXHR",
+      requests: [ ...this.errorQueue ]
+    }), this.errorQueue = []);
+  }
+  captureRequest(e) {
+    var r;
+    if (!e.type || ![ "xhr", "fetch" ].includes(e.type)) return;
+    if ((0, toExcEvent_1.isExceptionReportUrl)(String(null !== (r = e.url) && void 0 !== r ? r : ""), this.endpoint)) return;
+    const t = [ "url", "method", "duration", "status", "success", "startTime" ];
+    for (const r of t) if (void 0 === e[r]) return;
+    e.page = window.location.href, this.requestQueue.push(e), this.requestQueue.length >= this.maxQueueSize && this.reportRequest();
+  }
+  sendQueuedData() {
+    this.errorQueue.length > 0 && this.reportError(), this.requestQueue.length > 0 && this.reportRequest();
+  }
+  destroy() {
+    var e;
+    null === (e = this.replay) || void 0 === e || e.stop(), this.sendQueuedData(), this.reporter.destroy(), 
+    window.XMLHttpRequest = this.originalXHR, window.fetch = this.originalFetch, window.onerror = this.originalOnerror, 
+    this.sendTimer && (clearInterval(this.sendTimer), this.sendTimer = null), this.errorQueue = [], 
+    this.requestQueue = [], this.errorSentAt.clear();
+  }
 }
-exports.default = Monitor;
+
+exports.default = Monitor;