git-watchtower 1.12.0 → 1.12.2

package/bin/git-watchtower.js

@@ -389,6 +389,20 @@ let AUTO_PULL = true;
 const MAX_LOG_ENTRIES = 10;
 const MAX_SERVER_LOG_LINES = 500;
 
+// Timing constants (ms)
+/** Grace period before SIGKILLing a process after SIGTERM. */
+const FORCE_KILL_GRACE_MS = 3000;
+/** Additional grace period added to a command's timeout before SIGKILL. */
+const SIGKILL_GRACE_AFTER_TIMEOUT_MS = 5000;
+/** Delay between stopping and restarting the dev server. */
+const SERVER_RESTART_DELAY_MS = 500;
+/** How long a transient flash message stays on screen. */
+const FLASH_MESSAGE_DURATION_MS = 3000;
+/** Debounce window for file watcher events before notifying clients. */
+const FILE_WATCHER_DEBOUNCE_MS = 100;
+/** Max time to wait for the static HTTP server to close on shutdown. */
+const SERVER_CLOSE_TIMEOUT_MS = 2000;
+
 // Telemetry session tracking
 let branchSwitchCount = 0;
 let sessionStartTime = null;
@@ -405,6 +419,10 @@ let worker = null;
 let projectId = null;
 let webStateInterval = null;
 
+// Periodic update check controller — hoisted to module scope so the exit
+// handler can clean it up regardless of where in start() we are.
+let periodicUpdateCheck = null;
+
 function applyConfig(config) {
   // Server settings
   SERVER_MODE = config.server?.mode || 'static';
@@ -467,6 +485,17 @@ function openInBrowser(url) {
   });
 }
 
+/**
+ * Build a localhost URL for the given port.
+ * Centralizes the `http://localhost:${port}` pattern so it's easy to adjust
+ * (e.g. switch protocol or host) in one place.
+ * @param {number} port
+ * @returns {string}
+ */
+function localhostUrl(port) {
+  return `http://localhost:${port}`;
+}
+
 // parseRemoteUrl, buildBranchUrl, detectPlatform, buildWebUrl, extractSessionUrl
 // imported from src/git/remote.js
 
@@ -742,7 +771,7 @@ function stopServerProcess() {
       } catch (e) {
         // Process group may already be dead
       }
-    }, 3000);
+    }, FORCE_KILL_GRACE_MS);
 
     // Clear the force-kill timer if the process exits cleanly
     proc.once('close', () => {
@@ -760,7 +789,7 @@ function restartServerProcess() {
   setTimeout(() => {
     startServerProcess();
     render();
-  }, 500);
+  }, SERVER_RESTART_DELAY_MS);
 }
 
 // Network and polling state
@@ -857,7 +886,7 @@ function execCli(cmd, args = [], options = {}) {
     if (timeout > 0) {
       const killTimer = setTimeout(() => {
         try { child.kill('SIGKILL'); } catch (e) { /* already dead */ }
-      }, timeout + 5000);
+      }, timeout + SIGKILL_GRACE_AFTER_TIMEOUT_MS);
       child.on('close', () => clearTimeout(killTimer));
     }
   });
