Add support for batched websocket delivery

Signed-off-by: Andrew Richardson <[email protected]>

Author: awrichar

lib/interfaces.ts

@@ -185,6 +185,17 @@ export interface FireFlyEventDelivery extends Omit<FireFlyEnrichedEvent, 'type'>
   };
 }
 
+export interface FireFlyEventBatchDelivery {
+  type: 'event_batch';
+  id: string;
+  subscription: {
+    id: string;
+    name: string;
+    namespace: string;
+  };
+  events: FireFlyEventDelivery[];
+}
+
 // Datatypes
 
 export type FireFlyDatatypeFilter = operations['getDatatypes']['parameters']['query'];

lib/websocket.ts

@@ -5,6 +5,7 @@ import {
   FireFlyEphemeralSubscription,
   FireFlyWebSocketOptions,
   FireFlyEventDelivery,
+  FireFlyEventBatchDelivery,
 } from './interfaces';
 import Logger from './logger';
 
@@ -19,7 +20,10 @@ function buildEphemeralQueryParams(sub: FireFlyEphemeralSubscription) {
 }
 
 export interface FireFlyWebSocketCallback {
-  (socket: FireFlyWebSocket, data: FireFlyEventDelivery): void | Promise<void>;
+  (
+    socket: FireFlyWebSocket,
+    data: FireFlyEventDelivery | FireFlyEventBatchDelivery,
+  ): void | Promise<void>;
 }
 
 export class FireFlyWebSocket {
@@ -166,7 +170,7 @@ export class FireFlyWebSocket {
     }
   }
 
-  ack(event: FireFlyEventDelivery) {
+  ack(event: FireFlyEventDelivery | FireFlyEventBatchDelivery) {
     if (this.socket !== undefined && event.id !== undefined) {
       this.socket.send(
         JSON.stringify({
@@ -179,7 +183,7 @@ export class FireFlyWebSocket {
   }
 
   async close(wait?: boolean): Promise<void> {
-    const closedPromise = new Promise<void>(resolve => {
+    const closedPromise = new Promise<void>((resolve) => {
       this.closed = resolve;
     });
     this.clearPingTimers();