@cloudcare/browser-core 2.0.4 → 2.0.6

package/src/transport/httpRequest.js

@@ -1,5 +1,5 @@
 import { newRetryState, sendWithRetryStrategy } from './sendWithRetryStrategy'
-
+import { addEventListener } from '../browser/addEventListener'
 /**
  * Use POST request without content type to:
  * - avoid CORS preflight requests
@@ -100,10 +100,17 @@ function isKeepAliveSupported() {
 function sendXHR(url, data, onResponse) {
   const request = new XMLHttpRequest()
   request.open('POST', url, true)
-  request.send(data)
-  request.addEventListener('loadend', function () {
-    if (typeof onResponse === 'function') {
-      onResponse({ status: request.status })
+  addEventListener(
+    request,
+    'loadend',
+    function () {
+      if (typeof onResponse === 'function') {
+        onResponse({ status: request.status })
+      }
+    },
+    {
+      once: true
     }
-  })
+  )
+  request.send(data)
 }

package/src/transport/index.js

@@ -1,3 +1,4 @@
 export { createHttpRequest } from './httpRequest'
 export { Batch } from './batch'
 export { startBatchWithReplica } from './startBatchWithReplica'
+export { createFlushController } from './flushController'

package/src/transport/sendWithRetryStrategy.js

@@ -1,11 +1,7 @@
-import {
-  clocksNow,
-  ONE_KIBI_BYTE,
-  ONE_MEBI_BYTE,
-  ONE_SECOND
-} from '../helper/tools'
+import { clocksNow, ONE_SECOND } from '../helper/tools'
+import { ONE_MEBI_BYTE, ONE_KIBI_BYTE } from '../helper/byteUtils'
 import { ErrorSource } from '../helper/errorTools'
-
+import { setTimeout } from '../helper/timer'
 export var MAX_ONGOING_BYTES_COUNT = 80 * ONE_KIBI_BYTE
 export var MAX_ONGOING_REQUESTS = 32
 export var MAX_QUEUE_BYTES_COUNT = 3 * ONE_MEBI_BYTE

package/src/transport/startBatchWithReplica.js

@@ -1,11 +1,12 @@
 import { Batch } from './batch'
 import { createHttpRequest } from './httpRequest'
-
+import { createFlushController } from './flushController'
 export function startBatchWithReplica(
   configuration,
   endpointUrl,
   reportError,
-  pageExitObservable
+  pageExitObservable,
+  sessionExpireObservable
 ) {
   var primaryBatch = createBatch(endpointUrl)
 
@@ -16,11 +17,14 @@ export function startBatchWithReplica(
         configuration.batchBytesLimit,
         reportError
       ),
-      configuration.batchMessagesLimit,
-      configuration.batchBytesLimit,
-      configuration.messageBytesLimit,
-      configuration.flushTimeout,
-      pageExitObservable
+      createFlushController({
+        messagesLimit: configuration.batchMessagesLimit,
+        bytesLimit: configuration.batchBytesLimit,
+        durationLimit: configuration.flushTimeout,
+        pageExitObservable: pageExitObservable,
+        sessionExpireObservable: sessionExpireObservable
+      }),
+      configuration.messageBytesLimit
     )
   }
 

package/src/user/index.js

@@ -0,0 +1 @@
+export * from './user'

package/src/user/user.js

@@ -0,0 +1,31 @@
+import { display } from '../helper/display'
+import { assign, getType, each } from '../helper/tools'
+
+/**
+ * Clone input data and ensure known user properties (id, name, email)
+ * are strings, as defined here:
+ * https://docs.datadoghq.com/logs/log_configuration/attributes_naming_convention/#user-related-attributes
+ */
+export function sanitizeUser(newUser) {
+  // We shallow clone only to prevent mutation of user data.
+  var user = assign({}, newUser)
+  var keys = ['id', 'name', 'email']
+  each(keys, function (key) {
+    if (key in user) {
+      user[key] = String(user[key])
+    }
+  })
+
+  return user
+}
+
+/**
+ * Simple check to ensure user is valid
+ */
+export function checkUser(newUser) {
+  var isValid = getType(newUser) === 'object'
+  if (!isValid) {
+    display.error('Unsupported user:', newUser)
+  }
+  return isValid
+}