dankgrinder 6.8.2 → 6.16.0

package/lib/grinder.js

@@ -2,6 +2,7 @@ const { Client, Options } = require('discord.js-selfbot-v13');
 const Redis = require('ioredis');
 const commands = require('./commands');
 const { setDashboardActive, isCV2, ensureCV2, stripAnsi } = require('./commands/utils');
+const rawLogger = require('./rawLogger');
 const {
   BloomFilter, RingBuffer, TokenBucket, EMA, SlidingWindowCounter,
   AhoCorasick, LRUCache, StringPool, AsyncBatchQueue, JitterBackoff,
@@ -430,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;
@@ -597,6 +622,18 @@ function renderDashboard() {
       balStr = `${D}⏣${' '.repeat(colBal - 3)}-${c.reset}`;
     }
 
+    // ── Lifesaver indicator ──
+    const ls = wk._lifesavers;
+    let lsStr;
+    if (ls === 0) lsStr = `${R}♥0${c.reset}`;
+    else if (ls != null && ls <= 2) lsStr = `${Y}♥${ls}${c.reset}`;
+    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;
@@ -612,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} ${earnStr} ${earnBar}  ${actLabel}`));
+    lines.push(bRow(`  ${D}${origNum}${c.reset}  ${stsIcon} ${medalStr}${nameStr}  ${balStr} ${lvlStr} ${lsStr} ${earnStr} ${earnBar}  ${actLabel}`));
   }
 
   // Overflow summary
@@ -1400,6 +1437,24 @@ 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`);
+
+          // Extract lifesaver count from inventory and cache in Redis
+          if (result.items && redis) {
+            const lsItem = result.items.find(i =>
+              /life\s*saver/i.test(i.name) || /lifesaver/i.test(i.name)
+            );
+            const lsCount = lsItem ? lsItem.qty : 0;
+            this._lifesavers = lsCount;
+            try {
+              await redis.set(`dkg:lifesavers:${this.account.id}`, String(lsCount), 'EX', 86400);
+              if (lsCount === 0) {
+                await redis.set(`raw:alert:no-lifesaver:${this.channel?.id}`, '1', 'EX', 86400);
+              } else {
+                await redis.del(`raw:alert:no-lifesaver:${this.channel?.id}`);
+              }
+            } catch {}
+          }
+
           try {
             await fetch(`${API_URL}/api/grinder/inventory`, {
               method: 'POST',
@@ -1554,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;
@@ -1629,12 +1706,80 @@ class AccountWorker {
             balance: wallet,
             bank_balance: bank,
             total_balance: wallet + bank,
+            lifesavers: this._lifesavers ?? null,
           }),
         });
       } catch { /* silent */ }
     }
   }
 
