@openobserve/browser-core 0.3.3 → 0.4.0-beta.1

package/src/domain/configuration/configuration.ts

@@ -3,16 +3,14 @@ import { DOCS_ORIGIN, MORE_DETAILS, display } from '../../tools/display'
 import type { RawTelemetryConfiguration } from '../telemetry'
 import { isPercentage } from '../../tools/utils/numberUtils'
 import { objectHasValue } from '../../tools/utils/objectUtils'
-import { selectSessionStoreStrategyType } from '../session/sessionStore'
-import type { SessionStoreStrategyType } from '../session/storeStrategies/sessionStoreStrategy'
+import type { CookieOptions } from '../../browser/cookie'
+import { getCurrentSite } from '../../browser/cookie'
 import { TrackingConsent } from '../trackingConsent'
 import type { SessionPersistence } from '../session/sessionConstants'
 import type { MatchOption } from '../../tools/matchOption'
 import { isAllowedTrackingOrigins } from '../allowedTrackingOrigins'
+import { INTAKE_SITE_US1 } from '../intakeSites'
 import type { Site } from '../intakeSites'
-import { isWorkerEnvironment } from '../../tools/globalObject'
-import type { TransportConfiguration } from './transportConfiguration'
-import { computeTransportConfiguration } from './transportConfiguration'
 
 /**
  * Default privacy level for the browser SDK.
@@ -84,25 +82,17 @@ export interface InitConfiguration {
   silentMultipleInit?: boolean | undefined
 
   /**
-   * Which storage strategy to use for persisting sessions. Can be either 'cookie' or 'local-storage'.
+   * Which storage strategy to use for persisting sessions. Can be 'cookie', 'local-storage', or 'memory'.
+   * When an array is provided, the SDK will attempt each persistence type in the order specified.
    *
    * Important: If you are using the RUM and Logs Browser SDKs, this option must be configured with identical values
    *
-   * @category Session Persistence
-   * @defaultValue "cookie"
-   */
-  sessionPersistence?: SessionPersistence | undefined
-
-  /**
-   * Allows the use of localStorage when cookies cannot be set. This enables the RUM Browser SDK to run in environments that do not provide cookie support.
-   *
-   * Important: If you are using the RUM and Logs Browser SDKs, this option must be configured with identical values
-   * See [Monitor Electron Applications Using the Browser SDK](https://docs.datadoghq.com/real_user_monitoring/guide/monitor-electron-applications-using-browser-sdk) for further information.
+   * Note: 'memory' option is only for use with single-page applications. All page loads will start a new session, likely resulting in an increase in total number of RUM sessions
    *
    * @category Session Persistence
-   * @deprecated use `sessionPersistence: local-storage` where you want to use localStorage instead
+   * @defaultValue "cookie"
    */
-  allowFallbackToLocalStorage?: boolean | undefined
+  sessionPersistence?: SessionPersistence | SessionPersistence[] | undefined
 
   /**
    * Allow listening to DOM events dispatched programmatically ([untrusted events](https://developer.mozilla.org/en-US/docs/Web/API/Event/isTrusted)). Enabling this option can be useful if you heavily rely on programmatic events, such as in an automated UI test environment.
@@ -152,6 +142,30 @@ export interface InitConfiguration {
    */
   site?: Site | undefined
 
+  /**
+   * The OpenObserve ingestion API version used to build intake URLs.
+   *
+   * @category Transport
+   * @defaultValue v1
+   */
+  apiVersion?: string | undefined
+
+  /**
+   * The OpenObserve organization identifier, used as a path segment of intake URLs.
+   *
+   * @category Transport
+   * @defaultValue default
+   */
+  organizationIdentifier?: string | undefined
+
+  /**
+   * Send data to the intake over plain HTTP instead of HTTPS. Only intended for local
+   * development against a non-TLS OpenObserve instance.
+   *
+   * @category Transport
+   */
+  insecureHTTP?: boolean | undefined
+
   // tag and context options
   /**
    * The service name for your application. Follows the [tag syntax requirements](https://docs.datadoghq.com/getting_started/tagging/#define-tags).
@@ -213,15 +227,6 @@ export interface InitConfiguration {
    */
   trackAnonymousUser?: boolean | undefined
 
