@sifxprime/krouter 0.5.157 → 0.5.159

package/app/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sifxprime/krouter",
-  "version": "0.5.157",
+  "version": "0.5.159",
   "description": "kRouter (Kodelyth Router) CLI — Kodelyth AI Infrastructure",
   "homepage": "https://github.com/sifxprime/krouter",
   "repository": {

package/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "krouter-app",
-  "version": "0.5.157",
+  "version": "0.5.159",
   "description": "kRouter (Kodelyth Router) web dashboard — Kodelyth AI Infrastructure",
   "private": true,
   "scripts": {

package/cli.js

@@ -45,6 +45,7 @@ function createSpinner(text) {
 const pkg = require("./package.json");
 const { ensureSqliteRuntime, buildEnvWithRuntime } = require("./hooks/sqliteRuntime");
 const { ensureTrayRuntime } = require("./hooks/trayRuntime");
+const { getDataDir: getAppDataDir } = require("./src/lib/dataDir");
 const args = process.argv.slice(2);
 
 // Self-heal SQLite runtime deps (sql.js + better-sqlite3) into ~/.krouter/runtime
@@ -202,13 +203,11 @@ function compareVersions(a, b) {
   return 0;
 }
 
-// Get app data dir — kept in sync with src/mitm/paths.js
-const DATA_DIR_NAME = "krouter";
-function getAppDataDir() {
-  return process.platform === "win32"
-    ? path.join(process.env.APPDATA || "", DATA_DIR_NAME)
-    : path.join(os.homedir(), `.${DATA_DIR_NAME}`);
-}
+// getAppDataDir comes from ./src/lib/dataDir (required at the top). It used to be
+// a local copy that resolved ~/.krouter unconditionally and ignored DATA_DIR, so
+// the three call sites below -- the tunnel directory, the mitm pidfile, and the
+// db.json write in the crash-loop handler -- all looked in the wrong place
+// whenever DATA_DIR was set. The db.json one failed silently.
 
 // Kill PID from file (best-effort, removes file after)
 function killByPidFile(pidFile) {
@@ -726,6 +725,9 @@ async function showInterfaceMenu(latestVersion) {
 }
 
 const MAX_RESTARTS = 2;
+// Must match MITM_RECOVERY_MARKER in src/shared/services/initializeApp.js.
+// tests/unit/mitm-recovery-marker.test.js pins the two together.
+const MITM_RECOVERY_MARKER = ".mitm-recovery";
 const RESTART_RESET_MS = 30000; // Reset counter if alive > 30s
 
 // First non-internal IPv4 — the address remote peers actually reach when bound to 0.0.0.0.
@@ -1033,14 +1035,27 @@ function startServer(latestVersion) {
 
     if (restartCount >= MAX_RESTARTS) {
       console.error(`\n⚠️  Server crashed ${MAX_RESTARTS} times. Disabling MIT and restarting...`);
+      // Ask the app to disable MITM; do not write the setting here. This used to
+      // patch mitmEnabled in DATA_DIR/db.json, which the app migrated into SQLite
+      // and now keeps only as a rollback artifact -- so the write landed in a file
+      // nothing reads, and this recovery path had quietly done nothing for a long
+      // time. A supervisor has no business knowing how the app stores settings.
+      // MITM_RECOVERY_MARKER must match the constant of the same name in
+      // src/shared/services/initializeApp.js.
       try {
-        const dbPath = path.join(getAppDataDir(), "db.json");
-        if (fs.existsSync(dbPath)) {
-          const db = JSON.parse(fs.readFileSync(dbPath, "utf-8"));
-          if (db.settings) db.settings.mitmEnabled = false;
-          fs.writeFileSync(dbPath, JSON.stringify(db, null, 2));
-        }
-      } catch { /* best effort */ }
+        const marker = path.join(getAppDataDir(), MITM_RECOVERY_MARKER);
+        fs.mkdirSync(path.dirname(marker), { recursive: true });
+        fs.writeFileSync(
+          marker,
+          JSON.stringify({ reason: "crash-loop", restarts: MAX_RESTARTS, at: new Date().toISOString() }, null, 2)
+        );
+      } catch (e) {
+        // Not swallowed: if the request cannot be recorded, the restart below is
+        // very likely to crash again for the same reason, and the user should be
+        // told why rather than watching it loop.
+        console.error(`   Could not record the MITM recovery request: ${e.message}`);
+        console.error("   If this keeps crashing, disable MITM from the dashboard.");
+      }
       restartCount = 0;
       server = spawnServer();
       attachServerEvents();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sifxprime/krouter",
-  "version": "0.5.157",
+  "version": "0.5.159",
   "description": "kRouter (Kodelyth Router) CLI — Kodelyth AI Infrastructure",
   "homepage": "https://github.com/sifxprime/krouter",
   "repository": {

package/src/cli/api/client.js

@@ -3,7 +3,6 @@ const https = require("https");
 const crypto = require("crypto");
 const fs = require("node:fs");
 const path = require("node:path");
-const os = require("node:os");
 const { machineIdSync } = require("node-machine-id");
 
 // Default configuration
@@ -15,14 +14,10 @@ const DEFAULT_CONFIG = {
 
 const CLI_TOKEN_HEADER = "x-9r-cli-token";
 const CLI_TOKEN_SALT = "9r-cli-auth";
-// Kept in sync with src/mitm/paths.js / src/lib/dataDir.js
-function getDataDir() {
-  if (process.env.DATA_DIR) return process.env.DATA_DIR;
-  if (process.platform === "win32") {
-    return path.join(process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming"), "krouter");
-  }
-  return path.join(os.homedir(), ".krouter");
-}
+// Was a third hand-synced copy of this resolver. It honoured DATA_DIR but
+// without the Windows-path and writability guards the others have, so the same
+// setting could resolve three different ways in one process.
+const { getDataDir } = require("../../lib/dataDir");
 
 const MACHINE_ID_FILE = path.join(getDataDir(), "machine-id");
 const AUTH_DIR = path.join(getDataDir(), "auth");

package/src/lib/dataDir.js

@@ -0,0 +1,75 @@
+"use strict";
+
+/**
+ * Where the CLI keeps its data. One definition for the whole published package.
+ *
+ * This exists because there were three hand-synced copies of this logic, each
+ * carrying a "kept in sync with..." comment, and one of them had drifted:
+ * cli.js resolved `~/.krouter` unconditionally and ignored DATA_DIR entirely.
+ * That is a documented setting (README: "DATA_DIR | ~/.krouter | Data directory
+ * (SQLite, certs, cache)") and ARCHITECTURE.md promises db.json lives at
+ * `${DATA_DIR}/db.json`, so anyone who set it -- Docker users, mainly -- got a
+ * split brain: auth and machine-id read from DATA_DIR, while db.json, the
+ * tunnel directory and the mitm pidfile read from the home directory.
+ *
+ * The worst of it was silent. cli.js disables MITM in DATA_DIR/db.json to break
+ * a crash loop; looking in the wrong place made existsSync false, the
+ * best-effort catch swallowed it, and the server kept crash-looping with the
+ * safety valve doing nothing.
+ *
+ * Mirrors the app's own src/lib/dataDir.js. It cannot import it: that module is
+ * ESM and lives outside this package's `files`, so the published CLI has no
+ * access to it. Keep the two in step.
+ */
+
+const fs = require("node:fs");
+const path = require("node:path");
+const os = require("node:os");
+
+const APP_NAME = "krouter";
+
+/** The platform default, used when DATA_DIR is unset or unusable. */
+function appDir() {
+  if (process.platform === "win32") {
+    // Falling back to "" here would yield a *relative* path, which is how the
+    // previous cli.js copy could end up writing into the current directory.
+    return path.join(
+      process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming"),
+      APP_NAME
+    );
+  }
+  return path.join(os.homedir(), `.${APP_NAME}`);
+}
+
+/**
+ * Resolve the data directory, honouring DATA_DIR.
+ *
+ * Creating the directory is deliberate and matches the app: callers immediately
+ * join subpaths onto the result, so a configured-but-absent directory would
+ * otherwise fail at the first write rather than here.
+ */
+function getDataDir() {
+  const configured = process.env.DATA_DIR;
+  if (!configured) return appDir();
+
+  // A Unix path on Windows almost always means a Linux-targeted .env or Docker
+  // config leaked into a Windows run. Honouring it would write somewhere the
+  // user never intended.
+  if (process.platform === "win32" && /^\//.test(configured)) {
+    console.warn(`[DATA_DIR] '${configured}' is a Unix path on Windows - falling back to the default`);
+    return appDir();
+  }
+
+  try {
+    fs.mkdirSync(configured, { recursive: true });
+    return configured;
+  } catch (e) {
+    if (e && (e.code === "EACCES" || e.code === "EPERM")) {
+      console.warn(`[DATA_DIR] '${configured}' is not writable - falling back to ~/.${APP_NAME}`);
+      return appDir();
+    }
+    throw e;
+  }
+}
+
+module.exports = { getDataDir, appDir, APP_NAME };