@cloudcare/rum-uniapp 2.1.18 → 2.1.20

package/cjs/rumEventsCollection/tracing/tracer.js

@@ -4,32 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.clearTracingIfCancelled = clearTracingIfCancelled;
-exports.startTracer = startTracer;
 exports.injectHeadersIfTracingAllowed = injectHeadersIfTracingAllowed;
-
+exports.startTracer = startTracer;
 var _utils = require("../../helper/utils");
-
 var _enums = require("../../helper/enums");
-
 var _ddtraceTracer = require("./ddtraceTracer");
-
 var _skywalkingTracer = require("./skywalkingTracer");
-
 var _jaegerTracer = require("./jaegerTracer");
-
 var _zipkinSingleTracer = require("./zipkinSingleTracer");
-
 var _zipkinMultiTracer = require("./zipkinMultiTracer");
-
 var _w3cTraceParentTracer = require("./w3cTraceParentTracer");
-
 function clearTracingIfCancelled(context) {
   if (context.status === 0) {
     context.traceId = undefined;
     context.spanId = undefined;
   }
 }
-
 function startTracer(configuration) {
   return {
     clearTracingIfCancelled: clearTracingIfCancelled,
@@ -37,19 +27,16 @@ function startTracer(configuration) {
       return injectHeadersIfTracingAllowed(configuration, context, function (tracingHeaders) {
         context.option = (0, _utils.extend)({}, context.option);
         var header = {};
-
         if (context.option.header) {
           (0, _utils.each)(context.option.header, function (value, key) {
             header[key] = value;
           });
         }
-
         context.option.header = (0, _utils.extend)(header, tracingHeaders);
       });
     }
   };
 }
-
 function isAllowedUrl(configuration, requestUrl) {
   var requestOrigin = (0, _utils.getOrigin)(requestUrl);
   var flag = false;
@@ -61,47 +48,36 @@ function isAllowedUrl(configuration, requestUrl) {
   });
   return flag;
 }
