@cloudcare/rum-uniapp 2.1.16 → 2.1.18

package/cjs/helper/tracekit.js

@@ -91,6 +91,7 @@ var report = function reportModuleWrapper() {
     installGlobalUnhandledRejectionHandler();
     installGlobalOnPageNotFoundHandler();
     installGlobalOnMemoryWarningHandler();
+    installGlobalOnLazyLoadErrorHandler();
     handlers.push(handler);
   }
   /**
@@ -138,7 +139,8 @@ var report = function reportModuleWrapper() {
   var onErrorHandlerInstalled;
   var onUnhandledRejectionHandlerInstalled;
   var onPageNotFoundHandlerInstalled;
-  var onOnMemoryWarningHandlerInstalled;
+  var onMemoryWarningHandlerInstalled;
+  var onLazyLoadErrorHandlerInstalled;
   /**
    * Ensures all global unhandled exceptions are recorded.
    * Supported by Gecko and IE.
@@ -271,7 +273,7 @@ var report = function reportModuleWrapper() {
   }
 
   function installGlobalOnMemoryWarningHandler() {
-    if (onOnMemoryWarningHandlerInstalled || !_sdk.sdk.onMemoryWarning) {
+    if (onMemoryWarningHandlerInstalled || !_sdk.sdk.onMemoryWarning) {
       return;
     }
 
@@ -304,7 +306,24 @@ var report = function reportModuleWrapper() {
       }, true, {});
     });
 
-    onOnMemoryWarningHandlerInstalled = true;
+    onMemoryWarningHandlerInstalled = true;
+  }
+
+  function installGlobalOnLazyLoadErrorHandler() {
+    if (onLazyLoadErrorHandlerInstalled || !_sdk.sdk.onLazyLoadError) {
+      return;
+    }
+
+    _sdk.sdk.onLazyLoadError(function (res) {
+      var subpackage = res.subpackage || [];
+      notifyHandlers({
+        message: res.errMsg || '',
+        type: 'lazyloaderror',
+        name: subpackage.join(',') + 'load error'
+      }, true, {});
+    });
+
+    onLazyLoadErrorHandlerInstalled = true;
   }
   /**
    * Reports an unhandled Error.
@@ -919,7 +938,7 @@ exports.computeStackTrace = computeStackTrace;
 var ERROR_TYPES_RE = /^(?:[Uu]ncaught (?:exception: )?)?(?:((?:Eval|Internal|Range|Reference|Syntax|Type|URI|)Error): )?(.*)$/;
 
 function extractMessage(ex) {
-  var message = ex && ex.message;
+  var message = ex && ex.message; // console.log('message',message)
 
   if (!message) {
     return 'No error message';

package/cjs/helper/utils.js

@@ -7,7 +7,6 @@ exports.round = round;
 exports.toServerDuration = toServerDuration;
 exports.msToNs = msToNs;
 exports.UUID = UUID;
-exports.jsonStringify = jsonStringify;
 exports.elapsed = elapsed;
 exports.getMethods = getMethods;
 exports.replaceNumberCharByPath = replaceNumberCharByPath;
@@ -24,15 +23,19 @@ exports.escapeJsonValue = escapeJsonValue;
 exports.escapeFieldValueStr = escapeFieldValueStr;
 exports.escapeRowField = escapeRowField;
 exports.getOrigin = getOrigin;
-exports.createContextManager = createContextManager;
 exports.getActivePage = getActivePage;
 exports.findCommaSeparatedValue = findCommaSeparatedValue;
+exports.getType = getType;
+exports.mergeInto = mergeInto;
+exports.deepClone = deepClone;
 exports.defineGlobal = defineGlobal;
 exports.getGlobalObject = getGlobalObject;
-exports.ONE_KILO_BYTE = exports.ONE_HOUR = exports.ONE_MINUTE = exports.ONE_SECOND = exports.deepMixObject = exports.defineObject = exports.getOwnObjectKeys = exports.urlParse = exports.throttle = exports.now = exports.safeJSONParse = exports.isJSONString = exports.isEmptyObject = exports.isObject = exports.trim = exports.extend2Lev = exports.extend = exports.getURLSearchParams = exports.getQueryParamsFromUrl = exports.base64Encode = exports.utf8Encode = exports.areInOrder = exports.toArray = exports.isArray = exports.isNumber = exports.isBoolean = exports.isFunction = exports.isDate = exports.isString = exports.isUndefined = exports.indexOf = exports.keys = exports.values = exports.each = exports.isArguments = void 0;
+exports.ONE_HOUR = exports.ONE_MINUTE = exports.ONE_SECOND = exports.deepMixObject = exports.defineObject = exports.getOwnObjectKeys = exports.urlParse = exports.throttle = exports.now = exports.safeJSONParse = exports.isJSONString = exports.isEmptyObject = exports.isObject = exports.trim = exports.extend2Lev = exports.extend = exports.getURLSearchParams = exports.getQueryParamsFromUrl = exports.base64Encode = exports.utf8Encode = exports.areInOrder = exports.toArray = exports.isArray = exports.isFunction = exports.isNumber = exports.isBoolean = exports.isDate = exports.isString = exports.isUndefined = exports.indexOf = exports.keys = exports.values = exports.each = exports.isArguments = void 0;
 
 var _enums = require("./enums");
 
+var _jsonStringify = require("../helper/jsonStringify");
+
 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 ArrayProto = Array.prototype;
@@ -161,6 +164,18 @@ var isDate = function isDate(obj) {
 
 exports.isDate = isDate;
 
+var isBoolean = function isBoolean(obj) {
+  return toString.call(obj) === '[object Boolean]';
+};
+
+exports.isBoolean = isBoolean;
+
+var isNumber = function isNumber(obj) {
+  return toString.call(obj) === '[object Number]' && /[\d\.]+/.test(String(obj));
+};
+
+exports.isNumber = isNumber;
+
 var isFunction = function isFunction(f) {
   if (!f) {
     return false;
@@ -175,18 +190,6 @@ var isFunction = function isFunction(f) {
 
 exports.isFunction = isFunction;
 
-var isBoolean = function isBoolean(obj) {
-  return toString.call(obj) === '[object Boolean]';
-};
-
-exports.isBoolean = isBoolean;
-
-var isNumber = function isNumber(obj) {
-  return toString.call(obj) === '[object Number]' && /[\d\.]+/.test(String(obj));
-};
-
-exports.isNumber = isNumber;
-
 var isArray = nativeIsArray || function (obj) {
   return toString.call(obj) === '[object Array]';
 };
@@ -237,51 +240,6 @@ function UUID(placeholder) {
   (parseInt(placeholder, 10) ^ Math.random() * 16 >> parseInt(placeholder, 10) / 4).toString(16) : "".concat(1e7, "-", 1e3, "-", 4e3, "-", 8e3, "-", 1e11).replace(/[018]/g, UUID);
 }
 
-function jsonStringify(value, replacer, space) {
-  if (value === null || value === undefined) {
-    return JSON.stringify(value);
-  }
-
-  var originalToJSON = [false, undefined];
-
-  if (hasToJSON(value)) {
-    // We need to add a flag and not rely on the truthiness of value.toJSON
-    // because it can be set but undefined and that's actually significant.
-    originalToJSON = [true, value.toJSON];
-    delete value.toJSON;
-  }
-
-  var originalProtoToJSON = [false, undefined];
-  var prototype;
-
-  if (_typeof(value) === 'object') {
-    prototype = Object.getPrototypeOf(value);
-
-    if (hasToJSON(prototype)) {
-      originalProtoToJSON = [true, prototype.toJSON];
-      delete prototype.toJSON;
-    }
-  }
-
-  var result;
-
-  try {
-    result = JSON.stringify(value, undefined, space);
-  } catch (e) {
-    result = '<error: unable to serialize object>';
-  } finally {
-    if (originalToJSON[0]) {
-      value.toJSON = originalToJSON[1];
-    }
-
-    if (originalProtoToJSON[0]) {
-      prototype.toJSON = originalProtoToJSON[1];
-    }
-  }
-
-  return result;
-}
-
 var utf8Encode = function utf8Encode(string) {
   string = (string + '').replace(/\r\n/g, '\n').replace(/\r/g, '\n');
   var utftext = '',
@@ -537,55 +495,48 @@ var safeJSONParse = function safeJSONParse(str) {
 
 exports.safeJSONParse = safeJSONParse;
 
-var now = function now() {
+var now = Date.now || function () {
   return new Date().getTime();
 };
 
 exports.now = now;
 
-var throttle = function throttle(func, wait, options) {
-  var timeout, context, args, result;
-  var previous = 0;
-  if (!options) options = {};
-
-  var later = function later() {
-    previous = options.leading === false ? 0 : new Date().getTime();
-    timeout = null;
-    result = func.apply(context, args);
-    if (!timeout) context = args = null;
-  };
-
-  var throttled = function throttled() {
-    args = arguments;
-    var now = new Date().getTime();
-    if (!previous && options.leading === false) previous = now; //下次触发 func 剩余的时间
-
-    var remaining = wait - (now - previous);
-    context = this; // 如果没有剩余的时间了或者你改了系统时间
-
-    if (remaining <= 0 || remaining > wait) {
-      if (timeout) {
-        clearTimeout(timeout);
-        timeout = null;
+var throttle = function throttle(fn, wait, options) {
+  var needLeadingExecution = options && options.leading !== undefined ? options.leading : true;
+  var needTrailingExecution = options && options.trailing !== undefined ? options.trailing : true;
+  var inWaitPeriod = false;
+  var pendingExecutionWithParameters;
+  var pendingTimeoutId;
+  var context = this;
+  return {
+    throttled: function throttled() {
+      if (inWaitPeriod) {
+        pendingExecutionWithParameters = arguments;
+        return;
       }
 
-      previous = now;
-      result = func.apply(context, args);
-      if (!timeout) context = args = null;
-    } else if (!timeout && options.trailing !== false) {
-      timeout = setTimeout(later, remaining);
-    }
+      if (needLeadingExecution) {
+        fn.apply(context, arguments);
+      } else {
+        pendingExecutionWithParameters = arguments;
+      }
 
-    return result;
-  };
+      inWaitPeriod = true;
+      pendingTimeoutId = setTimeout(function () {
+        if (needTrailingExecution && pendingExecutionWithParameters) {
+          fn.apply(context, pendingExecutionWithParameters);
+        }
 
-  throttled.cancel = function () {
-    clearTimeout(timeout);
-    previous = 0;
-    timeout = null;
+        inWaitPeriod = false;
+        pendingExecutionWithParameters = undefined;
+      }, wait);
+    },
+    cancel: function cancel() {
+      clearTimeout(pendingTimeoutId);
+      inWaitPeriod = false;
+      pendingExecutionWithParameters = undefined;
+    }
   };
-
-  return throttled;
 };
 
 exports.throttle = throttle;
@@ -647,7 +598,7 @@ function toSnakeCase(word) {
 
 function escapeRowData(str) {
   if (_typeof(str) === 'object' && str) {
-    str = jsonStringify(str);
+    str = (0, _jsonStringify.jsonStringify)(str);
   } else if (!isString(str)) {
     return str;
   }
@@ -662,7 +613,7 @@ function escapeJsonValue(value) {
   if (isString(value)) {
     return value;
   } else {
-    return jsonStringify(value);
+    return (0, _jsonStringify.jsonStringify)(value);
   }
 }
 
@@ -672,7 +623,7 @@ function escapeFieldValueStr(str) {
 
 function escapeRowField(value) {
   if (_typeof(value) === 'object' && value) {
-    return escapeFieldValueStr(jsonStringify(value));
+    return escapeFieldValueStr((0, _jsonStringify.jsonStringify)(value));
   } else if (isString(value)) {
     return escapeFieldValueStr(value);
   } else {
@@ -841,32 +792,6 @@ function getOrigin(url) {
   return urlParse(url).getParse().Origin;
 }
 
-function createContextManager() {
-  var context = {};
-  return {
-    get: function get() {
-      return context;
-    },
-    add: function add(key, value) {
-      if (isString(key)) {
-        context[key] = value;
-      } else {
-        console.error('key 需要传递字符串类型');
-      }
-    },
-    remove: function remove(key) {
-      delete context[key];
-    },
-    set: function set(newContext) {
-      if (isObject(newContext)) {
-        context = newContext;
-      } else {
-        console.error('content 需要传递对象类型数据');
-      }
-    }
-  };
-}
-
 function getActivePage() {
   var curPages = typeof getCurrentPages === 'function' ? getCurrentPages() : [];
 
@@ -882,14 +807,119 @@ function findCommaSeparatedValue(rawString, name) {
   return matches ? matches[1] : undefined;
 }
 
+function createCircularReferenceChecker() {
+  if (typeof WeakSet !== 'undefined') {
+    var set = new WeakSet();
+    return {
+      hasAlreadyBeenSeen: function hasAlreadyBeenSeen(value) {
+        var has = set.has(value);
+
+        if (!has) {
+          set.add(value);
+        }
+
+        return has;
+      }
+    };
+  }
+
+  var array = [];
+  return {
+    hasAlreadyBeenSeen: function hasAlreadyBeenSeen(value) {
+      var has = array.indexOf(value) >= 0;
+
+      if (!has) {
+        array.push(value);
+      }
+
+      return has;
+    }
+  };
+}
+/**
+ * Similar to `typeof`, but distinguish plain objects from `null` and arrays
+ */
+
+
+function getType(value) {
+  if (value === null) {
+    return 'null';
+  }
+
+  if (Array.isArray(value)) {
+    return 'array';
+  }
+
+  return _typeof(value);
+}
+/**
+ * Iterate over source and affect its sub values into destination, recursively.
+ * If the source and destination can't be merged, return source.
+ */
+
+
+function mergeInto(destination, source, circularReferenceChecker) {
+  // ignore the source if it is undefined
+  if (typeof circularReferenceChecker === 'undefined') {
+    circularReferenceChecker = createCircularReferenceChecker();
+  }
+
+  if (source === undefined) {
+    return destination;
+  }
+
+  if (_typeof(source) !== 'object' || source === null) {
+    // primitive values - just return source
+    return source;
+  } else if (source instanceof Date) {
+    return new Date(source.getTime());
+  } else if (source instanceof RegExp) {
+    var flags = source.flags || // old browsers compatibility
+    [source.global ? 'g' : '', source.ignoreCase ? 'i' : '', source.multiline ? 'm' : '', source.sticky ? 'y' : '', source.unicode ? 'u' : ''].join('');
+    return new RegExp(source.source, flags);
+  }
+
+  if (circularReferenceChecker.hasAlreadyBeenSeen(source)) {
+    // remove circular references
+    return undefined;
+  } else if (Array.isArray(source)) {
+    var merged = Array.isArray(destination) ? destination : [];
+
+    for (var i = 0; i < source.length; ++i) {
+      merged[i] = mergeInto(merged[i], source[i], circularReferenceChecker);
+    }
+
+    return merged;
+  }
+
+  var merged = getType(destination) === 'object' ? destination : {};
+
+  for (var key in source) {
+    if (Object.prototype.hasOwnProperty.call(source, key)) {
+      merged[key] = mergeInto(merged[key], source[key], circularReferenceChecker);
+    }
+  }
+
+  return merged;
+}
+/**
+ * A simplistic implementation of a deep clone algorithm.
+ * Caveats:
+ * - It doesn't maintain prototype chains - don't use with instances of custom classes.
+ * - It doesn't handle Map and Set
+ */
+
+
+function deepClone(value) {
+  return mergeInto(undefined, value);
+}
+
 var ONE_SECOND = 1000;
 exports.ONE_SECOND = ONE_SECOND;
 var ONE_MINUTE = 60 * ONE_SECOND;
 exports.ONE_MINUTE = ONE_MINUTE;
 var ONE_HOUR = 60 * ONE_MINUTE;
 exports.ONE_HOUR = ONE_HOUR;
