dankgrinder 6.14.0 → 6.17.0

package/lib/grinder.js

@@ -431,10 +431,34 @@ function renderDashboard() {
   lines.push(bTop);
   lines.push(bEmpty);
 
-  // Title with animated spinner
   const spin = getSpinner('braille');
-  const titleGrad = gradientText(' D A N K G R I N D E R ', [192, 132, 252], [52, 211, 153]);
-  lines.push(bRow(`   ${c.bold}${titleGrad}${c.reset}  ${D}v${PKG_VERSION}${c.reset}  ${G}${spin}${c.reset}`));
+
+  // Title — big gradient banner
+  const titleLines = [
+    '██████╗  █████╗ ███╗   ██╗██╗  ██╗  ██████╗ ██████╗ ██╗███╗   ██╗██████╗ ███████╗██████╗',
+    '██╔══██╗██╔══██╗████╗  ██║██║ ██╔╝ ██╔════╝ ██╔══██╗██║████╗  ██║██╔══██╗██╔════╝██╔══██╗',
+    '██║  ██║███████║██╔██╗ ██║█████╔╝  ██║  ███╗██████╔╝██║██╔██╗ ██║██║  ██║█████╗  ██████╔╝',
+    '██║  ██║██╔══██║██║╚██╗██║██╔═██╗  ██║   ██║██╔══██╗██║██║╚██╗██║██║  ██║██╔══╝  ██╔══██╗',
+    '██████╔╝██║  ██║██║ ╚████║██║  ██╗ ╚██████╔╝██║  ██║██║██║ ╚████║██████╔╝███████╗██║  ██║',
+    '╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═══╝╚═╝  ╚═╝  ╚═════╝ ╚═╝  ╚═╝╚═╝╚═╝  ╚═══╝╚═════╝ ╚══════╝╚═╝  ╚═╝',
+  ];
+  // Check terminal width — fall back to compact title if too narrow
+  const termW = (process.stdout.columns || 120) - 6; // account for box borders
+  const useBigTitle = termW >= 92;
+  if (useBigTitle) {
+    for (let i = 0; i < titleLines.length; i++) {
+      const t = i / (titleLines.length - 1);
+      const from = t < 0.5
+        ? [lerp(192, 139, t * 2), lerp(132, 92, t * 2), lerp(252, 246, t * 2)]
+        : [lerp(139, 34, (t - 0.5) * 2), lerp(92, 211, (t - 0.5) * 2), lerp(246, 238, (t - 0.5) * 2)];
+      lines.push(bRow(` ${c.bold}${gradientLine(titleLines[i], from, [52, 211, 153])}${c.reset}`));
+    }
+  } else {
+    const titleGrad = gradientText(' D A N K   G R I N D E R ', [192, 132, 252], [52, 211, 153]);
+    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}`));
 
   // Subtitle info
   const activeCount = workers.filter(w => w.running && !w.paused && !w.dashboardPaused).length;
@@ -606,6 +630,10 @@ function renderDashboard() {
     else if (ls != null) lsStr = `${G}♥${ls}${c.reset}`;
     else lsStr = `${D}♥?${c.reset}`;
 
+    // ── Level indicator ──
+    const lvl = wk._level || 0;
+    const lvlStr = lvl > 0 ? `${Cy}L${lvl}${c.reset}` : `${D}L?${c.reset}`;
+
     // ── Earned (fixed visible width) ──
     const earnNum = wk.stats.coins || 0;
     let earnStr;
@@ -621,7 +649,7 @@ function renderDashboard() {
     const earnBarFill = earnNum > 0 ? Math.min(colBar, Math.max(1, Math.floor(Math.log10(earnNum + 1)))) : 0;
     const earnBar = progressBar(earnBarFill, colBar, colBar, [52, 211, 153], [40, 40, 55]);
 
-    lines.push(bRow(`  ${D}${origNum}${c.reset}  ${stsIcon} ${medalStr}${nameStr}  ${balStr} ${lsStr} ${earnStr} ${earnBar}  ${actLabel}`));
+    lines.push(bRow(`  ${D}${origNum}${c.reset}  ${stsIcon} ${medalStr}${nameStr}  ${balStr} ${lvlStr} ${lsStr} ${earnStr} ${earnBar}  ${actLabel}`));
   }
 
   // Overflow summary
@@ -1581,6 +1609,28 @@ class AccountWorker {
         }
       }
 
+      // Raw logger fallback — CV2 text is captured directly from gateway
+      if (!text || !looksLikeBalance(text)) {
+        const rawData = rawLogger.getLastRaw(this.channel?.id);
+        if (rawData && rawData.cv2Text) {
+          const rawText = rawData.cv2Text;
+          if (looksLikeBalance(rawText)) {
+            text = rawText;
+            this.log('debug', 'Balance: using rawLogger CV2 text fallback');
+          }
+        }
+        // Also try from Redis raw message
+        if ((!text || !looksLikeBalance(text)) && response?.id) {
+          try {
+            const rawMsg = await rawLogger.getMsg(response.id);
+            if (rawMsg?.allText && looksLikeBalance(rawMsg.allText)) {
+              text = rawMsg.allText;
+              this.log('debug', 'Balance: using rawLogger Redis fallback');
+            }
+          } catch {}
+        }
+      }
+
       if (!text) {
         this.log('warn', 'Balance response was empty after waiting for update');
         return;
@@ -1663,6 +1713,73 @@ class AccountWorker {
     }
   }
 
+  // ── Check DM History for deaths/level-ups ──────────────────
+  async checkDmHistory() {
+    try {
+      const dankUser = await this.client.users.fetch(DANK_MEMER_ID);
+      const dm = await dankUser.createDM();
+      this._dmChannelId = dm.id;
+      const recent = await dm.messages.fetch({ limit: 20 });
+
+      let deaths = 0, levelUps = 0, currentLevel = 0, lastLifesaverCount = -1;
+      for (const [, msg] of recent) {
+        const text = stripAnsi(getFullText(msg)).toLowerCase();
+
+        // Death detection
+        if (text.includes('you died') || text.includes('lifesaver protected')) {
+          deaths++;
+          // Button label: "You have 0 Life Saver left" or "You have 3 Life Saver left"
+          for (const row of (msg.components || [])) {
+            for (const comp of (row.components || [row])) {
+              const label = (comp.label || '').toLowerCase();
+              const lsMatch = label.match(/you have (\d+) life\s*saver/i);
+              if (lsMatch && lastLifesaverCount === -1) {
+                lastLifesaverCount = parseInt(lsMatch[1]);
+              }
+            }
+          }
+          // Fallback: check text
+          if (lastLifesaverCount === -1) {
+            const lsMatch = text.match(/(\d+)\s*life\s*saver/i);
+            if (lsMatch) lastLifesaverCount = parseInt(lsMatch[1]);
+          }
+        }
+
+        // Level up detection
+        if (text.includes('leveled up') || text.includes('level up')) {
+          levelUps++;
+          const m = text.match(/level\s+\*{0,2}(\d+)\*{0,2}\s+to\s+\*{0,2}(\d+)\*{0,2}/i);
+          if (m && parseInt(m[2]) > currentLevel) {
+            currentLevel = parseInt(m[2]);
+          }
+        }
+      }
+
+      // Update Redis with findings
+      if (redis) {
+        if (currentLevel > 0) {
+          await redis.set(`dkg:level:${this.account.id}`, String(currentLevel), 'EX', 2592000);
+          this._level = currentLevel;
+          this.log('info', `DM level: ${c.bold}${currentLevel}${c.reset}`);
+        }
+        if (lastLifesaverCount >= 0) {
+          await redis.set(`dkg:lifesavers:${this.account.id}`, String(lastLifesaverCount), 'EX', 86400);
+          this._lifesavers = lastLifesaverCount;
+          if (lastLifesaverCount === 0) {
+            await redis.set(`raw:alert:no-lifesaver:${dm.id}`, '1', 'EX', 86400);
+            await redis.set(`raw:alert:no-lifesaver:${this.channel?.id}`, '1', 'EX', 86400);
+            this.log('error', `${c.red}0 LIFESAVERS! Crime/Search will be disabled.${c.reset}`);
+          }
+        }
+      }
+
+      return { deaths, levelUps, currentLevel, lifesavers: lastLifesaverCount, dmChannelId: dm.id };
+    } catch (e) {
+      this.log('debug', `DM check failed: ${e.message}`);
+      return { deaths: 0, levelUps: 0, currentLevel: 0, lifesavers: -1 };
+    }
+  }
+
   // ── Run Single Command ──────────────────────────────────────
   // Each modular command handler sends the command, waits for response,
   // handles Hold Tight / cooldowns / item-buying internally.
@@ -2051,7 +2168,7 @@ class AccountWorker {
     // Interactive — response-driven CD (handler sets nextCooldownSec)
   { key: 'cmd_adventure', cmd: 'adventure',   cdKey: 'cd_adventure', defaultCd: 300,    priority: 3 },
   { key: 'cmd_stream',    cmd: 'stream',      cdKey: 'cd_stream',    defaultCd: 600,    priority: 3 },
-    { key: 'cmd_scratch',   cmd: 'scratch',     cdKey: 'cd_scratch',   defaultCd: 10,     priority: 3 },
+    // scratch removed — requires voting which can't be automated
   { key: 'cmd_work',      cmd: 'work shift',  cdKey: 'cd_work',      defaultCd: 1800,   priority: 3 },
     // Time-gated (run ASAP when available)
     { key: 'cmd_daily',     cmd: 'daily',       cdKey: 'cd_daily',     defaultCd: 86400,  priority: 10 },
@@ -3048,20 +3165,21 @@ async function start(apiKey, apiUrl) {
   console.log(`  ${rgb(52, 211, 153)}✓${c.reset}  ${c.bold}Inventory complete${c.reset}  ${rgb(52, 211, 153)}${invDone}/${total}${c.reset} ${c.dim}all clear${c.reset}`);
   console.log('');
 
-  // Phase 2.5: Check balance for ALL accounts + show lifesaver status
+  // Phase 2.5: Check balance for ALL accounts sequentially (CV2 needs raw logger timing)
   console.log(`  ${rgb(139, 92, 246)}${BRAILLE_SPIN[0]}${c.reset}  ${c.dim}Checking balance for ${c.reset}${c.bold}${activeWorkers.length}${c.reset}${c.dim} accounts...${c.reset}`);
 
   let balDone = 0;
   const balProgressInterval = setInterval(() => {
     const spin = BRAILLE_SPIN[Math.floor(Date.now() / 80) % BRAILLE_SPIN.length];
-    process.stdout.write(`\r  ${rgb(34, 211, 238)}${spin}${c.reset}  ${c.dim}Balance...${c.reset}  ${c.bold}${rgb(52, 211, 153)}${balDone}${c.reset}${c.dim}/${c.reset}${c.white}${total}${c.reset}  `);
+    process.stdout.write(`\r  ${rgb(34, 211, 238)}${spin}${c.reset}  ${c.dim}Balance...${c.reset}  ${c.bold}${rgb(52, 211, 153)}${balDone}${c.reset}${c.dim}/${c.reset}${c.white}${activeWorkers.length}${c.reset}  `);
   }, 80);
 
-  await Promise.all(activeWorkers.map(async (w) => {
+  // Run in parallel
+  await Promise.all(activeWorkers.map(async w => {
     try {
       await w.checkBalance();
+      balDone++;
     } catch {}
-    balDone++;
   }));
 
   clearInterval(balProgressInterval);
@@ -3086,6 +3204,45 @@ async function start(apiKey, apiUrl) {
   }
   console.log('');
 
+  // Phase 2.75: Check DM history for deaths/level-ups (sequential, fast)
+  console.log(`  ${rgb(139, 92, 246)}${BRAILLE_SPIN[0]}${c.reset}  ${c.dim}Checking DM history...${c.reset}`);
+  let dmDeaths = 0, dmLevelUps = 0, dmNoLs = [];
+  for (const w of activeWorkers) {
+    try {
+      const dm = await w.checkDmHistory();
+      if (dm.deaths > 0) dmDeaths += dm.deaths;
+      if (dm.levelUps > 0) dmLevelUps += dm.levelUps;
+      if (dm.lifesavers === 0) dmNoLs.push(w.username);
+      // Store level and lifesaver for dashboard
+      if (dm.currentLevel > 0) w._level = dm.currentLevel;
+      if (dm.lifesavers >= 0) w._lifesavers = dm.lifesavers;
+      const parts = [];
+      if (dm.currentLevel > 0) parts.push(`Lv${dm.currentLevel}`);
+      if (dm.deaths > 0) parts.push(`${rgb(239, 68, 68)}${dm.deaths} deaths${c.reset}`);
+      if (dm.lifesavers >= 0) {
+        const lc = dm.lifesavers === 0 ? rgb(239, 68, 68) : dm.lifesavers <= 2 ? rgb(251, 191, 36) : rgb(52, 211, 153);
+        parts.push(`${lc}♥${dm.lifesavers}${c.reset}`);
+      }
+      if (parts.length > 0) {
+        console.log(`  ${c.dim}├${c.reset} ${c.bold}${w.username}${c.reset}  ${parts.join('  ')}`);
+      }
+    } catch {}
+  }
+  if (dmNoLs.length > 0) {
+    console.log(`  ${rgb(239, 68, 68)}⚠${c.reset}  ${c.bold}${c.red}DM confirms 0 lifesavers:${c.reset} ${dmNoLs.join(', ')}`);
+    // Set Redis keys to block crime/search
+    for (const w of activeWorkers) {
+      if (dmNoLs.includes(w.username) && redis) {
+        try {
+          await redis.set(`dkg:lifesavers:${w.account.id}`, '0', 'EX', 86400);
+          await redis.set(`raw:alert:no-lifesaver:${w.channel?.id}`, '1', 'EX', 86400);
+        } catch {}
+      }
+    }
+  }
+  console.log(`  ${rgb(52, 211, 153)}✓${c.reset}  ${c.bold}DM check${c.reset}  ${c.dim}${dmDeaths} deaths, ${dmLevelUps} level-ups found${c.reset}`);
+  console.log('');
+
   console.log(`  ${rgb(139, 92, 246)}${c.bold}>>>${c.reset}  ${gradientText('Starting grind loops...', [139, 92, 246], [52, 211, 153])}`);
   console.log('');
 

package/lib/rawLogger.js

@@ -152,6 +152,9 @@ function detectCommand(d) {
   if (cv2Text.includes('fishing') || cv2Text.includes('fisherfolk')) return 'fish';
   if (cv2Text.includes('deposit') || cv2Text.includes('bank account')) return 'deposit';
   if (cv2Text.includes('begging') || cv2Text.includes('imagine begging')) return 'beg';
+  if (cv2Text.includes('hunting') || cv2Text.includes('went hunting') || cv2Text.includes('hunting rifle')) return 'hunt';
+  if (cv2Text.includes('digging') || cv2Text.includes('found nothing while') || cv2Text.includes('you dig')) return 'dig';
+  if (cv2Text.includes('great work') || cv2Text.includes('for your shift') || cv2Text.includes('working as') || cv2Text.includes('work shift') || cv2Text.includes('what color was')) return 'work';
   if (cv2Text.includes('weekly')) return 'weekly';
   if (cv2Text.includes('daily')) return 'daily';
   if (cv2Text.includes('inventory')) return 'inventory';
@@ -174,11 +177,12 @@ function detectCommand(d) {
   if (embedText.includes('you searched') || embedText.includes('searched the')) return 'search';
   if (embedText.includes('you committed') || embedText.includes('went outside')) return 'crime';
   // Hunt / dig
-  if (embedText.includes('hunting') || embedText.includes('came back with') || embedText.includes('hunting rifle') || embedText.includes('dragon\'s fireball') || embedText.includes('dodge the')) return 'hunt';
-  if (embedText.includes('you dig') || embedText.includes('found a') && embedText.includes('digging') || embedText.includes('shovel')) return 'dig';
-  // Work
-  if (embedText.includes('work') && (embedText.includes('shift') || embedText.includes('mini-game') || embedText.includes('color') || embedText.includes('what color'))) return 'work';
+  if (embedText.includes('hunting') || embedText.includes('came back with') || embedText.includes('hunting rifle') || embedText.includes('dragon\'s fireball') || embedText.includes('dodge the') || embedText.includes('went hunting') || embedText.includes('hunt') && (embedText.includes('caught') || embedText.includes('brought back') || embedText.includes('attacked') || embedText.includes('nothing') || embedText.includes('laughed') || embedText.includes('escaped') || embedText.includes('fell asleep'))) return 'hunt';
+  if (embedText.includes('digging') || embedText.includes('you dig') || embedText.includes('found a') && embedText.includes('dig') || embedText.includes('shovel') || embedText.includes('found nothing while') || embedText.includes('you found') && !embedText.includes('search')) return 'dig';
+  // Work — match both minigame prompt AND completion
+  if (embedText.includes('work') && (embedText.includes('shift') || embedText.includes('mini-game') || embedText.includes('color') || embedText.includes('what color') || embedText.includes('babysitter') || embedText.includes('great work') || embedText.includes('for your shift'))) return 'work';
   if (embedText.includes('you were given') && embedText.includes('shift')) return 'work';
+  if (embedText.includes('working as') || embedText.includes('for your shift')) return 'work';
   // Postmemes
   if (embedText.includes('pick a meme') || embedText.includes('meme posting')) return 'postmemes';
   // Stream
@@ -355,8 +359,17 @@ function attachDmLogger(client, opts = {}) {
       const m = allText.match(/level\s+(\d+)\s+to\s+(\d+)/i);
       dmEvent = { type: 'levelup', from: m ? parseInt(m[1]) : 0, to: m ? parseInt(m[2]) : 0 };
     } else if (allText.includes('lifesaver protected') || allText.includes('you died')) {
-      const ls = allText.match(/(\d+)\s*lifesaver/i);
-      dmEvent = { type: 'death', lifesaversLeft: ls ? parseInt(ls[1]) : -1 };
+      // Parse lifesaver count from button labels: "You have 0 Life Saver left"
+      let lsLeft = -1;
+      const btnText = extractButtons(d.components).map(b => (b.label || '').toLowerCase()).join(' ');
+      const btnMatch = btnText.match(/you have (\d+) life\s*saver/i);
+      if (btnMatch) lsLeft = parseInt(btnMatch[1]);
+      // Fallback to embed text
+      if (lsLeft === -1) {
+        const ls = allText.match(/(\d+)\s*life\s*saver/i);
+        if (ls) lsLeft = parseInt(ls[1]);
+      }
+      dmEvent = { type: 'death', lifesaversLeft: lsLeft };
     } else if (allText.includes('you were robbed') || allText.includes('just robbed you')) {
       const coins = allText.match(/[⏣]\s*([\d,]+)/);
       dmEvent = { type: 'robbed', amount: coins ? parseInt(coins[1].replace(/,/g, '')) : 0 };

package/package.json

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