git-watchtower 1.12.1 → 1.12.2

package/bin/git-watchtower.js

@@ -419,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';
@@ -481,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
 
@@ -2123,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
 
@@ -2773,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();
@@ -3016,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;
@@ -3103,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(() => {
@@ -3154,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');
@@ -3285,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);
@@ -3413,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();
@@ -3468,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) {
@@ -3479,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.1",
+  "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) {