@electric-sql/client 1.5.0 → 1.5.2

package/dist/cjs/index.cjs

@@ -504,6 +504,7 @@ var EXPERIMENTAL_LIVE_SSE_QUERY_PARAM = `experimental_live_sse`;
 var LIVE_SSE_QUERY_PARAM = `live_sse`;
 var FORCE_DISCONNECT_AND_REFRESH = `force-disconnect-and-refresh`;
 var PAUSE_STREAM = `pause-stream`;
+var SYSTEM_WAKE = `system-wake`;
 var LOG_MODE_QUERY_PARAM = `log`;
 var SUBSET_PARAM_WHERE = `subset__where`;
 var SUBSET_PARAM_LIMIT = `subset__limit`;
@@ -1177,7 +1178,7 @@ function canonicalShapeKey(url) {
   cleanUrl.searchParams.sort();
   return cleanUrl.toString();
 }
-var _error, _fetchClient2, _sseFetchClient, _messageParser, _subscribers, _started, _state, _lastOffset, _liveCacheBuster, _lastSyncedAt, _isUpToDate, _isMidStream, _connected, _shapeHandle, _mode, _schema, _onError, _requestAbortController, _isRefreshing, _tickPromise, _tickPromiseResolver, _tickPromiseRejecter, _messageChain, _snapshotTracker, _activeSnapshotRequests, _midStreamPromise, _midStreamPromiseResolver, _lastSeenCursor, _currentFetchUrl, _lastSseConnectionStartTime, _minSseConnectionDuration, _consecutiveShortSseConnections, _maxShortSseConnections, _sseFallbackToLongPolling, _sseBackoffBaseDelay, _sseBackoffMaxDelay, _unsubscribeFromVisibilityChanges, _staleCacheBuster, _staleCacheRetryCount, _maxStaleCacheRetries, _ShapeStream_instances, replayMode_get, start_fn, requestShape_fn, constructUrl_fn, createAbortListener_fn, onInitialResponse_fn, onMessages_fn, fetchShape_fn, requestShapeLongPoll_fn, requestShapeSSE_fn, pause_fn, resume_fn, nextTick_fn, waitForStreamEnd_fn, publish_fn, sendErrorToSubscribers_fn, subscribeToVisibilityChanges_fn, reset_fn, buildSubsetBody_fn;
+var _error, _fetchClient2, _sseFetchClient, _messageParser, _subscribers, _started, _state, _lastOffset, _liveCacheBuster, _lastSyncedAt, _isUpToDate, _isMidStream, _connected, _shapeHandle, _mode, _schema, _onError, _requestAbortController, _isRefreshing, _tickPromise, _tickPromiseResolver, _tickPromiseRejecter, _messageChain, _snapshotTracker, _activeSnapshotRequests, _midStreamPromise, _midStreamPromiseResolver, _lastSeenCursor, _currentFetchUrl, _lastSseConnectionStartTime, _minSseConnectionDuration, _consecutiveShortSseConnections, _maxShortSseConnections, _sseFallbackToLongPolling, _sseBackoffBaseDelay, _sseBackoffMaxDelay, _unsubscribeFromVisibilityChanges, _unsubscribeFromWakeDetection, _staleCacheBuster, _staleCacheRetryCount, _maxStaleCacheRetries, _ShapeStream_instances, replayMode_get, start_fn, requestShape_fn, constructUrl_fn, createAbortListener_fn, onInitialResponse_fn, onMessages_fn, fetchShape_fn, requestShapeLongPoll_fn, requestShapeSSE_fn, pause_fn, resume_fn, nextTick_fn, waitForStreamEnd_fn, publish_fn, sendErrorToSubscribers_fn, hasBrowserVisibilityAPI_fn, subscribeToVisibilityChanges_fn, subscribeToWakeDetection_fn, reset_fn, buildSubsetBody_fn;
 var ShapeStream = class {
   constructor(options) {
     __privateAdd(this, _ShapeStream_instances);
@@ -1228,6 +1229,7 @@ var ShapeStream = class {
     __privateAdd(this, _sseBackoffMaxDelay, 5e3);
     // Maximum delay cap (ms)
     __privateAdd(this, _unsubscribeFromVisibilityChanges);
+    __privateAdd(this, _unsubscribeFromWakeDetection);
     __privateAdd(this, _staleCacheBuster);
     // Cache buster set when stale CDN response detected, used on retry requests to bypass cache
     __privateAdd(this, _staleCacheRetryCount, 0);
@@ -1272,6 +1274,7 @@ var ShapeStream = class {
     ));
     __privateSet(this, _fetchClient2, createFetchWithConsumedMessages(__privateGet(this, _sseFetchClient)));
     __privateMethod(this, _ShapeStream_instances, subscribeToVisibilityChanges_fn).call(this);
+    __privateMethod(this, _ShapeStream_instances, subscribeToWakeDetection_fn).call(this);
   }
   get shapeHandle() {
     return __privateGet(this, _shapeHandle);
@@ -1298,9 +1301,10 @@ var ShapeStream = class {
     };
   }
   unsubscribeAll() {
-    var _a;
+    var _a, _b;
     __privateGet(this, _subscribers).clear();
     (_a = __privateGet(this, _unsubscribeFromVisibilityChanges)) == null ? void 0 : _a.call(this);
+    (_b = __privateGet(this, _unsubscribeFromWakeDetection)) == null ? void 0 : _b.call(this);
   }
   /** Unix time at which we last synced. Undefined when `isLoading` is true. */
   lastSyncedAt() {
@@ -1420,7 +1424,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());
     }
