monitor-track 1.10.1 → 1.11.0

package/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### 1.10.2 (2023-08-25)
+
+
+### ✨ Features
+
+* monitor ([c4da59b](https://github.com/zhoushoujian/monitor/commit/c4da59bfc6e4ffe38670cb0f3c0f9f76cdecf99a))
+
+
+
+### 1.10.1 (2023-08-25)
+
+
+### ✨ Features
+
+* monitor ([c4da59b](https://github.com/zhoushoujian/monitor/commit/c4da59bfc6e4ffe38670cb0f3c0f9f76cdecf99a))
+
+
+
 ## 1.10.0 (2023-08-25)
 
 

package/cjs/config/index.d.ts

@@ -23,10 +23,6 @@ export declare function getConfigValue(key: keyof IConfig): string | number | bo
     urls?: string[] | undefined;
     errors?: (string | {
         regExp: boolean;
-        /**
-         * @description 设置config配置项
-         * @param config 配置项
-         */
         input: string;
     })[] | undefined;
     apis?: string[] | undefined;

package/cjs/constant.d.ts

@@ -1,2 +1,2 @@
-export declare const shuyunTrackId = "shuyun-track-id";
-export declare const shuyunTrackSessionId = "shuyun-track-session-id";
+export declare const monitorTrackId = "monitor-track-id";
+export declare const monitorTrackSessionId = "monitor-track-session-id";

package/cjs/index.js

@@ -57,13 +57,9 @@ function __awaiter(thisArg, _arguments, P, generator) {
     });
 }
 
-const shuyunTrackId = 'shuyun-track-id';
-const shuyunTrackSessionId = 'shuyun-track-session-id';
+const monitorTrackId = 'monitor-track-id';
+const monitorTrackSessionId = 'monitor-track-session-id';
 
-/*
- * @Author: Mark.Zhang
- * @Description 配置项相关参数及方法
- */
 /**  */
 /**
  * @description config配置项默认值
@@ -91,11 +87,6 @@ function setConfig(config) {
     Object.assign(Config, config);
 }
 
-/*
- * @Author: Mark.Zhang
- * @Date: 2020-10-26 11:10:04
- * @Description 资源加载错误及js错误相关的处理方法
- */
 const eventsMatrix = [[]];
 rrweb__namespace.record({
     emit(event, isCheckout) {
@@ -616,7 +607,6 @@ function convertToSchema(data, map, redundancyData) {
     return reportData;
 }
 
-/* eslint-disable prefer-rest-params */
 /** 路由栈数组，存储路由变化信息 */
 let routerStack = [];
 /** 路由触发的时间 */
@@ -629,9 +619,11 @@ function _history(type) {
     const origin = history[type];
     return function () {
         // @ts-ignore
+        // eslint-disable-next-line prefer-rest-params
         const r = origin.apply(this, arguments);
         const e = new Event(type);
         // @ts-ignore
+        // eslint-disable-next-line prefer-rest-params
         e.arguments = arguments;
         window.dispatchEvent(e);
         return r;
@@ -709,13 +701,8 @@ function setRouteStack(page) {
     };
 }
 
-var version = "1.10.1";
+var version = "1.11.0";
 
-/*
- * @Author: Mark.Zhang
- * @Date: 2020-10-26 15:40:16
- * @Description 全局配置项
- */
 // 上报数据
 let Report = {
     uuid: '',
@@ -801,11 +788,12 @@ function setReportValue(key, value) {
 function getReport() {
     const nav = getNavigator();
     const viewport = getViewport();
+    const uuid = localStorage.getItem('username') || getUid();
     return Object.assign(Object.assign(Object.assign({}, Report), nav), {
         version,
         projectID: Config.projectID,
         host: location.host,
-        uuid: getUid(),
+        uuid,
         viewport,
         screen: `${screen.width} x ${screen.height}`,
         pageTitle: document.title,
@@ -974,11 +962,6 @@ const hackFetch = (XMLHttpRequestTimeout) => {
     }
 };
 
-/*
- * @Author: Mark.Zhang
- * @Date: 2020-10-26 11:10:04
- * @Description 用户行为处理方法
- */
 /**
  * @description 点击事件触发后的操作
  */
@@ -1040,10 +1023,10 @@ const parser = new uaParserJs.UAParser();
  * @description 获取uuid
  */
 function getUid() {
-    let uid = localStorage.getItem(shuyunTrackId) || '';
+    let uid = localStorage.getItem(monitorTrackId) || '';
     if (!uid) {
         uid = uuid.v4();
-        localStorage.setItem(shuyunTrackId, uid);
+        localStorage.setItem(monitorTrackId, uid);
     }
     return uid;
 }
@@ -1051,13 +1034,13 @@ function getUid() {
  * @description 获取session id
  */
 function getSessionId() {
-    const sessionId = sessionStorage.getItem(shuyunTrackSessionId);
+    const sessionId = sessionStorage.getItem(monitorTrackSessionId);
     if (sessionId) {
         return sessionId;
     }
     else {
         const id = uuid.v4();
-        sessionStorage.setItem(shuyunTrackSessionId, id);
+        sessionStorage.setItem(monitorTrackSessionId, id);
         return id;
     }
 }
@@ -1478,7 +1461,7 @@ class Track {
         if (Config.enableError) {
             off('error', handleError);
         }
-        sessionStorage.removeItem(shuyunTrackSessionId);
+        sessionStorage.removeItem(monitorTrackSessionId);
     }
 }
 

package/esm/config/global.js

@@ -5,11 +5,6 @@ import { setRouteStack, setPVTime } from '../handlers/pv.js';
 import { Config } from './index.js';
 import { version } from '../package.json.js';
 
-/*
- * @Author: Mark.Zhang
- * @Date: 2020-10-26 15:40:16
- * @Description 全局配置项
- */
 // 上报数据
 let Report = {
     uuid: '',
@@ -95,11 +90,12 @@ function setReportValue(key, value) {
 function getReport() {
     const nav = getNavigator();
     const viewport = getViewport();
+    const uuid = localStorage.getItem('username') || getUid();
     return Object.assign(Object.assign(Object.assign({}, Report), nav), {
         version,
         projectID: Config.projectID,
         host: location.host,
-        uuid: getUid(),
+        uuid,
         viewport,
         screen: `${screen.width} x ${screen.height}`,
         pageTitle: document.title,

package/esm/config/index.d.ts

@@ -23,10 +23,6 @@ export declare function getConfigValue(key: keyof IConfig): string | number | bo
     urls?: string[] | undefined;
     errors?: (string | {
         regExp: boolean;
-        /**
-         * @description 设置config配置项
-         * @param config 配置项
-         */
         input: string;
     })[] | undefined;
     apis?: string[] | undefined;

package/esm/config/index.js

@@ -1,7 +1,3 @@
-/*
- * @Author: Mark.Zhang
- * @Description 配置项相关参数及方法
- */
 /**  */
 /**
  * @description config配置项默认值

package/esm/constant.d.ts

@@ -1,2 +1,2 @@
-export declare const shuyunTrackId = "shuyun-track-id";
-export declare const shuyunTrackSessionId = "shuyun-track-session-id";
+export declare const monitorTrackId = "monitor-track-id";
+export declare const monitorTrackSessionId = "monitor-track-session-id";

package/esm/constant.js

@@ -1,4 +1,4 @@
-const shuyunTrackId = 'shuyun-track-id';
-const shuyunTrackSessionId = 'shuyun-track-session-id';
+const monitorTrackId = 'monitor-track-id';
+const monitorTrackSessionId = 'monitor-track-session-id';
 
-export { shuyunTrackId, shuyunTrackSessionId };
+export { monitorTrackId, monitorTrackSessionId };

package/esm/handlers/error.js

@@ -6,11 +6,6 @@ import { report } from '../reporter.js';
 import { setReportValue, getReport } from '../config/global.js';
 import { Config } from '../config/index.js';
 
-/*
- * @Author: Mark.Zhang
- * @Date: 2020-10-26 11:10:04
- * @Description 资源加载错误及js错误相关的处理方法
- */
 const eventsMatrix = [[]];
 rrweb.record({
     emit(event, isCheckout) {

package/esm/handlers/pv.js

@@ -3,7 +3,6 @@ import { report } from '../reporter.js';
 import { Config } from '../config/index.js';
 import { visualTrackFunc } from '../utils/index.js';
 
-/* eslint-disable prefer-rest-params */
 /** 路由栈数组，存储路由变化信息 */
 let routerStack = [];
 /** 路由触发的时间 */
@@ -16,9 +15,11 @@ function _history(type) {
     const origin = history[type];
     return function () {
         // @ts-ignore
+        // eslint-disable-next-line prefer-rest-params
         const r = origin.apply(this, arguments);
         const e = new Event(type);
         // @ts-ignore
+        // eslint-disable-next-line prefer-rest-params
         e.arguments = arguments;
         window.dispatchEvent(e);
         return r;

package/esm/handlers/user-activity.js

@@ -2,11 +2,6 @@ import { getElmPath } from '../utils/index.js';
 import { report } from '../reporter.js';
 import { setReportValue, getReport } from '../config/global.js';
 
-/*
- * @Author: Mark.Zhang
- * @Date: 2020-10-26 11:10:04
- * @Description 用户行为处理方法
- */
 /**
  * @description 点击事件触发后的操作
  */

package/esm/index.js

@@ -4,7 +4,7 @@ import { initReport, recordXMLHttpRequestLog, hackFetch } from './config/global.
 import { _history, handleHistoryChange } from './handlers/pv.js';
 import { handleError } from './handlers/error.js';
 import { handleClick, handleBlur, handleScroll } from './handlers/user-activity.js';
-import { shuyunTrackSessionId } from './constant.js';
+import { monitorTrackSessionId } from './constant.js';
 
 class Track {
     constructor() {
@@ -108,7 +108,7 @@ class Track {
         if (Config.enableError) {
             off('error', handleError);
         }
-        sessionStorage.removeItem(shuyunTrackSessionId);
+        sessionStorage.removeItem(monitorTrackSessionId);
     }
 }
 

package/esm/package.json.js

@@ -1,3 +1,3 @@
-var version = "1.10.1";
+var version = "1.11.0";
 
 export { version };

package/esm/utils/index.js

@@ -2,7 +2,7 @@ import { __awaiter } from '../_virtual/_tslib.js';
 import axios from 'axios';
 import { v4 } from 'uuid';
 import { UAParser } from 'ua-parser-js';
-import { shuyunTrackSessionId, shuyunTrackId } from '../constant.js';
+import { monitorTrackSessionId, monitorTrackId } from '../constant.js';
 import { setReportValue, getReport } from '../config/global.js';
 import { report } from '../reporter.js';
 import { Config } from '../config/index.js';
@@ -15,10 +15,10 @@ const parser = new UAParser();
  * @description 获取uuid
  */
 function getUid() {
-    let uid = localStorage.getItem(shuyunTrackId) || '';
+    let uid = localStorage.getItem(monitorTrackId) || '';
     if (!uid) {
         uid = v4();
-        localStorage.setItem(shuyunTrackId, uid);
+        localStorage.setItem(monitorTrackId, uid);
     }
     return uid;
 }
@@ -26,13 +26,13 @@ function getUid() {
  * @description 获取session id
  */
 function getSessionId() {
-    const sessionId = sessionStorage.getItem(shuyunTrackSessionId);
+    const sessionId = sessionStorage.getItem(monitorTrackSessionId);
     if (sessionId) {
         return sessionId;
     }
     else {
         const id = v4();
-        sessionStorage.setItem(shuyunTrackSessionId, id);
+        sessionStorage.setItem(monitorTrackSessionId, id);
         return id;
     }
 }

package/index.js

@@ -1,4 +1,4 @@
-var ShuyunTrack = (function (axios, uuid, uaParserJs, rrweb, ErrorStackParser, html2canvas) {
+var MonitorTrack = (function (axios, uuid, uaParserJs, rrweb, ErrorStackParser, html2canvas) {
     'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -95,13 +95,9 @@ var ShuyunTrack = (function (axios, uuid, uaParserJs, rrweb, ErrorStackParser, h
         return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
     };
 
-    var shuyunTrackId = 'shuyun-track-id';
-    var shuyunTrackSessionId = 'shuyun-track-session-id';
+    var monitorTrackId = 'monitor-track-id';
+    var monitorTrackSessionId = 'monitor-track-session-id';
 
-    /*
-     * @Author: Mark.Zhang
-     * @Description 配置项相关参数及方法
-     */
     /**  */
     /**
      * @description config配置项默认值
@@ -129,11 +125,6 @@ var ShuyunTrack = (function (axios, uuid, uaParserJs, rrweb, ErrorStackParser, h
         Object.assign(Config, config);
     }
 
-    /*
-     * @Author: Mark.Zhang
-     * @Date: 2020-10-26 11:10:04
-     * @Description 资源加载错误及js错误相关的处理方法
-     */
     var eventsMatrix = [[]];
     rrweb__namespace.record({
         emit: function (event, isCheckout) {
@@ -653,7 +644,6 @@ var ShuyunTrack = (function (axios, uuid, uaParserJs, rrweb, ErrorStackParser, h
         return reportData;
     }
 
-    /* eslint-disable prefer-rest-params */
     /** 路由栈数组，存储路由变化信息 */
     var routerStack = [];
     /** 路由触发的时间 */
@@ -666,9 +656,11 @@ var ShuyunTrack = (function (axios, uuid, uaParserJs, rrweb, ErrorStackParser, h
         var origin = history[type];
         return function () {
             // @ts-ignore
+            // eslint-disable-next-line prefer-rest-params
             var r = origin.apply(this, arguments);
             var e = new Event(type);
             // @ts-ignore
+            // eslint-disable-next-line prefer-rest-params
             e.arguments = arguments;
             window.dispatchEvent(e);
             return r;
@@ -746,7 +738,7 @@ var ShuyunTrack = (function (axios, uuid, uaParserJs, rrweb, ErrorStackParser, h
         };
     }
 
-    var version = "1.10.1";
+    var version = "1.11.0";
 
     // 上报数据
     var Report = {
@@ -833,11 +825,12 @@ var ShuyunTrack = (function (axios, uuid, uaParserJs, rrweb, ErrorStackParser, h
     function getReport() {
         var nav = getNavigator();
         var viewport = getViewport();
+        var uuid = localStorage.getItem('username') || getUid();
         return __assign(__assign(__assign({}, Report), nav), {
             version: version,
             projectID: Config.projectID,
             host: location.host,
-            uuid: getUid(),
+            uuid: uuid,
             viewport: viewport,
             screen: "".concat(screen.width, " x ").concat(screen.height),
             pageTitle: document.title,
@@ -1011,11 +1004,6 @@ var ShuyunTrack = (function (axios, uuid, uaParserJs, rrweb, ErrorStackParser, h
         }
     };
 
-    /*
-     * @Author: Mark.Zhang
-     * @Date: 2020-10-26 11:10:04
-     * @Description 用户行为处理方法
-     */
     /**
      * @description 点击事件触发后的操作
      */
@@ -1077,10 +1065,10 @@ var ShuyunTrack = (function (axios, uuid, uaParserJs, rrweb, ErrorStackParser, h
      * @description 获取uuid
      */
     function getUid() {
-        var uid = localStorage.getItem(shuyunTrackId) || '';
+        var uid = localStorage.getItem(monitorTrackId) || '';
         if (!uid) {
             uid = uuid.v4();
-            localStorage.setItem(shuyunTrackId, uid);
+            localStorage.setItem(monitorTrackId, uid);
         }
         return uid;
     }
@@ -1088,13 +1076,13 @@ var ShuyunTrack = (function (axios, uuid, uaParserJs, rrweb, ErrorStackParser, h
      * @description 获取session id
      */
     function getSessionId() {
-        var sessionId = sessionStorage.getItem(shuyunTrackSessionId);
+        var sessionId = sessionStorage.getItem(monitorTrackSessionId);
         if (sessionId) {
             return sessionId;
         }
         else {
             var id = uuid.v4();
-            sessionStorage.setItem(shuyunTrackSessionId, id);
+            sessionStorage.setItem(monitorTrackSessionId, id);
             return id;
         }
     }
@@ -1524,7 +1512,7 @@ var ShuyunTrack = (function (axios, uuid, uaParserJs, rrweb, ErrorStackParser, h
             if (Config.enableError) {
                 off('error', handleError);
             }
-            sessionStorage.removeItem(shuyunTrackSessionId);
+            sessionStorage.removeItem(monitorTrackSessionId);
         };
         return Track;
     }());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monitor-track",
-  "version": "1.10.1",
+  "version": "1.11.0",
   "description": "前端监控及埋点SDK工具javascript版本",
   "main": "cjs/index.js",
   "module": "esm/index.js",