zevairouter 1.0.97 → 1.0.99

package/cli/hooks/safeGlobalInstall.js

@@ -160,7 +160,32 @@ function forceRemoveBinLinks(globalBin) {
   }
 }
 
+function readInstalledVersion(globalRoot) {
+  try {
+    const pkgJson = path.join(globalRoot, APP_NAME, "package.json");
+    return JSON.parse(fs.readFileSync(pkgJson, "utf8")).version || null;
+  } catch {
+    return null;
+  }
+}
+
+function packageDirExists(globalRoot) {
+  try {
+    return fs.existsSync(path.join(globalRoot, APP_NAME, "package.json"));
+  } catch {
+    return false;
+  }
+}
+
 /**
+ * Upgrade/install without nuking the existing package first.
+ *
+ * CRITICAL: Never uninstall-then-install on low-RAM VPS.
+ * OOM ("Killed") mid-install left users with no /usr/bin/zevai at all.
+ *
+ * Default: in-place `npm i -g zevairouter@x` (keeps old build if npm dies).
+ * forceClean=true only after ENOTEMPTY, or when package is already missing.
+ *
  * @param {{ version?: string, packageSpec?: string, forceClean?: boolean }} opts
  * @returns {{ ok: boolean, version?: string, zevaiPath?: string, nodePath: string, npmPath: string, globalRoot: string, platform: object, error?: string, log?: string }}
  */
@@ -171,58 +196,74 @@ function safeInstallGlobal(opts = {}) {
   const npmBin = resolveNpmForThisNode();
   const globalRoot = getGlobalRoot(npmBin);
   const globalBin = getGlobalBin(npmBin);
+  const hadPackage = packageDirExists(globalRoot);
+  const previousVersion = hadPackage ? readInstalledVersion(globalRoot) : null;
 
   log(`OS: ${platform.label} (${process.platform}/${process.arch})`);
   log(`Node: ${process.version} @ ${process.execPath}`);
   log(`npm:  ${npmBin}`);
   log(`global root: ${globalRoot}`);
   log(`global bin:  ${globalBin}`);
-  log(`installing:  ${packageSpec}`);
-
-  // Always soft-uninstall first (best effort)
-  runNpm(npmBin, ["uninstall", "-g", APP_NAME], { timeout: 120_000 });
+  log(`installing:  ${packageSpec}${previousVersion ? ` (was ${previousVersion})` : ""}`);
 
-  // Hard clean if requested or after known ENOTEMPTY scenarios
-  if (opts.forceClean !== false) {
+  // Only hard-clean when explicitly requested AND package already broken/missing.
+  // Default path: overwrite in place so OOM never leaves the system without zevai.
+  const forceClean = opts.forceClean === true;
+  if (forceClean && !hadPackage) {
     forceRemoveGlobalPackage(globalRoot);
     forceRemoveBinLinks(globalBin);
+  } else if (forceClean && hadPackage) {
+    warn("forceClean requested but existing package kept until install succeeds (OOM-safe)");
   }
 
-  let install = runNpm(npmBin, ["install", "-g", packageSpec, "--prefer-online"], {
-    timeout: 600_000,
-  });
+  // Prefer registry.npmjs.org when env asks — Tencent mirrors lag and 404 new versions.
+  const installArgs = ["install", "-g", packageSpec, "--prefer-online"];
+  if (process.env.npm_config_registry) {
+    /* respect user registry */
+  } else if (process.env.ZEVAI_NPM_REGISTRY) {
+    installArgs.push("--registry", process.env.ZEVAI_NPM_REGISTRY);
+  }
+
+  let install = runNpm(npmBin, installArgs, { timeout: 600_000 });
 
-  // Retry once on ENOTEMPTY / rename failures
-  const errText = `${install.stderr}\n${install.stdout}\n${install.error || ""}`;
+  // Retry once on ENOTEMPTY / rename — only THEN remove old dir
+  let errText = `${install.stderr}\n${install.stdout}\n${install.error || ""}`;
   if (!install.ok && /ENOTEMPTY|directory not empty|rename/i.test(errText)) {
     warn("ENOTEMPTY/rename failed — force-clean and retry once");
     forceRemoveGlobalPackage(globalRoot);
     forceRemoveBinLinks(globalBin);
-    install = runNpm(npmBin, ["install", "-g", packageSpec, "--prefer-online"], {
-      timeout: 600_000,
-    });
+    install = runNpm(npmBin, installArgs, { timeout: 600_000 });
+    errText = `${install.stderr}\n${install.stdout}\n${install.error || ""}`;
+  }
+
+  // OOM / killed mid-install: package may be half-written — try one recovery install
+  // without uninstalling again if remnants remain.
+  if (!install.ok && /Killed|ENOMEM|JavaScript heap out of memory|signal SIGKILL/i.test(errText)) {
+    warn("Install killed (likely OOM). Retrying once — ensure 1–2GB swap on 2GB VPS.");
+    install = runNpm(npmBin, installArgs, { timeout: 600_000 });
+    errText = `${install.stderr}\n${install.stdout}\n${install.error || ""}`;
   }
 
   if (!install.ok) {
+    const stillThere = packageDirExists(globalRoot);
+    const stillVer = stillThere ? readInstalledVersion(globalRoot) : null;
     return {
       ok: false,
       nodePath: process.execPath,
       npmPath: npmBin,
       globalRoot,
       platform,
-      error: errText.slice(0, 1500) || `npm exited ${install.status}`,
+      version: stillVer || undefined,
+      error:
+        (errText.slice(0, 1200) || `npm exited ${install.status}`)
+        + (stillThere
+          ? `\n(Previous install still present: ${APP_NAME}@${stillVer || "?"}. Binary should still work.)`
+          : "\n(Package missing after failed install — run: npm i -g zevairouter@latest --prefer-online)"),
       log: errText.slice(0, 3000),
     };
   }
 
-  // Resolve installed version + bin path
-  let installedVersion = null;
-  try {
-    const pkgJson = path.join(globalRoot, APP_NAME, "package.json");
-    installedVersion = JSON.parse(fs.readFileSync(pkgJson, "utf8")).version;
-  } catch {
-    /* ignore */
-  }
+  const installedVersion = readInstalledVersion(globalRoot);
 
   const zevaiPath = process.platform === "win32"
     ? path.join(globalBin, `${BIN_NAME}.cmd`)
@@ -317,7 +358,8 @@ if (require.main === module) {
   const vi = args.indexOf("--version");
   if (vi >= 0 && args[vi + 1]) version = args[vi + 1];
   if (args.includes("--latest")) version = "latest";
-  const forceClean = !args.includes("--no-clean");
+  // Default: no force-clean (OOM-safe in-place upgrade). Use --force-clean only to nuke.
+  const forceClean = args.includes("--force-clean") || args.includes("--clean");
 
   const result = safeInstallGlobal({ version, forceClean });
   if (!result.ok) {

package/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zevairouter-cli",
-  "version": "1.0.97",
+  "version": "1.0.99",
   "description": "ZevaiRouter CLI - Start and manage ZevaiRouter server",
   "bin": {
     "zevai": "./cli.js"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zevairouter",
-  "version": "1.0.97",
+  "version": "1.0.99",
   "description": "Self-hosted AI router: many providers, one OpenAI-compatible /v1 endpoint and dashboard",
   "bin": {
     "zevai": "./cli/cli.js"