@@ -1473,6 +1491,7 @@ _sseFallbackToLongPolling = new WeakMap();
 _sseBackoffBaseDelay = new WeakMap();
 _sseBackoffMaxDelay = new WeakMap();
 _unsubscribeFromVisibilityChanges = new WeakMap();
+_unsubscribeFromWakeDetection = new WeakMap();
 _staleCacheBuster = new WeakMap();
 _staleCacheRetryCount = new WeakMap();
 _maxStaleCacheRetries = new WeakMap();
@@ -1481,7 +1500,7 @@ replayMode_get = function() {
   return __privateGet(this, _lastSeenCursor) !== void 0;
 };
 start_fn = async function() {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   __privateSet(this, _started, true);
   try {
     await __privateMethod(this, _ShapeStream_instances, requestShape_fn).call(this);
@@ -1507,17 +1526,20 @@ start_fn = async function() {
       }
       __privateSet(this, _connected, false);
       (_c = __privateGet(this, _tickPromiseRejecter)) == null ? void 0 : _c.call(this);
+      (_d = __privateGet(this, _unsubscribeFromWakeDetection)) == null ? void 0 : _d.call(this);
       return;
     }
     if (err instanceof Error) {
       __privateMethod(this, _ShapeStream_instances, sendErrorToSubscribers_fn).call(this, err);
     }
     __privateSet(this, _connected, false);
-    (_d = __privateGet(this, _tickPromiseRejecter)) == null ? void 0 : _d.call(this);
+    (_e = __privateGet(this, _tickPromiseRejecter)) == null ? void 0 : _e.call(this);
+    (_f = __privateGet(this, _unsubscribeFromWakeDetection)) == null ? void 0 : _f.call(this);
     throw err;
   }
   __privateSet(this, _connected, false);
-  (_e = __privateGet(this, _tickPromiseRejecter)) == null ? void 0 : _e.call(this);
+  (_g = __privateGet(this, _tickPromiseRejecter)) == null ? void 0 : _g.call(this);
+  (_h = __privateGet(this, _unsubscribeFromWakeDetection)) == null ? void 0 : _h.call(this);
 };
 requestShape_fn = async function() {
   var _a, _b;
@@ -1542,7 +1564,9 @@ requestShape_fn = async function() {
       resumingFromPause
     });
   } catch (e) {
-    if ((e instanceof FetchError || e instanceof FetchBackoffAbortError) && requestAbortController.signal.aborted && requestAbortController.signal.reason === FORCE_DISCONNECT_AND_REFRESH) {
+    const abortReason = requestAbortController.signal.reason;
+    const isRestartAbort = requestAbortController.signal.aborted && (abortReason === FORCE_DISCONNECT_AND_REFRESH || abortReason === SYSTEM_WAKE);
+    if ((e instanceof FetchError || e instanceof FetchBackoffAbortError) && isRestartAbort) {
       return __privateMethod(this, _ShapeStream_instances, requestShape_fn).call(this);
     }
     if (e instanceof FetchBackoffAbortError) {
@@ -1749,8 +1773,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);
@@ -1970,8 +1995,11 @@ sendErrorToSubscribers_fn = function(error) {
     errorFn == null ? void 0 : errorFn(error);
   });
 };
+hasBrowserVisibilityAPI_fn = function() {
+  return typeof document === `object` && typeof document.hidden === `boolean` && typeof document.addEventListener === `function`;
+};
 subscribeToVisibilityChanges_fn = function() {
-  if (typeof document === `object` && typeof document.hidden === `boolean` && typeof document.addEventListener === `function`) {
+  if (__privateMethod(this, _ShapeStream_instances, hasBrowserVisibilityAPI_fn).call(this)) {
     const visibilityHandler = () => {
       if (document.hidden) {
         __privateMethod(this, _ShapeStream_instances, pause_fn).call(this);
@@ -1985,6 +2013,44 @@ subscribeToVisibilityChanges_fn = function() {
     });
   }
 };
+/**
+ * Detects system wake from sleep using timer gap detection.
+ * When the system sleeps, setInterval timers are paused. On wake,
+ * the elapsed wall-clock time since the last tick will be much larger
+ * than the interval period, indicating the system was asleep.
+ *
+ * Only active in non-browser environments (Bun, Node.js) where
+ * `document.visibilitychange` is not available. In browsers,
+ * `#subscribeToVisibilityChanges` handles this instead. Without wake
+ * detection, in-flight HTTP requests (long-poll or SSE) may hang until
+ * the OS TCP timeout.
+ */
+subscribeToWakeDetection_fn = function() {
+  if (__privateMethod(this, _ShapeStream_instances, hasBrowserVisibilityAPI_fn).call(this)) return;
+  const INTERVAL_MS = 2e3;
+  const WAKE_THRESHOLD_MS = 4e3;
+  let lastTickTime = Date.now();
+  const timer = setInterval(() => {
+    const now = Date.now();
+    const elapsed = now - lastTickTime;
+    lastTickTime = now;
+    if (elapsed > INTERVAL_MS + WAKE_THRESHOLD_MS) {
+      if (__privateGet(this, _state) === `active` && __privateGet(this, _requestAbortController)) {
+        __privateSet(this, _isRefreshing, true);
+        __privateGet(this, _requestAbortController).abort(SYSTEM_WAKE);
+        queueMicrotask(() => {
+          __privateSet(this, _isRefreshing, false);
+        });
+      }
+    }
+  }, INTERVAL_MS);
+  if (typeof timer === `object` && `unref` in timer) {
+    timer.unref();
+  }
+  __privateSet(this, _unsubscribeFromWakeDetection, () => {
+    clearInterval(timer);
+  });
+};
 /**
  * Resets the state of the stream, optionally with a provided
  * shape handle