@electric-sql/client 1.5.9 → 1.5.11

package/dist/cjs/index.cjs

@@ -1719,7 +1719,7 @@ var PausedState = class _PausedState extends ShapeStreamState {
   constructor(previousState) {
     super();
     this.kind = `paused`;
-    this.previousState = previousState;
+    this.previousState = previousState instanceof _PausedState ? previousState.previousState : previousState;
   }
   get handle() {
     return this.previousState.handle;
@@ -1759,7 +1759,20 @@ var PausedState = class _PausedState extends ShapeStreamState {
     if (transition.action === `accepted`) {
       return { action: `accepted`, state: new _PausedState(transition.state) };
     }
-    return transition;
+    if (transition.action === `ignored`) {
+      return { action: `ignored`, state: this };
+    }
+    if (transition.action === `stale-retry`) {
+      return {
+        action: `stale-retry`,
+        state: new _PausedState(transition.state),
+        exceededMaxRetries: transition.exceededMaxRetries
+      };
+    }
+    const _exhaustive = transition;
+    throw new Error(
+      `PausedState.handleResponseMetadata: unhandled transition action "${_exhaustive.action}"`
+    );
   }
   withHandle(handle) {
     return new _PausedState(this.previousState.withHandle(handle));
@@ -1778,7 +1791,7 @@ var ErrorState = class _ErrorState extends ShapeStreamState {
   constructor(previousState, error) {
     super();
     this.kind = `error`;
-    this.previousState = previousState;
+    this.previousState = previousState instanceof _ErrorState ? previousState.previousState : previousState;
     this.error = error;
   }
   get handle() {
@@ -1799,6 +1812,21 @@ var ErrorState = class _ErrorState extends ShapeStreamState {
   get isUpToDate() {
     return this.previousState.isUpToDate;
   }
+  get staleCacheBuster() {
+    return this.previousState.staleCacheBuster;
+  }
+  get staleCacheRetryCount() {
+    return this.previousState.staleCacheRetryCount;
+  }
+  get sseFallbackToLongPolling() {
+    return this.previousState.sseFallbackToLongPolling;
+  }
+  get consecutiveShortSseConnections() {
+    return this.previousState.consecutiveShortSseConnections;
+  }
+  get replayCursor() {
+    return this.previousState.replayCursor;
+  }
   withHandle(handle) {
     return new _ErrorState(this.previousState.withHandle(handle), this.error);
   }
@@ -1912,6 +1940,9 @@ var RESERVED_PARAMS = /* @__PURE__ */ new Set([
   CACHE_BUSTER_QUERY_PARAM
 ]);
 var TROUBLESHOOTING_URL = `https://electric-sql.com/docs/guides/troubleshooting`;
+function createCacheBuster() {
+  return `${Date.now()}-${Math.random().toString(36).substring(2, 9)}`;
+}
 async function resolveValue(value) {
   if (typeof value === `function`) {
     return value();
@@ -1952,7 +1983,7 @@ function canonicalShapeKey(url) {
   cleanUrl.searchParams.sort();
   return cleanUrl.toString();
 }
-var _error, _fetchClient2, _sseFetchClient, _messageParser, _subscribers, _started, _syncState, _connected, _mode, _onError, _requestAbortController, _refreshCount, _snapshotCounter, _ShapeStream_instances, isRefreshing_get, _tickPromise, _tickPromiseResolver, _tickPromiseRejecter, _messageChain, _snapshotTracker, _pauseLock, _currentFetchUrl, _lastSseConnectionStartTime, _minSseConnectionDuration, _maxShortSseConnections, _sseBackoffBaseDelay, _sseBackoffMaxDelay, _unsubscribeFromVisibilityChanges, _unsubscribeFromWakeDetection, _maxStaleCacheRetries, _recentRequestEntries, _fastLoopWindowMs, _fastLoopThreshold, _fastLoopBackoffBaseMs, _fastLoopBackoffMaxMs, _fastLoopConsecutiveCount, _fastLoopMaxCount, start_fn, teardown_fn, requestShape_fn, checkFastLoop_fn, constructUrl_fn, createAbortListener_fn, onInitialResponse_fn, onMessages_fn, fetchShape_fn, requestShapeLongPoll_fn, requestShapeSSE_fn, nextTick_fn, publish_fn, sendErrorToSubscribers_fn, hasBrowserVisibilityAPI_fn, subscribeToVisibilityChanges_fn, subscribeToWakeDetection_fn, reset_fn, buildSubsetBody_fn;
+var _error, _fetchClient2, _sseFetchClient, _messageParser, _subscribers, _started, _syncState, _connected, _mode, _onError, _requestAbortController, _refreshCount, _snapshotCounter, _ShapeStream_instances, isRefreshing_get, _tickPromise, _tickPromiseResolver, _tickPromiseRejecter, _messageChain, _snapshotTracker, _pauseLock, _currentFetchUrl, _lastSseConnectionStartTime, _minSseConnectionDuration, _maxShortSseConnections, _sseBackoffBaseDelay, _sseBackoffMaxDelay, _unsubscribeFromVisibilityChanges, _unsubscribeFromWakeDetection, _maxStaleCacheRetries, _recentRequestEntries, _fastLoopWindowMs, _fastLoopThreshold, _fastLoopBackoffBaseMs, _fastLoopBackoffMaxMs, _fastLoopConsecutiveCount, _fastLoopMaxCount, _refetchCacheBuster, start_fn, teardown_fn, requestShape_fn, checkFastLoop_fn, constructUrl_fn, createAbortListener_fn, onInitialResponse_fn, onMessages_fn, fetchShape_fn, requestShapeLongPoll_fn, requestShapeSSE_fn, nextTick_fn, publish_fn, sendErrorToSubscribers_fn, hasBrowserVisibilityAPI_fn, subscribeToVisibilityChanges_fn, subscribeToWakeDetection_fn, reset_fn, buildSubsetBody_fn;
 var ShapeStream = class {
   constructor(options) {
     __privateAdd(this, _ShapeStream_instances);
@@ -1999,6 +2030,7 @@ var ShapeStream = class {
     __privateAdd(this, _fastLoopBackoffMaxMs, 5e3);
     __privateAdd(this, _fastLoopConsecutiveCount, 0);
     __privateAdd(this, _fastLoopMaxCount, 5);
+    __privateAdd(this, _refetchCacheBuster);
     var _a, _b, _c, _d;
     this.options = __spreadValues({ subscribe: true }, options);
     validateOptions(this.options);
@@ -2179,7 +2211,7 @@ var ShapeStream = class {
           expiredHandle: null,
           now: Date.now(),
           maxStaleCacheRetries: __privateGet(this, _maxStaleCacheRetries),
-          createCacheBuster: () => `${Date.now()}-${Math.random().toString(36).substring(2, 9)}`
+          createCacheBuster
         });
         if (transition.action === `accepted`) {
           __privateSet(this, _syncState, transition.state);
@@ -2240,8 +2272,15 @@ var ShapeStream = class {
           const shapeKey = canonicalShapeKey(fetchUrl);
           expiredShapesCache.markExpired(shapeKey, usedHandle);
         }
-        const nextHandle = e.headers[SHAPE_HANDLE_HEADER] || `${usedHandle != null ? usedHandle : `handle`}-next`;
-        __privateSet(this, _syncState, __privateGet(this, _syncState).withHandle(nextHandle));
+        const nextHandle = e.headers[SHAPE_HANDLE_HEADER];
+        if (nextHandle) {
+          __privateSet(this, _syncState, __privateGet(this, _syncState).withHandle(nextHandle));
+        } else {
+          console.warn(
+            `[Electric] Received 409 response without a shape handle header. This likely indicates a proxy or CDN stripping required headers.`
+          );
+          __privateSet(this, _refetchCacheBuster, createCacheBuster());
+        }
         return this.fetchSnapshot(opts);
       }
       throw e;
@@ -2302,6 +2341,7 @@ _fastLoopBackoffBaseMs = new WeakMap();
 _fastLoopBackoffMaxMs = new WeakMap();
 _fastLoopConsecutiveCount = new WeakMap();
 _fastLoopMaxCount = new WeakMap();
+_refetchCacheBuster = new WeakMap();
 start_fn = async function() {
   var _a, _b;
   __privateSet(this, _started, true);
@@ -2406,7 +2446,13 @@ requestShape_fn = async function() {
         const shapeKey = canonicalShapeKey(fetchUrl);
         expiredShapesCache.markExpired(shapeKey, __privateGet(this, _syncState).handle);
       }
-      const newShapeHandle = e.headers[SHAPE_HANDLE_HEADER] || `${__privateGet(this, _syncState).handle}-next`;
+      const newShapeHandle = e.headers[SHAPE_HANDLE_HEADER];
+      if (!newShapeHandle) {
+        console.warn(
+          `[Electric] Received 409 response without a shape handle header. This likely indicates a proxy or CDN stripping required headers.`
+        );
+        __privateSet(this, _refetchCacheBuster, createCacheBuster());
+      }
       __privateMethod(this, _ShapeStream_instances, reset_fn).call(this, newShapeHandle);
       const messages409 = Array.isArray(e.json) ? e.json : e.json != null ? [e.json] : [];
       await __privateMethod(this, _ShapeStream_instances, publish_fn).call(this, messages409);
@@ -2575,6 +2621,13 @@ constructUrl_fn = async function(url, resumingFromPause, subsetParams) {
   if (expiredHandle) {
     fetchUrl.searchParams.set(EXPIRED_HANDLE_QUERY_PARAM, expiredHandle);
   }
+  if (__privateGet(this, _refetchCacheBuster)) {
+    fetchUrl.searchParams.set(
+      CACHE_BUSTER_QUERY_PARAM,
+      __privateGet(this, _refetchCacheBuster)
+    );
+    __privateSet(this, _refetchCacheBuster, void 0);
+  }
   fetchUrl.searchParams.sort();
   return {
     fetchUrl,
@@ -2611,7 +2664,7 @@ onInitialResponse_fn = async function(response) {
     expiredHandle,
     now: Date.now(),
     maxStaleCacheRetries: __privateGet(this, _maxStaleCacheRetries),
-    createCacheBuster: () => `${Date.now()}-${Math.random().toString(36).substring(2, 9)}`
+    createCacheBuster
   });
   __privateSet(this, _syncState, transition.state);
   if (transition.action === `stale-retry`) {