@cloudcare/rum-uniapp 2.0.2 → 2.1.2

package/cjs/boot/buildEnv.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.buildEnv = void 0;
 var buildEnv = {
-  sdkVersion: '2.0.2',
+  sdkVersion: '2.1.2',
   sdkName: 'df_uniapp_rum_sdk'
 };
 exports.buildEnv = buildEnv;

package/cjs/boot/rum.entry.js

@@ -9,6 +9,8 @@ var _utils = require("../helper/utils");
 
 var _rum = require("./rum");
 
+var _enums = require("../helper/enums");
+
 function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 var makeRum = function makeRum(startRumImpl) {
@@ -18,12 +20,7 @@ var makeRum = function makeRum(startRumImpl) {
 
   var _getInternalContext = function getInternalContext() {};
 
-  function clonedCommonContext() {
-    return (0, _utils.extend2Lev)({}, {
-      context: globalContextManager.get(),
-      user: user
-    });
-  }
+  var addActionStrategy = function addActionStrategy() {};
 
   var rumGlobal = {
     init: function init(Vue, userConfiguration) {
@@ -45,6 +42,7 @@ var makeRum = function makeRum(startRumImpl) {
       });
 
       _getInternalContext = _startRumImpl.getInternalContext;
+      addActionStrategy = _startRumImpl.addAction;
       isAlreadyInitialized = true;
     },
     getInternalContext: function getInternalContext(startTime) {
@@ -54,6 +52,16 @@ var makeRum = function makeRum(startRumImpl) {
     removeRumGlobalContext: globalContextManager.remove,
     getRumGlobalContext: globalContextManager.get,
     setRumGlobalContext: globalContextManager.set,
+    addAction: function addAction(name, context) {
+      if ((0, _utils.isObject)(context) && (0, _utils.isString)(name)) {
+        addActionStrategy({
+          name: name,
+          context: (0, _utils.extend2Lev)({}, context),
+          startClocks: (0, _utils.now)(),
+          type: _enums.ActionType.custom
+        });
+      }
+    },
     setUser: function setUser(newUser) {
       var sanitizedUser = sanitizeUser(newUser);
 

package/cjs/boot/rum.js

@@ -53,9 +53,12 @@ var startRum = function startRum(Vue, userConfiguration, getCommonContext) {
   (0, _requestCollection.startRequestCollection)(lifeCycle, configuration);
   (0, _performanceCollection.startPagePerformanceObservable)(lifeCycle, configuration);
   (0, _setDataCollection.startSetDataColloction)(lifeCycle, Vue);
-  (0, _actionCollection.startActionCollection)(lifeCycle, configuration, Vue);
+
+  var _startActionCollection = (0, _actionCollection.startActionCollection)(lifeCycle, configuration, Vue);
+
   var internalContext = (0, _internalContext.startInternalContext)(userConfiguration.applicationId, session, parentContexts);
   return {
+    addAction: _startActionCollection.addAction,
     getInternalContext: internalContext.get
   };
 };

package/cjs/helper/enums.js

@@ -36,7 +36,8 @@ exports.RequestType = RequestType;
 var ActionType = {
   tap: 'tap',
   longpress: 'longpress',
-  longtap: 'longtap'
+  longtap: 'longtap',
+  custom: 'custom'
 };
 exports.ActionType = ActionType;
 var MpHook = {

package/cjs/rumEventsCollection/action/actionCollection.js

@@ -21,10 +21,18 @@ function startActionCollection(lifeCycle, configuration, Vue) {
   if (configuration.trackInteractions) {
     (0, _trackActions.trackActions)(lifeCycle, Vue);
   }
+
+  return {
+    addAction: function addAction(action, savedCommonContext) {
+      lifeCycle.notify(_lifeCycle.LifeCycleEventType.RAW_RUM_EVENT_COLLECTED, (0, _utils.extend2Lev)({
+        savedCommonContext: savedCommonContext
+      }, processAction(action)));
+    }
+  };
 }
 
 function processAction(action) {
-  var autoActionProperties = {
+  var autoActionProperties = isAutoAction(action) ? {
     action: {
       error: {
         count: action.counts.errorCount
@@ -38,7 +46,12 @@ function processAction(action) {
         count: action.counts.resourceCount
       }
     }
+  } : {
+    action: {
+      loadingTime: 0
+    }
   };
+  var customerContext = !isAutoAction(action) ? action.context : undefined;
   var actionEvent = (0, _utils.extend2Lev)({
     action: {
       target: {
@@ -50,7 +63,12 @@ function processAction(action) {
     type: _enums.RumEventType.ACTION
   }, autoActionProperties);
   return {
+    customerContext: customerContext,
     rawRumEvent: actionEvent,
     startTime: action.startClocks
   };
+}
+
+function isAutoAction(action) {
+  return action.type !== _enums.ActionType.custom;
 }

package/cjs/rumEventsCollection/assembly.js

@@ -29,7 +29,7 @@ function startRumAssembly(applicationId, configuration, session, lifeCycle, pare
     var startTime = data.startTime;
     var rawRumEvent = data.rawRumEvent;
     var viewContext = parentContexts.findView(startTime);
-    var savedCommonContext = data.savedGlobalContext;
+    var savedCommonContext = data.savedCommonContext;
     var customerContext = data.customerContext;
     var deviceContext = {
       device: _baseInfo["default"].deviceInfo
@@ -62,7 +62,7 @@ function startRumAssembly(applicationId, configuration, session, lifeCycle, pare
       };
       var rumEvent = (0, _utils.extend2Lev)(rumContext, deviceContext, viewContext, actionContext, rawRumEvent);
       var serverRumEvent = (0, _utils.withSnakeCaseKeys)(rumEvent);
-      var context = (0, _utils.extend2Lev)(commonContext.context, customerContext);
+      var context = (0, _utils.extend2Lev)({}, commonContext.context, customerContext);
 
       if (!(0, _utils.isEmptyObject)(context)) {
         serverRumEvent.tags = context;

package/esm/boot/buildEnv.js

@@ -1,4 +1,4 @@
 export var buildEnv = {
-  sdkVersion: '2.0.2',
+  sdkVersion: '2.1.2',
   sdkName: 'df_uniapp_rum_sdk'
 };

package/esm/boot/rum.entry.js

@@ -1,5 +1,6 @@
-import { isPercentage, extend2Lev, createContextManager, defineGlobal, getGlobalObject } from '../helper/utils';
+import { isPercentage, extend2Lev, now, createContextManager, defineGlobal, getGlobalObject, isString, isObject } from '../helper/utils';
 import { startRum } from './rum';
+import { ActionType } from '../helper/enums';
 export var makeRum = function makeRum(startRumImpl) {
   var isAlreadyInitialized = false;
   var globalContextManager = createContextManager();
@@ -7,12 +8,7 @@ export var makeRum = function makeRum(startRumImpl) {
 
   var _getInternalContext = function getInternalContext() {};
 
-  function clonedCommonContext() {
-    return extend2Lev({}, {
-      context: globalContextManager.get(),
-      user: user
-    });
-  }
+  var addActionStrategy = function addActionStrategy() {};
 
   var rumGlobal = {
     init: function init(Vue, userConfiguration) {
@@ -34,6 +30,7 @@ export var makeRum = function makeRum(startRumImpl) {
       });
 
       _getInternalContext = _startRumImpl.getInternalContext;
+      addActionStrategy = _startRumImpl.addAction;
       isAlreadyInitialized = true;
     },
     getInternalContext: function getInternalContext(startTime) {
@@ -43,6 +40,16 @@ export var makeRum = function makeRum(startRumImpl) {
     removeRumGlobalContext: globalContextManager.remove,
     getRumGlobalContext: globalContextManager.get,
     setRumGlobalContext: globalContextManager.set,
+    addAction: function addAction(name, context) {
+      if (isObject(context) && isString(name)) {
+        addActionStrategy({
+          name: name,
+          context: extend2Lev({}, context),
+          startClocks: now(),
+          type: ActionType.custom
+        });
+      }
+    },
     setUser: function setUser(newUser) {
       var sanitizedUser = sanitizeUser(newUser);
 

package/esm/boot/rum.js

@@ -29,9 +29,12 @@ export var startRum = function startRum(Vue, userConfiguration, getCommonContext
   startRequestCollection(lifeCycle, configuration);
   startPagePerformanceObservable(lifeCycle, configuration);
   startSetDataColloction(lifeCycle, Vue);
-  startActionCollection(lifeCycle, configuration, Vue);
+
+  var _startActionCollection = startActionCollection(lifeCycle, configuration, Vue);
+
   var internalContext = startInternalContext(userConfiguration.applicationId, session, parentContexts);
   return {
+    addAction: _startActionCollection.addAction,
     getInternalContext: internalContext.get
   };
 };

package/esm/helper/enums.js

@@ -20,7 +20,8 @@ export var RequestType = {
 export var ActionType = {
   tap: 'tap',
   longpress: 'longpress',
-  longtap: 'longtap'
+  longtap: 'longtap',
+  custom: 'custom'
 };
 export var MpHook = {
   data: 1,

package/esm/rumEventsCollection/action/actionCollection.js

@@ -1,6 +1,6 @@
 import { msToNs, extend2Lev } from '../../helper/utils';
 import { LifeCycleEventType } from '../../core/lifeCycle';
-import { RumEventType } from '../../helper/enums';
+import { RumEventType, ActionType } from '../../helper/enums';
 import { trackActions } from './trackActions';
 export function startActionCollection(lifeCycle, configuration, Vue) {
   lifeCycle.subscribe(LifeCycleEventType.AUTO_ACTION_COMPLETED, function (action) {
@@ -10,10 +10,18 @@ export function startActionCollection(lifeCycle, configuration, Vue) {
   if (configuration.trackInteractions) {
     trackActions(lifeCycle, Vue);
   }
+
+  return {
+    addAction: function addAction(action, savedCommonContext) {
+      lifeCycle.notify(LifeCycleEventType.RAW_RUM_EVENT_COLLECTED, extend2Lev({
+        savedCommonContext: savedCommonContext
+      }, processAction(action)));
+    }
+  };
 }
 
 function processAction(action) {
-  var autoActionProperties = {
+  var autoActionProperties = isAutoAction(action) ? {
     action: {
       error: {
         count: action.counts.errorCount
@@ -27,7 +35,12 @@ function processAction(action) {
         count: action.counts.resourceCount
       }
     }
+  } : {
+    action: {
+      loadingTime: 0
+    }
   };
+  var customerContext = !isAutoAction(action) ? action.context : undefined;
   var actionEvent = extend2Lev({
     action: {
       target: {
@@ -39,7 +52,12 @@ function processAction(action) {
     type: RumEventType.ACTION
   }, autoActionProperties);
   return {
+    customerContext: customerContext,
     rawRumEvent: actionEvent,
     startTime: action.startClocks
   };
+}
+
+function isAutoAction(action) {
+  return action.type !== ActionType.custom;
 }

package/esm/rumEventsCollection/assembly.js

@@ -14,7 +14,7 @@ export function startRumAssembly(applicationId, configuration, session, lifeCycl
     var startTime = data.startTime;
     var rawRumEvent = data.rawRumEvent;
     var viewContext = parentContexts.findView(startTime);
-    var savedCommonContext = data.savedGlobalContext;
+    var savedCommonContext = data.savedCommonContext;
     var customerContext = data.customerContext;
     var deviceContext = {
       device: baseInfo.deviceInfo
@@ -47,7 +47,7 @@ export function startRumAssembly(applicationId, configuration, session, lifeCycl
       };
       var rumEvent = extend2Lev(rumContext, deviceContext, viewContext, actionContext, rawRumEvent);
       var serverRumEvent = withSnakeCaseKeys(rumEvent);
-      var context = extend2Lev(commonContext.context, customerContext);
+      var context = extend2Lev({}, commonContext.context, customerContext);
 
       if (!isEmptyObject(context)) {
         serverRumEvent.tags = context;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cloudcare/rum-uniapp",
-	"version": "2.0.2",
+	"version": "2.1.2",
 	"main": "cjs/index.js",
 	"module": "esm/index.js",
 	"miniprogram": "cjs",