-var ONE_KILO_BYTE = 1024;
-exports.ONE_KILO_BYTE = ONE_KILO_BYTE;
 
 function defineGlobal(global, name, api) {
   global[name] = api;

package/cjs/rumEventsCollection/assembly.js

@@ -34,6 +34,11 @@ function startRumAssembly(applicationId, configuration, session, lifeCycle, pare
     var deviceContext = {
       device: _baseInfo["default"].deviceInfo
     };
+    var appContext = {
+      app: {
+        launch: _baseInfo["default"].getLaunchOptions()
+      }
+    };
 
     if (session.isTracked() && (viewContext || rawRumEvent.type === _enums.RumEventType.APP)) {
       var actionContext = parentContexts.findAction(startTime);
@@ -61,7 +66,7 @@ function startRumAssembly(applicationId, configuration, session, lifeCycle, pare
           is_signin: configuration.user_id ? 'T' : 'F'
         }
       };
-      var rumEvent = (0, _utils.extend2Lev)(rumContext, deviceContext, viewContext, actionContext, rawRumEvent);
+      var rumEvent = (0, _utils.extend2Lev)(rumContext, deviceContext, appContext, viewContext, actionContext, rawRumEvent);
       var serverRumEvent = (0, _utils.withSnakeCaseKeys)(rumEvent);
       var context = (0, _utils.extend2Lev)({}, commonContext.context, customerContext);
 

package/cjs/rumEventsCollection/error/errorCollection.js

@@ -12,14 +12,13 @@ var _enums = require("../../helper/enums");
 
 var _lifeCycle = require("../../core/lifeCycle");
 
+var _errorTools = require("../../core/errorTools");
+
 var _utils = require("../../helper/utils");
 
+var _tracekit = require("../../helper/tracekit");
+
 function startErrorCollection(lifeCycle, configuration) {
-  // return doStartErrorCollection(
-  // 	lifeCycle,
-  // 	configuration,
-  // 	startAutomaticErrorCollection(configuration),
-  // )
   (0, _errorCollection.startAutomaticErrorCollection)(configuration).subscribe(function (error) {
     lifeCycle.notify(_lifeCycle.LifeCycleEventType.RAW_ERROR_COLLECTED, {
       error: error
@@ -33,28 +32,24 @@ function doStartErrorCollection(lifeCycle) {
     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
-      // })
+    addError: function addError(customError, savedCommonContext) {
+      var rawError = computeRawError(customError.error, customError.startTime, customError.context);
+      lifeCycle.notify(_lifeCycle.LifeCycleEventType.RAW_ERROR_COLLECTED, {
+        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 computeRawError(error, startTime, context) {
+  var stackTrace = error instanceof Error ? (0, _tracekit.computeStackTrace)(error) : undefined;
+  return (0, _utils.extend)({
+    startTime: startTime,
+    source: _errorTools.ErrorSource.CUSTOM,
+    context: context
+  }, (0, _errorTools.formatUnknownError)(stackTrace, error, 'Provided'));
+}
 
 function processError(error) {
   var resource = error.resource;
@@ -87,6 +82,7 @@ function processError(error) {
     type: _enums.RumEventType.ERROR
   }, tracingInfo);
   return {
+    customerContext: error.context,
     rawRumEvent: rawRumEvent,
     startTime: error.startTime
   };

package/cjs/rumEventsCollection/page/index.js

@@ -99,10 +99,11 @@ function newView(lifeCycle, route, startTime) {
     startTime: startTime,
     route: route
   });
-  var scheduleViewUpdate = (0, _utils.throttle)(triggerViewUpdate, THROTTLE_VIEW_UPDATE_PERIOD, {
+  var scheduleViewThrottled = (0, _utils.throttle)(triggerViewUpdate, THROTTLE_VIEW_UPDATE_PERIOD, {
     leading: false
   });
-  var cancelScheduleViewUpdate = scheduleViewUpdate.cancel;
+  var scheduleViewUpdate = scheduleViewThrottled.throttled;
+  var cancelScheduleViewUpdate = scheduleViewThrottled.cancel;
 
   var _trackEventCounts = (0, _trackEventCounts2.trackEventCounts)(lifeCycle, function (newEventCounts) {
     eventCounts = newEventCounts;

package/cjs/rumEventsCollection/resource/resourceCollection.js

@@ -11,6 +11,8 @@ var _lifeCycle = require("../../core/lifeCycle");
 
 var _utils = require("../../helper/utils");
 
+var _jsonStringify = require("../../helper/jsonStringify");
+
 var _enums = require("../../helper/enums");
 
 function startResourceCollection(lifeCycle, configuration) {
@@ -38,7 +40,7 @@ function processRequest(request) {
       urlHost: urlObj.Host,
       urlPath: urlObj.Path,
       urlPathGroup: (0, _utils.replaceNumberCharByPath)(urlObj.Path),
-      urlQuery: (0, _utils.jsonStringify)((0, _utils.getQueryParamsFromUrl)(request.url))
+      urlQuery: (0, _jsonStringify.jsonStringify)((0, _utils.getQueryParamsFromUrl)(request.url))
     },
     type: _enums.RumEventType.RESOURCE
   }, tracingInfo, correspondingTimingOverrides);

package/esm/boot/buildEnv.js

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