@dotcms/analytics 1.2.3-next.3 → 1.2.3-next.4

package/lib/core/shared/constants/dot-analytics.constants.d.ts

@@ -156,3 +156,22 @@ export declare const ANALYTICS_WINDOWS_CLEANUP_KEY = "__dotAnalyticsCleanup__";
  * @see core-web/libs/sdk/react/src/lib/next/components/Contentlet/Contentlet.tsx
  */
 export declare const CONTENTLET_CLASS = "dotcms-contentlet";
+/**
+ * Queue persistence configuration constants
+ * Used for storing events in sessionStorage for traditional page navigations
+ */
+/**
+ * Session storage key for persistent tab ID
+ * This ID remains constant across page navigations within the same browser tab
+ */
+export declare const TAB_ID_STORAGE_KEY = "dot_analytics_tab_id";
+/**
+ * Prefix for queue storage key in sessionStorage
+ * Full key format: dot_analytics_queue_{tabId}
+ */
+export declare const QUEUE_STORAGE_KEY_PREFIX = "dot_analytics_queue";
+/**
+ * Maximum age in milliseconds for persisted events
+ * Events older than this will be discarded (24 hours)
+ */
+export declare const MAX_EVENT_AGE_MS: number;

package/lib/core/shared/constants/dot-analytics.constants.js

