Add "noack" option to completely disable managed ack on websockets

Also move to passing an "options" object instead of continuing to add
individual parameters to the listen() function.

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

Author: awrichar

lib/firefly.ts

@@ -612,26 +612,34 @@ export default class FireFly extends HttpBase {
     subscriptions: string | string[] | FireFlySubscriptionBase,
     callback: FireFlyWebSocketCallback,
     socketOptions?: WebSocket.ClientOptions | http.ClientRequestArgs,
-    afterConnect?: FireFlyWebSocketConnectCallback,
+    fireflySocketOptions?: Partial<FireFlyWebSocketOptions> | FireFlyWebSocketConnectCallback,
   ): FireFlyWebSocket {
+    if (typeof fireflySocketOptions === 'function') {
+      // Legacy compatibility (afterConnect callback passed as 4th arg)
+      fireflySocketOptions = <FireFlyWebSocketOptions>{
+        afterConnect: fireflySocketOptions,
+      };
+    }
     const options: FireFlyWebSocketOptions = {
       host: this.options.websocket.host,
       namespace: this.options.namespace,
       username: this.options.username,
       password: this.options.password,
-      subscriptions: [],
-      autoack: false,
       reconnectDelay: this.options.websocket.reconnectDelay,
       heartbeatInterval: this.options.websocket.heartbeatInterval,
-      socketOptions: socketOptions,
-      afterConnect: afterConnect,
+      autoack: false,
+      ...fireflySocketOptions,
+      socketOptions,
+      subscriptions: [],
     };
 
     const handler: FireFlyWebSocketCallback = (socket, event) => {
       this.queue = this.queue.finally(() => callback(socket, event));
-      this.queue.then(() => {
-        socket.ack(event);
-      });
+      if (!options.noack) {
+        this.queue.then(() => {
+          socket.ack(event);
+        });
+      }
     };
 
     if (Array.isArray(subscriptions)) {

lib/interfaces.ts

@@ -76,7 +76,8 @@ export interface FireFlyWebSocketOptions {
   username?: string;
   password?: string;
   ephemeral?: FireFlyEphemeralSubscription;
-  autoack: boolean;
+  autoack?: boolean;
+  noack?: boolean;
   reconnectDelay: number;
   heartbeatInterval: number;
   socketOptions?: WebSocket.ClientOptions | http.ClientRequestArgs;