dankgrinder 6.21.0 → 6.25.0

package/lib/grinder.js

@@ -458,7 +458,7 @@ function renderDashboard() {
     lines.push(bRow(`   ${c.bold}${titleGrad}${c.reset}  ${D}v${PKG_VERSION}${c.reset}  ${G}${spin}${c.reset}`));
   }
 
-  lines.push(bRow(`   ${D}v${PKG_VERSION}${c.reset}  ${G}${spin}${c.reset}`));
+  lines.push(bRow(`   ${D}v${PKG_VERSION}${c.reset}  ${G}${spin}${c.reset}  ${Y}◷${c.reset} ${D}UP${c.reset}  ${c.bold}${Y}${formatUptime()}${c.reset}`));
 
   // Subtitle info
   const activeCount = workers.filter(w => w.running && !w.paused && !w.dashboardPaused).length;
@@ -487,52 +487,62 @@ function renderDashboard() {
   lines.push(bEmpty);
 
   // ═══════════════════════════════════════════════════════════════
-  //  STATS PANEL (split: left = metrics, right = big trend)
+  //  STATS PANEL — left: metrics (fixed labels) | right: big trend
   // ═══════════════════════════════════════════════════════════════
   lines.push(bSep);
   lines.push(bEmpty);
 
-  // Earnings sparkline data
   const now = Date.now();
   if (now - lastEarningsSample > 8000) { earningsHistory.push(totalCoins); lastEarningsSample = now; }
   const elapsedHrs = (Date.now() - startTime) / 3_600_000;
   const perHr = elapsedHrs > 0.01 ? Math.round(totalCoins / elapsedHrs) : 0;
-  const peakFlag = isNewHigh ? `  ${R}${c.bold}* NEW HIGH *${c.reset}` : '';
 
-  // Left column: fixed metrics (left-aligned)
+  // ── Compute all metric values ──────────────────────────────────
   const cpmVal = globalCmdRate.getRate().toFixed(1);
   const srColor = successRate >= 95 ? G : successRate >= 80 ? Y : R;
-  const srBarW = Math.min(15, Math.floor(iw * 0.1));
-  const srBar = progressBar(successRate, 100, srBarW, successRate >= 95 ? [52, 211, 153] : successRate >= 80 ? [251, 191, 36] : [239, 68, 68]);
+  const srBar = progressBar(successRate, 100, 10, successRate >= 95 ? [52, 211, 153] : successRate >= 80 ? [251, 191, 36] : [239, 68, 68]);
   const memMB = Math.round((process.memoryUsage?.rss?.() ?? process.memoryUsage().rss) / 1048576);
   const memCol = memMB > 900 ? [239, 68, 68] : memMB > 600 ? [251, 191, 36] : [52, 211, 153];
-  const memBarW = Math.min(15, Math.floor(iw * 0.1));
-  const memBar = progressBar(memMB, 1024, memBarW, memCol, [40, 40, 55]);
+  const memBar = progressBar(memMB, 1024, 10, memCol, [40, 40, 55]);
+  const perHrColor = perHr >= 0 ? G : R;
+  const perHrSign = perHr >= 0 ? '+' : '';
+  const newHighFlag = isNewHigh ? `  ${R}${c.bold}★ NEW HIGH ★${c.reset}` : '';
 
-  // Right column: big trend sparkline
-  const sparkW = Math.floor(iw * 0.42);
+  // ── Big trend sparkline (right column) ──────────────────────
+  const sparkW = Math.max(36, Math.floor(iw * 0.55));
   const spark = drawSparkline(earningsHistory.toArray(), sparkW);
 
-  // Build split rows
-  const leftHalf = Math.floor(iw * 0.52);
+  // ── Build each row: left metrics (fixed) | right trend ───────
+  const leftW = 36; // chars for left column content
 
-  // Row 1: Balance + EARNED  |  TREND (big sparkline)
-  const leftRow1 = `${Au}⟐${c.reset} ${D}BALANCE${c.reset}  ${c.bold}${Au}⏣ ${formatCoins(totalBalance)}${c.reset}   ${G}▲${c.reset} ${D}EARNED${c.reset}  ${c.bold}${G}+⏣ ${formatCoins(totalCoins)}${c.reset}${peakFlag}`;
-  const rightRow1 = `${A}~${c.reset} ${D}TREND${c.reset}  ${spark}`;
-  const combined1 = `${leftRow1}${' '.repeat(Math.max(2, leftHalf - leftRow1.replace(RE, '').length))}${rightRow1}`;
-  lines.push(bRow(`   ${combined1}`));
+  // Helper: build a stat row with fixed-width label
+  const statRow = (icon, label, val) => {
+    const raw = `${icon} ${label}  ${val}`;
+    const padded = raw + ' '.repeat(Math.max(0, leftW - raw.replace(RE, '').length));
+    return padded;
+  };
+
+  // Row 1: Balance
+  const balVal = `${Au}⏣${c.reset}${c.bold} ${formatCoins(totalBalance)}${c.reset}`;
+  const balRaw = `${Au}⟐${c.reset} ${D}BALANCE${c.reset}  ${balVal}`;
+  lines.push(bRow(`   ${balRaw.padEnd(leftW + 4)}${A}~${c.reset} ${D}TREND${c.reset}  ${spark}`));
+
+  // Row 2: Earned
+  const earnVal = `${perHrColor}${c.bold}${perHrSign}⏣ ${formatCoins(perHr)}/h${c.reset}`;
+  const earnRaw = `${G}▲${c.reset} ${D}EARNED${c.reset}  ${c.bold}${G}${perHrSign}⏣ ${formatCoins(totalCoins)}${c.reset}${newHighFlag}`;
+  lines.push(bRow(`   ${earnRaw.padEnd(leftW + 4)}${D}──┬──${c.reset}  ${c.dim}earned over session${c.reset}`));
 
-  // Row 2: Peak (left)
-  const peakRow = `${O}★${c.reset} ${D}PEAK${c.reset}     ${c.bold}${O}⏣ ${formatCoins(sessionPeakCoins)}${c.reset}`;
-  lines.push(bRow(`   ${peakRow}${' '.repeat(Math.max(2, leftHalf - peakRow.replace(RE, '').length))}${Y}◷${c.reset} ${D}UP${c.reset}  ${c.bold}${Y}${formatUptime()}${c.reset}`));
+  // Row 3: Peak
+  const peakRaw = `${O}★${c.reset} ${D}PEAK${c.reset}     ${c.bold}${O}⏣ ${formatCoins(sessionPeakCoins)}${c.reset}`;
+  lines.push(bRow(`   ${peakRaw.padEnd(leftW + 4)}${D}   │${c.reset}  ${c.dim}⏣ ${formatCoins(Math.abs(perHr))}/h${c.reset}`));
 
-  // Row 3: CMDS (left) + success bar + rate
-  const cmdsRow = `${B}◆${c.reset} ${D}CMDS${c.reset}     ${c.bold}${B}${totalCommands}${c.reset}  ${srColor}${successRate}%${c.reset} ${srBar}  ${Cy}${cpmVal}${c.reset}${D}/min${c.reset}`;
-  lines.push(bRow(`   ${cmdsRow}`));
+  // Row 4: Commands
+  const cmdsRaw = `${B}◆${c.reset} ${D}CMDS${c.reset}     ${c.bold}${B}${totalCommands}${c.reset}  ${srColor}${successRate}%${c.reset} ${srBar}  ${Cy}${cpmVal}${c.reset}${D}/min${c.reset}`;
+  lines.push(bRow(`   ${cmdsRaw.padEnd(leftW + 4)}${D}   │${c.reset}`));
 
-  // Row 4: MEM (left)
-  const memRow = `${D}≡${c.reset} ${D}MEM${c.reset}      ${rgb(memCol[0], memCol[1], memCol[2])}${c.bold}${memMB}MB${c.reset}  ${memBar}`;
-  lines.push(bRow(`   ${memRow}`));
+  // Row 5: Memory
+  const memRaw = `${D}≡${c.reset} ${D}MEM${c.reset}      ${rgb(memCol[0], memCol[1], memCol[2])}${c.bold}${memMB}MB${c.reset}  ${memBar}`;
+  lines.push(bRow(`   ${memRaw.padEnd(leftW + 4)}${D}   │${c.reset}`));
 
   lines.push(bEmpty);
 
@@ -642,9 +652,9 @@ function renderDashboard() {
     else if (ls != null) lsStr = `${G}♥${ls}${c.reset}`;
     else lsStr = `${D}♥?${c.reset}`;
 
-    // ── Level indicator ──
+    // ── Level indicator (fixed width so value changes don't jitter) ──
     const lvl = wk._level || 0;
-    const lvlStr = lvl > 0 ? `${Cy}L${lvl}${c.reset}` : `${D}L?${c.reset}`;
+    const lvlStr = lvl > 0 ? `${Cy}L${String(lvl).padStart(3)}${c.reset}` : `${D}L???${c.reset}`;
 
     // ── Earned (fixed visible width) ──
     const earnNum = wk.stats.coins || 0;
@@ -1413,6 +1423,7 @@ class AccountWorker {
       startupProgress = null,
       requireComplete = false,
       maxAttempts = 1,
+      silent = false,
     } = options;
     if (this._invRunning) return { ok: false, skipped: 'busy' };
     if (!force && this._lastInvCheck && Date.now() - this._lastInvCheck < 300_000) return { ok: false, skipped: 'recent' };
@@ -1426,7 +1437,7 @@ class AccountWorker {
         const baseLabel = startupProgress ? `[inv] ${startupProgress.current}/${startupProgress.total}` : '[inv]';
         const attemptLabel = tries > 1 ? ` [try ${attempt}/${tries}]` : '';
         const progressLine = `${baseLabel}${c.bold} ${this.username}${c.reset}${attemptLabel}`;
-        process.stdout.write(`\x1b[2K\r${progressLine}`);
+        if (!silent) process.stdout.write(`\x1b[2K\r${progressLine}`);
 
         try {
           const result = await commands.runInventory({
@@ -1436,9 +1447,10 @@ class AccountWorker {
             accountId: this.account.id,
             redis,
             onPageProgress: ({ page, total }) => {
-              // Update progress on same line
-              const erase = '\x1b[2K\r';
-              process.stdout.write(`${erase}${baseLabel} ${c.bold}${this.username}${c.reset} · page ${page}/${total}${attemptLabel}`);
+              if (!silent) {
+                const erase = '\x1b[2K\r';
+                process.stdout.write(`${erase}${baseLabel} ${c.bold}${this.username}${c.reset} · page ${page}/${total}${attemptLabel}`);
+              }
             },
           });
 
@@ -1447,8 +1459,10 @@ class AccountWorker {
           }
 
           // Final result on same line
-          const resultLine = `${baseLabel} ${c.bold}${this.username}${c.reset}: ${c.green}${result.items?.length || 0} items${c.reset}, ⏣ ${c.green}${(result.totalValue || 0).toLocaleString()}${c.reset} net${attemptLabel}`;
-          process.stdout.write(`\x1b[2K\r${resultLine}\n`);
+          if (!silent) {
+            const resultLine = `${baseLabel} ${c.bold}${this.username}${c.reset}: ${c.green}${result.items?.length || 0} items${c.reset}, ⏣ ${c.green}${(result.totalValue || 0).toLocaleString()}${c.reset} net${attemptLabel}`;
+            process.stdout.write(`\x1b[2K\r${resultLine}\n`);
+          }
 
           // Extract lifesaver count from inventory and cache in Redis
           if (result.items && redis) {
@@ -1492,7 +1506,7 @@ class AccountWorker {
           if (attempt < tries) {
             const baseLabel = startupProgress ? `[inv] ${startupProgress.current}/${startupProgress.total}` : '[inv]';
             const retryLine = `${baseLabel} ${c.bold}${this.username}${c.reset}: ${c.yellow}attempt ${attempt}/${tries} failed${c.reset} — retrying...`;
-            process.stdout.write(`\x1b[2K\r${retryLine}\n`);
+            if (!silent) process.stdout.write(`\x1b[2K\r${retryLine}\n`);
             await new Promise((r) => setTimeout(r, 1500 + Math.floor(Math.random() * 1500)));
             continue;
           }
@@ -1503,7 +1517,7 @@ class AccountWorker {
     } catch (e) {
       const baseLabel = startupProgress ? `[inv] ${startupProgress.current}/${startupProgress.total}` : '[inv]';
       const failLine = `${baseLabel} ${c.bold}${this.username}${c.reset}: ${c.red}failed${c.reset} — ${e.message}`;
-      process.stdout.write(`\x1b[2K\r${failLine}\n`);
+      if (!silent) process.stdout.write(`\x1b[2K\r${failLine}\n`);
       return { ok: false, error: e.message };
     } finally {
       this._invRunning = false;
@@ -3209,9 +3223,9 @@ async function start(apiKey, apiUrl) {
 
     const num = `${c.dim}${(idx + 1).toString().padStart(iColNum - 1)}${c.reset}  `;
     const name = s.name.substring(0, iColName).padEnd(iColName);
-    const items = `${invRes?.items?.length || 0}`.padEnd(iColItems);
+    const items = `${invRes?.result?.items?.length || 0}`.padEnd(iColItems);
     const val = invRes?.ok
-      ? `${c.green}⏣${(invRes.totalValue || 0).toLocaleString()}${c.reset}`.padEnd(iColVal + 3)
+      ? `${c.green}⏣${(invRes.result?.totalValue || 0).toLocaleString()}${c.reset}`.padEnd(iColVal + 3)
       : `${c.dim}··${c.reset}`.padEnd(iColVal);
     const sts = invRes?.ok ? `${rgb(52, 211, 153)}✓${c.reset}` : `${rgb(239, 68, 68)}✗${c.reset}`;
 
@@ -3221,7 +3235,7 @@ async function start(apiKey, apiUrl) {
 
   await Promise.all(activeWorkers.map(async (w, i) => {
     try {
-      const invRes = await w.checkInventory({ force: true, requireComplete: true, maxAttempts: 3 });
+      const invRes = await w.checkInventory({ force: true, requireComplete: true, maxAttempts: 3, silent: true });
       finalizeInvLine(i, invRes);
     } catch {
       finalizeInvLine(i, { ok: false });

package/package.json

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