@cloudcare/browser-core 1.2.6 → 1.2.8

package/cjs/dataMap.js

@@ -143,10 +143,10 @@ var dataMap = {
   action: {
     type: _enums.RumEventType.ACTION,
     tags: {
-      action_name: 'action.target.name',
       action_type: 'action.type'
     },
     fields: {
+      action_name: 'action.target.name',
       duration: 'action.loading_time',
       action_error_count: 'action.error.count',
       action_resource_count: 'action.resource.count',

package/cjs/helper/contextHistory.js

@@ -8,12 +8,6 @@ exports.ContextHistory = ContextHistory;
 
 var _tools = require("./tools");
 
-function _createForOfIteratorHelper(o, allowArrayLike) { var it; if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 var END_OF_TIMES = Infinity;
 var CLEAR_OLD_CONTEXTS_INTERVAL = _tools.ONE_MINUTE;
 exports.CLEAR_OLD_CONTEXTS_INTERVAL = CLEAR_OLD_CONTEXTS_INTERVAL;
@@ -56,25 +50,16 @@ ContextHistory.prototype.find = function (startTime) {
     startTime = END_OF_TIMES;
   }
 
-  var _iterator = _createForOfIteratorHelper(this.entries),
-      _step;
+  for (var i = 0; i < this.entries.length; i++) {
+    var entry = this.entries[i];
 
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var entry = _step.value;
-
-      if (entry.startTime <= startTime) {
-        if (startTime <= entry.endTime) {
-          return entry.context;
-        }
-
-        break;
+    if (entry.startTime <= startTime) {
+      if (startTime <= entry.endTime) {
+        return entry.context;
       }
+
+      break;
     }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
   }
 };
 /**

package/cjs/helper/limitModification.js

@@ -9,12 +9,6 @@ var _tools = require("./tools");
 
 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); }
 
-function _createForOfIteratorHelper(o, allowArrayLike) { var it; if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 /**
  * Current limitations:
  * - field path do not support array, 'a.b.c' only
@@ -36,24 +30,16 @@ function limitModification(object, modifiableFieldPaths, modifier) {
 
 function get(object, path) {
   var current = object;
+  var fields = path.split('.');
 
-  var _iterator = _createForOfIteratorHelper(path.split('.')),
-      _step;
-
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var field = _step.value;
-
-      if (!isValidObjectContaining(current, field)) {
-        return;
-      }
+  for (var i = 0; i < fields.length; i++) {
+    var field = fields[i];
 
-      current = current[field];
+    if (!isValidObjectContaining(current, field)) {
+      return;
     }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
+
+    current = current[field];
   }
 
   return current;

package/esm/dataMap.js

@@ -134,10 +134,10 @@ export var dataMap = {
   action: {
     type: RumEventType.ACTION,
     tags: {
-      action_name: 'action.target.name',
       action_type: 'action.type'
     },
     fields: {
+      action_name: 'action.target.name',
       duration: 'action.loading_time',
       action_error_count: 'action.error.count',
       action_resource_count: 'action.resource.count',

package/esm/helper/contextHistory.js

@@ -1,4 +1,4 @@
-import { relativeNow, ONE_MINUTE, filter, map } from './tools';
+import { relativeNow, ONE_MINUTE, filter, map, each } from './tools';
 var END_OF_TIMES = Infinity;
 export var CLEAR_OLD_CONTEXTS_INTERVAL = ONE_MINUTE;
 export function ContextHistory(expireDelay) {
@@ -39,7 +39,9 @@ ContextHistory.prototype.find = function (startTime) {
     startTime = END_OF_TIMES;
   }
 
-  for (var entry of this.entries) {
+  for (var i = 0; i < this.entries.length; i++) {
+    var entry = this.entries[i];
+
     if (entry.startTime <= startTime) {
       if (startTime <= entry.endTime) {
         return entry.context;

package/esm/helper/limitModification.js

@@ -21,8 +21,11 @@ export function limitModification(object, modifiableFieldPaths, modifier) {
 
 function get(object, path) {
   var current = object;
+  var fields = path.split('.');
+
+  for (var i = 0; i < fields.length; i++) {
+    var field = fields[i];
 
-  for (var field of path.split('.')) {
     if (!isValidObjectContaining(current, field)) {
       return;
     }

package/esm/transport/sendWithRetryStrategy.js

@@ -120,12 +120,10 @@ function newPayloadQueue() {
       queue.push(payload);
       this.bytesCount += payload.bytesCount;
     },
-
-    first() {
+    first: function first() {
       return queue[0];
     },
-
-    dequeue() {
+    dequeue: function dequeue() {
       var payload = queue.shift();
 
       if (payload) {
@@ -134,15 +132,12 @@ function newPayloadQueue() {
 
       return payload;
     },
-
-    size() {
+    size: function size() {
       return queue.length;
     },
-
-    isFull() {
+    isFull: function isFull() {
       return this.bytesCount >= MAX_QUEUE_BYTES_COUNT;
     }
-
   };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudcare/browser-core",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "main": "cjs/index.js",
   "module": "esm/index.js",
   "scripts": {
@@ -20,5 +20,5 @@
   "author": "dataflux",
   "license": "MIT",
   "description": "DataFlux RUM Web 端数据指标监控",
-  "gitHead": "b386724801c6dd65cd462a65b1dcbf89676ae9a4"
+  "gitHead": "7a00f6c0d6380acd59c36f5f0e0b0d46f0d0630a"
 }

package/src/dataMap.js

@@ -133,10 +133,10 @@ export var dataMap = {
   action: {
     type: RumEventType.ACTION,
     tags: {
-      action_name: 'action.target.name',
       action_type: 'action.type'
     },
     fields: {
+      action_name: 'action.target.name',
       duration: 'action.loading_time',
       action_error_count: 'action.error.count',
       action_resource_count: 'action.resource.count',

package/src/helper/contextHistory.js

@@ -1,40 +1,41 @@
-import { relativeNow, ONE_MINUTE, filter, map} from './tools'
+import { relativeNow, ONE_MINUTE, filter, map, each } from './tools'
 
 var END_OF_TIMES = Infinity
 
 export var CLEAR_OLD_CONTEXTS_INTERVAL = ONE_MINUTE
 export function ContextHistory(expireDelay) {
-  this.expireDelay = expireDelay 
+  this.expireDelay = expireDelay
   this.entries = []
   var _this = this
-  this.clearOldContextsInterval = setInterval(function(){
+  this.clearOldContextsInterval = setInterval(function () {
     _this.clearOldContexts()
-  }, CLEAR_OLD_CONTEXTS_INTERVAL);
+  }, CLEAR_OLD_CONTEXTS_INTERVAL)
 }
-ContextHistory.prototype.add = function(context, startTime) {
+ContextHistory.prototype.add = function (context, startTime) {
   var _this = this
   var entry = {
     context: context,
     startTime: startTime,
     endTime: END_OF_TIMES,
-    remove: function() {
+    remove: function () {
       var index = _this.entries.indexOf(entry)
       if (index >= 0) {
         _this.entries.splice(index, 1)
       }
     },
-    close: function(endTime){
+    close: function (endTime) {
       entry.endTime = endTime
-    },
+    }
   }
   this.entries.unshift(entry)
   return entry
 }
-ContextHistory.prototype.find = function(startTime) {
+ContextHistory.prototype.find = function (startTime) {
   if (typeof startTime === 'undefined') {
     startTime = END_OF_TIMES
   }
-  for (var entry of this.entries) {
+  for (var i = 0; i < this.entries.length; i++) {
+    var entry = this.entries[i]
     if (entry.startTime <= startTime) {
       if (startTime <= entry.endTime) {
         return entry.context
@@ -47,7 +48,7 @@ ContextHistory.prototype.find = function(startTime) {
  * Helper function to close the currently active context, if any. This method assumes that entries
  * are not overlapping.
  */
-ContextHistory.prototype.closeActive = function(endTime) {
+ContextHistory.prototype.closeActive = function (endTime) {
   var latestEntry = this.entries[0]
   if (latestEntry && latestEntry.endTime === END_OF_TIMES) {
     latestEntry.close(endTime)
@@ -57,29 +58,35 @@ ContextHistory.prototype.closeActive = function(endTime) {
  * Return all contexts that were active during `startTime`, or all currently active contexts if no
  * `startTime` is provided.
  */
-ContextHistory.prototype.findAll = function(startTime){
+ContextHistory.prototype.findAll = function (startTime) {
   if (typeof startTime === 'undefined') {
     startTime = END_OF_TIMES
   }
-  var result = filter(this.entries, function(entry) { return entry.startTime <= startTime && startTime <= entry.endTime })   
-  return map(result, function(entry) { return entry.context })   
+  var result = filter(this.entries, function (entry) {
+    return entry.startTime <= startTime && startTime <= entry.endTime
+  })
+  return map(result, function (entry) {
+    return entry.context
+  })
 }
 /**
  * Remove all entries from this collection.
  */
-ContextHistory.prototype.reset = function  () {
+ContextHistory.prototype.reset = function () {
   this.entries = []
 }
 /**
  * Stop internal garbage collection of past entries.
  */
-ContextHistory.prototype.stop = function() {
+ContextHistory.prototype.stop = function () {
   clearInterval(this.clearOldContextsInterval)
 }
-ContextHistory.prototype.clearOldContexts = function() {
+ContextHistory.prototype.clearOldContexts = function () {
   var oldTimeThreshold = relativeNow() - this.expireDelay
-  while (this.entries.length > 0 && this.entries[this.entries.length - 1].endTime < oldTimeThreshold) {
+  while (
+    this.entries.length > 0 &&
+    this.entries[this.entries.length - 1].endTime < oldTimeThreshold
+  ) {
     this.entries.pop()
   }
 }
-

package/src/helper/limitModification.js

@@ -21,12 +21,15 @@ export function limitModification(object, modifiableFieldPaths, modifier) {
 
 function get(object, path) {
   var current = object
-  for (var field of path.split('.')) {
+  var fields = path.split('.')
+  for (var i = 0; i < fields.length; i++) {
+    var field = fields[i]
     if (!isValidObjectContaining(current, field)) {
       return
     }
     current = current[field]
   }
+
   return current
 }
 

package/src/transport/sendWithRetryStrategy.js

@@ -1,4 +1,9 @@
-import { clocksNow, ONE_KIBI_BYTE, ONE_MEBI_BYTE, ONE_SECOND } from '../helper/tools'
+import {
+  clocksNow,
+  ONE_KIBI_BYTE,
+  ONE_MEBI_BYTE,
+  ONE_SECOND
+} from '../helper/tools'
 import { ErrorSource } from '../helper/errorTools'
 
 export var MAX_ONGOING_BYTES_COUNT = 80 * ONE_KIBI_BYTE
@@ -10,12 +15,12 @@ export var INITIAL_BACKOFF_TIME = ONE_SECOND
 var TransportStatus = {
   UP: 'UP',
   FAILURE_DETECTED: 'FAILURE_DETECTED',
-  DOWN: 'DOWN',
+  DOWN: 'DOWN'
 }
 
 var RetryReason = {
   AFTER_SUCCESS: 'AFTER_SUCCESS',
-  AFTER_RESUME: 'AFTER_RESUME',
+  AFTER_RESUME: 'AFTER_RESUME'
 }
 
 export function sendWithRetryStrategy(
@@ -30,59 +35,62 @@ export function sendWithRetryStrategy(
     state.bandwidthMonitor.canHandle(payload)
   ) {
     send(payload, state, sendStrategy, {
-      onSuccess: function()  { return retryQueuedPayloads(RetryReason.AFTER_SUCCESS, state, sendStrategy, reportError) },
-      onFailure: function()  {
+      onSuccess: function () {
+        return retryQueuedPayloads(
+          RetryReason.AFTER_SUCCESS,
+          state,
+          sendStrategy,
+          reportError
+        )
+      },
+      onFailure: function () {
         state.queuedPayloads.enqueue(payload)
         scheduleRetry(state, sendStrategy, reportError)
-      },
+      }
     })
   } else {
     state.queuedPayloads.enqueue(payload)
   }
 }
 
-function scheduleRetry(
-  state,
-  sendStrategy,
-  reportError
-) {
+function scheduleRetry(state, sendStrategy, reportError) {
   if (state.transportStatus !== TransportStatus.DOWN) {
     return
   }
-  setTimeout(
-    function(){
-      var payload = state.queuedPayloads.first()
-      send(payload, state, sendStrategy, {
-        onSuccess: function() {
-          state.queuedPayloads.dequeue()
-          // if (state.lastFailureStatus !== 0) {
-          //   addTelemetryDebug('resuming after transport down', {
-          //     failureStatus: state.lastFailureStatus,
-          //   })
-          // }
-          state.currentBackoffTime = INITIAL_BACKOFF_TIME
-          retryQueuedPayloads(RetryReason.AFTER_RESUME, state, sendStrategy, reportError)
-        },
-        onFailure: function() {
-          state.currentBackoffTime = Math.min(MAX_BACKOFF_TIME, state.currentBackoffTime * 2)
-          scheduleRetry(state, sendStrategy, reportError)
-        },
-      })
-    },
-    state.currentBackoffTime
-  )
+  setTimeout(function () {
+    var payload = state.queuedPayloads.first()
+    send(payload, state, sendStrategy, {
+      onSuccess: function () {
+        state.queuedPayloads.dequeue()
+        // if (state.lastFailureStatus !== 0) {
+        //   addTelemetryDebug('resuming after transport down', {
+        //     failureStatus: state.lastFailureStatus,
+        //   })
+        // }
+        state.currentBackoffTime = INITIAL_BACKOFF_TIME
+        retryQueuedPayloads(
+          RetryReason.AFTER_RESUME,
+          state,
+          sendStrategy,
+          reportError
+        )
+      },
+      onFailure: function () {
+        state.currentBackoffTime = Math.min(
+          MAX_BACKOFF_TIME,
+          state.currentBackoffTime * 2
+        )
+        scheduleRetry(state, sendStrategy, reportError)
+      }
+    })
+  }, state.currentBackoffTime)
 }
 
-function send(
-  payload,
-  state,
-  sendStrategy,
-  responseData
-) {
+function send(payload, state, sendStrategy, responseData) {
   var onSuccess = responseData.onSuccess
   var onFailure = responseData.onFailure
   state.bandwidthMonitor.add(payload)
-  sendStrategy(payload, function(response) {
+  sendStrategy(payload, function (response) {
     state.bandwidthMonitor.remove(payload)
     if (wasRequestSuccessful(response)) {
       state.transportStatus = TransportStatus.UP
@@ -90,31 +98,40 @@ function send(
     } else {
       // do not consider transport down if another ongoing request could succeed
       state.transportStatus =
-        state.bandwidthMonitor.ongoingRequestCount > 0 ? TransportStatus.FAILURE_DETECTED : TransportStatus.DOWN
+        state.bandwidthMonitor.ongoingRequestCount > 0
+          ? TransportStatus.FAILURE_DETECTED
+          : TransportStatus.DOWN
       state.lastFailureStatus = response.status
       onFailure()
     }
   })
 }
 
-function retryQueuedPayloads(
-  reason,
-  state,
-  sendStrategy,
-  reportError
-) {
-  if (reason === RetryReason.AFTER_SUCCESS && state.queuedPayloads.isFull() && !state.queueFullReported) {
+function retryQueuedPayloads(reason, state, sendStrategy, reportError) {
+  if (
+    reason === RetryReason.AFTER_SUCCESS &&
+    state.queuedPayloads.isFull() &&
+    !state.queueFullReported
+  ) {
     reportError({
-      message: 'Reached max events size queued for upload: '+ MAX_QUEUE_BYTES_COUNT / ONE_MEBI_BYTE + 'MiB',
+      message:
+        'Reached max events size queued for upload: ' +
+        MAX_QUEUE_BYTES_COUNT / ONE_MEBI_BYTE +
+        'MiB',
       source: ErrorSource.AGENT,
-      startClocks: clocksNow(),
+      startClocks: clocksNow()
     })
     state.queueFullReported = true
   }
   var previousQueue = state.queuedPayloads
   state.queuedPayloads = newPayloadQueue()
   while (previousQueue.size() > 0) {
-    sendWithRetryStrategy(previousQueue.dequeue(), state, sendStrategy, reportError)
+    sendWithRetryStrategy(
+      previousQueue.dequeue(),
+      state,
+      sendStrategy,
+      reportError
+    )
   }
 }
 
@@ -129,7 +146,7 @@ export function newRetryState() {
     currentBackoffTime: INITIAL_BACKOFF_TIME,
     bandwidthMonitor: newBandwidthMonitor(),
     queuedPayloads: newPayloadQueue(),
-    queueFullReported: false,
+    queueFullReported: false
   }
 }
 
@@ -137,29 +154,29 @@ function newPayloadQueue() {
   var queue = []
   return {
     bytesCount: 0,
-    enqueue: function(payload) {
+    enqueue: function (payload) {
       if (this.isFull()) {
         return
       }
       queue.push(payload)
       this.bytesCount += payload.bytesCount
     },
-    first() {
+    first: function () {
       return queue[0]
     },
-    dequeue() {
+    dequeue: function () {
       var payload = queue.shift()
       if (payload) {
         this.bytesCount -= payload.bytesCount
       }
       return payload
     },
-    size() {
+    size: function () {
       return queue.length
     },
-    isFull() {
+    isFull: function () {
       return this.bytesCount >= MAX_QUEUE_BYTES_COUNT
-    },
+    }
   }
 }
 
@@ -167,20 +184,21 @@ function newBandwidthMonitor() {
   return {
     ongoingRequestCount: 0,
     ongoingByteCount: 0,
-    canHandle: function(payload) {
+    canHandle: function (payload) {
       return (
         this.ongoingRequestCount === 0 ||
-        (this.ongoingByteCount + payload.bytesCount <= MAX_ONGOING_BYTES_COUNT &&
+        (this.ongoingByteCount + payload.bytesCount <=
+          MAX_ONGOING_BYTES_COUNT &&
           this.ongoingRequestCount < MAX_ONGOING_REQUESTS)
       )
     },
-    add: function(payload) {
+    add: function (payload) {
       this.ongoingRequestCount += 1
       this.ongoingByteCount += payload.bytesCount
     },
-    remove:function(payload) {
+    remove: function (payload) {
       this.ongoingRequestCount -= 1
       this.ongoingByteCount -= payload.bytesCount
-    },
+    }
   }
 }