@callforge/tracking-client 0.4.2 → 0.5.1

package/dist/index.js

@@ -58,24 +58,36 @@ var TrackingCache = class {
     }
   }
   /**
-   * Get cached session if valid (same locationId and not expired).
-   * Returns null if cache miss, location changed, or expired.
+   * Get cached session if valid.
+   *
+   * Cache is valid when:
+   * - Not expired (with 30s buffer)
+   * - AND one of:
+   *   - No locationId provided (page refresh without loc_physical_ms) → use any cache
+   *   - locationId matches cached locId (same location)
+   *
+   * Cache is invalid when:
+   * - locationId provided but differs from cached locId (new location overwrites)
    */
   get(locationId) {
     const cached = this.read();
     if (!cached) return null;
-    if (cached.locId !== locationId) return null;
     if (cached.expiresAt - EXPIRY_BUFFER_MS <= Date.now()) return null;
+    if (!locationId) return cached;
+    if (cached.locId !== locationId) return null;
     return cached;
   }
   /**
    * Get sessionId for refresh if location matches (regardless of expiry).
    * Used when cache is expired but location is same - send sessionId to server.
+   *
+   * Only returns sessionId if locationId is provided AND matches cached locId.
+   * (IP-based sessions don't send sessionId for refresh since location may differ)
    */
   getSessionId(locationId) {
     const cached = this.read();
     if (!cached) return null;
-    if (cached.locId !== locationId) return null;
+    if (!locationId || cached.locId !== locationId) return null;
     return cached.sessionId;
   }
   /**
@@ -222,33 +234,34 @@ var CallForge = class _CallForge {
     });
   }
   async fetchSession() {
+    var _a;
     const locationId = this.getLocationId();
-    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 (locationId && typeof window !== "undefined" && window.__cfTracking) {
+    if (typeof window !== "undefined" && window.__cfTracking) {
       try {
         const data2 = await window.__cfTracking;
-        this.saveToCache(locationId, data2, params);
+        const dataWithExtras = data2;
+        const effectiveLocId = (_a = dataWithExtras.locId) != null ? _a : locationId;
+        const autoParams2 = this.getAutoParams();
+        const params2 = __spreadValues(__spreadValues(__spreadValues({}, autoParams2), dataWithExtras.params), this.customParams);
+        this.saveToCache(effectiveLocId, data2, params2);
         this.sessionId = data2.sessionId;
         this.sessionCreated = true;
         return this.formatApiResponse(data2);
       } catch (e) {
       }
     }
-    const cachedSessionId = locationId ? this.cache.getSessionId(locationId) : null;
-    const data = await this.fetchFromApi(locationId, cachedSessionId, params);
-    if (locationId) {
-      this.saveToCache(locationId, data, params);
+    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);
+    const cachedSessionId = this.cache.getSessionId(locationId);
+    const data = await this.fetchFromApi(locationId, cachedSessionId, params);
+    this.saveToCache(locationId, data, params);
     this.sessionId = data.sessionId;
     this.sessionCreated = true;
     return this.formatApiResponse(data);
@@ -289,7 +302,7 @@ var CallForge = class _CallForge {
   }
   saveToCache(locationId, data, params) {
     const cached = {
-      locId: locationId,
+      locId: locationId != null ? locationId : null,
       sessionId: data.sessionId,
       phoneNumber: data.phoneNumber,
       location: data.location,
@@ -360,19 +373,20 @@ 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}';
 var sid=null;
-if(loc){try{
+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}
-sid=(c&&c.locId===loc)?c.sessionId:null;
-var cp=c&&c.params||{};
-p=Object.assign({},p,cp);
-}catch(e){}}
+if(c&&c.expiresAt>Date.now()+30000){
+if(!loc||(loc&&c.locId===loc)){c.params=Object.assign({},c.params,p);window.__cfTracking=Promise.resolve(c);return}
+sid=(c.locId===loc)?c.sessionId:null;
+var cp=c.params||{};
+p=Object.assign({},cp,p);
+}}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;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});
+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});
 })();`.replace(/\n/g, "");
   return `<link rel="preconnect" href="${endpoint}">
 <script>${script}</script>`;

package/dist/index.mjs

@@ -34,24 +34,36 @@ var TrackingCache = class {
     }
   }
   /**
-   * Get cached session if valid (same locationId and not expired).
-   * Returns null if cache miss, location changed, or expired.
+   * Get cached session if valid.
+   *
+   * Cache is valid when:
+   * - Not expired (with 30s buffer)
+   * - AND one of:
+   *   - No locationId provided (page refresh without loc_physical_ms) → use any cache
+   *   - locationId matches cached locId (same location)
+   *
+   * Cache is invalid when:
+   * - locationId provided but differs from cached locId (new location overwrites)
    */
   get(locationId) {
     const cached = this.read();
     if (!cached) return null;
-    if (cached.locId !== locationId) return null;
     if (cached.expiresAt - EXPIRY_BUFFER_MS <= Date.now()) return null;
+    if (!locationId) return cached;
+    if (cached.locId !== locationId) return null;
     return cached;
   }
   /**
    * Get sessionId for refresh if location matches (regardless of expiry).
    * Used when cache is expired but location is same - send sessionId to server.
+   *
+   * Only returns sessionId if locationId is provided AND matches cached locId.
+   * (IP-based sessions don't send sessionId for refresh since location may differ)
    */
   getSessionId(locationId) {
     const cached = this.read();
     if (!cached) return null;
-    if (cached.locId !== locationId) return null;
+    if (!locationId || cached.locId !== locationId) return null;
     return cached.sessionId;
   }
   /**
@@ -198,33 +210,34 @@ var CallForge = class _CallForge {
     });
   }
   async fetchSession() {
+    var _a;
     const locationId = this.getLocationId();
-    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 (locationId && typeof window !== "undefined" && window.__cfTracking) {
+    if (typeof window !== "undefined" && window.__cfTracking) {
       try {
         const data2 = await window.__cfTracking;
-        this.saveToCache(locationId, data2, params);
+        const dataWithExtras = data2;
+        const effectiveLocId = (_a = dataWithExtras.locId) != null ? _a : locationId;
+        const autoParams2 = this.getAutoParams();
+        const params2 = __spreadValues(__spreadValues(__spreadValues({}, autoParams2), dataWithExtras.params), this.customParams);
+        this.saveToCache(effectiveLocId, data2, params2);
         this.sessionId = data2.sessionId;
         this.sessionCreated = true;
         return this.formatApiResponse(data2);
       } catch (e) {
       }
     }
-    const cachedSessionId = locationId ? this.cache.getSessionId(locationId) : null;
-    const data = await this.fetchFromApi(locationId, cachedSessionId, params);
-    if (locationId) {
-      this.saveToCache(locationId, data, params);
+    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);
+    const cachedSessionId = this.cache.getSessionId(locationId);
+    const data = await this.fetchFromApi(locationId, cachedSessionId, params);
+    this.saveToCache(locationId, data, params);
     this.sessionId = data.sessionId;
     this.sessionCreated = true;
     return this.formatApiResponse(data);
@@ -265,7 +278,7 @@ var CallForge = class _CallForge {
   }
   saveToCache(locationId, data, params) {
     const cached = {
-      locId: locationId,
+      locId: locationId != null ? locationId : null,
       sessionId: data.sessionId,
       phoneNumber: data.phoneNumber,
       location: data.location,
@@ -336,19 +349,20 @@ 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}';
 var sid=null;
-if(loc){try{
+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}
-sid=(c&&c.locId===loc)?c.sessionId:null;
-var cp=c&&c.params||{};
-p=Object.assign({},p,cp);
-}catch(e){}}
+if(c&&c.expiresAt>Date.now()+30000){
+if(!loc||(loc&&c.locId===loc)){c.params=Object.assign({},c.params,p);window.__cfTracking=Promise.resolve(c);return}
+sid=(c.locId===loc)?c.sessionId:null;
+var cp=c.params||{};
+p=Object.assign({},cp,p);
+}}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;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});
+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});
 })();`.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.4.2",
+  "version": "0.5.1",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,17 +14,17 @@
   "files": [
     "dist"
   ],
+  "devDependencies": {
+    "jsdom": "^27.4.0",
+    "tsup": "^8.0.0",
+    "typescript": "^5.3.0",
+    "vitest": "^1.6.0",
+    "@callforge/tsconfig": "0.0.0"
+  },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts",
     "clean": "rm -rf dist",
     "test": "vitest run",
     "test:watch": "vitest"
-  },
-  "devDependencies": {
-    "@callforge/tsconfig": "workspace:*",
-    "jsdom": "^27.4.0",
-    "tsup": "^8.0.0",
-    "typescript": "^5.3.0",
-    "vitest": "^1.6.0"
   }
-}
+}