onerway-analytics 1.0.2 → 1.1.0

package/dist/bundle/index.js

@@ -24,7 +24,7 @@ var OnrwayAnalytics = (() => {
     API_KEY_MAP: () => API_KEY_MAP,
     Analytics: () => Analytics,
     DEFAULT_CONFIG: () => DEFAULT_CONFIG,
-    GAManager: () => GAManager,
+    GTMManager: () => GTMManager,
     SDK_VERSION: () => SDK_VERSION,
     STORAGE_KEYS: () => STORAGE_KEYS,
     Sender: () => Sender,
@@ -454,16 +454,17 @@ var OnrwayAnalytics = (() => {
   function collectMarketing() {
     if (!isBrowser()) return {};
     let utm = {};
-    const storedUtm = safeLocalStorageGet(STORAGE_KEYS.UTM_PARAMS);
-    if (storedUtm) {
-      try {
-        utm = JSON.parse(storedUtm);
-      } catch {
-      }
+    const freshUtm = parseUTMParams();
+    if (Object.keys(freshUtm).length > 0) {
+      utm = freshUtm;
+      safeLocalStorageSet(STORAGE_KEYS.UTM_PARAMS, JSON.stringify(utm));
     } else {
-      utm = parseUTMParams();
-      if (Object.keys(utm).length > 0) {
-        safeLocalStorageSet(STORAGE_KEYS.UTM_PARAMS, JSON.stringify(utm));
+      const storedUtm = safeLocalStorageGet(STORAGE_KEYS.UTM_PARAMS);
+      if (storedUtm) {
+        try {
+          utm = JSON.parse(storedUtm);
+        } catch {
+        }
       }
     }
     let landingPage = safeLocalStorageGet(STORAGE_KEYS.LANDING_PAGE);
@@ -643,34 +644,41 @@ var OnrwayAnalytics = (() => {
     });
   }
 
-  // src/core/ga-loader.ts
-  function loadGtagScript(measurementId) {
-    return new Promise((resolve, reject) => {
-      if (document.querySelector(`script[src*="googletagmanager.com/gtag/js"]`)) {
-        resolve();
-        return;
-      }
+  // src/core/gtm-loader.ts
+  function initGTM(config) {
+    if (!config.enabled || !config.containerId) return;
+    if (typeof window === "undefined") return;
+    const dataLayerName = config.dataLayerName || "dataLayer";
+    const w2 = window;
+    if (!Array.isArray(w2[dataLayerName])) {
+      w2[dataLayerName] = [];
+    }
+    w2[dataLayerName].push({ "gtm.start": (/* @__PURE__ */ new Date()).getTime(), event: "gtm.js" });
+    const existingScript = document.querySelector(
+      `script[src*="googletagmanager.com/gtm.js?id=${config.containerId}"]`
+    );
+    if (!existingScript) {
+      const dl = dataLayerName !== "dataLayer" ? `&l=${encodeURIComponent(dataLayerName)}` : "";
       const script = document.createElement("script");
       script.async = true;
-      script.src = `https://www.googletagmanager.com/gtag/js?id=${measurementId}`;
-      script.onload = () => resolve();
-      script.onerror = () => reject(new Error("Failed to load gtag.js"));
-      document.head.appendChild(script);
-    });
-  }
-  async function initGA(config) {
-    if (!config.enabled || !config.measurementId) return;
-    if (typeof window === "undefined") return;
-    window.dataLayer = window.dataLayer || [];
-    window.gtag = function gtag() {
-      window.dataLayer.push(arguments);
-    };
-    window.gtag("js", /* @__PURE__ */ new Date());
-    window.gtag("config", config.measurementId, {
-      send_page_view: config.sendPageView ?? false,
-      debug_mode: config.debugMode ?? false
-    });
-    await loadGtagScript(config.measurementId);
+      script.src = `https://www.googletagmanager.com/gtm.js?id=${config.containerId}${dl}`;
+      const firstScript = document.getElementsByTagName("script")[0];
+      firstScript.parentNode?.insertBefore(script, firstScript);
+    }
+    if (!document.querySelector(`noscript[data-gtm-id="${config.containerId}"]`)) {
+      const noscript = document.createElement("noscript");
+      noscript.setAttribute("data-gtm-id", config.containerId);
+      const iframe = document.createElement("iframe");
+      iframe.src = `https://www.googletagmanager.com/ns.html?id=${config.containerId}`;
+      iframe.height = "0";
+      iframe.width = "0";
+      iframe.style.display = "none";
+      iframe.style.visibility = "hidden";
+      noscript.appendChild(iframe);
+      if (document.body) {
+        document.body.insertBefore(noscript, document.body.firstChild);
+      }
+    }
   }
 
   // node_modules/web-vitals/dist/web-vitals.js
@@ -949,88 +957,43 @@ var OnrwayAnalytics = (() => {
     }
   }
 
-  // src/core/ga-adapter.ts
-  function trackToGA(eventName, properties, options) {
-    if (typeof window === "undefined" || !window.gtag) return;
-    const params = {
-      session_id: options.sessionId,
-      engagement_time_msec: 100,
-      page_location: options.pageUrl,
-      page_referrer: options.referrer
-    };
-    const { marketing, userId } = options;
-    if (marketing.utm_source) params.utm_source = marketing.utm_source;
-    if (marketing.utm_medium) params.utm_medium = marketing.utm_medium;
-    if (marketing.utm_campaign) params.utm_campaign = marketing.utm_campaign;
-    if (marketing.utm_term) params.utm_term = marketing.utm_term;
-    if (marketing.utm_content) params.utm_content = marketing.utm_content;
-    if (userId) params.user_id = userId;
-    Object.assign(params, properties);
-    window.gtag("event", eventName, params);
-  }
-  function setGAUserId(userId) {
-    if (typeof window === "undefined" || !window.gtag) return;
-    window.gtag("set", { user_id: userId ?? void 0 });
-  }
-  function setGAUserProperties(properties) {
-    if (typeof window === "undefined" || !window.gtag) return;
-    window.gtag("set", "user_properties", properties);
-  }
-
-  // src/core/ga-manager.ts
-  var GAManager = class {
+  // src/core/gtm-manager.ts
+  var GTMManager = class {
     constructor() {
       this._initialized = false;
+      this._dataLayerName = "dataLayer";
     }
     get ready() {
-      return this._initialized && typeof window !== "undefined" && typeof window.gtag === "function";
-    }
-    get measurementId() {
-      return this._measurementId;
-    }
-    track(eventName, properties) {
-      if (!this.ready) return;
-      window.gtag("event", eventName, properties ?? {});
-    }
-    setUserId(userId) {
-      if (!this.ready) return;
-      window.gtag("set", { user_id: userId ?? void 0 });
+      return this._initialized && typeof window !== "undefined";
     }
-    setUserProperties(properties) {
-      if (!this.ready) return;
-      window.gtag("set", "user_properties", properties);
+    get containerId() {
+      return this._containerId;
     }
-    set(keyOrParams, value) {
+    push(data) {
       if (!this.ready) return;
-      if (typeof keyOrParams === "string") {
-        window.gtag("set", keyOrParams, value);
-      } else {
-        window.gtag("set", keyOrParams);
+      const w2 = window;
+      const dl = w2[this._dataLayerName];
+      if (Array.isArray(dl)) {
+        dl.push(data);
       }
     }
-    config(params) {
-      if (!this.ready || !this._measurementId) return;
-      window.gtag("config", this._measurementId, params ?? {});
-    }
-    consent(mode, params) {
-      if (!this.ready) return;
-      window.gtag("consent", mode, params);
+    track(eventName, properties) {
+      this.push({ event: eventName, ...properties || {} });
     }
-    get(key, callback) {
-      if (!this.ready || !this._measurementId) return;
-      window.gtag("get", this._measurementId, key, callback);
+    setUserId(userId) {
+      this.push({ userId: userId ?? void 0 });
     }
-    gtag(...args) {
-      if (typeof window === "undefined" || !window.gtag) return;
-      window.gtag(...args);
+    setUserProperties(properties) {
+      this.push(properties);
     }
-    _init(measurementId) {
-      this._measurementId = measurementId;
+    _init(containerId, dataLayerName = "dataLayer") {
+      this._containerId = containerId;
+      this._dataLayerName = dataLayerName;
       this._initialized = true;
     }
     _destroy() {
       this._initialized = false;
-      this._measurementId = void 0;
+      this._containerId = void 0;
     }
   };
 
@@ -1044,11 +1007,8 @@ var OnrwayAnalytics = (() => {
       this.userProps = {};
       this.initialized = false;
       this.retrying = 0;
-      this.gaInitialized = false;
-      this.gaPendingQueue = [];
-      this.gaPendingIdentify = null;
       this.unloadHandler = null;
-      this.ga = new GAManager();
+      this.gtm = new GTMManager();
       this.config = {
         debug: false,
         autoTrack: true,
@@ -1064,6 +1024,7 @@ var OnrwayAnalytics = (() => {
       this.clientType = DEFAULT_CONFIG.clientType;
       this.batchPageId = this.generateBatchPageId();
       this.sessionManager = new SessionManager(this.config.sessionTimeout);
+      this.sampled = this.resolveSampling();
       if (isBrowser()) {
         this.recoverFailedEvents();
       }
@@ -1077,28 +1038,10 @@ var OnrwayAnalytics = (() => {
       if (isBrowser() && this.config.performance?.enabled !== false) {
         initPerformanceMonitor(this, this.config.performance);
       }
-      if (isBrowser() && this.config.ga?.enabled) {
-        this.ga._init(this.config.ga.measurementId);
-        initGA(this.config.ga).then(() => {
-          this.gaInitialized = true;
-          this.log("GA4 initialized with measurementId:", this.config.ga?.measurementId);
-          if (this.gaPendingIdentify) {
-            setGAUserId(this.gaPendingIdentify.userId);
-            if (this.gaPendingIdentify.attributes) {
-              setGAUserProperties(this.gaPendingIdentify.attributes);
-            }
-            this.gaPendingIdentify = null;
-          }
-          for (const { eventName, properties, options } of this.gaPendingQueue) {
-            trackToGA(eventName, properties, options);
-          }
-          this.gaPendingQueue = [];
-        }).catch((error) => {
-          this.ga._destroy();
-          this.gaPendingIdentify = null;
-          this.gaPendingQueue = [];
-          this.log("Failed to initialize GA4:", error);
-        });
+      if (isBrowser() && this.config.gtm?.enabled) {
+        initGTM(this.config.gtm);
+        this.gtm._init(this.config.gtm.containerId, this.config.gtm.dataLayerName);
+        this.log("GTM initialized with containerId:", this.config.gtm.containerId);
       }
       this.initialized = true;
       this.log("Analytics SDK initialized", {
@@ -1106,7 +1049,7 @@ var OnrwayAnalytics = (() => {
         clientId: this.clientId,
         sessionId: this.sessionManager.getSessionId()
       });
-      if (isBrowser()) {
+      if (isBrowser() && this.config.autoTrackPageView !== false) {
         this.trackPageView();
       }
     }
@@ -1115,21 +1058,16 @@ var OnrwayAnalytics = (() => {
         this.log("Invalid event name");
         return;
       }
+      if (!this.sampled) return;
       const normalizedProps = properties && isObject(properties) ? properties : {};
       const isKeyEvent = options?.keyEvent === true || this.isKeyEvent(eventName);
-      if (this.config.ga?.enabled) {
-        const gaOptions = {
-          sessionId: this.sessionManager.getSessionId(),
-          pageUrl: isBrowser() ? getPageUrl() : "",
-          referrer: isBrowser() ? document.referrer : "",
-          marketing: collectMarketing(),
-          userId: this.userId
-        };
-        if (this.gaInitialized) {
-          trackToGA(eventName, normalizedProps, gaOptions);
-        } else {
-          this.gaPendingQueue.push({ eventName, properties: normalizedProps, options: gaOptions });
-        }
+      if (this.gtm.ready) {
+        this.gtm.track(eventName, {
+          ...normalizedProps,
+          session_id: this.sessionManager.getSessionId(),
+          page_url: isBrowser() ? getPageUrl() : "",
+          referrer: isBrowser() ? document.referrer : ""
+        });
       }
       if (this.config.disableServer) return;
       const event = {
@@ -1158,13 +1096,11 @@ var OnrwayAnalytics = (() => {
       if (attributes && isObject(attributes)) {
         this.userProps = attributes;
       }
-      if (this.gaInitialized) {
-        setGAUserId(userId);
+      if (this.gtm.ready) {
+        this.gtm.setUserId(userId);
         if (attributes && isObject(attributes)) {
-          setGAUserProperties(attributes);
+          this.gtm.setUserProperties(attributes);
         }
-      } else if (this.config.ga?.enabled) {
-        this.gaPendingIdentify = { userId, attributes };
       }
       this.log("User identified:", { userId, attributes });
       if (wasAnonymous && this.buffer.length > 0) {
@@ -1185,8 +1121,8 @@ var OnrwayAnalytics = (() => {
         clearTimeout(this.bufferTimer);
         this.bufferTimer = null;
       }
-      if (this.gaInitialized) {
-        setGAUserId(null);
+      if (this.gtm.ready) {
+        this.gtm.setUserId(null);
       }
       this.log("Analytics reset");
     }
@@ -1211,6 +1147,14 @@ var OnrwayAnalytics = (() => {
         console.log("[Analytics]", ...args);
       }
     }
+    resolveSampling() {
+      const rate = this.config.sampleRate ?? 1;
+      if (rate >= 1) return true;
+      if (rate <= 0) return false;
+      const decision = Math.random() < rate;
+      this.log(`Sampling decision: ${decision ? "included" : "excluded"} (sampleRate=${rate})`);
+      return decision;
+    }
     getOrCreateClientId() {
       if (!isBrowser()) return generateUUID();
       let clientId = safeLocalStorageGet(STORAGE_KEYS.CLIENT_ID);
@@ -1252,8 +1196,9 @@ var OnrwayAnalytics = (() => {
       const merged = {};
       for (const key of Object.keys(defaults)) {
         const k2 = key;
-        if (defaults[k2] !== void 0) {
-          merged[k2] = defaults[k2];
+        const val = defaults[k2];
+        if (val !== void 0 && val !== "") {
+          merged[k2] = val;
         }
       }
       for (const key of Object.keys(properties)) {
@@ -1338,6 +1283,7 @@ var OnrwayAnalytics = (() => {
     }
     recoverFailedEvents() {
       if (this.config.disableServer) return;
+      if (!this.sampled) return;
       const failedEvents = StorageQueue.recover();
       if (failedEvents.length > 0) {
         this.log(`Recovered ${failedEvents.length} failed events from storage`);