@cloudcare/browser-core 1.0.9 → 1.0.13

package/cjs/configuration.js

@@ -83,7 +83,6 @@ function commonInit(userConfiguration, buildEnv) {
     sdkName: buildEnv.sdkName,
     datakitUrl: getDatakitUrl(userConfiguration.datakitUrl || userConfiguration.datakitOrigin),
     logsEndpoint: getLogsEndPoint(userConfiguration.datakitOrigin),
-    tags: userConfiguration.tags || [],
     isEnabled: function isEnabled(feature) {
       return (0, _tools.includes)(enableExperimentalFeatures, feature);
     },
@@ -106,7 +105,7 @@ function commonInit(userConfiguration, buildEnv) {
     transportConfiguration.trackInteractions = !!userConfiguration.trackInteractions;
   }
 
-  return (0, _tools.extend2Lev)(DEFAULT_CONFIGURATION, transportConfiguration);
+  return (0, _tools.extend2Lev)({}, DEFAULT_CONFIGURATION, transportConfiguration);
 }
 
 function mustUseSecureCookie(userConfiguration) {

package/cjs/dataMap.js

@@ -13,7 +13,9 @@ var commonTags = {
   app_id: 'application.id',
   env: '_dd.env',
   version: '_dd.version',
-  userid: 'user.user_id',
+  userid: 'user.id',
+  user_email: 'user.email',
+  user_name: 'user.name',
   session_id: 'session.id',
   session_type: 'session.type',
   is_signin: 'user.is_signin',

package/cjs/helper/tools.js

@@ -1805,13 +1805,21 @@ function createContextManager() {
       return context;
     },
     add: function add(key, value) {
-      context[key] = value;
+      if (isString(key)) {
+        context[key] = value;
+      } else {
+        console.error('key 需要传递字符串类型');
+      }
     },
     remove: function remove(key) {
       delete context[key];
     },
     set: function set(newContext) {
-      context = newContext;
+      if (isObject(newContext)) {
+        context = newContext;
+      } else {
+        console.error('content 需要传递对象类型数据');
+      }
     }
   };
 }
