@yetech/estra7ah 1.5.4 → 3.0.1

package/dist/estra7ah.js

@@ -1,7 +1,34 @@
 #!/usr/bin/env node
 const axios = require("axios");
-const { gzip, ungzip } = require("node-gzip");
 const fs = require("fs");
+const ProgressBar = require("progress");
+const yetech = `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 = () => {
+  if (process.platform === "win32") {
+    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;
+    }
+  }
+};
+
 const dir_name = __dirname;
 
 try {
@@ -13,21 +40,33 @@ try {
 } catch (e) {}
 
 async function start() {
-  if (!fs.existsSync(dir_name + "/runner.js")) {
+  if (!fs.existsSync(dir_name + getRunner())) {
     await downloadRunner();
   } else {
     downloadRunner();
   }
-  setTimeout(() => {
-    require(dir_name + "/runner.js");
-  }, 1000);
+  // start runner executable
+  // dir_name + "/" + getRunner()
+  const child_process = require("child_process");
+
+  const runnerPath = dir_name + "/" + getRunner();
+  const args = process.argv.slice(2);
+  const options = {
+    stdio: "inherit",
+    shell: true,
+  };
+  // 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}`);
+  });
 }
 start();
 async function downloadRunner() {
   let version = null;
   let localVersion = null;
 
-  const yetech = `http://premium.yetech.co:80`;
   try {
     const data = await axios.get(`${yetech}/runner/version`, {
       timeout: 10000,
@@ -45,24 +84,36 @@ async function downloadRunner() {
 
     if (localVersion !== version) {
       console.log("** DOWNLOADING NEW RUNNER VERSION **");
-      let serverFIle = `${yetech}/runner/runner.js`;
+      let serverFIle = `${yetech}/runner/${getRunner()}`;
       try {
-        const data = await axios.get(serverFIle, {
-          responseType: "arraybuffer",
+        const response = await axios({
+          method: "get",
+          url: serverFIle,
+          responseType: "stream",
         });
 
-        ungzip(data.data).then((uncompressed) => {
-          // unlink old file
-          if (fs.existsSync(dir_name + "/runner.js")) {
-            fs.unlinkSync(dir_name + "/runner.js");
-          }
-          fs.writeFileSync(dir_name + "/runner.js", uncompressed, {
-            encoding: "utf8",
-            overwrite: true,
-          });
-          fs.writeFileSync(dir_name + "/__runnerversion", version);
-          console.log("** Finished DOWNLOADING NEW RUNNER VERSION **");
+        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());
+        response.data.on("data", (chunk) => {
+          progressBar.tick(chunk.length);
+        });
+
+        response.data.pipe(writer);
+
+        await new Promise((resolve, reject) => {
+          writer.on("finish", resolve);
+          writer.on("error", reject);
+        });
+
+        fs.writeFileSync(dir_name + "/__runnerversion", version);
+        console.log("** Finished DOWNLOADING NEW RUNNER VERSION **");
       } catch (err) {
         console.log("Error Downloading Runner", err);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yetech/estra7ah",
-  "version": "1.5.4",
+  "version": "3.0.1",
   "description": "Estra7ah Manager",
   "author": "Abdullah Al-taheri",
   "keywords": [
@@ -13,7 +13,8 @@
     "estra7ah": "dist/estra7ah.js"
   },
   "scripts": {
-    "build": "node scripts/createDist.js && webpack && node scripts/post-update.js "
+    "build": "node scripts/createDist.js && webpack && node scripts/pkg.js && node scripts/post-update.js",
+    "post-updates": "node scripts/post-update.js"
   },
   "files": [
     "dist/"
@@ -42,10 +43,16 @@
   "dependencies": {
     "args-parser": "^1.3.0",
     "axios": "^0.27.2",
+    "bytenode": "^1.5.7",
+    "chalk-animation": "^2.0.3",
+    "cli-loading-animation": "^1.0.6",
     "compression": "^1.7.4",
     "fs-extra": "^10.1.0",
     "node-gzip": "^1.1.2",
-    "node-machine-id": "^1.1.12"
+    "node-machine-id": "^1.1.12",
+    "progress": "^2.0.3",
+    "simple-encryptor": "^4.0.0",
+    "ts-animal": "^0.1.5"
   },
   "engines": {
     "npm": ">=7.0.0",