dankgrinder 8.48.0 → 8.51.0

package/lib/grinder.js

@@ -2932,7 +2932,7 @@ async function start(apiKey, apiUrl, opts = {}) {
   ui.log(-1, `Starting ${activeWorkers.length} grind loops...`);
   ui.setLive(true);
   ui.draw();
-  ui.startRefresh(3000);
+  ui.startRefresh();
   for (const w of activeWorkers) {
     if (!shutdownCalled) w.grindLoop();
   }
@@ -3050,10 +3050,12 @@ async function start(apiKey, apiUrl, opts = {}) {
     const webhookMsg = `+⏣ ${finalCoins.toLocaleString()} | ${finalCmds} cmds | ${formatUptime()}` +
       (totalRecoveries > 0 ? ` | ${totalRecoveries} auto-recoveries` : '') +
       (CLUSTER_ENABLED ? ` | node: ${NODE_ID.substring(0, 12)}` : '');
-    sendWebhook('Session Ended', webhookMsg, 0x8b5cf6);
+    sendWebhook('Session Ended', webhookMsg, 0x8b5cf6).catch(() => {});
 
     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);
     process.exit(0);
   }
 

package/lib/ui.js

@@ -1,26 +1,30 @@
 /**
- * CLI Live Dashboard — ASCII banner, per-account status table, event stream below.
+ * CLI Live Dashboard — cursor-positioned in-place row updates.
+ * Box drawn once at startup. Account rows updated in-place. Events below box.
  */
 
 let _startTime = Date.now();
 let _workers = [];
-let _isShuttingDown = () => false;
 let _version = '0.0.0';
 let _live = false;
-let _phase = 'init'; // 'init' | 'login' | 'inventory' | 'balance' | 'dms' | 'grinding'
-let _boxRow = 0;      // which terminal row the box top starts on
-let _boxHeight = 0;   // total rows consumed by the box
-let _eventCountAtDraw = 0; // events logged since last draw
-let _eventCount = 0;  // total events ever logged
+let _phase = 'init';
+
+// Terminal dimensions at last draw
+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
 
 // ── Spinner frames ────────────────────────────────────────────
 const SPINNER = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
 function spinnerFrame() { return SPINNER[Math.floor(Date.now() / 150) % SPINNER.length]; }
 
