@cloudcare/browser-core 1.0.26 → 1.1.1

package/cjs/configuration.js

@@ -53,6 +53,7 @@ var DEFAULT_CONFIGURATION = {
   // 是否不抛弃采样是数据， 采用在服务端菜样的方式
   isJsBirdge: false,
   // 是否需要对webview 发送数据，需要装我们对应ios sdk
+  isLineProtocolToJson: false,
   beforeSend: function beforeSend(event) {},
   isServerError: function isServerError(request) {
     return false;
@@ -108,6 +109,10 @@ function commonInit(userConfiguration, buildEnv) {
     transportConfiguration.isJsBirdge = userConfiguration.isJsBirdge;
   }
 
+  if ('isLineProtocolToJson' in userConfiguration) {
+    transportConfiguration.isLineProtocolToJson = userConfiguration.isLineProtocolToJson;
+  }
+
   if ('allowedDDTracingOrigins' in userConfiguration) {
     transportConfiguration.allowedTracingOrigins = userConfiguration.allowedDDTracingOrigins;
   }

package/cjs/helper/mobileUtil.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.userAgent = exports.jsBirdge = exports.isIos = exports.isAndroid = void 0;
+exports.userAgent = exports.isIos = exports.isAndroid = exports.JsBirdge = void 0;
 var userAgent = navigator.userAgent.toLowerCase();
 exports.userAgent = userAgent;
 
@@ -29,6 +29,7 @@ var JsBirdge = function JsBirdge() {
   } catch (err) {}
 };
 
+exports.JsBirdge = JsBirdge;
 JsBirdge.prototype = {
   initBridge: function initBridge() {
     var _this = this;
@@ -116,5 +117,5 @@ JsBirdge.prototype = {
     }
   }
 };
-var jsBirdge = new JsBirdge();
-exports.jsBirdge = jsBirdge;
+var JsBirdge = JsBirdge;
+exports.JsBirdge = JsBirdge;

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,7 +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;
@@ -57,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;
@@ -104,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) {
@@ -2033,4 +2056,26 @@ function escapeRowData(str) {
   return String(str).replace(reg, function (word) {
     return '\\' + word;
   });
+}
+
+function escapeJsonValue(value) {
+  if (isString(value)) {
+    return 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,17 +22,37 @@ function addBatchPrecision(url) {
   return url + (url.indexOf('?') === -1 ? '?' : '&') + 'precision=ms';
 }
 
-var httpRequest = function httpRequest(endpointUrl, bytesLimit) {
+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) {
-      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 (this.sendBeacon && size < this.bytesLimit && this.isLineProtocolToJson) {
+      var blob = new Blob([JSON.stringify(data)], {
+        type: 'application/json'
+      });
+      var isQueued = this.sendBeacon(url, blob);
 
       if (isQueued) {
         return;
@@ -40,7 +62,14 @@ httpRequest.prototype = {
     var request = new XMLHttpRequest();
     request.open('POST', url, true);
     request.withCredentials = true;
-    request.send(data);
+
+    if (this.isLineProtocolToJson) {
+      request.setRequestHeader('Content-type', 'application/json');
+      request.send(JSON.stringify(data));
+    } else {
+      request.setRequestHeader('Content-type', 'text/plain;charset=UTF-8');
+      request.send(data);
+    }
   }
 };
 var HttpRequest = httpRequest;
@@ -63,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);
@@ -71,33 +100,10 @@ var processedMessageByDataMap = function processedMessageByDataMap(message) {
         filterFileds.push(_key);
 
         if (_value || (0, _tools.isNumber)(_value)) {
-          rowData.tags[_key] = _value;
+          rowData.tags[_key] = (0, _tools.escapeJsonValue)(_value);
           tagsStr.push((0, _tools.escapeRowData)(_key) + '=' + (0, _tools.escapeRowData)(_value));
         }
       });
-
-      if (message.tags && (0, _tools.isObject)(message.tags) && !(0, _tools.isEmptyObject)(message.tags)) {
-        // 自定义tag
-        var _tagKeys = [];
-        (0, _tools.each)(message.tags, function (_value, _key) {
-          // 如果和之前tag重名，则舍弃
-          if (filterFileds.indexOf(_key) > -1) return;
-          filterFileds.push(_key);
-
-          if (_value || (0, _tools.isNumber)(_value)) {
-            _tagKeys.push(_key);
-
-            rowData.tags[_key] = _value;
-            tagsStr.push((0, _tools.escapeRowData)(_key) + '=' + (0, _tools.escapeRowData)(_value));
-          }
-        });
-
-        if (_tagKeys.length) {
-          rowData.tags[CUSTOM_KEYS] = _tagKeys;
-          tagsStr.push((0, _tools.escapeRowData)(CUSTOM_KEYS) + '=' + (0, _tools.escapeRowData)(_tagKeys));
-        }
-      }
-
       var fieldsStr = [];
       (0, _tools.each)(value.fields, function (_value, _key) {
         if ((0, _tools.isArray)(_value) && _value.length === 2) {
@@ -110,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);
@@ -122,17 +133,41 @@ 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， 存储成field
+        var _tagKeys = [];
+        (0, _tools.each)(message.tags, function (_value, _key) {
+          // 如果和之前tag重名，则舍弃
+          if (filterFileds.indexOf(_key) > -1) return;
+          filterFileds.push(_key);
+
+          if (_value || (0, _tools.isNumber)(_value)) {
+            _tagKeys.push(_key);
+
+            rowData.fields[_key] = _value; // 这里不需要转译
+
+            fieldsStr.push((0, _tools.escapeRowData)(_key) + '=' + (0, _tools.escapeRowField)(_value));
+          }
+        });
+
+        if (_tagKeys.length) {
+          rowData.fields[CUSTOM_KEYS] = (0, _tools.escapeRowField)(_tagKeys);
+          fieldsStr.push((0, _tools.escapeRowData)(CUSTOM_KEYS) + '=' + (0, _tools.escapeRowField)(_tagKeys));
+        }
+      }
+
       if (message.type === _enums.RumEventType.LOGGER) {
         // 这里处理日志类型数据自定义字段
         (0, _tools.each)(message, function (value, key) {
           if (filterFileds.indexOf(key) === -1 && ((0, _tools.isNumber)(value) || (0, _tools.isString)(value) || (0, _tools.isBoolean)(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));
           }
         });
       }
@@ -159,12 +194,13 @@ var processedMessageByDataMap = function processedMessageByDataMap(message) {
 
 exports.processedMessageByDataMap = processedMessageByDataMap;
 
-function batch(request, maxSize, bytesLimit, maxMessageSize, flushTimeout, 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.pushOnlyBuffer = [];
   this.upsertBuffer = {};
@@ -172,7 +208,7 @@ function batch(request, maxSize, bytesLimit, maxMessageSize, flushTimeout, befor
   this.bufferMessageCount = 0;
   this.flushOnVisibilityHidden();
   this.flushPeriodically();
-}
+};
 
 batch.prototype = {
   add: function add(message) {
@@ -184,7 +220,16 @@ batch.prototype = {
   flush: function flush() {
     if (this.bufferMessageCount !== 0) {
       var messages = this.pushOnlyBuffer.concat((0, _tools.values)(this.upsertBuffer));
-      this.request.send(messages.join('\n'), this.bufferBytesSize);
+      if (messages.length === 0) return;
+
+      if (this.isLineProtocolToJson) {
+        this.request.send((0, _tools.map)(messages, function (rowdataStr) {
+          return JSON.parse(rowdataStr);
+        }), this.bufferBytesSize);
+      } else {
+        this.request.send(messages.join('\n'), this.bufferBytesSize);
+      }
+
       this.pushOnlyBuffer = [];
       this.upsertBuffer = {};
       this.bufferBytesSize = 0;
@@ -192,6 +237,10 @@ batch.prototype = {
     }
   },
   processSendData: function processSendData(message) {
+    if (this.isLineProtocolToJson) {
+      return JSON.stringify(processedMessageByDataMap(message).rowData);
+    }
+
     return processedMessageByDataMap(message).rowStr;
   },
   sizeInBytes: function sizeInBytes(candidate) {
@@ -291,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/configuration.js

@@ -39,6 +39,7 @@ export var DEFAULT_CONFIGURATION = {
   // 是否不抛弃采样是数据， 采用在服务端菜样的方式
   isJsBirdge: false,
   // 是否需要对webview 发送数据，需要装我们对应ios sdk
+  isLineProtocolToJson: false,
   beforeSend: function beforeSend(event) {},
   isServerError: function isServerError(request) {
     return false;
@@ -93,6 +94,10 @@ export function commonInit(userConfiguration, buildEnv) {
     transportConfiguration.isJsBirdge = userConfiguration.isJsBirdge;
   }
 
+  if ('isLineProtocolToJson' in userConfiguration) {
+    transportConfiguration.isLineProtocolToJson = userConfiguration.isLineProtocolToJson;
+  }
+
   if ('allowedDDTracingOrigins' in userConfiguration) {
     transportConfiguration.allowedTracingOrigins = userConfiguration.allowedDDTracingOrigins;
   }

package/esm/helper/mobileUtil.js

@@ -103,4 +103,4 @@ JsBirdge.prototype = {
     }
   }
 };
-export var jsBirdge = new JsBirdge();
+export var JsBirdge = JsBirdge;

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) {
@@ -1726,4 +1739,23 @@ export function escapeRowData(str) {
   return String(str).replace(reg, function (word) {
     return '\\' + word;
   });
+}
+export function escapeJsonValue(value) {
+  if (isString(value)) {
+    return 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 } 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,17 +11,37 @@ function addBatchPrecision(url) {
   return url + (url.indexOf('?') === -1 ? '?' : '&') + 'precision=ms';
 }
 
-var httpRequest = function httpRequest(endpointUrl, bytesLimit) {
+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) {
-      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 (this.sendBeacon && size < this.bytesLimit && this.isLineProtocolToJson) {
+      var blob = new Blob([JSON.stringify(data)], {
+        type: 'application/json'
+      });
+      var isQueued = this.sendBeacon(url, blob);
 
       if (isQueued) {
         return;
@@ -30,7 +51,14 @@ httpRequest.prototype = {
     var request = new XMLHttpRequest();
     request.open('POST', url, true);
     request.withCredentials = true;
-    request.send(data);
+
+    if (this.isLineProtocolToJson) {
+      request.setRequestHeader('Content-type', 'application/json');
+      request.send(JSON.stringify(data));
+    } else {
+      request.setRequestHeader('Content-type', 'text/plain;charset=UTF-8');
+      request.send(data);
+    }
   }
 };
 export var HttpRequest = httpRequest;
@@ -51,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);
@@ -59,33 +87,10 @@ export var processedMessageByDataMap = function processedMessageByDataMap(messag
         filterFileds.push(_key);
 
         if (_value || isNumber(_value)) {
-          rowData.tags[_key] = _value;
+          rowData.tags[_key] = escapeJsonValue(_value);
           tagsStr.push(escapeRowData(_key) + '=' + escapeRowData(_value));
         }
       });
-
-      if (message.tags && isObject(message.tags) && !isEmptyObject(message.tags)) {
-        // 自定义tag
-        var _tagKeys = [];
-        each(message.tags, function (_value, _key) {
-          // 如果和之前tag重名，则舍弃
-          if (filterFileds.indexOf(_key) > -1) return;
-          filterFileds.push(_key);
-
-          if (_value || isNumber(_value)) {
-            _tagKeys.push(_key);
-
-            rowData.tags[_key] = _value;
-            tagsStr.push(escapeRowData(_key) + '=' + escapeRowData(_value));
-          }
-        });
-
-        if (_tagKeys.length) {
-          rowData.tags[CUSTOM_KEYS] = _tagKeys;
-          tagsStr.push(escapeRowData(CUSTOM_KEYS) + '=' + escapeRowData(_tagKeys));
-        }
-      }
-
       var fieldsStr = [];
       each(value.fields, function (_value, _key) {
         if (isArray(_value) && _value.length === 2) {
@@ -98,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);
@@ -110,17 +120,41 @@ 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， 存储成field
+        var _tagKeys = [];
+        each(message.tags, function (_value, _key) {
+          // 如果和之前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 (message.type === RumEventType.LOGGER) {
         // 这里处理日志类型数据自定义字段
         each(message, function (value, key) {
           if (filterFileds.indexOf(key) === -1 && (isNumber(value) || isString(value) || isBoolean(value))) {
-            tagsStr.push(escapeRowData(key) + '=' + escapeRowData(value));
+            rowData.fields[key] = value; // 这里不需要转译
+
+            fieldsStr.push(escapeRowData(key) + '=' + escapeRowField(value));
           }
         });
       }
@@ -145,12 +179,13 @@ export var processedMessageByDataMap = function processedMessageByDataMap(messag
   };
 };
 
-function batch(request, maxSize, bytesLimit, maxMessageSize, flushTimeout, 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.pushOnlyBuffer = [];
   this.upsertBuffer = {};
@@ -158,7 +193,7 @@ function batch(request, maxSize, bytesLimit, maxMessageSize, flushTimeout, befor
   this.bufferMessageCount = 0;
   this.flushOnVisibilityHidden();
   this.flushPeriodically();
-}
+};
 
 batch.prototype = {
   add: function add(message) {
@@ -170,7 +205,16 @@ batch.prototype = {
   flush: function flush() {
     if (this.bufferMessageCount !== 0) {
       var messages = this.pushOnlyBuffer.concat(values(this.upsertBuffer));
-      this.request.send(messages.join('\n'), this.bufferBytesSize);
+      if (messages.length === 0) return;
+
+      if (this.isLineProtocolToJson) {
+        this.request.send(map(messages, function (rowdataStr) {
+          return JSON.parse(rowdataStr);
+        }), this.bufferBytesSize);
+      } else {
+        this.request.send(messages.join('\n'), this.bufferBytesSize);
+      }
+
       this.pushOnlyBuffer = [];
       this.upsertBuffer = {};
       this.bufferBytesSize = 0;
@@ -178,6 +222,10 @@ batch.prototype = {
     }
   },
   processSendData: function processSendData(message) {
+    if (this.isLineProtocolToJson) {
+      return JSON.stringify(processedMessageByDataMap(message).rowData);
+    }
+
     return processedMessageByDataMap(message).rowStr;
   },
   sizeInBytes: function sizeInBytes(candidate) {
@@ -277,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.26",
+  "version": "1.1.1",
   "main": "cjs/index.js",
   "module": "esm/index.js",
   "scripts": {
@@ -20,5 +20,5 @@
   "author": "dataflux",
   "license": "MIT",
   "description": "DataFlux RUM Web 端数据指标监控",
-  "gitHead": "8a8ee0b57af1e54f8b41100dfadf1477868cce56"
+  "gitHead": "6637896a7d66c35f8b37da75b14d234d049c79d5"
 }

package/src/configuration.js

@@ -41,6 +41,7 @@ export var DEFAULT_CONFIGURATION = {
   allowedTracingOrigins:[], // 新增
   isServiceSampling: false, // 是否不抛弃采样是数据， 采用在服务端菜样的方式
   isJsBirdge: false,// 是否需要对webview 发送数据，需要装我们对应ios sdk
+  isLineProtocolToJson: false,
   beforeSend: function (event) {},
   isServerError: function(request) {return false}  // 判断请求是否为error 请求
 }
@@ -91,6 +92,9 @@ export function commonInit(userConfiguration, buildEnv) {
   if ('isJsBirdge' in userConfiguration) {
     transportConfiguration.isJsBirdge = userConfiguration.isJsBirdge
   }
+  if ('isLineProtocolToJson' in userConfiguration) {
+    transportConfiguration.isLineProtocolToJson = userConfiguration.isLineProtocolToJson
+  }
   if ('allowedDDTracingOrigins' in userConfiguration) {
     transportConfiguration.allowedTracingOrigins =
       userConfiguration.allowedDDTracingOrigins

package/src/helper/mobileUtil.js

@@ -99,4 +99,4 @@ JsBirdge.prototype = {
   }
 }
 
-export var jsBirdge = new JsBirdge()
+export var JsBirdge = JsBirdge

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) {
@@ -1702,3 +1716,25 @@ export function escapeRowData(str) {
     return '\\' + word
   })
 }
+
+export function escapeJsonValue(value) {
+  if (isString(value)) {
+    return 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

@@ -11,10 +11,14 @@ import {
   toServerDuration,
   isBoolean,
   isEmptyObject,
-  isObject
+  isObject,
+  map,
+  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'
@@ -22,27 +26,59 @@ function addBatchPrecision(url) {
   if (!url) return url
   return url + (url.indexOf('?') === -1 ? '?' : '&') + 'precision=ms'
 }
-var httpRequest = function (endpointUrl, bytesLimit) {
+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) {
-      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 (this.sendBeacon && size < this.bytesLimit && this.isLineProtocolToJson) {
+      const blob = new Blob([JSON.stringify(data)], {
+        type: 'application/json',
+      });
+      var isQueued = this.sendBeacon(url, blob)
       if (isQueued) {
         return
       }
     }
+    
     var request = new XMLHttpRequest()
     request.open('POST', url, true)
     request.withCredentials = true
-    request.send(data)
+    if (this.isLineProtocolToJson) {
+      request.setRequestHeader('Content-type', 'application/json')
+      request.send(JSON.stringify(data))
+    } else {
+      
+      request.setRequestHeader('Content-type', 'text/plain;charset=UTF-8')
+      request.send(data)
+    }
+    
+    
+    
   }
 }
 
 export var HttpRequest = httpRequest
+
 export var processedMessageByDataMap = function (message) {
   if (!message || !message.type) return {
     rowStr: '',
@@ -58,33 +94,16 @@ 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)
         if (_value || isNumber(_value)) {
-          rowData.tags[_key] = _value
+          rowData.tags[_key] = escapeJsonValue(_value)
           tagsStr.push(escapeRowData(_key) + '=' + escapeRowData(_value))
         }
       })
-      if (message.tags && isObject(message.tags) && !isEmptyObject(message.tags)) {
-        // 自定义tag
-        const _tagKeys = []
-        each(message.tags, function (_value, _key) {
-          // 如果和之前tag重名，则舍弃
-          if (filterFileds.indexOf(_key) > -1) return
-          filterFileds.push(_key)
-          if (_value || isNumber(_value)) {
-            _tagKeys.push(_key)
-            rowData.tags[_key] = _value
-            tagsStr.push(escapeRowData(_key) + '=' + escapeRowData(_value))
-          }
-        })
-        if (_tagKeys.length) {
-          rowData.tags[CUSTOM_KEYS] = _tagKeys
-          tagsStr.push(escapeRowData(CUSTOM_KEYS) + '=' + escapeRowData(_tagKeys))
-        }
-      }
+      
       var fieldsStr = []
       each(value.fields, function (_value, _key) {
         if (isArray(_value) && _value.length === 2) {
@@ -94,33 +113,50 @@ 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， 存储成field
+        const _tagKeys = []
+        each(message.tags, function (_value, _key) {
+          // 如果和之前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 (message.type === RumEventType.LOGGER) {
         // 这里处理日志类型数据自定义字段
-
         each(message, function (value, key) {
           if (
             filterFileds.indexOf(key) === -1 &&
             (isNumber(value) || isString(value) || isBoolean(value))
           ) {
-            tagsStr.push(escapeRowData(key) + '=' + escapeRowData(value))
+            rowData.fields[key] = value // 这里不需要转译
+            fieldsStr.push(escapeRowData(key) + '=' + escapeRowField(value))
           }
         })
       }
@@ -141,40 +177,58 @@ export var processedMessageByDataMap = function (message) {
     rowData: hasFileds ? rowData : undefined
   }
 }
-function batch(
+var batch = function(
   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.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))
-      this.request.send(messages.join('\n'), this.bufferBytesSize)
+      if (messages.length === 0) return
+      if (this.isLineProtocolToJson) {
+        this.request.send(map(messages, function(rowdataStr) {
+          return JSON.parse(rowdataStr)
+        }), this.bufferBytesSize)
+      } else {
+        
+        this.request.send(messages.join('\n'), this.bufferBytesSize)
+      }
+      
       this.pushOnlyBuffer = []
       this.upsertBuffer = {}
       this.bufferBytesSize = 0
@@ -183,6 +237,10 @@ batch.prototype = {
   },
 
   processSendData: function (message) {
+    if (this.isLineProtocolToJson) {
+      return JSON.stringify(processedMessageByDataMap(message).rowData)
+    }
+    
     return processedMessageByDataMap(message).rowStr
   },
   sizeInBytes: function (candidate) {
@@ -286,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