@electric-sql/client 1.5.0 → 1.5.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@electric-sql/client",
   "description": "Postgres everywhere - your data, in sync, wherever you need it.",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "author": "ElectricSQL team and contributors.",
   "bugs": {
     "url": "https://github.com/electric-sql/electric/issues"

package/src/client.ts

@@ -1118,13 +1118,16 @@ export class ShapeStream<T extends Row<unknown> = Row>
             `Check that your proxy includes all query parameters (especially 'handle' and 'offset') in its cache key.`
         )
       } else {
+        // We already have a valid handle, so ignore the stale response entirely
+        // to prevent a mismatch between our current handle and the stale offset.
         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 "${this.#shapeHandle}".`
+            `Ignoring the stale response and continuing with handle "${this.#shapeHandle}".`
         )
+        return
       }
     }
 
@@ -1687,8 +1690,32 @@ export class ShapeStream<T extends Row<unknown> = Row>
       fetchOptions = { headers: result.requestHeaders }
     }
 
-    const response = await this.#fetchClient(fetchUrl.toString(), fetchOptions)
+    // Capture handle before fetch to avoid race conditions if it changes during the request
+    const usedHandle = this.#shapeHandle
+
+    let response: Response
+    try {
+      response = await this.#fetchClient(fetchUrl.toString(), fetchOptions)
+    } catch (e) {
+      // Handle 409 "must-refetch" - shape handle changed/expired.
+      // The fetch wrapper throws FetchError for non-OK responses, so we catch here.
+      // Unlike #requestShape, we don't call #reset() here as that would
+      // clear #activeSnapshotRequests and break requestSnapshot's pause/resume logic.
+      if (e instanceof FetchError && e.status === 409) {
+        if (usedHandle) {
+          const shapeKey = canonicalShapeKey(fetchUrl)
+          expiredShapesCache.markExpired(shapeKey, usedHandle)
+        }
+
+        this.#shapeHandle =
+          e.headers[SHAPE_HANDLE_HEADER] || `${usedHandle ?? `handle`}-next`
+
+        return this.fetchSnapshot(opts)
+      }
+      throw e
+    }
 
+    // Handle non-OK responses from custom fetch clients that bypass the wrapper chain
     if (!response.ok) {
       throw await FetchError.fromResponse(response, fetchUrl.toString())
     }