@@ -1879,7 +1887,12 @@ function toSnakeCase(word) {
 }
 
 function escapeRowData(str) {
-  if (!isString(str)) return str;
+  if (_typeof(str) === 'object' && str) {
+    str = jsonStringify(str);
+  } else if (!isString(str)) {
+    return str;
+  }
+
   var reg = /[\s=,"]/g;
   return String(str).replace(reg, function (word) {
     return '\\' + word;

package/cjs/sessionManagement.js

@@ -50,7 +50,8 @@ function startSessionManagement(options, productKey, computeSessionState) {
   var anonymousCookie = cacheAnonymousID(options);
   var sessionCookie = (0, _cookie.cacheCookieAccess)(SESSION_COOKIE_NAME, options);
   var renewObservable = new _observable.Observable();
-  var currentSessionId = retrieveActiveSession(sessionCookie).id;
+  var currentSession = retrieveActiveSession(sessionCookie);
+  var currentSessionId = currentSession.id;
   var expandOrRenewSession = (0, _tools.throttle)(function () {
     var session = retrieveActiveSession(sessionCookie);
     var state = computeSessionState(session[productKey]);
@@ -83,11 +84,44 @@ function startSessionManagement(options, productKey, computeSessionState) {
       return anonymousCookie.get();
     },
     getId: function getId() {
-      return retrieveActiveSession(sessionCookie).id;
+      // 先获取debug id
+      var session = retrieveActiveSession(sessionCookie);
+      return session.did || session.id;
     },
     getTrackingType: function getTrackingType() {
       return retrieveActiveSession(sessionCookie)[productKey];
     },
+    getDebugSession: function getDebugSession() {
+      var session = retrieveActiveSession(sessionCookie);
+
+      if ((0, _tools.isEmptyObject)(session) || !session.did) {
+        return {};
+      }
+
+      return {
+        id: session.did,
+        created: session.dcreated
+      };
+    },
+    addDebugSession: function addDebugSession(id, created) {
+      var session = retrieveActiveSession(sessionCookie);
+
+      if (!(0, _tools.isEmptyObject)(session)) {
+        session.did = id || _tools.UUID;
+        session.dcreated = created || String(Date.now());
+        persistSession(session, sessionCookie);
+      }
+    },
+    clearDebugSession: function clearDebugSession() {
+      var session = retrieveActiveSession(sessionCookie);
+      var newSession = {};
+      (0, _tools.each)((0, _tools.objectEntries)(session), function (item) {
+        if (item[0] !== 'did' && item[0] !== 'dcreated') {
+          newSession[item[0]] = item[1];
+        }
+      });
+      persistSession(newSession, sessionCookie);
+    },
     renewObservable: renewObservable
   };
 }

package/cjs/transport.js

@@ -13,6 +13,7 @@ var _dataMap = require("./dataMap");
 
 // https://en.wikipedia.org/wiki/UTF-8
 var HAS_MULTI_BYTES_CHARACTERS = /[^\u0000-\u007F]/;
+var CUSTOM_KEYS = 'custom_keys';
 
 function addBatchPrecision(url) {
   if (!url) return url;
@@ -64,7 +65,7 @@ var processedMessageByDataMap = function processedMessageByDataMap(message) {
       (0, _tools.each)(tags, function (value_path, _key) {
         var _value = (0, _tools.findByPath)(message, value_path);
 
-        filterFileds.push(value_path);
+        filterFileds.push(_key);
 
         if (_value || (0, _tools.isNumber)(_value)) {
           rowData.tags[_key] = _value;
@@ -72,16 +73,26 @@ var processedMessageByDataMap = function processedMessageByDataMap(message) {
         }
       });
 
-      if (message.tags.length) {
+      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 = [];
@@ -92,7 +103,7 @@ var processedMessageByDataMap = function processedMessageByDataMap(message) {
 
           var _valueData = (0, _tools.findByPath)(message, value_path);
 
-          filterFileds.push(value_path);
+          filterFileds.push(_key);
 
           if (_valueData || (0, _tools.isNumber)(_valueData)) {
             rowData.fields[_key] = _valueData; // 这里不需要转译
@@ -103,7 +114,7 @@ var processedMessageByDataMap = function processedMessageByDataMap(message) {
         } else if ((0, _tools.isString)(_value)) {
           var _valueData = (0, _tools.findByPath)(message, _value);
 
-          filterFileds.push(_value);
+          filterFileds.push(_key);
 
           if (_valueData || (0, _tools.isNumber)(_valueData)) {
             rowData.fields[_key] = _valueData; // 这里不需要转译

package/cjs/xhrProxy.js

@@ -85,6 +85,8 @@ function proxyXhr() {
       var hasBeenReported = false;
 
       var reportXhr = function reportXhr() {
+        _this.removeEventListener('loadend', reportXhr);
+
         if (hasBeenReported) {
           return;
         }

package/esm/configuration.js

@@ -69,8 +69,9 @@ export function commonInit(userConfiguration, buildEnv) {
     sdkName: buildEnv.sdkName,
     datakitUrl: getDatakitUrl(userConfiguration.datakitUrl || userConfiguration.datakitOrigin),
     logsEndpoint: getLogsEndPoint(userConfiguration.datakitOrigin),
-    tags: userConfiguration.tags || [],
-    isEnabled: feature => includes(enableExperimentalFeatures, feature),
+    isEnabled: function isEnabled(feature) {
+      return includes(enableExperimentalFeatures, feature);
+    },
     cookieOptions: buildCookieOptions(userConfiguration)
   };
 
@@ -90,7 +91,7 @@ export function commonInit(userConfiguration, buildEnv) {
     transportConfiguration.trackInteractions = !!userConfiguration.trackInteractions;
   }
 
-  return extend2Lev(DEFAULT_CONFIGURATION, transportConfiguration);
+  return extend2Lev({}, DEFAULT_CONFIGURATION, transportConfiguration);
 }
 
 function mustUseSecureCookie(userConfiguration) {

package/esm/dataMap.js

@@ -5,7 +5,9 @@ export var commonTags = {
   app_id: 'application.id',
   env: '_dd.env',
   version: '_dd.version',
-  userid: 'user.user_id',
+  userid: 'user.id',
+  user_email: 'user.email',
+  user_name: 'user.name',
   session_id: 'session.id',
   session_type: 'session.type',
   is_signin: 'user.is_signin',

package/esm/helper/tools.js

@@ -1530,13 +1530,21 @@ export function createContextManager() {
       return context;
     },
     add: function add(key, value) {
-      context[key] = value;
+      if (isString(key)) {
+        context[key] = value;
+      } else {
+        console.error('key 需要传递字符串类型');
+      }
     },
     remove: function remove(key) {
       delete context[key];
     },
     set: function set(newContext) {
-      context = newContext;
+      if (isObject(newContext)) {
+        context = newContext;
+      } else {
+        console.error('content 需要传递对象类型数据');
+      }
     }
   };
 }
@@ -1596,7 +1604,12 @@ export function toSnakeCase(word) {
   }).replace(/-/g, '_');
 }
 export function escapeRowData(str) {
-  if (!isString(str)) return str;
+  if (typeof str === 'object' && str) {
+    str = jsonStringify(str);
+  } else if (!isString(str)) {
+    return str;
+  }
+
   var reg = /[\s=,"]/g;
   return String(str).replace(reg, function (word) {
     return '\\' + word;

package/esm/sessionManagement.js

@@ -28,7 +28,8 @@ export function startSessionManagement(options, productKey, computeSessionState)
   var anonymousCookie = cacheAnonymousID(options);
   var sessionCookie = cacheCookieAccess(SESSION_COOKIE_NAME, options);
   var renewObservable = new Observable();
-  var currentSessionId = retrieveActiveSession(sessionCookie).id;
+  var currentSession = retrieveActiveSession(sessionCookie);
+  var currentSessionId = currentSession.id;
   var expandOrRenewSession = throttle(function () {
     var session = retrieveActiveSession(sessionCookie);
     var state = computeSessionState(session[productKey]);
@@ -61,11 +62,44 @@ export function startSessionManagement(options, productKey, computeSessionState)
       return anonymousCookie.get();
     },
     getId: function getId() {
-      return retrieveActiveSession(sessionCookie).id;
+      // 先获取debug id
+      var session = retrieveActiveSession(sessionCookie);
+      return session.did || session.id;
     },
     getTrackingType: function getTrackingType() {
       return retrieveActiveSession(sessionCookie)[productKey];
     },
+    getDebugSession: function getDebugSession() {
+      var session = retrieveActiveSession(sessionCookie);
+
+      if (isEmptyObject(session) || !session.did) {
+        return {};
+      }
+
+      return {
+        id: session.did,
+        created: session.dcreated
+      };
+    },
+    addDebugSession: function addDebugSession(id, created) {
+      var session = retrieveActiveSession(sessionCookie);
+
+      if (!isEmptyObject(session)) {
+        session.did = id || UUID;
+        session.dcreated = created || String(Date.now());
+        persistSession(session, sessionCookie);
+      }
+    },
+    clearDebugSession: function clearDebugSession() {
+      var session = retrieveActiveSession(sessionCookie);
+      var newSession = {};
+      each(objectEntries(session), function (item) {
+        if (item[0] !== 'did' && item[0] !== 'dcreated') {
+          newSession[item[0]] = item[1];
+        }
+      });
+      persistSession(newSession, sessionCookie);
+    },
     renewObservable: renewObservable
   };
 }

package/esm/transport.js

@@ -1,8 +1,9 @@
-import { addEventListener, values, findByPath, escapeRowData, each, isNumber, isArray, extend, isString, keys, toServerDuration, isBoolean } from './helper/tools';
+import { addEventListener, values, findByPath, escapeRowData, each, isNumber, isArray, extend, isString, toServerDuration, isBoolean, isEmptyObject, isObject } from './helper/tools';
 import { DOM_EVENT, RumEventType } from './helper/enums';
 import { commonTags, dataMap } from './dataMap'; // https://en.wikipedia.org/wiki/UTF-8
 
 var HAS_MULTI_BYTES_CHARACTERS = /[^\u0000-\u007F]/;
+var CUSTOM_KEYS = 'custom_keys';
 
 function addBatchPrecision(url) {
   if (!url) return url;
@@ -52,7 +53,7 @@ export var processedMessageByDataMap = function processedMessageByDataMap(messag
       each(tags, function (value_path, _key) {
         var _value = findByPath(message, value_path);
 
-        filterFileds.push(value_path);
+        filterFileds.push(_key);
 
         if (_value || isNumber(_value)) {
           rowData.tags[_key] = _value;
@@ -60,16 +61,26 @@ export var processedMessageByDataMap = function processedMessageByDataMap(messag
         }
       });
 
-      if (message.tags.length) {
+      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 = [];
@@ -80,7 +91,7 @@ export var processedMessageByDataMap = function processedMessageByDataMap(messag
 
           var _valueData = findByPath(message, value_path);
 
-          filterFileds.push(value_path);
+          filterFileds.push(_key);
 
           if (_valueData || isNumber(_valueData)) {
             rowData.fields[_key] = _valueData; // 这里不需要转译
@@ -91,7 +102,7 @@ export var processedMessageByDataMap = function processedMessageByDataMap(messag
         } else if (isString(_value)) {
           var _valueData = findByPath(message, _value);
 
-          filterFileds.push(_value);
+          filterFileds.push(_key);
 
           if (_valueData || isNumber(_valueData)) {
             rowData.fields[_key] = _valueData; // 这里不需要转译

package/esm/xhrProxy.js

@@ -73,6 +73,8 @@ function proxyXhr() {
       var hasBeenReported = false;
 
       var reportXhr = function reportXhr() {
+        _this.removeEventListener('loadend', reportXhr);
+
         if (hasBeenReported) {
           return;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudcare/browser-core",
-  "version": "1.0.9",
+  "version": "1.0.13",
   "main": "cjs/index.js",
   "module": "esm/index.js",
   "scripts": {
@@ -14,12 +14,11 @@
     "sdk"
   ],
   "repository": {
-    "url": "https://github.com/CloudCare/dataflux-rum-sdk-javascript",
+    "url": "https://github.com/DataFlux-cn/datakit-js",
     "type": "git"
   },
   "author": "dataflux",
   "license": "MIT",
-  "homepage": "https://github.com/CloudCare/dataflux-rum-sdk-javascript/blob/master/packages/rum/README.md",
   "description": "DataFlux RUM Web 端数据指标监控",
-  "gitHead": "9adc492491227f95b92dde62e19aa6492fe5370b"
+  "gitHead": "666c0183f62de2c65313ff5cc2be75843aa95c25"
 }

package/src/configuration.js

@@ -54,7 +54,8 @@ function getDatakitUrl(url) {
   return trim(url) + '/v1/write/rum'
 }
 function getLogsEndPoint(url) {
-  if (url.lastIndexOf('/') === url.length - 1) return trim(url) + 'v1/write/logging'
+  if (url.lastIndexOf('/') === url.length - 1)
+    return trim(url) + 'v1/write/logging'
   return trim(url) + '/v1/write/logging'
 }
 export function commonInit(userConfiguration, buildEnv) {
@@ -73,8 +74,7 @@ export function commonInit(userConfiguration, buildEnv) {
       userConfiguration.datakitUrl || userConfiguration.datakitOrigin
     ),
     logsEndpoint: getLogsEndPoint(userConfiguration.datakitOrigin),
-    tags: userConfiguration.tags || [],
-    isEnabled: (feature) => includes(enableExperimentalFeatures, feature),
+    isEnabled: function(feature) {return includes(enableExperimentalFeatures, feature)},
     cookieOptions: buildCookieOptions(userConfiguration)
   }
   if ('allowedDDTracingOrigins' in userConfiguration) {
@@ -94,7 +94,7 @@ export function commonInit(userConfiguration, buildEnv) {
   if ('trackInteractions' in userConfiguration) {
     transportConfiguration.trackInteractions = !!userConfiguration.trackInteractions
   }
-  return extend2Lev(DEFAULT_CONFIGURATION, transportConfiguration)
+  return extend2Lev({}, DEFAULT_CONFIGURATION, transportConfiguration)
 }
 function mustUseSecureCookie(userConfiguration) {
   return (

package/src/dataMap.js

@@ -5,7 +5,9 @@ export var commonTags = {
   app_id: 'application.id',
   env: '_dd.env',
   version: '_dd.version',
-  userid: 'user.user_id',
+  userid: 'user.id',
+  user_email: 'user.email',
+  user_name: 'user.name',
   session_id: 'session.id',
   session_type: 'session.type',
   is_signin: 'user.is_signin',

package/src/helper/tools.js

@@ -1507,7 +1507,11 @@ export function createContextManager() {
     },
 
     add: function (key, value) {
-      context[key] = value
+      if (isString(key)) {
+        context[key] = value
+      } else {
+        console.error('key 需要传递字符串类型')
+      }
     },
 
     remove: function (key) {
@@ -1515,7 +1519,12 @@ export function createContextManager() {
     },
 
     set: function (newContext) {
-      context = newContext
+      if (isObject(newContext)) {
+        context = newContext
+      } else {
+        console.error('content 需要传递对象类型数据')
+      }
+      
     }
   }
 }
@@ -1578,7 +1587,11 @@ export function toSnakeCase(word) {
 }
 
 export function escapeRowData(str) {
-  if (!isString(str)) return str
+  if (typeof str === 'object' && str) {
+     str = jsonStringify(str)
+  } else if (!isString(str)) {
+    return str
+  } 
   var reg = /[\s=,"]/g
   return String(str).replace(reg, function (word) {
     return '\\' + word

package/src/sessionManagement.js

@@ -38,7 +38,8 @@ export function startSessionManagement(
   var anonymousCookie = cacheAnonymousID(options)
   var sessionCookie = cacheCookieAccess(SESSION_COOKIE_NAME, options)
   var renewObservable = new Observable()
-  var currentSessionId = retrieveActiveSession(sessionCookie).id
+  var currentSession = retrieveActiveSession(sessionCookie)
+  var currentSessionId = currentSession.id
   var expandOrRenewSession = throttle(function () {
     var session = retrieveActiveSession(sessionCookie)
     var state = computeSessionState(session[productKey])
@@ -71,11 +72,41 @@ export function startSessionManagement(
       return anonymousCookie.get()
     },
     getId: function () {
-      return retrieveActiveSession(sessionCookie).id
+      // 先获取debug id
+      var session = retrieveActiveSession(sessionCookie)
+      return session.did || session.id
     },
     getTrackingType: function () {
       return retrieveActiveSession(sessionCookie)[productKey]
     },
+    getDebugSession: function () {
+      var session = retrieveActiveSession(sessionCookie)
+      if (isEmptyObject(session) || !session.did) {
+        return {}
+      }
+      return {
+        id: session.did,
+        created: session.dcreated
+      }
+    },
+    addDebugSession: function (id, created) {
+      var session = retrieveActiveSession(sessionCookie)
+      if (!isEmptyObject(session)) {
+        session.did = id || UUID
+        session.dcreated = created || String(Date.now())
+        persistSession(session, sessionCookie)
+      }
+    },
+    clearDebugSession: function () {
+      var session = retrieveActiveSession(sessionCookie)
+      var newSession = {}
+      each(objectEntries(session), function (item) {
+        if (item[0] !== 'did' && item[0] !== 'dcreated') {
+          newSession[item[0]] = item[1]
+        }
+      })
+      persistSession(newSession, sessionCookie)
+    },
     renewObservable: renewObservable
   }
 }

package/src/transport.js

@@ -8,14 +8,16 @@ import {
   isArray,
   extend,
   isString,
-  keys,
   toServerDuration,
-  isBoolean
+  isBoolean,
+  isEmptyObject,
+  isObject
 } from './helper/tools'
 import { DOM_EVENT, RumEventType } from './helper/enums'
 import { commonTags, dataMap } from './dataMap'
 // https://en.wikipedia.org/wiki/UTF-8
 var HAS_MULTI_BYTES_CHARACTERS = /[^\u0000-\u007F]/
+var CUSTOM_KEYS = 'custom_keys'
 function addBatchPrecision(url) {
   if (!url) return url
   return url + (url.indexOf('?') === -1 ? '?' : '&') + 'precision=ms'
@@ -55,21 +57,29 @@ export var processedMessageByDataMap = function (message) {
       var filterFileds = ['date', 'type'] // 已经在datamap中定义过的fields和tags
       each(tags, function (value_path, _key) {
         var _value = findByPath(message, value_path)
-        filterFileds.push(value_path)
+        filterFileds.push(_key)
         if (_value || isNumber(_value)) {
           rowData.tags[_key] = _value
           tagsStr.push(escapeRowData(_key) + '=' + escapeRowData(_value))
         }
       })
-      if (message.tags.length) {
+      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) {
@@ -77,7 +87,7 @@ export var processedMessageByDataMap = function (message) {
           var type = _value[0],
             value_path = _value[1]
           var _valueData = findByPath(message, value_path)
-          filterFileds.push(value_path)
+          filterFileds.push(_key)
           if (_valueData || isNumber(_valueData)) {
             rowData.fields[_key] = _valueData // 这里不需要转译
             _valueData =
@@ -90,7 +100,7 @@ export var processedMessageByDataMap = function (message) {
           }
         } else if (isString(_value)) {
           var _valueData = findByPath(message, _value)
-          filterFileds.push(_value)
+          filterFileds.push(_key)
           if (_valueData || isNumber(_valueData)) {
             rowData.fields[_key] = _valueData // 这里不需要转译
             _valueData = escapeRowData(_valueData)

package/src/xhrProxy.js

@@ -71,6 +71,7 @@ function proxyXhr() {
 
       var hasBeenReported = false
       var reportXhr = function () {
+        _this.removeEventListener('loadend', reportXhr)
         if (hasBeenReported) {
           return
         }