@yetech/estra7ah 3.3.4 → 3.3.6

package/dist/estra7ah.js

@@ -12,10 +12,13 @@ const ProgressBar = require("progress");
 const child_process = require("child_process");
 
 const YETECH_URL = `http://premium.yetech.co:80`;
-// Cloudflare-cached mirror of /runner/* (origin = same VPS). The ?v= query
-// string busts the edge cache exactly when a new build lands, so stale
-// binaries are impossible and no cache purging is ever needed.
-const CDN_URL = `https://dl.yetech.co`;
+// Cloudflare-cached mirror of /runner/* (origin = same VPS). Plain HTTP on
+// purpose: the origin is HTTP-only, and download integrity is enforced by the
+// content-length size check, so TLS to the edge buys nothing here while
+// avoiding the origin-cert / SSL-mode requirement. The ?v= query string busts
+// the edge cache exactly when a new build lands, so stale binaries are
+// impossible and no cache purging is ever needed.
+const CDN_URL = `http://dl.yetech.co`;
 const RUNNERS = {
   win64: "runner-win-x64.exe",
   linux64: "runner-linux-x64",
@@ -316,29 +319,55 @@ async function downloadRunner() {
 }
 
 // Start the runner executable
+let runnerStarted = false;
 function startRunner() {
-  const runnerFile = getRunner();
-  const runnerPath = `"${DIR_NAME}/${runnerFile}"`;
-  const args = process.argv.slice(2);
-  const options = { stdio: "inherit", shell: true };
+  // main() may fire this more than once (missing binary + update paths); the
+  // runner must only ever be launched once, or two processes fight for the ports.
+  if (runnerStarted) return;
+  runnerStarted = true;
+
+  const spawnOnce = () => {
+    const runnerFile = getRunner();
+    const absPath = `${DIR_NAME}/${runnerFile}`;
+    const args = process.argv.slice(2);
 
-  setTimeout(() => {
     if (process.platform !== "win32") {
       try {
-        fs.chmodSync(`${DIR_NAME}/${runnerFile}`, "755");
+        fs.chmodSync(absPath, "755");
       } catch (error) {
         console.error("Error setting permissions:", error.message);
       }
     }
 
-    // .js runner (armv7) runs under the same Node that launched us
-    const command = runnerFile.endsWith(".js") ? `"${process.execPath}"` : runnerPath;
-    const commandArgs = runnerFile.endsWith(".js") ? [runnerPath, ...args] : args;
-    const runnerProcess = child_process.spawn(command, commandArgs, options);
-    runnerProcess.on("exit", (code) => {
-      console.log(`Runner exited with code ${code}`);
+    // Spawn the binary directly (no shell) so its own path is the argv[0] — a
+    // shell wrapper would swallow exec failures as opaque /bin/sh errors. The
+    // .js runner (armv7, no pkg target) runs under the Node that launched us.
+    const isJs = runnerFile.endsWith(".js");
+    const command = isJs ? process.execPath : absPath;
+    const commandArgs = isJs ? [absPath, ...args] : args;
+
+    let runnerProcess;
+    try {
+      runnerProcess = child_process.spawn(command, commandArgs, { stdio: "inherit" });
+    } catch (error) {
+      console.error("Failed to spawn runner:", error.message);
+      return setTimeout(spawnOnce, 3000);
+    }
+
+    // Without this, a spawn failure surfaces as an uncaught exception instead
+    // of a handleable event.
+    runnerProcess.on("error", (error) => {
+      console.error("Runner spawn error:", error.message);
+    });
+    runnerProcess.on("exit", (code, signal) => {
+      console.log(`Runner exited with code ${code}${signal ? " (signal " + signal + ")" : ""}`);
+      // Keep the service alive: relaunch after a short backoff instead of
+      // leaving everything down until the next manual restart.
+      setTimeout(spawnOnce, 3000);
     });
-  }, 1000);
+  };
+
+  setTimeout(spawnOnce, 1000);
 }
 
 // Main function

package/package.json

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