@seqyuan/annodex 0.1.40 → 0.1.42

package/bin/annodex.js

@@ -281,27 +281,72 @@ function autoRestartEnabled() {
   return true;
 }
 
+function addPidIfValid(target, pidValue) {
+  const pid = Number(pidValue);
+  if (Number.isInteger(pid) && pid > 0 && pid !== process.pid) target.add(pid);
+}
+
+function localAddressMatchesPort(localAddress, listenPort) {
+  const match = String(localAddress || "").trim().match(/:(\d+)$/);
+  return !!match && Number(match[1]) === listenPort;
+}
+
 function findListeningPids(listenPort) {
-  if (process.platform === "win32") return [];
+  const targetPort = Number(listenPort);
+  if (!Number.isInteger(targetPort) || targetPort <= 0 || targetPort > 65535) return [];
   const pids = new Set();
+
+  if (process.platform === "win32") {
+    try {
+      const psCommand = [
+        `$port = ${targetPort}`,
+        "Get-NetTCPConnection -State Listen -LocalPort $port -ErrorAction Stop | Select-Object -ExpandProperty OwningProcess",
+      ].join("; ");
+      const result = spawnSync("powershell.exe", ["-NoProfile", "-Command", psCommand], { encoding: "utf8", windowsHide: true });
+      if (result.status === 0) {
+        result.stdout
+          .split(/\r?\n/)
+          .map((value) => value.trim())
+          .filter(Boolean)
+          .forEach((value) => addPidIfValid(pids, value));
+      }
+    } catch {
+      // Fall through to netstat.
+    }
+    if (pids.size === 0) {
+      try {
+        const result = spawnSync("netstat", ["-ano", "-p", "tcp"], { encoding: "utf8", windowsHide: true });
+        for (const line of result.stdout.split(/\r?\n/)) {
+          const fields = line.trim().split(/\s+/);
+          if (fields.length < 5) continue;
+          const proto = fields[0].toUpperCase();
+          const localAddress = fields[1];
+          const state = fields[3] ? fields[3].toUpperCase() : "";
+          const pidValue = fields[fields.length - 1];
+          if (proto !== "TCP" || state !== "LISTENING" || !localAddressMatchesPort(localAddress, targetPort)) continue;
+          addPidIfValid(pids, pidValue);
+        }
+      } catch {
+        // Ignore lookup failures.
+      }
+    }
+    return [...pids];
+  }
+
   try {
-    const result = spawnSync("lsof", [`-tiTCP:${listenPort}`, "-sTCP:LISTEN"], { encoding: "utf8" });
+    const result = spawnSync("lsof", [`-tiTCP:${targetPort}`, "-sTCP:LISTEN"], { encoding: "utf8" });
     result.stdout
       .split(/\s+/)
-      .map((value) => Number(value))
-      .filter((pid) => Number.isInteger(pid) && pid > 0 && pid !== process.pid)
-      .forEach((pid) => pids.add(pid));
+      .filter(Boolean)
+      .forEach((value) => addPidIfValid(pids, value));
   } catch {
     // Fall through to ss.
   }
   if (pids.size === 0 && process.platform === "linux") {
     try {
-      const result = spawnSync("ss", ["-H", "-ltnp", `sport = :${listenPort}`], { encoding: "utf8" });
+      const result = spawnSync("ss", ["-H", "-ltnp", `sport = :${targetPort}`], { encoding: "utf8" });
       const matches = result.stdout.matchAll(/pid=(\d+)/g);
-      for (const match of matches) {
-        const pid = Number(match[1]);
-        if (Number.isInteger(pid) && pid > 0 && pid !== process.pid) pids.add(pid);
-      }
+      for (const match of matches) addPidIfValid(pids, match[1]);
     } catch {
       // Ignore lookup failures.
     }
@@ -324,6 +369,22 @@ function isPathInside(childPath, parentPath) {
 
 function readProcessCmdline(pid) {
   if (!Number.isInteger(pid) || pid <= 0) return "";
+  if (process.platform === "win32") {
+    try {
+      const psCommand = `Get-CimInstance Win32_Process -Filter \"ProcessId = ${pid}\" -ErrorAction Stop | Select-Object -ExpandProperty CommandLine`;
+      const result = spawnSync("powershell.exe", ["-NoProfile", "-Command", psCommand], { encoding: "utf8", windowsHide: true });
+      if (result.status === 0 && result.stdout.trim()) return result.stdout.trim();
+    } catch {
+      // Fall through to wmic.
+    }
+    try {
+      const result = spawnSync("wmic", ["process", "where", `ProcessId=${pid}`, "get", "CommandLine", "/value"], { encoding: "utf8", windowsHide: true });
+      const line = result.stdout.split(/\r?\n/).find((value) => value.startsWith("CommandLine="));
+      return line ? line.slice("CommandLine=".length).trim() : "";
+    } catch {
+      return "";
+    }
+  }
   if (process.platform === "linux") {
     try {
       return fs.readFileSync(`/proc/${pid}/cmdline`, "utf8").replace(/\0/g, " ").trim();
@@ -673,8 +734,7 @@ Usage:
   annodex stop           Stop background annodex
   annodex status [--json] Show background server status
   annodex logs [-f]      Show background server logs
-  annodex passwd          Change password (or set if none)
-  annodex passwd --reset   Remove password (disable auth)
+  annodex passwd          Set or change password (empty = disable auth)
   annodex update          Update to the latest version
 
 Options:
@@ -754,7 +814,6 @@ if (firstPos === "update") {
 
 if (firstPos === "passwd") {
   const reset = positionals[1] === "--reset";
-
   if (reset) {
     if (fs.existsSync(authFile)) {
       fs.unlinkSync(authFile);
@@ -764,41 +823,26 @@ if (firstPos === "passwd") {
     }
     process.exit(0);
   }
-
   const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
   const ask = (prompt) => new Promise((res) => rl.question(prompt, res));
   (async () => {
     const exists = fs.existsSync(authFile);
     if (exists) {
-      console.log("\n   Changing password...\n");
-      const oldPw = await ask("Current password: ");
-      try {
-        const cfg = JSON.parse(fs.readFileSync(authFile, "utf8"));
-        if (!bcrypt.compareSync(oldPw, cfg.passwordHash)) {
-          console.log("   ❌ Incorrect password.\n");
-          rl.close();
-          process.exit(1);
-        }
-      } catch { console.log("   ❌ Could not read auth file.\n"); rl.close(); process.exit(1); }
+      console.log("\n   Changing password...");
+      console.log("   (Terminal access grants reset permission — no old password needed)\n");
     }
-    const pw1 = await ask("New password (empty to disable): ");
-    if (!pw1.trim()) {
+    const pw = await ask("New password (empty to disable): ");
+    if (!pw.trim()) {
       if (fs.existsSync(authFile)) fs.unlinkSync(authFile);
       console.log("   🔓 Auth disabled.\n");
       rl.close();
       process.exit(0);
     }
-    const pw2 = await ask("Confirm new password: ");
-    if (pw1 !== pw2) {
-      console.log("   ❌ Passwords don't match.\n");
-      rl.close();
-      process.exit(1);
-    }
-    const hash = bcrypt.hashSync(pw1, 10);
+    const hash = bcrypt.hashSync(pw, 10);
     const dir = path.dirname(authFile);
     if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
     fs.writeFileSync(authFile, JSON.stringify({ passwordHash: hash, enabled: true }, null, 2));
-    console.log(exists ? "   ✅ Password changed.\n" : "   ✅ Password set.\n");
+    console.log(exists ? "   ✅ Password changed.\n" : "   ✅ Password set. Restart won't prompt.\n");
     rl.close();
     process.exit(0);
   })();
@@ -835,21 +879,14 @@ function promptPassword() {
     (async () => {
       console.log("\n🔐 No password set. You can protect annodex with a password.");
       console.log("   Leave empty and press Enter to skip.\n");
-      const pw1 = await ask("Enter password: ");
-      if (!pw1.trim()) {
+      const pw = await ask("Enter password: ");
+      if (!pw.trim()) {
         console.log("   Skipped — no password required.\n");
         rl.close();
         resolve(false);
         return;
       }
-      const pw2 = await ask("Confirm password: ");
-      if (pw1 !== pw2) {
-        console.log("   Passwords don't match. Skipping.\n");
-        rl.close();
-        resolve(false);
-        return;
-      }
-      const hash = bcrypt.hashSync(pw1, 10);
+      const hash = bcrypt.hashSync(pw, 10);
       const dir = path.dirname(authFile);
       if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
       fs.writeFileSync(authFile, JSON.stringify({ passwordHash: hash, enabled: true }, null, 2));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seqyuan/annodex",
-  "version": "0.1.40",
+  "version": "0.1.42",
   "description": "AI-native bioinformatics workspace by Annoroad",
   "license": "MIT",
   "bin": {