@cloudcare/browser-core 1.0.29 → 1.1.0

package/cjs/helper/tools.js

@@ -8,7 +8,9 @@ exports.UUID = UUID;
 exports.addEvent = exports._URL = void 0;
 exports.addEventListener = addEventListener;
 exports.addEventListeners = addEventListeners;
-exports.base64Encode = exports.autoExeQueue = exports.ajax = exports.addSinglePageEvent = exports.addHashEvent = void 0;
+exports.ajax = exports.addSinglePageEvent = exports.addHashEvent = void 0;
+exports.assign = assign;
+exports.base64Encode = exports.autoExeQueue = void 0;
 exports.clocksNow = clocksNow;
 exports.clocksOrigin = clocksOrigin;
 exports.coverExtend = exports.cookie = void 0;
@@ -58,7 +60,10 @@ exports.replaceNumberCharByPath = replaceNumberCharByPath;
 exports.round = round;
 exports.safeJSONParse = void 0;
 exports.safeTruncate = safeTruncate;
-exports.throttle = exports.strip_sa_properties = exports.strip_empty_properties = exports.stringSplice = exports.strToUnicode = exports.sessionStorage = exports.searchObjString = exports.searchObjDate = exports.searchConfigData = void 0;
+exports.sessionStorage = exports.searchObjString = exports.searchObjDate = exports.searchConfigData = void 0;
+exports.shallowClone = shallowClone;
+exports.strip_empty_properties = exports.stringSplice = exports.strToUnicode = void 0;
+exports.throttle = exports.strip_sa_properties = void 0;
 exports.timeStampNow = timeStampNow;
 exports.toArray = exports.tirm = void 0;
 exports.toServerDuration = toServerDuration;
