From b99c672112c92f92bf1421f3eae44b6861292de9 Mon Sep 17 00:00:00 2001
From: Matthew Little <zone117x@gmail.com>
Date: Thu, 21 Nov 2024 15:54:10 +0100
Subject: [PATCH] fix: socket-io reconnection bug (#2174)

* fix: socket-io reconnection bug

* test: add socket-io reconnection test
---
 client/src/socket-io/index.ts                 |  2 +-
 .../routes/ws/channels/socket-io-channel.ts   |  5 +-
 tests/api/socket-io.test.ts                   | 57 +++++++++++++++++++
 3 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/client/src/socket-io/index.ts b/client/src/socket-io/index.ts
index 62578c7c0..3bba9f918 100644
--- a/client/src/socket-io/index.ts
+++ b/client/src/socket-io/index.ts
@@ -72,7 +72,7 @@ export class StacksApiSocketClient {
 
   handleSubscription(topic: Topic, subscribe = false, listener?: (...args: any[]) => void) {
     const subsQuery = this.socket.io.opts.query?.subscriptions as string | undefined;
-    const subscriptions = new Set(subsQuery?.split(',') ?? []);
+    const subscriptions = new Set(subsQuery ? subsQuery.split(',') : []);
     if (subscribe) {
       this.socket.emit('subscribe', topic, error => {
         if (error) console.error(`Error subscribing: ${error}`);
diff --git a/src/api/routes/ws/channels/socket-io-channel.ts b/src/api/routes/ws/channels/socket-io-channel.ts
index 9d373e281..963d871cc 100644
--- a/src/api/routes/ws/channels/socket-io-channel.ts
+++ b/src/api/routes/ws/channels/socket-io-channel.ts
@@ -90,7 +90,10 @@ export class SocketIOChannel extends WebSocketChannel {
     io.use((socket, next) => {
       const subscriptions = socket.handshake.query['subscriptions'];
       if (subscriptions) {
-        const topics = [...[subscriptions]].flat().flatMap(r => r.split(','));
+        const topics = [...[subscriptions]]
+          .flat()
+          .flatMap(r => r.split(','))
+          .filter(r => !!r);
         const invalidSubs = this.getInvalidSubscriptionTopics(topics as Topic[]);
         if (invalidSubs) {
           const error = new Error(`Invalid topic: ${invalidSubs.join(', ')}`);
diff --git a/tests/api/socket-io.test.ts b/tests/api/socket-io.test.ts
index 04627c405..c787fcad7 100644
--- a/tests/api/socket-io.test.ts
+++ b/tests/api/socket-io.test.ts
@@ -20,6 +20,7 @@ import {
   NftEvent,
   Transaction,
 } from 'client/src/types';
+import { Socket } from 'node:net';
 
 describe('socket-io', () => {
   let apiServer: ApiServer;
@@ -40,6 +41,62 @@ describe('socket-io', () => {
     await migrate('down');
   });
 
+  test('socket-io-client > reconnect', async () => {
+    const serverSocketConnectWaiter = waiter<Socket>();
+    apiServer.server.once('upgrade', (_req, socket: Socket) => {
+      serverSocketConnectWaiter.finish(socket);
+    });
+
+    const client = new StacksApiSocketClient({
+      url: `http://${apiServer.address}`,
+      // socketOpts: { reconnection: false },
+    });
+
+    const updateWaiter: Waiter<Block> = waiter();
+    const subResult = client.subscribeBlocks(block => updateWaiter.finish(block));
+
+    // subscriptions should be saved in the client query obj
+    expect(client.socket.io.opts.query).toMatchObject({ subscriptions: 'block' });
+
+    // wait for initial client connection
+    await new Promise<void>(resolve => client.socket.once('connect', resolve));
+
+    const connectAttempt = waiter();
+    client.socket.io.once('reconnect_attempt', attempt => {
+      // subscriptions should be saved in the client query obj
+      expect(client.socket.io.opts.query).toMatchObject({ subscriptions: 'block' });
+      connectAttempt.finish();
+    });
+
+    const reconnectWaiter = waiter();
+    client.socket.io.once('reconnect', () => reconnectWaiter.finish());
+
+    // force kill client connection on the server to trigger reconnect
+    const serverSocket = await serverSocketConnectWaiter;
+    serverSocket.resetAndDestroy();
+
+    await connectAttempt;
+    await reconnectWaiter;
+
+    // ensure client still waiting for block update
+    expect(updateWaiter.isFinished).toBe(false);
+
+    const block = new TestBlockBuilder({ block_hash: '0x1234', burn_block_hash: '0x5454' })
+      .addTx({ tx_id: '0x4321' })
+      .build();
+    await db.update(block);
+
+    const result = await updateWaiter;
+    try {
+      expect(result.hash).toEqual('0x1234');
+      expect(result.burn_block_hash).toEqual('0x5454');
+      expect(result.txs[0]).toEqual('0x4321');
+    } finally {
+      subResult.unsubscribe();
+      client.socket.close();
+    }
+  });
+
   test('socket-io-client > block updates', async () => {
     const client = new StacksApiSocketClient({
       url: `http://${apiServer.address}`,