dankgrinder 8.53.0 → 8.54.0

package/lib/grinder.js

@@ -3024,11 +3024,10 @@ async function start(apiKey, apiUrl, opts = {}) {
     const cpm = globalCmdRate.getRate().toFixed(1);
     console.log(`${c.bold}Total:${c.reset} +⏣${finalCoins.toLocaleString()} in ${formatUptime()} | ${finalCmds}cmds | ~${cpm}cmd/m | ${memFinal}MB`);
 
-    // Stop workers — max 1s per worker so one hung client doesn't block shutdown
-    await Promise.all(workers.map(wk => Promise.race([
-      new Promise(resolve => { wk.stop(); resolve(true); }),
-      new Promise(resolve => setTimeout(() => resolve(false), 1000)),
-    ])));
+    // Stop workers immediately (don't wait) — instant shutdown
+    for (const wk of workers) {
+      try { wk.stop(); } catch {}
+    }
     workerMap.clear();
 
     // Release cluster claims
@@ -3054,13 +3053,14 @@ async function start(apiKey, apiUrl, opts = {}) {
 
     if (redis) { redis.disconnect().catch(() => {}); }
     console.log(`${c.green}Goodbye!${c.reset}\n`);
-    // Force exit after 5s so Ctrl+C always terminates even if cleanup hangs
-    setTimeout(() => process.exit(0), 5000);
+    // Force exit so Ctrl+C always terminates immediately
+    setTimeout(() => process.exit(0), 2000);
     process.exit(0);
   }
 
   process.on('SIGINT', () => gracefulShutdown('SIGINT'));
   process.on('SIGTERM', () => gracefulShutdown('SIGTERM'));
+  process.on('SIGHUP', () => gracefulShutdown('SIGHUP'));
 }
 
 // ══════════════════════════════════════════════════════════════

package/lib/ui.js

@@ -1,6 +1,6 @@
 /**
  * CLI Live Dashboard — cursor-positioned in-place row updates.
- * Box drawn once at startup. Account rows updated in-place. Events below box.
+ * Box drawn once. Rows updated in-place. Events below box.
  */
 
 let _startTime = Date.now();
@@ -9,13 +9,15 @@ let _version = '0.0.0';
 let _live = false;
 let _phase = 'init';
 
-// Terminal dimensions at last draw
+// Terminal dimensions
 let _W = 100;
 let _inner = 98;
 let _maxAccounts = 4;
 
-// Row map: which terminal row each account row starts at (1-indexed)
-let _accountRows = []; // _accountRows[accountIdx] = terminalRow
+// Row map: which terminal row each account starts at (1-indexed)
+let _accountRows = []; // _accountRows[accountIdx] = row
+let _totalsRow = 0;
+let _bottomRow = 0;
 
 // ── Spinner frames ────────────────────────────────────────────
 const SPINNER = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
@@ -50,20 +52,21 @@ const c = {
   white: '\x1b[37m',
 };
 const DIM = c.dim;
+const B = '\x1b[38;2;77;212;238m'; // box border color
 
