fix: send response with nos sub active

blockfrost · Oct 20, 2021 · cf823cb · cf823cb
1 parent ad548a4
commit cf823cb
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/src/server.ts b/src/server.ts
@@ -226,14 +226,15 @@ wss.on('connection', (ws: Server.Ws) => {
         const activeBlockSubIndex = activeSubscriptions.findIndex(i => i.type === 'block');
 
         if (activeBlockSubIndex > -1) {
-          const message = prepareMessage(data.id, {
-            subscribed: false,
-          });
-
-          ws.send(message);
           activeSubscriptions.splice(activeBlockSubIndex);
         }
 
+        const message = prepareMessage(data.id, {
+          subscribed: false,
+        });
+
+        ws.send(message);
+
         break;
       }
 
@@ -255,11 +256,11 @@ wss.on('connection', (ws: Server.Ws) => {
             type: 'addresses',
             id: data.id,
           });
+        }
 
-          const message = prepareMessage(data.id, { subscribed: true });
+        const message = prepareMessage(data.id, { subscribed: true });
 
-          ws.send(message);
-        }
+        ws.send(message);
 
         break;
       }
@@ -268,15 +269,16 @@ wss.on('connection', (ws: Server.Ws) => {
         const activeAddressSubIndex = activeSubscriptions.findIndex(i => i.type === 'addresses');
 
         if (activeAddressSubIndex > -1) {
-          const message = prepareMessage(data.id, {
-            subscribed: false,
-          });
-
-          ws.send(message);
-          addressedSubscribed = [];
           activeSubscriptions.splice(activeAddressSubIndex);
         }
 
+        const message = prepareMessage(data.id, {
+          subscribed: false,
+        });
+
+        ws.send(message);
+        addressedSubscribed = [];
+
         break;
       }