@cloudcare/rum-uniapp 2.1.15 → 2.1.17

package/esm/helper/utils.js

@@ -1,4 +1,5 @@
 import { MpHook } from './enums';
+import { jsonStringify } from '../helper/jsonStringify';
 var ArrayProto = Array.prototype;
 var ObjProto = Object.prototype;
 var ObjProto = Object.prototype;
@@ -97,6 +98,12 @@ export var isString = function isString(obj) {
 export var isDate = function isDate(obj) {
   return toString.call(obj) === '[object Date]';
 };
+export var isBoolean = function isBoolean(obj) {
+  return toString.call(obj) === '[object Boolean]';
+};
+export var isNumber = function isNumber(obj) {
+  return toString.call(obj) === '[object Number]' && /[\d\.]+/.test(String(obj));
+};
 export var isFunction = function isFunction(f) {
   if (!f) {
     return false;
@@ -108,12 +115,6 @@ export var isFunction = function isFunction(f) {
     return false;
   }
 };
-export var isBoolean = function isBoolean(obj) {
-  return toString.call(obj) === '[object Boolean]';
-};
-export var isNumber = function isNumber(obj) {
-  return toString.call(obj) === '[object Number]' && /[\d\.]+/.test(String(obj));
-};
 export var isArray = nativeIsArray || function (obj) {
   return toString.call(obj) === '[object Array]';
 };
@@ -154,50 +155,6 @@ export function UUID(placeholder) {
   return placeholder ? // tslint:disable-next-line no-bitwise
   (parseInt(placeholder, 10) ^ Math.random() * 16 >> parseInt(placeholder, 10) / 4).toString(16) : "".concat(1e7, "-", 1e3, "-", 4e3, "-", 8e3, "-", 1e11).replace(/[018]/g, UUID);
 }
-export 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;
-}
 export var utf8Encode = function utf8Encode(string) {
   string = (string + '').replace(/\r\n/g, '\n').replace(/\r/g, '\n');
   var utftext = '',
@@ -416,52 +373,45 @@ export var safeJSONParse = function safeJSONParse(str) {
 
   return val;
 };
-export var now = function now() {
+export var now = Date.now || function () {
   return new Date().getTime();
 };
-export 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;
+export 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;
 };
 export function noop() {}
 /**
@@ -689,31 +639,6 @@ export var deepMixObject = function deepMixObject(targetObj) {
 export function getOrigin(url) {
   return urlParse(url).getParse().Origin;
 }
-export 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 需要传递对象类型数据');
-      }
-    }
-  };
-}
 export function getActivePage() {
   var curPages = typeof getCurrentPages === 'function' ? getCurrentPages() : [];
 
@@ -727,10 +652,114 @@ export function findCommaSeparatedValue(rawString, name) {
   var matches = rawString.match('(?:^|;)\\s*' + name + '\\s*=\\s*([^;]+)');
   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
+ */
+
+
+export 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.
+ */
+
+export 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
+ */
+
+export function deepClone(value) {
+  return mergeInto(undefined, value);
+}
 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;
 }

package/esm/rumEventsCollection/assembly.js

@@ -19,6 +19,11 @@ export function startRumAssembly(applicationId, configuration, session, lifeCycl
     var deviceContext = {
       device: baseInfo.deviceInfo
     };
+    var appContext = {
+      app: {
+        launch: baseInfo.getLaunchOptions()
+      }
+    };
 
     if (session.isTracked() && (viewContext || rawRumEvent.type === RumEventType.APP)) {
       var actionContext = parentContexts.findAction(startTime);
@@ -46,7 +51,7 @@ export function startRumAssembly(applicationId, configuration, session, lifeCycl
           is_signin: configuration.user_id ? 'T' : 'F'
         }
       };
-      var rumEvent = extend2Lev(rumContext, deviceContext, viewContext, actionContext, rawRumEvent);
+      var rumEvent = extend2Lev(rumContext, deviceContext, appContext, viewContext, actionContext, rawRumEvent);
       var serverRumEvent = withSnakeCaseKeys(rumEvent);
       var context = extend2Lev({}, commonContext.context, customerContext);
 

package/esm/rumEventsCollection/error/errorCollection.js

@@ -1,13 +1,10 @@
 import { startAutomaticErrorCollection } from '../../core/errorCollection';
 import { RumEventType } from '../../helper/enums';
 import { LifeCycleEventType } from '../../core/lifeCycle';
-import { urlParse, replaceNumberCharByPath, getStatusGroup, extend2Lev } from '../../helper/utils';
+import { ErrorSource, formatUnknownError } from '../../core/errorTools';
+import { urlParse, replaceNumberCharByPath, getStatusGroup, extend2Lev, extend } from '../../helper/utils';
+import { computeStackTrace } from '../../helper/tracekit';
 export function startErrorCollection(lifeCycle, configuration) {
-  // return doStartErrorCollection(
-  // 	lifeCycle,
-  // 	configuration,
-  // 	startAutomaticErrorCollection(configuration),
-  // )
   startAutomaticErrorCollection(configuration).subscribe(function (error) {
     lifeCycle.notify(LifeCycleEventType.RAW_ERROR_COLLECTED, {
       error: error
@@ -20,27 +17,24 @@ export function doStartErrorCollection(lifeCycle) {
     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
-      // })
+    addError: function addError(customError, savedCommonContext) {
+      var rawError = computeRawError(customError.error, customError.startTime, customError.context);
+      lifeCycle.notify(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 ? computeStackTrace(error) : undefined;
+  return extend({
+    startTime,
+    source: ErrorSource.CUSTOM,
+    context
+  }, formatUnknownError(stackTrace, error, 'Provided'));
+}
 
 function processError(error) {
   var resource = error.resource;
@@ -73,6 +67,7 @@ function processError(error) {
     type: RumEventType.ERROR
   }, tracingInfo);
   return {
+    customerContext: error.context,
     rawRumEvent: rawRumEvent,
     startTime: error.startTime
   };

package/esm/rumEventsCollection/page/index.js

@@ -1,4 +1,4 @@
-import { type, now, throttle, UUID, isNumber, getActivePage } from '../../helper/utils';
+import { now, throttle, UUID, isNumber, getActivePage } from '../../helper/utils';
 import { trackEventCounts } from '../trackEventCounts';
 import { LifeCycleEventType } from '../../core/lifeCycle'; // 劫持原小程序App方法
 
@@ -87,10 +87,11 @@ function newView(lifeCycle, route, startTime) {
     startTime,
     route
   });
-  var scheduleViewUpdate = throttle(triggerViewUpdate, THROTTLE_VIEW_UPDATE_PERIOD, {
+  var scheduleViewThrottled = throttle(triggerViewUpdate, THROTTLE_VIEW_UPDATE_PERIOD, {
     leading: false
   });
-  var cancelScheduleViewUpdate = scheduleViewUpdate.cancel;
+  var scheduleViewUpdate = scheduleViewThrottled.throttled;
+  var cancelScheduleViewUpdate = scheduleViewThrottled.cancel;
 
   var _trackEventCounts = trackEventCounts(lifeCycle, function (newEventCounts) {
     eventCounts = newEventCounts;

package/esm/rumEventsCollection/resource/resourceCollection.js

@@ -1,6 +1,7 @@
 import { computePerformanceResourceDuration, computePerformanceResourceDetails, computeSize } from './resourceUtils';
 import { LifeCycleEventType } from '../../core/lifeCycle';
-import { msToNs, extend2Lev, urlParse, getQueryParamsFromUrl, replaceNumberCharByPath, jsonStringify, UUID, getStatusGroup } from '../../helper/utils';
+import { msToNs, extend2Lev, urlParse, getQueryParamsFromUrl, replaceNumberCharByPath, UUID, getStatusGroup } from '../../helper/utils';
+import { jsonStringify } from '../../helper/jsonStringify';
 import { RumEventType } from '../../helper/enums';
 export function startResourceCollection(lifeCycle, configuration) {
   lifeCycle.subscribe(LifeCycleEventType.REQUEST_COMPLETED, function (request) {

package/package.json

@@ -1,44 +1,44 @@
 {
-	"name": "@cloudcare/rum-uniapp",
-	"version": "2.1.15",
-	"main": "cjs/index.js",
-	"module": "esm/index.js",
-	"miniprogram": "cjs",
-	"types": "cjs/index.d.ts",
-	"devDependencies": {
-		"@babel/core": "^7.12.10",
-		"@babel/preset-env": "^7.12.10",
-		"ali-oss": "^6.12.0",
-		"npm-run-all": "^4.1.5",
-		"replace-in-file": "^6.1.0",
-		"webpack": "^5.37.0",
-		"webpack-cli": "^4.7.0",
-		"webpack-dev-server": "^3.11.2"
-	},
-	"scripts": {
-		"test": "echo \"Error: no test specified\" && exit 1",
-		"build": "run-p build:cjs build:esm build:wx",
-		"build:watch": "webpack --watch --config ./webpack.config.js --mode=development",
-		"build:wx": "rm -rf demo/miniprogram  && webpack --config webpack.config.js --mode=production && npm run replace-build-env demo/miniprogram",
-		"build:cjs": "rm -rf cjs && babel --config-file ./babel.cjs.json --out-dir cjs ./src  && npm run replace-build-env cjs",
-		"build:esm": "rm -rf esm && babel --config-file ./babel.esm.json --out-dir esm ./src && npm run replace-build-env esm",
-		"publish:npm": "npm run build && node ./scripts/publish-oss.js && npm publish --access=public",
-		"publish:oss:test": "npm run build && node ./scripts/publish-oss.js test",
-		"replace-build-env": "node scripts/replace-build-env.js"
-	},
-	"keywords": [
-		"dataflux",
-		"rum",
-		"sdk",
-		"小程序",
-		"miniapp"
-	],
-	"author": "dataflux",
-	"license": "MIT",
-	"repository": {
-		"url": "https://github.com/DataFlux-cn/datakit-miniprogram-uniapp",
-		"type": "git"
-	},
-	"description": "DataFlux RUM 小程序 端数据指标监控",
-	"dependencies": {}
-}
+    "name": "@cloudcare/rum-uniapp",
+    "version": "2.1.17",
+    "main": "cjs/index.js",
+    "module": "esm/index.js",
+    "miniprogram": "cjs",
+    "types": "cjs/index.d.ts",
+    "devDependencies": {
+        "@babel/core": "^7.12.10",
+        "@babel/preset-env": "^7.12.10",
+        "ali-oss": "^6.12.0",
+        "npm-run-all": "^4.1.5",
+        "replace-in-file": "^6.1.0",
+        "webpack": "^5.37.0",
+        "webpack-cli": "^4.7.0",
+        "webpack-dev-server": "^3.11.2"
+    },
+    "scripts": {
+        "test": "echo \"Error: no test specified\" && exit 1",
+        "build": "run-p build:cjs build:esm build:wx",
+        "build:watch": "webpack --watch --config ./webpack.config.js --mode=development",
+        "build:wx": "rm -rf demo/miniprogram  && webpack --config webpack.config.js --mode=production && npm run replace-build-env demo/miniprogram",
+        "build:cjs": "rm -rf cjs && babel --config-file ./babel.cjs.json --out-dir cjs ./src  && npm run replace-build-env cjs",
+        "build:esm": "rm -rf esm && babel --config-file ./babel.esm.json --out-dir esm ./src && npm run replace-build-env esm",
+        "publish:npm": "npm run build && node ./scripts/publish-oss.js && npm publish --access=public",
+        "publish:oss:test": "npm run build && node ./scripts/publish-oss.js test",
+        "replace-build-env": "node scripts/replace-build-env.js"
+    },
+    "keywords": [
+        "dataflux",
+        "rum",
+        "sdk",
+        "小程序",
+        "miniapp"
+    ],
+    "author": "dataflux",
+    "license": "MIT",
+    "repository": {
+        "url": "https://github.com/DataFlux-cn/datakit-miniprogram-uniapp",
+        "type": "git"
+    },
+    "description": "DataFlux RUM 小程序 端数据指标监控",
+    "dependencies": {}
+}