@cloudcare/rum-uniapp 2.1.9 → 2.1.10

package/cjs/boot/buildEnv.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.buildEnv = void 0;
 var buildEnv = {
-  sdkVersion: '2.1.9',
+  sdkVersion: '2.1.10',
   sdkName: 'df_uniapp_rum_sdk'
 };
 exports.buildEnv = buildEnv;

package/cjs/core/transport.js

@@ -68,7 +68,7 @@ var processedMessageByDataMap = function processedMessageByDataMap(message) {
       rowData.measurement = key;
       var tagsStr = [];
       var tags = (0, _utils.extend)({}, _dataMap.commonTags, value.tags);
-      var filterFileds = ['date', 'type']; // 已经在datamap中定义过的fields和tags
+      var filterFileds = ['date', 'type', CUSTOM_KEYS]; // 已经在datamap中定义过的fields和tags
 
       (0, _utils.each)(tags, function (value_path, _key) {
         var _value = (0, _utils.findByPath)(message, value_path);
@@ -76,13 +76,13 @@ var processedMessageByDataMap = function processedMessageByDataMap(message) {
         filterFileds.push(_key);
 
         if (_value || (0, _utils.isNumber)(_value)) {
-          rowData.tags[_key] = _value;
+          rowData.tags[_key] = (0, _utils.escapeJsonValue)(_value);
           tagsStr.push((0, _utils.escapeRowData)(_key) + '=' + (0, _utils.escapeRowData)(_value));
         }
       });
 
       if (message.tags && (0, _utils.isObject)(message.tags) && !(0, _utils.isEmptyObject)(message.tags)) {
-        // 自定义tag
+        // 自定义tag， 存储成field
         var _tagKeys = [];
         (0, _utils.each)(message.tags, function (_value, _key) {
           // 如果和之前tag重名，则舍弃
@@ -92,14 +92,15 @@ var processedMessageByDataMap = function processedMessageByDataMap(message) {
           if (_value || (0, _utils.isNumber)(_value)) {
             _tagKeys.push(_key);
 
-            rowData.tags[_key] = _value;
-            tagsStr.push((0, _utils.escapeRowData)(_key) + '=' + (0, _utils.escapeRowData)(_value));
+            rowData.fields[_key] = _value; // 这里不需要转译
+
+            fieldsStr.push((0, _utils.escapeRowData)(_key) + '=' + (0, _utils.escapeRowField)(_value));
           }
         });
 
         if (_tagKeys.length) {
-          rowData.tags[CUSTOM_KEYS] = _tagKeys;
-          tagsStr.push((0, _utils.escapeRowData)(CUSTOM_KEYS) + '=' + (0, _utils.escapeRowData)(_tagKeys));
+          rowData.fields[CUSTOM_KEYS] = (0, _utils.escapeRowField)(_tagKeys);
+          fieldsStr.push((0, _utils.escapeRowData)(CUSTOM_KEYS) + '=' + (0, _utils.escapeRowField)(_tagKeys));
         }
       }
 
@@ -116,8 +117,7 @@ var processedMessageByDataMap = function processedMessageByDataMap(message) {
           if (_valueData || (0, _utils.isNumber)(_valueData)) {
             rowData.fields[_key] = _valueData; // 这里不需要转译
 
-            _valueData = type === 'string' ? '"' + _valueData.replace(/[\\]*"/g, '"').replace(/"/g, '\\"') + '"' : (0, _utils.escapeRowData)(_valueData);
-            fieldsStr.push((0, _utils.escapeRowData)(_key) + '=' + _valueData);
+            fieldsStr.push((0, _utils.escapeRowData)(_key) + '=' + (0, _utils.escapeRowField)(_valueData));
           }
         } else if ((0, _utils.isString)(_value)) {
           var _valueData = (0, _utils.findByPath)(message, _value);
@@ -127,8 +127,7 @@ var processedMessageByDataMap = function processedMessageByDataMap(message) {
           if (_valueData || (0, _utils.isNumber)(_valueData)) {
             rowData.fields[_key] = _valueData; // 这里不需要转译
 
-            _valueData = (0, _utils.escapeRowData)(_valueData);
-            fieldsStr.push((0, _utils.escapeRowData)(_key) + '=' + _valueData);
+            fieldsStr.push((0, _utils.escapeRowData)(_key) + '=' + (0, _utils.escapeRowField)(_valueData));
           }
         }
       });

package/cjs/helper/utils.js

@@ -20,6 +20,9 @@ exports.withSnakeCaseKeys = withSnakeCaseKeys;
 exports.deepSnakeCase = deepSnakeCase;
 exports.toSnakeCase = toSnakeCase;
 exports.escapeRowData = escapeRowData;
+exports.escapeJsonValue = escapeJsonValue;
+exports.escapeFieldValueStr = escapeFieldValueStr;
+exports.escapeRowField = escapeRowField;
 exports.getOrigin = getOrigin;
 exports.createContextManager = createContextManager;
 exports.getActivePage = getActivePage;
@@ -641,6 +644,28 @@ function escapeRowData(str) {
   });
 }
 
+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;
+  }
+}
+
 var urlParse = function urlParse(para) {
   var URLParser = function URLParser(a) {
     this._fields = {

package/esm/boot/buildEnv.js

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

package/esm/core/transport.js

@@ -1,4 +1,4 @@
-import { findByPath, escapeRowData, isNumber, each, isString, values, extend, isObject, isEmptyObject, isArray, isBoolean, toServerDuration } from '../helper/utils';
+import { findByPath, escapeRowData, isNumber, each, isString, values, extend, isObject, isEmptyObject, isArray, escapeRowField, escapeJsonValue, toServerDuration } from '../helper/utils';
 import { sdk } from '../core/sdk';
 import { LifeCycleEventType } from '../core/lifeCycle';
 import { commonTags, dataMap } from './dataMap';
@@ -53,7 +53,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);
@@ -61,13 +61,13 @@ 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
+        // 自定义tag， 存储成field
         var _tagKeys = [];
         each(message.tags, function (_value, _key) {
           // 如果和之前tag重名，则舍弃
@@ -77,14 +77,15 @@ export var processedMessageByDataMap = function processedMessageByDataMap(messag
           if (_value || isNumber(_value)) {
             _tagKeys.push(_key);
 
-            rowData.tags[_key] = _value;
-            tagsStr.push(escapeRowData(_key) + '=' + escapeRowData(_value));
+            rowData.fields[_key] = _value; // 这里不需要转译
+
+            fieldsStr.push(escapeRowData(_key) + '=' + escapeRowField(_value));
           }
         });
 
         if (_tagKeys.length) {
-          rowData.tags[CUSTOM_KEYS] = _tagKeys;
-          tagsStr.push(escapeRowData(CUSTOM_KEYS) + '=' + escapeRowData(_tagKeys));
+          rowData.fields[CUSTOM_KEYS] = escapeRowField(_tagKeys);
+          fieldsStr.push(escapeRowData(CUSTOM_KEYS) + '=' + escapeRowField(_tagKeys));
         }
       }
 
@@ -101,8 +102,7 @@ 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);
+            fieldsStr.push(escapeRowData(_key) + '=' + escapeRowField(_valueData));
           }
         } else if (isString(_value)) {
           var _valueData = findByPath(message, _value);
@@ -112,8 +112,7 @@ 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));
           }
         }
       });

package/esm/helper/utils.js

@@ -511,6 +511,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;
+  }
+}
 export var urlParse = function urlParse(para) {
   var URLParser = function URLParser(a) {
     this._fields = {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cloudcare/rum-uniapp",
-	"version": "2.1.9",
+	"version": "2.1.10",
 	"main": "cjs/index.js",
 	"module": "esm/index.js",
 	"miniprogram": "cjs",