@techysy/10router 1.1.3 → 1.2.1

package/app/src/sse/services/qoderCheckin.js

@@ -194,13 +194,34 @@ export async function checkinOneQoder(conn, deps = {}) {
     );
 
     if (claimable.length === 0) {
-      const alreadyCount = campaigns.filter((c) => c.claimStatus === "CLAIMED").length;
+      // Two different truths used to collapse into one result, and the dashboard
+      // rendered both as "today's credits are already claimed":
+      //
+      //   - the account has no CLAIM_BENEFIT campaign at all. The intl qoder.sh
+      //     deployment currently returns only the season promo, whose actionType
+      //     is VIEW_DETAILS, for every account we have seen — so there is nothing
+      //     to claim, and never was today;
+      //   - a credits campaign exists and is already CLAIMED.
+      //
+      // The first is a normal "nothing on offer here" state, not a claim that
+      // happened, so it gets its own status instead of borrowing the success one.
+      const creditCampaigns = campaigns.filter((c) => c.actionType === "CLAIM_BENEFIT");
+      if (creditCampaigns.length === 0) {
+        return {
+          connectionId: conn.id,
+          account: conn.name || conn.email || conn.id,
+          provider: conn.provider,
+          status: "no-activity",
+          message: "当前无可领取的活动",
+          claimedAmount: 0,
+        };
+      }
       return {
         connectionId: conn.id,
         account: conn.name || conn.email || conn.id,
         provider: conn.provider,
         status: "already",
-        message: alreadyCount > 0 ? "今日已领或无待领活动" : "当前无活动权益",
+        message: "今日已领或无待领活动",
         claimedAmount: 0,
       };
     }
@@ -310,6 +331,12 @@ export async function runQoderCheckinTick(deps = {}) {
       } else if (outcome.status === "already") {
         memo[conn.id] = today;
         log.debug("QODER_CHECKIN", `${accountLabel(conn)}：${outcome.message || "今日已领或无待领活动"}`);
+      } else if (outcome.status === "no-activity") {
+        // Deliberately NOT memoized: nothing was confirmed, and the campaign can
+        // still appear later in the day (the daily window opens at 10:00 UTC+8),
+        // so the next tick should look again. A debug line, not a warning — for a
+        // deployment that has no such campaign this is the normal outcome.
+        log.debug("QODER_CHECKIN", `${accountLabel(conn)}：${outcome.message || "当前无可领取的活动"}`);
       } else {
         log.warn("QODER_CHECKIN", `${accountLabel(conn)} 领取失败：${outcome.error || outcome.status}`);
       }
