@haluo/util 1.0.32 → 2.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haluo/util",
-  "version": "1.0.32",
+  "version": "2.0.0",
   "main": "./dist/index.js",
   "author": "<wanghui@jddmoto.com>",
   "description": "哈罗摩托工具库",
@@ -26,11 +26,11 @@
     "@haluo/util"
   ],
   "dependencies": {
-    "@sentry/browser": "^7.31.1",
     "@types/jest": "^26.0.24",
-    "axios": "^1.2.3",
+    "axios": "^0.19.2",
     "clipboard-copy": "^4.0.1",
     "jest": "^27.0.6",
+    "raven-js": "^3.27.2",
     "ua-parser-js": "^1.0.2",
     "uuid": "^8.3.2"
   },
@@ -65,7 +65,7 @@
     "lodash": "^4.17.21",
     "normalize.css": "^8.0.1",
     "ts-jest": "^27.0.4",
-    "typescript": "^3.9.5",
+    "typescript": "^4.9.5",
     "webpack": "^4.32.2",
     "webpack-cli": "^3.3.2",
     "webpack-dev-server": "^3.4.1",

package/src/index.ts

@@ -27,13 +27,10 @@ class Utils {
    * 示例：this.$cookie、this.$date、this.$match、this.$number、this.$tools
    * @param {Object} Vue 需要挂载的目标对象
    */
-  install(Vue: any) {
+  install(app: any) {
     Object.keys(modules).forEach((key) => {
-      if (key === 'filter') {
-        return modules[key].install(Vue)
-      }
-      Vue.prototype['$' + key] = modules[key]
-      Vue['$' + key] = modules[key]
+      const globalProperties = app.config.globalProperties
+      globalProperties['$' + key] = modules[key]
     })
   }
 

package/src/modules/filter/index.ts

@@ -3,13 +3,6 @@
  * @Author: wanghui
  * @createBy: @2020.05.28
  */
-/**
- * 示例：注入所有过滤器
- * import { filter as filters } from '@haluo/util'
- * Object.keys(filters).forEach(key => {
- *   Vue.filter(key, filters[key])
- * })
- */
 'use strict'
 
 const dateClass = require('../date')
@@ -45,13 +38,6 @@ class FilterClass {
   slice(target: Array<any> | string = '', length: number = 0) {
     return toolsClass.slice(target, length)
   }
-
-  install(Vue: any) {
-    const _this = this
-    Vue.filter('format', _this.format)
-    Vue.filter('formatMoney', _this.formatMoney)
-    Vue.filter('slice', _this.slice)
-  }
 }
 
 module.exports = new FilterClass()

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,9 +13,7 @@ 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
-        // status = 0 是在跨域与404的情况下
-        // 当前都是在readyState为4(请求已完成)的情况下，进行处理
-        if(type !== 'error' || this.status === 0) return
+        if(type !== 'error') return
         let duration = Date.now() - startTime
         let status = this.status
         let statusText = this.statusText

package/src/modules/monitor/utils/tracker.ts

@@ -1,29 +1,15 @@
 const { v4: uuidv4 } = require('uuid')
 // const Parser = require('ua-parser-js');
-const reg = /((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3}/g
-
 class SendTracker {
   url: string
   constructor() {
     this.url = ''
   }
-  verifyRequest(reason:string):boolean {
-    if(!reason) return false
-    if(reg.test(reason)) return false
-    if(reason.startsWith('halomoto')) return false
-    if(reason.startsWith('file:')) return false
-    if(reason.includes('log-center.58moto.com')) return false
-    if(reason.includes('s23.cnzz.com')) return false
-    if(reason.includes('g.alicdn.com')) return false
-    if(reason.includes('vendors')) return false
-    return true
-  }
   send(data:any = {}) {
     const host = window.location.host
     if(host.indexOf('localhost') > -1) return
+    const reg = /((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3}/g
     if(reg.test(host)) return
-    if(!this.verifyRequest(data.reason)) return
-    data.reason = window.location.href+' '+data.reason
     const log = { ...getExtraData(), ...data}
     let formBody: any = [];
     for (var property in log) {

package/src/modules/sentry/index.ts

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

package/dist/index.cjs.js

@@ -1,89 +0,0 @@
-'use strict';
-
-/**
- * @file Cookie
- * @Author: wanghui
- * @createBy: @2021.01.21
- */
-var CookieClass = /** @class */ (function () {
-    function CookieClass() {
-    }
-    /**
-     * 获取cookie
-     * @param {String} name
-     * @return {String}
-     */
-    CookieClass.prototype.getCookie = function (name) {
-        var _name = name + '=';
-        var ca = document.cookie.split(';');
-        for (var i = 0; i < ca.length; i++) {
-            var c = ca[i];
-            while (c.charAt(0) === ' ')
-                c = c.substring(1);
-            if (c.includes(_name))
-                return c.substring(_name.length, c.length);
-        }
-        return '';
-    };
-    /**
-     * 设置cookie
-     * @param {Object} ICookie
-     */
-    CookieClass.prototype.setCookie = function (_a) {
-        var _b = _a.name, name = _b === void 0 ? '' : _b, _c = _a.value, value = _c === void 0 ? '' : _c, _d = _a.exdays, exdays = _d === void 0 ? -1 : _d, _e = _a.path, path = _e === void 0 ? '/' : _e, _f = _a.domain, domain = _f === void 0 ? '.jddmoto.com' : _f;
-        var d = new Date();
-        d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000));
-        var expires = "expires=" + d.toUTCString();
-        document.cookie = name + "=" + value + ";" + expires + ";path=" + path + ";domain=" + domain + ";";
-    };
-    /**
-     * 清除Cookie
-     * @param {String} name
-     */
-    CookieClass.prototype.clearCookie = function (name) {
-        this.setCookie({
-            name: name,
-            value: '',
-            exdays: -1,
-        });
-    };
-    return CookieClass;
-}());
-var cookie = new CookieClass();
-
-/**
- * @Author: wanghui
- * createBy: @2020.05.21
- */
-// import date from './modules/date'
-// import dom from './modules/dom'
-// import filter from './modules/filter'
-// import format from './modules/format'
-// import match from './modules/match'
-// import number from './modules/number'
-// import tools from './modules/tools'
-var modules = {
-    cookie: cookie,
-};
-var Utils = /** @class */ (function () {
-    function Utils() {
-        Object.assign(this, modules);
-    }
-    /**
-     * 挂载各组件
-     * 示例：this.$cookie、this.$date、this.$match、this.$number、this.$tools
-     * @param {Object} app 需要挂载的目标对象
-     */
-    Utils.prototype.install = function (app) {
-        Object.keys(modules).forEach(function (key) {
-            if (key === 'filter') {
-                return modules[key].install(app);
-            }
-            app.config.globalProperties['$' + key] = modules[key];
-        });
-    };
-    return Utils;
-}());
-var utils = new Utils();
-
-module.exports = utils;

package/dist/index.d.ts

@@ -1,12 +0,0 @@
-declare class Utils {
-    [key: string]: Object;
-    constructor();
-    /**
-     * 挂载各组件
-     * 示例：this.$cookie、this.$date、this.$match、this.$number、this.$tools
-     * @param {Object} app 需要挂载的目标对象
-     */
-    install(app: any): void;
-}
-declare const utils: Utils;
-export default utils;

package/dist/index.esm.js

@@ -1,87 +0,0 @@
-/**
- * @file Cookie
- * @Author: wanghui
- * @createBy: @2021.01.21
- */
-var CookieClass = /** @class */ (function () {
-    function CookieClass() {
-    }
-    /**
-     * 获取cookie
-     * @param {String} name
-     * @return {String}
-     */
-    CookieClass.prototype.getCookie = function (name) {
-        var _name = name + '=';
-        var ca = document.cookie.split(';');
-        for (var i = 0; i < ca.length; i++) {
-            var c = ca[i];
-            while (c.charAt(0) === ' ')
-                c = c.substring(1);
-            if (c.includes(_name))
-                return c.substring(_name.length, c.length);
-        }
-        return '';
-    };
-    /**
-     * 设置cookie
-     * @param {Object} ICookie
-     */
-    CookieClass.prototype.setCookie = function (_a) {
-        var _b = _a.name, name = _b === void 0 ? '' : _b, _c = _a.value, value = _c === void 0 ? '' : _c, _d = _a.exdays, exdays = _d === void 0 ? -1 : _d, _e = _a.path, path = _e === void 0 ? '/' : _e, _f = _a.domain, domain = _f === void 0 ? '.jddmoto.com' : _f;
-        var d = new Date();
-        d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000));
-        var expires = "expires=" + d.toUTCString();
-        document.cookie = name + "=" + value + ";" + expires + ";path=" + path + ";domain=" + domain + ";";
-    };
-    /**
-     * 清除Cookie
-     * @param {String} name
-     */
-    CookieClass.prototype.clearCookie = function (name) {
-        this.setCookie({
-            name: name,
-            value: '',
-            exdays: -1,
-        });
-    };
-    return CookieClass;
-}());
-var cookie = new CookieClass();
-
-/**
- * @Author: wanghui
- * createBy: @2020.05.21
- */
-// import date from './modules/date'
-// import dom from './modules/dom'
-// import filter from './modules/filter'
-// import format from './modules/format'
-// import match from './modules/match'
-// import number from './modules/number'
-// import tools from './modules/tools'
-var modules = {
-    cookie: cookie,
-};
-var Utils = /** @class */ (function () {
-    function Utils() {
-        Object.assign(this, modules);
-    }
-    /**
-     * 挂载各组件
-     * 示例：this.$cookie、this.$date、this.$match、this.$number、this.$tools
-     * @param {Object} app 需要挂载的目标对象
-     */
-    Utils.prototype.install = function (app) {
-        Object.keys(modules).forEach(function (key) {
-            if (key === 'filter') {
-                return modules[key].install(app);
-            }
-            app.config.globalProperties['$' + key] = modules[key];
-        });
-    };
-    return Utils;
-}());
-var utils = new Utils();
-
-export { utils as default };

package/dist/lib-list.d.ts

@@ -1,2 +0,0 @@
-declare const _default: {};
-export default _default;

package/dist/modules/cookie/index.d.ts

@@ -1,27 +0,0 @@
-interface ICookie {
-    name: string;
-    value: string;
-    exdays: number;
-    path?: string;
-    domain?: string;
-}
-declare class CookieClass {
-    /**
-     * 获取cookie
-     * @param {String} name
-     * @return {String}
-     */
-    getCookie(name: string): string;
-    /**
-     * 设置cookie
-     * @param {Object} ICookie
-     */
-    setCookie({ name, value, exdays, path, domain, }: ICookie): void;
-    /**
-     * 清除Cookie
-     * @param {String} name
-     */
-    clearCookie(name: string): void;
-}
-declare const _default: CookieClass;
-export default _default;

package/dist/modules/date/index.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/modules/dom/index.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/modules/filter/index.d.ts

@@ -1,26 +0,0 @@
-declare const dateClass: any;
-declare const numberClass: any;
-declare const toolsClass: any;
-declare class FilterClass {
-    /**
-     * 格式化时间，示例：1586840260500 | format('YYYY-MM-DD HH:mm:ss')
-     * @param {String|Number} date
-     * @param {String} fmt 'YYYY-MM-DD HH:mm:ss'
-     * @return {String} 'YYYY-MM-DD HH:mm:ss'
-     */
-    format(date: string | number, fmt?: string): any;
-    /**
-     * 格式化金额，示例：123456 | formatMoney
-     * @param {Number} num
-     * @return {String} 123,456
-     */
-    formatMoney(money: number | string): string;
-    /**
-     * 截取数组或字符串，示例：'1234' | slice(3)
-     * @param {Array|String} target 数组或字符串
-     * @param {Number} length 截取长度，从0开始
-     * @return {any}
-     */
-    slice(target?: Array<any> | string, length?: number): any;
-    install(app: any): void;
-}

package/dist/modules/format/index.d.ts

@@ -1,13 +0,0 @@
-interface Obj {
-    [prop: string]: any;
-}
-declare class Format {
-    /**
-     * @desc 对于对象非数字与布尔值的value，当其为falsy时，转换成separator
-     * @param {object} obj 传入的对象
-     * @param {string} separator 替换后的值
-     * transformObjectNullVal({ a: null, b: 0}, '23') // {a: "23", b: 0}
-     * @return {object}
-     */
-    transformObjectNullVal<T extends Obj>(obj: T, separator?: string): T;
-}

package/dist/modules/match/index.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/modules/number/index.d.ts

@@ -1,39 +0,0 @@
-declare class NumberClass {
-    /**
-     * 个位数前面补0
-     * @param {Number} num 需要格式化的数字
-     * @return {String} '01'
-     */
-    formatNumber(num: number): string;
-    /**
-     * 将手机号中间部分替换为星号
-     * @param {String} phone 手机号码
-     * @return {String} 131****1111
-     */
-    formatPhone(phone: string): string;
-    /**
-     * 格式化数字 万
-     * @param {Number} num
-     * @return {String} 12.3万
-     */
-    convertToWan(num: number): string | number;
-    /**
-     * 格式化数字 k
-     * @param {Number} num
-     * @return {String} 1.2k
-     */
-    convertToThousand(num: number): string | number;
-    /**
-    * 随机数，指定范围
-    * @param {Number} min 开始
-    * @param {Number} max 结束
-    * @return {Number|Object}
-    */
-    random(min: number, max: number): number | null;
-    /**
-     * 格式化金额
-     * @param {Number} num
-     * @return {String} 123,456
-     */
-    formatMoney(money: number | string, signal: string): string;
-}

package/dist/modules/sentry/index.d.ts

@@ -1,15 +0,0 @@
-declare class Report {
-    static instance: any;
-    constructor(Vue: Object, options?: {});
-    [key: string]: any;
-    static getInstance(Vue: Object, Option: Object): any;
-    install(): void;
-    /**
-     * 主动上报
-     * @param {String} data
-     * @param {String} type 'info','warning','error'
-     * @param {Object} options
-     */
-    log(data?: any, type?: any, options?: any): void;
-}
-export default Report;

package/dist/modules/tools/index.d.ts

@@ -1 +0,0 @@
-export {};