@cloudcare/browser-core 3.1.6 → 3.1.8

package/src/browser/xhrObservable.js

@@ -21,7 +21,7 @@ export function initXhrObservable() {
 }
 
 function createXhrObservable() {
-  var observable = new Observable(function () {
+  return new Observable(function (observable) {
     var openInstrumentMethod = instrumentMethodAndCallOriginal(
       XMLHttpRequest.prototype,
       'open',
@@ -54,7 +54,6 @@ function createXhrObservable() {
       abortInstrumentMethod.stop()
     }
   })
-  return observable
 }
 
 function openXhr(method, url) {
@@ -62,7 +61,7 @@ function openXhr(method, url) {
   this[DATA_FLUX_REQUEST_ID_KEY] = requestUUID
   xhrContexts[requestUUID] = {
     state: 'open',
-    method: method,
+    method: String(method).toUpperCase(),
     url: normalizeUrl(String(url))
   }
 }

package/src/console/consoleObservable.js

@@ -24,7 +24,7 @@ export function initConsoleObservable(apis) {
 
 /* eslint-disable no-console */
 function createConsoleObservable(api) {
-  var observable = new Observable(function () {
+  return new Observable(function (observable) {
     var originalConsoleApi = console[api]
     console[api] = function () {
       var params = [].slice.call(arguments)

package/src/dataMap.js

@@ -38,7 +38,9 @@ export var commonFields = {
   display: 'display',
   session_has_replay: 'session.has_replay',
   is_login: 'user.is_login',
-  page_states: '_gc.page_states'
+  page_states: '_gc.page_states',
+  session_sample_rate: '_gc.configuration.session_sample_rate',
+  session_replay_sample_rate: '_gc.configuration.session_replay_sample_rate'
 }
 // 需要用双引号将字符串类型的field value括起来， 这里有数组标示[string, path]
 export var dataMap = {
@@ -50,6 +52,7 @@ export var dataMap = {
       view_privacy_replay_level: 'privacy.replay_level'
     },
     fields: {
+      sampled_for_replay: 'session.sampled_for_replay',
       is_active: 'view.is_active',
       session_replay_stats: '_gc.replay_stats',
       session_is_active: 'session.is_active',

package/src/helper/observable.js

@@ -7,7 +7,7 @@ var _Observable = function (onFirstSubscribe) {
 _Observable.prototype = {
   subscribe: function (f) {
     if (!this.observers.length && this.onFirstSubscribe) {
-      this.onLastUnsubscribe = this.onFirstSubscribe() || undefined
+      this.onLastUnsubscribe = this.onFirstSubscribe(this) || undefined
     }
     this.observers.push(f)
     var _this = this
@@ -32,7 +32,7 @@ export var Observable = _Observable
 
 export function mergeObservables() {
   var observables = [].slice.call(arguments)
-  var globalObservable = new Observable(function () {
+  return new Observable(function (globalObservable) {
     var subscriptions = map(observables, function (observable) {
       return observable.subscribe(function (data) {
         return globalObservable.notify(data)
@@ -44,5 +44,4 @@ export function mergeObservables() {
       })
     }
   })
-  return globalObservable
 }

package/src/report/reportObservable.js

@@ -26,7 +26,7 @@ export function initReportObservable(configuration, apis) {
 }
 
 function createReportObservable(reportTypes) {
-  var observable = new Observable(function () {
+  return new Observable(function (observable) {
     if (!window.ReportingObserver) {
       return
     }
@@ -52,7 +52,7 @@ function createReportObservable(reportTypes) {
 }
 
 function createCspViolationReportObservable(configuration) {
-  var observable = new Observable(function () {
+  return new Observable(function (observable) {
     var handleCspViolation = function (event) {
       observable.notify(buildRawReportFromCspViolation(event))
     }

package/src/session/sessionCookieStore.js

@@ -164,6 +164,6 @@ function isValidSessionString(sessionString) {
 function isExpiredState(session) {
   return isEmptyObject(session)
 }
-function clearSession(options) {
+export function clearSession(options) {
   setCookie(SESSION_COOKIE_NAME, '', 0, options)
 }

package/src/session/sessionStore.js

@@ -2,7 +2,11 @@ import { COOKIE_ACCESS_DELAY } from '../browser/cookie'
 import { Observable } from '../helper/observable'
 import { dateNow, UUID, throttle } from '../helper/tools'
 import { SESSION_TIME_OUT_DELAY } from './sessionConstants'
-import { retrieveSession, withCookieLockAccess } from './sessionCookieStore'
+import {
+  retrieveSession,
+  withCookieLockAccess,
+  clearSession
+} from './sessionCookieStore'
 import { clearInterval, setInterval } from '../helper/timer'
 
 /**
@@ -137,7 +141,7 @@ export function startSessionStore(options, productKey, computeSessionState) {
     renewObservable: renewObservable,
     expireObservable: expireObservable,
     expire: function () {
-      deleteSessionCookie(options)
+      clearSession(options)
       synchronizeSession({})
     },
     stop: function () {