dankgrinder 8.45.0 → 8.48.0

package/lib/grinder.js

@@ -2826,6 +2826,7 @@ async function start(apiKey, apiUrl, opts = {}) {
   const LOGIN_GAP_MAX_MS = Number.isFinite(parsedGapMax) && parsedGapMax >= LOGIN_GAP_MIN_MS ? parsedGapMax : Math.max(parsedGapMin, 150);
   const randomLoginGap = () => LOGIN_GAP_MAX_MS <= LOGIN_GAP_MIN_MS ? LOGIN_GAP_MIN_MS : LOGIN_GAP_MIN_MS + Math.floor(Math.random() * (LOGIN_GAP_MAX_MS - LOGIN_GAP_MIN_MS + 1));
 
+  ui.setPhase('login');
   ui.log(-1, `Logging in ${accounts.length} accounts...`);
   const BATCH_SIZE = 10;
   for (let i = 0; i < accounts.length; i += BATCH_SIZE) {
@@ -2874,6 +2875,7 @@ async function start(apiKey, apiUrl, opts = {}) {
   const activeWorkers = workers.filter(w => !w._tokenInvalid);
 
   // ── Phase 2: Inventory check ────────────────────────────────────
+  ui.setPhase('inventory');
   ui.log(-1, `Checking inventory...`);
   let invFailed = 0;
   await Promise.all(activeWorkers.map(async (w) => {
@@ -2887,6 +2889,7 @@ async function start(apiKey, apiUrl, opts = {}) {
   }
 
   // ── Phase 2.5: Balance check ───────────────────────────────────
+  ui.setPhase('balance');
   ui.log(-1, `Checking balances...`);
   for (const w of activeWorkers) {
     try { await w.checkBalance(true); } catch {}
@@ -2899,6 +2902,7 @@ async function start(apiKey, apiUrl, opts = {}) {
   ui.log(-1, `Balance: +⏣${totalCoins.toLocaleString()} across ${activeWorkers.length} accounts`);
 
   // ── Phase 2.75: DM history check ────────────────────────────────
+  ui.setPhase('dms');
   ui.log(-1, `Checking DM history...`);
   let dmDeaths = 0, dmLevelUps = 0, dmNoLs = [];
   for (const w of activeWorkers) {
@@ -2924,9 +2928,11 @@ async function start(apiKey, apiUrl, opts = {}) {
   ui.log(-1, `DM: ${parts.length > 0 ? parts.join(', ') : 'clean'}`);
 
   // ── Phase 3: Start grind loops ───────────────────────────────────
+  ui.setPhase('grinding');
   ui.log(-1, `Starting ${activeWorkers.length} grind loops...`);
   ui.setLive(true);
   ui.draw();
+  ui.startRefresh(3000);
   for (const w of activeWorkers) {
     if (!shutdownCalled) w.grindLoop();
   }
@@ -2997,6 +3003,7 @@ async function start(apiKey, apiUrl, opts = {}) {
     shutdownInProgress = true;
     shutdownCalled = true;
     setDashboardActive(false);
+    ui.stopRefresh();
     ui.stop();
     process.stdout.write(c.show + '\n');
 

package/lib/ui.js

@@ -1,6 +1,5 @@
 /**
- * CLI Live Dashboard — clean box at top, events stream below.
- * Box drawn once. Events appended line-by-line. No flicker.
+ * CLI Live Dashboard — ASCII banner, per-account status table, event stream below.
  */
 
 let _startTime = Date.now();
@@ -8,11 +7,26 @@ 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
 
 // ── Spinner frames ────────────────────────────────────────────
 const SPINNER = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
 function spinnerFrame() { return SPINNER[Math.floor(Date.now() / 150) % SPINNER.length]; }
 
+// ── Compact ASCII art banner (fits in 80-col box) ─────────────
+const BANNER_LINES = [
+  '  ██████╗ ██╗   ██╗███╗   ██╗ ██████╗ ███████╗ ██████╗ ███╗   ██╗  DANKGRINDER',
+  '  ██╔══██╗██║   ██║████╗  ██║██╔════╝ ██╔════╝██╔═══██╗████╗  ██║  v' + 'PLACEHOLDER',
+  '  ██║  ██║██║   ██║██╔██╗ ██║██║  ███╗█████╗  ██║   ██║██╔██╗ ██║',
+  '  ██║  ██║██║   ██║██║╚██╗██║██║   ██║██╔══╝  ██║   ██║██║╚██╗██║',
+  '  ██████╔╝╚██████╔╝██║ ╚████║╚██████╔╝███████╗╚██████╔╝██║ ╚████║',
+  '  ╚═════╝  ╚═════╝ ╚═╝  ╚═══╝ ╚═════╝ ╚══════╝ ╚═════╝ ╚═╝  ╚═══╝',
+];
+
 // ── Palette ───────────────────────────────────────────────────
 const PALETTE = [
   '\x1b[38;2;77;212;238m', '\x1b[38;2;255;194;77m', '\x1b[38;2;130;210;100m',
@@ -30,12 +44,14 @@ const c = {
   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;
 
 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 fmtUptime() {
   const s = Math.floor((Date.now() - _startTime) / 1000);
@@ -50,7 +66,7 @@ function fmtUptime() {
 
 // ── Status helpers ─────────────────────────────────────────────
 function statusColor(w) {
-  if (!w.loggedIn || !w.channel) return c.red;
+  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;
@@ -58,12 +74,12 @@ function statusColor(w) {
 }
 
 function statusText(w) {
-  if (!w.loggedIn || !w.channel) return 'CONNECTING';
+  if (!w.channel) return spinnerFrame() + ' CONN';
   if (w.paused) return 'PAUSED';
   if (w.dashboardPaused) return 'HELD';
   if (w._alert?.type === 'death') return 'DEAD';
   if (w._alert?.type === 'lowls') return 'LOW LS';
-  if (w.busy || w._invRunning || w._sellRunning) return spinnerFrame() + ' BUSY';
+  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';
@@ -71,68 +87,112 @@ function statusText(w) {
   return '● READY';
 }
 
+// ── Format helpers ─────────────────────────────────────────────
+function fmtCoins(n) {
+  if (!n && n !== 0) return DIM + '—' + c.reset;
+  if (n >= 1_000_000) return c.green + '+' + (n / 1_000_000).toFixed(1) + 'M' + c.reset;
+  if (n >= 1_000) return c.green + '+' + (n / 1_000).toFixed(1) + 'k' + c.reset;
+  if (n > 0) return c.green + '+' + n + c.reset;
+  return DIM + '—' + c.reset;
+}
+
+function fmtLifesavers(w) {
+  const ls = w._lifesavers;
+  if (ls === undefined || ls === null) return DIM + '—' + c.reset;
+  if (ls === 0) return c.red + '0' + c.reset;
+  if (ls <= 2) return c.yellow + ls + c.reset;
+  return c.green + ls + c.reset;
+}
+
+function fmtLevel(w) {
+  const lv = w._level;
+  if (!lv) return DIM + '—' + c.reset;
+  return c.cyan + lv + c.reset;
+}
+
 // ── Layout ────────────────────────────────────────────────────
 function layout() {
   const W = Math.min(process.stdout.columns || 100, 120);
   const rows = process.stdout.rows || 40;
-  // Box: header(2) + title(1) + gap(1) + statusBar(1) + divider(1) + headerRow(1) + hr(1) + maxAccounts + totals(2) + divider(1)
-  const maxAccounts = Math.min(_workers.length, Math.max(3, rows - 16));
+  const maxAccounts = Math.min(_workers.length, Math.max(3, rows - 14));
   return { W, maxAccounts };
 }
 
-// ── Draw the fixed box ────────────────────────────────────────
+// ── Draw the full dashboard ───────────────────────────────────
 function draw() {
   const { W, maxAccounts } = layout();
   const inner = W - 2;
 
-  // ── Save cursor + clear screen ──
-  process.stdout.write('\x1b[s');  // save cursor
-  process.stdout.write('\x1b[2J\x1b[H'); // clear screen + home
+  // ── 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`);
+  }
 
-  // ── Title ──
+  // ── Top border ──
   process.stdout.write(`\x1b[38;2;77;212;238m┌${'─'.repeat(inner)}┐\x1b[0m\n`);
-  const title = `  ${c.bold}${c.cyan}DANK${c.reset}${c.bold}${c.white}GRINDER${c.reset}  ${c.dim}v${_version}${c.reset}  `;
-  const dots = ' '.repeat(Math.max(0, inner - stripAnsi(title) - 10));
-  const upStr = `${DIM}${fmtUptime()}${c.reset}`;
-  const upPad = ' '.repeat(Math.max(0, inner - stripAnsi(title) - stripAnsi(dots) - stripAnsi(upStr) - 2));
-  process.stdout.write(`\x1b[38;2;77;212;238m│\x1b[0m${title}${dots}${upStr}${upPad}\x1b[38;2;77;212;238m│\x1b[0m\n`);
+
+  // ── ASCII banner (dynamic — includes version) ──
+  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
+    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`);
+    } 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`);
+    }
+  }
 
   // ── Status bar ──
-  const running = _workers.filter(w => w.loggedIn && w.channel && !w.paused && !w.dashboardPaused).length;
+  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.loggedIn || !w.channel).length;
+  const errors = _workers.filter(w => !w.channel).length;
+  const phaseLabel = _phase === 'grinding' ? '' : `  ${c.dim}[${_phase}]${c.reset}`;
   const statusParts = [
     `${c.green}●${c.reset} ${running} online`,
     paused > 0 ? `${c.yellow}~${c.reset} ${paused} paused` : null,
     errors > 0 ? `${c.red}E${c.reset} ${errors} error` : null,
     `${DIM}Ctrl+C${c.reset}`,
   ].filter(Boolean);
-  const statusStr = statusParts.join('   ');
+  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`);
 
   // ── Table header ──
-  const col = { st: 9, name: 18, last: 24, cmds: 6, ok: 5, earned: 10 };
-  const nameExtra = Math.max(0, inner - col.st - col.name - col.last - col.cmds - col.ok - col.earned - 8);
+  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;
 
   process.stdout.write(`\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('LAST COMMAND', col.last)}${c.reset} `);
-  process.stdout.write(`${c.bold}${padL('CMDS', col.cmds)}${c.reset} `);
-  process.stdout.write(`${c.bold}${padL('OK%', col.ok)}${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`);
 
   // ── Account rows ──
   const sorted = [..._workers].sort((a, b) => {
-    if (!a.loggedIn !== !b.loggedIn) return !a.loggedIn ? 1 : -1;
-    const aA = a.loggedIn && a.channel && !a.paused && !a.dashboardPaused;
-    const bA = b.loggedIn && b.channel && !b.paused && !b.dashboardPaused;
+    if (!a.channel !== !b.channel) return !a.channel ? 1 : -1;
+    const aA = a.channel && !a.paused && !a.dashboardPaused;
+    const bA = b.channel && !b.paused && !b.dashboardPaused;
     if (aA !== bA) return bA ? 1 : -1;
     return (b.stats.commands || 0) - (a.stats.commands || 0);
   });
@@ -144,17 +204,19 @@ function draw() {
     const col2 = wc(wi);
     const stCol = statusColor(w);
     const stTxt = statusText(w);
-    const earned = w.stats.coins > 0 ? `${c.green}+${w.stats.coins.toLocaleString()}${c.reset}` : DIM + '—' + c.reset;
-    const cmds = w.stats.commands || 0;
-    const rate = w.stats.commands > 0 ? Math.round((w.stats.successes / w.stats.commands) * 100) : 0;
+    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(w.username || '?', col.name)}${c.reset} `);
-    process.stdout.write(`${DIM}${padR(w.lastStatus || 'idle', col.last)}${c.reset} `);
-    process.stdout.write(`${padL(cmds, col.cmds)} `);
-    process.stdout.write(`${padL(rate, col.ok)}% `);
+    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`);
   }
@@ -165,9 +227,10 @@ function draw() {
   }
 
   // ── Totals ──
-  let totalCoins = 0, totalCmds = 0, totalOk = 0;
+  let totalCoins = 0, totalBal = 0, totalCmds = 0, totalOk = 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;
   }
@@ -179,32 +242,35 @@ function draw() {
   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.last)} `);
-  process.stdout.write(`${padL(totalCmds, col.cmds)} `);
-  process.stdout.write(`${padL(rate, col.ok)}% `);
-  if (totalCoins > 0) {
-    process.stdout.write(`${c.green}${padL('+' + totalCoins.toLocaleString(), col.earned)}${c.reset} `);
-  } else {
-    process.stdout.write(`${DIM}${padL('—', col.earned)}${c.reset} `);
-  }
+  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`);
 
   // ── Bottom ──
   process.stdout.write(`\x1b[38;2;77;212;238m└${'─'.repeat(inner)}┘\x1b[0m\n`);
 
-  // Restore cursor to after the box
-  process.stdout.write('\x1b[u');
+  // 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;
 }
 
-// ── Strip ANSI for length calc ───────────────────────────────
-function stripAnsi(s) {
-  return String(s).replace(/\x1b\[[0-9;]*m/g, '');
+// ── Gradient line ─────────────────────────────────────────────
+function gradientLine(text, r1, g1, b1, r2, g2, b2) {
+  let out = '';
+  for (let i = 0; i < text.length; i++) {
+    const t = text.length <= 1 ? 0 : i / (text.length - 1);
+    out += `\x1b[38;2;${Math.round(r1 + (r2 - r1) * t)};${Math.round(g1 + (g2 - g1) * t)};${Math.round(b1 + (b2 - b1) * t)}m${text[i]}`;
+  }
+  return out + '\x1b[0m';
 }
 
 // ── Event tracking ────────────────────────────────────────────
 let _eventLines = []; // [accountIdx] = [{text, ts}]
-const MAX_EVENTS = 3;
+const MAX_EVENTS = 4;
 
 // ── Public API ────────────────────────────────────────────────
 
@@ -215,36 +281,54 @@ function init({ workers, isShuttingDown }) {
   _version = '0.0.0';
   _eventLines = [];
   _live = false;
+  _phase = 'init';
+  _boxRow = 0;
+  _boxHeight = 0;
+  _eventCount = 0;
+  _eventCountAtDraw = 0;
 }
 
-function drawBanner(version) { _version = version; }
+function drawBanner(version) { _version = version || '0.0.0'; }
+
 function start() {}
-function stop() { _live = false; process.stdout.write(c.reset + '\n'); }
+function stop() { _live = false; _phase = 'init'; process.stdout.write(c.reset + '\n'); }
+
 function setLive(val) { _live = val; }
 
+function setPhase(phase) { _phase = phase; }
+
 // log: append event below the box (no redraw of 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')}`;
 
-  // Track event per account
   if (accountIdx >= 0) {
     if (!_eventLines[accountIdx]) _eventLines[accountIdx] = [];
     _eventLines[accountIdx].push({ text: msg, ts });
     if (_eventLines[accountIdx].length > MAX_EVENTS) _eventLines[accountIdx].shift();
   }
+  _eventCount++;
 
-  if (!_live) return; // during login: just track, don't output yet
+  if (!_live) return;
 
-  // ── Append event cleanly below the box ──
+  // Clean event line: colored name + timestamp + message
   const col2 = accountIdx >= 0 ? wc(accountIdx) : c.cyan;
   const name = accountIdx >= 0 ? trunc(_workers[accountIdx]?.username || '?', 14) : 'GLOBAL';
-  const text = DIM + name + c.reset + ' ' + DIM + ts + c.reset + ' ' + msg;
-  process.stdout.write(text + '\n');
+  process.stdout.write(`${col2}${name}${c.reset} ${DIM}[${ts}]${c.reset} ${msg}\n`);
 }
 
-function logGlobal(msg) {
-  log(-1, 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);
+}
+function stopRefresh() {
+  if (_refreshInterval) { clearInterval(_refreshInterval); _refreshInterval = null; }
 }
 
-module.exports = { init, drawBanner, start, draw, log, logGlobal, workerColor: wc, stop, setLive };
+module.exports = { init, drawBanner, start, draw, log, logGlobal, workerColor: wc, stop, setLive, setPhase, startRefresh, stopRefresh };

package/package.json

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