@@ -1336,7 +1365,7 @@ function showFlash(message) {
   flashTimeout = setTimeout(() => {
     store.setState({ flashMessage: null });
     render();
-  }, 3000);
+  }, FLASH_MESSAGE_DURATION_MS);
 }
 
 function hideFlash() {
@@ -2109,7 +2138,7 @@ function createStaticServer() {
     return;
   }
 
-  const url = new URL(req.url, `http://localhost:${PORT}`);
+  const url = new URL(req.url, localhostUrl(PORT));
   let pathname = url.pathname;
   const logPath = pathname; // Keep original for logging
 
@@ -2194,7 +2223,7 @@ function setupFileWatcher() {
         addLog(`File changed: ${filename}`, 'info');
         notifyClients();
         render();
-      }, 100);
+      }, FILE_WATCHER_DEBOUNCE_MS);
     });
 
     fileWatcher.on('error', (err) => {
@@ -2759,7 +2788,7 @@ function setupKeyboardInput() {
 
       case 'o': // Open live server in browser
         if (!NO_SERVER) {
-          const serverUrl = `http://localhost:${PORT}`;
+          const serverUrl = localhostUrl(PORT);
           addLog(`Opening ${serverUrl} in browser...`, 'info');
           openInBrowser(serverUrl);
           render();
@@ -3002,7 +3031,7 @@ async function handleWebAction(action, payload) {
         break;
       case 'openBrowser':
         if (!NO_SERVER) {
-          openInBrowser(`http://localhost:${PORT}`);
+          openInBrowser(localhostUrl(PORT));
           sendResult(true, 'Opened in browser');
         }
         break;
@@ -3089,7 +3118,7 @@ async function startWebDashboard(openBrowser) {
       });
       worker.onCommand = (action, payload) => handleWebAction(action, payload);
       await worker.connect();
-      addLog(`Joined web dashboard at http://localhost:${existing.port} (tab)`, 'success');
+      addLog(`Joined web dashboard at ${localhostUrl(existing.port)} (tab)`, 'success');
 
       // Push state periodically
       webStateInterval = setInterval(() => {
@@ -3140,8 +3169,8 @@ async function startWebDashboard(openBrowser) {
     WEB_PORT = port;
     writeLock(process.pid, port, coordinator.socketPath);
 
-    addLog(`Web dashboard: http://localhost:${port}`, 'success');
-    if (openBrowser) openInBrowser(`http://localhost:${port}`);
+    addLog(`Web dashboard: ${localhostUrl(port)}`, 'success');
+    if (openBrowser) openInBrowser(localhostUrl(port));
     render();
   } catch (err) {
     addLog(`Web dashboard failed: ${err.message}`, 'error');
@@ -3250,7 +3279,7 @@ async function shutdown() {
     clients.clear();
 
     const serverClosePromise = new Promise(resolve => server.close(resolve));
-    const timeoutPromise = new Promise(resolve => setTimeout(resolve, 2000));
+    const timeoutPromise = new Promise(resolve => setTimeout(resolve, SERVER_CLOSE_TIMEOUT_MS));
     await Promise.race([serverClosePromise, timeoutPromise]);
   }
 
@@ -3271,6 +3300,11 @@ async function shutdown() {
 
 process.on('SIGINT', shutdown);
 process.on('SIGTERM', shutdown);
+// Clean up long-lived timers on exit, regardless of which code path got us
+// here (normal exit, uncaught exception, early failure in start()).
+process.on('exit', () => {
+  if (periodicUpdateCheck) periodicUpdateCheck.stop();
+});
 process.on('uncaughtException', async (err) => {
   telemetry.captureError(err);
   write(ansi.showCursor);
@@ -3399,11 +3433,11 @@ async function start() {
     // Static mode
     server = createStaticServer();
     server.listen(PORT, '127.0.0.1', () => {
-      addLog(`Server started on http://localhost:${PORT}`, 'success');
+      addLog(`Server started on ${localhostUrl(PORT)}`, 'success');
       addLog(`Serving ${STATIC_DIR.replace(PROJECT_ROOT, '.')}`, 'info');
       addLog(`Current branch: ${store.get('currentBranch')}`, 'info');
       // Add server log entries for static server
-      addServerLog(`Static server started on http://localhost:${PORT}`);
+      addServerLog(`Static server started on ${localhostUrl(PORT)}`);
       addServerLog(`Serving files from: ${STATIC_DIR.replace(PROJECT_ROOT, '.')}`);
       addServerLog(`Live reload enabled - waiting for browser connections...`);
       render();
@@ -3454,8 +3488,9 @@ async function start() {
     }
   }).catch(() => {});
 
-  // Re-check for updates periodically (every 4 hours) while running
-  const periodicCheck = startPeriodicUpdateCheck((latestVersion) => {
+  // Re-check for updates periodically (every 4 hours) while running.
+  // Assigned to module scope so the top-level exit handler can stop it.
+  periodicUpdateCheck = startPeriodicUpdateCheck((latestVersion) => {
     const alreadyKnown = store.get('updateAvailable');
     store.setState({ updateAvailable: latestVersion });
     if (!alreadyKnown) {
@@ -3465,9 +3500,6 @@ async function start() {
     }
     render();
   });
-
-  // Clean up periodic check on exit
-  process.on('exit', () => periodicCheck.stop());
 }
 
 start().catch(err => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-watchtower",
-  "version": "1.12.0",
+  "version": "1.12.2",
   "description": "Terminal-based Git branch monitor with activity sparklines and optional dev server with live reload",
   "main": "bin/git-watchtower.js",
   "bin": {

package/src/cli/args.js

@@ -175,7 +175,15 @@ function parseArgs(argv, options = {}) {
  * @returns {object} Merged config
  */
 function applyCliArgsToConfig(config, cliArgs) {
-  const merged = JSON.parse(JSON.stringify(config)); // deep clone
+  // Shallow clone with nested object spreading — the config is at most two
+  // levels deep and all values are primitives, so this is equivalent to a deep
+  // clone but avoids the JSON round-trip (which silently drops `undefined`,
+  // functions, and throws on circular refs).
+  const merged = {
+    ...config,
+    server: { ...config.server },
+    web: { ...config.web },
+  };
 
   // Server settings
   if (cliArgs.mode !== null) {

package/src/server/process.js

@@ -31,8 +31,17 @@ const KILL_GRACE_PERIOD = 3000;
 const RESTART_DELAY = 500;
 
 /**
- * Parse a command string into command and arguments
- * Handles quoted strings properly
+ * Parse a command string into command and arguments.
+ * Handles quoted strings, backslash escapes (e.g. `\"`, `\\`, `\ `),
+ * and empty quoted arguments (`""`).
+ *
+ * Rules (POSIX-ish):
+ * - Inside single quotes, characters are literal — backslashes do NOT escape.
+ * - Inside double quotes or outside any quotes, a backslash causes the next
+ *   character to be treated literally (so `\"` yields `"`, `\\` yields `\`,
+ *   and `\ ` yields a literal space that doesn't split the argument).
+ * - A trailing backslash with no following character is left literal.
+ *
  * @param {string} commandString - Command string to parse
  * @returns {{command: string, args: string[]}}
  */
@@ -41,27 +50,43 @@ function parseCommand(commandString) {
   let current = '';
   let inQuotes = false;
   let quoteChar = '';
+  // Tracks whether we've started accumulating an argument — distinguishes
+  // `""` (empty argument) from whitespace between arguments.
+  let hasCurrent = false;
 
   for (let i = 0; i < commandString.length; i++) {
     const char = commandString[i];
 
+    // Backslash escapes: unless we're inside single quotes, a backslash
+    // causes the next character to be treated literally. A trailing
+    // backslash (no following character) falls through and is kept literal.
+    if (char === '\\' && quoteChar !== "'" && i + 1 < commandString.length) {
+      current += commandString[i + 1];
+      hasCurrent = true;
+      i++;
+      continue;
+    }
+
     if ((char === '"' || char === "'") && !inQuotes) {
       inQuotes = true;
       quoteChar = char;
+      hasCurrent = true;
     } else if (char === quoteChar && inQuotes) {
       inQuotes = false;
       quoteChar = '';
     } else if (char === ' ' && !inQuotes) {
-      if (current) {
+      if (hasCurrent) {
         args.push(current);
         current = '';
+        hasCurrent = false;
       }
     } else {
       current += char;
+      hasCurrent = true;
     }
   }
 
-  if (current) {
+  if (hasCurrent) {
     args.push(current);
   }