@electric-sql/client 1.5.0 → 1.5.1

package/dist/cjs/index.cjs

@@ -1420,7 +1420,21 @@ var ShapeStream = class {
       fetchUrl = result.fetchUrl;
       fetchOptions = { headers: result.requestHeaders };
     }
-    const response = await __privateGet(this, _fetchClient2).call(this, fetchUrl.toString(), fetchOptions);
+    const usedHandle = __privateGet(this, _shapeHandle);
+    let response;
+    try {
+      response = await __privateGet(this, _fetchClient2).call(this, fetchUrl.toString(), fetchOptions);
+    } catch (e) {
+      if (e instanceof FetchError && e.status === 409) {
+        if (usedHandle) {
+          const shapeKey = canonicalShapeKey(fetchUrl);
+          expiredShapesCache.markExpired(shapeKey, usedHandle);
+        }
+        __privateSet(this, _shapeHandle, e.headers[SHAPE_HANDLE_HEADER] || `${usedHandle != null ? usedHandle : `handle`}-next`);
+        return this.fetchSnapshot(opts);
+      }
+      throw e;
+    }
     if (!response.ok) {
       throw await FetchError.fromResponse(response, fetchUrl.toString());
     }
@@ -1749,8 +1763,9 @@ onInitialResponse_fn = async function(response) {
       );
     } 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)}".`
+        `[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 response and continuing with handle "${__privateGet(this, _shapeHandle)}".`
       );
+      return;
     }
   }
   const lastOffset = headers.get(CHUNK_LAST_OFFSET_HEADER);