-
 function injectHeadersIfTracingAllowed(configuration, context, inject) {
   if (!isAllowedUrl(configuration, context.url) || !configuration.traceType) {
     return;
   }
-
   var tracer;
-
   switch (configuration.traceType) {
     case _enums.TraceType.DDTRACE:
       tracer = new _ddtraceTracer.DDtraceTracer();
       break;
-
     case _enums.TraceType.SKYWALKING_V3:
       tracer = new _skywalkingTracer.SkyWalkingTracer(configuration, context.url);
       break;
-
     case _enums.TraceType.ZIPKIN_MULTI_HEADER:
       tracer = new _zipkinMultiTracer.ZipkinMultiTracer(configuration);
       break;
-
     case _enums.TraceType.JAEGER:
       tracer = new _jaegerTracer.JaegerTracer(configuration);
       break;
-
     case _enums.TraceType.W3C_TRACEPARENT:
       tracer = new _w3cTraceParentTracer.W3cTraceParentTracer(configuration);
       break;
-
     case _enums.TraceType.ZIPKIN_SINGLE_HEADER:
       tracer = new _zipkinSingleTracer.ZipkinSingleTracer(configuration);
       break;
-
     default:
       break;
   }
-
   if (!tracer || !tracer.isTracingSupported()) {
     return;
   }
-
   context.traceId = tracer.getTraceId();
   context.spanId = tracer.getSpanId();
   inject(tracer.makeTracingHeaders());

package/cjs/rumEventsCollection/tracing/w3cTraceParentTracer.js

@@ -4,31 +4,26 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.W3cTraceParentTracer = W3cTraceParentTracer;
-
 // === Generate a random 64-bit number in fixed-length hex format
 function randomTraceId() {
   var digits = '0123456789abcdef';
   var n = '';
-
   for (var i = 0; i < 16; i += 1) {
     var rand = Math.floor(Math.random() * 16);
     n += digits[rand];
   }
-
   return n;
 }
+
 /**
  * 
  * @param {*} configuration  配置信息
  */
-
-
 function W3cTraceParentTracer(configuration) {
   var rootSpanId = randomTraceId();
   this._traceId = randomTraceId() + rootSpanId;
   this._spanId = rootSpanId;
 }
-
 W3cTraceParentTracer.prototype = {
   isTracingSupported: function isTracingSupported() {
     return true;

package/cjs/rumEventsCollection/tracing/zipkinMultiTracer.js

@@ -4,38 +4,31 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ZipkinMultiTracer = ZipkinMultiTracer;
-
 // === Generate a random 64-bit number in fixed-length hex format
 function randomTraceId() {
   var digits = '0123456789abcdef';
   var n = '';
-
   for (var i = 0; i < 16; i += 1) {
     var rand = Math.floor(Math.random() * 16);
     n += digits[rand];
   }
-
   return n;
 }
+
 /**
  * 
  * @param {*} configuration  配置信息
  */
-
-
 function ZipkinMultiTracer(configuration) {
   var rootSpanId = randomTraceId();
-
   if (configuration.traceId128Bit) {
     // 128bit生成traceid
     this._traceId = randomTraceId() + rootSpanId;
   } else {
     this._traceId = rootSpanId;
   }
-
   this._spanId = rootSpanId;
 }
-
 ZipkinMultiTracer.prototype = {
   isTracingSupported: function isTracingSupported() {
     return true;
@@ -51,8 +44,8 @@ ZipkinMultiTracer.prototype = {
       'X-B3-TraceId': this.getTraceId(),
       'X-B3-SpanId': this.getSpanId(),
       //  'X-B3-ParentSpanId': '',
-      'X-B3-Sampled': '1' //  'X-B3-Flags': '0'
-
+      'X-B3-Sampled': '1'
+      //  'X-B3-Flags': '0'
     };
   }
 };

package/cjs/rumEventsCollection/tracing/zipkinSingleTracer.js

@@ -4,31 +4,26 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ZipkinSingleTracer = ZipkinSingleTracer;
-
 // === Generate a random 64-bit number in fixed-length hex format
 function randomTraceId() {
   var digits = '0123456789abcdef';
   var n = '';
-
   for (var i = 0; i < 16; i += 1) {
     var rand = Math.floor(Math.random() * 16);
     n += digits[rand];
   }
-
   return n;
 }
+
 /**
  * 
  * @param {*} configuration  配置信息
  */
-
-
 function ZipkinSingleTracer(configuration) {
   var rootSpanId = randomTraceId();
   this._traceId = randomTraceId() + rootSpanId;
   this._spanId = rootSpanId;
 }
-
 ZipkinSingleTracer.prototype = {
   isTracingSupported: function isTracingSupported() {
     return true;

package/cjs/rumEventsCollection/trackEventCounts.js

@@ -4,18 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.trackEventCounts = trackEventCounts;
-
 var _utils = require("../helper/utils");
-
 var _enums = require("../helper/enums");
-
 var _lifeCycle = require("../core/lifeCycle");
-
 function trackEventCounts(lifeCycle, callback) {
   if (typeof callback === 'undefined') {
     callback = _utils.noop;
   }
-
   var eventCounts = {
     errorCount: 0,
     resourceCount: 0,
@@ -24,18 +19,15 @@ function trackEventCounts(lifeCycle, callback) {
   };
   var subscription = lifeCycle.subscribe(_lifeCycle.LifeCycleEventType.RAW_RUM_EVENT_COLLECTED, function (data) {
     var rawRumEvent = data.rawRumEvent;
-
     switch (rawRumEvent.type) {
       case _enums.RumEventType.ERROR:
         eventCounts.errorCount += 1;
         callback(eventCounts);
         break;
-
       case _enums.RumEventType.RESOURCE:
         eventCounts.resourceCount += 1;
         callback(eventCounts);
         break;
-
       case _enums.RumEventType.ACTION:
         eventCounts.userActionCount += 1;
         callback(eventCounts);

package/cjs/rumEventsCollection/trackPageActiveites.js

@@ -3,46 +3,35 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.waitIdlePageActivity = waitIdlePageActivity;
+exports.PAGE_ACTIVITY_VALIDATION_DELAY = exports.PAGE_ACTIVITY_MAX_DURATION = exports.PAGE_ACTIVITY_END_DELAY = void 0;
 exports.trackPageActivities = trackPageActivities;
+exports.waitIdlePageActivity = waitIdlePageActivity;
 exports.waitPageActivitiesCompletion = waitPageActivitiesCompletion;
-exports.PAGE_ACTIVITY_MAX_DURATION = exports.PAGE_ACTIVITY_END_DELAY = exports.PAGE_ACTIVITY_VALIDATION_DELAY = void 0;
-
 var _utils = require("../helper/utils");
-
 var _lifeCycle = require("../core/lifeCycle");
-
 var _observable = require("../core/observable");
-
 // Delay to wait for a page activity to validate the tracking process
-var PAGE_ACTIVITY_VALIDATION_DELAY = 100; // Delay to wait after a page activity to end the tracking process
-
-exports.PAGE_ACTIVITY_VALIDATION_DELAY = PAGE_ACTIVITY_VALIDATION_DELAY;
-var PAGE_ACTIVITY_END_DELAY = 100; // Maximum duration of the tracking process
-
-exports.PAGE_ACTIVITY_END_DELAY = PAGE_ACTIVITY_END_DELAY;
-var PAGE_ACTIVITY_MAX_DURATION = 10000;
-exports.PAGE_ACTIVITY_MAX_DURATION = PAGE_ACTIVITY_MAX_DURATION;
-
+var PAGE_ACTIVITY_VALIDATION_DELAY = exports.PAGE_ACTIVITY_VALIDATION_DELAY = 100;
+// Delay to wait after a page activity to end the tracking process
+var PAGE_ACTIVITY_END_DELAY = exports.PAGE_ACTIVITY_END_DELAY = 100;
+// Maximum duration of the tracking process
+var PAGE_ACTIVITY_MAX_DURATION = exports.PAGE_ACTIVITY_MAX_DURATION = 10000;
 function waitIdlePageActivity(lifeCycle, completionCallback) {
   var _trackPageActivities = trackPageActivities(lifeCycle);
-
   var pageActivitiesObservable = _trackPageActivities.observable;
   var stopPageActivitiesTracking = _trackPageActivities.stop;
-
   var _waitPageActivitiesCompletion = waitPageActivitiesCompletion(pageActivitiesObservable, stopPageActivitiesTracking, completionCallback);
-
   var stopWaitPageActivitiesCompletion = _waitPageActivitiesCompletion.stop;
-
   function stop() {
     stopWaitPageActivitiesCompletion();
     stopPageActivitiesTracking();
   }
-
   return {
     stop: stop
   };
-} // Automatic action collection lifecycle overview:
+}
+
+// Automatic action collection lifecycle overview:
 //                      (Start new trackPageActivities)
 //              .-------------------'--------------------.
 //              v                                        v
@@ -66,8 +55,6 @@ function waitIdlePageActivity(lifeCycle, completionCallback) {
 //
 // Note: because MAX_DURATION > VALIDATION_DELAY, we are sure that if the process is still alive
 // after MAX_DURATION, it has been validated.
-
-
 function trackPageActivities(lifeCycle) {
   var observable = new _observable.Observable();
   var subscriptions = [];
@@ -82,7 +69,6 @@ function trackPageActivities(lifeCycle) {
     if (firstRequestIndex === undefined) {
       firstRequestIndex = startEvent.requestIndex;
     }
-
     pendingRequestsCount += 1;
     notifyPageActivity();
   }));
@@ -91,17 +77,14 @@ function trackPageActivities(lifeCycle) {
     if (firstRequestIndex === undefined || request.requestIndex < firstRequestIndex) {
       return;
     }
-
     pendingRequestsCount -= 1;
     notifyPageActivity();
   }));
-
   function notifyPageActivity() {
     observable.notify({
       isBusy: pendingRequestsCount > 0
     });
   }
-
   return {
     observable: observable,
     stop: function stop() {
@@ -111,7 +94,6 @@ function trackPageActivities(lifeCycle) {
     }
   };
 }
-
 function waitPageActivitiesCompletion(pageActivitiesObservable, stopPageActivitiesTracking, completionCallback) {
   var idleTimeoutId;
   var hasCompleted = false;
@@ -131,7 +113,6 @@ function waitPageActivitiesCompletion(pageActivitiesObservable, stopPageActiviti
     clearTimeout(validationTimeoutId);
     clearTimeout(idleTimeoutId);
     var lastChangeTime = (0, _utils.now)();
-
     if (!isBusy) {
       idleTimeoutId = setTimeout(function () {
         complete({
@@ -141,7 +122,6 @@ function waitPageActivitiesCompletion(pageActivitiesObservable, stopPageActiviti
       }, PAGE_ACTIVITY_END_DELAY);
     }
   });
-
   function stop() {
     hasCompleted = true;
     clearTimeout(validationTimeoutId);
@@ -149,16 +129,13 @@ function waitPageActivitiesCompletion(pageActivitiesObservable, stopPageActiviti
     clearTimeout(maxDurationTimeoutId);
     stopPageActivitiesTracking();
   }
-
   function complete(params) {
     if (hasCompleted) {
       return;
     }
-
     stop();
     completionCallback(params);
   }
-
   return {
     stop: stop
   };

package/cjs/rumEventsCollection/transport/batch.js

@@ -4,13 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.startRumBatch = startRumBatch;
-
 var _lifeCycle = require("../../core/lifeCycle");
-
 var _transport = require("../../core/transport");
-
 var _enums = require("../../helper/enums");
-
 function startRumBatch(configuration, lifeCycle) {
   var batch = makeRumBatch(configuration, lifeCycle);
   lifeCycle.subscribe(_lifeCycle.LifeCycleEventType.RUM_EVENT_COLLECTED, function (serverRumEvent) {
@@ -26,21 +22,17 @@ function startRumBatch(configuration, lifeCycle) {
     }
   };
 }
-
 function makeRumBatch(configuration, lifeCycle) {
   var primaryBatch = createRumBatch(configuration.datakitUrl, lifeCycle);
-
   function createRumBatch(endpointUrl, lifeCycle) {
     return new _transport.Batch(new _transport.HttpRequest(endpointUrl, configuration.batchBytesLimit), configuration.maxBatchSize, configuration.batchBytesLimit, configuration.maxMessageSize, configuration.flushTimeout, lifeCycle);
   }
-
   var stopped = false;
   return {
     add: function add(message) {
       if (stopped) {
         return;
       }
-
       primaryBatch.add(message);
     },
     stop: function stop() {
@@ -50,7 +42,6 @@ function makeRumBatch(configuration, lifeCycle) {
       if (stopped) {
         return;
       }
-
       primaryBatch.upsert(message, key);
     }
   };

package/esm/boot/buildEnv.js

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

package/esm/boot/rum.entry.js

@@ -10,50 +10,40 @@ import { sdk } from '../core/sdk';
 export var makeRum = function makeRum(startRumImpl) {
   var isAlreadyInitialized = false;
   var globalContextManager = createContextManager(CustomerDataType.GlobalContext);
-  var userContextManager = createContextManager(CustomerDataType.User); //   var user = {}
-
+  var userContextManager = createContextManager(CustomerDataType.User);
+  //   var user = {}
   var getInternalContextStrategy = function getInternalContextStrategy() {
     return undefined;
   };
-
   var bufferApiCalls = new BoundedBuffer();
-
   var _addActionStrategy = function addActionStrategy(action, commonContext) {
     if (typeof commonContext == 'undefined') {
       commonContext = buildCommonContext(globalContextManager, userContextManager);
     }
-
     bufferApiCalls.add(function () {
       return _addActionStrategy(action, commonContext);
     });
   };
-
   var _addErrorStrategy = function addErrorStrategy(providedError, commonContext) {
     if (typeof commonContext == 'undefined') {
       commonContext = buildCommonContext(globalContextManager, userContextManager);
     }
-
     bufferApiCalls.add(function () {
       return _addErrorStrategy(providedError, commonContext);
     });
   };
-
   var rumGlobal = {
     init: function init(Vue, userConfiguration) {
       if (typeof userConfiguration === 'undefined') {
         userConfiguration = {};
       }
-
       if (!Vue) return;
-
       if (!canInitRum(userConfiguration)) {
         return;
       }
-
       var _startRumImpl = startRumImpl(Vue, userConfiguration, function () {
         return buildCommonContext(globalContextManager, userContextManager);
       });
-
       getInternalContextStrategy = _startRumImpl.getInternalContext;
       _addActionStrategy = _startRumImpl.addAction;
       _addErrorStrategy = _startRumImpl.addError;
@@ -104,33 +94,31 @@ export var makeRum = function makeRum(startRumImpl) {
     removeUser: userContextManager.clearContext
   };
   return rumGlobal;
-
   function canInitRum(userConfiguration) {
     if (!sdk) {
       console.error('DATAFLUX_RUM unsupport platform, Fail to start.');
       return false;
     }
-
     if (isAlreadyInitialized) {
       console.error('DATAFLUX_RUM is already initialized.');
       return false;
     }
-
     if (!userConfiguration.applicationId) {
       console.error('Application ID is not configured, no RUM data will be collected.');
       return false;
     }
-
-    if (!userConfiguration.datakitOrigin) {
-      console.error('datakitOrigin is not configured, no RUM data will be collected.');
+    if (!userConfiguration.site && !userConfiguration.datakitOrigin && !userConfiguration.datakitUrl) {
+      console.error('datakitOrigin or site is not configured, no RUM data will be collected.');
+      return false;
+    }
+    if (userConfiguration.site && !userConfiguration.clientToken) {
+      console.error('clientToken is not configured, no RUM data will be collected.');
       return false;
     }
-
     if (userConfiguration.sampleRate !== undefined && !isPercentage(userConfiguration.sampleRate)) {
       console.error('Sample Rate should be a number between 0 and 100');
       return false;
     }
-
     return true;
   }
 };

package/esm/boot/rum.js

@@ -24,15 +24,11 @@ export var startRum = function startRum(Vue, userConfiguration, getCommonContext
   startAppCollection(lifeCycle, configuration);
   startResourceCollection(lifeCycle, configuration);
   startViewCollection(lifeCycle, configuration, Vue);
-
   var _startErrorCollection = startErrorCollection(lifeCycle, configuration);
-
   startRequestCollection(lifeCycle, configuration);
   startPagePerformanceObservable(lifeCycle, configuration);
   startSetDataColloction(lifeCycle, Vue);
-
   var _startActionCollection = startActionCollection(lifeCycle, configuration, Vue);
-
   var internalContext = startInternalContext(userConfiguration.applicationId, session, parentContexts);
   return {
     addAction: _startActionCollection.addAction,

package/esm/core/baseInfo.js

@@ -1,25 +1,21 @@
 import { sdk } from '../core/sdk';
 import { UUID } from '../helper/utils';
 import { CLIENT_ID_TOKEN } from '../helper/enums';
-
 class BaseInfo {
   constructor() {
     this.getDeviceInfo();
     this.getNetWork();
   }
-
   getDeviceInfo() {
     try {
       var deviceInfo = sdk.getSystemInfoSync();
       var osInfo = deviceInfo.system.split(' ');
       var osVersion = '';
-
       if (osInfo.length > 1) {
         osVersion = osInfo[1];
       } else {
         osVersion = osInfo[0] || '';
       }
-
       var osVersionMajor = osVersion && osVersion.split('.').length && osVersion.split('.')[0];
       this.deviceInfo = {
         screenSize: "".concat(deviceInfo.screenWidth, "*").concat(deviceInfo.screenHeight, " "),
@@ -39,18 +35,14 @@ class BaseInfo {
       this.deviceInfo = {};
     }
   }
-
   getClientID() {
     var clienetId = sdk.getStorageSync(CLIENT_ID_TOKEN);
-
     if (!clienetId) {
       clienetId = UUID();
       sdk.setStorageSync(CLIENT_ID_TOKEN, clienetId);
     }
-
     return clienetId;
   }
-
   getNetWork() {
     sdk.getNetworkType({
       success: e => {
@@ -61,7 +53,6 @@ class BaseInfo {
       this.deviceInfo.network = e.networkType ? e.networkType : 'unknown';
     });
   }
-
   getLaunchOptions() {
     if (sdk.getLaunchOptionsSync) {
       var res = sdk.getLaunchOptionsSync();
@@ -73,7 +64,5 @@ class BaseInfo {
       return {};
     }
   }
-
 }
-
 export default new BaseInfo();

package/esm/core/boundedBuffer.js

@@ -1,14 +1,11 @@
 import { each } from '../helper/utils';
 var BUFFER_LIMIT = 500;
-
 var _BoundedBuffer = function _BoundedBuffer() {
   this.buffer = [];
 };
-
 _BoundedBuffer.prototype = {
   add: function add(callback) {
     var length = this.buffer.push(callback);
-
     if (length > BUFFER_LIMIT) {
       this.buffer.splice(0, 1);
     }