+function row(n) { process.stdout.write(`\x1b[${n};1H`); }
+function clrLine() { process.stdout.write('\x1b[2K'); }
 function trunc(s, n) { s = String(s || ''); return s.length <= n ? s : s.slice(0, n - 1) + '…'; }
 function padR(s, n) { return trunc(s, n).padEnd(n); }
 function padL(s, n, char) { return String(s).padStart(n, char || ' '); }
 function stripAnsi(s) { return String(s).replace(/\x1b\[[0-9;]*m/g, ''); }
-function clearLine() { process.stdout.write('\x1b[2K'); } // clear current line
+function ln() { process.stdout.write('\n'); }
 
 function fmtUptime() {
   const s = Math.floor((Date.now() - _startTime) / 1000);
   if (s < 60) return `${s}s`;
   const m = Math.floor(s / 60);
   const h = Math.floor(m / 60);
-  const d = Math.floor(h / 24);
-  if (d > 0) return `${d}d${h % 24}h`;
   if (h > 0) return `${h}h${m % 60}m`;
   return `${m}m`;
 }
@@ -114,8 +117,24 @@ function fmtLevel(w) {
   return c.cyan + lv + c.reset;
 }
 
-// ── Build a full account row string ──────────────────────────
-function buildAccountRow(w, wi, col) {
+// ── Layout ────────────────────────────────────────────────────
+function layout() {
+  _W = Math.min(process.stdout.columns || 100, 120);
+  _inner = _W - 2;
+  const rows = process.stdout.rows || 40;
+  _maxAccounts = Math.min(_workers.length, Math.max(3, rows - 16));
+}
+
+// ── Column layout ─────────────────────────────────────────────
+function getCol() {
+  const col = { st: 9, name: 18, cmd: 16, bal: 8, ls: 3, lv: 3, earned: 8 };
+  const nameExtra = Math.max(0, _inner - col.st - col.name - col.cmd - col.bal - col.ls - col.lv - col.earned - 14);
+  col.name += nameExtra;
+  return col;
+}
+
+// ── Build account row string ─────────────────────────────────
+function accountRow(w, wi, col) {
   const col2 = wc(wi);
   const stCol = statusColor(w);
   const stTxt = statusText(w);
@@ -125,46 +144,54 @@ function buildAccountRow(w, wi, col) {
   const lv = fmtLevel(w);
   const name = padR(trunc(w.username || '?', col.name), col.name);
   const doing = padR(w.lastStatus || 'idle', col.cmd);
+  const earnedStr = stripAnsi(earned);
+  const balStr = stripAnsi(bal);
+
+  // Pad earned and bal to column widths
+  const earnedPadded = earned.padEnd(col.earned + (earned.length - earnedStr.length));
+  const balPadded = bal.padEnd(col.bal + (bal.length - balStr.length));
 
   return (
-    '\x1b[2K' + // clear the line first
-    `\x1b[38;2;77;212;238m│\x1b[0m ` +
+    `${B}│\x1b[0m ` +
     `${DIM}${padL(wi + 1, 2)}${c.reset} ` +
     `${stCol}${padR(stTxt, col.st)}${c.reset} ` +
     `${col2}${name}${c.reset} ` +
     `${DIM}${doing}${c.reset} ` +
-    `${padL(bal, col.bal)} ` +
+    `${balPadded} ` +
     `${padL(ls, col.ls)} ` +
     `${padL(lv, col.lv)} ` +
-    `${padL(earned, col.earned)} ` +
-    `\x1b[38;2;77;212;238m│\x1b[0m\n`
+    `${earnedPadded} ` +
+    `${B}│\x1b[0m`
   );
 }
 
-// ── Draw the FULL box (called once at startup) ───────────────
+// ── Draw the FULL box (called once) ─────────────────────────
 function draw() {
-  const rows = process.stdout.rows || 40;
-  _W = Math.min(process.stdout.columns || 100, 120);
-  _inner = _W - 2;
+  layout();
+  const col = getCol();
+  const bannerH = BANNER_LINES.length;
 
-  // Clear entire screen
+  // Clear entire screen + home
   process.stdout.write('\x1b[2J\x1b[H');
 
+  let r = 1;
+
   // ── Top border ──
-  process.stdout.write(`\x1b[38;2;77;212;238m┌${'─'.repeat(_inner)}┐\x1b[0m\n`);
-
-  // ── ASCII banner ──
-  const bannerWithVer = BANNER_LINES[1].replace('PLACEHOLDER', _version);
-  const bannerLines = [BANNER_LINES[0], bannerWithVer, ...BANNER_LINES.slice(2)];
-  for (let i = 0; i < bannerLines.length; i++) {
-    const line = bannerLines[i];
-    const inner = _inner - stripAnsi(line).length;
+  row(r++); clrLine();
+  process.stdout.write(`${B}┌${'─'.repeat(_inner)}┐`);
+  ln();
+
+  // ── Banner ──
+  for (let i = 0; i < bannerH; i++) {
+    row(r++); clrLine();
+    const line = i === 1 ? BANNER_LINES[1].replace('PLACEHOLDER', _version) : BANNER_LINES[i];
     if (i < 2) {
       const gradLine = gradientLine(line, 77, 212, 238, 255, 92, 147);
-      process.stdout.write(`\x1b[38;2;77;212;238m│\x1b[0m${gradLine}${' '.repeat(_inner - stripAnsi(gradLine).length)}\x1b[38;2;77;212;238m│\x1b[0m\n`);
+      process.stdout.write(`${B}│\x1b[0m  ${gradLine}${' '.repeat(_inner - 2 - stripAnsi(gradLine) - 2)}${B}│`);
     } else {
-      process.stdout.write(`\x1b[38;2;77;212;238m│\x1b[0m${DIM}${line}${c.reset}${' '.repeat(_inner - stripAnsi(line).length)}\x1b[38;2;77;212;238m│\x1b[0m\n`);
+      process.stdout.write(`${B}│\x1b[0m  ${DIM}${line}${c.reset}${' '.repeat(_inner - 2 - stripAnsi(line) - 2)}${B}│`);
     }
+    ln();
   }
 
   // ── Status bar ──
@@ -179,34 +206,25 @@ function draw() {
     `${DIM}Ctrl+C${c.reset}`,
   ].filter(Boolean);
   const statusStr = statusParts.join('   ') + phaseLabel;
-  process.stdout.write(`\x1b[38;2;77;212;238m│\x1b[0m ${statusStr}${' '.repeat(_inner - stripAnsi(statusStr))}\x1b[38;2;77;212;238m│\x1b[0m\n`);
-  process.stdout.write(`\x1b[38;2;77;212;238m├${'─'.repeat(_inner)}┤\x1b[0m\n`);
 
-  // ── Table header ──
-  const col = { st: 9, name: 18, cmd: 16, bal: 8, ls: 3, lv: 3, earned: 8 };
-  const nameExtra = Math.max(0, _inner - col.st - col.name - col.cmd - col.bal - col.ls - col.lv - col.earned - 14);
-  col.name += nameExtra;
+  row(r++); clrLine();
+  process.stdout.write(`${B}│\x1b[0m ${statusStr}${' '.repeat(_inner - 1 - stripAnsi(statusStr))}${B}│`);
+  ln();
 
-  process.stdout.write(`\x1b[2K\x1b[38;2;77;212;238m│\x1b[0m `);
-  process.stdout.write(`${c.bold}#${c.reset} `);
-  process.stdout.write(`${c.bold}${padR('STATUS', col.st)}${c.reset} `);
-  process.stdout.write(`${c.bold}${padR('ACCOUNT', col.name)}${c.reset} `);
-  process.stdout.write(`${c.bold}${padR('DOING', col.cmd)}${c.reset} `);
-  process.stdout.write(`${c.bold}${padL('BAL', col.bal)}${c.reset} `);
-  process.stdout.write(`${c.bold}${padL('LS', col.ls)}${c.reset} `);
-  process.stdout.write(`${c.bold}${padL('LV', col.lv)}${c.reset} `);
-  process.stdout.write(`${c.bold}${padL('EARNED', col.earned)}${c.reset} `);
-  process.stdout.write(`\x1b[38;2;77;212;238m│\x1b[0m\n`);
-  process.stdout.write(`\x1b[38;2;77;212;238m│\x1b[0m ${'─'.repeat(_inner)} \x1b[38;2;77;212;238m│\x1b[0m\n`);
-
-  // Track row positions
-  const BOX_TOP = 1;
-  const bannerH = bannerLines.length;      // 6
-  const statusBarRow = BOX_TOP + bannerH + 1; // row 8
-  const headerRow = statusBarRow + 1;          // row 9
-  const hrRow = headerRow + 1;                 // row 10
-  _maxAccounts = Math.min(_workers.length, Math.max(3, rows - 14));
-  _accountRows = [];
+  // ── Divider ──
+  row(r++); clrLine();
+  process.stdout.write(`${B}├${'─'.repeat(_inner)}┤`);
+  ln();
+
+  // ── Header ──
+  row(r++); clrLine();
+  process.stdout.write(`${B}│\x1b[0m ${c.bold}#${c.reset} ${c.bold}${padR('STATUS', col.st)}${c.reset} ${c.bold}${padR('ACCOUNT', col.name)}${c.reset} ${c.bold}${padR('DOING', col.cmd)}${c.reset} ${c.bold}${padL('BAL', col.bal)}${c.reset} ${c.bold}${padL('LS', col.ls)}${c.reset} ${c.bold}${padL('LV', col.lv)}${c.reset} ${c.bold}${padL('EARNED', col.earned)}${c.reset} ${B}│`);
+  ln();
+
+  // ── HR ──
+  row(r++); clrLine();
+  process.stdout.write(`${B}│\x1b[0m ${'─'.repeat(_inner)} ${B}│`);
+  ln();
 
   // ── Account rows ──
   const sorted = [..._workers].sort((a, b) => {
@@ -218,14 +236,22 @@ function draw() {
   });
   const shown = sorted.slice(0, _maxAccounts);
 
+  _accountRows = [];
   for (let si = 0; si < shown.length; si++) {
     const w = shown[si];
     const wi = _workers.indexOf(w);
-    const rowNum = hrRow + 1 + si;
-    _accountRows[wi] = rowNum;
-    process.stdout.write(buildAccountRow(w, wi, col));
+    _accountRows[wi] = r;
+    row(r++); clrLine();
+    process.stdout.write(accountRow(w, wi, col));
+    ln();
   }
 
+  // ── Totals divider ──
+  _totalsRow = r;
+  row(r++); clrLine();
+  process.stdout.write(`${B}│\x1b[0m ${'─'.repeat(_inner)} ${B}│`);
+  ln();
+
   // ── Totals ──
   let totalCoins = 0, totalBal = 0;
   for (const w of _workers) {
@@ -233,40 +259,35 @@ function draw() {
     totalBal += w.stats.balance || 0;
   }
   const memMB = Math.round((process.memoryUsage?.rss?.() ?? process.memoryUsage().rss) / 1048576);
+  const balStr = totalBal > 0 ? '⏣' + totalBal.toLocaleString() : '—';
+  const balPadded = balStr.padEnd(col.bal);
+  const earnedStr = stripAnsi(fmtCoins(totalCoins));
 
-  const totalsRow = hrRow + 1 + shown.length;
-  process.stdout.write(`\x1b[38;2;77;212;238m│\x1b[0m ${'─'.repeat(_inner)} \x1b[38;2;77;212;238m│\x1b[0m\n`);
-  process.stdout.write(`\x1b[2K\x1b[38;2;77;212;238m│\x1b[0m `);
-  process.stdout.write(`${c.bold}Σ${c.reset} `);
-  process.stdout.write(`${DIM}${padL(_workers.length, 2)} acc${c.reset} `);
-  process.stdout.write(`${' '.repeat(col.name)} `);
-  process.stdout.write(`${' '.repeat(col.cmd)} `);
-  process.stdout.write(`${padL(totalBal > 0 ? '⏣' + totalBal.toLocaleString() : '—', col.bal)} `);
-  process.stdout.write(`${' '.repeat(col.ls)} `);
-  process.stdout.write(`${' '.repeat(col.lv)} `);
-  process.stdout.write(`${fmtCoins(totalCoins)} `);
-  process.stdout.write(`${DIM}${fmtUptime()} | ${memMB}MB${c.reset} `.padEnd(_inner));
-  process.stdout.write(`\x1b[38;2;77;212;238m│\x1b[0m\n`);
+  row(r++); clrLine();
+  process.stdout.write(
+    `${B}│\x1b[0m ${c.bold}Σ${c.reset} ${DIM}${padL(_workers.length, 2)} acc${c.reset} ${' '.repeat(col.name + col.cmd)} ${balPadded} ${' '.repeat(col.ls + col.lv)} ${fmtCoins(totalCoins)}${' '.repeat(_inner - 2 - stripAnsi(` ${c.bold}Σ${c.reset} ${DIM}${padL(_workers.length, 2)} acc${c.reset} ${' '.repeat(col.name + col.cmd)} ${balPadded} ${' '.repeat(col.ls + col.lv)} ${fmtCoins(totalCoins)}`))}${B}│`
+  );
+  ln();
 
   // ── Bottom ──
-  process.stdout.write(`\x1b[38;2;77;212;238m└${'─'.repeat(_inner)}┘\x1b[0m\n`);
+  _bottomRow = r;
+  row(r++); clrLine();
+  process.stdout.write(`${B}└${'─'.repeat(_inner)}┘`);
+  ln();
 }
 
-// ── Update ONE account row in place ─────────────────────────
+// ── Update ONE account row in-place ─────────────────────────
 function updateAccountRow(accountIdx) {
-  const row = _accountRows[accountIdx];
-  if (!row) return; // not visible
-
+  if (!_live) return;
+  const rowNum = _accountRows[accountIdx];
+  if (!rowNum) return; // not visible
   const w = _workers[accountIdx];
   if (!w) return;
+  const col = getCol();
 
-  const col = { st: 9, name: 18, cmd: 16, bal: 8, ls: 3, lv: 3, earned: 8 };
-  const nameExtra = Math.max(0, _inner - col.st - col.name - col.cmd - col.bal - col.ls - col.lv - col.earned - 14);
-  col.name += nameExtra;
-
-  // Move cursor to this row, column 1
-  process.stdout.write(`\x1b[${row};1H`);
-  process.stdout.write(buildAccountRow(w, accountIdx, col));
+  row(rowNum); clrLine();
+  process.stdout.write(accountRow(w, accountIdx, col));
+  ln();
 }
 
 // ── Gradient line ─────────────────────────────────────────────
@@ -280,7 +301,7 @@ function gradientLine(text, r1, g1, b1, r2, g2, b2) {
 }
 
 // ── Event tracking ────────────────────────────────────────────
-let _eventLines = []; // [accountIdx] = [{text, ts}]
+let _eventLines = [];
 const MAX_EVENTS = 15;
 
 // ── Public API ────────────────────────────────────────────────
@@ -307,7 +328,6 @@ function stop() {
 function setLive(val) { _live = val; }
 function setPhase(phase) { _phase = phase; }
 
-// log: update account row in-place + append event below box
 function log(accountIdx, msg) {
   const now = new Date();
   const ts = `${padL(now.getHours(), 2, '0')}:${padL(now.getMinutes(), 2, '0')}:${padL(now.getSeconds(), 2, '0')}`;
@@ -316,13 +336,11 @@ function log(accountIdx, msg) {
     if (!_eventLines[accountIdx]) _eventLines[accountIdx] = [];
     _eventLines[accountIdx].push({ text: msg, ts });
     if (_eventLines[accountIdx].length > MAX_EVENTS) _eventLines[accountIdx].shift();
-    // Update the row in place
     if (_live) updateAccountRow(accountIdx);
   }
 
   if (!_live) return;
 
-  // Append event below the box (after the bottom border)
   const col2 = accountIdx >= 0 ? wc(accountIdx) : c.cyan;
   const name = accountIdx >= 0 ? trunc(_workers[accountIdx]?.username || '?', 14) : 'GLOBAL';
   process.stdout.write(`${col2}${name}${c.reset} ${DIM}[${ts}]${c.reset} ${msg}\n`);
@@ -330,22 +348,17 @@ function log(accountIdx, msg) {
 
 function logGlobal(msg) { log(-1, msg); }
 
-// Force full redraw (call this when window resizes or box needs rebuild)
-function fullRedraw() { if (_live) draw(); }
-
-// ── Periodic refresh: animate spinners & countdowns every 3s ──
+// ── Refresh ──────────────────────────────────────────────────
 let _refreshTimer = null;
 function startRefresh() {
   if (_refreshTimer) return;
   _refreshTimer = setInterval(() => {
     if (!_live) return;
-    for (let i = 0; i < _workers.length; i++) {
-      updateAccountRow(i);
-    }
+    for (let i = 0; i < _workers.length; i++) updateAccountRow(i);
   }, 1500);
 }
 function stopRefresh() {
   if (_refreshTimer) { clearInterval(_refreshTimer); _refreshTimer = null; }
 }
 
-module.exports = { init, drawBanner, start, draw, log, logGlobal, workerColor: wc, stop, setLive, setPhase, updateAccountRow, fullRedraw, startRefresh, stopRefresh };
+module.exports = { init, drawBanner, start, draw, log, logGlobal, workerColor: wc, stop, setLive, setPhase, updateAccountRow, startRefresh, stopRefresh };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dankgrinder",
-  "version": "8.53.0",
+  "version": "8.54.0",
   "description": "Dank Memer automation engine — grind coins while you sleep",
   "bin": {
     "dankgrinder": "bin/dankgrinder.js"