rozmova-analytics 1.1.10 → 1.1.12

package/dist/helpers.d.ts

@@ -8,6 +8,7 @@ export declare function detectOS(): "Windows" | "macOS" | "Linux" | "Android" |
 export declare const getDomain: () => string;
 export declare const getReferrer: () => string | null;
 export declare function getSearchQueryFromReferrer(): string | null;
-export declare const getGAClientId: () => string;
+export declare const getClientIdFromCookies: () => string;
+export declare const getGAClientId: () => Promise<string>;
 export declare function getGASessionId(): string | null;
 export declare const getLocaleFromURL: (isClearly?: boolean) => string;

package/dist/index.d.ts

@@ -14,15 +14,16 @@ declare class Analytics {
         ga?: boolean;
         mixpanel?: boolean;
         customerIO?: boolean;
-    }): void;
+    }): Promise<void>;
     setUser(userId: string, userParams: {
         email: string;
         name: string;
         numberOfSessions: number;
         locale: string;
         phone?: string;
+        isB2B?: boolean;
     }): void;
-    getCommonParams(): AnalyticsCommonParams;
+    getCommonParams(): Promise<AnalyticsCommonParams>;
     setLocale(newLocale: string): void;
     resetUser(): void;
     getUserId: () => string;

package/dist/index.esm.js

@@ -12123,13 +12123,39 @@ function getSearchQueryFromReferrer() {
     // If no match with search engines, return null
     return null;
 }
-const getGAClientId = () => {
+const getClientIdFromCookies = () => {
     const clientId = api.get("_ga");
     if (!clientId)
         return "";
     const splitedClientId = clientId.split(".");
     return splitedClientId[2] + "." + splitedClientId[3];
 };
+const getGAClientId = () => {
+    return new Promise((resolve) => {
+        if (typeof gtag !== "undefined") {
+            try {
+                gtag("get", GOOGLE_ANALYTICS_ID, "client_id", function (clientId) {
+                    if (clientId) {
+                        resolve(clientId);
+                    }
+                    else {
+                        resolve(getClientIdFromCookies());
+                    }
+                });
+                setTimeout(() => {
+                    resolve(getClientIdFromCookies());
+                }, 1000);
+            }
+            catch (error) {
+                console.warn("Error getting client ID from gtag:", error);
+                resolve(getClientIdFromCookies());
+            }
+        }
+        else {
+            resolve(getClientIdFromCookies());
+        }
+    });
+};
 function getGASessionId() {
     const cookieValue = api.get("_ga_GYQLL028VQ");
     if (!cookieValue)
@@ -12539,7 +12565,7 @@ class Analytics {
     setUserTag(key, value) {
         Clarity.setTag(key, value);
     }
-    trackEvent(eventName, properties, services = {
+    async trackEvent(eventName, properties, services = {
         ga: true,
         mixpanel: true,
         customerIO: true,
@@ -12548,7 +12574,7 @@ class Analytics {
             this.dataLayer.push({ eventName, eventParams: properties });
             return;
         }
-        const commonParams = this.getCommonParams();
+        const commonParams = await this.getCommonParams();
         const allParams = { ...commonParams, ...properties };
         // Mixpanel
         if (services.mixpanel) {
@@ -12597,10 +12623,10 @@ class Analytics {
             console.warn("Analytics is not initialized.");
             return;
         }
-        const { email, name, phone } = userParams;
+        const { email, name, phone, isB2B } = userParams;
         // Mixpanel user
         mixpanel.identify(userId);
-        mixpanel.people.set({ $email: email, name, phone });
+        mixpanel.people.set({ $email: email, name, phone, isB2B });
         // GA user
         gtag("config", GOOGLE_ANALYTICS_ID, {
             user_properties: this.getCommonParams(),
@@ -12614,14 +12640,15 @@ class Analytics {
         // login event
         this.trackEvent("login", { logged: "yes", uid: userId });
     }
-    getCommonParams() {
+    async getCommonParams() {
         const persistedParams = getCurrentParams();
+        const user_pseudo_id = await getGAClientId();
         return {
             ...persistedParams,
             fbc: api.get("_fbc"),
             fbp: api.get("_fbp"),
             session_id: getGASessionId(),
-            user_pseudo_id: getGAClientId(),
+            user_pseudo_id,
             rid: getUserId(),
             funnel_name: api.get("funnel_name"),
             language: getBrowserLanguage(),

package/dist/index.js

@@ -12125,13 +12125,39 @@ function getSearchQueryFromReferrer() {
     // If no match with search engines, return null
     return null;
 }
-const getGAClientId = () => {
+const getClientIdFromCookies = () => {
     const clientId = api.get("_ga");
     if (!clientId)
         return "";
     const splitedClientId = clientId.split(".");
     return splitedClientId[2] + "." + splitedClientId[3];
 };
+const getGAClientId = () => {
+    return new Promise((resolve) => {
+        if (typeof gtag !== "undefined") {
+            try {
+                gtag("get", GOOGLE_ANALYTICS_ID, "client_id", function (clientId) {
+                    if (clientId) {
+                        resolve(clientId);
+                    }
+                    else {
+                        resolve(getClientIdFromCookies());
+                    }
+                });
+                setTimeout(() => {
+                    resolve(getClientIdFromCookies());
+                }, 1000);
+            }
+            catch (error) {
+                console.warn("Error getting client ID from gtag:", error);
+                resolve(getClientIdFromCookies());
+            }
+        }
+        else {
+            resolve(getClientIdFromCookies());
+        }
+    });
+};
 function getGASessionId() {
     const cookieValue = api.get("_ga_GYQLL028VQ");
     if (!cookieValue)
@@ -12541,7 +12567,7 @@ class Analytics {
     setUserTag(key, value) {
         Clarity.setTag(key, value);
     }
-    trackEvent(eventName, properties, services = {
+    async trackEvent(eventName, properties, services = {
         ga: true,
         mixpanel: true,
         customerIO: true,
@@ -12550,7 +12576,7 @@ class Analytics {
             this.dataLayer.push({ eventName, eventParams: properties });
             return;
         }
-        const commonParams = this.getCommonParams();
+        const commonParams = await this.getCommonParams();
         const allParams = { ...commonParams, ...properties };
         // Mixpanel
         if (services.mixpanel) {
@@ -12599,10 +12625,10 @@ class Analytics {
             console.warn("Analytics is not initialized.");
             return;
         }
-        const { email, name, phone } = userParams;
+        const { email, name, phone, isB2B } = userParams;
         // Mixpanel user
         mixpanel.identify(userId);
-        mixpanel.people.set({ $email: email, name, phone });
+        mixpanel.people.set({ $email: email, name, phone, isB2B });
         // GA user
         gtag("config", GOOGLE_ANALYTICS_ID, {
             user_properties: this.getCommonParams(),
@@ -12616,14 +12642,15 @@ class Analytics {
         // login event
         this.trackEvent("login", { logged: "yes", uid: userId });
     }
-    getCommonParams() {
+    async getCommonParams() {
         const persistedParams = getCurrentParams();
+        const user_pseudo_id = await getGAClientId();
         return {
             ...persistedParams,
             fbc: api.get("_fbc"),
             fbp: api.get("_fbp"),
             session_id: getGASessionId(),
-            user_pseudo_id: getGAClientId(),
+            user_pseudo_id,
             rid: getUserId(),
             funnel_name: api.get("funnel_name"),
             language: getBrowserLanguage(),