-  /**
-   * Encode cookie options in the cookie value. This can be used as a mitigation for microssession issues.
-   * ⚠️ This is a beta feature and may be changed or removed in the future.
-   *
-   * @category Beta
-   * @defaultValue false
-   */
-  betaEncodeCookieOptions?: boolean | undefined
-
   // internal options
   /**
    * [Internal option] Enable experimental features
@@ -235,7 +240,7 @@ export interface InitConfiguration {
    *
    * @internal
    */
-  replica?: ReplicaUserConfiguration | undefined
+  replica?: ReplicaInitConfiguration | undefined
 
   /**
    * [Internal option] Set the datacenter from where the data is dual shipped
@@ -244,14 +249,6 @@ export interface InitConfiguration {
    */
   datacenter?: string
 
-  /**
-   * [Internal option] Datadog internal analytics subdomain
-   *
-   * @internal
-   */
-  // TODO next major: remove this option and replace usages by proxyFn
-  internalAnalyticsSubdomain?: string
-
   /**
    * [Internal option] The percentage of telemetry configuration sent. A value between 0 and 100.
    *
@@ -288,10 +285,6 @@ export interface InitConfiguration {
    * @internal
    */
   variant?: string | undefined
-
-  apiVersion: string
-  organizationIdentifier: string
-  insecureHTTP: boolean | undefined
 }
 
 // This type is only used to build the core configuration. Logs and RUM SDKs are using a proper type
@@ -302,20 +295,30 @@ type GenericBeforeSendCallback = (event: any, context?: any) => unknown
  * path: /api/vX/product
  * parameters: xxx=yyy&zzz=aaa
  */
-export type ProxyFn = (options: { path: string; parameters: string }) => string
+export type ProxyFn = (options: { path: string; parameters: string; subdomain?: string }) => string
 
 /**
  * @internal
  */