-// ── Compact ASCII art banner (fits in 80-col box) ─────────────
+// ── ASCII banner ──────────────────────────────────────────────
 const BANNER_LINES = [
   '  ██████╗ ██╗   ██╗███╗   ██╗ ██████╗ ███████╗ ██████╗ ███╗   ██╗  DANKGRINDER',
-  '  ██╔══██╗██║   ██║████╗  ██║██╔════╝ ██╔════╝██╔═══██╗████╗  ██║  v' + 'PLACEHOLDER',
+  '  ██╔══██╗██║   ██║████╗  ██║██╔════╝ ██╔════╝██╔═══██╗████╗  ██║  vPLACEHOLDER',
   '  ██║  ██║██║   ██║██╔██╗ ██║██║  ███╗█████╗  ██║   ██║██╔██╗ ██║',
   '  ██║  ██║██║   ██║██║╚██╗██║██║   ██║██╔══╝  ██║   ██║██║╚██╗██║',
   '  ██████╔╝╚██████╔╝██║ ╚████║╚██████╔╝███████╗╚██████╔╝██║ ╚████║',
@@ -43,7 +47,6 @@ const c = {
   red: '\x1b[38;2;255;80;100m',
   yellow: '\x1b[38;2;255;220;80m',
   cyan: '\x1b[38;2;80;220;255m',
-  blue: '\x1b[38;2;100;160;255m',
   white: '\x1b[37m',
 };
 const DIM = c.dim;
@@ -52,6 +55,7 @@ function trunc(s, n) { s = String(s || ''); return s.length <= n ? s : s.slice(0
 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 fmtUptime() {
   const s = Math.floor((Date.now() - _startTime) / 1000);
@@ -69,7 +73,7 @@ function statusColor(w) {
   if (!w.channel) return c.red;
   if (w.paused || w.dashboardPaused) return c.yellow;
   if (w.busy || w._invRunning || w._sellRunning) return c.yellow;
-  if (Date.now() < w.globalCooldownUntil) return c.blue;
+  if (Date.now() < w.globalCooldownUntil) return c.cyan;
   return c.green;
 }
 
@@ -82,7 +86,7 @@ function statusText(w) {
   if (w.busy || w._invRunning || w._sellRunning) return spinnerFrame() + ' WORK';
   if (Date.now() < w.globalCooldownUntil) {
     const wait = Math.ceil((w.globalCooldownUntil - Date.now()) / 1000);
-    return '⏳' + wait + 's';
+    return '⏳' + padL(wait, 3) + 's';
   }
   return '● READY';
 }
@@ -110,48 +114,56 @@ function fmtLevel(w) {
   return c.cyan + lv + c.reset;
 }
 
-// ── Layout ────────────────────────────────────────────────────
-function layout() {
-  const W = Math.min(process.stdout.columns || 100, 120);
-  const rows = process.stdout.rows || 40;
-  const maxAccounts = Math.min(_workers.length, Math.max(3, rows - 14));
-  return { W, maxAccounts };
+// ── Build a full account row string ──────────────────────────
+function buildAccountRow(w, wi, col) {
+  const col2 = wc(wi);
+  const stCol = statusColor(w);
+  const stTxt = statusText(w);
+  const earned = fmtCoins(w.stats.coins);
+  const bal = w.stats.balance !== undefined ? fmtCoins(w.stats.balance) : DIM + '?' + c.reset;
+  const ls = fmtLifesavers(w);
+  const lv = fmtLevel(w);
+  const name = padR(trunc(w.username || '?', col.name), col.name);
+  const doing = padR(w.lastStatus || 'idle', col.cmd);
+
+  return (
+    '\x1b[2K' + // clear the line first
+    `\x1b[38;2;77;212;238m│\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)} ` +
+    `${padL(ls, col.ls)} ` +
+    `${padL(lv, col.lv)} ` +
+    `${padL(earned, col.earned)} ` +
+    `\x1b[38;2;77;212;238m│\x1b[0m\n`
+  );
 }
 
-// ── Draw the full dashboard ───────────────────────────────────
+// ── Draw the FULL box (called once at startup) ───────────────
 function draw() {
-  const { W, maxAccounts } = layout();
-  const inner = W - 2;
-
-  // ── Clear screen + home ──
-  const isFirst = _boxRow === 0;
-  if (isFirst) {
-    process.stdout.write('\x1b[2J\x1b[H');
-  } else {
-    // Move cursor up to box start: box rows + events since last draw
-    const eventsSinceDraw = _eventCount - _eventCountAtDraw;
-    const up = _boxHeight + eventsSinceDraw;
-    process.stdout.write(`\x1b[${up}A`);
-  }
+  const rows = process.stdout.rows || 40;
+  _W = Math.min(process.stdout.columns || 100, 120);
+  _inner = _W - 2;
+
+  // Clear entire screen
+  process.stdout.write('\x1b[2J\x1b[H');
 
   // ── Top border ──
-  process.stdout.write(`\x1b[38;2;77;212;238m┌${'─'.repeat(inner)}┐\x1b[0m\n`);
+  process.stdout.write(`\x1b[38;2;77;212;238m┌${'─'.repeat(_inner)}┐\x1b[0m\n`);
 
-  // ── ASCII banner (dynamic — includes version) ──
+  // ── 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];
-    // Gradient: cyan → pink for row 0 and 1, dim for others
+    const inner = _inner - stripAnsi(line).length;
     if (i < 2) {
       const gradLine = gradientLine(line, 77, 212, 238, 255, 92, 147);
-      const pad = ' '.repeat(Math.max(0, inner - stripAnsi(gradLine).length));
-      process.stdout.write(`\x1b[38;2;77;212;238m│\x1b[0m${gradLine}${pad}\x1b[38;2;77;212;238m│\x1b[0m\n`);
+      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`);
     } else {
-      const dimLine = DIM + line + c.reset;
-      const pad = ' '.repeat(Math.max(0, inner - stripAnsi(dimLine).length));
-      process.stdout.write(`\x1b[38;2;77;212;238m│\x1b[0m${dimLine}${pad}\x1b[38;2;77;212;238m│\x1b[0m\n`);
+      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`);
     }
   }
 
@@ -159,7 +171,7 @@ function draw() {
   const running = _workers.filter(w => w.channel && !w.paused && !w.dashboardPaused).length;
   const paused = _workers.filter(w => w.paused || w.dashboardPaused).length;
   const errors = _workers.filter(w => !w.channel).length;
-  const phaseLabel = _phase === 'grinding' ? '' : `  ${c.dim}[${_phase}]${c.reset}`;
+  const phaseLabel = _phase === 'grinding' ? '' : `  ${DIM}[${_phase}]${c.reset}`;
   const statusParts = [
     `${c.green}●${c.reset} ${running} online`,
     paused > 0 ? `${c.yellow}~${c.reset} ${paused} paused` : null,
@@ -167,16 +179,15 @@ function draw() {
     `${DIM}Ctrl+C${c.reset}`,
   ].filter(Boolean);
   const statusStr = statusParts.join('   ') + phaseLabel;
-  const statusPad = ' '.repeat(Math.max(0, inner - stripAnsi(statusStr)));
-  process.stdout.write(`\x1b[38;2;77;212;238m│\x1b[0m ${statusStr}${statusPad}\x1b[38;2;77;212;238m│\x1b[0m\n`);
-  process.stdout.write(`\x1b[38;2;77;212;238m├${'─'.repeat(inner)}┤\x1b[0m\n`);
+  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);
+  const nameExtra = Math.max(0, _inner - col.st - col.name - col.cmd - col.bal - col.ls - col.lv - col.earned - 14);
   col.name += nameExtra;
 
-  process.stdout.write(`\x1b[38;2;77;212;238m│\x1b[0m `);
+  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} `);
@@ -186,7 +197,16 @@ function draw() {
   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`);
+  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 = [];
 
   // ── Account rows ──
   const sorted = [..._workers].sort((a, b) => {
@@ -196,49 +216,27 @@ function draw() {
     if (aA !== bA) return bA ? 1 : -1;
     return (b.stats.commands || 0) - (a.stats.commands || 0);
   });
-  const shown = sorted.slice(0, maxAccounts);
+  const shown = sorted.slice(0, _maxAccounts);
 
   for (let si = 0; si < shown.length; si++) {
     const w = shown[si];
     const wi = _workers.indexOf(w);
-    const col2 = wc(wi);
-    const stCol = statusColor(w);
-    const stTxt = statusText(w);
-    const earned = fmtCoins(w.stats.coins);
-    const bal = w.stats.balance !== undefined ? fmtCoins(w.stats.balance) : DIM + '?' + c.reset;
-    const ls = fmtLifesavers(w);
-    const lv = fmtLevel(w);
-
-    process.stdout.write(`\x1b[38;2;77;212;238m│\x1b[0m `);
-    process.stdout.write(`${DIM}${padL(wi + 1, 2)}${c.reset} `);
-    process.stdout.write(`${stCol}${padR(stTxt, col.st)}${c.reset} `);
-    process.stdout.write(`${col2}${padR(trunc(w.username || '?', col.name), col.name)}${c.reset} `);
-    process.stdout.write(`${DIM}${padR(w.lastStatus || 'idle', col.cmd)}${c.reset} `);
-    process.stdout.write(`${padL(bal, col.bal)} `);
-    process.stdout.write(`${padL(ls, col.ls)} `);
-    process.stdout.write(`${padL(lv, col.lv)} `);
-    process.stdout.write(`${padL(earned, col.earned)} `);
-    process.stdout.write(`\x1b[38;2;77;212;238m│\x1b[0m\n`);
-  }
-
-  if (sorted.length > maxAccounts) {
-    const extra = sorted.length - maxAccounts;
-    process.stdout.write(`\x1b[38;2;77;212;238m│\x1b[0m ${DIM}+ ${extra} more accounts${' '.repeat(Math.max(0, inner - 20 - String(extra).length))}${c.reset} \x1b[38;2;77;212;238m│\x1b[0m\n`);
+    const rowNum = hrRow + 1 + si;
+    _accountRows[wi] = rowNum;
+    process.stdout.write(buildAccountRow(w, wi, col));
   }
 
   // ── Totals ──
-  let totalCoins = 0, totalBal = 0, totalCmds = 0, totalOk = 0;
+  let totalCoins = 0, totalBal = 0;
   for (const w of _workers) {
     totalCoins += w.stats.coins || 0;
     totalBal += w.stats.balance || 0;
-    totalCmds += w.stats.commands || 0;
-    totalOk += w.stats.successes || 0;
   }
-  const rate = totalCmds > 0 ? Math.round((totalOk / totalCmds) * 100) : 0;
   const memMB = Math.round((process.memoryUsage?.rss?.() ?? process.memoryUsage().rss) / 1048576);
 
-  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[38;2;77;212;238m│\x1b[0m `);
+  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)} `);
@@ -247,15 +245,28 @@ function draw() {
   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(`${DIM}${fmtUptime()} | ${memMB}MB${c.reset} `.padEnd(_inner));
   process.stdout.write(`\x1b[38;2;77;212;238m│\x1b[0m\n`);
 
   // ── Bottom ──
-  process.stdout.write(`\x1b[38;2;77;212;238m└${'─'.repeat(inner)}┘\x1b[0m\n`);
+  process.stdout.write(`\x1b[38;2;77;212;238m└${'─'.repeat(_inner)}┘\x1b[0m\n`);
+}
+
+// ── Update ONE account row in place ─────────────────────────
+function updateAccountRow(accountIdx) {
+  const row = _accountRows[accountIdx];
+  if (!row) return; // not visible
 
-  // Record box height + current event count for next redraw
-  _boxHeight = bannerLines.length + 1 + 1 + 2 + shown.length + (sorted.length > maxAccounts ? 1 : 0) + 3;
-  _eventCountAtDraw = _eventCount;
+  const w = _workers[accountIdx];
+  if (!w) return;
+
+  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));
 }
 
 // ── Gradient line ─────────────────────────────────────────────
@@ -270,34 +281,33 @@ function gradientLine(text, r1, g1, b1, r2, g2, b2) {
 
 // ── Event tracking ────────────────────────────────────────────
 let _eventLines = []; // [accountIdx] = [{text, ts}]
-const MAX_EVENTS = 4;
+const MAX_EVENTS = 15;
 
 // ── Public API ────────────────────────────────────────────────
 
 function init({ workers, isShuttingDown }) {
   _startTime = Date.now();
   _workers = workers;
-  _isShuttingDown = isShuttingDown || (() => false);
   _version = '0.0.0';
   _eventLines = [];
   _live = false;
   _phase = 'init';
-  _boxRow = 0;
-  _boxHeight = 0;
-  _eventCount = 0;
-  _eventCountAtDraw = 0;
+  _accountRows = [];
 }
 
 function drawBanner(version) { _version = version || '0.0.0'; }
-
 function start() {}
-function stop() { _live = false; _phase = 'init'; process.stdout.write(c.reset + '\n'); }
 
-function setLive(val) { _live = val; }
+function stop() {
+  _live = false;
+  _phase = 'init';
+  process.stdout.write('\x1b[2J\x1b[H' + c.reset + '\n');
+}
 
+function setLive(val) { _live = val; }
 function setPhase(phase) { _phase = phase; }
 
-// log: append event below the box (no redraw of box)
+// 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')}`;
@@ -306,12 +316,13 @@ 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);
   }
-  _eventCount++;
 
   if (!_live) return;
 
-  // Clean event line: colored name + timestamp + message
+  // 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`);
@@ -319,16 +330,22 @@ function log(accountIdx, msg) {
 
 function logGlobal(msg) { log(-1, msg); }
 
-// Start periodic box refresh (every 3s for spinner/countdown updates)
-let _refreshInterval = null;
-function startRefresh(ms = 3000) {
-  if (_refreshInterval) clearInterval(_refreshInterval);
-  _refreshInterval = setInterval(() => {
-    if (_live) draw();
-  }, ms);
+// Force full redraw (call this when window resizes or box needs rebuild)
+function fullRedraw() { if (_live) draw(); }
+
+// ── Periodic refresh: animate spinners & countdowns every 3s ──
+let _refreshTimer = null;
+function startRefresh() {
+  if (_refreshTimer) return;
+  _refreshTimer = setInterval(() => {
+    if (!_live) return;
+    for (let i = 0; i < _workers.length; i++) {
+      updateAccountRow(i);
+    }
+  }, 1500);
 }
 function stopRefresh() {
-  if (_refreshInterval) { clearInterval(_refreshInterval); _refreshInterval = null; }
+  if (_refreshTimer) { clearInterval(_refreshTimer); _refreshTimer = null; }
 }
 
-module.exports = { init, drawBanner, start, draw, log, logGlobal, workerColor: wc, stop, setLive, setPhase, startRefresh, stopRefresh };
+module.exports = { init, drawBanner, start, draw, log, logGlobal, workerColor: wc, stop, setLive, setPhase, updateAccountRow, fullRedraw, startRefresh, stopRefresh };

package/package.json

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