git-watchtower 2.3.13 → 2.3.15

package/package.json

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

package/src/casino/index.js

@@ -7,6 +7,7 @@
  */
 
 const { ansi, box } = require('../ui/ansi');
+const sounds = require('./sounds');
 
 // ============================================================================
 // Casino Mode State
@@ -110,13 +111,17 @@ function disable() {
   // up to ~15 frames × 120 ms = 1.8 s after disable, and lossMessage stayed
   // set so isLossAnimating() reported true into the next session.
   resetLossState();
-  // Drop the marquee render callback so a stale closure to the previous
-  // session's render() doesn't survive across enable/disable cycles. In
-  // production this is mostly hygiene (bin/git-watchtower.js wires the
-  // callback exactly once at startup against a singleton render fn), but
-  // tests that re-use the casino module saw the previous test's callback
-  // persist into the next setRenderCallback assignment.
-  marqueeCallback = null;
+  // KEEP marqueeCallback set across disable→enable cycles. The bin wires
+  // this callback exactly once at startup; nulling it here would mean a
+  // user-triggered casino toggle (off then on with `c`) would leave the
+  // marquee interval ticking with no render trigger, freezing the
+  // animation until some other event forced a redraw. The interval body
+  // is already gated on `casinoEnabled`, which is the source of truth.
+  // Cancel any pending sound timeouts (jackpot bell chains, multi-play
+  // mega-jackpot files) so audio doesn't continue after the user
+  // toggled casino mode off — and so child processes from the file-play
+  // path don't get spawned by a setTimeout that fires after shutdown.
+  sounds.cancelAll();
 }
 
 /**

package/src/casino/sounds.js

@@ -9,6 +9,44 @@ const { execFile } = require('child_process');
 const path = require('path');
 const fs = require('fs');
 
+/**
+ * Pending setTimeout handles for the multi-bell / multi-play chains used
+ * by playJackpot and playMegaJackpot. Tracked so casino.disable() (and
+ * shutdown) can cancel any in-flight chain instead of letting up to ~600
+ * ms of post-disable audio leak through.
+ * @type {Set<NodeJS.Timeout>}
+ */
+const _pendingTimeouts = new Set();
+
+/**
+ * Schedule a callback like setTimeout, but auto-track the handle so it
+ * can be cancelled by cancelAll() and auto-removes itself on fire.
+ * @param {Function} fn
+ * @param {number} delay
+ * @returns {NodeJS.Timeout}
+ * @private
+ */
+function _scheduleTracked(fn, delay) {
+  const handle = setTimeout(() => {
+    _pendingTimeouts.delete(handle);
+    try { fn(); } catch (e) { /* sounds are optional */ }
+  }, delay);
+  _pendingTimeouts.add(handle);
+  return handle;
+}
+
+/**
+ * Cancel every pending sound timeout. Idempotent. Called from
+ * casino.disable() so a jackpot fired moments before the user toggled
+ * casino mode off doesn't keep playing afterward.
+ */
+function cancelAll() {
+  for (const handle of _pendingTimeouts) {
+    clearTimeout(handle);
+  }
+  _pendingTimeouts.clear();
+}
+
 // ============================================================================
 // Sound Configuration
 // ============================================================================
@@ -133,10 +171,11 @@ function playJackpot() {
   if (soundPath) {
     playFile(soundPath, VOLUME.jackpot);
   } else {
-    // Multiple bells for jackpot!
+    // Multiple bells for jackpot! Tracked so casino.disable() can
+    // cancel mid-chain — see _scheduleTracked / cancelAll.
     playBell();
-    setTimeout(playBell, 200);
-    setTimeout(playBell, 400);
+    _scheduleTracked(playBell, 200);
+    _scheduleTracked(playBell, 400);
   }
 }
 
@@ -146,14 +185,14 @@ function playJackpot() {
 function playMegaJackpot() {
   const soundPath = getSoundPath('jackpot');
   if (soundPath) {
-    // Play jackpot sound multiple times
+    // Play jackpot sound multiple times. Tracked for cancellation.
     playFile(soundPath, VOLUME.jackpot);
-    setTimeout(() => playFile(soundPath, VOLUME.jackpot), 300);
-    setTimeout(() => playFile(soundPath, VOLUME.jackpot), 600);
+    _scheduleTracked(() => playFile(soundPath, VOLUME.jackpot), 300);
+    _scheduleTracked(() => playFile(soundPath, VOLUME.jackpot), 600);
   } else {
     // Lots of bells!
     for (let i = 0; i < 5; i++) {
-      setTimeout(playBell, i * 150);
+      _scheduleTracked(playBell, i * 150);
     }
   }
 }
@@ -240,6 +279,7 @@ module.exports = {
   playSpin,
   playLoss,
   playForWinLevel,
+  cancelAll,
   getSoundPath,
   SOUNDS_DIR,
 };