@callforge/tracking-client 0.1.0 → 0.3.0

package/dist/index.d.mts

@@ -77,6 +77,10 @@ declare class CallForge {
     private readonly cache;
     private sessionPromise;
     private customParams;
+    private ga4PollInterval;
+    private ga4PollTimeout;
+    private sessionId;
+    private sessionCreated;
     private constructor();
     /**
      * Initialize the CallForge tracking client.
@@ -94,9 +98,22 @@ declare class CallForge {
     onReady(callback: ReadyCallback): void;
     /**
      * Set custom tracking parameters.
-     * Merges with existing params (new values override).
+     * If session already exists, sends PATCH to update.
+     * Otherwise queues params for next session request.
      */
-    setParams(params: Record<string, string>): void;
+    setParams(params: Record<string, string>): Promise<void>;
+    /**
+     * Get the currently queued custom params.
+     */
+    getQueuedParams(): TrackingParams;
+    private patchSession;
+    /**
+     * Start polling for the GA4 _ga cookie.
+     * If found immediately, calls setParams right away.
+     * Otherwise polls every 500ms for up to 10 seconds.
+     */
+    startGA4CookiePolling(): void;
+    private stopGA4CookiePolling;
     private fetchSession;
     private getLocationId;
     private getAutoParams;

package/dist/index.d.ts

@@ -77,6 +77,10 @@ declare class CallForge {
     private readonly cache;
     private sessionPromise;
     private customParams;
+    private ga4PollInterval;
+    private ga4PollTimeout;
+    private sessionId;
+    private sessionCreated;
     private constructor();
     /**
      * Initialize the CallForge tracking client.
@@ -94,9 +98,22 @@ declare class CallForge {
     onReady(callback: ReadyCallback): void;
     /**
      * Set custom tracking parameters.
-     * Merges with existing params (new values override).
+     * If session already exists, sends PATCH to update.
+     * Otherwise queues params for next session request.
      */
-    setParams(params: Record<string, string>): void;
+    setParams(params: Record<string, string>): Promise<void>;
+    /**
+     * Get the currently queued custom params.
+     */
+    getQueuedParams(): TrackingParams;
+    private patchSession;
+    /**
+     * Start polling for the GA4 _ga cookie.
+     * If found immediately, calls setParams right away.
+     * Otherwise polls every 500ms for up to 10 seconds.
+     */
+    startGA4CookiePolling(): void;
+    private stopGA4CookiePolling;
     private fetchSession;
     private getLocationId;
     private getAutoParams;

package/dist/index.js

@@ -129,17 +129,27 @@ var TrackingCache = class {
 
 // src/client.ts
 var DEFAULT_ENDPOINT = "https://tracking.callforge.io";
+function getGA4ClientId() {
+  if (typeof document === "undefined") return null;
+  const match = document.cookie.match(/_ga=GA\d+\.\d+\.(.+?)(?:;|$)/);
+  return match ? match[1] : null;
+}
 var FETCH_TIMEOUT_MS = 1e4;
 var AUTO_PARAMS = ["gclid", "gbraid", "wbraid", "msclkid", "fbclid"];
 var CallForge = class _CallForge {
   constructor(config) {
     this.sessionPromise = null;
     this.customParams = {};
+    this.ga4PollInterval = null;
+    this.ga4PollTimeout = null;
+    this.sessionId = null;
+    this.sessionCreated = false;
     this.config = {
       categoryId: config.categoryId,
       endpoint: config.endpoint || DEFAULT_ENDPOINT
     };
     this.cache = new TrackingCache(config.categoryId);
+    this.startGA4CookiePolling();
   }
   /**
    * Initialize the CallForge tracking client.
@@ -168,34 +178,103 @@ var CallForge = class _CallForge {
   }
   /**
    * Set custom tracking parameters.
-   * Merges with existing params (new values override).
+   * If session already exists, sends PATCH to update.
+   * Otherwise queues params for next session request.
    */
-  setParams(params) {
+  async setParams(params) {
     this.customParams = __spreadValues(__spreadValues({}, this.customParams), params);
+    if (this.sessionCreated && this.sessionId) {
+      await this.patchSession(params);
+    }
+  }
+  /**
+   * Get the currently queued custom params.
+   */
+  getQueuedParams() {
+    return __spreadValues({}, this.customParams);
+  }
+  async patchSession(params) {
+    try {
+      const response = await fetch(
+        `${this.config.endpoint}/v1/tracking/session/${this.sessionId}`,
+        {
+          method: "PATCH",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify(params)
+        }
+      );
+      if (!response.ok) {
+        console.warn("[CallForge] Failed to patch session:", response.status);
+      }
+    } catch (error) {
+      console.warn("[CallForge] Failed to patch session:", error);
+    }
+  }
+  /**
+   * Start polling for the GA4 _ga cookie.
+   * If found immediately, calls setParams right away.
+   * Otherwise polls every 500ms for up to 10 seconds.
+   */
+  startGA4CookiePolling() {
+    if (this.ga4PollInterval !== null || this.ga4PollTimeout !== null) {
+      return;
+    }
+    const clientId = getGA4ClientId();
+    if (clientId) {
+      this.setParams({ ga4ClientId: clientId });
+      return;
+    }
+    this.ga4PollInterval = setInterval(() => {
+      const clientId2 = getGA4ClientId();
+      if (clientId2) {
+        this.setParams({ ga4ClientId: clientId2 });
+        this.stopGA4CookiePolling();
+      }
+    }, 500);
+    this.ga4PollTimeout = setTimeout(() => {
+      this.stopGA4CookiePolling();
+    }, 1e4);
+  }
+  stopGA4CookiePolling() {
+    if (this.ga4PollInterval) {
+      clearInterval(this.ga4PollInterval);
+      this.ga4PollInterval = null;
+    }
+    if (this.ga4PollTimeout) {
+      clearTimeout(this.ga4PollTimeout);
+      this.ga4PollTimeout = null;
+    }
   }
   async fetchSession() {
     const locationId = this.getLocationId();
-    if (!locationId) {
-      return { sessionId: null, phoneNumber: null, location: null };
-    }
-    const cached = this.cache.get(locationId);
-    if (cached) {
-      return this.formatSession(cached);
+    if (locationId) {
+      const cached = this.cache.get(locationId);
+      if (cached) {
+        this.sessionId = cached.sessionId;
+        this.sessionCreated = true;
+        return this.formatSession(cached);
+      }
     }
     const autoParams = this.getAutoParams();
     const cachedParams = this.cache.getParams();
     const params = __spreadValues(__spreadValues(__spreadValues({}, autoParams), cachedParams), this.customParams);
-    if (typeof window !== "undefined" && window.__cfTracking) {
+    if (locationId && typeof window !== "undefined" && window.__cfTracking) {
       try {
         const data2 = await window.__cfTracking;
         this.saveToCache(locationId, data2, params);
+        this.sessionId = data2.sessionId;
+        this.sessionCreated = true;
         return this.formatApiResponse(data2);
       } catch (e) {
       }
     }
-    const sessionId = this.cache.getSessionId(locationId);
-    const data = await this.fetchFromApi(locationId, sessionId, params);
-    this.saveToCache(locationId, data, params);
+    const cachedSessionId = locationId ? this.cache.getSessionId(locationId) : null;
+    const data = await this.fetchFromApi(locationId, cachedSessionId, params);
+    if (locationId) {
+      this.saveToCache(locationId, data, params);
+    }
+    this.sessionId = data.sessionId;
+    this.sessionCreated = true;
     return this.formatApiResponse(data);
   }
   getLocationId() {
@@ -260,9 +339,11 @@ var CallForge = class _CallForge {
   buildUrl(locationId, sessionId, params) {
     const { categoryId, endpoint } = this.config;
     const queryParams = {
-      categoryId,
-      loc_physical_ms: locationId
+      categoryId
     };
+    if (locationId) {
+      queryParams.loc_physical_ms = locationId;
+    }
     if (sessionId) {
       queryParams.sessionId = sessionId;
     }
@@ -298,23 +379,24 @@ function getPreloadSnippet(config) {
   const script = `(function(){
 var u=new URLSearchParams(location.search);
 var loc=u.get('loc_physical_ms');
-if(!loc)return;
 var ap=['gclid','gbraid','wbraid','msclkid','fbclid'];
 var p={};
 for(var i=0;i<ap.length;i++){var v=u.get(ap[i]);if(v)p[ap[i]]=v}
 var key='${cacheKey}';
-try{
+var sid=null;
+if(loc){try{
 var c=JSON.parse(localStorage.getItem(key));
 if(c&&c.locId===loc&&c.expiresAt>Date.now()+30000){c.params=Object.assign({},c.params,p);window.__cfTracking=Promise.resolve(c);return}
-var sid=(c&&c.locId===loc)?c.sessionId:null;
+sid=(c&&c.locId===loc)?c.sessionId:null;
 var cp=c&&c.params||{};
 p=Object.assign({},p,cp);
-}catch(e){}
-var url='${endpoint}/v1/tracking/session?categoryId=${categoryId}&loc_physical_ms='+loc;
+}catch(e){}}
+var url='${endpoint}/v1/tracking/session?categoryId=${categoryId}';
+if(loc)url+='&loc_physical_ms='+loc;
 if(sid)url+='&sessionId='+sid;
 var ks=Object.keys(p).sort();
 for(var j=0;j<ks.length;j++)url+='&'+ks[j]+'='+encodeURIComponent(p[ks[j]]);
-window.__cfTracking=fetch(url,{credentials:'omit'}).then(function(r){return r.json()}).then(function(d){d.params=p;try{localStorage.setItem(key,JSON.stringify({locId:loc,sessionId:d.sessionId,phoneNumber:d.phoneNumber,location:d.location,expiresAt:d.expiresAt,params:p}))}catch(e){}return d});
+window.__cfTracking=fetch(url,{credentials:'omit'}).then(function(r){return r.json()}).then(function(d){d.params=p;if(loc){try{localStorage.setItem(key,JSON.stringify({locId:loc,sessionId:d.sessionId,phoneNumber:d.phoneNumber,location:d.location,expiresAt:d.expiresAt,params:p}))}catch(e){}}return d});
 })();`.replace(/\n/g, "");
   return `<link rel="preconnect" href="${endpoint}">
 <script>${script}</script>`;

package/dist/index.mjs

@@ -105,17 +105,27 @@ var TrackingCache = class {
 
 // src/client.ts
 var DEFAULT_ENDPOINT = "https://tracking.callforge.io";
+function getGA4ClientId() {
+  if (typeof document === "undefined") return null;
+  const match = document.cookie.match(/_ga=GA\d+\.\d+\.(.+?)(?:;|$)/);
+  return match ? match[1] : null;
+}
 var FETCH_TIMEOUT_MS = 1e4;
 var AUTO_PARAMS = ["gclid", "gbraid", "wbraid", "msclkid", "fbclid"];
 var CallForge = class _CallForge {
   constructor(config) {
     this.sessionPromise = null;
     this.customParams = {};
+    this.ga4PollInterval = null;
+    this.ga4PollTimeout = null;
+    this.sessionId = null;
+    this.sessionCreated = false;
     this.config = {
       categoryId: config.categoryId,
       endpoint: config.endpoint || DEFAULT_ENDPOINT
     };
     this.cache = new TrackingCache(config.categoryId);
+    this.startGA4CookiePolling();
   }
   /**
    * Initialize the CallForge tracking client.
@@ -144,34 +154,103 @@ var CallForge = class _CallForge {
   }
   /**
    * Set custom tracking parameters.
-   * Merges with existing params (new values override).
+   * If session already exists, sends PATCH to update.
+   * Otherwise queues params for next session request.
    */
-  setParams(params) {
+  async setParams(params) {
     this.customParams = __spreadValues(__spreadValues({}, this.customParams), params);
+    if (this.sessionCreated && this.sessionId) {
+      await this.patchSession(params);
+    }
+  }
+  /**
+   * Get the currently queued custom params.
+   */
+  getQueuedParams() {
+    return __spreadValues({}, this.customParams);
+  }
+  async patchSession(params) {
+    try {
+      const response = await fetch(
+        `${this.config.endpoint}/v1/tracking/session/${this.sessionId}`,
+        {
+          method: "PATCH",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify(params)
+        }
+      );
+      if (!response.ok) {
+        console.warn("[CallForge] Failed to patch session:", response.status);
+      }
+    } catch (error) {
+      console.warn("[CallForge] Failed to patch session:", error);
+    }
+  }
+  /**
+   * Start polling for the GA4 _ga cookie.
+   * If found immediately, calls setParams right away.
+   * Otherwise polls every 500ms for up to 10 seconds.
+   */
+  startGA4CookiePolling() {
+    if (this.ga4PollInterval !== null || this.ga4PollTimeout !== null) {
+      return;
+    }
+    const clientId = getGA4ClientId();
+    if (clientId) {
+      this.setParams({ ga4ClientId: clientId });
+      return;
+    }
+    this.ga4PollInterval = setInterval(() => {
+      const clientId2 = getGA4ClientId();
+      if (clientId2) {
+        this.setParams({ ga4ClientId: clientId2 });
+        this.stopGA4CookiePolling();
+      }
+    }, 500);
+    this.ga4PollTimeout = setTimeout(() => {
+      this.stopGA4CookiePolling();
+    }, 1e4);
+  }
+  stopGA4CookiePolling() {
+    if (this.ga4PollInterval) {
+      clearInterval(this.ga4PollInterval);
+      this.ga4PollInterval = null;
+    }
+    if (this.ga4PollTimeout) {
+      clearTimeout(this.ga4PollTimeout);
+      this.ga4PollTimeout = null;
+    }
   }
   async fetchSession() {
     const locationId = this.getLocationId();
-    if (!locationId) {
-      return { sessionId: null, phoneNumber: null, location: null };
-    }
-    const cached = this.cache.get(locationId);
-    if (cached) {
-      return this.formatSession(cached);
+    if (locationId) {
+      const cached = this.cache.get(locationId);
+      if (cached) {
+        this.sessionId = cached.sessionId;
+        this.sessionCreated = true;
+        return this.formatSession(cached);
+      }
     }
     const autoParams = this.getAutoParams();
     const cachedParams = this.cache.getParams();
     const params = __spreadValues(__spreadValues(__spreadValues({}, autoParams), cachedParams), this.customParams);
-    if (typeof window !== "undefined" && window.__cfTracking) {
+    if (locationId && typeof window !== "undefined" && window.__cfTracking) {
       try {
         const data2 = await window.__cfTracking;
         this.saveToCache(locationId, data2, params);
+        this.sessionId = data2.sessionId;
+        this.sessionCreated = true;
         return this.formatApiResponse(data2);
       } catch (e) {
       }
     }
-    const sessionId = this.cache.getSessionId(locationId);
-    const data = await this.fetchFromApi(locationId, sessionId, params);
-    this.saveToCache(locationId, data, params);
+    const cachedSessionId = locationId ? this.cache.getSessionId(locationId) : null;
+    const data = await this.fetchFromApi(locationId, cachedSessionId, params);
+    if (locationId) {
+      this.saveToCache(locationId, data, params);
+    }
+    this.sessionId = data.sessionId;
+    this.sessionCreated = true;
     return this.formatApiResponse(data);
   }
   getLocationId() {
@@ -236,9 +315,11 @@ var CallForge = class _CallForge {
   buildUrl(locationId, sessionId, params) {
     const { categoryId, endpoint } = this.config;
     const queryParams = {
-      categoryId,
-      loc_physical_ms: locationId
+      categoryId
     };
+    if (locationId) {
+      queryParams.loc_physical_ms = locationId;
+    }
     if (sessionId) {
       queryParams.sessionId = sessionId;
     }
@@ -274,23 +355,24 @@ function getPreloadSnippet(config) {
   const script = `(function(){
 var u=new URLSearchParams(location.search);
 var loc=u.get('loc_physical_ms');
-if(!loc)return;
 var ap=['gclid','gbraid','wbraid','msclkid','fbclid'];
 var p={};
 for(var i=0;i<ap.length;i++){var v=u.get(ap[i]);if(v)p[ap[i]]=v}
 var key='${cacheKey}';
-try{
+var sid=null;
+if(loc){try{
 var c=JSON.parse(localStorage.getItem(key));
 if(c&&c.locId===loc&&c.expiresAt>Date.now()+30000){c.params=Object.assign({},c.params,p);window.__cfTracking=Promise.resolve(c);return}
-var sid=(c&&c.locId===loc)?c.sessionId:null;
+sid=(c&&c.locId===loc)?c.sessionId:null;
 var cp=c&&c.params||{};
 p=Object.assign({},p,cp);
-}catch(e){}
-var url='${endpoint}/v1/tracking/session?categoryId=${categoryId}&loc_physical_ms='+loc;
+}catch(e){}}
+var url='${endpoint}/v1/tracking/session?categoryId=${categoryId}';
+if(loc)url+='&loc_physical_ms='+loc;
 if(sid)url+='&sessionId='+sid;
 var ks=Object.keys(p).sort();
 for(var j=0;j<ks.length;j++)url+='&'+ks[j]+'='+encodeURIComponent(p[ks[j]]);
-window.__cfTracking=fetch(url,{credentials:'omit'}).then(function(r){return r.json()}).then(function(d){d.params=p;try{localStorage.setItem(key,JSON.stringify({locId:loc,sessionId:d.sessionId,phoneNumber:d.phoneNumber,location:d.location,expiresAt:d.expiresAt,params:p}))}catch(e){}return d});
+window.__cfTracking=fetch(url,{credentials:'omit'}).then(function(r){return r.json()}).then(function(d){d.params=p;if(loc){try{localStorage.setItem(key,JSON.stringify({locId:loc,sessionId:d.sessionId,phoneNumber:d.phoneNumber,location:d.location,expiresAt:d.expiresAt,params:p}))}catch(e){}}return d});
 })();`.replace(/\n/g, "");
   return `<link rel="preconnect" href="${endpoint}">
 <script>${script}</script>`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@callforge/tracking-client",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",