dankgrinder 8.42.0 → 8.43.0

package/lib/grinder.js

@@ -721,14 +721,11 @@ class AccountWorker {
   log(type, msg) {
     const stripped = msg.replace(/\x1b\[[0-9;]*m/g, '');
     if (type !== 'debug') this.lastStatus = stripped.substring(0, 28);
-    // Route through UI
-    const icons = { info: '.', success: '[OK]', error: '[X]', warn: '[!]', cmd: '>', coin: '$', buy: '#', bal: '*', debug: '.' };
-    const icon = icons[type] || icons.info;
-    const text = `${icon} ${this.username} ${msg}`;
+    // Route through UI — msg already has context, no need to prepend username
     if (typeof ui !== 'undefined') {
-      try { ui.log(this.idx, text); } catch { process.stdout.write(text + '\n'); }
+      try { ui.log(this.idx, msg); } catch { process.stdout.write(msg + '\n'); }
     } else {
-      process.stdout.write(text + '\n');
+      process.stdout.write(msg + '\n');
     }
   }
 
@@ -2512,6 +2509,7 @@ class AccountWorker {
         clearTimeout(timeoutId);
         this.username = this.client.user.tag || this.username;
         this.avatarUrl = this.client.user.displayAvatarURL?.({ format: 'png', dynamic: true, size: 128 }) || null;
+        this.loggedIn = true; // so statusColor/statusText show correct state
 
         // Attach raw gateway logger for CV2 component capture
         rawLogger.attachRawLogger(this.client, { channelId: this.account.channel_id });

package/lib/ui.js

@@ -1,5 +1,5 @@
 /**
- * CLI Live Dashboard — fixed box at top, events stream below.
+ * CLI Live Dashboard — clean box at top, events stream below.
  * Box drawn once. Events appended line-by-line. No flicker.
  */
 
@@ -8,37 +8,11 @@ let _workers = [];
 let _isShuttingDown = () => false;
 let _version = '0.0.0';
 let _live = false;
-let _boxHeight = 0; // rows consumed by the box
 
 // ── Spinner frames ────────────────────────────────────────────
 const SPINNER = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
 function spinnerFrame() { return SPINNER[Math.floor(Date.now() / 150) % SPINNER.length]; }
 
-// ── Big ASCII art banner ──────────────────────────────────────
-const BANNER_LINES = [
-  '  ██████╗ ██╗   ██╗███╗   ██╗ ██████╗ ███████╗ ██████╗ ███╗   ██╗',
-  '  ██╔══██╗██║   ██║████╗  ██║██╔════╝ ██╔════╝██╔═══██╗████╗  ██║',
-  '  ██║  ██║██║   ██║██╔██╗ ██║██║  ███╗█████╗  ██║   ██║██╔██╗ ██║',
-  '  ██║  ██║██║   ██║██║╚██╗██║██║   ██║██╔══╝  ██║   ██║██║╚██╗██║',
-  '  ██████╔╝╚██████╔╝██║ ╚████║╚██████╔╝███████╗╚██████╔╝██║ ╚████║',
-  '  ╚═════╝  ╚═════╝ ╚═╝  ╚═══╝ ╚═════╝ ╚══════╝ ╚═════╝ ╚═╝  ╚═══╝',
-  '                        ██╗██╗   ██╗███╗   ██╗ ██████╗ ██╗     ███████╗██████╗ ',
-  '                        ██║██║   ██║████╗  ██║██╔═══██╗██║     ██╔════╝██╔══██╗',
-  '  ███████╗███████╗     ██║██║   ██║██╔██╗ ██║██║   ██║██║     █████╗  ██████╔╝',
-  '  ╚════██║╚════██║     ██║██║   ██║██║╚██╗██║██║   ██║██║     ██╔══╝  ██╔══██╗',
-  '      ██║     ██║     ██║╚██████╔╝██║ ╚████║╚██████╔╝███████╗███████╗██║  ██║',
-  '      ╚═╝     ╚═╝     ╚═╝ ╚═════╝ ╚═╝  ╚═══╝ ╚═════╝ ╚══════╝╚══════╝╚═╝  ╚═╝',
-];
-
-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';
-}
-
 // ── Palette ───────────────────────────────────────────────────
 const PALETTE = [
   '\x1b[38;2;77;212;238m', '\x1b[38;2;255;194;77m', '\x1b[38;2;130;210;100m',
@@ -76,7 +50,7 @@ function fmtUptime() {
 
 // ── Status helpers ─────────────────────────────────────────────
 function statusColor(w) {
-  if (!w.running || !w.channel) return c.red;
+  if (!w.loggedIn || !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;
@@ -84,7 +58,7 @@ function statusColor(w) {
 }
 
 function statusText(w) {
-  if (!w.running || !w.channel) return 'ERROR';
+  if (!w.loggedIn || !w.channel) return 'CONNECTING';
   if (w.paused) return 'PAUSED';
   if (w.dashboardPaused) return 'HELD';
   if (w._alert?.type === 'death') return 'DEAD';
@@ -99,75 +73,66 @@ function statusText(w) {
 
 // ── Layout ────────────────────────────────────────────────────
 function layout() {
-  const W = Math.min(process.stdout.columns || 120, 120);
+  const W = Math.min(process.stdout.columns || 100, 120);
   const rows = process.stdout.rows || 40;
-  const bannerH = BANNER_LINES.length + 1; // +1 blank
-  const statusH = 1;
-  const headerH = 2; // headers + hr
-  const footerH = 2; // totals + hr
-  const maxAccounts = Math.min(_workers.length, Math.max(3, rows - bannerH - statusH - headerH - footerH - 5));
-  return { W, bannerH, statusH, headerH, footerH, maxAccounts };
+  // 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));
+  return { W, maxAccounts };
 }
 
 // ── Draw the fixed box ────────────────────────────────────────
 function draw() {
-  const { W, bannerH, statusH, headerH, footerH, maxAccounts } = layout();
-  const T = '─'.repeat(W - 2);
-
-  // ── Save cursor, clear screen, go to top ──
-  process.stdout.write('\x1b[s');          // save cursor
-  process.stdout.write('\x1b[2J\x1b[H');  // clear screen + home
-  process.stdout.write('\x1b[1G');        // column 1
-
-  // ── Top of box ──
-  process.stdout.write(`\x1b[38;2;77;212;238m┌─${T}─┐\x1b[0m\n`);
-
-  // ── Banner inside box ──
-  for (const line of BANNER_LINES) {
-    process.stdout.write(`\x1b[38;2;77;212;238m│\x1b[0m  ${gradientLine(line, 77, 212, 238, 255, 92, 147)}  \x1b[38;2;77;212;238m│\x1b[0m\n`);
-  }
-  process.stdout.write(`\x1b[38;2;77;212;238m│\x1b[0m\n`);
-
-  // ── Status bar inside box ──
-  const running = _workers.filter(w => w.running && w.channel && !w.paused && !w.dashboardPaused).length;
+  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
+
+  // ── Title ──
+  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`);
+
+  // ── Status bar ──
+  const running = _workers.filter(w => w.loggedIn && w.channel && !w.paused && !w.dashboardPaused).length;
   const paused = _workers.filter(w => w.paused || w.dashboardPaused).length;
-  const errors = _workers.filter(w => !w.running || !w.channel).length;
-  const statusLine = [
-    `${c.bold}v${_version}${c.reset}`,
-    `${c.green}●${c.reset} online`,
-    `${fmtUptime()}`,
-    `${c.green}·${c.reset}${running}`,
-    `${c.yellow}~${c.reset}${paused}`,
-    errors > 0 ? `${c.red}E${c.reset}${errors}` : null,
+  const errors = _workers.filter(w => !w.loggedIn || !w.channel).length;
+  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).join('  ');
-  const statusPad = W - 4 - stripAnsi(statusLine).length;
-  process.stdout.write(`\x1b[38;2;77;212;238m│\x1b[0m ${statusLine}${' '.repeat(Math.max(0, statusPad))} \x1b[38;2;77;212;238m│\x1b[0m\n`);
-  process.stdout.write(`\x1b[38;2;77;212;238m├─${T}─┤\x1b[0m\n`);
+  ].filter(Boolean);
+  const statusStr = statusParts.join('   ');
+  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: 20, last: 22, cmds: 6, ok: 5, earned: 10,
-  };
-  const nameExtra = Math.max(0, W - 4 - col.st - col.name - col.last - col.cmds - col.ok - col.earned - 14);
+  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);
   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 CMD', col.last)}${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}${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(W - 4)} \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.channel !== !b.channel) return !a.channel ? 1 : -1;
-    const aA = a.running && a.channel && !a.paused && !a.dashboardPaused;
-    const bA = b.running && b.channel && !b.paused && !b.dashboardPaused;
+    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 (aA !== bA) return bA ? 1 : -1;
     return (b.stats.commands || 0) - (a.stats.commands || 0);
   });
@@ -195,7 +160,8 @@ function draw() {
   }
 
   if (sorted.length > maxAccounts) {
-    process.stdout.write(`\x1b[38;2;77;212;238m│\x1b[0m ${DIM}+${sorted.length - maxAccounts} more${' '.repeat(Math.max(0, W - 20 - String(sorted.length - maxAccounts).length))}${c.reset} \x1b[38;2;77;212;238m│\x1b[0m\n`);
+    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`);
   }
 
   // ── Totals ──
@@ -208,7 +174,7 @@ function draw() {
   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(W - 4)} \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 `);
   process.stdout.write(`${c.bold}Σ${c.reset} `);
   process.stdout.write(`${DIM}${padL(_workers.length, 2)} acc${c.reset} `);
@@ -216,18 +182,19 @@ function draw() {
   process.stdout.write(`${' '.repeat(col.last)} `);
   process.stdout.write(`${padL(totalCmds, col.cmds)} `);
   process.stdout.write(`${padL(rate, col.ok)}% `);
-  process.stdout.write(`${totalCoins > 0 ? c.green + padL('+' + totalCoins.toLocaleString(), col.earned) + c.reset : DIM + padL('—', col.earned) + c.reset} `);
-  process.stdout.write(`${DIM}${fmtUptime()} | ${memMB}MB${c.reset} `.padEnd(W - 4));
+  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(`${DIM}${fmtUptime()} | ${memMB}MB${c.reset} `.padEnd(inner));
   process.stdout.write(`\x1b[38;2;77;212;238m│\x1b[0m\n`);
 
-  // ── Bottom of box ──
-  process.stdout.write(`\x1b[38;2;77;212;238m└─${T}─┘\x1b[0m\n`);
+  // ── Bottom ──
+  process.stdout.write(`\x1b[38;2;77;212;238m└${'─'.repeat(inner)}┘\x1b[0m\n`);
 
-  // Record how many rows the box consumed
-  _boxHeight = bannerH + statusH + 1 + headerH + shown.length + (sorted.length > maxAccounts ? 1 : 0) + footerH + 1;
-
-  // Restore cursor to just below the box
-  process.stdout.write(`\x1b[u`); // restore cursor
+  // Restore cursor to after the box
+  process.stdout.write('\x1b[u');
 }
 
 // ── Strip ANSI for length calc ───────────────────────────────
@@ -237,7 +204,7 @@ function stripAnsi(s) {
 
 // ── Event tracking ────────────────────────────────────────────
 let _eventLines = []; // [accountIdx] = [{text, ts}]
-const MAX_EVENTS = 2;
+const MAX_EVENTS = 3;
 
 // ── Public API ────────────────────────────────────────────────
 
@@ -253,10 +220,9 @@ function init({ workers, isShuttingDown }) {
 function drawBanner(version) { _version = version; }
 function start() {}
 function stop() { _live = false; process.stdout.write(c.reset + '\n'); }
-
-// Enable live mode — from this point, log() appends below the box
 function setLive(val) { _live = val; }
 
+// 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')}`;
@@ -270,14 +236,11 @@ function log(accountIdx, msg) {
 
   if (!_live) return; // during login: just track, don't output yet
 
-  // ── Append event LINE BY LINE below the box ──
-  const col2 = accountIdx >= 0 ? wc(accountIdx) : '';
-  const name = accountIdx >= 0 ? trunc(_workers[accountIdx]?.username || '?', 12) : 'GLOBAL';
-
-  process.stdout.write(`\x1b[38;2;77;212;238m│\x1b[0m `);
-  process.stdout.write(`${col2}${padR(name, 12)}${c.reset} `);
-  process.stdout.write(`${DIM}[${ts}]${c.reset} ${msg}`);
-  process.stdout.write(`\n`);
+  // ── Append event cleanly below the box ──
+  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');
 }
 
 function logGlobal(msg) {

package/package.json

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