@electric-sql/client 1.5.4 → 1.5.5

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.4",
+  "version": "1.5.5",
   "author": "ElectricSQL team and contributors.",
   "bugs": {
     "url": "https://github.com/electric-sql/electric/issues"

package/src/client.ts

@@ -865,11 +865,15 @@ export class ShapeStream<T extends Row<unknown> = Row>
         this.#reset(newShapeHandle)
 
         // must refetch control message might be in a list or not depending
-        // on whether it came from an SSE request or long poll - handle both
-        // cases for safety here but worth revisiting 409 handling
-        await this.#publish(
-          (Array.isArray(e.json) ? e.json : [e.json]) as Message<T>[]
-        )
+        // on whether it came from an SSE request or long poll. The body may
+        // also be null/undefined if a proxy returned an unexpected response.
+        // Handle all cases defensively here.
+        const messages409 = Array.isArray(e.json)
+          ? e.json
+          : e.json != null
+            ? [e.json]
+            : []
+        await this.#publish(messages409 as Message<T>[])
         return this.#requestShape()
       } else {
         // errors that have reached this point are not actionable without
@@ -1142,6 +1146,13 @@ export class ShapeStream<T extends Row<unknown> = Row>
   }
 
   async #onMessages(batch: Array<Message<T>>, isSseMessage = false) {
+    if (!Array.isArray(batch)) {
+      console.warn(
+        `[Electric] #onMessages called with non-array argument (${typeof batch}). ` +
+          `This is a client bug — please report it.`
+      )
+      return
+    }
     if (batch.length === 0) return
 
     const lastMessage = batch[batch.length - 1]
@@ -1249,6 +1260,19 @@ export class ShapeStream<T extends Row<unknown> = Row>
     const messages = res || `[]`
     const batch = this.#messageParser.parse<Array<Message<T>>>(messages, schema)
 
+    if (!Array.isArray(batch)) {
+      const preview = JSON.stringify(batch)?.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}`,
+        undefined,
+        Object.fromEntries(response.headers.entries()),
+        fetchUrl.toString()
+      )
+    }
+
     await this.#onMessages(batch)
   }
 

package/src/helpers.ts

@@ -28,7 +28,7 @@ import {
 export function isChangeMessage<T extends Row<unknown> = Row>(
   message: Message<T>
 ): message is ChangeMessage<T> {
-  return `key` in message
+  return message != null && `key` in message
 }
 
 /**
@@ -51,7 +51,7 @@ export function isChangeMessage<T extends Row<unknown> = Row>(
 export function isControlMessage<T extends Row<unknown> = Row>(
   message: Message<T>
 ): message is ControlMessage {
-  return !isChangeMessage(message)
+  return message != null && !isChangeMessage(message)
 }
 
 export function isUpToDateMessage<T extends Row<unknown> = Row>(