voicecc 1.1.8 → 1.1.10

package/bin/voicecc.js

@@ -297,12 +297,33 @@ function stopDaemon() {
   const pid = parseInt(readFileSync(PID_FILE, "utf-8").trim(), 10);
   console.log(`Stopping VoiceCC (PID ${pid})...`);
 
+  // Kill the entire process group (negative PID) so child processes
+  // like cloudflared and tsx's Node subprocess are also terminated.
   try {
-    process.kill(pid, "SIGTERM");
+    process.kill(-pid, "SIGTERM");
   } catch {
-    // Already dead
+    // Fall back to killing just the main PID
+    try { process.kill(pid, "SIGTERM"); } catch { /* already dead */ }
   }
 
+  // Wait for the process to actually die (up to 5 seconds)
+  const deadline = Date.now() + 5000;
+  while (Date.now() < deadline) {
+    try {
+      process.kill(pid, 0);
+    } catch {
+      break; // Process is gone
+    }
+    // Busy-wait in small increments
+    const waitUntil = Date.now() + 100;
+    while (Date.now() < waitUntil) { /* spin */ }
+  }
+
+  // Force kill if still alive
+  try {
+    process.kill(-pid, "SIGKILL");
+  } catch { /* already dead */ }
+
   // Clean up
   try { unlinkSync(PID_FILE); } catch { /* ignore */ }
   try { unlinkSync(STATUS_FILE); } catch { /* ignore */ }
@@ -479,10 +500,20 @@ function startDaemon() {
     ensureNonRootUser();
     chownPkgRoot();
     console.log(`Dropping root privileges, running as '${VOICECC_USER}'...`);
-    child = spawn("su", ["-", VOICECC_USER, "-c", `cd ${PKG_ROOT} && ${TSX_BIN} server/index.ts`], {
+
+    // Resolve uid/gid for the voicecc user so we can drop privileges
+    // via spawn options instead of `su`, which can leak stdio and
+    // cause PID tracking issues.
+    const uid = parseInt(execSync(`id -u ${VOICECC_USER}`, { encoding: "utf-8" }).trim(), 10);
+    const gid = parseInt(execSync(`id -g ${VOICECC_USER}`, { encoding: "utf-8" }).trim(), 10);
+
+    child = spawn(TSX_BIN, ["server/index.ts"], {
       cwd: PKG_ROOT,
       detached: true,
       stdio: ["ignore", logFd, logFd],
+      uid,
+      gid,
+      env: { ...process.env, HOME: `/home/${VOICECC_USER}`, USER: VOICECC_USER, VOICECC_DIR },
     });
   } else {
     child = spawn(TSX_BIN, ["server/index.ts"], {
@@ -543,6 +574,16 @@ if (isRunning()) {
 // Start the daemon
 startDaemon();
 
-// Wait briefly for server to write status.json, then show info
-await new Promise((resolve) => setTimeout(resolve, 3000));
+// Poll for status.json until the server is ready
+const tunnelEnabled = readFileSync(ENV_PATH, "utf-8").includes("TUNNEL_ENABLED=true");
+const MAX_WAIT_MS = tunnelEnabled ? 30000 : 10000;
+const POLL_INTERVAL_MS = 500;
+const startTime = Date.now();
+
+while (Date.now() - startTime < MAX_WAIT_MS) {
+  await new Promise((resolve) => setTimeout(resolve, POLL_INTERVAL_MS));
+  const status = readStatus();
+  if (status && (!tunnelEnabled || status.tunnelUrl)) break;
+}
+
 showInfo();