@electric-sql/client 1.3.0 → 1.3.1

package/dist/cjs/index.cjs

@@ -768,6 +768,13 @@ function getNextChunkUrl(url, res) {
   if (!shapeHandle || !lastOffset || isUpToDate) return;
   const nextUrl = new URL(url);
   if (nextUrl.searchParams.has(LIVE_QUERY_PARAM)) return;
+  const expiredHandle = nextUrl.searchParams.get(EXPIRED_HANDLE_QUERY_PARAM);
+  if (expiredHandle && shapeHandle === expiredHandle) {
+    console.warn(
+      `[Electric] Received stale cached response with expired shape handle. This should not happen and indicates a proxy/CDN caching misconfiguration. The response contained handle "${shapeHandle}" which was previously marked as expired. Check that your proxy includes all query parameters (especially 'handle' and 'offset') in its cache key. Skipping prefetch to prevent infinite 409 loop.`
+    );
+    return;
+  }
   nextUrl.searchParams.set(SHAPE_HANDLE_QUERY_PARAM, shapeHandle);
   nextUrl.searchParams.set(OFFSET_QUERY_PARAM, lastOffset);
   nextUrl.searchParams.sort();
@@ -1574,7 +1581,15 @@ onInitialResponse_fn = async function(response) {
   const { headers, status } = response;
   const shapeHandle = headers.get(SHAPE_HANDLE_HEADER);
   if (shapeHandle) {
-    __privateSet(this, _shapeHandle, shapeHandle);
+    const shapeKey = __privateGet(this, _currentFetchUrl) ? canonicalShapeKey(__privateGet(this, _currentFetchUrl)) : null;
+    const expiredHandle = shapeKey ? expiredShapesCache.getExpiredHandle(shapeKey) : null;
+    if (shapeHandle !== expiredHandle) {
+      __privateSet(this, _shapeHandle, shapeHandle);
+    } else {
+      console.warn(
+        `[Electric] Received stale cached response with expired shape handle. This should not happen and indicates a proxy/CDN caching misconfiguration. The response contained handle "${shapeHandle}" which was previously marked as expired. Check that your proxy includes all query parameters (especially 'handle' and 'offset') in its cache key. Ignoring the stale handle and continuing with handle "${__privateGet(this, _shapeHandle)}".`
+      );
+    }
   }
   const lastOffset = headers.get(CHUNK_LAST_OFFSET_HEADER);
   if (lastOffset) {