dankgrinder 8.40.0 → 8.42.0

package/lib/grinder.js

@@ -13,12 +13,21 @@ const ui = require('./ui');
 // Global shutdown flag
 let shutdownCalled = false;
 
-// Catch silent Discord client errors
+// Catch silent Discord client errors — route through log() once available
 process.on('unhandledRejection', (reason) => {
-  process.stdout.write(`[UNHANDLED REJECTION] ${reason?.message || reason}\n`);
+  const msg = reason?.message || reason;
+  if (typeof log === 'function') {
+    log('error', msg);
+  } else {
+    process.stderr.write(`[UNHANDLED REJECTION] ${msg}\n`);
+  }
 });
 process.on('uncaughtException', (err) => {
-  process.stdout.write(`[UNCAUGHT] ${err.message}\n`);
+  if (typeof log === 'function') {
+    log('error', err.message);
+  } else {
+    process.stderr.write(`[UNCAUGHT] ${err.message}\n`);
+  }
 });
 
 // ── Memory-Optimized Client Factory ──────────────────────────
@@ -2768,7 +2777,7 @@ async function start(apiKey, apiUrl, opts = {}) {
 
   // Init rawLogger Redis (uses same URL — logs all raw gateway data)
   if (REDIS_URL) {
-    rawLogger.init(REDIS_URL).catch(() => {});
+    rawLogger.init(REDIS_URL, { silent: true }).catch(() => {});
     // Listen for DM events across all accounts — update worker state + dashboard LIVE
     rawLogger.onDmEvent((event, raw) => {
       const channelId = raw.channel_id;
@@ -2863,7 +2872,6 @@ async function start(apiKey, apiUrl, opts = {}) {
   if (timedOutWorkers.length > 0) {
     ui.log(-1, `${timedOutWorkers.length} timed out (retrying in background)`);
   }
-  ui.draw();
 
   const activeWorkers = workers.filter(w => !w._tokenInvalid);
 
@@ -2919,10 +2927,11 @@ async function start(apiKey, apiUrl, opts = {}) {
 
   // ── Phase 3: Start grind loops ───────────────────────────────────
   ui.log(-1, `Starting ${activeWorkers.length} grind loops...`);
+  ui.setLive(true);
+  ui.draw();
   for (const w of activeWorkers) {
     if (!shutdownCalled) w.grindLoop();
   }
-  ui.draw();
 
   // Cluster heartbeat — lets other nodes see this node is alive
   if (CLUSTER_ENABLED) {

package/lib/rawLogger.js

@@ -28,11 +28,15 @@ const memStore = new Map();
 const channelLast = new Map();
 const memRing = [];
 let memIdx = 0;
+let _silent = false;
+function _log(...args) { if (!_silent) console.log(...args); }
+function _err(...args) { if (!_silent) console.error(...args); }
 
 // ── Redis init ──
-async function init(redisUrl) {
+async function init(redisUrl, opts = {}) {
+  if (opts.silent) _silent = true;
   if (!redisUrl) {
-    console.log('[rawLogger] No Redis URL — raw logging disabled');
+    _log('[rawLogger] No Redis URL — raw logging disabled');
     return;
   }
   try {
@@ -44,7 +48,7 @@ async function init(redisUrl) {
     });
     // Skip if already connecting or connected
     if (redis.status === 'connecting' || redis.status === 'connect' || redis.status === 'ready') {
-      console.log('[rawLogger] Redis already connecting — skipping');
+      _log('[rawLogger] Redis already connecting — skipping');
       redisReady = false;
       return;
     }
@@ -58,12 +62,12 @@ async function init(redisUrl) {
       redis.connect().catch(reject);
     });
     redisReady = true;
-    console.log('[rawLogger] Redis connected');
+    _log('[rawLogger] Redis connected');
     redis.on('error', (e) => {
       // Suppress common transient network errors from spamming stderr
       const msg = e?.message || '';
       if (msg.includes('ETIMEDOUT') || msg.includes('ECONNRESET') || msg.includes('ENOTFOUND') || msg.includes('read') || msg.includes('connect')) return;
-      console.error(`[rawLogger] Redis error: ${msg}`);
+      _err(`[rawLogger] Redis error: ${msg}`);
       redisReady = false;
     });
     redis.on('close', () => {
@@ -79,7 +83,7 @@ async function init(redisUrl) {
     // Suppress "already connecting" errors — happens when Redis reconnects mid-init
     const msg = e?.message || '';
     if (!msg.includes('already connecting') && !msg.includes('already connected')) {
-      console.error(`[rawLogger] Redis connect failed: ${msg}`);
+      _err(`[rawLogger] Redis connect failed: ${msg}`);
     }
     redis = null;
     redisReady = false;

package/lib/ui.js

@@ -1,12 +1,14 @@
 /**
- * CLI Live Dashboard — box design, loading animations, per-account status.
- * Everything inside a single box. Events stream below. No duplicate output.
+ * CLI Live Dashboard — fixed box at top, events stream below.
+ * Box drawn once. Events appended line-by-line. No flicker.
  */
 
 let _startTime = Date.now();
 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 = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
@@ -60,11 +62,6 @@ 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 padC(s, n) {
-  s = String(s || '');
-  const pad = Math.max(0, n - s.length);
-  return ' '.repeat(Math.floor(pad / 2)) + s + ' '.repeat(Math.ceil(pad / 2));
-}
 
 function fmtUptime() {
   const s = Math.floor((Date.now() - _startTime) / 1000);
@@ -104,25 +101,25 @@ function statusText(w) {
 function layout() {
   const W = Math.min(process.stdout.columns || 120, 120);
   const rows = process.stdout.rows || 40;
-  const bannerH = BANNER_LINES.length + 1; // +1 for blank line
+  const bannerH = BANNER_LINES.length + 1; // +1 blank
   const statusH = 1;
-  const headerH = 3; // blank + headers + hr
-  const totalsH = 2; // totals + hr
-  const footerH = 1; // blank
-  const maxAccounts = Math.min(_workers.length, Math.max(3, rows - bannerH - statusH - headerH - totalsH - footerH - 8));
-  const eventH = Math.max(3, rows - bannerH - statusH - headerH - totalsH - footerH - maxAccounts);
-  return { W, bannerH, statusH, headerH, totalsH, footerH, maxAccounts, eventH };
+  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 };
 }
 
-// ── Draw the full box ────────────────────────────────────────
+// ── Draw the fixed box ────────────────────────────────────────
 function draw() {
-  const { W, bannerH, statusH, headerH, totalsH, footerH, maxAccounts, eventH } = layout();
-  const T = '─'.repeat(W - 2); // inner width
+  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 ──
-  // Move cursor to top-left of box area and overwrite in place (no full clear)
-  process.stdout.write(`\x1b[${1};1H`);
-  process.stdout.write(`\x1b[0J`); // clear from cursor to end of screen
   process.stdout.write(`\x1b[38;2;77;212;238m┌─${T}─┐\x1b[0m\n`);
 
   // ── Banner inside box ──
@@ -144,18 +141,13 @@ function draw() {
     errors > 0 ? `${c.red}E${c.reset}${errors}` : null,
     `${DIM}Ctrl+C${c.reset}`,
   ].filter(Boolean).join('  ');
-  const statusPad = W - 4 - statusLine.length;
+  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`);
 
   // ── Table header ──
   const col = {
-    st: 8,    // Status
-    name: 18, // Account name
-    last: 20, // Last command
-    cmds: 6,  // Commands
-    ok: 4,   // OK%
-    earned: 10, // Earned
+    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);
   col.name += nameExtra;
@@ -164,7 +156,7 @@ function draw() {
   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}${padR('LAST CMD', 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} `);
@@ -186,14 +178,14 @@ function draw() {
     const wi = _workers.indexOf(w);
     const col2 = wc(wi);
     const stCol = statusColor(w);
-    const stText = statusText(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;
 
     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(stText, col.st)}${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)} `);
@@ -203,7 +195,7 @@ function draw() {
   }
 
   if (sorted.length > maxAccounts) {
-    process.stdout.write(`\x1b[38;2;77;212;238m│\x1b[0m ${DIM}+${sorted.length - maxAccounts} more accounts${' '.repeat(Math.max(0, W - 24 - String(sorted.length - maxAccounts).length))}${c.reset} \x1b[38;2;77;212;238m│\x1b[0m\n`);
+    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`);
   }
 
   // ── Totals ──
@@ -221,50 +213,31 @@ 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(`${DIM}${' '.repeat(col.last)}${c.reset} `);
+  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));
   process.stdout.write(`\x1b[38;2;77;212;238m│\x1b[0m\n`);
 
-  // ── Events section ──
-  process.stdout.write(`\x1b[38;2;77;212;238m├─${T}─┤\x1b[0m\n`);
-  process.stdout.write(`\x1b[38;2;77;212;238m│\x1b[0m ${c.bold}EVENTS${c.reset}${' '.repeat(Math.max(0, W - 10))}\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`);
+  // ── Bottom of box ──
+  process.stdout.write(`\x1b[38;2;77;212;238m└─${T}─┘\x1b[0m\n`);
 
-  // Show recent events per account
-  const evLines = [];
-  for (let i = 0; i < _workers.length; i++) {
-    if (_eventLines[i] && _eventLines[i].length > 0) {
-      const latest = _eventLines[i][_eventLines[i].length - 1];
-      const col2 = wc(i);
-      const name = trunc(_workers[i]?.username || '?', 14);
-      evLines.push({ i, text: latest.text, ts: latest.ts, col: col2, name });
-    }
-  }
+  // Record how many rows the box consumed
+  _boxHeight = bannerH + statusH + 1 + headerH + shown.length + (sorted.length > maxAccounts ? 1 : 0) + footerH + 1;
 
-  for (let i = 0; i < Math.min(eventH, evLines.length); i++) {
-    const ev = evLines[evLines.length - 1 - i];
-    const now = new Date();
-    const ts = `${padL(now.getHours(), 2, '0')}:${padL(now.getMinutes(), 2, '0')}:${padL(now.getSeconds(), 2, '0')}`;
-    process.stdout.write(`\x1b[38;2;77;212;238m│\x1b[0m `);
-    process.stdout.write(`${ev.col}${padR(ev.name, 14)}${c.reset} `);
-    process.stdout.write(`${DIM}[${ts}]${c.reset} ${ev.text}${' '.repeat(Math.max(0, W - 20 - ev.name.length - ev.text.length))}`);
-    process.stdout.write(`\x1b[38;2;77;212;238m│\x1b[0m\n`);
-  }
-
-  for (let i = 0; i < Math.max(0, eventH - evLines.length); i++) {
-    process.stdout.write(`\x1b[38;2;77;212;238m│\x1b[0m ${' '.repeat(W - 4)} \x1b[38;2;77;212;238m│\x1b[0m\n`);
-  }
+  // Restore cursor to just below the box
+  process.stdout.write(`\x1b[u`); // restore cursor
+}
 
-  // ── Bottom of box ──
-  process.stdout.write(`\x1b[38;2;77;212;238m└─${T}─┘\x1b[0m\n`);
+// ── Strip ANSI for length calc ───────────────────────────────
+function stripAnsi(s) {
+  return String(s).replace(/\x1b\[[0-9;]*m/g, '');
 }
 
 // ── Event tracking ────────────────────────────────────────────
 let _eventLines = []; // [accountIdx] = [{text, ts}]
-const MAX_EVENTS = 3;
+const MAX_EVENTS = 2;
 
 // ── Public API ────────────────────────────────────────────────
 
@@ -274,28 +247,41 @@ function init({ workers, isShuttingDown }) {
   _isShuttingDown = isShuttingDown || (() => false);
   _version = '0.0.0';
   _eventLines = [];
+  _live = false;
 }
 
 function drawBanner(version) { _version = version; }
 function start() {}
-function stop() { process.stdout.write(c.reset + '\n'); }
+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; }
 
 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();
   }
 
-  draw();
+  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`);
 }
 
 function logGlobal(msg) {
-  // Global events go to account 0
   log(-1, msg);
 }
 
-module.exports = { init, drawBanner, start, draw, log, logGlobal, workerColor: wc, stop };
+module.exports = { init, drawBanner, start, draw, log, logGlobal, workerColor: wc, stop, setLive };

package/package.json

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