@cloudcare/rum-uniapp 2.0.1 → 2.1.3

package/esm/helper/utils.js

@@ -44,6 +44,33 @@ export var values = function values(obj) {
   });
   return results;
 };
+export var keys = function keys(obj) {
+  var results = [];
+
+  if (obj === null) {
+    return results;
+  }
+
+  each(obj, function (value, key) {
+    results[results.length] = key;
+  });
+  return results;
+};
+export var indexOf = function indexOf(arr, target) {
+  var indexOf = arr.indexOf;
+
+  if (indexOf) {
+    return indexOf.call(arr, target);
+  } else {
+    for (var i = 0; i < arr.length; i++) {
+      if (target === arr[i]) {
+        return i;
+      }
+    }
+
+    return -1;
+  }
+};
 export function round(num, decimals) {
   return +num.toFixed(decimals);
 }
@@ -665,4 +692,45 @@ export function getActivePage() {
   }
 
   return {};
+}
+export function findCommaSeparatedValue(rawString, name) {
+  var matches = rawString.match('(?:^|;)\\s*' + name + '\\s*=\\s*([^;]+)');
+  return matches ? matches[1] : undefined;
+}
+export var ONE_SECOND = 1000;
+export var ONE_MINUTE = 60 * ONE_SECOND;
+export var ONE_HOUR = 60 * ONE_MINUTE;
+export var ONE_KILO_BYTE = 1024;
+export function defineGlobal(global, name, api) {
+  global[name] = api;
+}
+export function getGlobalObject() {
+  if (typeof globalThis === 'object') {
+    return globalThis;
+  }
+
+  Object.defineProperty(Object.prototype, '_dd_temp_', {
+    get: function get() {
+      return this;
+    },
+    configurable: true
+  }); // @ts-ignore
+
+  var globalObject = _dd_temp_; // @ts-ignore
+
+  delete Object.prototype._dd_temp_;
+
+  if (typeof globalObject !== 'object') {
+    // on safari _dd_temp_ is available on window but not globally
+    // fallback on other browser globals check
+    if (typeof self === 'object') {
+      globalObject = self;
+    } else if (typeof window === 'object') {
+      globalObject = window;
+    } else {
+      globalObject = {};
+    }
+  }
+
+  return globalObject;
 }

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/app/appCollection.js

@@ -20,7 +20,6 @@ function processAppUpdate(appinfo) {
       duration: msToNs(appinfo.duration)
     }
   };