@@ -105,6 +110,21 @@ var each = function each(obj, iterator, context) {
 
 exports.each = each;
 
+function assign(target) {
+  each(slice.call(arguments, 1), function (source) {
+    for (var prop in source) {
+      if (Object.prototype.hasOwnProperty.call(source, prop)) {
+        target[prop] = source[prop];
+      }
+    }
+  });
+  return target;
+}
+
+function shallowClone(object) {
+  return assign({}, object);
+}
+
 var extend = function extend(obj) {
   each(slice.call(arguments, 1), function (source) {
     for (var prop in source) {

package/cjs/transport.js

@@ -11,6 +11,8 @@ var _enums = require("./helper/enums");
 
 var _dataMap = require("./dataMap");
 
+var _init = require("./init");
+
 // https://en.wikipedia.org/wiki/UTF-8
 var HAS_MULTI_BYTES_CHARACTERS = /[^\u0000-\u007F]/;
 var CUSTOM_KEYS = 'custom_keys';
@@ -20,27 +22,37 @@ function addBatchPrecision(url) {
   return url + (url.indexOf('?') === -1 ? '?' : '&') + 'precision=ms';
 }
 
+var global = (0, _init.getGlobalObject)();
+
 var httpRequest = function httpRequest(endpointUrl, bytesLimit, isLineProtocolToJson) {
   this.endpointUrl = endpointUrl;
   this.bytesLimit = bytesLimit;
   this.isLineProtocolToJson = isLineProtocolToJson;
+  var isRealNavigator = Object.prototype.toString.call(global && global.navigator) === '[object Navigator]';
+  var hasSendBeacon = isRealNavigator && typeof global.navigator.sendBeacon === 'function';
+
+  if (hasSendBeacon) {
+    this.sendBeacon = global.navigator.sendBeacon.bind(global.navigator);
+  } else {
+    this.sendBeacon = undefined;
+  }
 };
 
 httpRequest.prototype = {
   send: function send(data, size) {
     var url = addBatchPrecision(this.endpointUrl);
 
-    if (navigator.sendBeacon && size < this.bytesLimit && !this.isLineProtocolToJson) {
-      var isQueued = navigator.sendBeacon(url, data);
+    if (this.sendBeacon && size < this.bytesLimit && !this.isLineProtocolToJson) {
+      var isQueued = this.sendBeacon(url, data);
 
       if (isQueued) {
         return;
       }
-    } else if (navigator.sendBeacon && size < this.bytesLimit && this.isLineProtocolToJson) {
+    } else if (this.sendBeacon && size < this.bytesLimit && this.isLineProtocolToJson) {
       var blob = new Blob([JSON.stringify(data)], {
         type: 'application/json'
       });
-      var isQueued = navigator.sendBeacon(url, blob);
+      var isQueued = this.sendBeacon(url, blob);
 
       if (isQueued) {
         return;
@@ -176,20 +188,21 @@ var processedMessageByDataMap = function processedMessageByDataMap(message) {
 
 exports.processedMessageByDataMap = processedMessageByDataMap;
 
-function batch(request, maxSize, bytesLimit, maxMessageSize, flushTimeout, isLineProtocolToJson, beforeUnloadCallback) {
+var batch = function batch(request, maxSize, bytesLimit, maxMessageSize, flushTimeout, isLineProtocolToJson, beforeUnloadCallback) {
   this.request = request;
   this.maxSize = maxSize;
   this.bytesLimit = bytesLimit;
   this.maxMessageSize = maxMessageSize;
   this.flushTimeout = flushTimeout;
-  this.isLineProtocolToJson = isLineProtocolToJson, this.beforeUnloadCallback = beforeUnloadCallback;
+  this.isLineProtocolToJson = isLineProtocolToJson;
+  this.beforeUnloadCallback = beforeUnloadCallback;
   this.pushOnlyBuffer = [];
   this.upsertBuffer = {};
   this.bufferBytesSize = 0;
   this.bufferMessageCount = 0;
   this.flushOnVisibilityHidden();
   this.flushPeriodically();
-}
+};
 
 batch.prototype = {
   add: function add(message) {
@@ -321,7 +334,7 @@ batch.prototype = {
     // @ts-ignore this function is not always defined
 
 
-    if (navigator.sendBeacon) {
+    if (global.navigator.sendBeacon) {
       /**
        * beforeunload is called before visibilitychange
        * register first to be sure to be called before flush on beforeunload

package/esm/helper/tools.js

@@ -30,6 +30,19 @@ export var each = function each(obj, iterator, context) {
     }
   }
 };
+export function assign(target) {
+  each(slice.call(arguments, 1), function (source) {
+    for (var prop in source) {
+      if (Object.prototype.hasOwnProperty.call(source, prop)) {
+        target[prop] = source[prop];
+      }
+    }
+  });
+  return target;
+}
+export function shallowClone(object) {
+  return assign({}, object);
+}
 export var extend = function extend(obj) {
   each(slice.call(arguments, 1), function (source) {
     for (var prop in source) {

package/esm/transport.js

@@ -1,6 +1,7 @@
 import { addEventListener, values, findByPath, escapeRowData, each, isNumber, isArray, extend, isString, toServerDuration, isBoolean, isEmptyObject, isObject, map, escapeJsonValue } from './helper/tools';
 import { DOM_EVENT, RumEventType } from './helper/enums';
-import { commonTags, dataMap } from './dataMap'; // https://en.wikipedia.org/wiki/UTF-8
+import { commonTags, dataMap } from './dataMap';
+import { getGlobalObject } from './init'; // https://en.wikipedia.org/wiki/UTF-8
 
 var HAS_MULTI_BYTES_CHARACTERS = /[^\u0000-\u007F]/;
 var CUSTOM_KEYS = 'custom_keys';
@@ -10,27 +11,37 @@ function addBatchPrecision(url) {
   return url + (url.indexOf('?') === -1 ? '?' : '&') + 'precision=ms';
 }
 
+var global = getGlobalObject();
+
 var httpRequest = function httpRequest(endpointUrl, bytesLimit, isLineProtocolToJson) {
   this.endpointUrl = endpointUrl;
   this.bytesLimit = bytesLimit;
   this.isLineProtocolToJson = isLineProtocolToJson;
+  var isRealNavigator = Object.prototype.toString.call(global && global.navigator) === '[object Navigator]';
+  var hasSendBeacon = isRealNavigator && typeof global.navigator.sendBeacon === 'function';
+
+  if (hasSendBeacon) {
+    this.sendBeacon = global.navigator.sendBeacon.bind(global.navigator);
+  } else {
+    this.sendBeacon = undefined;
+  }
 };
 
 httpRequest.prototype = {
   send: function send(data, size) {
     var url = addBatchPrecision(this.endpointUrl);
 
-    if (navigator.sendBeacon && size < this.bytesLimit && !this.isLineProtocolToJson) {
-      var isQueued = navigator.sendBeacon(url, data);
+    if (this.sendBeacon && size < this.bytesLimit && !this.isLineProtocolToJson) {
+      var isQueued = this.sendBeacon(url, data);
 
       if (isQueued) {
         return;
       }
-    } else if (navigator.sendBeacon && size < this.bytesLimit && this.isLineProtocolToJson) {
+    } else if (this.sendBeacon && size < this.bytesLimit && this.isLineProtocolToJson) {
       var blob = new Blob([JSON.stringify(data)], {
         type: 'application/json'
       });
-      var isQueued = navigator.sendBeacon(url, blob);
+      var isQueued = this.sendBeacon(url, blob);
 
       if (isQueued) {
         return;
@@ -162,20 +173,21 @@ export var processedMessageByDataMap = function processedMessageByDataMap(messag
   };
 };
 
-function batch(request, maxSize, bytesLimit, maxMessageSize, flushTimeout, isLineProtocolToJson, beforeUnloadCallback) {
+var batch = function batch(request, maxSize, bytesLimit, maxMessageSize, flushTimeout, isLineProtocolToJson, beforeUnloadCallback) {
   this.request = request;
   this.maxSize = maxSize;
   this.bytesLimit = bytesLimit;
   this.maxMessageSize = maxMessageSize;
   this.flushTimeout = flushTimeout;
-  this.isLineProtocolToJson = isLineProtocolToJson, this.beforeUnloadCallback = beforeUnloadCallback;
+  this.isLineProtocolToJson = isLineProtocolToJson;
+  this.beforeUnloadCallback = beforeUnloadCallback;
   this.pushOnlyBuffer = [];
   this.upsertBuffer = {};
   this.bufferBytesSize = 0;
   this.bufferMessageCount = 0;
   this.flushOnVisibilityHidden();
   this.flushPeriodically();
-}
+};
 
 batch.prototype = {
   add: function add(message) {
@@ -307,7 +319,7 @@ batch.prototype = {
     // @ts-ignore this function is not always defined
 
 
-    if (navigator.sendBeacon) {
+    if (global.navigator.sendBeacon) {
       /**
        * beforeunload is called before visibilitychange
        * register first to be sure to be called before flush on beforeunload

package/package.json

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

package/src/helper/tools.js

@@ -29,6 +29,20 @@ export var each = function (obj, iterator, context) {
     }
   }
 }
+export function assign(target) {
+  each(slice.call(arguments, 1), function (source) {
+    for (var prop in source) {
+      if (Object.prototype.hasOwnProperty.call(source, prop)) {
+        target[prop] = source[prop]
+      }
+    }
+  })
+  return target
+}
+
+export function shallowClone(object){
+  return assign({}, object)
+}
 export var extend = function (obj) {
   each(slice.call(arguments, 1), function (source) {
     for (var prop in source) {
@@ -1709,4 +1723,4 @@ export function escapeJsonValue(value) {
   } else {
     return jsonStringify(value)
   }
-}
+}

package/src/transport.js

@@ -17,6 +17,7 @@ import {
 } from './helper/tools'
 import { DOM_EVENT, RumEventType } from './helper/enums'
 import { commonTags, dataMap } from './dataMap'
+import {  getGlobalObject } from'./init'
 // https://en.wikipedia.org/wiki/UTF-8
 var HAS_MULTI_BYTES_CHARACTERS = /[^\u0000-\u007F]/
 var CUSTOM_KEYS = 'custom_keys'
@@ -24,29 +25,40 @@ function addBatchPrecision(url) {
   if (!url) return url
   return url + (url.indexOf('?') === -1 ? '?' : '&') + 'precision=ms'
 }
+var global = getGlobalObject()
 var httpRequest = function (endpointUrl, bytesLimit, isLineProtocolToJson) {
   this.endpointUrl = endpointUrl
   this.bytesLimit = bytesLimit
   this.isLineProtocolToJson = isLineProtocolToJson
+  var isRealNavigator = Object.prototype.toString.call(global && global.navigator) === '[object Navigator]';
+  var hasSendBeacon = isRealNavigator && typeof global.navigator.sendBeacon === 'function';
+  if (hasSendBeacon) {
+    this.sendBeacon = global.navigator.sendBeacon.bind(global.navigator);
+  } else {
+    this.sendBeacon = undefined
+  }
+  
 }
 httpRequest.prototype = {
   send: function (data, size) {
     
     var url = addBatchPrecision(this.endpointUrl)
-    if (navigator.sendBeacon && size < this.bytesLimit && !this.isLineProtocolToJson) {
-      var isQueued = navigator.sendBeacon(url, data)
+    
+    if (this.sendBeacon && size < this.bytesLimit && !this.isLineProtocolToJson) {
+      var isQueued = this.sendBeacon(url, data)
       if (isQueued) {
-        return
+        return 
       }
-    } else if (navigator.sendBeacon && size < this.bytesLimit && this.isLineProtocolToJson) {
+    } else if (this.sendBeacon && size < this.bytesLimit && this.isLineProtocolToJson) {
       const blob = new Blob([JSON.stringify(data)], {
         type: 'application/json',
       });
-      var isQueued = navigator.sendBeacon(url, blob)
+      var isQueued = this.sendBeacon(url, blob)
       if (isQueued) {
         return
       }
     }
+    
     var request = new XMLHttpRequest()
     request.open('POST', url, true)
     request.withCredentials = true
@@ -54,6 +66,7 @@ httpRequest.prototype = {
       request.setRequestHeader('Content-type', 'application/json')
       request.send(JSON.stringify(data))
     } else {
+      
       request.setRequestHeader('Content-type', 'text/plain;charset=UTF-8')
       request.send(data)
     }
@@ -165,7 +178,7 @@ export var processedMessageByDataMap = function (message) {
     rowData: hasFileds ? rowData : undefined
   }
 }
-function batch(
+var batch = function(
   request,
   maxSize,
   bytesLimit,
@@ -174,30 +187,37 @@ function batch(
   isLineProtocolToJson,
   beforeUnloadCallback
 ) {
+  
   this.request = request
   this.maxSize = maxSize
   this.bytesLimit = bytesLimit
   this.maxMessageSize = maxMessageSize
   this.flushTimeout = flushTimeout
-  this.isLineProtocolToJson = isLineProtocolToJson,
+  this.isLineProtocolToJson = isLineProtocolToJson
   this.beforeUnloadCallback = beforeUnloadCallback
+  
   this.pushOnlyBuffer = []
   this.upsertBuffer = {}
   this.bufferBytesSize = 0
   this.bufferMessageCount = 0
+  
   this.flushOnVisibilityHidden()
   this.flushPeriodically()
 }
 batch.prototype = {
+  
   add: function (message) {
+    
     this.addOrUpdate(message)
   },
 
   upsert: function (message, key) {
+    
     this.addOrUpdate(message, key)
   },
 
   flush: function () {
+    
     if (this.bufferMessageCount !== 0) {
       var messages = this.pushOnlyBuffer.concat(values(this.upsertBuffer))
       if (messages.length === 0) return
@@ -206,6 +226,7 @@ batch.prototype = {
           return JSON.parse(rowdataStr)
         }), this.bufferBytesSize)
       } else {
+        
         this.request.send(messages.join('\n'), this.bufferBytesSize)
       }
       
@@ -220,6 +241,7 @@ batch.prototype = {
     if (this.isLineProtocolToJson) {
       return JSON.stringify(processedMessageByDataMap(message).rowData)
     }
+    
     return processedMessageByDataMap(message).rowStr
   },
   sizeInBytes: function (candidate) {
@@ -323,7 +345,7 @@ batch.prototype = {
      * With sendBeacon, requests are guaranteed to be successfully sent during document unload
      */
     // @ts-ignore this function is not always defined
-    if (navigator.sendBeacon) {
+    if (global.navigator.sendBeacon) {
       /**
        * beforeunload is called before visibilitychange
        * register first to be sure to be called before flush on beforeunload