@@ -1,20 +1,20 @@
-const I = "/api/v1/analytics/content/event", c = {
+const c = "/api/v1/analytics/content/event", o = {
   PAGEVIEW: "pageview",
   CONTENT_IMPRESSION: "content_impression",
   CONTENT_CLICK: "content_click",
   CONVERSION: "conversion"
-}, o = [
+}, s = [
   "utm_source",
   "utm_medium",
   "utm_campaign",
   "utm_term",
   "utm_content"
-], s = 30, e = "dot_analytics_session_id", N = "dot_analytics_user_id", _ = 15, E = 5e3, A = ["click"], L = {
+], I = 30, e = "dot_analytics_session_id", N = "dot_analytics_user_id", _ = 15, E = 5e3, A = ["click"], O = {
   eventBatchSize: _,
   // Max events per batch - auto-sends when reached
   flushInterval: E
   // Time between flushes - sends whatever is queued
-}, O = [
+}, L = [
   "title",
   "url",
   "path",
@@ -28,28 +28,31 @@ const I = "/api/v1/analytics/content/event", c = {
   dwellMs: n,
   maxNodes: T,
   throttleMs: S
-}, U = "content_impression", D = "content_click", M = 300, a = "a, button", R = "__dotAnalyticsActive__", l = "__dotAnalyticsCleanup__", r = "dotcms-contentlet";
+}, U = "content_impression", a = "content_click", D = 300, M = "a, button", R = "__dotAnalyticsActive__", l = "__dotAnalyticsCleanup__", F = "dotcms-contentlet", P = "dot_analytics_tab_id", d = "dot_analytics_queue", r = 1440 * 60 * 1e3;
 export {
   A as ACTIVITY_EVENTS,
-  I as ANALYTICS_ENDPOINT,
-  O as ANALYTICS_JS_DEFAULT_PROPERTIES,
+  c as ANALYTICS_ENDPOINT,
+  L as ANALYTICS_JS_DEFAULT_PROPERTIES,
   R as ANALYTICS_WINDOWS_ACTIVE_KEY,
   l as ANALYTICS_WINDOWS_CLEANUP_KEY,
-  a as CLICKABLE_ELEMENTS_SELECTOR,
-  D as CLICK_EVENT_TYPE,
-  r as CONTENTLET_CLASS,
-  M as DEFAULT_CLICK_THROTTLE_MS,
+  M as CLICKABLE_ELEMENTS_SELECTOR,
+  a as CLICK_EVENT_TYPE,
+  F as CONTENTLET_CLASS,
+  D as DEFAULT_CLICK_THROTTLE_MS,
   C as DEFAULT_IMPRESSION_CONFIG,
   n as DEFAULT_IMPRESSION_DWELL_MS,
   T as DEFAULT_IMPRESSION_MAX_NODES,
   i as DEFAULT_IMPRESSION_MUTATION_OBSERVER_DEBOUNCE_MS,
   S as DEFAULT_IMPRESSION_THROTTLE_MS,
   t as DEFAULT_IMPRESSION_VISIBILITY_THRESHOLD,
-  L as DEFAULT_QUEUE_CONFIG,
-  s as DEFAULT_SESSION_TIMEOUT_MINUTES,
-  c as DotCMSPredefinedEventType,
-  o as EXPECTED_UTM_KEYS,
+  O as DEFAULT_QUEUE_CONFIG,
+  I as DEFAULT_SESSION_TIMEOUT_MINUTES,
+  o as DotCMSPredefinedEventType,
+  s as EXPECTED_UTM_KEYS,
   U as IMPRESSION_EVENT_TYPE,
+  r as MAX_EVENT_AGE_MS,
+  d as QUEUE_STORAGE_KEY_PREFIX,
   e as SESSION_STORAGE_KEY,
+  P as TAB_ID_STORAGE_KEY,
   N as USER_ID_KEY
 };

package/lib/core/shared/http/dot-analytics.http.d.ts

@@ -6,4 +6,4 @@ import { DotCMSAnalyticsConfig, DotCMSAnalyticsRequestBody } from '../models';
  * @param keepalive - Use keepalive mode for page unload scenarios (default: false)
  * @returns A promise that resolves when the request is complete
  */
-export declare const sendAnalyticsEvent: (payload: DotCMSAnalyticsRequestBody, config: DotCMSAnalyticsConfig, keepalive?: boolean) => Promise<void>;
+export declare const sendAnalyticsEvent: (payload: DotCMSAnalyticsRequestBody, config: DotCMSAnalyticsConfig, keepalive?: boolean) => Promise<boolean>;

package/lib/core/shared/http/dot-analytics.http.js

@@ -1,34 +1,36 @@
-import { ANALYTICS_ENDPOINT as f } from "../constants/dot-analytics.constants.js";
-import { createPluginLogger as T } from "../utils/dot-analytics.utils.js";
-const h = async (n, a, i = !1) => {
-  const r = T("HTTP", a), c = `${a.server}${f}`, g = JSON.stringify(n);
-  r.info(`Sending ${n.events.length} event(s)${i ? " (keepalive)" : ""}`, {
+import { ANALYTICS_ENDPOINT as p } from "../constants/dot-analytics.constants.js";
+import { createPluginLogger as l } from "../utils/dot-analytics.utils.js";
+const m = async (n, i, c = !1) => {
+  const e = l("HTTP", i), f = `${i.server}${p}`, g = JSON.stringify(n);
+  e.info(`Sending ${n.events.length} event(s)${c ? " (keepalive)" : ""}`, {
     payload: n
   });
   try {
-    const e = {
+    const r = {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: g
     };
-    if (i) {
-      e.keepalive = !0, e.credentials = "omit", fetch(c, e);
-      return;
-    }
-    const t = await fetch(c, e);
+    if (c)
+      return r.keepalive = !0, r.credentials = "omit", fetch(f, r).catch((o) => {
+        e.error("Keepalive request failed (browser may have ignored it):", o);
+      }), !0;
+    const t = await fetch(f, r);
     if (!t.ok) {
-      const p = t.statusText || "Unknown Error", o = `HTTP ${t.status}: ${p}`;
+      const o = t.statusText || "Unknown Error", a = `HTTP ${t.status}: ${o}`;
       try {
         const s = await t.json();
-        s.message ? r.warn(`${s.message} (${o})`) : r.warn(`${o} - No error message in response`);
+        s.message ? e.warn(`${s.message} (${a})`) : e.warn(`${a} - No error message in response`);
       } catch (s) {
-        r.warn(`${o} - Failed to parse error response:`, s);
+        e.warn(`${a} - Failed to parse error response:`, s);
       }
+      return !1;
     }
-  } catch (e) {
-    r.error("Error sending event:", e);
+    return !0;
+  } catch (r) {
+    return e.error("Error sending event:", r), !1;
   }
 };
 export {
-  h as sendAnalyticsEvent
+  m as sendAnalyticsEvent
 };

package/lib/core/shared/models/event.model.d.ts

@@ -167,3 +167,15 @@ export type DotCMSCustomEvent = DotCMSEventBase<DotCMSCustomEventType, DotCMSCus
  * Used primarily for type documentation and validation.
  */
 export type DotCMSEvent = DotCMSPageViewEvent | DotCMSContentImpressionEvent | DotCMSContentClickEvent | DotCMSConversionEvent | DotCMSCustomEvent;
+/**
+ * Structure for persisted queue in sessionStorage.
+ * Used to preserve events across traditional page navigations.
+ */
+export interface PersistedQueue {
+    /** Unique identifier for this browser tab */
+    tabId: string;
+    /** Timestamp when the queue was last persisted */
+    timestamp: number;
+    /** Array of events waiting to be sent */
+    events: DotCMSEvent[];
+}

package/lib/core/shared/queue/dot-analytics.queue.utils.d.ts

@@ -23,6 +23,10 @@ export declare const createAnalyticsQueue: (config: DotCMSAnalyticsConfig) => {
     /**
      * Clean up queue resources
      * Flushes remaining events and cleans up listeners
+     *
+     * IMPORTANT: Does NOT clear sessionStorage
+     * - Storage is cleared only after sendBatch succeeds or in initialize()
+     * - This allows events to persist across traditional page navigations
      */
     cleanup: () => void;
 };

package/lib/core/shared/queue/dot-analytics.queue.utils.js

@@ -1,49 +1,125 @@
-import m from "@analytics/queue-utils";
-import v from "@analytics/router-utils";
-import { DEFAULT_QUEUE_CONFIG as y } from "../constants/dot-analytics.constants.js";
-import { sendAnalyticsEvent as b } from "../http/dot-analytics.http.js";
-import { createPluginLogger as w } from "../utils/dot-analytics.utils.js";
-const L = (u) => {
-  const i = w("Queue", u);
-  let t = null, n = null, o = !1, d = !1, f = typeof window < "u" ? window.location.pathname : "";
-  const a = {
-    ...y,
-    ...typeof u.queue == "object" ? u.queue : {}
-  }, g = (e, s) => {
-    if (!n) return;
-    i.debug(`Sending batch of ${e.length} event(s)`, {
+import q from "@analytics/queue-utils";
+import F from "@analytics/router-utils";
+import { DEFAULT_QUEUE_CONFIG as x, TAB_ID_STORAGE_KEY as I, MAX_EVENT_AGE_MS as z, QUEUE_STORAGE_KEY_PREFIX as P } from "../constants/dot-analytics.constants.js";
+import { sendAnalyticsEvent as w } from "../http/dot-analytics.http.js";
+import { createPluginLogger as T, safeSessionStorage as d, generateSecureId as U, getAnalyticsContext as D } from "../utils/dot-analytics.utils.js";
+const R = (l) => {
+  const n = T("Queue", l);
+  let i = null, c = null, f = !1, m = !1, v = typeof window < "u" ? window.location.pathname : "", o = "", a = [];
+  const y = {
+    ...x,
+    ...typeof l.queue == "object" ? l.queue : {}
+  }, g = () => `${P}_${o}`, E = (e) => {
+    const t = e;
+    if (!t || typeof t != "object" || Array.isArray(t))
+      return null;
+    if (typeof t.tabId != "string" || typeof t.timestamp != "number" || !Number.isFinite(t.timestamp) || !Array.isArray(t.events))
+      return n.warn("Invalid persisted queue: structural mismatch"), null;
+    const s = t.events.filter(
+      (r) => r && typeof r == "object" && "event_type" in r
+    );
+    return {
+      tabId: t.tabId,
+      timestamp: t.timestamp,
+      events: s
+    };
+  }, A = () => {
+    try {
+      const e = g(), t = d.getItem(e);
+      if (!t)
+        return n.debug("No persisted queue found"), null;
+      const s = JSON.parse(t), r = E(s);
+      if (!r)
+        return d.removeItem(e), null;
+      const u = Date.now() - r.timestamp;
+      return u > z ? (n.warn(
+        `Persisted events too old (${Math.round(u / 1e3 / 60 / 60)}h), discarding`
+      ), d.removeItem(e), null) : (n.info(
+        `Loaded ${r.events.length} persisted event(s) from storage (age: ${Math.round(u / 1e3)}s)`
+      ), r);
+    } catch (e) {
+      return n.error("Failed to load persisted queue", e), d.removeItem(g()), null;
+    }
+  }, h = () => {
+    if (a.length !== 0)
+      try {
+        const e = g(), t = {
+          tabId: o,
+          timestamp: Date.now(),
+          events: a
+        };
+        d.setItem(e, JSON.stringify(t)), n.debug(`Persisted ${a.length} event(s) to storage`);
+      } catch (e) {
+        e instanceof Error && e.name === "QuotaExceededError" ? n.warn("sessionStorage quota exceeded, continuing without persistence") : n.error("Failed to persist queue", e);
+      }
+  }, b = () => {
+    try {
+      const e = g();
+      d.removeItem(e), n.debug("Persisted queue cleared from storage");
+    } catch (e) {
+      n.error("Failed to clear persisted queue", e);
+    }
+  }, _ = async (e, t = !0) => {
+    if (e.length === 0)
+      return !0;
+    n.info(`Sending ${e.length} persisted event(s) immediately`);
+    const r = { context: D(l), events: e };
+    return w(r, l, t);
+  }, $ = (e, t) => {
+    if (!c) return;
+    n.debug(`Sending batch of ${e.length} event(s)`, {
       events: e,
-      keepalive: o
-    }), b({ context: n, events: e }, u, o);
-  }, l = () => {
-    !t || t.size() === 0 || !n || (i.info(`Flushing ${t.size()} events (page hidden/unload)`), o = !0, t.flush(!0));
-  }, c = () => {
-    if (i.debug("handleVisibilityChange", document.visibilityState), document.visibilityState === "hidden") {
-      if (d) {
-        i.debug("Skipping flush (SPA navigation detected)");
+      keepalive: f
+    }), w({ context: c, events: e }, l, f), a = a.filter(
+      (r) => !e.some((u) => u === r)
+    ), f || (a.length === 0 ? b() : h());
+  }, p = () => {
+    !i || i.size() === 0 || !c || (n.info(`Flushing ${i.size()} events (page hidden/unload)`), f = !0, i.flush(!0));
+  }, S = () => {
+    if (n.debug("handleVisibilityChange", document.visibilityState), document.visibilityState === "hidden") {
+      if (m) {
+        n.debug("Skipping flush (SPA navigation detected), persisting to storage"), h();
         return;
       }
-      l();
-    } else document.visibilityState === "visible" && (d = !1);
+      p();
+    } else document.visibilityState === "visible" && (m = !1);
   };
   return {
     /**
      * Initialize the queue with smart batching
      */
     initialize: () => {
-      t = m(
-        (e, s) => {
-          g(e);
+      if (typeof window < "u") {
+        const t = d.getItem(I);
+        if (t)
+          o = t, n.debug(`Reusing Tab ID: ${o}`);
+        else {
+          typeof crypto < "u" && typeof crypto.randomUUID == "function" ? o = crypto.randomUUID() : (o = U("tab"), n.debug("crypto.randomUUID not available, using fallback generator"));
+          try {
+            d.setItem(I, o);
+          } catch {
+          }
+          n.debug(`Generated new Tab ID: ${o}`);
+        }
+      }
+      const e = A();
+      e && e.events.length > 0 && _(e.events, !1).then((t) => {
+        t ? b() : n.warn(
+          "Failed to send persisted events, keeping in storage for next retry"
+        );
+      }), i = q(
+        (t, s) => {
+          $(t);
         },
         {
-          max: a.eventBatchSize,
-          interval: a.flushInterval,
+          max: y.eventBatchSize,
+          interval: y.flushInterval,
           throttle: !1
           // Always false - enables both batch size and interval triggers
         }
-      ), typeof window < "u" && typeof document < "u" && (document.addEventListener("visibilitychange", c), window.addEventListener("pagehide", l), v((e) => {
-        d = !0, f = e, i.debug(`SPA navigation detected (${f})`), setTimeout(() => {
-          d = !1;
+      ), typeof window < "u" && typeof document < "u" && (document.addEventListener("visibilitychange", S), window.addEventListener("pagehide", p), F((t) => {
+        m = !0, v = t, n.debug(`SPA navigation detected (${v})`), setTimeout(() => {
+          m = !1;
         }, 100);
       }));
     },
@@ -53,28 +129,33 @@ const L = (u) => {
      * - Sends immediately when eventBatchSize reached (with throttle: false)
      * - Sends pending events every flushInterval
      */
-    enqueue: (e, s) => {
-      if (n = s, !t) return;
-      const r = t.size() + 1, p = a.eventBatchSize, h = r >= p;
-      i.debug(
-        `Event added. Queue size: ${r}/${p}${h ? " (full, sending...)" : ""}`,
+    enqueue: (e, t) => {
+      if (c = t, !i) return;
+      a.push(e);
+      const s = i.size() + 1, r = y.eventBatchSize, u = s >= r;
+      n.debug(
+        `Event added. Queue size: ${s}/${r}${u ? " (full, sending...)" : ""}`,
         { eventType: e.event_type, event: e }
-      ), t.push(e);
+      ), i.push(e), h();
     },
     /**
      * Get queue size for debugging
      * Returns the number of events in smartQueue
      */
-    size: () => t?.size() ?? 0,
+    size: () => i?.size() ?? 0,
     /**
      * Clean up queue resources
      * Flushes remaining events and cleans up listeners
+     *
+     * IMPORTANT: Does NOT clear sessionStorage
+     * - Storage is cleared only after sendBatch succeeds or in initialize()
+     * - This allows events to persist across traditional page navigations
      */
     cleanup: () => {
-      l(), typeof window < "u" && typeof document < "u" && (document.removeEventListener("visibilitychange", c), window.removeEventListener("pagehide", l)), t = null, n = null, o = !1;
+      p(), typeof window < "u" && typeof document < "u" && (document.removeEventListener("visibilitychange", S), window.removeEventListener("pagehide", p)), i = null, c = null, f = !1, a = [];
     }
   };
 };
 export {
-  L as createAnalyticsQueue
+  R as createAnalyticsQueue
 };

package/lib/core/shared/utils/dot-analytics.utils.d.ts

@@ -50,6 +50,7 @@ export declare const generateSecureId: (prefix: string) => string;
 export declare const safeSessionStorage: {
     getItem: (key: string) => string | null;
     setItem: (key: string, value: string) => void;
+    removeItem: (key: string) => void;
 };
 /**
  * Gets or generates a user ID from localStorage.

package/lib/core/shared/utils/dot-analytics.utils.js

@@ -1,6 +1,6 @@
-import { ANALYTICS_JS_DEFAULT_PROPERTIES as _, SESSION_STORAGE_KEY as g, DEFAULT_SESSION_TIMEOUT_MINUTES as p, USER_ID_KEY as m, DEFAULT_IMPRESSION_MUTATION_OBSERVER_DEBOUNCE_MS as T, EXPECTED_UTM_KEYS as D, CONTENTLET_CLASS as h } from "../constants/dot-analytics.constants.js";
-import { DotLogger as E } from "../dot-analytics.logger.js";
-function $(t) {
+import { ANALYTICS_JS_DEFAULT_PROPERTIES as p, SESSION_STORAGE_KEY as g, DEFAULT_SESSION_TIMEOUT_MINUTES as T, USER_ID_KEY as f, DEFAULT_IMPRESSION_MUTATION_OBSERVER_DEBOUNCE_MS as I, EXPECTED_UTM_KEYS as D, CONTENTLET_CLASS as h } from "../constants/dot-analytics.constants.js";
+import { DotLogger as y } from "../dot-analytics.logger.js";
+function P(t) {
   const e = [];
   return t.siteAuth?.trim() || e.push('"siteAuth"'), t.server?.trim() || e.push('"server"'), e.length > 0 ? e : null;
 }
@@ -8,7 +8,7 @@ let d = null, u = null;
 const l = (t) => {
   const e = Date.now(), n = Math.random().toString(36).substr(2, 9), s = Math.random().toString(36).substr(2, 9);
   return `${t}_${e}_${n}${s}`;
-}, f = {
+}, w = {
   getItem: (t) => {
     try {
       return localStorage.getItem(t);
@@ -19,20 +19,49 @@ const l = (t) => {
   setItem: (t, e) => {
     try {
       localStorage.setItem(t, e);
+    } catch (n) {
+      throw console.warn(`DotCMS Analytics [Core]: Could not save ${t} to localStorage`), n;
+    }
+  }
+}, R = {
+  getItem: (t) => {
+    try {
+      return sessionStorage.getItem(t);
+    } catch {
+      return null;
+    }
+  },
+  setItem: (t, e) => {
+    try {
+      sessionStorage.setItem(t, e);
+    } catch (n) {
+      throw console.warn(`DotCMS Analytics [Core]: Could not save ${t} to sessionStorage`), n;
+    }
+  },
+  removeItem: (t) => {
+    try {
+      sessionStorage.removeItem(t);
     } catch {
-      console.warn(`DotCMS Analytics [Core]: Could not save ${t} to localStorage`);
+      console.warn(`DotCMS Analytics [Core]: Could not remove ${t} from sessionStorage`);
     }
   }
-}, I = () => {
-  let t = f.getItem(m);
-  return t || (t = l("user"), f.setItem(m, t)), t;
-}, y = (t) => {
+}, E = () => {
+  let t = w.getItem(f);
+  if (!t) {
+    t = l("user");
+    try {
+      w.setItem(f, t);
+    } catch {
+    }
+  }
+  return t;
+}, C = (t) => {
   const e = new Date(t), n = /* @__PURE__ */ new Date(), s = new Date(
     e.getUTCFullYear(),
     e.getUTCMonth(),
     e.getUTCDate()
-  ), r = new Date(n.getUTCFullYear(), n.getUTCMonth(), n.getUTCDate());
-  return s.getTime() !== r.getTime();
+  ), o = new Date(n.getUTCFullYear(), n.getUTCMonth(), n.getUTCDate());
+  return s.getTime() !== o.getTime();
 }, v = () => {
   const t = Date.now();
   if (typeof window > "u")
@@ -40,16 +69,16 @@ const l = (t) => {
   try {
     const e = sessionStorage.getItem(g);
     if (e) {
-      const { sessionId: r, startTime: o, lastActivity: a } = JSON.parse(e), i = !y(o), c = t - a < p * 60 * 1e3;
-      if (i && c)
+      const { sessionId: o, startTime: r, lastActivity: c } = JSON.parse(e), a = !C(r), i = t - c < T * 60 * 1e3;
+      if (a && i)
         return sessionStorage.setItem(
           g,
           JSON.stringify({
-            sessionId: r,
-            startTime: o,
+            sessionId: o,
+            startTime: r,
             lastActivity: t
           })
-        ), r;
+        ), o;
     }
     const n = l("session"), s = {
       sessionId: n,
@@ -60,58 +89,58 @@ const l = (t) => {
   } catch {
     return l("session_fallback");
   }
-}, P = (t) => {
-  const e = v(), n = I(), s = C();
+}, x = (t) => {
+  const e = v(), n = E(), s = A();
   return {
     site_auth: t.siteAuth,
     session_id: e,
     user_id: n,
     device: s
   };
-}, w = () => d || (d = {
+}, _ = () => d || (d = {
   user_language: navigator.language,
   doc_encoding: document.characterSet || document.charset,
   screen_resolution: typeof screen < "u" && screen.width && screen.height ? `${screen.width}x${screen.height}` : ""
-}, d), C = () => {
-  const t = w(), e = window.innerWidth || document.documentElement.clientWidth || 0, n = window.innerHeight || document.documentElement.clientHeight || 0;
+}, d), A = () => {
+  const t = _(), e = window.innerWidth || document.documentElement.clientWidth || 0, n = window.innerHeight || document.documentElement.clientHeight || 0;
   return {
     screen_resolution: t.screen_resolution ?? "",
     language: t.user_language ?? "",
     viewport_width: String(e),
     viewport_height: String(n)
   };
-}, A = (t) => {
+}, b = (t) => {
   const e = t.search;
   if (u && u.search === e)
     return u.params;
   const n = new URLSearchParams(e), s = {};
-  return D.forEach((r) => {
-    const o = n.get(r);
-    if (o) {
-      const a = r.replace("utm_", "");
-      s[a] = o;
+  return D.forEach((o) => {
+    const r = n.get(o);
+    if (r) {
+      const c = o.replace("utm_", "");
+      s[c] = r;
     }
   }), u = { search: e, params: s }, s;
 }, O = () => {
   try {
-    const t = (/* @__PURE__ */ new Date()).getTimezoneOffset(), e = t > 0 ? "-" : "+", n = Math.abs(t), s = Math.floor(n / 60), r = n % 60;
-    return `${e}${s.toString().padStart(2, "0")}:${r.toString().padStart(2, "0")}`;
+    const t = (/* @__PURE__ */ new Date()).getTimezoneOffset(), e = t > 0 ? "-" : "+", n = Math.abs(t), s = Math.floor(n / 60), o = n % 60;
+    return `${e}${s.toString().padStart(2, "0")}:${o.toString().padStart(2, "0")}`;
   } catch {
     return "+00:00";
   }
-}, N = () => {
+}, M = () => {
   try {
-    const t = /* @__PURE__ */ new Date(), e = O(), n = t.getFullYear(), s = (t.getMonth() + 1).toString().padStart(2, "0"), r = t.getDate().toString().padStart(2, "0"), o = t.getHours().toString().padStart(2, "0"), a = t.getMinutes().toString().padStart(2, "0"), i = t.getSeconds().toString().padStart(2, "0");
-    return `${n}-${s}-${r}T${o}:${a}:${i}${e}`;
+    const t = /* @__PURE__ */ new Date(), e = O(), n = t.getFullYear(), s = (t.getMonth() + 1).toString().padStart(2, "0"), o = t.getDate().toString().padStart(2, "0"), r = t.getHours().toString().padStart(2, "0"), c = t.getMinutes().toString().padStart(2, "0"), a = t.getSeconds().toString().padStart(2, "0");
+    return `${n}-${s}-${o}T${r}:${c}:${a}${e}`;
   } catch {
     return (/* @__PURE__ */ new Date()).toISOString();
   }
-}, R = (t, e = typeof window < "u" ? window.location : {}) => {
-  const n = N(), s = w(), { properties: r } = t, o = {};
-  Object.keys(r).forEach((c) => {
-    _.includes(c) || (o[c] = r[c]);
+}, Y = (t, e = typeof window < "u" ? window.location : {}) => {
+  const n = M(), s = _(), { properties: o } = t, r = {};
+  Object.keys(o).forEach((i) => {
+    p.includes(i) || (r[i] = o[i]);
   });
-  const a = {
+  const c = {
     url: e.href,
     doc_encoding: s.doc_encoding,
     doc_hash: e.hash,
@@ -119,28 +148,28 @@ const l = (t) => {
     doc_search: e.search,
     doc_host: e.hostname,
     doc_path: e.pathname,
-    title: r.title ?? document?.title
-  }, i = A(e);
+    title: o.title ?? document?.title
+  }, a = b(e);
   return {
     ...t,
-    page: a,
-    ...Object.keys(i).length > 0 && { utm: i },
+    page: c,
+    ...Object.keys(a).length > 0 && { utm: a },
     // Only include custom if there are user-provided properties
-    ...Object.keys(o).length > 0 && { custom: o },
+    ...Object.keys(r).length > 0 && { custom: r },
     local_time: n
   };
 };
-function b(t, e) {
+function L(t, e) {
   let n = 0;
   return (...s) => {
-    const r = Date.now();
-    r - n >= e && (t(...s), n = r);
+    const o = Date.now();
+    o - n >= e && (t(...s), n = o);
   };
 }
-function x(t) {
+function B(t) {
   return t.dataset.dotIdentifier || null;
 }
-function Y(t) {
+function F(t) {
   return {
     identifier: t.dataset.dotIdentifier || "",
     inode: t.dataset.dotInode || "",
@@ -149,51 +178,59 @@ function Y(t) {
     baseType: t.dataset.dotBasetype || ""
   };
 }
-const B = 100, M = () => typeof window < "u" && typeof document < "u", F = () => Array.from(document.querySelectorAll(`.${h}`)), k = (t, e = T) => {
-  const n = b(t, e), s = new MutationObserver((r) => {
+const z = 100, N = () => typeof window < "u" && typeof document < "u", H = () => Array.from(document.querySelectorAll(`.${h}`)), J = (t, e = I) => {
+  const n = L(t, e), s = new MutationObserver((r) => {
     r.some((a) => a.addedNodes.length === 0 && a.removedNodes.length === 0 ? !1 : [
       ...Array.from(a.addedNodes),
       ...Array.from(a.removedNodes)
-    ].some((c) => {
-      if (c.nodeType !== Node.ELEMENT_NODE)
+    ].some((m) => {
+      if (m.nodeType !== Node.ELEMENT_NODE)
         return !1;
-      const S = c;
+      const S = m;
       return S.classList?.contains(h) ? !0 : S.querySelector?.(`.${h}`) !== null;
     })) && n();
-  });
-  return s.observe(document.body, {
+  }), o = document.body || document.documentElement;
+  return o ? s.observe(o, {
     childList: !0,
     subtree: !0,
     attributes: !1,
     characterData: !1
+  }) : window.addEventListener("DOMContentLoaded", () => {
+    document.body && s.observe(document.body, {
+      childList: !0,
+      subtree: !0,
+      attributes: !1,
+      characterData: !1
+    });
   }), s;
-}, z = (t) => {
-  M() && (window.addEventListener("beforeunload", t), window.addEventListener("pagehide", t));
-}, H = (t, e) => {
+}, K = (t) => {
+  N() && (window.addEventListener("beforeunload", t), window.addEventListener("pagehide", t));
+}, j = (t, e) => {
   const n = e.logLevel ?? (e.debug ? "debug" : "warn");
-  return new E("Analytics", t, n);
-}, J = (t, e, n) => [
+  return new y("Analytics", t, n);
+}, W = (t, e, n) => [
   t.impressions && e(t),
   t.clicks && n(t)
 ].filter(Boolean);
 export {
-  B as INITIAL_SCAN_DELAY_MS,
-  k as createContentletObserver,
-  H as createPluginLogger,
-  b as createThrottle,
-  R as enrichPagePayloadOptimized,
-  Y as extractContentletData,
-  x as extractContentletIdentifier,
-  A as extractUTMParameters,
-  F as findContentlets,
+  z as INITIAL_SCAN_DELAY_MS,
+  J as createContentletObserver,
+  j as createPluginLogger,
+  L as createThrottle,
+  Y as enrichPagePayloadOptimized,
+  F as extractContentletData,
+  B as extractContentletIdentifier,
+  b as extractUTMParameters,
+  H as findContentlets,
   l as generateSecureId,
-  P as getAnalyticsContext,
-  C as getDeviceDataForContext,
-  J as getEnhancedTrackingPlugins,
-  N as getLocalTime,
+  x as getAnalyticsContext,
+  A as getDeviceDataForContext,
+  W as getEnhancedTrackingPlugins,
+  M as getLocalTime,
   v as getSessionId,
-  I as getUserId,
-  M as isBrowser,
-  z as setupPluginCleanup,
-  $ as validateAnalyticsConfig
+  E as getUserId,
+  N as isBrowser,
+  R as safeSessionStorage,
+  K as setupPluginCleanup,
+  P as validateAnalyticsConfig
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dotcms/analytics",
-  "version": "1.2.3-next.3",
+  "version": "1.2.3-next.4",
   "description": "Official JavaScript library for Content Analytics with DotCMS.",
   "repository": {
     "type": "git",