No more web sockets (#24)

* change checkin to https and every minute and when you find a new block

* let's try this

* force checkin once a minute

* force checkin once a minute

Author: austintgriffith

https_connection/httpsConnection.js

@@ -0,0 +1,153 @@
+import https from "https";
+import macaddress from "macaddress";
+import os from "os";
+import { debugToFile } from "../helpers.js";
+import {
+  getMemoryUsage,
+  getCpuUsage,
+  getDiskUsage,
+} from "../getSystemStats.js";
+import { localClient } from "../monitor_components/viemClients.js";
+import { installDir } from "../commandLineOptions.js";
+
+export let checkIn;
+
+function getMacAddress() {
+  return new Promise((resolve, reject) => {
+    macaddress.all((err, all) => {
+      if (err) {
+        reject(`Error getting MAC address: ${err}`);
+        return;
+      }
+
+      // Get the first non-internal MAC address
+      let macAddress = null;
+      for (const interfaceName in all) {
+        const mac = all[interfaceName].mac;
+        if (mac && mac !== "00:00:00:00:00:00") {
+          macAddress = mac;
+          break;
+        }
+      }
+
+      resolve(macAddress);
+    });
+  });
+}
+
+export function initializeHttpConnection(httpConfig) {
+  let lastCheckInTime = 0;
+  let lastCheckedBlockNumber = -1;
+  const minCheckInInterval = 60000; // Minimum 60 seconds between check-ins
+
+  checkIn = async function (force = false) {
+    const now = Date.now();
+    if (!force && now - lastCheckInTime < minCheckInInterval) {
+      return;
+    }
+
+    let currentBlockNumber;
+    try {
+      currentBlockNumber = await localClient.getBlockNumber();
+    } catch (error) {
+      debugToFile(`Failed to get block number: ${error}`, () => {});
+      return;
+    }
+
+    if (!force && currentBlockNumber === lastCheckedBlockNumber) {
+      return;
+    }
+
+    lastCheckInTime = now;
+    lastCheckedBlockNumber = currentBlockNumber;
+
+    let executionClientResponse = httpConfig.executionClient;
+    let consensusClientResponse = httpConfig.consensusClient;
+
+    if (httpConfig.executionClient === "geth") {
+      executionClientResponse += " v" + httpConfig.gethVer;
+    } else if (httpConfig.executionClient === "reth") {
+      executionClientResponse += " v" + httpConfig.rethVer;
+    }
+
+    if (httpConfig.consensusClient === "prysm") {
+      consensusClientResponse += " v" + httpConfig.prysmVer;
+    } else if (httpConfig.consensusClient === "lighthouse") {
+      consensusClientResponse += " v" + httpConfig.lighthouseVer;
+    }
+
+    let possibleBlockNumber;
+    let possibleBlockHash;
+    try {
+      possibleBlockNumber = await localClient.getBlockNumber();
+      const block = await localClient.getBlock();
+      possibleBlockHash = block.hash;
+    } catch (error) {
+      debugToFile(`Failed to get block number: ${error}`, () => {});
+    }
+
+    try {
+      const cpuUsage = await getCpuUsage();
+      const memoryUsage = await getMemoryUsage();
+      const diskUsage = await getDiskUsage(installDir);
+      const macAddress = await getMacAddress();
+
+      const params = new URLSearchParams({
+        id: `${os.hostname()}-${macAddress}-${os.platform()}-${os.arch()}`,
+        node_version: `${process.version}`,
+        execution_client: executionClientResponse,
+        consensus_client: consensusClientResponse,
+        cpu_usage: `${cpuUsage.toFixed(1)}`,
+        memory_usage: `${memoryUsage}`,
+        storage_usage: `${diskUsage}`,
+        block_number: possibleBlockNumber ? possibleBlockNumber.toString() : "",
+        block_hash: possibleBlockHash ? possibleBlockHash : "",
+      });
+
+      const options = {
+        hostname: "rpc.buidlguidl.com",
+        port: 48544,
+        path: `/checkin?${params.toString()}`,
+        method: "GET",
+      };
+
+      const req = https.request(options, (res) => {
+        let data = "";
+        res.on("data", (chunk) => {
+          data += chunk;
+        });
+        res.on("end", () => {
+          debugToFile(`Checkin response: ${data}`, () => {});
+        });
+      });
+
+      req.on("error", (error) => {
+        debugToFile(`Checkin error: ${error}`, () => {});
+      });
+
+      req.end();
+    } catch (error) {
+      debugToFile(`checkIn() Error: ${error}`, () => {});
+    }
+  };
+
+  // Immediate check-in when monitoring starts
+  checkIn(true);
+
+  // Set up block listener
+  localClient.watchBlocks(
+    {
+      onBlock: (block) => {
+        if (block.number > 0) {
+          checkIn(true); // Force check-in for each new block
+        }
+      },
+    },
+    (error) => {
+      debugToFile(`Error in block watcher: ${error}`, () => {});
+    }
+  );
+
+  // Regular interval check-in
+  setInterval(() => checkIn(true), 60000); // Force check-in every 60 seconds
+}

index.js

@@ -11,7 +11,7 @@ import {
   installWindowsConsensusClient,
   installWindowsExecutionClient,
 } from "./ethereum_client_scripts/install.js";
-import { initializeWSConnection } from "./ws_connection/wsConnection.js";
+import { initializeHttpConnection } from "./https_connection/httpsConnection.js";
 import {
   executionClient,
   consensusClient,
@@ -297,7 +297,7 @@ let runsClient = false;
 
 createJwtSecret(jwtDir);
 
-const wsConfig = {
+const httpConfig = {
   executionClient: executionClient,
   consensusClient: consensusClient,
   gethVer: gethVer,
@@ -312,7 +312,7 @@ if (!isAlreadyRunning()) {
   startClient(executionClient, installDir);
   startClient(consensusClient, installDir);
 
-  initializeWSConnection(wsConfig);
+  initializeHttpConnection(httpConfig);
 
   runsClient = true;
   createLockFile();

monitor_components/updateLogicExecution.js

@@ -11,6 +11,7 @@ import { mainnetClient, localClient, isSyncing } from "./viemClients.js";
 import { exec } from "child_process";
 import { populateRethStageGauge } from "./rethStageGauge.js";
 import { populateGethStageGauge } from "./gethStageGauge.js";
+import { checkIn } from "../https_connection/httpsConnection.js";
 
 const progress = loadProgress();
 let gethStageProgress = [
@@ -82,6 +83,7 @@ export function setupLogStreaming(
 ) {
   let logBuffer = [];
   let lastSize = 0;
+  let lastKnownBlockNumber = 0;
 
   const ensureBufferFillsWidget = () => {
     const visibleHeight = executionLog.height - 2; // Account for border
@@ -98,7 +100,7 @@ export function setupLogStreaming(
     }
   };
 
-  const updateLogContent = () => {
+  const updateLogContent = async () => {
     try {
       const stats = fs.statSync(logFilePath);
       const newSize = stats.size;
@@ -116,7 +118,7 @@ export function setupLogStreaming(
           terminal: false,
         });
 
-        newRl.on("line", (line) => {
+        newRl.on("line", async (line) => {
           globalLine = line;
           logBuffer.push(formatLogLines(line));
 
@@ -134,6 +136,20 @@ export function setupLogStreaming(
             saveChainDlProgress(line);
           }
 
+          // Check for new block
+          const blockNumberMatch = line.match(/block=(\d+)/);
+          if (blockNumberMatch) {
+            const currentBlockNumber = parseInt(blockNumberMatch[1], 10);
+            if (currentBlockNumber > lastKnownBlockNumber) {
+              lastKnownBlockNumber = currentBlockNumber;
+              try {
+                await checkIn(); // Call checkIn when a new block is found
+              } catch (error) {
+                debugToFile(`Error calling checkIn: ${error}`, () => {});
+              }
+            }
+          }
+
           screen.render();
         });
 
@@ -161,84 +177,6 @@ export function setupLogStreaming(
   });
 }
 
-// export function setupLogStreaming(
-//   logFilePath,
-//   executionLog,
-//   screen,
-//   rethStageGauge,
-//   gethStageGauge,
-//   chainInfoBox
-// ) {
-//   let logBuffer = [];
-//   let lastSize = 0;
-
-//   const updateLogContent = () => {
-//     try {
-//       const stats = fs.statSync(logFilePath);
-//       const newSize = stats.size;
-
-//       if (newSize > lastSize) {
-//         const newStream = fs.createReadStream(logFilePath, {
-//           encoding: "utf8",
-//           start: lastSize,
-//           end: newSize,
-//         });
-
-//         const newRl = readline.createInterface({
-//           input: newStream,
-//           output: process.stdout,
-//           terminal: false,
-//         });
-
-//         newRl.on("line", (line) => {
-//           globalLine = line;
-//           logBuffer.push(formatLogLines(line));
-
-//           debugToFile(`logBuffer.length: ${logBuffer.length}`, () => {});
-
-//           if (logBuffer.length > executionLog.height - 2) {
-//             logBuffer.shift();
-//           }
-
-//           executionLog.setContent(logBuffer.join("\n"));
-
-//           if (executionClient == "geth") {
-//             if (screen.children.includes(gethStageGauge)) {
-//               populateGethStageGauge(gethStageProgress);
-//             }
-
-//             saveHeaderDlProgress(line);
-//             saveStateDlProgress(line);
-//             saveChainDlProgress(line);
-//           }
-
-//           screen.render();
-//         });
-
-//         newRl.on("close", () => {
-//           lastSize = newSize;
-//         });
-
-//         newRl.on("error", (err) => {
-//           debugToFile(`Error reading log file: ${err}`, () => {});
-//         });
-//       }
-//     } catch (error) {
-//       debugToFile(`Error accessing log file: ${error}`, () => {});
-//     }
-//   };
-
-//   // Initial read to load existing content
-//   updateLogContent();
-
-//   // Watch for file changes
-//   fs.watchFile(logFilePath, (curr, prev) => {
-//     if (curr.mtime > prev.mtime) {
-//       updateLogContent();
-//     }
-//   });
-// }
-
 let statusMessage = "INITIALIZING...";
 
 async function createGethMessage(syncingStatus, blockNumber, latestBlock) {

package-lock.json

@@ -13,6 +13,7 @@
     "axios": "^1.7.2",
     "blessed": "^0.1.81",
     "blessed-contrib": "^4.11.0",
+    "https": "^1.0.0",
     "macaddress": "^0.5.3",
     "minimist": "^1.2.8",
     "node-pty": "^1.0.0",