@cloudcare/rum-uniapp 2.1.18 → 2.1.22

package/esm/rumEventsCollection/action/trackActions.js

@@ -6,41 +6,67 @@ import { ActionType } from '../../helper/enums';
 import { tracker } from '../../core/sdk';
 var WHITE_METHOD = ['setup'];
 export function trackActions(lifeCycle, Vue) {
-  var action = startActionManagement(lifeCycle); // New views trigger the discard of the current pending Action
+  var action = startActionManagement(lifeCycle);
 
+  // New views trigger the discard of the current pending Action
   lifeCycle.subscribe(LifeCycleEventType.VIEW_CREATED, function () {
     action.discardCurrent();
   });
-
   if (Vue && Vue.extend) {
     var originVueExtend = Vue.extend;
-
     Vue.extend = function (vueOptions) {
       proxyInstance(vueOptions, action, lifeCycle);
       return originVueExtend.call(this, vueOptions);
     };
   } else {
     if (!tracker) return;
-    var originCreatePage = tracker.createPage;
-
-    tracker.createPage = function (page) {
-      // methods 方法
-      proxyInstance(page, action, lifeCycle);
-      return originCreatePage.call(this, page);
-    };
-
-    var originCreateComponent = tracker.createComponent;
-
-    tracker.createComponent = function (component) {
-      proxyInstance(component, action, lifeCycle);
-      return originCreateComponent.call(this, component);
-    };
-  } // var originVueExtend = Vue.extend
-
+    var hasComponent = false;
+    if (Page) {
+      hasComponent = true;
+      var originPage = Page;
+      Page = function Page(page) {
+        var methods = getMethods(page);
+        methods.forEach(methodName => {
+          clickProxy(page, methodName, function (_action) {
+            action.create(_action.type, _action.name);
+          }, lifeCycle);
+        });
+        return originPage(page);
+      };
+    }
+    if (Component) {
+      hasComponent = true;
+      var originComponent = Component;
+      Component = function Component(component) {
+        var methods = getMethods(component.methods);
+        methods.forEach(methodName => {
+          clickProxy(component, methodName, function (_action) {
+            action.create(_action.type, _action.name);
+          });
+        });
+        return originComponent(component);
+      };
+    }
+    if (!hasComponent) {
+      var originCreatePage = tracker.createPage;
+      tracker.createPage = function (page) {
+        // methods 方法
+        proxyInstance(page, action, lifeCycle);
+        return originCreatePage.call(this, page);
+      };
+      var originCreateComponent = tracker.createComponent;
+      tracker.createComponent = function (component) {
+        proxyInstance(component, action, lifeCycle);
+        return originCreateComponent.call(this, component);
+      };
+    }
+  }
+  // var originVueExtend = Vue.extend
 
   return {
     stop: function stop() {
-      action.discardCurrent(); // stopListener()
+      action.discardCurrent();
+      // stopListener()
     }
   };
 }
@@ -55,7 +81,6 @@ function proxyInstance(options, action, lifeCycle) {
       }, lifeCycle);
     });
   }
-
   var originMethods = getMethods(options);
   originMethods.forEach(methodName => {
     clickProxy(options, methodName, function (_action) {
@@ -63,20 +88,16 @@ function proxyInstance(options, action, lifeCycle) {
     }, lifeCycle);
   });
 }
-
 function clickProxy(origin, methodName, callback, lifeCycle) {
   if (WHITE_METHOD.indexOf(methodName) > -1) return;
   var originMethod = origin[methodName];
-
   origin[methodName] = function () {
     var result = originMethod.apply(this, arguments);
     var action = {};
-
     if (isObject(arguments[0])) {
       var currentTarget = arguments[0].currentTarget || {};
       var dataset = currentTarget.dataset || {};
       var actionType = arguments[0].type;
-
       if (actionType && ActionType[actionType]) {
         action.type = actionType;
         action.name = dataset.name || dataset.content || dataset.type;
@@ -105,11 +126,9 @@ function clickProxy(origin, methodName, callback, lifeCycle) {
         lifeCycle.notify(LifeCycleEventType.PAGE_ALIAS_ACTION, true);
       }
     }
-
     return result;
   };
 }
-
 function startActionManagement(lifeCycle) {
   var currentAction;
   var currentIdlePageActivitySubscription;
@@ -119,7 +138,6 @@ function startActionManagement(lifeCycle) {
         // Ignore any new action if another one is already occurring.
         return;
       }
-
       var pendingAutoAction = new PendingAutoAction(lifeCycle, type, name);
       currentAction = pendingAutoAction;
       currentIdlePageActivitySubscription = waitIdlePageActivity(lifeCycle, function (params) {
@@ -128,7 +146,6 @@ function startActionManagement(lifeCycle) {
         } else {
           pendingAutoAction.discard();
         }
-
         currentAction = undefined;
       });
     },
@@ -141,7 +158,6 @@ function startActionManagement(lifeCycle) {
     }
   };
 }