+  // ── 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.
@@ -1660,6 +1805,27 @@ class AccountWorker {
     if (shutdownCalled || !this.running) return;
     this.stats.commands++;
 
+    // ── Lifesaver protection: skip crime/search if 0 lifesavers ──
+    if (cmdName === 'crime' || cmdName === 'search') {
+      const noLifesaver = await rawLogger.hasNoLifesaverAlert(this.channel?.id);
+      if (noLifesaver) {
+        this.log('warn', `[${cmdName}] SKIPPED — no lifesavers! (death detected in DMs)`);
+        await this.setCooldown(cmdName, 3600); // block for 1 hour
+        return;
+      }
+      // Also check Redis key for lifesaver count
+      if (redis) {
+        try {
+          const lsCount = await redis.get(`dkg:lifesavers:${this.account.id}`);
+          if (lsCount === '0') {
+            this.log('warn', `[${cmdName}] SKIPPED — 0 lifesavers cached`);
+            await this.setCooldown(cmdName, 3600);
+            return;
+          }
+        } catch {}
+      }
+    }
+
     const cmdOpts = {
       channel: this.channel,
       waitForDankMemer: (timeout) => this.waitForDankMemer(timeout),
@@ -1763,6 +1929,42 @@ class AccountWorker {
         return;
       }
 
+      // ── Death / lifesaver detection in command responses ──
+      if (resultLower.includes('you died') || resultLower.includes('lifesaver protected')) {
+        this.log('error', `DEATH DETECTED during ${cmdName}!`);
+        // Check for lifesaver count in the response
+        const lsMatch = result.match(/(\d+)\s*life\s*saver/i);
+        const lsCount = lsMatch ? parseInt(lsMatch[1]) : -1;
+        if (redis) {
+          if (lsCount === 0) {
+            // 0 lifesavers — DISABLE crime/search immediately
+            await redis.set(`dkg:lifesavers:${this.account.id}`, '0', 'EX', 86400);
+            await redis.set(`raw:alert:no-lifesaver:${this.channel?.id}`, '1', 'EX', 86400);
+            this.log('error', `0 LIFESAVERS! Disabling crime/search for this account!`);
+            await this.setCooldown('crime', 86400); // 24h
+            await this.setCooldown('search', 86400);
+            sendWebhook('DEATH ALERT', `**${this.username}** died during \`${cmdName}\`!\n**0 lifesavers remaining!**\nCrime/search disabled for 24h.`, 0xef4444);
+          } else if (lsCount > 0) {
+            await redis.set(`dkg:lifesavers:${this.account.id}`, String(lsCount), 'EX', 86400);
+            this.log('warn', `Lifesaver used! ${lsCount} remaining.`);
+            if (lsCount <= 2) {
+              sendWebhook('LOW LIFESAVERS', `**${this.username}** has only **${lsCount}** lifesaver(s) left!`, 0xfbbf24);
+            }
+          }
+        }
+        return;
+      }
+
+      // Died flag from crime/search handler (death detected in the command response)
+      if (cmdResult.died) {
+        this.log('error', `${cmdName} → DIED! Checking lifesaver count...`);
+        // The DM will come separately with the actual death details
+        // For now, be cautious — set a short cooldown and let DM listener handle the rest
+        await this.setCooldown('crime', 300); // 5 min cooldown to check DMs
+        await this.setCooldown('search', 300);
+        return;
+      }
+
       // Premium-only command detection — disable for 24h
       if (resultLower.includes('only available on premium') || resultLower.includes('premium') ||
           resultLower.includes('buy the ability to use this command')) {
@@ -1966,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 },
@@ -2101,6 +2303,8 @@ class AccountWorker {
 
       // Set up error/disconnect handlers for auto-recovery
       this._attachRecoveryListeners();
+      rawLogger.attachRawLogger(this.client, { channelId: this.account.channel_id });
+      rawLogger.attachDmLogger(this.client);
 
       await this.client.login(this.account.discord_token);
       this.channel = await this.client.channels.fetch(this.account.channel_id).catch(() => null);
@@ -2554,6 +2758,11 @@ 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;
+
+        // Attach raw gateway logger for CV2 component capture
+        rawLogger.attachRawLogger(this.client, { channelId: this.account.channel_id });
+      rawLogger.attachDmLogger(this.client);
+
         // Report status non-blocking
         fetch(`${API_URL}/api/grinder/status`, {
           method: 'POST',
@@ -2795,6 +3004,27 @@ async function start(apiKey, apiUrl) {
   const checks = [];
   checks.push(`${rgb(52, 211, 153)}✓${c.reset} ${c.white}API${c.reset}`);
   if (REDIS_URL) checks.push(redis ? `${rgb(52, 211, 153)}✓${c.reset} ${c.white}Redis${c.reset}` : `${rgb(251, 191, 36)}○${c.reset} ${c.dim}Redis (connecting...)${c.reset}`);
+
+  // Init rawLogger Redis (uses same URL — logs all raw gateway data)
+  if (REDIS_URL) {
+    rawLogger.init(REDIS_URL).catch(() => {});
+    // Listen for DM death events across all accounts
+    rawLogger.onDmEvent((event, raw) => {
+      if (event.type === 'death' && event.lifesaversLeft === 0) {
+        const channelId = raw.channel_id;
+        // Find which worker uses this DM channel and disable their crime/search
+        for (const w of workers) {
+          if (w.client?.user?.dmChannel?.id === channelId || w.channel?.id) {
+            w.log?.('error', `DEATH in DMs! 0 lifesavers — disabling crime/search`);
+            w.setCooldown?.('crime', 86400);
+            w.setCooldown?.('search', 86400);
+          }
+        }
+        sendWebhook?.('DEATH ALERT (DM)', `Account died! **0 lifesavers!**\nCrime/search auto-disabled.`, 0xef4444);
+      }
+    });
+    checks.push(`${rgb(52, 211, 153)}✓${c.reset} ${c.white}RawLog${c.reset}`);
+  }
   if (hasZlib) checks.push(`${rgb(52, 211, 153)}✓${c.reset} ${c.white}zlib${c.reset}`);
   if (WEBHOOK_URL) checks.push(`${rgb(52, 211, 153)}✓${c.reset} ${c.white}Webhook${c.reset}`);
   if (CLUSTER_ENABLED) {
@@ -2934,6 +3164,73 @@ 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 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}  `);
+  }, 80);
+
+  // Run sequentially — parallel causes CV2 text to be empty (raw logger timing)
+  for (const w of activeWorkers) {
+    try {
+      await w.checkBalance();
+    } catch {}
+    balDone++;
+  }
+
+  clearInterval(balProgressInterval);
+  process.stdout.write(`\r${c.clearLine}`);
+
+  // Show balance + lifesaver summary for each account
+  let totalWallet = 0, totalBank = 0, noLifesaverAccounts = [];
+  for (const w of activeWorkers) {
+    const wallet = w.stats?.balance || 0;
+    const bank = w.stats?.bankBalance || 0;
+    const ls = w._lifesavers ?? '?';
+    totalWallet += wallet;
+    totalBank += bank;
+    const lsColor = ls === 0 ? rgb(239, 68, 68) : ls <= 2 ? rgb(251, 191, 36) : rgb(52, 211, 153);
+    console.log(`  ${c.dim}├${c.reset} ${c.bold}${w.username}${c.reset}  Wallet: ${c.green}⏣ ${wallet.toLocaleString()}${c.reset}  Bank: ${c.cyan}⏣ ${bank.toLocaleString()}${c.reset}  Total: ${c.bold}⏣ ${(wallet + bank).toLocaleString()}${c.reset}  LS: ${lsColor}${ls}${c.reset}`);
+    if (ls === 0) noLifesaverAccounts.push(w.username);
+  }
+  console.log(`  ${rgb(52, 211, 153)}✓${c.reset}  ${c.bold}Balance${c.reset}  Total: ${c.bold}${c.green}⏣ ${(totalWallet + totalBank).toLocaleString()}${c.reset} ${c.dim}(wallet: ⏣ ${totalWallet.toLocaleString()} + bank: ⏣ ${totalBank.toLocaleString()})${c.reset}`);
+
+  if (noLifesaverAccounts.length > 0) {
+    console.log(`  ${rgb(239, 68, 68)}⚠${c.reset}  ${c.bold}${c.red}WARNING: ${noLifesaverAccounts.length} account(s) have 0 LIFESAVERS!${c.reset} Crime/Search disabled for: ${noLifesaverAccounts.join(', ')}`);
+  }
+  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);
+      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(', ')}`);
+  }
+  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('');