-export interface ReplicaUserConfiguration {
+export interface ReplicaInitConfiguration {
   applicationId?: string
   clientToken: string
 }
 
-export interface Configuration extends TransportConfiguration {
-  // Built from init configuration
+export type SdkSource = 'browser' | 'flutter' | 'unity'
+
+export interface Configuration {
+  clientToken: string
+  datacenter: string | undefined
+  proxy: string | ProxyFn | undefined
+  site: Site
+  apiVersion: string
+  organizationIdentifier: string
+  insecureHTTP: boolean | undefined
+  source: SdkSource
   beforeSend: GenericBeforeSendCallback | undefined
-  sessionStoreStrategyType: SessionStoreStrategyType | undefined
+  cookieOptions: CookieOptions | undefined
+  sessionPersistence: SessionPersistence | SessionPersistence[] | undefined
   sessionSampleRate: number
   telemetrySampleRate: number
   telemetryConfigurationSampleRate: number
@@ -324,19 +327,14 @@ export interface Configuration extends TransportConfiguration {
   version?: string | undefined
   env?: string | undefined
   silentMultipleInit: boolean
-  allowUntrustedEvents: boolean
   trackingConsent: TrackingConsent
   storeContextsAcrossPages: boolean
   trackAnonymousUser?: boolean
-  betaEncodeCookieOptions: boolean
 
   // internal
   sdkVersion: string | undefined
-  source: 'browser' | 'flutter' | 'unity'
   variant: string | undefined
-  apiVersion: string
-  organizationIdentifier: string
-  insecureHTTP: boolean | undefined
+  replica: ReplicaInitConfiguration | undefined
 }
 
 function isString(tag: unknown, tagName: string): tag is string | undefined | null {
@@ -347,15 +345,6 @@ function isString(tag: unknown, tagName: string): tag is string | undefined | nu
   return true
 }
 
-function isDatadogSite(site: unknown) {
-  return true;
-  // if (site && typeof site === 'string' && !/(datadog|ddog|datad0g|dd0g)/.test(site)) {
-  //   display.error(`Site should be a valid Datadog site. ${MORE_DETAILS} ${DOCS_ORIGIN}/getting_started/site/.`)
-  //   return false
-  // }
-  // return true
-}
-
 export function isSampleRate(sampleRate: unknown, name: string) {
   if (sampleRate !== undefined && !isPercentage(sampleRate)) {
     display.error(`${name} Sample Rate should be a number between 0 and 100`)
@@ -368,7 +357,7 @@ export function validateAndBuildConfiguration(
   initConfiguration: InitConfiguration,
   errorStack?: string
 ): Configuration | undefined {
-  if (!initConfiguration || !initConfiguration.clientToken) {
+  if (!initConfiguration?.clientToken) {
     display.error('Client Token is not configured, we will not send any data.')
     return
   }
@@ -382,7 +371,6 @@ export function validateAndBuildConfiguration(
   }
 
   if (
-    !isDatadogSite(initConfiguration.site) ||
     !isSampleRate(initConfiguration.sessionSampleRate, 'Session') ||
     !isSampleRate(initConfiguration.telemetrySampleRate, 'Telemetry') ||
     !isSampleRate(initConfiguration.telemetryConfigurationSampleRate, 'Telemetry Configuration') ||
@@ -404,9 +392,17 @@ export function validateAndBuildConfiguration(
   }
 
   return {
+    clientToken: initConfiguration.clientToken,
+    proxy: initConfiguration.proxy,
+    site: initConfiguration.site || INTAKE_SITE_US1,
+    apiVersion: initConfiguration.apiVersion ?? 'v1',
+    organizationIdentifier: initConfiguration.organizationIdentifier ?? 'default',
+    insecureHTTP: initConfiguration.insecureHTTP,
+    source: validateSource(initConfiguration.source),
     beforeSend:
       initConfiguration.beforeSend && catchUserErrors(initConfiguration.beforeSend, 'beforeSend threw an error:'),
-    sessionStoreStrategyType: isWorkerEnvironment ? undefined : selectSessionStoreStrategyType(initConfiguration),
+    cookieOptions: buildCookieOptions(initConfiguration),
+    sessionPersistence: initConfiguration.sessionPersistence,
     sessionSampleRate: initConfiguration.sessionSampleRate ?? 100,
     telemetrySampleRate: initConfiguration.telemetrySampleRate ?? 20,
     telemetryConfigurationSampleRate: initConfiguration.telemetryConfigurationSampleRate ?? 5,
@@ -416,24 +412,36 @@ export function validateAndBuildConfiguration(
     version: initConfiguration.version ?? undefined,
     datacenter: initConfiguration.datacenter ?? undefined,
     silentMultipleInit: !!initConfiguration.silentMultipleInit,
-    allowUntrustedEvents: !!initConfiguration.allowUntrustedEvents,
     trackingConsent: initConfiguration.trackingConsent ?? TrackingConsent.GRANTED,
     trackAnonymousUser: initConfiguration.trackAnonymousUser ?? true,
     storeContextsAcrossPages: !!initConfiguration.storeContextsAcrossPages,
-    betaEncodeCookieOptions: !!initConfiguration.betaEncodeCookieOptions,
 
     /**
      * The source of the SDK, used for support plugins purposes.
      */
     variant: initConfiguration.variant,
     sdkVersion: initConfiguration.sdkVersion,
+    replica: initConfiguration.replica,
+  }
+}
 
-    apiVersion: initConfiguration.apiVersion ?? 'v1',
-    organizationIdentifier: initConfiguration.organizationIdentifier,
-    insecureHTTP: initConfiguration.insecureHTTP,
+export function buildCookieOptions(initConfiguration: InitConfiguration): CookieOptions | undefined {
+  const cookieOptions: CookieOptions = {}
 
-    ...computeTransportConfiguration(initConfiguration),
+  cookieOptions.secure =
+    !!initConfiguration.useSecureSessionCookie || !!initConfiguration.usePartitionedCrossSiteSessionCookie
+  cookieOptions.crossSite = !!initConfiguration.usePartitionedCrossSiteSessionCookie
+  cookieOptions.partitioned = !!initConfiguration.usePartitionedCrossSiteSessionCookie
+
+  if (initConfiguration.trackSessionAcrossSubdomains) {
+    const currentSite = getCurrentSite()
+    if (!currentSite) {
+      return
+    }
+    cookieOptions.domain = currentSite
   }
+
+  return cookieOptions
 }
 
 export function serializeConfiguration(initConfiguration: InitConfiguration) {
@@ -449,15 +457,22 @@ export function serializeConfiguration(initConfiguration: InitConfiguration) {
     silent_multiple_init: initConfiguration.silentMultipleInit,
     track_session_across_subdomains: initConfiguration.trackSessionAcrossSubdomains,
     track_anonymous_user: initConfiguration.trackAnonymousUser,
-    session_persistence: initConfiguration.sessionPersistence,
-    allow_fallback_to_local_storage: !!initConfiguration.allowFallbackToLocalStorage,
+    session_persistence: Array.isArray(initConfiguration.sessionPersistence)
+      ? initConfiguration.sessionPersistence[0]
+      : initConfiguration.sessionPersistence,
     store_contexts_across_pages: !!initConfiguration.storeContextsAcrossPages,
     allow_untrusted_events: !!initConfiguration.allowUntrustedEvents,
     tracking_consent: initConfiguration.trackingConsent,
     use_allowed_tracking_origins: Array.isArray(initConfiguration.allowedTrackingOrigins),
-    beta_encode_cookie_options: initConfiguration.betaEncodeCookieOptions,
     source: initConfiguration.source,
     sdk_version: initConfiguration.sdkVersion,
     variant: initConfiguration.variant,
   } satisfies RawTelemetryConfiguration
 }
+
+function validateSource(source: string | undefined): SdkSource {
+  if (source === 'flutter' || source === 'unity') {
+    return source
+  }
+  return 'browser'
+}

package/src/domain/configuration/endpointBuilder.ts

@@ -1,88 +1,122 @@
+import { timeStampNow } from '@openobserve/js-core/time'
 import type { Payload } from '../../transport'
-import { timeStampNow } from '../../tools/utils/timeUtils'
 import { normalizeUrl } from '../../tools/utils/urlPolyfill'
 import { generateUUID } from '../../tools/utils/stringUtils'
-import { INTAKE_SITE_FED_STAGING, INTAKE_SITE_US1, PCI_INTAKE_HOST_US1 } from '../intakeSites'
-import type { InitConfiguration } from './configuration'
+import type { Site } from '../intakeSites'
+import { INTAKE_SITE_US1 } from '../intakeSites'
+import type { Configuration, ProxyFn } from './configuration'
 
 // replaced at build time
 declare const __BUILD_ENV__SDK_VERSION__: string
 
-export type TrackType = 'logs' | 'rum' | 'replay' | 'profile' | 'exposures'
+export type TrackType = 'logs' | 'rum' | 'replay' | 'profile' | 'exposures' | 'flagevaluation' | 'debugger'
 export type ApiType =
-  | 'fetch-keepalive'
   | 'fetch'
   | 'beacon'
   // 'manual' reflects that the request have been sent manually, outside of the SDK (ex: via curl or
   // a Node.js script).
   | 'manual'
 
+/**
+ * Source values supported by the transport layer for the `o2source` URL parameter.
+ *
+ * `'dd_debugger'` is internal to the Live Debugger SDK and is not part of
+ * `InitConfiguration.source`. It is passed directly to `createEndpointBuilder`
+ * by the debugger transport.
+ */
+export type TransportSource = 'browser' | 'flutter' | 'unity' | 'dd_debugger'
+
+interface EndpointBuilderConfiguration {
+  clientToken: string
+  proxy?: string | ProxyFn
+  site?: Site
+  source?: TransportSource
+  apiVersion?: string
+  organizationIdentifier?: string
+  insecureHTTP?: boolean
+}
+
 export type EndpointBuilder = ReturnType<typeof createEndpointBuilder>
 
 export function createEndpointBuilder(
-  initConfiguration: InitConfiguration,
+  configuration: EndpointBuilderConfiguration,
   trackType: TrackType,
   extraParameters?: string[]
 ) {
-  const buildUrlWithParameters = createEndpointUrlWithParametersBuilder(initConfiguration, trackType)
-  
   return {
     build(api: ApiType, payload: Payload) {
-      const parameters = buildEndpointParameters(initConfiguration, trackType, api, payload, extraParameters)
-      return buildUrlWithParameters(parameters)
+      return buildEndpointUrl({
+        proxy: configuration.proxy,
+        site: configuration.site,
+        insecureHTTP: configuration.insecureHTTP,
+        path: `/rum/${configuration.apiVersion ?? 'v1'}/${configuration.organizationIdentifier ?? 'default'}/${trackType}`,
+        parameters: buildEndpointParameters(configuration, trackType, api, payload, extraParameters),
+      })
     },
     trackType,
   }
 }
 
 /**
- * Create a function used to build a full endpoint url from provided parameters. The goal of this
- * function is to pre-compute some parts of the URL to avoid re-computing everything on every
- * request, as only parameters are changing.
+ * Build the endpoint for the replica (dual shipping) site, if a replica is configured.
+ *
+ * The replica always targets the US1 site but keeps the `proxy` and `source` of the main
+ * configuration. The RUM track additionally carries the replica `application.id`.
  */
-function createEndpointUrlWithParametersBuilder(
-  initConfiguration: InitConfiguration,
-  trackType: TrackType
-): (parameters: string) => string {
-  // const path = `/api/v2/${trackType}`
-  const { proxy, apiVersion, organizationIdentifier, insecureHTTP } = initConfiguration
-
-  const path = `/rum/${apiVersion}/${organizationIdentifier}/${trackType}`
-  if (typeof proxy === 'string') {
-    const normalizedProxyUrl = normalizeUrl(proxy)
-    return (parameters) => `${normalizedProxyUrl}?o2forward=${encodeURIComponent(`${path}?${parameters}`)}`
+export function createReplicaEndpointBuilder({ replica, proxy, source }: Configuration, trackType: TrackType) {
+  if (!replica) {
+    return
   }
-  if (typeof proxy === 'function') {
-    return (parameters) => proxy({ path, parameters })
-  }
-  const host = buildEndpointHost(trackType, initConfiguration)
-  const protocol = insecureHTTP ? 'http' : 'https'
-  return (parameters) => `${protocol}://${host}${path}?${parameters}`
+  return createEndpointBuilder(
+    {
+      clientToken: replica.clientToken,
+      proxy,
+      source,
+      site: INTAKE_SITE_US1,
+    },
+    trackType,
+    trackType === 'rum' ? [`application.id=${replica.applicationId}`] : undefined
+  )
 }
 
-export function buildEndpointHost(
-  trackType: TrackType,
-  initConfiguration: InitConfiguration & { usePciIntake?: boolean }
-) {
-  const { site = INTAKE_SITE_US1, internalAnalyticsSubdomain } = initConfiguration
-
-  return site
+export interface BuildEndpointUrlOptions {
+  proxy?: string | ProxyFn
+  site: Site | undefined
+  subdomain?: string
+  path: string
+  parameters?: string
+  insecureHTTP?: boolean
+}
 
-  if (trackType === 'logs' && initConfiguration.usePciIntake && site === INTAKE_SITE_US1) {
-    return PCI_INTAKE_HOST_US1
+export function buildEndpointUrl({
+  proxy,
+  site = INTAKE_SITE_US1,
+  path,
+  parameters = '',
+  subdomain,
+  insecureHTTP,
+}: BuildEndpointUrlOptions): string {
+  let pathAndParameters = path
+  if (parameters) {
+    pathAndParameters += `?${parameters}`
   }
 
-  if (internalAnalyticsSubdomain && site === INTAKE_SITE_US1) {
-    return `${internalAnalyticsSubdomain}.${INTAKE_SITE_US1}`
+  if (typeof proxy === 'string') {
+    let url = `${normalizeUrl(proxy)}?o2forward=${encodeURIComponent(pathAndParameters)}`
+    if (subdomain) {
+      url += `&o2forwardSubdomain=${subdomain}`
+    }
+    return url
   }
 
-  if (site === INTAKE_SITE_FED_STAGING) {
-    return `http-intake.logs.${site}`
+  if (typeof proxy === 'function') {
+    return proxy({ path, parameters, subdomain })
   }
 
-  const domainParts = site.split('.')
-  const extension = domainParts.pop()
-  return `browser-intake-${domainParts.join('-')}.${extension!}`
+  // OpenObserve: the configured `site` is used verbatim as the intake host, without the
+  // Datadog `browser-intake-` domain construction or subdomain prefixes.
+  const protocol = insecureHTTP ? 'http' : 'https'
+  return `${protocol}://${site}${pathAndParameters}`
 }
 
 /**
@@ -90,7 +124,7 @@ export function buildEndpointHost(
  * request, as they change randomly.
  */
 function buildEndpointParameters(
-  { clientToken, internalAnalyticsSubdomain, source = 'browser' }: InitConfiguration,
+  { clientToken, source = 'browser' }: EndpointBuilderConfiguration,
   trackType: TrackType,
   api: ApiType,
   { retry, encoding }: Payload,
@@ -116,9 +150,5 @@ function buildEndpointParameters(
     }
   }
 
-  if (internalAnalyticsSubdomain) {
-    parameters.reverse()
-  }
-
   return parameters.join('&')
-}
+}

package/src/domain/configuration/index.ts

@@ -5,7 +5,7 @@ export {
   isSampleRate,
   validateAndBuildConfiguration,
   serializeConfiguration,
+  buildCookieOptions,
 } from './configuration'
 export type { EndpointBuilder, TrackType } from './endpointBuilder'
-export { createEndpointBuilder, buildEndpointHost } from './endpointBuilder'
-export { computeTransportConfiguration, isIntakeUrl } from './transportConfiguration'
+export { createEndpointBuilder, createReplicaEndpointBuilder, buildEndpointUrl } from './endpointBuilder'

package/src/domain/connectivity/connectivity.ts

@@ -1,18 +1,6 @@
+import type { EffectiveType, NetworkInterface } from '../../browser/browser.types'
 import { globalObject } from '../../tools/globalObject'
 
-export type NetworkInterface = 'bluetooth' | 'cellular' | 'ethernet' | 'none' | 'wifi' | 'wimax' | 'other' | 'unknown'
-export type EffectiveType = 'slow-2g' | '2g' | '3g' | '4g'
-
-interface BrowserNavigator extends Navigator {
-  connection?: NetworkInformation
-}
-
-export interface NetworkInformation {
-  type?: NetworkInterface
-  effectiveType?: EffectiveType
-  saveData: boolean
-}
-
 export interface Connectivity {
   status: 'connected' | 'not_connected'
   interfaces?: NetworkInterface[]
@@ -21,11 +9,11 @@ export interface Connectivity {
 }
 
 export function getConnectivity(): Connectivity {
-  const navigator = globalObject.navigator as BrowserNavigator
+  const navigator = globalObject.navigator
 
   return {
     status: navigator.onLine ? 'connected' : 'not_connected',
-    interfaces: navigator.connection && navigator.connection.type ? [navigator.connection.type] : undefined,
+    interfaces: navigator.connection?.type ? [navigator.connection.type] : undefined,
     effective_type: navigator.connection?.effectiveType,
   }
 }

package/src/domain/console/consoleObservable.ts

@@ -1,6 +1,7 @@
+import { clocksNow } from '@openobserve/js-core/time'
+import { ConsoleApiName, globalConsole } from '@openobserve/js-core/util'
 import { isError, computeRawError } from '../error/error'
-import { mergeObservables, Observable } from '../../tools/observable'
-import { ConsoleApiName, globalConsole } from '../../tools/display'
+import { Observable, mergeObservables } from '../../tools/observable'
 import { callMonitored } from '../../tools/monitor'
 import { sanitize } from '../../tools/serialisation/sanitize'
 import { jsonStringify } from '../../tools/serialisation/jsonStringify'
@@ -8,7 +9,6 @@ import type { RawError } from '../error/error.types'
 import { ErrorHandling, ErrorSource, NonErrorPrefix } from '../error/error.types'
 import { computeStackTrace } from '../../tools/stackTrace/computeStackTrace'
 import { createHandlingStack, formatErrorMessage } from '../../tools/stackTrace/handlingStack'
-import { clocksNow } from '../../tools/utils/timeUtils'
 
 export type ConsoleLog = NonErrorConsoleLog | ErrorConsoleLog
 

package/src/domain/context/contextManager.ts

@@ -1,4 +1,4 @@
-import { deepClone } from '../../tools/mergeInto'
+import { deepClone } from '@openobserve/js-core/util'
 import { sanitize } from '../../tools/serialisation/sanitize'
 import type { Context } from '../../tools/serialisation/context'
 import { Observable } from '../../tools/observable'

package/src/domain/context/contextUtils.ts

@@ -1,6 +1,6 @@
+import { getType } from '@openobserve/js-core/util'
 import type { Context } from '../../tools/serialisation/context'
 import { display } from '../../tools/display'
-import { getType } from '../../tools/utils/typeUtils'
 
 /**
  * Simple check to ensure an object is a valid context

package/src/domain/context/defineContextMethod.ts

@@ -1,7 +1,7 @@
 import type { RawTelemetryUsage, RawTelemetryUsageFeature } from '../telemetry'
 import { addTelemetryUsage } from '../telemetry'
 import { monitor } from '../../tools/monitor'
-import type { BoundedBuffer } from '../../tools/boundedBuffer'
+import type { BufferedObservable } from '../../tools/observable'
 import type { ContextManager } from './contextManager'
 import type { ContextManagerMethod, CustomerContextKey } from './contextConstants'
 
@@ -22,10 +22,10 @@ export function defineContextMethod<MethodName extends ContextManagerMethod, Key
 export function bufferContextCalls<Key extends string, StartResult extends Record<Key, ContextManager>>(
   preStartContextManager: ContextManager,
   name: Key,
-  bufferApiCalls: BoundedBuffer<StartResult>
+  bufferApiCalls: BufferedObservable<(startResult: StartResult) => void>
 ) {
   preStartContextManager.changeObservable.subscribe(() => {
     const context = preStartContextManager.getContext()
-    bufferApiCalls.add((startResult) => startResult[name].setContext(context))
+    bufferApiCalls.notify((startResult) => startResult[name].setContext(context))
   })
 }

package/src/domain/context/storeContextManager.ts

@@ -1,8 +1,7 @@
+import { combine } from '@openobserve/js-core/util'
 import { addEventListener, DOM_EVENT } from '../../browser/addEventListener'
 import type { Context } from '../../tools/serialisation/context'
-import type { Configuration } from '../configuration'
-import { combine } from '../../tools/mergeInto'
-import { isEmptyObject } from '../../tools/utils/objectUtils'
+import { isEmptyObject, tryJsonParse } from '../../tools/utils/objectUtils'
 import type { ContextManager } from './contextManager'
 import type { CustomerDataType } from './contextConstants'
 
@@ -11,15 +10,19 @@ const CONTEXT_STORE_KEY_PREFIX = '_oo_c'
 const storageListeners: Array<{ stop: () => void }> = []
 
 export function storeContextManager(
-  configuration: Configuration,
   contextManager: ContextManager,
   productKey: string,
   customerDataType: CustomerDataType
 ) {
+  // window and localStorage are not available in Web Workers or Node.js environments
+  if (typeof window === 'undefined' || typeof localStorage === 'undefined') {
+    return
+  }
+
   const storageKey = buildStorageKey(productKey, customerDataType)
 
   storageListeners.push(
-    addEventListener(configuration, window, DOM_EVENT.STORAGE, ({ key }) => {
+    addEventListener(window, DOM_EVENT.STORAGE, ({ key }) => {
       if (storageKey === key) {
         synchronizeWithStorage()
       }
@@ -42,7 +45,7 @@ export function storeContextManager(
 
   function getFromStorage() {
     const rawContext = localStorage.getItem(storageKey)
-    return rawContext ? (JSON.parse(rawContext) as Context) : {}
+    return rawContext ? (tryJsonParse<Context>(rawContext) ?? {}) : {}
   }
 }