@electric-sql/client 1.2.2 → 1.3.1

package/dist/index.d.ts

@@ -45,13 +45,22 @@ type MoveOutPattern = {
     pos: number;
     value: string;
 };
+type SubsetParams = {
+    where?: string;
+    params?: Record<string, string>;
+    limit?: number;
+    offset?: number;
+    orderBy?: string;
+};
 type ControlMessage = {
     headers: (Header & {
         control: `up-to-date` | `must-refetch`;
         global_last_seen_lsn?: string;
     }) | (Header & {
         control: `snapshot-end`;
-    } & PostgresSnapshot);
+    } & PostgresSnapshot) | (Header & {
+        control: `subset-end`;
+    } & SubsetParams);
 };
 type EventMessage = {
     headers: Header & {
@@ -377,13 +386,6 @@ type ExternalParamsRecord<T extends Row<unknown> = Row> = {
 } & Partial<PostgresParams<T>> & {
     [K in ReservedParamKeys]?: never;
 };
-type SubsetParams = {
-    where?: string;
-    params?: Record<string, string>;
-    limit?: number;
-    offset?: number;
-    orderBy?: string;
-};
 type ReservedParamKeys = typeof LIVE_CACHE_BUSTER_QUERY_PARAM | typeof SHAPE_HANDLE_QUERY_PARAM | typeof LIVE_QUERY_PARAM | typeof OFFSET_QUERY_PARAM | `subset__${string}`;
 /**
  * External headers type - what users provide.

package/dist/index.legacy-esm.js

@@ -429,11 +429,9 @@ function isUpToDateMessage(message) {
   return isControlMessage(message) && message.headers.control === `up-to-date`;
 }
 function getOffset(message) {
+  if (message.headers.control != `up-to-date`) return;
   const lsn = message.headers.global_last_seen_lsn;
-  if (!lsn) {
-    return;
-  }
-  return `${lsn}_0`;
+  return lsn ? `${lsn}_0` : void 0;
 }
 function isVisibleInSnapshot(txid, snapshot) {
   const xid = BigInt(txid);
@@ -603,6 +601,7 @@ function createFetchWithChunkBuffer(fetchClient, prefetchOptions = ChunkPrefetch
       return prefetchedRequest;
     }
     prefetchQueue == null ? void 0 : prefetchQueue.abort();
+    prefetchQueue = void 0;
     const response = await fetchClient(...args);
     const nextUrl = getNextChunkUrl(url, response);
     if (nextUrl) {
@@ -675,12 +674,17 @@ var PrefetchQueue = class {
   }
   abort() {
     __privateGet(this, _prefetchQueue).forEach(([_, aborter]) => aborter.abort());
+    __privateGet(this, _prefetchQueue).clear();
   }
   consume(...args) {
-    var _a;
     const url = args[0].toString();
-    const request = (_a = __privateGet(this, _prefetchQueue).get(url)) == null ? void 0 : _a[0];
-    if (!request || url !== __privateGet(this, _queueHeadUrl)) return;
+    const entry = __privateGet(this, _prefetchQueue).get(url);
+    if (!entry || url !== __privateGet(this, _queueHeadUrl)) return;
+    const [request, aborter] = entry;
+    if (aborter.signal.aborted) {
+      __privateGet(this, _prefetchQueue).delete(url);
+      return;
+    }
     __privateGet(this, _prefetchQueue).delete(url);
     request.then((response) => {
       const nextUrl = getNextChunkUrl(url, response);
@@ -729,6 +733,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();
@@ -1231,7 +1242,8 @@ var ShapeStream = class {
       }
       const { metadata, data } = await this.fetchSnapshot(opts);
       const dataWithEndBoundary = data.concat([
-        { headers: __spreadValues({ control: `snapshot-end` }, metadata) }
+        { headers: __spreadValues({ control: `snapshot-end` }, metadata) },
+        { headers: __spreadValues({ control: `subset-end` }, opts) }
       ]);
       __privateGet(this, _snapshotTracker).addSnapshot(
         metadata,
@@ -1536,7 +1548,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) {
@@ -1691,7 +1711,11 @@ pause_fn = function() {
   }
 };
 resume_fn = function() {
+  var _a;
   if (__privateGet(this, _started) && (__privateGet(this, _state) === `paused` || __privateGet(this, _state) === `pause-requested`)) {
+    if ((_a = this.options.signal) == null ? void 0 : _a.aborted) {
+      return;
+    }
     if (__privateGet(this, _state) === `pause-requested`) {
       __privateSet(this, _state, `active`);
     }