@@ -328,9 +355,10 @@ export async function runQoderCheckinTick(deps = {}) {
   // One consolidated summary replaces the old firehose of per-event JSON lines.
   const claimed = results.filter((r) => r.status === "checked-in");
   const failed = results.filter((r) => r.status === "failed");
-  const already = results.length - claimed.length - failed.length;
+  const none = results.filter((r) => r.status === "no-activity");
+  const already = results.length - claimed.length - failed.length - none.length;
   const totalCredits = claimed.reduce((a, r) => a + (r.claimedAmount || 0), 0);
-  const summary = `领取汇总：成功 ${claimed.length}（+${totalCredits} Credits）、已领 ${already}、失败 ${failed.length}`;
+  const summary = `领取汇总：成功 ${claimed.length}（+${totalCredits} Credits）、已领 ${already}、无活动 ${none.length}、失败 ${failed.length}`;
   if (claimed.length > 0 || failed.length > 0) {
     log.info("QODER_CHECKIN", summary);
   } else {

package/cli.js

@@ -64,8 +64,9 @@ function createSpinner(text) {
 }
 
 const pkg = require("./package.json");
-const { ensureSqliteRuntime, buildEnvWithRuntime } = require("./hooks/sqliteRuntime");
+const { ensureSqliteRuntime, buildEnvWithRuntime, getDataDir } = require("./hooks/sqliteRuntime");
 const { ensureTrayRuntime } = require("./hooks/trayRuntime");
+const { healStaleServer, writeDiskVersion, writePidFile, removePidFile } = require("./src/cli/staleServer");
 const args = process.argv.slice(2);
 
 // Subcommands (`10router xai video …`) run against an already-running gateway
@@ -81,6 +82,21 @@ if (args[0] === "xai" && args[1] === "video") {
   return;
 }
 
+// `10router doctor` is dispatched BEFORE the runtime self-heal below on purpose:
+// it exists to REPORT a broken runtime, so it must not silently repair one first.
+// It is read-only (no installs, no writes, no kills) and exits non-zero when any
+// check is red, which makes it usable as a CI/"is my install broken" gate.
+if (args[0] === "doctor") {
+  const { run } = require("./src/cli/doctor");
+  run(args.slice(1))
+    .then((code) => process.exit(code))
+    .catch((err) => {
+      console.error(`❌ ${err?.message || err}`);
+      process.exit(1);
+    });
+  return;
+}
+
 // Self-heal SQLite runtime deps (sql.js + better-sqlite3) into ~/.10router/runtime
 // so the server can resolve them via NODE_PATH. Best-effort — sql.js is required,
 // better-sqlite3 is optional. Logs to stderr only on failure.
@@ -90,8 +106,9 @@ try { ensureSqliteRuntime({ silent: true }); } catch {}
 try { ensureTrayRuntime({ silent: true }); } catch {}
 
 // Configuration constants
-// Two different names, identical until the npm package was renamed to
-// 10router-cli: APP_NAME is what you install, BIN_NAME is what you then type.
+// Two different names, identical until the npm package was renamed — first to
+// 10router-cli, now @techysy/10router — while the bin stayed `10router`:
+// APP_NAME is what you install, BIN_NAME is what you then type.
 const APP_NAME = pkg.name;
 const BIN_NAME = Object.keys(pkg.bin ?? {})[0] ?? pkg.name;
 const INSTALL_CMD_LATEST = `npm i -g ${APP_NAME}@latest --prefer-online`;
@@ -126,6 +143,7 @@ let noBrowser = false;
 let skipUpdate = false;
 let showLog = false;
 let trayMode = false;
+let noTray = false;
 
 for (let i = 0; i < args.length; i++) {
   if (args[i] === "--port" || args[i] === "-p") {
@@ -143,6 +161,8 @@ for (let i = 0; i < args.length; i++) {
   } else if (args[i] === "--tray" || args[i] === "-t") {
     trayMode = true;
     process.env.TRAY_MODE = "1";
+  } else if (args[i] === "--no-tray") {
+    noTray = true;
   } else if (args[i] === "--help" || args[i] === "-h") {
     console.log(t("help.text", { bin: BIN_NAME, port: DEFAULT_PORT, host: DEFAULT_HOST }));
     process.exit(0);
@@ -152,12 +172,32 @@ for (let i = 0; i < args.length; i++) {
   }
 }
 
-// Auto-relaunch after update: detached process has no TTY → fallback to tray
-if (skipUpdate && !trayMode && !process.stdin.isTTY) {
+// Headless: run in tray *mode* (keep the server alive, ignore SIGHUP, no TUI)
+// whenever there is nothing to drive an interactive menu. Two cases:
+//   - no interactive terminal — a supervisor (systemd / nohup / a container) or
+//     the detached auto-relaunch after an update. Their stdin is not a TTY, so
+//     selectMenu() reads EOF and resolves to -1 → "exit", which would tear down
+//     the server it just started (exit code 0, so Restart=on-failure won't fire).
+//   - explicit --no-tray, documented as "serve headless": tray *mode* still
+//     applies, there is simply no icon (initTrayIcon() already degrades to that).
+if (!trayMode && (noTray || !process.stdin.isTTY)) {
   trayMode = true;
   process.env.TRAY_MODE = "1";
 }
 
+// Record the version that is now ON DISK. An upgrade (npm i -g / fpk / desktop)
+// replaces the package dir while a detached server from the old build may still
+// be running; this marker lets that old process — and the dashboard — see that
+// the disk has moved on. postinstall.js writes it too (it runs while the old
+// server is still alive); this covers installs where postinstall never ran.
+//
+// Deliberately AFTER the `--help` / `--version` exits above: those are read-only
+// queries and must not stamp the user's data dir. Otherwise a stray run of this
+// script from a source checkout advertises the checkout's version (e.g. 1.1.4)
+// to an *installed* app that shares the same data dir, and the dashboard shows a
+// "disk differs from the running build" banner that is simply not true.
+try { writeDiskVersion(getDataDir(), pkg.version); } catch {}
+
 // Always use Node.js runtime with absolute path
 const RUNTIME = process.execPath;
 
@@ -442,10 +482,18 @@ function isRestrictedEnvironment() {
   return null;
 }
 
+// Settings → Security → "Check for updates automatically" off. The launcher
+// runs before the server and cannot read the setting, so the server mirrors it
+// into this marker (src/lib/updateCheck.js — keep the name in sync).
+const UPDATE_CHECK_DISABLED_MARKER = "update-check-disabled";
+function autoUpdateCheckDisabled() {
+  try { return fs.existsSync(path.join(getDataDir(), UPDATE_CHECK_DISABLED_MARKER)); } catch { return false; }
+}
+
 // Check if new version available, return latest version or null
 function checkForUpdate() {
   return new Promise((resolve) => {
-    if (skipUpdate) {
+    if (skipUpdate || autoUpdateCheckDisabled()) {
       resolve(null);
       return;
     }
@@ -527,8 +575,25 @@ if (!fs.existsSync(serverPath)) {
 
 // Start server immediately; run update check in parallel (not on the critical path).
 const updatePromise = checkForUpdate();
+
+// Stop a server left over from a PREVIOUS build before trying to own the port:
+// otherwise the new server dies on EADDRINUSE while the stale one keeps serving
+// chunk hashes that no longer exist on disk (blank dashboard). Never fatal.
+function logStaleServerResult(result) {
+  if (result && result.action === "killed") {
+    console.log(t("launcher.staleServerKilled", { running: result.running, disk: pkg.version }));
+  } else if (result && result.action === "warn") {
+    console.log(t("launcher.staleServerNoPid", { running: result.running, port: String(port) }));
+  }
+}
+
 killAllAppProcesses(port)
   .then(() => killProcessOnPort(port))
+  .then(() =>
+    healStaleServer({ port, version: pkg.version, dataDir: getDataDir() })
+      .then(logStaleServerResult)
+      .catch(() => {}),
+  )
   .then(() => startServer(updatePromise));
 
 // Show interface selection menu
@@ -610,6 +675,9 @@ function startServer(updatePromise) {
         HOSTNAME: host
       }
     });
+    // Pidfile: lets a later launcher run stop a server this process left behind
+    // (an upgrade replaces the package dir under a detached server). Best-effort.
+    if (child.pid) writePidFile(getDataDir(), child.pid);
     if (!showLog && child.stderr) {
       child.stderr.on("data", (data) => {
         const lines = data.toString().split("\n").filter(Boolean);
@@ -643,6 +711,7 @@ function startServer(updatePromise) {
       }
       // Also try to kill process group
       process.kill(-server.pid, "SIGKILL");
+      removePidFile(getDataDir());
     } catch (e) { }
   }
 
@@ -667,7 +736,13 @@ function startServer(updatePromise) {
     cleanup();
     setTimeout(() => process.exit(0), 100);
   });
+  // A closing terminal sends SIGHUP. With no TTY (nohup / systemd / a detached
+  // launcher) that signal means "the terminal went away", not "shut down", and
+  // taking the gateway down with it is the opposite of what was asked for — so
+  // ignore it, exactly as tray mode already does below.
+  const ignoreSighup = !process.stdout.isTTY;
   process.on("SIGHUP", () => {
+    if (ignoreSighup) return;
     if (isShuttingDown) return;
     isShuttingDown = true;
     cleanup();
@@ -676,6 +751,9 @@ function startServer(updatePromise) {
 
   // Initialize tray icon (runs alongside TUI)
   const initTrayIcon = () => {
+    // --no-tray: a supervisor (systemd / nohup / a container) or a user who just
+    // wants the gateway. Tray *mode* still applies; there is simply no icon.
+    if (noTray) return false;
     try {
       const { initTray } = require("./src/cli/tray/tray");
       initTray({
@@ -688,8 +766,16 @@ function startServer(updatePromise) {
         },
         onOpenDashboard: () => openBrowser(url)
       });
+      return true;
     } catch (err) {
-      // Tray not available - continue without it
+      // Tray not available (headless host, no systray backend, missing optional
+      // dependency) - keep serving, but say so rather than failing silently.
+      console.warn(
+        t("launcher.trayUnavailable", {
+          error: (err && err.message) || String(err),
+        })
+      );
+      return false;
     }
   };
 
@@ -703,9 +789,13 @@ function startServer(updatePromise) {
     console.log(t("launcher.serverLine", { url: `http://${displayHost}:${port}` }));
 
     waitServerReady(port).then(() => {
-      initTrayIcon();
-      console.log(t("launcher.trayReady"));
-      console.log(t("launcher.trayReadyHint"));
+      if (initTrayIcon()) {
+        console.log(t("launcher.trayReady"));
+        console.log(t("launcher.trayReadyHint"));
+      } else {
+        // No icon exists, so don't claim the app is sitting in the tray.
+        console.log(t("launcher.traySkipped"));
+      }
     });
 
     return;

package/hooks/postinstall.js

@@ -3,8 +3,18 @@
 // Postinstall: warm-up SQLite deps into ~/.10router/runtime so the first
 // `10router` start doesn't need network. Failure here is non-fatal —
 // cli.js will retry at runtime if anything is missing.
-const { ensureSqliteRuntime } = require("./sqliteRuntime");
+const { ensureSqliteRuntime, getDataDir } = require("./sqliteRuntime");
 const { ensureTrayRuntime } = require("./trayRuntime");
+const { writeDiskVersion } = require("../src/cli/staleServer");
+
+// Record the on-disk version FIRST: an upgrade runs this hook while the old
+// server is still alive, and that old process (and the dashboard it serves)
+// needs to see that the package directory already moved on. Best-effort.
+try {
+  writeDiskVersion(getDataDir(), require("../package.json").version);
+} catch (e) {
+  console.warn(`[10router] could not record disk version: ${e.message}`);
+}
 
 try {
   ensureSqliteRuntime({ silent: false });

package/hooks/sqliteRuntime.js

@@ -41,12 +41,17 @@ function ensureRuntimeDir() {
   return dir;
 }
 
-function hasModule(name) {
-  return fs.existsSync(path.join(getRuntimeNodeModules(), name, "package.json"));
+// Both helpers take the node_modules dir explicitly so a *diagnostic* can ask
+// about a directory it was handed (doctor) while production code keeps the one
+// default that matters. They are the single source of truth for "installed" vs
+// "installed and actually usable": npm happily reports better-sqlite3 as present
+// when its compiled binary never got built.
+function hasModule(name, nodeModulesDir = getRuntimeNodeModules()) {
+  return fs.existsSync(path.join(nodeModulesDir, name, "package.json"));
 }
 
-function isBetterSqliteBinaryValid() {
-  const binary = path.join(getRuntimeNodeModules(), "better-sqlite3", "build", "Release", "better_sqlite3.node");
+function isBetterSqliteBinaryValid(nodeModulesDir = getRuntimeNodeModules()) {
+  const binary = path.join(nodeModulesDir, "better-sqlite3", "build", "Release", "better_sqlite3.node");
   if (!fs.existsSync(binary)) return false;
   try {
     const fd = fs.openSync(binary, "r");
@@ -88,11 +93,19 @@ function runNpmInstall({ cwd, pkgs, extraArgs = [], timeout = 180000 }) {
   return { ok: res.status === 0, code: res.status, stderr: res.stderr || "", stdout: res.stdout || "" };
 }
 
+// Always let npm RECORD these installs — never suppress saving. The runtime dir
+// (~/.10router/runtime) is a single npm project shared by this hook and
+// trayRuntime.js. A package present in node_modules but absent from
+// runtime/package.json is "extraneous", so the next `npm install` in this dir
+// prunes it: sqlite hook installs better-sqlite3 → tray hook installs systray2
+// and prunes better-sqlite3 → the round after prunes systray2 right back.
+// Recording each install as a real dependency makes npm keep both. (Regression
+// guard: tests/unit/runtime-hooks-install-args.test.js asserts no hook ever
+// passes the save-suppressing flag.)
 function npmInstall(pkgs, opts = {}) {
   const cwd = ensureRuntimeDir();
-  const extra = opts.optional ? ["--no-save"] : [];
   if (!opts.silent) console.log("⏳ Installing SQLite engine (first run)...");
-  const res = runNpmInstall({ cwd, pkgs, extraArgs: extra, timeout: opts.timeout || 180000 });
+  const res = runNpmInstall({ cwd, pkgs, timeout: opts.timeout || 180000 });
   if (!res.ok && !opts.silent) {
     const reason = summarizeNpmError(res.stderr);
     console.warn("⚠️  SQLite engine install failed — using fallback");
@@ -107,10 +120,10 @@ function npmInstall(pkgs, opts = {}) {
 // from nested node_modules — verify and reinstall if missing. node:sqlite is
 // built-in. This is purely a *speed optimization* — app works without
 // better-sqlite3 via fallbacks.
-function isSqlJsWasmValid() {
+function isSqlJsWasmValid(nodeModulesDir = getRuntimeNodeModules()) {
   const bundledWasm = path.join(__dirname, "..", "app", "node_modules", "sql.js", "dist", "sql-wasm.wasm");
   if (fs.existsSync(bundledWasm)) return true;
-  const runtimeWasm = path.join(getRuntimeNodeModules(), "sql.js", "dist", "sql-wasm.wasm");
+  const runtimeWasm = path.join(nodeModulesDir, "sql.js", "dist", "sql-wasm.wasm");
   return fs.existsSync(runtimeWasm);
 }
 
@@ -129,7 +142,7 @@ function ensureSqliteRuntime({ silent = false } = {}) {
     return { betterSqlite: true, sqlJs: sqlJsOk };
   }
 
-  const ok = npmInstall([`better-sqlite3@${BETTER_SQLITE3_VERSION}`], { optional: true, silent });
+  const ok = npmInstall([`better-sqlite3@${BETTER_SQLITE3_VERSION}`], { silent });
   return {
     betterSqlite: ok && hasModule("better-sqlite3") && isBetterSqliteBinaryValid(),
     sqlJs: sqlJsOk,
@@ -153,4 +166,9 @@ module.exports = {
   getRuntimeNodeModules,
   runNpmInstall,
   summarizeNpmError,
+  npmInstall,
+  getDataDir,
+  hasModule,
+  isBetterSqliteBinaryValid,
+  isSqlJsWasmValid,
 };

package/hooks/trayRuntime.js

@@ -74,7 +74,10 @@ function ensureRuntimeDir() {
 function npmInstall(pkgs, { silent = false } = {}) {
   const cwd = ensureRuntimeDir();
   if (!silent) console.log("⏳ Installing system tray (first run)...");
-  const res = runNpmInstall({ cwd, pkgs, extraArgs: ["--no-save"], timeout: 120000 });
+  // Let npm record systray2 as a dependency — do NOT suppress saving: the
+  // runtime dir is one shared npm project, so an unrecorded package gets pruned
+  // by the sqlite hook's next install (see npmInstall in sqliteRuntime.js).
+  const res = runNpmInstall({ cwd, pkgs, timeout: 120000 });
   if (!res.ok && !silent) {
     const reason = summarizeNpmError(res.stderr);
     console.warn("⚠️  System tray install failed — tray disabled");
@@ -104,4 +107,4 @@ function ensureTrayRuntime({ silent = false } = {}) {
   return { systray: ok && hasSystray() };
 }
 
-module.exports = { ensureTrayRuntime };
+module.exports = { ensureTrayRuntime, npmInstall };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@techysy/10router",
-  "version": "1.1.3",
+  "version": "1.2.1",
   "description": "10Router CLI - Start and manage 10Router server",
   "publishConfig": {
     "access": "public"
@@ -32,7 +32,7 @@
     "react-dom": "19.2.1"
   },
   "comment_postinstall": "`|| exit 0` is deliberate: this hook only warms ~/.10router/runtime, and cli.js re-runs the same ensureSqliteRuntime/ensureTrayRuntime on every start, so a failure here costs nothing. Without it npm aborts the whole install — e.g. running Windows npm against a WSL path, where cmd.exe cannot cd to a UNC directory, falls back to C:\\Windows and node then cannot find hooks/postinstall.js at all, so the script's own try/catch never gets to run.",
-  "comment_sqlite": "sql.js + better-sqlite3 are NOT bundled here. They are installed into ~/.10router/runtime/node_modules by hooks/postinstall.js (and re-checked at runtime by cli.js). This avoids Windows EBUSY errors when updating the global CLI, since native .node files no longer live under the locked install dir.",
+  "comment_sqlite": "sql.js + better-sqlite3 are NOT bundled here. They are installed into ~/.10router/runtime/node_modules by hooks/postinstall.js (and re-checked at runtime by cli.js). This avoids Windows EBUSY errors when updating the global CLI, since native .node files no longer live under the locked install dir. Both runtime deps are installed WITH save (never --no-save): the runtime dir is a single shared npm project, so a package found in node_modules but missing from runtime/package.json is pruned as extraneous by the other hook's next install, and the two hooks would otherwise uninstall each other in a ping-pong.",
   "comment_systray": "systray2 is NOT bundled here. It is lazy-installed into ~/.10router/runtime/node_modules by hooks/postinstall.js on macOS/Linux only. Windows uses PowerShell NotifyIcon (zero binary). This avoids shipping unsigned Go binaries that trigger antivirus false positives (Kaspersky). We use the systray2 fork because the legacy systray@1.0.5 ships a 2017 x86_64 binary that fails on modern macOS dyld.",
   "engines": {
     "node": ">=18.0.0"
@@ -45,6 +45,15 @@
     "api"
   ],
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/techysy/10router.git",
+    "directory": "cli"
+  },
+  "homepage": "https://github.com/techysy/10router#readme",
+  "bugs": {
+    "url": "https://github.com/techysy/10router/issues"
+  },
   "devDependencies": {
     "esbuild": "^0.25.12",
     "nodemon": "^3.1.14"

package/src/cli/api/client.js

@@ -13,10 +13,17 @@ const DEFAULT_CONFIG = {
   protocol: "http:",
 };
 
-const CLI_TOKEN_HEADER = "x-9r-cli-token";
+// The server renamed x-9r-cli-token → x-10r-cli-token and still accepts both;
+// send both so this launcher also works against a server older than the rename.
+const CLI_TOKEN_HEADERS = ["x-10r-cli-token", "x-9r-cli-token"];
 const CLI_TOKEN_SALT = "9r-cli-auth";
 const APP_NAME = "10router";
 
+function cliTokenHeaders() {
+  const token = getCliToken();
+  return Object.fromEntries(CLI_TOKEN_HEADERS.map((h) => [h, token]));
+}
+
 function getDataDir() {
   if (process.env.DATA_DIR) return process.env.DATA_DIR;
   if (process.platform === "win32") {
@@ -94,7 +101,7 @@ function makeRequest(method, path, body = null) {
       method: method,
       headers: {
         "Content-Type": "application/json",
-        [CLI_TOKEN_HEADER]: getCliToken(),
+        ...cliTokenHeaders(),
       },
     };