@electric-sql/client 1.5.4 → 1.5.5

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`;
@@ -2321,7 +2321,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 +2505,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 +2567,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 +2580,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) {