Added consensus and execution peer counts to rpc check in

Author: sfaber34

https_connection/httpsConnection.js

@@ -9,6 +9,10 @@ import {
 } from "../getSystemStats.js";
 import { localClient } from "../monitor_components/viemClients.js";
 import { installDir } from "../commandLineOptions.js";
+import {
+  getConsensusPeers,
+  getExecutionPeers,
+} from "../monitor_components/peerCountGauge.js";
 
 export let checkIn;
 
@@ -91,6 +95,12 @@ export function initializeHttpConnection(httpConfig) {
       const memoryUsage = await getMemoryUsage();
       const diskUsage = await getDiskUsage(installDir);
       const macAddress = await getMacAddress();
+      const executionPeers = await getExecutionPeers(
+        httpConfig.executionClient
+      );
+      const consensusPeers = await getConsensusPeers(
+        httpConfig.consensusClient
+      );
 
       const params = new URLSearchParams({
         id: `${os.hostname()}-${macAddress}-${os.platform()}-${os.arch()}`,
@@ -102,6 +112,8 @@ export function initializeHttpConnection(httpConfig) {
         storage_usage: `${diskUsage}`,
         block_number: possibleBlockNumber ? possibleBlockNumber.toString() : "",
         block_hash: possibleBlockHash ? possibleBlockHash : "",
+        execution_peers: executionPeers,
+        consensus_peers: consensusPeers,
       });
 
       const options = {
@@ -118,6 +130,7 @@ export function initializeHttpConnection(httpConfig) {
         });
         res.on("end", () => {
           debugToFile(`Checkin response: ${data}`, () => {});
+          debugToFile(`Response status: ${res.statusCode}`, () => {});
         });
       });
 

monitor_components/peerCountGauge.js

@@ -31,7 +31,7 @@ export function createPeerCountGauge(grid, screen) {
 
 //
 
-async function getExecutionPeers() {
+export async function getExecutionPeers() {
   try {
     const peerCountHex = await localClient.request({
       method: "net_peerCount",
@@ -45,28 +45,20 @@ async function getExecutionPeers() {
   }
 }
 
-async function getConsensusPeers(consensusClient) {
-  // debugToFile(
-  //   `getConsensusPeers() consensusClient: ${consensusClient}`,
-  //   () => {}
-  // );
-
+export async function getConsensusPeers(consensusClient) {
   let searchString;
   if (consensusClient == "prysm") {
     searchString = 'p2p_peer_count{state="Connected"}';
   } else if (consensusClient == "lighthouse") {
     searchString = "libp2p_peers";
   }
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve) => {
     exec(
       `curl -s http://localhost:5054/metrics | grep -E '^${searchString} '`,
       (error, stdout, stderr) => {
-        if (error) {
-          return reject(error);
-        }
-        if (stderr) {
-          debugToFile(`getConsensusPeers(): ${stderr}`, () => {});
-          return reject(new Error(stderr));
+        if (error || stderr) {
+          // debugToFile(`getConsensusPeers(): ${error || stderr}`, () => {});
+          return resolve(null);
         }
 
         const parts = stdout.trim().split(" ");