-  console.log(appEvent, 'appEvent====');
   return {
     rawRumEvent: appEvent,
     startTime: appinfo.startTime

package/esm/rumEventsCollection/assembly.js

@@ -1,28 +1,26 @@
-import { extend2Lev, withSnakeCaseKeys, performDraw, isEmptyObject } from '../helper/utils';
+import { extend2Lev, withSnakeCaseKeys, isEmptyObject } from '../helper/utils';
 import { LifeCycleEventType } from '../core/lifeCycle';
 import { RumEventType } from '../helper/enums';
 import baseInfo from '../core/baseInfo';
-
-function isTracked(configuration) {
-  return performDraw(configuration.sampleRate);
-}
-
-var SessionType = {
-  SYNTHETICS: 'synthetics',
-  USER: 'user'
-};
-export function startRumAssembly(applicationId, configuration, lifeCycle, parentContexts, getCommonContext) {
+import { SessionType } from '../core/sessionManagement';
+import { createErrorFilter } from '../core/errorFilter';
+export function startRumAssembly(applicationId, configuration, session, lifeCycle, parentContexts, getCommonContext) {
+  var errorFilter = createErrorFilter(configuration, function (error) {
+    lifeCycle.notify(LifeCycleEventType.RAW_ERROR_COLLECTED, {
+      error: error
+    });
+  });
   lifeCycle.subscribe(LifeCycleEventType.RAW_RUM_EVENT_COLLECTED, function (data) {
     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
     };
 
-    if (isTracked(configuration) && (viewContext || rawRumEvent.type === RumEventType.APP)) {
+    if (session.isTracked() && (viewContext || rawRumEvent.type === RumEventType.APP)) {
       var actionContext = parentContexts.findAction(startTime);
       var commonContext = savedCommonContext || getCommonContext();
       var rumContext = {
@@ -39,7 +37,7 @@ export function startRumAssembly(applicationId, configuration, lifeCycle, parent
         device: {},
         date: new Date().getTime(),
         session: {
-          id: baseInfo.getSessionId(),
+          id: session.getSessionId(),
           type: SessionType.USER
         },
         user: {
@@ -49,7 +47,7 @@ export function startRumAssembly(applicationId, configuration, lifeCycle, parent
       };
       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;
@@ -63,7 +61,17 @@ export function startRumAssembly(applicationId, configuration, lifeCycle, parent
         }, commonContext.user);
       }
 
-      lifeCycle.notify(LifeCycleEventType.RUM_EVENT_COLLECTED, serverRumEvent);
+      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

@@ -3,13 +3,44 @@ import { RumEventType } from '../../helper/enums';
 import { LifeCycleEventType } from '../../core/lifeCycle';
 import { urlParse, replaceNumberCharByPath, getStatusGroup } from '../../helper/utils';
 export function startErrorCollection(lifeCycle, configuration) {
-  return doStartErrorCollection(lifeCycle, configuration, startAutomaticErrorCollection(configuration));
-}
-export function doStartErrorCollection(lifeCycle, configuration, observable) {
-  observable.subscribe(function (error) {
-    lifeCycle.notify(LifeCycleEventType.RAW_RUM_EVENT_COLLECTED, processError(error));
+  // return doStartErrorCollection(
+  // 	lifeCycle,
+  // 	configuration,
+  // 	startAutomaticErrorCollection(configuration),
+  // )
+  startAutomaticErrorCollection(configuration).subscribe(function (error) {
+    lifeCycle.notify(LifeCycleEventType.RAW_ERROR_COLLECTED, {
+      error: error
+    });
   });
+  return doStartErrorCollection(lifeCycle);
 }
+export function doStartErrorCollection(lifeCycle) {
+  lifeCycle.subscribe(LifeCycleEventType.RAW_ERROR_COLLECTED, function (error) {
+    lifeCycle.notify(LifeCycleEventType.RAW_RUM_EVENT_COLLECTED, processError(error.error));
+  });
+  return {
+    addError: function addError(customError, savedCommonContext) {// var rawError = computeRawError(
+      //   customError.error,
+      //   customError.startTime,
+      //   customError.source
+      // )
+      // lifeCycle.notify(LifeCycleEventType.RAW_ERROR_COLLECTED, {
+      //   customerContext: customError.context,
+      //   savedCommonContext: savedCommonContext,
+      //   error: rawError
+      // })
+    }
+  };
+} // function computeRawError(error, handlingStack, startClocks) {
+//   const stackTrace = error instanceof Error ? computeStackTrace(error) : undefined
+//   return extend({
+//     startClocks,
+//     source: ErrorSource.CUSTOM,
+//     originalError: error,
+//     handling: ErrorHandling.HANDLED
+//   }, formatUnknownError(stackTrace, error, 'Provided', handlingStack) )
+// }
 
 function processError(error) {
   var resource = error.resource;

package/esm/rumEventsCollection/internalContext.js

@@ -0,0 +1,27 @@
+/**
+ * Internal context keep returning v1 format
+ * to not break compatibility with logs data format
+ */
+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 {
+          application: {
+            id: applicationId
+          },
+          session: {
+            id: session.getSessionId()
+          },
+          userAction: actionContext ? {
+            id: actionContext.userAction.id
+          } : undefined,
+          page: viewContext.page
+        };
+      }
+    }
+  };
+}

package/esm/rumEventsCollection/page/index.js

@@ -34,6 +34,7 @@ export function rewritePage(configuration, lifeCycle, Vue) {
 
           if (methodName === 'onUnload' || methodName === 'onHide') {
             currentView.end();
+            currentView = undefined;
           }
         }
 

package/esm/rumEventsCollection/resource/resourceCollection.js

@@ -15,7 +15,6 @@ function processRequest(request) {
   var tracingInfo = computeRequestTracingInfo(request);
   var urlObj = urlParse(request.url).getParse();
   var startTime = request.startTime;
-  console.log(request, 'request=========');
   var resourceEvent = extend2Lev({
     date: startTime,
     resource: {

package/package.json

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