@cloudcare/rum-uniapp 2.0.1 → 2.0.2

package/cjs/rumEventsCollection/error/errorCollection.js

@@ -15,14 +15,46 @@ var _lifeCycle = require("../../core/lifeCycle");
 var _utils = require("../../helper/utils");
 
 function startErrorCollection(lifeCycle, configuration) {
-  return doStartErrorCollection(lifeCycle, configuration, (0, _errorCollection.startAutomaticErrorCollection)(configuration));
+  // return doStartErrorCollection(
+  // 	lifeCycle,
+  // 	configuration,
+  // 	startAutomaticErrorCollection(configuration),
+  // )
+  (0, _errorCollection.startAutomaticErrorCollection)(configuration).subscribe(function (error) {
+    lifeCycle.notify(_lifeCycle.LifeCycleEventType.RAW_ERROR_COLLECTED, {
+      error: error
+    });
+  });
+  return doStartErrorCollection(lifeCycle);
 }
 
-function doStartErrorCollection(lifeCycle, configuration, observable) {
-  observable.subscribe(function (error) {
-    lifeCycle.notify(_lifeCycle.LifeCycleEventType.RAW_RUM_EVENT_COLLECTED, processError(error));
+function doStartErrorCollection(lifeCycle) {
+  lifeCycle.subscribe(_lifeCycle.LifeCycleEventType.RAW_ERROR_COLLECTED, function (error) {
+    lifeCycle.notify(_lifeCycle.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/cjs/rumEventsCollection/internalContext.js

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.startInternalContext = startInternalContext;
+
+/**
+ * Internal context keep returning v1 format
+ * to not break compatibility with logs data format
+ */
+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/cjs/rumEventsCollection/page/index.js

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

package/cjs/rumEventsCollection/resource/resourceCollection.js

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

package/esm/boot/buildEnv.js

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

package/esm/boot/rum.entry.js

@@ -1,10 +1,12 @@
-import { isPercentage, extend2Lev, createContextManager } from '../helper/utils';
+import { isPercentage, extend2Lev, createContextManager, defineGlobal, getGlobalObject } from '../helper/utils';
 import { startRum } from './rum';
 export var makeRum = function makeRum(startRumImpl) {
   var isAlreadyInitialized = false;
   var globalContextManager = createContextManager();
   var user = {};
 
+  var _getInternalContext = function getInternalContext() {};
+
   function clonedCommonContext() {
     return extend2Lev({}, {
       context: globalContextManager.get(),
@@ -24,14 +26,19 @@ export var makeRum = function makeRum(startRumImpl) {
         return;
       }
 
-      startRumImpl(Vue, userConfiguration, function () {
+      var _startRumImpl = startRumImpl(Vue, userConfiguration, function () {
         return {
           user: user,
           context: globalContextManager.get()
         };
       });
+
+      _getInternalContext = _startRumImpl.getInternalContext;
       isAlreadyInitialized = true;
     },
+    getInternalContext: function getInternalContext(startTime) {
+      return _getInternalContext(startTime);
+    },
     addRumGlobalContext: globalContextManager.add,
     removeRumGlobalContext: globalContextManager.remove,
     getRumGlobalContext: globalContextManager.get,
@@ -97,4 +104,5 @@ export var makeRum = function makeRum(startRumImpl) {
     return result;
   }
 };
-export var datafluxRum = makeRum(startRum);
+export var datafluxRum = makeRum(startRum);
+defineGlobal(getGlobalObject(), 'DATAFLUX_RUM_MIN', datafluxRum);

package/esm/boot/rum.js

@@ -12,13 +12,16 @@ import { startAppCollection } from '../rumEventsCollection/app/appCollection';
 import { startPagePerformanceObservable } from '../rumEventsCollection/performanceCollection';
 import { startSetDataColloction } from '../rumEventsCollection/setDataCollection';
 import { startActionCollection } from '../rumEventsCollection/action/actionCollection';
+import { sessionManagement } from '../core/sessionManagement';
+import { startInternalContext } from '../rumEventsCollection/internalContext';
 import { sdk } from '../core/sdk';
 export var startRum = function startRum(Vue, userConfiguration, getCommonContext) {
   var configuration = commonInit(userConfiguration, buildEnv);
   var lifeCycle = new LifeCycle();
   var parentContexts = startParentContexts(lifeCycle);
   var batch = startRumBatch(configuration, lifeCycle);
-  startRumAssembly(userConfiguration.applicationId, configuration, lifeCycle, parentContexts, getCommonContext);
+  var session = new sessionManagement(configuration);
+  startRumAssembly(userConfiguration.applicationId, configuration, session, lifeCycle, parentContexts, getCommonContext);
   startAppCollection(lifeCycle, configuration);
   startResourceCollection(lifeCycle, configuration);
   startViewCollection(lifeCycle, configuration, Vue);
@@ -27,4 +30,8 @@ export var startRum = function startRum(Vue, userConfiguration, getCommonContext
   startPagePerformanceObservable(lifeCycle, configuration);
   startSetDataColloction(lifeCycle, Vue);
   startActionCollection(lifeCycle, configuration, Vue);
+  var internalContext = startInternalContext(userConfiguration.applicationId, session, parentContexts);
+  return {
+    getInternalContext: internalContext.get
+  };
 };

package/esm/core/baseInfo.js

@@ -4,7 +4,6 @@ import { CLIENT_ID_TOKEN } from '../helper/enums';
 
 class BaseInfo {
   constructor() {
-    this.sessionId = UUID();
     this.getDeviceInfo();
     this.getNetWork();
   }
@@ -63,10 +62,6 @@ class BaseInfo {
     });
   }
 
-  getSessionId() {
-    return this.sessionId;
-  }
-
 }
 
 export default new BaseInfo();

package/esm/core/configuration.js

@@ -66,6 +66,10 @@ export function commonInit(userConfiguration, buildEnv) {
     transportConfiguration.traceType = userConfiguration.traceType;
   }
 
+  if ('sampleRate' in userConfiguration) {
+    transportConfiguration.sampleRate = userConfiguration.sampleRate;
+  }
+
   return extend2Lev(DEFAULT_CONFIGURATION, transportConfiguration);
 }
 

package/esm/core/errorCollection.js

@@ -79,17 +79,16 @@ export function startRuntimeErrorTracking(errorObservable) {
 export function stopRuntimeErrorTracking() {
   report.unsubscribe(traceKitReportHandler);
 }
-var filteredErrorsObservable;
+var errorObservable;
 export function startAutomaticErrorCollection(configuration) {
-  if (!filteredErrorsObservable) {
-    var errorObservable = new Observable();
+  if (!errorObservable) {
+    errorObservable = new Observable();
     trackNetworkError(configuration, errorObservable);
     startConsoleTracking(errorObservable);
-    startRuntimeErrorTracking(errorObservable);
-    filteredErrorsObservable = filterErrors(configuration, errorObservable);
+    startRuntimeErrorTracking(errorObservable); // filteredErrorsObservable = filterErrors(configuration, errorObservable)
   }
 
-  return filteredErrorsObservable;
+  return errorObservable;
 }
 export function trackNetworkError(configuration, errorObservable) {
   startXhrProxy().onRequestComplete(function (context) {

package/esm/core/errorFilter.js

@@ -0,0 +1,38 @@
+import { ErrorSource } from './errorTools';
+import { now, ONE_MINUTE } from '../helper/utils';
+export function createErrorFilter(configuration, onLimitReached) {
+  var errorCount = 0;
+  var allowNextError = false;
+  return {
+    isLimitReached: function isLimitReached() {
+      if (errorCount === 0) {
+        setTimeout(function () {
+          errorCount = 0;
+        }, ONE_MINUTE);
+      }
+
+      errorCount += 1;
+
+      if (errorCount <= configuration.maxErrorsByMinute || allowNextError) {
+        allowNextError = false;
+        return false;
+      }
+
+      if (errorCount === configuration.maxErrorsByMinute + 1) {
+        allowNextError = true;
+
+        try {
+          onLimitReached({
+            message: "Reached max number of errors by minute: ".concat(configuration.maxErrorsByMinute),
+            source: ErrorSource.AGENT,
+            startTime: now()
+          });
+        } finally {
+          allowNextError = false;
+        }
+      }
+
+      return true;
+    }
+  };
+}

package/esm/core/errorTools.js

@@ -3,7 +3,8 @@ export var ErrorSource = {
   CONSOLE: 'console',
   NETWORK: 'network',
   SOURCE: 'source',
-  LOGGER: 'logger'
+  LOGGER: 'logger',
+  CUSTOM: 'custom'
 };
 export function formatUnknownError(stackTrace, errorObject, nonErrorPrefix) {
   if (!stackTrace || stackTrace.message === undefined && !(errorObject instanceof Error)) {

package/esm/core/lifeCycle.js

@@ -40,5 +40,6 @@ export var LifeCycleEventType = {
   REQUEST_STARTED: 'REQUEST_STARTED',
   REQUEST_COMPLETED: 'REQUEST_COMPLETED',
   RAW_RUM_EVENT_COLLECTED: 'RAW_RUM_EVENT_COLLECTED',
+  RAW_ERROR_COLLECTED: 'RAW_ERROR_COLLECTED',
   RUM_EVENT_COLLECTED: 'RUM_EVENT_COLLECTED'
 };

package/esm/core/sdk.js

@@ -34,7 +34,6 @@ function getSDK() {
     console.warn('unsupport platform, Fail to start');
   }
 
-  console.log('------get SDK-------');
   return {
     sdk,
     tracker

package/esm/core/sessionManagement.js

@@ -0,0 +1,20 @@
+import { UUID, performDraw } from '../helper/utils';
+export var SessionType = {
+  SYNTHETICS: 'synthetics',
+  USER: 'user'
+};
+export class sessionManagement {
+  constructor(configuration) {
+    this.sessionId = UUID();
+    this.isTrack = performDraw(configuration.sampleRate);
+  }
+
+  getSessionId() {
+    return this.sessionId;
+  }
+
+  isTracked() {
+    return this.isTrack;
+  }
+
+}

package/esm/core/transport.js

@@ -118,15 +118,6 @@ export var processedMessageByDataMap = function processedMessageByDataMap(messag
         }
       });
 
-      if (message.type === RumEventType.LOGGER) {
-        // 这里处理日志类型数据自定义字段
-        each(message, function (value, key) {
-          if (filterFileds.indexOf(key) === -1 && (isNumber(value) || isString(value) || isBoolean(value))) {
-            tagsStr.push(escapeRowData(key) + '=' + escapeRowData(value));
-          }
-        });
-      }
-
       if (tagsStr.length) {
         rowStr += tagsStr.join(',');
       }

package/esm/helper/enums.js

@@ -10,7 +10,8 @@ export var RumEventType = {
   VIEW: 'view',
   RESOURCE: 'resource',
   APP: 'app',
-  ACTION: 'action'
+  ACTION: 'action',
+  LOGGER: 'logger'
 };
 export var RequestType = {
   XHR: 'network',
@@ -41,4 +42,8 @@ export var TraceType = {
   W3C_TRACEPARENT: 'w3c_traceparent',
   SKYWALKING_V3: 'skywalking_v3',
   JAEGER: 'jaeger'
+};
+export var ErrorHandling = {
+  HANDLED: 'handled',
+  UNHANDLED: 'unhandled'
 };

package/esm/helper/limitModification.js

@@ -0,0 +1,57 @@
+import { extend2Lev, each } from './utils';
+/**
+ * Current limitations:
+ * - field path do not support array, 'a.b.c' only
+ * - modifiable fields type must be string
+ */
+
+export function limitModification(object, modifiableFieldPaths, modifier) {
+  var clone = extend2Lev({}, object);
+  var result = modifier(clone);
+  each(modifiableFieldPaths, function (path) {
+    var originalValue = get(object, path);
+    var newValue = get(clone, path);
+
+    if (typeof originalValue === 'string' && typeof newValue === 'string') {
+      set(object, path, newValue);
+    }
+  });
+  return result;
+}
+
+function get(object, path) {
+  var current = object;
+
+  for (var field of path.split('.')) {
+    if (!isValidObjectContaining(current, field)) {
+      return;
+    }
+
+    current = current[field];
+  }
+
+  return current;
+}
+
+function set(object, path, value) {
+  var current = object;
+  var fields = path.split('.');
+
+  for (var i = 0; i < fields.length; i += 1) {
+    var field = fields[i];
+
+    if (!isValidObjectContaining(current, field)) {
+      return;
+    }
+
+    if (i !== fields.length - 1) {
+      current = current[field];
+    } else {
+      current[field] = value;
+    }
+  }
+}
+
+function isValidObjectContaining(object, field) {
+  return typeof object === 'object' && object !== null && field in object;
+}

package/esm/helper/tracekit.js

@@ -904,7 +904,7 @@ export var computeStackTrace = function computeStackTraceWrapper() {
 var ERROR_TYPES_RE = /^(?:[Uu]ncaught (?:exception: )?)?(?:((?:Eval|Internal|Range|Reference|Syntax|Type|URI|)Error): )?(.*)$/;
 
 function extractMessage(ex) {
-  var message = ex && ex.message; // console.log('message',message)
+  var message = ex && ex.message;
 
   if (!message) {
     return 'No error message';

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/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,17 +1,15 @@
-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;
@@ -22,7 +20,7 @@ export function startRumAssembly(applicationId, configuration, lifeCycle, parent
       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: {
@@ -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;
           }
         }