Add nodes per network chart component

backend/src/api/database-migration.ts

@@ -4,7 +4,7 @@ import logger from '../logger';
 import { Common } from './common';
 
 class DatabaseMigration {
-  private static currentVersion = 25;
+  private static currentVersion = 26;
   private queryTimeout = 120000;
   private statisticsAddedIndexed = false;
   private uniqueLogs: string[] = [];
@@ -257,6 +257,14 @@ class DatabaseMigration {
         await this.$executeQuery(this.getCreateNodesStatsQuery(), await this.$checkIfTableExists('node_stats'));
       }
 
+      if (databaseSchemaVersion < 26 && isBitcoin === true) {
+        this.uniqueLog(logger.notice, `'lightning_stats' table has been truncated. Will re-generate historical data from scratch.`);
+        await this.$executeQuery(`TRUNCATE lightning_stats`);
+        await this.$executeQuery('ALTER TABLE `lightning_stats` ADD tor_nodes int(11) NOT NULL DEFAULT "0"');
+        await this.$executeQuery('ALTER TABLE `lightning_stats` ADD clearnet_nodes int(11) NOT NULL DEFAULT "0"');
+        await this.$executeQuery('ALTER TABLE `lightning_stats` ADD unannounced_nodes int(11) NOT NULL DEFAULT "0"');
+      }
+
     } catch (e) {
       throw e;
     }

backend/src/api/explorer/statistics.api.ts

@@ -4,7 +4,7 @@ import DB from '../../database';
 class StatisticsApi {
   public async $getStatistics(): Promise<any> {
     try {
-      const query = `SELECT UNIX_TIMESTAMP(added) AS added, channel_count, node_count, total_capacity FROM lightning_stats ORDER BY id DESC`;
+      const query = `SELECT UNIX_TIMESTAMP(added) AS added, channel_count, node_count, total_capacity, tor_nodes, clearnet_nodes, unannounced_nodes FROM lightning_stats ORDER BY id DESC`;
       const [rows]: any = await DB.query(query);
       return rows;
     } catch (e) {

backend/src/tasks/lightning/stats-updater.service.ts

@@ -1,6 +1,8 @@
-import logger from "../../logger";
-import DB from "../../database";
-import lightningApi from "../../api/lightning/lightning-api-factory";
+
+import DB from '../../database';
+import logger from '../../logger';
+import lightningApi from '../../api/lightning/lightning-api-factory';
+import * as net from 'net';
 
 class LightningStatsUpdater {
   constructor() {}
@@ -115,37 +117,67 @@ class LightningStatsUpdater {
           added,
           channel_count,
           node_count,
-          total_capacity
+          total_capacity,
+          tor_nodes,
+          clearnet_nodes,
+          unannounced_nodes
         )
-        VALUES (FROM_UNIXTIME(?), ?, ?, ?)`;
+        VALUES (FROM_UNIXTIME(?), ?, ?, ?, ?, ?, ?)`;
 
       await DB.query(query, [
         date.getTime() / 1000,
         channelsCount,
         0,
         totalCapacity,
+        0,
+        0,
+        0
       ]);
 
         // Add one day and continue
         date.setDate(date.getDate() + 1);
       }
 
-      const [nodes]: any = await DB.query(`SELECT first_seen FROM nodes ORDER BY first_seen ASC`);
+      const [nodes]: any = await DB.query(`SELECT first_seen, sockets FROM nodes ORDER BY first_seen ASC`);
       date = new Date(startTime);
 
       while (date < currentDate) {
         let nodeCount = 0;
+        let clearnetNodes = 0;
+        let torNodes = 0;
+        let unannouncedNodes = 0;
         for (const node of nodes) {
           if (new Date(node.first_seen) > date) {
             break;
           }
           nodeCount++;
+
+          const sockets = node.sockets.split(',');
+          let isUnnanounced = true;
+          for (const socket of sockets) {
+            const hasOnion = socket.indexOf('.onion') !== -1;
+            if (hasOnion) {
+              torNodes++;
+              isUnnanounced = false;
+            }
+            const hasClearnet = [4, 6].includes(net.isIP(socket.split(':')[0]));
+            if (hasClearnet) {
+              clearnetNodes++;
+              isUnnanounced = false;
+            }
+          }
+          if (isUnnanounced) {
+            unannouncedNodes++;
+          }
         }
 
-        const query = `UPDATE lightning_stats SET node_count = ? WHERE added = FROM_UNIXTIME(?)`;
+        const query = `UPDATE lightning_stats SET node_count = ?, tor_nodes = ?, clearnet_nodes = ?, unannounced_nodes = ? WHERE added = FROM_UNIXTIME(?)`;
 
         await DB.query(query, [
           nodeCount,
+          torNodes,
+          clearnetNodes,
+          unannouncedNodes,
           date.getTime() / 1000,
         ]);
 
@@ -178,18 +210,46 @@ class LightningStatsUpdater {
         }
       }
 
+      let clearnetNodes = 0;
+      let torNodes = 0;
+      let unannouncedNodes = 0;
+      for (const node of networkGraph.nodes) {
+        let isUnnanounced = true;
+        for (const socket of node.sockets) {
+          const hasOnion = socket.indexOf('.onion') !== -1;
+          if (hasOnion) {
+            torNodes++;
+            isUnnanounced = false;
+          }
+          const hasClearnet = [4, 6].includes(net.isIP(socket.split(':')[0]));
+          if (hasClearnet) {
+            clearnetNodes++;
+            isUnnanounced = false;
+          }
+        }
+        if (isUnnanounced) {
+          unannouncedNodes++;
+        }
+      }
+
       const query = `INSERT INTO lightning_stats(
           added,
           channel_count,
           node_count,
-          total_capacity
+          total_capacity,
+          tor_nodes,
+          clearnet_nodes,
+          unannounced_nodes
         )
-        VALUES (NOW(), ?, ?, ?)`;
+        VALUES (NOW(), ?, ?, ?, ?, ?, ?)`;
 
       await DB.query(query, [
         networkGraph.channels.length,
         networkGraph.nodes.length,
         total_capacity,
+        torNodes,
+        clearnetNodes,
+        unannouncedNodes
       ]);
       logger.info(`Lightning daily stats done.`);
     } catch (e) {