@cloudcare/browser-core 1.0.29 → 1.1.2

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;
@@ -19,8 +21,10 @@ exports.deepSnakeCase = deepSnakeCase;
 exports.each = void 0;
 exports.elapsed = elapsed;
 exports.encodeDates = void 0;
+exports.escapeFieldValueStr = escapeFieldValueStr;
 exports.escapeJsonValue = escapeJsonValue;
 exports.escapeRowData = escapeRowData;
+exports.escapeRowField = escapeRowField;
 exports.filter = exports.extend2Lev = exports.extend = void 0;
 exports.find = find;
 exports.findByPath = findByPath;
@@ -58,7 +62,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.strToUnicode = void 0;
+exports.throttle = exports.strip_sa_properties = exports.strip_empty_properties = exports.stringSplice = void 0;
 exports.timeStampNow = timeStampNow;
 exports.toArray = exports.tirm = void 0;
 exports.toServerDuration = toServerDuration;
@@ -105,6 +112,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) {
@@ -1812,7 +1834,7 @@ function clocksNow() {
 }
 
 function timeStampNow() {
-  return Date.now();
+  return new Date().getTime();
 }
 
 function elapsed(start, end) {
@@ -2042,4 +2064,18 @@ function escapeJsonValue(value) {
   } else {
     return jsonStringify(value);
   }
+}
+
+function escapeFieldValueStr(str) {
+  return '"' + str.replace(/[\\]*"/g, '"').replace(/"/g, '\\"') + '"';
+}
+
+function escapeRowField(value) {
+  if (_typeof(value) === 'object' && value) {
+    return escapeFieldValueStr(jsonStringify(value));
+  } else if (isString(value)) {
+    return escapeFieldValueStr(value);
+  } else {
+    return value;
+  }
 }

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;
@@ -80,7 +92,7 @@ var processedMessageByDataMap = function processedMessageByDataMap(message) {
       rowData.measurement = key;
       var tagsStr = [];
       var tags = (0, _tools.extend)({}, _dataMap.commonTags, value.tags);
-      var filterFileds = ['date', 'type']; // 已经在datamap中定义过的fields和tags
+      var filterFileds = ['date', 'type', CUSTOM_KEYS]; // 已经在datamap中定义过的fields和tags
 
       (0, _tools.each)(tags, function (value_path, _key) {
         var _value = (0, _tools.findByPath)(message, value_path);
@@ -104,9 +116,14 @@ var processedMessageByDataMap = function processedMessageByDataMap(message) {
 
           if (_valueData || (0, _tools.isNumber)(_valueData)) {
             rowData.fields[_key] = _valueData; // 这里不需要转译
-
-            _valueData = type === 'string' ? '"' + _valueData.replace(/[\\]*"/g, '"').replace(/"/g, '\\"') + '"' : (0, _tools.escapeRowData)(_valueData);
-            fieldsStr.push((0, _tools.escapeRowData)(_key) + '=' + _valueData);
+            // _valueData =
+            //   type === 'string'
+            //     ? '"' +
+            //       _valueData.replace(/[\\]*"/g, '"').replace(/"/g, '\\"') +
+            //       '"'
+            //     : escapeRowData(_valueData)
+
+            fieldsStr.push((0, _tools.escapeRowData)(_key) + '=' + (0, _tools.escapeRowField)(_valueData));
           }
         } else if ((0, _tools.isString)(_value)) {
           var _valueData = (0, _tools.findByPath)(message, _value);
@@ -116,14 +133,13 @@ var processedMessageByDataMap = function processedMessageByDataMap(message) {
           if (_valueData || (0, _tools.isNumber)(_valueData)) {
             rowData.fields[_key] = _valueData; // 这里不需要转译
 
-            _valueData = (0, _tools.escapeRowData)(_valueData);
-            fieldsStr.push((0, _tools.escapeRowData)(_key) + '=' + _valueData);
+            fieldsStr.push((0, _tools.escapeRowData)(_key) + '=' + (0, _tools.escapeRowField)(_valueData));
           }
         }
       });
 
       if (message.tags && (0, _tools.isObject)(message.tags) && !(0, _tools.isEmptyObject)(message.tags)) {
-        // 自定义tag
+        // 自定义tag， 存储成field
         var _tagKeys = [];
         (0, _tools.each)(message.tags, function (_value, _key) {
           // 如果和之前tag重名，则舍弃
@@ -133,14 +149,15 @@ var processedMessageByDataMap = function processedMessageByDataMap(message) {
           if (_value || (0, _tools.isNumber)(_value)) {
             _tagKeys.push(_key);
 
-            rowData.tags[_key] = (0, _tools.escapeJsonValue)(_value);
-            tagsStr.push((0, _tools.escapeRowData)(_key) + '=' + (0, _tools.escapeRowData)(_value));
+            rowData.fields[_key] = _value; // 这里不需要转译
+
+            fieldsStr.push((0, _tools.escapeRowData)(_key) + '=' + (0, _tools.escapeRowField)(_value));
           }
         });
 
         if (_tagKeys.length) {
-          rowData.tags[CUSTOM_KEYS] = (0, _tools.escapeJsonValue)(_tagKeys);
-          tagsStr.push((0, _tools.escapeRowData)(CUSTOM_KEYS) + '=' + (0, _tools.escapeRowData)(_tagKeys));
+          rowData.fields[CUSTOM_KEYS] = (0, _tools.escapeRowField)(_tagKeys);
+          fieldsStr.push((0, _tools.escapeRowData)(CUSTOM_KEYS) + '=' + (0, _tools.escapeRowField)(_tagKeys));
         }
       }
 
@@ -148,8 +165,9 @@ var processedMessageByDataMap = function processedMessageByDataMap(message) {
         // 这里处理日志类型数据自定义字段
         (0, _tools.each)(message, function (value, key) {
           if (filterFileds.indexOf(key) === -1 && ((0, _tools.isNumber)(value) || (0, _tools.isString)(value) || (0, _tools.isBoolean)(value))) {
-            rowData.tags[key] = (0, _tools.escapeJsonValue)(value);
-            tagsStr.push((0, _tools.escapeRowData)(key) + '=' + (0, _tools.escapeRowData)(value));
+            rowData.fields[key] = value; // 这里不需要转译
+
+            fieldsStr.push((0, _tools.escapeRowData)(key) + '=' + (0, _tools.escapeRowField)(value));
           }
         });
       }
@@ -176,20 +194,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 +340,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) {
@@ -1526,7 +1539,7 @@ export function clocksNow() {
   };
 }
 export function timeStampNow() {
-  return Date.now();
+  return new Date().getTime();
 }
 export function elapsed(start, end) {
   return end - start;
@@ -1733,4 +1746,16 @@ export function escapeJsonValue(value) {
   } else {
     return jsonStringify(value);
   }
+}
+export function escapeFieldValueStr(str) {
+  return '"' + str.replace(/[\\]*"/g, '"').replace(/"/g, '\\"') + '"';
+}
+export function escapeRowField(value) {
+  if (typeof value === 'object' && value) {
+    return escapeFieldValueStr(jsonStringify(value));
+  } else if (isString(value)) {
+    return escapeFieldValueStr(value);
+  } else {
+    return value;
+  }
 }

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 { addEventListener, values, findByPath, escapeRowData, each, isNumber, isArray, extend, isString, toServerDuration, isBoolean, isEmptyObject, isObject, map, escapeJsonValue, escapeRowField } 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;
@@ -68,7 +79,7 @@ export var processedMessageByDataMap = function processedMessageByDataMap(messag
       rowData.measurement = key;
       var tagsStr = [];
       var tags = extend({}, commonTags, value.tags);
-      var filterFileds = ['date', 'type']; // 已经在datamap中定义过的fields和tags
+      var filterFileds = ['date', 'type', CUSTOM_KEYS]; // 已经在datamap中定义过的fields和tags
 
       each(tags, function (value_path, _key) {
         var _value = findByPath(message, value_path);
@@ -92,9 +103,14 @@ export var processedMessageByDataMap = function processedMessageByDataMap(messag
 
           if (_valueData || isNumber(_valueData)) {
             rowData.fields[_key] = _valueData; // 这里不需要转译
-
-            _valueData = type === 'string' ? '"' + _valueData.replace(/[\\]*"/g, '"').replace(/"/g, '\\"') + '"' : escapeRowData(_valueData);
-            fieldsStr.push(escapeRowData(_key) + '=' + _valueData);
+            // _valueData =
+            //   type === 'string'
+            //     ? '"' +
+            //       _valueData.replace(/[\\]*"/g, '"').replace(/"/g, '\\"') +
+            //       '"'
+            //     : escapeRowData(_valueData)
+
+            fieldsStr.push(escapeRowData(_key) + '=' + escapeRowField(_valueData));
           }
         } else if (isString(_value)) {
           var _valueData = findByPath(message, _value);
@@ -104,14 +120,13 @@ export var processedMessageByDataMap = function processedMessageByDataMap(messag
           if (_valueData || isNumber(_valueData)) {
             rowData.fields[_key] = _valueData; // 这里不需要转译
 
-            _valueData = escapeRowData(_valueData);
-            fieldsStr.push(escapeRowData(_key) + '=' + _valueData);
+            fieldsStr.push(escapeRowData(_key) + '=' + escapeRowField(_valueData));
           }
         }
       });
 
       if (message.tags && isObject(message.tags) && !isEmptyObject(message.tags)) {
-        // 自定义tag
+        // 自定义tag， 存储成field
         var _tagKeys = [];
         each(message.tags, function (_value, _key) {
           // 如果和之前tag重名，则舍弃
@@ -121,14 +136,15 @@ export var processedMessageByDataMap = function processedMessageByDataMap(messag
           if (_value || isNumber(_value)) {
             _tagKeys.push(_key);
 
-            rowData.tags[_key] = escapeJsonValue(_value);
-            tagsStr.push(escapeRowData(_key) + '=' + escapeRowData(_value));
+            rowData.fields[_key] = _value; // 这里不需要转译
+
+            fieldsStr.push(escapeRowData(_key) + '=' + escapeRowField(_value));
           }
         });
 
         if (_tagKeys.length) {
-          rowData.tags[CUSTOM_KEYS] = escapeJsonValue(_tagKeys);
-          tagsStr.push(escapeRowData(CUSTOM_KEYS) + '=' + escapeRowData(_tagKeys));
+          rowData.fields[CUSTOM_KEYS] = escapeRowField(_tagKeys);
+          fieldsStr.push(escapeRowData(CUSTOM_KEYS) + '=' + escapeRowField(_tagKeys));
         }
       }
 
@@ -136,8 +152,9 @@ export var processedMessageByDataMap = function processedMessageByDataMap(messag
         // 这里处理日志类型数据自定义字段
         each(message, function (value, key) {
           if (filterFileds.indexOf(key) === -1 && (isNumber(value) || isString(value) || isBoolean(value))) {
-            rowData.tags[key] = escapeJsonValue(value);
-            tagsStr.push(escapeRowData(key) + '=' + escapeRowData(value));
+            rowData.fields[key] = value; // 这里不需要转译
+
+            fieldsStr.push(escapeRowData(key) + '=' + escapeRowField(value));
           }
         });
       }
@@ -162,20 +179,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 +325,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.2",
   "main": "cjs/index.js",
   "module": "esm/index.js",
   "scripts": {
@@ -20,5 +20,5 @@
   "author": "dataflux",
   "license": "MIT",
   "description": "DataFlux RUM Web 端数据指标监控",
-  "gitHead": "34770c27f33e4fbaaafc8743aa5e9f5ffd14bc14"
+  "gitHead": "5cbe53e30874a6c365a4e1e31353da8b02d0e0f3"
 }

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) {
@@ -1500,7 +1514,7 @@ export function clocksNow() {
   return { relative: relativeNow(), timeStamp: timeStampNow() }
 }
 export function timeStampNow() {
-  return Date.now()
+  return new Date().getTime()
 }
 export function elapsed(start, end) {
   return end - start
@@ -1709,4 +1723,18 @@ export function escapeJsonValue(value) {
   } else {
     return jsonStringify(value)
   }
-}
+}
+export function escapeFieldValueStr(str) {
+  return '"' +
+  str.replace(/[\\]*"/g, '"').replace(/"/g, '\\"') +
+  '"'
+}
+export function escapeRowField(value) {
+  if (typeof value === 'object' && value) {
+    return escapeFieldValueStr(jsonStringify(value))
+  } else if (isString(value)) {
+    return escapeFieldValueStr(value)
+  } else {
+    return value
+  }
+}

package/src/transport.js

@@ -13,10 +13,12 @@ import {
   isEmptyObject,
   isObject,
   map,
-  escapeJsonValue
+  escapeJsonValue,
+  escapeRowField
 } 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 +26,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 +67,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)
     }
@@ -80,7 +94,7 @@ export var processedMessageByDataMap = function (message) {
       rowData.measurement = key
       var tagsStr = []
       var tags = extend({}, commonTags, value.tags)
-      var filterFileds = ['date', 'type'] // 已经在datamap中定义过的fields和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)
@@ -99,26 +113,25 @@ export var processedMessageByDataMap = function (message) {
           filterFileds.push(_key)
           if (_valueData || isNumber(_valueData)) {
             rowData.fields[_key] = _valueData // 这里不需要转译
-            _valueData =
-              type === 'string'
-                ? '"' +
-                  _valueData.replace(/[\\]*"/g, '"').replace(/"/g, '\\"') +
-                  '"'
-                : escapeRowData(_valueData)
-            fieldsStr.push(escapeRowData(_key) + '=' + _valueData)
+            // _valueData =
+            //   type === 'string'
+            //     ? '"' +
+            //       _valueData.replace(/[\\]*"/g, '"').replace(/"/g, '\\"') +
+            //       '"'
+            //     : escapeRowData(_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 // 这里不需要转译
-            _valueData = escapeRowData(_valueData)
-            fieldsStr.push(escapeRowData(_key) + '=' + _valueData)
+            fieldsStr.push(escapeRowData(_key) + '=' + escapeRowField(_valueData))
           }
         }
       })
       if (message.tags && isObject(message.tags) && !isEmptyObject(message.tags)) {
-        // 自定义tag
+        // 自定义tag， 存储成field
         const _tagKeys = []
         each(message.tags, function (_value, _key) {
           // 如果和之前tag重名，则舍弃
@@ -126,25 +139,24 @@ export var processedMessageByDataMap = function (message) {
           filterFileds.push(_key)
           if (_value || isNumber(_value)) {
             _tagKeys.push(_key)
-            rowData.tags[_key] = escapeJsonValue(_value)
-            tagsStr.push(escapeRowData(_key) + '=' + escapeRowData(_value))
+            rowData.fields[_key] = _value // 这里不需要转译
+            fieldsStr.push(escapeRowData(_key) + '=' + escapeRowField(_value))
           }
         })
         if (_tagKeys.length) {
-          rowData.tags[CUSTOM_KEYS] = escapeJsonValue(_tagKeys)
-          tagsStr.push(escapeRowData(CUSTOM_KEYS) + '=' + escapeRowData(_tagKeys))
+          rowData.fields[CUSTOM_KEYS] = escapeRowField(_tagKeys)
+          fieldsStr.push(escapeRowData(CUSTOM_KEYS) + '=' + escapeRowField(_tagKeys))
         }
       }
       if (message.type === RumEventType.LOGGER) {
         // 这里处理日志类型数据自定义字段
-
         each(message, function (value, key) {
           if (
             filterFileds.indexOf(key) === -1 &&
             (isNumber(value) || isString(value) || isBoolean(value))
           ) {
-            rowData.tags[key] = escapeJsonValue(value)
-            tagsStr.push(escapeRowData(key) + '=' + escapeRowData(value))
+            rowData.fields[key] = value // 这里不需要转译
+            fieldsStr.push(escapeRowData(key) + '=' + escapeRowField(value))
           }
         })
       }
@@ -165,7 +177,7 @@ export var processedMessageByDataMap = function (message) {
     rowData: hasFileds ? rowData : undefined
   }
 }
-function batch(
+var batch = function(
   request,
   maxSize,
   bytesLimit,
@@ -174,30 +186,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 +225,7 @@ batch.prototype = {
           return JSON.parse(rowdataStr)
         }), this.bufferBytesSize)
       } else {
+        
         this.request.send(messages.join('\n'), this.bufferBytesSize)
       }
       
@@ -220,6 +240,7 @@ batch.prototype = {
     if (this.isLineProtocolToJson) {
       return JSON.stringify(processedMessageByDataMap(message).rowData)
     }
+    
     return processedMessageByDataMap(message).rowStr
   },
   sizeInBytes: function (candidate) {
@@ -323,7 +344,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