@electric-sql/client 1.5.4 → 1.5.6

package/dist/cjs/index.cjs

@@ -463,10 +463,10 @@ function snakeCamelMapper(schema) {
 
 // src/helpers.ts
 function isChangeMessage(message) {
-  return `key` in message;
+  return message != null && `key` in message;
 }
 function isControlMessage(message) {
-  return !isChangeMessage(message);
+  return message != null && !isChangeMessage(message);
 }
 function isUpToDateMessage(message) {
   return isControlMessage(message) && message.headers.control === `up-to-date`;
@@ -646,6 +646,12 @@ function createFetchWithChunkBuffer(fetchClient, prefetchOptions = ChunkPrefetch
   let prefetchQueue;
   const prefetchClient = async (...args) => {
     const url = args[0].toString();
+    const method = getRequestMethod(args[0], args[1]);
+    if (method !== `GET`) {
+      prefetchQueue == null ? void 0 : prefetchQueue.abort();
+      prefetchQueue = void 0;
+      return fetchClient(...args);
+    }
     const prefetchedRequest = prefetchQueue == null ? void 0 : prefetchQueue.consume(...args);
     if (prefetchedRequest) {
       return prefetchedRequest;
@@ -815,6 +821,15 @@ function chainAborter(aborter, sourceSignal) {
 }
 function noop() {
 }
+function getRequestMethod(input, init) {
+  if (init == null ? void 0 : init.method) {
+    return init.method.toUpperCase();
+  }
+  if (typeof Request !== `undefined` && input instanceof Request) {
+    return input.method.toUpperCase();
+  }
+  return `GET`;
+}
 
 // src/expression-compiler.ts
 function compileExpression(expr, columnMapper) {
@@ -1491,6 +1506,12 @@ var FetchingState = class extends ActiveState {
     const staleResult = this.checkStaleResponse(input);
     if (staleResult) return staleResult;
     const shared = this.parseResponseFields(input);
+    if (input.status === 204) {
+      return {
+        action: `accepted`,
+        state: new LiveState(shared, { sseFallbackToLongPolling: true })
+      };
+    }
     return { action: `accepted`, state: new SyncingState(shared) };
   }
   canEnterReplayMode() {
@@ -2321,7 +2342,8 @@ requestShape_fn = async function() {
       }
       const newShapeHandle = e.headers[SHAPE_HANDLE_HEADER] || `${__privateGet(this, _syncState).handle}-next`;
       __privateMethod(this, _ShapeStream_instances, reset_fn).call(this, newShapeHandle);
-      await __privateMethod(this, _ShapeStream_instances, publish_fn).call(this, Array.isArray(e.json) ? e.json : [e.json]);
+      const messages409 = Array.isArray(e.json) ? e.json : e.json != null ? [e.json] : [];
+      await __privateMethod(this, _ShapeStream_instances, publish_fn).call(this, messages409);
       return __privateMethod(this, _ShapeStream_instances, requestShape_fn).call(this);
     } else {
       throw e;
@@ -2504,6 +2526,12 @@ onInitialResponse_fn = async function(response) {
   return true;
 };
 onMessages_fn = async function(batch, isSseMessage = false) {
+  if (!Array.isArray(batch)) {
+    console.warn(
+      `[Electric] #onMessages called with non-array argument (${typeof batch}). This is a client bug \u2014 please report it.`
+    );
+    return;
+  }
   if (batch.length === 0) return;
   const lastMessage = batch[batch.length - 1];
   const hasUpToDateMessage = isUpToDateMessage(lastMessage);
@@ -2560,6 +2588,7 @@ fetchShape_fn = async function(opts) {
   return __privateMethod(this, _ShapeStream_instances, requestShapeLongPoll_fn).call(this, opts);
 };
 requestShapeLongPoll_fn = async function(opts) {
+  var _a;
   const { fetchUrl, requestAbortController, headers } = opts;
   const response = await __privateGet(this, _fetchClient2).call(this, fetchUrl.toString(), {
     signal: requestAbortController.signal,
@@ -2572,6 +2601,16 @@ requestShapeLongPoll_fn = async function(opts) {
   const res = await response.text();
   const messages = res || `[]`;
   const batch = __privateGet(this, _messageParser).parse(messages, schema);
+  if (!Array.isArray(batch)) {
+    const preview = (_a = JSON.stringify(batch)) == null ? void 0 : _a.slice(0, 200);
+    throw new FetchError(
+      response.status,
+      `Received non-array response body from shape endpoint. This may indicate a proxy or CDN is returning an unexpected response. Expected a JSON array, got ${typeof batch}: ${preview}`,
+      void 0,
+      Object.fromEntries(response.headers.entries()),
+      fetchUrl.toString()
+    );
+  }
   await __privateMethod(this, _ShapeStream_instances, onMessages_fn).call(this, batch);
 };
 requestShapeSSE_fn = async function(opts) {
@@ -2621,7 +2660,9 @@ requestShapeSSE_fn = async function(opts) {
     if (requestAbortController.signal.aborted) {
       throw new FetchBackoffAbortError();
     }
-    throw error;
+    if (error instanceof FetchError || error instanceof StaleCacheError || error instanceof MissingHeadersError) {
+      throw error;
+    }
   } finally {
     const connectionDuration = Date.now() - __privateGet(this, _lastSseConnectionStartTime);
     const wasAborted = requestAbortController.signal.aborted;