@cloudcare/rum-uniapp 2.1.18 → 2.1.20

package/esm/core/configuration.js

@@ -5,20 +5,17 @@ export var DEFAULT_CONFIGURATION = {
   sampleRate: 100,
   flushTimeout: 30 * ONE_SECOND,
   maxErrorsByMinute: 3000,
-
   /**
    * Logs intake limit
    */
   maxBatchSize: 50,
   maxMessageSize: 256 * ONE_KILO_BYTE,
-
   /**
    * beacon payload max queue size implementation is 64kb
    * ensure that we leave room for logs, rum and potential other users
    */
   batchBytesLimit: 16 * ONE_KILO_BYTE,
   datakitUrl: '',
-
   /**
    * arbitrary value, byte precision not needed
    */
@@ -32,18 +29,24 @@ export var DEFAULT_CONFIGURATION = {
   isIntakeUrl: function isIntakeUrl(url) {
     return false;
   } // 自定义方法根据请求资源 url 判断是否需要采集对应资源数据，默认都采集。 返回：false 表示要采集，true 表示不需要采集
-
 };
 
 function trim(str) {
   return str.replace(TRIM_REGIX, '');
 }
-
-function getDatakitUrlUrl(url) {
-  if (url && url.lastIndexOf('/') === url.length - 1) return trim(url) + 'v1/write/rum';
-  return trim(url) + '/v1/write/rum';
+function getDatakitEndPoint(configuration) {
+  var url = configuration.datakitOrigin || configuration.datakitUrl || configuration.site;
+  var endpoint = url;
+  if (url && url.lastIndexOf('/') === url.length - 1) {
+    endpoint = trim(url) + 'v1/write/rum';
+  } else {
+    endpoint = trim(url) + '/v1/write/rum';
+  }
+  if (configuration.site && configuration.clientToken) {
+    endpoint = endpoint + '?token=' + configuration.clientToken + '&to_headless=true';
+  }
+  return endpoint;
 }
-
 export function commonInit(userConfiguration, buildEnv) {
   var transportConfiguration = {
     applicationId: userConfiguration.applicationId,
@@ -52,52 +55,41 @@ export function commonInit(userConfiguration, buildEnv) {
     service: userConfiguration.service || 'miniapp',
     sdkVersion: buildEnv.sdkVersion,
     sdkName: buildEnv.sdkName,
-    datakitUrl: getDatakitUrlUrl(userConfiguration.datakitUrl || userConfiguration.datakitOrigin),
+    datakitUrl: getDatakitEndPoint(userConfiguration),
     tags: userConfiguration.tags || []
   };
-
   if ('trackInteractions' in userConfiguration) {
     transportConfiguration.trackInteractions = !!userConfiguration.trackInteractions;
   }
-
   if ('allowedTracingOrigins' in userConfiguration) {
     transportConfiguration.allowedTracingOrigins = userConfiguration.allowedTracingOrigins;
   }
-
   if ('traceId128Bit' in userConfiguration) {
     transportConfiguration.traceId128Bit = !!userConfiguration.traceId128Bit;
   }
-
   if ('traceType' in userConfiguration && hasTraceType(userConfiguration.traceType)) {
     transportConfiguration.traceType = userConfiguration.traceType;
   }
-
   if ('sampleRate' in userConfiguration) {
     transportConfiguration.sampleRate = userConfiguration.sampleRate;
   }
-
   if ('isVue2' in userConfiguration) {
     transportConfiguration.isVue2 = userConfiguration.isVue2;
   }
-
   if ('isIntakeUrl' in userConfiguration && isFunction(userConfiguration.isIntakeUrl) && isBoolean(userConfiguration.isIntakeUrl())) {
     transportConfiguration.isIntakeUrl = userConfiguration.isIntakeUrl;
   }
-
   return extend2Lev(DEFAULT_CONFIGURATION, transportConfiguration);
 }
-
 function hasTraceType(traceType) {
   if (traceType && values(TraceType).indexOf(traceType) > -1) return true;
   return false;
 }
-
 var haveSameOrigin = function haveSameOrigin(url1, url2) {
   var parseUrl1 = urlParse(url1).getParse();
   var parseUrl2 = urlParse(url2).getParse();
   return parseUrl1.Origin === parseUrl2.Origin;
 };
-
 export function isIntakeRequest(url, configuration) {
   // return haveSameOrigin(url, configuration.datakitUrl)
   return url.indexOf(configuration.datakitUrl) === 0 || configuration.isIntakeUrl(url);

package/esm/core/contextManager.js

@@ -7,15 +7,14 @@ export function createContextManager(customerDataType, computeBytesCountImpl) {
   if (typeof computeBytesCountImpl === 'undefined') {
     computeBytesCountImpl = computeBytesCount;
   }
-
   var context = {};
   var bytesCountCache;
-  var alreadyWarned = false; // Throttle the bytes computation to minimize the impact on performance.
-  // Especially useful if the user call context APIs synchronously multiple times in a row
+  var alreadyWarned = false;
 
+  // Throttle the bytes computation to minimize the impact on performance.
+  // Especially useful if the user call context APIs synchronously multiple times in a row
   var computeBytesCountThrottled = throttle(function (context) {
     bytesCountCache = computeBytesCountImpl(jsonStringify(context));
-
     if (!alreadyWarned) {
       alreadyWarned = warnIfCustomerDataLimitReached(bytesCountCache, customerDataType);
     }
@@ -24,24 +23,20 @@ export function createContextManager(customerDataType, computeBytesCountImpl) {
     getBytesCount: function getBytesCount() {
       return bytesCountCache;
     },
-
     /** @deprecated use getContext instead */
     get: function get() {
       return context;
     },
-
     /** @deprecated use setContextProperty instead */
     add: function add(key, value) {
       context[key] = value;
       computeBytesCountThrottled(context);
     },
-
     /** @deprecated renamed to removeContextProperty */
     remove: function remove(key) {
       delete context[key];
       computeBytesCountThrottled(context);
     },
-
     /** @deprecated use setContext instead */
     set: function set(newContext) {
       context = newContext;

package/esm/core/dataMap.js

@@ -1,5 +1,5 @@
-import { RumEventType } from '../helper/enums'; // 需要用双引号将字符串类型的field value括起来， 这里有数组标示[string, path]
-
+import { RumEventType } from '../helper/enums';
+// 需要用双引号将字符串类型的field value括起来， 这里有数组标示[string, path]
 export var commonTags = {
   sdk_name: '_dd.sdk_name',
   sdk_version: '_dd.sdk_version',

package/esm/core/downloadProxy.js

@@ -17,7 +17,6 @@ export function startDownloadProxy(userConfiguration) {
       }
     };
   }
-
   return downloadProxySingleton;
 }
 export function resetDownloadProxy() {
@@ -28,13 +27,10 @@ export function resetDownloadProxy() {
     sdk.downloadFile = originalDownloadRequest;
   }
 }
-
 function proxyDownload(userConfiguration) {
   originalDownloadRequest = sdk.downloadFile;
-
   sdk.downloadFile = function () {
     var _this = this;
-
     var dataflux_xhr = {
       method: 'GET',
       startTime: 0,
@@ -44,36 +40,28 @@ function proxyDownload(userConfiguration) {
     };
     dataflux_xhr.startTime = now();
     var originalSuccess = arguments[0].success;
-
     if (typeof originalSuccess === 'function') {
       arguments[0].success = function () {
         reportXhr(arguments[0]);
-
         if (originalSuccess) {
           originalSuccess.apply(_this, arguments);
         }
       };
     }
-
     var originalFail = arguments[0].fail;
-
     if (typeof originalFail === 'function') {
       arguments[0].fail = function () {
         reportXhr(arguments[0]);
-
         if (originalFail) {
           originalFail.apply(_this, arguments);
         }
       };
     }
-
     var hasBeenReported = false;
-
     var reportXhr = function reportXhr(res) {
       if (hasBeenReported) {
         return;
       }
-
       hasBeenReported = true;
       dataflux_xhr.duration = now() - dataflux_xhr.startTime;
       dataflux_xhr.response = JSON.stringify({
@@ -87,16 +75,14 @@ function proxyDownload(userConfiguration) {
         callback(dataflux_xhr);
       });
     };
-
     beforeSendCallbacks.forEach(function (callback) {
       callback(dataflux_xhr);
     });
-    var result = originalDownloadRequest.apply(this, arguments); // 判断结果是否为promise
-
+    var result = originalDownloadRequest.apply(this, arguments);
+    // 判断结果是否为promise
     var isPromise = function isPromise(obj) {
       return !!obj && (typeof obj === "object" || typeof obj === "function") && typeof obj.then === "function";
     };
-
     if (isPromise(result) && userConfiguration.isVue2) {
       // vue2 版本，success, fail 都在then返回
       return result.then(function (res) {
@@ -105,7 +91,6 @@ function proxyDownload(userConfiguration) {
         } else {
           reportXhr(res[1]);
         }
-
         return res;
       });
     } else if (isPromise(result) && !userConfiguration.isVue2) {

package/esm/core/errorCollection.js

@@ -9,7 +9,6 @@ import { resetDownloadProxy, startDownloadProxy } from './downloadProxy';
 var originalConsoleError;
 export function startConsoleTracking(errorObservable) {
   originalConsoleError = console.error;
-
   console.error = function () {
     originalConsoleError.apply(console, arguments);
     var args = toArray(arguments);
@@ -27,19 +26,15 @@ export function startConsoleTracking(errorObservable) {
 export function stopConsoleTracking() {
   console.error = originalConsoleError;
 }
-
 function formatConsoleParameters(param) {
   if (typeof param === 'string') {
     return param;
   }
-
   if (param instanceof Error) {
     return toStackTraceString(computeStackTrace(param));
   }
-
   return JSON.stringify(param, undefined, 2);
 }
-
 export function filterErrors(configuration, errorObservable) {
   var errorCount = 0;
   var filteredErrorObservable = new Observable();
@@ -73,7 +68,6 @@ export function startRuntimeErrorTracking(errorObservable) {
       startTime: now()
     });
   };
-
   report.subscribe(traceKitReportHandler);
 }
 export function stopRuntimeErrorTracking() {
@@ -85,7 +79,8 @@ export function startAutomaticErrorCollection(configuration) {
     errorObservable = new Observable();
     trackNetworkError(configuration, errorObservable);
     startConsoleTracking(errorObservable);
-    startRuntimeErrorTracking(errorObservable); // filteredErrorsObservable = filterErrors(configuration, errorObservable)
+    startRuntimeErrorTracking(errorObservable);
+    // filteredErrorsObservable = filterErrors(configuration, errorObservable)
   }
 
   return errorObservable;
@@ -97,7 +92,6 @@ export function trackNetworkError(configuration, errorObservable) {
   startDownloadProxy(configuration).onRequestComplete(function (context) {
     return handleCompleteRequest(context.type, context);
   });
-
   function handleCompleteRequest(type, request) {
     if (!isIntakeRequest(request.url, configuration) && (isRejected(request) || isServerError(request))) {
       errorObservable.notify({
@@ -116,7 +110,6 @@ export function trackNetworkError(configuration, errorObservable) {
       });
     }
   }
-
   return {
     stop: function stop() {
       resetXhrProxy();
@@ -124,27 +117,21 @@ export function trackNetworkError(configuration, errorObservable) {
     }
   };
 }
-
 function isRejected(request) {
   return request.status === 0 && request.responseType !== 'opaque';
 }
-
 function isServerError(request) {
   return request.status >= 500;
 }
-
 function truncateResponse(response, configuration) {
   if (response && response.length > configuration.requestErrorResponseLengthLimit) {
     return response.substring(0, configuration.requestErrorResponseLengthLimit) + '...';
   }
-
   return response;
 }
-
 function format(type) {
   if (RequestType.XHR === type) {
     return 'XHR';
   }
-
   return RequestType.DOWNLOAD;
 }

package/esm/core/errorFilter.js

@@ -10,17 +10,13 @@ export function createErrorFilter(configuration, onLimitReached) {
           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),
@@ -31,7 +27,6 @@ export function createErrorFilter(configuration, onLimitReached) {
           allowNextError = false;
         }
       }
-
       return true;
     }
   };

package/esm/core/errorTools.js

@@ -15,7 +15,6 @@ export function formatUnknownError(stackTrace, errorObject, nonErrorPrefix) {
       type: stackTrace && stackTrace.name
     };
   }
-
   return {
     message: stackTrace.message || 'Empty message',
     stack: toStackTraceString(stackTrace),
@@ -24,7 +23,6 @@ export function formatUnknownError(stackTrace, errorObject, nonErrorPrefix) {
 }
 export function toStackTraceString(stack) {
   var result = stack.name || 'Error' + ': ' + stack.message;
-
   if (isArray(stack.stack)) {
     stack.stack.forEach(function (frame) {
       var func = frame.func === '?' ? '<anonymous>' : frame.func;
@@ -34,6 +32,5 @@ export function toStackTraceString(stack) {
       result += '\n  at ' + func + args + ' @ ' + frame.url + line + column;
     });
   }
-
   return result;
 }

package/esm/core/heavyCustomerDataWarning.js

@@ -1,7 +1,8 @@
-import { ONE_KIBI_BYTE } from '../helper/byteUtils'; // RUM and logs batch bytes limit is 16KB
+import { ONE_KIBI_BYTE } from '../helper/byteUtils';
+
+// RUM and logs batch bytes limit is 16KB
 // ensure that we leave room for other event attributes and maintain a decent amount of event per batch
 // (3KB (customer data) + 1KB (other attributes)) * 4 (events per batch) = 16KB
-
 export var CUSTOMER_DATA_BYTES_LIMIT = 3 * ONE_KIBI_BYTE;
 export var CustomerDataType = {
   FeatureFlag: 'feature flag evaluation',
@@ -14,6 +15,5 @@ export function warnIfCustomerDataLimitReached(bytesCount, customerDataType) {
     console.warn('The ' + customerDataType + 'data is over ' + CUSTOMER_DATA_BYTES_LIMIT / ONE_KIBI_BYTE + " KiB. On low connectivity, the SDK has the potential to exhaust the user's upload bandwidth.");
     return true;
   }
-
   return false;
 }

package/esm/core/lifeCycle.js

@@ -2,20 +2,16 @@ export class LifeCycle {
   constructor() {
     this.callbacks = {};
   }
-
   notify(eventType, data) {
     var eventCallbacks = this.callbacks[eventType];
-
     if (eventCallbacks) {
       eventCallbacks.forEach(callback => callback(data));
     }
   }
-
   subscribe(eventType, callback) {
     if (!this.callbacks[eventType]) {
       this.callbacks[eventType] = [];
     }
-
     this.callbacks[eventType].push(callback);
     return {
       unsubscribe: () => {
@@ -23,7 +19,6 @@ export class LifeCycle {
       }
     };
   }
-
 }
 export var LifeCycleEventType = {
   PERFORMANCE_ENTRY_COLLECTED: 'PERFORMANCE_ENTRY_COLLECTED',

package/esm/core/observable.js

@@ -2,15 +2,12 @@ export class Observable {
   constructor() {
     this.observers = [];
   }
-
   subscribe(f) {
     this.observers.push(f);
   }
-
   notify(data) {
     this.observers.forEach(function (observer) {
       observer(data);
     });
   }
-
 }

package/esm/core/sdk.js

@@ -1,14 +1,11 @@
 import { deepMixObject } from '../helper/utils';
-
 function getSDK() {
   var sdk = null,
-      tracker = '';
-
+    tracker = '';
   try {
     if (uni && typeof uni === 'object' && typeof uni.request === 'function') {
       sdk = uni;
     }
-
     if (wx && typeof wx === 'object' && typeof wx.request === 'function') {
       // 微信
       tracker = wx;
@@ -33,13 +30,11 @@ function getSDK() {
   } catch (err) {
     console.warn('unsupport platform, Fail to start');
   }
-
   return {
     sdk,
     tracker
   };
 }
-
 var instance = getSDK();
 export var sdk = instance.sdk;
 export var tracker = instance.tracker;

package/esm/core/sessionManagement.js

@@ -8,13 +8,10 @@ export class sessionManagement {
     this.sessionId = UUID();
     this.isTrack = performDraw(configuration.sampleRate);
   }
-
   getSessionId() {
     return this.sessionId;
   }
-
   isTracked() {
     return this.isTrack;
   }
-
 }

package/esm/core/transport.js

@@ -2,21 +2,19 @@ import { findByPath, escapeRowData, isNumber, each, isString, values, extend, is
 import { sdk } from '../core/sdk';
 import { computeBytesCount } from '../helper/byteUtils';
 import { LifeCycleEventType } from '../core/lifeCycle';
-import { commonTags, dataMap, commonFields } from './dataMap'; // https://en.wikipedia.org/wiki/UTF-8
+import { commonTags, dataMap, commonFields } from './dataMap';
 
+// https://en.wikipedia.org/wiki/UTF-8
 var HAS_MULTI_BYTES_CHARACTERS = /[^\u0000-\u007F]/;
 var CUSTOM_KEYS = 'custom_keys';
-
 function addBatchPrecision(url) {
   if (!url) return url;
   return url + (url.indexOf('?') === -1 ? '?' : '&') + 'precision=ms';
 }
-
 var httpRequest = function httpRequest(endpointUrl, bytesLimit) {
   this.endpointUrl = endpointUrl;
   this.bytesLimit = bytesLimit;
 };
-
 httpRequest.prototype = {
   send: function send(data) {
     var url = addBatchPrecision(this.endpointUrl);
@@ -49,17 +47,13 @@ export var processedMessageByDataMap = function processedMessageByDataMap(messag
       } else {
         rowStr += key + ',';
       }
-
       rowData.measurement = key;
       var tagsStr = [];
       var tags = extend({}, commonTags, value.tags);
       var filterFileds = ['date', 'type', CUSTOM_KEYS]; // 已经在datamap中定义过的fields和tags
-
       each(tags, function (value_path, _key) {
         var _value = findByPath(message, value_path);
-
         filterFileds.push(_key);
-
         if (_value || isNumber(_value)) {
           rowData.tags[_key] = escapeJsonValue(_value);
           tagsStr.push(escapeRowData(_key) + '=' + escapeRowData(_value));
@@ -70,30 +64,22 @@ export var processedMessageByDataMap = function processedMessageByDataMap(messag
       each(fields, function (_value, _key) {
         if (isArray(_value) && _value.length === 2) {
           var type = _value[0],
-              value_path = _value[1];
-
+            value_path = _value[1];
           var _valueData = findByPath(message, value_path);
-
           filterFileds.push(_key);
-
           if (_valueData || isNumber(_valueData)) {
             rowData.fields[_key] = _valueData; // 这里不需要转译
-
             fieldsStr.push(escapeRowData(_key) + '=' + escapeRowField(_valueData));
           }
         } else if (isString(_value)) {
           var _valueData = findByPath(message, _value);
-
           filterFileds.push(_key);
-
           if (_valueData || isNumber(_valueData)) {
             rowData.fields[_key] = _valueData; // 这里不需要转译
-
             fieldsStr.push(escapeRowData(_key) + '=' + escapeRowField(_valueData));
           }
         }
       });
-
       if (message.tags && isObject(message.tags) && !isEmptyObject(message.tags)) {
         // 自定义tag， 存储成field
         var _tagKeys = [];
@@ -101,42 +87,35 @@ export var processedMessageByDataMap = function processedMessageByDataMap(messag
           // 如果和之前tag重名，则舍弃
           if (filterFileds.indexOf(_key) > -1) return;
           filterFileds.push(_key);
-
           if (_value || isNumber(_value)) {
             _tagKeys.push(_key);
-
             rowData.fields[_key] = _value; // 这里不需要转译
-
             fieldsStr.push(escapeRowData(_key) + '=' + escapeRowField(_value));
           }
         });
-
         if (_tagKeys.length) {
           rowData.fields[CUSTOM_KEYS] = escapeRowField(_tagKeys);
           fieldsStr.push(escapeRowData(CUSTOM_KEYS) + '=' + escapeRowField(_tagKeys));
         }
       }
-
       if (tagsStr.length) {
         rowStr += tagsStr.join(',');
       }
-
       if (fieldsStr.length) {
         rowStr += ' ';
         rowStr += fieldsStr.join(',');
         hasFileds = true;
       }
-
       rowStr = rowStr + ' ' + message.date;
       rowData.time = toServerDuration(message.date); // 这里不需要转译
     }
   });
+
   return {
     rowStr: hasFileds ? rowStr : '',
     rowData: hasFileds ? rowData : undefined
   };
 };
-
 function batch(request, maxSize, bytesLimit, maxMessageSize, flushTimeout, lifeCycle) {
   this.request = request;
   this.maxSize = maxSize;
@@ -151,7 +130,6 @@ function batch(request, maxSize, bytesLimit, maxMessageSize, flushTimeout, lifeC
   this.flushOnVisibilityHidden();
   this.flushPeriodically();
 }
-
 batch.prototype = {
   add: function add(message) {
     this.addOrUpdate(message);
@@ -175,22 +153,17 @@ batch.prototype = {
   addOrUpdate: function addOrUpdate(message, key) {
     var process = this.process(message);
     if (!process.processedMessage || process.processedMessage === '') return;
-
     if (process.messageBytesSize >= this.maxMessageSize) {
       console.warn('Discarded a message whose size was bigger than the maximum allowed size' + this.maxMessageSize + 'KB.');
       return;
     }
-
     if (this.hasMessageFor(key)) {
       this.remove(key);
     }
-
     if (this.willReachedBytesLimitWith(process.messageBytesSize)) {
       this.flush();
     }
-
     this.push(process.processedMessage, process.messageBytesSize, key);
-
     if (this.isFull()) {
       this.flush();
     }
@@ -208,13 +181,11 @@ batch.prototype = {
       // \n separator at serialization
       this.bufferBytesSize += 1;
     }
-
     if (key !== undefined) {
       this.upsertBuffer[key] = processedMessage;
     } else {
       this.pushOnlyBuffer.push(processedMessage);
     }
-
     this.bufferBytesSize += messageBytesSize;
     this.bufferMessageCount += 1;
   },
@@ -224,7 +195,6 @@ batch.prototype = {
     var messageBytesSize = computeBytesCount(removedMessage);
     this.bufferBytesSize -= messageBytesSize;
     this.bufferMessageCount -= 1;
-
     if (this.bufferMessageCount > 0) {
       this.bufferBytesSize -= 1;
     }
@@ -241,10 +211,8 @@ batch.prototype = {
   },
   flushPeriodically: function flushPeriodically() {
     var _this = this;
-
     setTimeout(function () {
       _this.flush();
-
       _this.flushPeriodically();
     }, _this.flushTimeout);
   },
@@ -254,8 +222,6 @@ batch.prototype = {
      * With sendBeacon, requests are guaranteed to be successfully sent during document unload
      */
     // @ts-ignore this function is not always defined
-
-
     this.lifeCycle.subscribe(LifeCycleEventType.APP_HIDE, function () {
       _this.flush();
     });