Refactor. API explanations. UX revamp.

backend/src/api/bitcoin/electrs-api.ts

@@ -1,5 +1,5 @@
 const config = require('../../../mempool-config.json');
-import { Transaction, Block } from '../../interfaces';
+import { Transaction, Block, MempoolInfo } from '../../interfaces';
 import * as request from 'request';
 
 class ElectrsApi {
@@ -7,6 +7,27 @@ class ElectrsApi {
   constructor() {
   }
 
+  getMempoolInfo(): Promise<MempoolInfo> {
+    return new Promise((resolve, reject) => {
+      request(config.ELECTRS_API_URL + '/mempool', { json: true, timeout: 10000 }, (err, res, response) => {
+        if (err) {
+          reject(err);
+        } else if (res.statusCode !== 200) {
+          reject(response);
+        } else {
+          if (!response.count) {
+            reject('Empty data');
+            return;
+          }
+          resolve({
+            size: response.count,
+            bytes: response.vsize,
+          });
+        }
+      });
+    });
+  }
+
   getRawMempool(): Promise<Transaction['txid'][]> {
     return new Promise((resolve, reject) => {
       request(config.ELECTRS_API_URL + '/mempool/txids', { json: true, timeout: 10000, forever: true }, (err, res, response) => {

backend/src/api/mempool.ts

@@ -32,6 +32,14 @@ class Mempool {
     }
   }
 
+  public async updateMemPoolInfo() {
+    try {
+      this.mempoolInfo = await bitcoinApi.getMempoolInfo();
+    } catch (err) {
+      console.log('Error getMempoolInfo', err);
+    }
+  }
+
   public getMempoolInfo(): MempoolInfo | undefined {
     return this.mempoolInfo;
   }

backend/src/index.ts

@@ -58,6 +58,7 @@ class Server {
   }
 
   private async runMempoolIntervalFunctions() {
+    await memPool.updateMemPoolInfo();
     await blocks.updateBlocks();
     await memPool.updateMempool();
     setTimeout(this.runMempoolIntervalFunctions.bind(this), config.ELECTRS_POLL_RATE_MS);
@@ -83,28 +84,33 @@ class Server {
           const parsedMessage = JSON.parse(message);
 
           if (parsedMessage.action === 'want') {
-            client['want-stats'] = parsedMessage.data.indexOf('stats') > -1;
+            client['want-blocks'] = parsedMessage.data.indexOf('blocks') > -1;
+            client['want-mempool-blocks'] = parsedMessage.data.indexOf('mempool-blocks') > -1;
             client['want-live-2h-chart'] = parsedMessage.data.indexOf('live-2h-chart') > -1;
+            client['want-stats'] = parsedMessage.data.indexOf('stats') > -1;
           }
 
           if (parsedMessage && parsedMessage.txId && /^[a-fA-F0-9]{64}$/.test(parsedMessage.txId)) {
             client['txId'] = parsedMessage.txId;
           }
+
+          if (parsedMessage.action === 'init') {
+            const _blocks = blocks.getBlocks();
+            if (!_blocks) {
+              return;
+            }
+            client.send(JSON.stringify({
+              'mempoolInfo': memPool.getMempoolInfo(),
+              'vBytesPerSecond': memPool.getVBytesPerSecond(),
+              'blocks': _blocks,
+              'conversions': fiatConversion.getTickers()['BTCUSD'],
+              'mempool-blocks': mempoolBlocks.getMempoolBlocks(),
+            }));
+          }
         } catch (e) {
           console.log(e);
         }
       });
-
-      const _blocks = blocks.getBlocks();
-      if (!_blocks) {
-        return;
-      }
-      client.send(JSON.stringify({
-        'blocks': _blocks,
-        'conversions': fiatConversion.getTickers()['BTCUSD'],
-        'mempool-blocks': mempoolBlocks.getMempoolBlocks(),
-      }));
-
     });
 
     statistics.setNewStatisticsEntryCallback((stats: Statistic) => {
@@ -113,11 +119,13 @@ class Server {
           return;
         }
 
-        if (client['want-live-2h-chart']) {
-          client.send(JSON.stringify({
-            'live-2h-chart': stats
-          }));
+        if (!client['want-live-2h-chart']) {
+          return;
         }
+
+        client.send(JSON.stringify({
+          'live-2h-chart': stats
+        }));
       });
     });
 
@@ -127,6 +135,10 @@ class Server {
           return;
         }
 
+        if (!client['want-blocks']) {
+          return;
+        }
+
         if (client['txId'] && txIds.indexOf(client['txId']) > -1) {
           client['txId'] = null;
           client.send(JSON.stringify({
@@ -143,16 +155,29 @@ class Server {
 
     memPool.setMempoolChangedCallback((newMempool: { [txid: string]: SimpleTransaction }) => {
       mempoolBlocks.updateMempoolBlocks(newMempool);
-      const pBlocks = mempoolBlocks.getMempoolBlocks();
+      const mBlocks = mempoolBlocks.getMempoolBlocks();
+      const mempoolInfo = memPool.getMempoolInfo();
+      const vBytesPerSecond = memPool.getVBytesPerSecond();
 
       this.wss.clients.forEach((client: WebSocket) => {
         if (client.readyState !== WebSocket.OPEN) {
           return;
         }
 
-        client.send(JSON.stringify({
-          'mempool-blocks': pBlocks
-        }));
+        const response = {};
+
+        if (client['want-stats']) {
+          response['mempoolInfo'] = mempoolInfo;
+          response['vBytesPerSecond'] = vBytesPerSecond;
+        }
+
+        if (client['want-mempool-blocks']) {
+          response['mempool-blocks'] = mBlocks;
+        }
+
+        if (Object.keys(response).length) {
+          client.send(JSON.stringify(response));
+        }
       });
     });
   }