-
 var PendingAutoAction = function PendingAutoAction(lifeCycle, type, name) {
   this.id = UUID();
   this.startClocks = now();
@@ -154,7 +170,6 @@ var PendingAutoAction = function PendingAutoAction(lifeCycle, type, name) {
     startClocks: this.startClocks
   });
 };
-
 PendingAutoAction.prototype = {
   complete: function complete(endTime) {
     var eventCounts = this.eventCountsSubscription.eventCounts;

package/esm/rumEventsCollection/app/appCollection.js

@@ -8,7 +8,6 @@ export function startAppCollection(lifeCycle, configuration) {
   });
   return rewriteApp(configuration, lifeCycle);
 }
-
 function processAppUpdate(appinfo) {
   var appEvent = {
     date: appinfo.startTime,

package/esm/rumEventsCollection/app/index.js

@@ -1,6 +1,7 @@
 import { now, areInOrder, UUID } from '../../helper/utils';
-import { LifeCycleEventType } from '../../core/lifeCycle'; // 劫持原小程序App方法
+import { LifeCycleEventType } from '../../core/lifeCycle';
 
+// 劫持原小程序App方法
 export var THROTTLE_VIEW_UPDATE_PERIOD = 3000;
 export var startupTypes = {
   COLD: 'cold',
@@ -10,12 +11,12 @@ export function rewriteApp(configuration, lifeCycle, Vue) {
   var originApp = App;
   var appInfo = {
     isStartUp: false // 是否启动
-
   };
-  var startTime;
 
+  var startTime;
   App = function App(app) {
-    startTime = now() // 合并方法，插入记录脚本
+    startTime = now()
+    // 合并方法，插入记录脚本
     ;
     ['onLaunch', 'onShow', 'onHide'].forEach(methodName => {
       var userDefinedMethod = app[methodName]; // 暂存用户定义的方法
@@ -28,28 +29,25 @@ export function rewriteApp(configuration, lifeCycle, Vue) {
         } else if (methodName === 'onShow') {
           if (appInfo.isStartUp && appInfo.isHide) {
             // 判断是热启动
-            appInfo.startupType = startupTypes.HOT; // appUpdate()
+            appInfo.startupType = startupTypes.HOT;
+            // appUpdate()
           }
         } else if (methodName === 'onHide') {
           lifeCycle.notify(LifeCycleEventType.APP_HIDE);
           appInfo.isHide = true;
         }
-
         return userDefinedMethod && userDefinedMethod.call(this, options);
       };
     });
     return originApp(app);
   };
-
   startPerformanceObservable(lifeCycle);
 }
-
 function startPerformanceObservable(lifeCycle) {
   var subscribe = lifeCycle.subscribe(LifeCycleEventType.PERFORMANCE_ENTRY_COLLECTED, function (entitys) {
     // 过滤掉其他页面监听，只保留首次启动
     var codeDownloadDuration;
     var launchEntity = entitys.find(entity => entity.entryType === 'navigation' && entity.navigationType === 'appLaunch');
-
     if (typeof launchEntity !== 'undefined') {
       lifeCycle.notify(LifeCycleEventType.APP_UPDATE, {
         startTime: launchEntity.startTime,
@@ -59,9 +57,7 @@ function startPerformanceObservable(lifeCycle) {
         duration: launchEntity.duration
       });
     }
-
     var scriptentity = entitys.find(entity => entity.entryType === 'script' && entity.name === 'evaluateScript');
-
     if (typeof scriptentity !== 'undefined') {
       lifeCycle.notify(LifeCycleEventType.APP_UPDATE, {
         startTime: scriptentity.startTime,
@@ -71,25 +67,24 @@ function startPerformanceObservable(lifeCycle) {
         duration: scriptentity.duration
       });
     }
-
     var firstEntity = entitys.find(entity => entity.entryType === 'render' && entity.name === 'firstRender');
-
     if (firstEntity && scriptentity && launchEntity) {
       if (!areInOrder(firstEntity.duration, launchEntity.duration) || !areInOrder(scriptentity.duration, launchEntity.duration)) {
         return;
       }
-
-      codeDownloadDuration = launchEntity.duration - firstEntity.duration - scriptentity.duration; // 资源下载耗时
-
+      codeDownloadDuration = launchEntity.duration - firstEntity.duration - scriptentity.duration;
+      // 资源下载耗时
       lifeCycle.notify(LifeCycleEventType.APP_UPDATE, {
         startTime: launchEntity.startTime,
         name: '小程序包下载',
         type: 'package_download',
         id: UUID(),
         duration: codeDownloadDuration
-      }); // 资源下载时间暂时定为：首次启动时间-脚本加载时间-初次渲染时间
+      });
+      // 资源下载时间暂时定为：首次启动时间-脚本加载时间-初次渲染时间
     }
   });
+
   return {
     stop: subscribe.unsubscribe
   };

package/esm/rumEventsCollection/assembly.js

@@ -24,7 +24,6 @@ export function startRumAssembly(applicationId, configuration, session, lifeCycl
         launch: baseInfo.getLaunchOptions()
       }
     };
-
     if (session.isTracked() && (viewContext || rawRumEvent.type === RumEventType.APP)) {
       var actionContext = parentContexts.findAction(startTime);
       var commonContext = savedCommonContext || getCommonContext();
@@ -54,11 +53,9 @@ export function startRumAssembly(applicationId, configuration, session, lifeCycl
       var rumEvent = extend2Lev(rumContext, deviceContext, appContext, viewContext, actionContext, rawRumEvent);
       var serverRumEvent = withSnakeCaseKeys(rumEvent);
       var context = extend2Lev({}, commonContext.context, customerContext);
-
       if (!isEmptyObject(context)) {
         serverRumEvent.tags = context;
       }
-
       if (!isEmptyObject(commonContext.user)) {
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
         serverRumEvent.user = extend2Lev({
@@ -66,18 +63,15 @@ export function startRumAssembly(applicationId, configuration, session, lifeCycl
           is_signin: 'T'
         }, commonContext.user);
       }
-
       if (shouldSend(serverRumEvent, errorFilter)) {
         lifeCycle.notify(LifeCycleEventType.RUM_EVENT_COLLECTED, serverRumEvent);
       }
     }
   });
 }
-
 function shouldSend(event, errorFilter) {
   if (event.type === RumEventType.ERROR) {
     return !errorFilter.isLimitReached();
   }
-
   return true;
 }

package/esm/rumEventsCollection/error/errorCollection.js

@@ -26,7 +26,6 @@ export function doStartErrorCollection(lifeCycle) {
     }
   };
 }
