@haluo/util 1.0.29 → 1.0.31

package/dist/modules/monitor/lib/jsError.js

@@ -20,9 +20,16 @@ function injectJsError(data) {
     if (data === void 0) { data = {}; }
     window.addEventListener('error', function (e) {
         if (e.target && (e.target.src || e.target.href)) {
-            tracker_1.default.send(__assign({ kind: 'stability', type: 'error', title: 'resourceError', filename: e.target.src || e.target.href, tagName: e.target.tagName, reason: e.target.src || e.target.href }, data
-            // selector: lastEvent ? get
-            ));
+            // track.send({
+            //   kind: 'stability',
+            //   type: 'error',
+            //   title: 'resourceError',
+            //   filename: e.target.src || e.target.href,
+            //   tagName: e.target.tagName,
+            //   reason: e.target.src || e.target.href,
+            //   ...data
+            //   // selector: lastEvent ? get
+            // })
             return;
         }
         tracker_1.default.send(__assign({ kind: 'stability', type: 'error', title: 'jsError', message: e.message, filename: e.filename, position: e.lineno + ":" + e.colno, reason: e.error.stack }, data

package/dist/modules/monitor/lib/xhr.js

@@ -31,7 +31,9 @@ function injectXHR(data) {
             var handler = function (type) { return function (event) {
                 if (_this.logData.url.indexOf('app/collect/original/info/report/v2') > -1)
                     return;
-                if (type !== 'error')
+                // status = 0 是在跨域与404的情况下
+                // 当前都是在readyState为4(请求已完成)的情况下，进行处理
+                if (type !== 'error' || _this.status === 0)
                     return;
                 var duration = Date.now() - startTime_1;
                 var status = _this.status;

package/dist/modules/sentry/index.js

@@ -11,8 +11,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var raven_js_1 = __importDefault(require("raven-js"));
-// import RavenVue from 'raven-js/plugins/vue';
+var browser_1 = __importDefault(require("@sentry/browser"));
 var Report = /** @class */ (function () {
     function Report(Vue, options) {
         if (options === void 0) { options = {}; }
@@ -36,9 +35,9 @@ var Report = /** @class */ (function () {
             // }).addPlugin(RavenVue, this.Vue).install();
             // raven内置了vue插件，会通过vue.config.errorHandler来捕获vue组件内错误并上报sentry服务
             // 记录用户信息
-            raven_js_1.default.setUserContext({ user: this.options.user || '' });
+            browser_1.default.setUser({ user: this.options.user || '' });
             // 设置全局tag标签
-            raven_js_1.default.setTagsContext({ environment: this.options.env || '' });
+            browser_1.default.setTag('environment', this.options.env || '');
         }
     };
     /**
@@ -52,22 +51,20 @@ var Report = /** @class */ (function () {
         if (type === void 0) { type = 'error'; }
         if (options === void 0) { options = {}; }
         // 添加面包屑
-        raven_js_1.default.captureBreadcrumb({
+        browser_1.default.addBreadcrumb({
             message: data,
             category: 'manual message',
         });
         // 异常上报
         if (data instanceof Error) {
-            raven_js_1.default.captureException(data, {
+            browser_1.default.captureException(data, {
                 level: type,
-                logger: 'manual exception',
                 tags: { options: options },
             });
         }
         else {
-            raven_js_1.default.captureException('error', {
+            browser_1.default.captureException('error', {
                 level: type,
-                logger: 'manual data',
                 extra: {
                     data: data,
                     options: this.options,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haluo/util",
-  "version": "1.0.29",
+  "version": "1.0.31",
   "main": "./dist/index.js",
   "author": "<wanghui@jddmoto.com>",
   "description": "哈罗摩托工具库",
@@ -26,8 +26,9 @@
     "@haluo/util"
   ],
   "dependencies": {
+    "@sentry/browser": "^7.31.1",
     "@types/jest": "^26.0.24",
-    "axios": "^0.19.2",
+    "axios": "^1.2.3",
     "clipboard-copy": "^4.0.1",
     "jest": "^27.0.6",
     "raven-js": "^3.27.2",

package/src/modules/monitor/lib/jsError.ts

@@ -2,16 +2,16 @@ import track from '../utils/tracker'
 export function injectJsError (data:any={}) {
   window.addEventListener('error', (e: any) => {
     if (e.target && (e.target.src || e.target.href)) {
-      track.send({
-        kind: 'stability',
-        type: 'error',
-        title: 'resourceError',
-        filename: e.target.src || e.target.href,
-        tagName: e.target.tagName,
-        reason: e.target.src || e.target.href,
-        ...data
-        // selector: lastEvent ? get
-      })
+      // track.send({
+      //   kind: 'stability',
+      //   type: 'error',
+      //   title: 'resourceError',
+      //   filename: e.target.src || e.target.href,
+      //   tagName: e.target.tagName,
+      //   reason: e.target.src || e.target.href,
+      //   ...data
+      //   // selector: lastEvent ? get
+      // })
       return
     }
     track.send({

package/src/modules/monitor/lib/xhr.ts

@@ -13,7 +13,9 @@ export default function injectXHR(data:any={}){
       const startTime = Date.now()
       const handler = (type:string) => (event:any) => {
         if(this.logData.url.indexOf('app/collect/original/info/report/v2') > -1 ) return
-        if(type !== 'error') return
+        // status = 0 是在跨域与404的情况下
+        // 当前都是在readyState为4(请求已完成)的情况下，进行处理
+        if(type !== 'error' || this.status === 0) return
         let duration = Date.now() - startTime
         let status = this.status
         let statusText = this.statusText

package/src/modules/sentry/index.ts

@@ -8,8 +8,7 @@
  */
 'use strict'
 
-import Raven from 'raven-js';
-// import RavenVue from 'raven-js/plugins/vue';
+import Raven from '@sentry/browser';
 
 class Report {
   static instance: any;
@@ -39,10 +38,10 @@ class Report {
       // raven内置了vue插件，会通过vue.config.errorHandler来捕获vue组件内错误并上报sentry服务
 
       // 记录用户信息
-      Raven.setUserContext({ user: this.options.user || '' });
+      Raven.setUser({ user: this.options.user || '' });
 
       // 设置全局tag标签
-      Raven.setTagsContext({ environment: this.options.env || '' });
+      Raven.setTag('environment', this.options.env || '');
     }
   }
 
@@ -54,7 +53,7 @@ class Report {
    */
   log(data: any = null, type: any = 'error', options: any = {}) {
     // 添加面包屑
-    Raven.captureBreadcrumb({
+    Raven.addBreadcrumb({
       message: data,
       category: 'manual message',
     });
@@ -62,13 +61,11 @@ class Report {
     if (data instanceof Error) {
       Raven.captureException(data, {
         level: type,
-        logger: 'manual exception',
         tags: { options },
       });
     } else {
       Raven.captureException('error', {
         level: type,
-        logger: 'manual data',
         extra: {
           data,
           options: this.options,