run network tail cleanup

Moonsong-Labs · Sep 12, 2023 · cc50a28 · cc50a28
1 parent ddf7923
commit cc50a28
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 108 deletions.
diff --git a/.changeset/moody-fans-juggle.md b/.changeset/moody-fans-juggle.md
@@ -12,4 +12,5 @@
 - [#251](https://github.com/Moonsong-Labs/moonwall/issues/251)
 - [#224](https://github.com/Moonsong-Labs/moonwall/issues/224)
 - [#255](https://github.com/Moonsong-Labs/moonwall/issues/255)
-- [#262](https://github.com/Moonsong-Labs/moonwall/issues/262)
+- [#262](https://github.com/Moonsong-Labs/moonwall/issues/262)
+- [#49](https://github.com/Moonsong-Labs/moonwall/issues/49)
diff --git a/packages/cli/src/cmds/runNetwork.ts b/packages/cli/src/cmds/runNetwork.ts
@@ -2,10 +2,9 @@ import { Environment } from "@moonwall/types";
 import { ApiPromise } from "@polkadot/api";
 import chalk from "chalk";
 import clear from "clear";
-import fs, { promises as fsPromises, watch } from "fs";
+import fs, { promises as fsPromises } from "fs";
 import inquirer from "inquirer";
 import PressToContinuePrompt from "inquirer-press-to-continue";
-import { createReadStream, stat } from "node:fs";
 import WebSocket from "ws";
 import { parse } from "yaml";
 import { clearNodeLogs, reportLogLocation } from "../internal/cmdFunctions/tempLogs";
@@ -370,127 +369,80 @@ const resolveTailChoice = async (env: Environment) => {
   });
 
   await new Promise(async (resolve) => {
-    const ctx = MoonwallContext.getContext();
     const onData = (chunk: any) => ui.log.write(chunk.toString());
+    const logFilePath = process.env.MOON_MONITORED_NODE
+      ? process.env.MOON_MONITORED_NODE
+      : process.env.MOON_LOG_LOCATION;
 
-    if (ctx.foundation == "zombie") {
-      const logPath = process.env.MOON_MONITORED_NODE!;
-      let currentReadPosition = 0;
+    // eslint-disable-next-line prefer-const
+    let currentReadPosition = 0;
 
-      const readLog = () => {
-        stat(logPath, (err, stats) => {
-          if (err) {
-            console.error("Error reading log: ", err);
-            return;
-          }
-
-          const newReadPosition = stats.size;
-
-          if (newReadPosition > currentReadPosition) {
-            const stream = createReadStream(logPath, {
-              start: currentReadPosition,
-              end: newReadPosition,
-            });
-            stream.on("data", onData);
-            stream.on("end", () => {
-              currentReadPosition = newReadPosition;
-            });
-          }
-        });
-      };
-
-      const watcher = watch(logPath, (eventType) => {
-        if (eventType === "change") {
-          readLog();
-        }
+    const printLogs = (newReadPosition: number, currentReadPosition: number) => {
+      const stream = fs.createReadStream(logFilePath, {
+        start: currentReadPosition,
+        end: newReadPosition,
       });
+      stream.on("data", onData);
+      stream.on("end", () => {
+        currentReadPosition = newReadPosition;
+      });
+    };
 
-      readLog();
-      inquirer
-        .prompt({
-          name: "exitTail",
-          type: "press-to-continue",
-          anyKey: true,
-          pressToContinueMessage: " Press any key to stop tailing logs and go back  ↩️",
-        })
-        .then(() => {
-          watcher.close();
-          resolve("");
-        });
-    } else {
-      const logFilePath = process.env.MOON_LOG_LOCATION;
-
-      // eslint-disable-next-line prefer-const
-      let currentReadPosition = 0;
-
-      const printLogs = (newReadPosition: number, currentReadPosition: number) => {
-        const stream = fs.createReadStream(logFilePath, {
-          start: currentReadPosition,
-          end: newReadPosition,
-        });
-        stream.on("data", onData);
-        stream.on("end", () => {
-          currentReadPosition = newReadPosition;
-        });
-      };
-
-      const readLog = () => {
-        const stats = fs.statSync(logFilePath);
-        const newReadPosition = stats.size;
-
-        if (newReadPosition > currentReadPosition && tailing) {
-          printLogs(newReadPosition, currentReadPosition);
-        }
-      };
+    const readLog = () => {
+      const stats = fs.statSync(logFilePath);
+      const newReadPosition = stats.size;
 
-      printLogs(fs.statSync(logFilePath).size, 0);
+      if (newReadPosition > currentReadPosition && tailing) {
+        printLogs(newReadPosition, currentReadPosition);
+      }
+    };
 
-      const handleInputData = async (key: any) => {
-        ui.rl.input.pause();
-        const char = key.toString().trim();
+    printLogs(fs.statSync(logFilePath).size, 0);
 
-        if (char === "p") {
-          tailing = false;
-          // printLogs(fs.statSync(logFilePath).size, currentReadPosition);
-          ui.updateBottomBar(bottomBarContents + resumePauseProse[1]);
-        }
+    const handleInputData = async (key: any) => {
+      ui.rl.input.pause();
+      const char = key.toString().trim();
 
-        if (char === "r") {
-          printLogs(fs.statSync(logFilePath).size, currentReadPosition);
-          tailing = true;
-          ui.updateBottomBar(bottomBarContents + resumePauseProse[0]);
-        }
+      if (char === "p") {
+        tailing = false;
+        ui.updateBottomBar(bottomBarContents + resumePauseProse[1]);
+      }
 
-        if (char === "q") {
-          ui.rl.input.removeListener("data", handleInputData);
-          ui.rl.input.pause();
-          fs.unwatchFile(logFilePath);
-          resolve("");
-        }
+      if (char === "r") {
+        printLogs(fs.statSync(logFilePath).size, currentReadPosition);
+        tailing = true;
+        ui.updateBottomBar(bottomBarContents + resumePauseProse[0]);
+      }
 
-        if (char === "t") {
-          await resolveTestChoice(env, true);
-          ui.updateBottomBar(bottomBarContents + resumePauseProse[tailing ? 0 : 1]);
-        }
+      if (char === "q") {
+        ui.rl.input.removeListener("data", handleInputData);
+        ui.rl.input.pause();
+        fs.unwatchFile(logFilePath);
+        resolve("");
+      }
 
-        if (char === "g") {
-          ui.rl.input.pause();
-          tailing = false;
-          await resolveGrepChoice(env, true);
-          ui.updateBottomBar(bottomBarContents + resumePauseProse[tailing ? 0 : 1]);
-          tailing = true;
-          ui.rl.input.resume();
-        }
+      if (char === "t") {
+        await resolveTestChoice(env, true);
+        ui.updateBottomBar(bottomBarContents + resumePauseProse[tailing ? 0 : 1]);
+      }
 
+      if (char === "g") {
+        ui.rl.input.pause();
+        tailing = false;
+        await resolveGrepChoice(env, true);
+        ui.updateBottomBar(bottomBarContents + resumePauseProse[tailing ? 0 : 1]);
+        tailing = true;
         ui.rl.input.resume();
-      };
+      }
 
-      ui.rl.input.on("data", handleInputData);
+      ui.rl.input.resume();
+    };
 
-      fs.watchFile(logFilePath, () => {
-        readLog();
-      });
-    }
+    ui.rl.input.on("data", handleInputData);
+
+    fs.watchFile(logFilePath, () => {
+      readLog();
+    });
   });
 
   ui.close();