-
 function computeRawError(error, startTime, context) {
   var stackTrace = error instanceof Error ? computeStackTrace(error) : undefined;
   return extend({
@@ -35,11 +34,9 @@ function computeRawError(error, startTime, context) {
     context
   }, formatUnknownError(stackTrace, error, 'Provided'));
 }
-
 function processError(error) {
   var resource = error.resource;
   var tracingInfo;
-
   if (resource) {
     tracingInfo = computeRequestTracingInfo(resource);
     var urlObj = urlParse(error.resource.url).getParse();
@@ -53,7 +50,6 @@ function processError(error) {
       urlPathGroup: replaceNumberCharByPath(urlObj.Path)
     };
   }
-
   var rawRumEvent = extend2Lev({
     date: error.startTime,
     error: {
@@ -72,14 +68,11 @@ function processError(error) {
     startTime: error.startTime
   };
 }
-
 function computeRequestTracingInfo(request) {
   var hasBeenTraced = request.traceId && request.spanId;
-
   if (!hasBeenTraced) {
     return undefined;
   }
-
   return {
     _dd: {
       spanId: request.spanId,

package/esm/rumEventsCollection/internalContext.js

@@ -6,7 +6,6 @@ export function startInternalContext(applicationId, session, parentContexts) {
   return {
     get: function get(startTime) {
       var viewContext = parentContexts.findView(startTime);
-
       if (session.isTracked() && viewContext) {
         var actionContext = parentContexts.findAction(startTime);
         return {

package/esm/rumEventsCollection/page/index.js

@@ -1,70 +1,66 @@
 import { now, throttle, UUID, isNumber, getActivePage } from '../../helper/utils';
 import { trackEventCounts } from '../trackEventCounts';
-import { LifeCycleEventType } from '../../core/lifeCycle'; // 劫持原小程序App方法
+import { LifeCycleEventType } from '../../core/lifeCycle';
 
+// 劫持原小程序App方法
 export var THROTTLE_VIEW_UPDATE_PERIOD = 3000;
-
 function proxyPage(pageOptions, lifeCycle) {
   // 合并方法，插入记录脚本
   var currentView,
-      startTime = now();
+    startTime = now();
   ['onReady', 'onShow', 'onLoad', 'onUnload', 'onHide'].forEach(methodName => {
     var userDefinedMethod = pageOptions[methodName];
-
     pageOptions[methodName] = function () {
-      var mpType = this.mpType || this.$vm.mpType;
-
+      var mpType = this.mpType || this.$vm && this.$vm.mpType;
       if (mpType !== 'page') {
         return userDefinedMethod && userDefinedMethod.apply(this, arguments);
-      } // 只处理page类型
-
-
+      }
+      // 只处理page类型
       if (methodName === 'onShow' || methodName === 'onLoad') {
         if (typeof currentView === 'undefined') {
           var activePage = getActivePage();
           currentView = newView(lifeCycle, activePage && activePage.route, startTime);
         }
       }
-
       currentView && currentView.setLoadEventEnd(methodName);
-
       if ((methodName === 'onUnload' || methodName === 'onHide' || methodName === 'onShow') && currentView) {
         currentView.triggerUpdate();
-
         if (methodName === 'onUnload' || methodName === 'onHide') {
           currentView.end();
           currentView = undefined;
         }
       }
-
       return userDefinedMethod && userDefinedMethod.apply(this, arguments);
     };
   });
 }
-
 export function rewritePage(configuration, lifeCycle, Vue) {
   if (Vue && Vue.extend) {
     var originVueExtend = Vue.extend;
-
     Vue.extend = function (vueOptions) {
       proxyPage(vueOptions, lifeCycle);
       return originVueExtend.call(this, vueOptions);
     };
   } else {
-    var originComponent = Component;
-
-    Component = function Component(pageOptions) {
-      proxyPage(pageOptions.methods, lifeCycle);
-      return originComponent.call(this, pageOptions);
-    };
+    if (Page) {
+      var originPage = Page;
+      Page = function Page(pageOptions) {
+        proxyPage(pageOptions, lifeCycle);
+        return originPage.call(this, pageOptions);
+      };
+    } else {
+      var originComponent = Component;
+      Component = function Component(pageOptions) {
+        proxyPage(pageOptions.methods, lifeCycle);
+        return originComponent.call(this, pageOptions);
+      };
+    }
   }
 }
-
 function newView(lifeCycle, route, startTime) {
   if (typeof startTime === 'undefined' || Number(startTime) === 0) {
     startTime = now();
   }
-
   var id = UUID();
   var isActive = true;
   var eventCounts = {
@@ -92,21 +88,16 @@ function newView(lifeCycle, route, startTime) {
   });
   var scheduleViewUpdate = scheduleViewThrottled.throttled;
   var cancelScheduleViewUpdate = scheduleViewThrottled.cancel;
-
   var _trackEventCounts = trackEventCounts(lifeCycle, function (newEventCounts) {
     eventCounts = newEventCounts;
     scheduleViewUpdate();
   });
-
   var stopEventCountsTracking = _trackEventCounts.stop;
-
   var _trackFptTime = trackFptTime(lifeCycle, function (duration) {
     fpt = duration;
     scheduleViewUpdate();
   });
-
   var stopFptTracking = _trackFptTime.stop;
-
   var _trackSetDataTime = trackSetDataTime(lifeCycle, function (duration) {
     if (isNumber(duration)) {
       setdataDuration += duration;
@@ -114,25 +105,20 @@ function newView(lifeCycle, route, startTime) {
       scheduleViewUpdate();
     }
   });
-
   var stopSetDataTracking = _trackSetDataTime.stop;
-
   var _trackLoadingTime = trackLoadingTime(lifeCycle, function (duration) {
     if (isNumber(duration)) {
       loadingDuration = duration;
       scheduleViewUpdate();
     }
   });
-
   var stopLoadingTimeTracking = _trackLoadingTime.stop;
-
   var setLoadEventEnd = function setLoadEventEnd(type) {
     if (type === 'onLoad') {
       loadingTime = now();
       loadingDuration = loadingTime - startTime;
     } else if (type === 'onShow') {
       showTime = now();
-
       if (typeof onload2onshowTime === 'undefined' && typeof loadingTime !== 'undefined') {
         onload2onshowTime = showTime - loadingTime;
       }
@@ -140,7 +126,6 @@ function newView(lifeCycle, route, startTime) {
       if (typeof onshow2onready === 'undefined' && typeof showTime !== 'undefined') {
         onshow2onready = now() - showTime;
       }
-
       if (typeof fmp === 'undefined') {
         fmp = now() - startTime; // 从开发者角度看，小程序首屏渲染完成的标志是首页 Page.onReady 事件触发。
       }
@@ -148,13 +133,10 @@ function newView(lifeCycle, route, startTime) {
       if (typeof showTime !== 'undefined') {
         stayTime = now() - showTime;
       }
-
       isActive = false;
     }
-
     triggerViewUpdate();
   };
-
   function triggerViewUpdate() {
     documentVersion += 1;
     lifeCycle.notify(LifeCycleEventType.VIEW_UPDATED, {
@@ -175,7 +157,6 @@ function newView(lifeCycle, route, startTime) {
       isActive: isActive
     });
   }
-
   return {
     scheduleUpdate: scheduleViewUpdate,
     setLoadEventEnd,
@@ -195,11 +176,9 @@ function newView(lifeCycle, route, startTime) {
     }
   };
 }
-
 function trackFptTime(lifeCycle, callback) {
   var subscribe = lifeCycle.subscribe(LifeCycleEventType.PERFORMANCE_ENTRY_COLLECTED, function (entitys) {
     var firstRenderEntity = entitys.find(entity => entity.entryType === 'render' && entity.name === 'firstRender');
-
     if (typeof firstRenderEntity !== 'undefined') {
       callback(firstRenderEntity.duration);
     }
@@ -208,11 +187,9 @@ function trackFptTime(lifeCycle, callback) {
     stop: subscribe.unsubscribe
   };
 }
-
 function trackLoadingTime(lifeCycle, callback) {
   var subscribe = lifeCycle.subscribe(LifeCycleEventType.PERFORMANCE_ENTRY_COLLECTED, function (entitys) {
     var navigationEnity = entitys.find(entity => entity.entryType === 'navigation');
-
     if (typeof navigationEnity !== 'undefined') {
       callback(navigationEnity.duration);
     }
@@ -221,7 +198,6 @@ function trackLoadingTime(lifeCycle, callback) {
     stop: subscribe.unsubscribe
   };
 }
-
 function trackSetDataTime(lifeCycle, callback) {
   var subscribe = lifeCycle.subscribe(LifeCycleEventType.PAGE_SET_DATA_UPDATE, function (data) {
     if (!data) return;

package/esm/rumEventsCollection/page/viewCollection.js

@@ -8,15 +8,12 @@ export function startViewCollection(lifeCycle, configuration, Vue) {
   });
   return rewritePage(configuration, lifeCycle, Vue);
 }
-
 function processViewUpdate(view) {
   var apdexLevel;
-
   if (view.fmp) {
     apdexLevel = parseInt(Number(view.fmp) / 1000);
     apdexLevel = apdexLevel > 9 ? 9 : apdexLevel;
   }
-
   var viewEvent = {
     _dd: {
       documentVersion: view.documentVersion

package/esm/rumEventsCollection/parentContexts.js

@@ -39,7 +39,6 @@ export function startParentContexts(lifeCycle) {
         startTime: currentAction.startClocks
       });
     }
-
     currentAction = undefined;
   });
   lifeCycle.subscribe(LifeCycleEventType.AUTO_ACTION_DISCARDED, function () {
@@ -54,15 +53,12 @@ export function startParentContexts(lifeCycle) {
   var clearOldContextsInterval = setInterval(function () {
     clearOldContexts(previousViews, VIEW_CONTEXT_TIME_OUT_DELAY);
   }, CLEAR_OLD_CONTEXTS_INTERVAL);
-
   function clearOldContexts(previousContexts, timeOutDelay) {
     var oldTimeThreshold = now() - timeOutDelay;
-
     while (previousContexts.length > 0 && previousContexts[previousContexts.length - 1].startTime < oldTimeThreshold) {
       previousContexts.pop();
     }
   }
-
   function buildCurrentActionContext() {
     return {
       userAction: {
@@ -70,7 +66,6 @@ export function startParentContexts(lifeCycle) {
       }
     };
   }
-
   function buildCurrentViewContext() {
     return {
       page: {
@@ -80,22 +75,18 @@ export function startParentContexts(lifeCycle) {
       }
     };
   }
-
   function findContext(buildContext, previousContexts, currentContext, startTime) {
     if (startTime === undefined) {
       return currentContext ? buildContext() : undefined;
     }
-
     if (currentContext && startTime >= currentContext.startTime) {
       return buildContext();
     }
-
     var flag = undefined;
     each(previousContexts, function (previousContext) {
       if (startTime > previousContext.endTime) {
         return false;
       }
-
       if (startTime >= previousContext.startTime) {
         flag = previousContext.context;
         return false;
@@ -103,7 +94,6 @@ export function startParentContexts(lifeCycle) {
     });
     return flag;
   }
-
   var parentContexts = {
     findView: function findView(startTime) {
       return findContext(buildCurrentViewContext, previousViews, currentView, startTime);

package/esm/rumEventsCollection/requestCollection.js

@@ -10,7 +10,6 @@ export function startRequestCollection(lifeCycle, configuration) {
   trackXhr(lifeCycle, configuration, tracer);
   trackDownload(lifeCycle, configuration);
 }
-
 function parseHeader(header) {
   // 大小写兼容
   if (!isObject(header)) return header;
@@ -20,7 +19,6 @@ function parseHeader(header) {
   });
   return res;
 }
-
 function getHeaderString(header) {
   if (!isObject(header)) return header;
   var headerStr = '';
@@ -29,7 +27,6 @@ function getHeaderString(header) {
   });
   return headerStr;
 }
-
 export function trackXhr(lifeCycle, configuration, tracer) {
   var xhrProxy = startXhrProxy(configuration);
   xhrProxy.beforeSend(function (context) {
@@ -88,7 +85,6 @@ export function trackDownload(lifeCycle, configuration) {
   });
   return dwonloadProxy;
 }
-
 function getNextRequestIndex() {
   var result = nextRequestIndex;
   nextRequestIndex += 1;

package/esm/rumEventsCollection/resource/resourceCollection.js

@@ -8,7 +8,6 @@ export function startResourceCollection(lifeCycle, configuration) {
     lifeCycle.notify(LifeCycleEventType.RAW_RUM_EVENT_COLLECTED, processRequest(request));
   });
 }
-
 function processRequest(request) {
   var type = request.type;
   var timing = request.performance;
@@ -37,14 +36,11 @@ function processRequest(request) {
     rawRumEvent: resourceEvent
   };
 }
-
 function computeRequestTracingInfo(request) {
   var hasBeenTraced = request.traceId && request.spanId;
-
   if (!hasBeenTraced) {
     return undefined;
   }
-
   return {
     _dd: {
       spanId: request.spanId,
@@ -55,7 +51,6 @@ function computeRequestTracingInfo(request) {
     }
   };
 }
-
 function computePerformanceEntryMetrics(timing) {
   return {
     resource: extend2Lev({}, {