Merge pull request #4226 from rmosolgo/ably-dont-pass-empty-data

Don't pass along empty initial responses in Ably subscriptions
rmosolgo · Oct 13, 2022 · 3fa4e93 · 3fa4e93
2 parents b5d5641 + 44db672
commit 3fa4e93
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 1 deletion.
diff --git a/javascript_client/src/subscriptions/__tests__/createAblyHandlerTest.ts b/javascript_client/src/subscriptions/__tests__/createAblyHandlerTest.ts
@@ -185,6 +185,41 @@ describe("createAblyHandler", () => {
     expect(nextInvokedWith).toBeUndefined()
   })
 
+  it("doesn't dispatch anything for an empty data object", async () => {
+    let errorInvokedWith = undefined
+    let nextInvokedWith = undefined
+
+    const producer = createAblyHandler({
+      fetchOperation: () =>
+        new Promise(resolve =>
+          resolve({
+            headers: new Map([["X-Subscription-ID", "foo"]]),
+            body: { data: {} }
+          })
+        ),
+      ably: createDummyConsumer()
+    })
+
+    producer(
+      dummyOperation,
+      {},
+      {},
+      {
+        onError: (errors: any) => {
+          errorInvokedWith = errors
+        },
+        onNext: (response: any) => {
+          nextInvokedWith = response
+        },
+        onCompleted: () => {}
+      }
+    )
+
+    await nextTick()
+    expect(errorInvokedWith).toBeUndefined()
+    expect(nextInvokedWith).toBeUndefined()
+  })
+
   it("dispatches caught errors", async () => {
     let errorInvokedWith = undefined
     let nextInvokedWith = undefined

diff --git a/javascript_client/src/subscriptions/createAblyHandler.ts b/javascript_client/src/subscriptions/createAblyHandler.ts
@@ -55,7 +55,7 @@ function createAblyHandler(options: AblyHandlerOptions) {
         if (result.errors) {
           // What kind of error stuff belongs here?
           observer.onError(result.errors)
-        } else if (result.data) {
+        } else if (result.data && Object.keys(result.data).length > 0) {
           observer.onNext({ data: result.data })
         }
       }