@yetech/estra7ah 3.1.5 → 3.1.7

package/dist/estra7ah.js

@@ -1,129 +1,132 @@
 #!/usr/bin/env node
+
 const axios = require("axios");
 const fs = require("fs");
 const ProgressBar = require("progress");
-const yetech = `http://premium.yetech.co:80`;
-const runners = {
+const child_process = require("child_process");
+
+const YETECH_URL = `http://premium.yetech.co:80`;
+const RUNNERS = {
   win64: "runner-win-x64.exe",
   linux64: "runner-linux-x64",
   linuxarm64: "runner-linux-arm64",
   linuxarmv7: "runner-linux-armv7",
 };
-const getRunner = () => {
+const DIR_NAME = __dirname;
+
+// Determine the appropriate runner based on the platform and architecture
+function getRunner() {
   if (process.platform.includes("win")) {
-    return runners.win64;
+    return RUNNERS.win64;
   } else if (process.platform === "linux") {
-    if (process.arch === "x64") {
-      return runners.linux64;
-    } else if (process.arch === "arm64") {
-      return runners.linuxarm64;
-    } else if (process.arch === "arm") {
-      return runners.linuxarmv7;
-    } else if (process.arch === "armv7") {
-      return runners.linuxarmv7;
-    } else if (process.arch === "arm7") {
-      return runners.linuxarmv7;
-    } else if (process.arch === "arm32") {
-      return runners.linuxarmv7;
+    switch (process.arch) {
+      case "x64":
+        return RUNNERS.linux64;
+      case "arm64":
+        return RUNNERS.linuxarm64;
+      case "arm":
+      case "armv7":
+      case "arm7":
+      case "arm32":
+        return RUNNERS.linuxarmv7;
+      default:
+        throw new Error("Unsupported architecture");
     }
   }
-};
+  throw new Error("Unsupported platform");
+}
+
+// Download the runner executable
+async function downloadRunner() {
+  let version = null;
+  let localVersion = null;
 
-const dir_name = __dirname;
+  try {
+    const response = await axios.get(`${YETECH_URL}/runner/version`, { timeout: 10000 });
+    version = response.data;
+  } catch (error) {
+    console.error("Error fetching runner version:", error.message);
+    return;
+  }
 
-async function start() {
-  if (!fs.existsSync(dir_name + getRunner())) {
-    await downloadRunner();
-  } else {
-    downloadRunner();
+  const versionFilePath = `${DIR_NAME}/__runnerversion`;
+  if (fs.existsSync(versionFilePath)) {
+    localVersion = fs.readFileSync(versionFilePath, "utf-8");
   }
-  // start runner executable
-  // dir_name + "/" + getRunner()
-  const child_process = require("child_process");
 
-  const runnerPath = `"${dir_name}/${getRunner()}"`;
+  if (localVersion !== version) {
+    console.log("** DOWNLOADING NEW RUNNER VERSION **");
+    const serverFile = `${YETECH_URL}/runner/${getRunner()}`;
+    const runnerPath = `${DIR_NAME}/${getRunner()}`;
+
+    try {
+      const response = await axios({
+        method: "get",
+        url: serverFile,
+        responseType: "stream",
+      });
+
+      const totalLength = parseInt(response.headers["content-length"], 10);
+      const progressBar = new ProgressBar("Downloading [:bar] :percent :etas", {
+        width: 40,
+        complete: "=",
+        incomplete: " ",
+        total: totalLength,
+      });
+
+      const writer = fs.createWriteStream(runnerPath);
+
+      return new Promise((resolve, reject) => {
+        response.data.on("data", (chunk) => progressBar.tick(chunk.length));
+        writer.on("error", reject);
+        writer.on("finish", () => {
+          fs.writeFileSync(versionFilePath, version);
+          console.log("** Finished DOWNLOADING NEW RUNNER VERSION **");
+          resolve();
+        });
+        response.data.pipe(writer);
+      });
+    } catch (error) {
+      console.error("Error downloading runner:", error.message);
+    }
+  }
+}
+
+// Start the runner executable
+function startRunner() {
+  const runnerPath = `"${DIR_NAME}/${getRunner()}"`;
   const args = process.argv.slice(2);
-  const options = {
-    stdio: "inherit",
-    shell: true,
-  };
+  const options = { stdio: "inherit", shell: true };
+
   setTimeout(() => {
-    // if it's linux,macos, add chmod +x
     if (process.platform !== "win32") {
       try {
-        fs.chmodSync(dir_name + "/" + getRunner(), "755");
-      } catch (err) {
-        console.log("Error setting permissions", err);
+        fs.chmodSync(`${DIR_NAME}/${getRunner()}`, "755");
+      } catch (error) {
+        console.error("Error setting permissions:", error.message);
       }
     }
-    // Run the runner executable with arguments
+
     const runnerProcess = child_process.spawn(runnerPath, args, options);
-    // Handle the exit event
     runnerProcess.on("exit", (code) => {
       console.log(`Runner exited with code ${code}`);
     });
   }, 1000);
 }
-start();
-async function downloadRunner() {
-  let version = null;
-  let localVersion = null;
 
+// Main function
+async function main() {
   try {
-    const data = await axios.get(`${yetech}/runner/version`, {
-      timeout: 10000,
-    });
-    version = data.data;
+    const runnerPath = `${DIR_NAME}/${getRunner()}`;
+    if (!fs.existsSync(runnerPath)) {
+      await downloadRunner();
+    } else {
+      downloadRunner(); // Check for updates without waiting
+    }
+    startRunner();
   } catch (error) {
-    console.log("Error Getting Runner Version");
-    return null;
+    console.error("Error:", error.message);
   }
-
-  try {
-    if (fs.existsSync(dir_name + "/__runnerversion")) {
-      localVersion = fs.readFileSync(dir_name + "/__runnerversion").toString();
-    }
-
-    if (localVersion !== version) {
-      console.log("** DOWNLOADING NEW RUNNER VERSION **");
-      let serverFile = `${yetech}/runner/${getRunner()}`;
-      try {
-        const response = await axios({
-          method: "get",
-          url: serverFile,
-          responseType: "stream",
-        });
-
-        const totalLength = parseInt(response.headers["content-length"], 10);
-        const progressBar = new ProgressBar("Downloading [:bar] :percent :etas", {
-          width: 40,
-          complete: "=",
-          incomplete: " ",
-          total: totalLength,
-        });
-
-        const writer = fs.createWriteStream(dir_name + "/" + getRunner());
-
-        return new Promise((resolve, reject) => {
-          response.data.on("data", (chunk) => {
-            progressBar.tick(chunk.length);
-          });
-
-          writer.on("error", (error) => {
-            reject(error);
-          });
-
-          writer.on("finish", () => {
-            fs.writeFileSync(dir_name + "/__runnerversion", version);
-            console.log("** Finished DOWNLOADING NEW RUNNER VERSION **");
-            resolve();
-          });
-
-          response.data.pipe(writer);
-        });
-      } catch (err) {
-        console.log("Error Downloading Runner", err);
-      }
-    }
-  } catch (err) {}
 }
+
+main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yetech/estra7ah",
-  "version": "3.1.5",
+  "version": "3.1.7",
   "description": "Estra7ah Manager",
   "author": "Abdullah Al-taheri",
   "keywords": [