dankgrinder 6.8.1 → 6.14.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,
@@ -597,6 +598,14 @@ 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}`;
+
     // ── Earned (fixed visible width) ──
     const earnNum = wk.stats.coins || 0;
     let earnStr;
@@ -612,7 +621,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} ${lsStr} ${earnStr} ${earnBar}  ${actLabel}`));
   }
 
   // Overflow summary
@@ -1400,6 +1409,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',
@@ -1629,6 +1656,7 @@ class AccountWorker {
             balance: wallet,
             bank_balance: bank,
             total_balance: wallet + bank,
+            lifesavers: this._lifesavers ?? null,
           }),
         });
       } catch { /* silent */ }
@@ -1660,6 +1688,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 +1812,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')) {
@@ -2101,6 +2186,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 +2641,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 +2887,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 +3047,45 @@ 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
+  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);
+
+  await Promise.all(activeWorkers.map(async (w) => {
+    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('');
+
   console.log(`  ${rgb(139, 92, 246)}${c.bold}>>>${c.reset}  ${gradientText('Starting grind loops...', [139, 92, 246], [52, 211, 153])}`);
   console.log('');
 
@@ -3015,7 +3167,8 @@ async function start(apiKey, apiUrl) {
       }
 
       const before = workers.length;
-      workers = workers.filter(w => w.running || freshIds.has(w.account.id));
+      // Keep ALL workers visible — never remove from array (user wants to see gaps)
+      // Only clean up workerMap entries for accounts fully removed from API
       if (workers.length !== before) scheduleRender();
     } catch {}
   }, 10_000);
@@ -3124,6 +3277,7 @@ function setupKeyboardShortcuts() {
 
       // Ctrl+C or q = quit
       if (k === '\u0003' || k === 'q') {
+        process.stdout.write(c.show);
         console.log(`\n\n  ${c.yellow}Shutting down gracefully...${c.reset}`);
         process.emit('SIGINT');
         return;
@@ -3131,51 +3285,40 @@ function setupKeyboardShortcuts() {
 
       // p = pause all accounts
       if (k === 'p') {
-        let paused = 0;
-        workers.forEach(w => { if (w.running && !w.paused) { w.paused = true; paused++; } });
-        console.log(`\n  ${rgb(139, 92, 246)}╭${c.reset}${c.dim}${'─'.repeat(40)}${c.reset}${rgb(139, 92, 246)}╮${c.reset}`);
-        console.log(`  ${rgb(139, 92, 246)}│${c.reset}  ${c.yellow}⏸ Paused ${paused} accounts${c.reset}                        ${rgb(139, 92, 246)}│${c.reset}`);
-        console.log(`  ${rgb(139, 92, 246)}╰${c.reset}${c.dim}${'─'.repeat(40)}${c.reset}${rgb(139, 92, 246)}╯${c.reset}`);
+        let count = 0;
+        workers.forEach(w => { if (w.running && !w.paused) { w.paused = true; count++; } });
+        recentLogs.push(`>> PAUSED ${count} accounts (press R to resume)`);
+        scheduleRender();
         return;
       }
 
       // r = resume all accounts
       if (k === 'r') {
-        let resumed = 0;
-        workers.forEach(w => { if (w.paused) { w.paused = false; resumed++; } });
-        console.log(`\n  ${rgb(139, 92, 246)}╭${c.reset}${c.dim}${'─'.repeat(40)}${c.reset}${rgb(139, 92, 246)}╮${c.reset}`);
-        console.log(`  ${rgb(139, 92, 246)}│${c.reset}  ${c.green}● Resumed ${resumed} accounts${c.reset}                      ${rgb(139, 92, 246)}│${c.reset}`);
-        console.log(`  ${rgb(139, 92, 246)}╰${c.reset}${c.dim}${'─'.repeat(40)}${c.reset}${rgb(139, 92, 246)}╯${c.reset}`);
+        let count = 0;
+        workers.forEach(w => { if (w.paused) { w.paused = false; count++; } });
+        recentLogs.push(`>> RESUMED ${count} accounts`);
+        scheduleRender();
         return;
       }
 
-      // s = show status summary
+      // s = show status summary (pushed to log feed)
       if (k === 's') {
         const active = workers.filter(w => w.running && !w.paused).length;
         const paused = workers.filter(w => w.paused).length;
-        const offline = workers.filter(w => !w.running).length;
+        const invalid = workers.filter(w => w._tokenInvalid).length;
+        const offline = workers.filter(w => !w.running && !w._tokenInvalid).length;
         const recovering = workers.filter(w => w._recoveryAttempts > 0 && w._errorCooldownUntil > Date.now()).length;
         const totalEarn = workers.reduce((s, w) => s + (w.stats.coins || 0), 0);
-        console.log(`\n  ${rgb(139, 92, 246)}╔${c.reset}${c.bold}${'═'.repeat(50)}${c.reset}${rgb(139, 92, 246)}╗${c.reset}`);
-        console.log(`  ${rgb(139, 92, 246)}║${c.reset}  ${c.bold}Status Summary${c.reset}                                      ${rgb(139, 92, 246)}║${c.reset}`);
-        console.log(`  ${rgb(139, 92, 246)}╠${c.reset}${c.dim}${'═'.repeat(50)}${c.reset}${rgb(139, 92, 246)}╣${c.reset}`);
-        console.log(`  ${rgb(139, 92, 246)}║${c.reset}  ${c.green}● ${active} active${c.reset}  ${c.yellow}⏸ ${paused} paused${c.reset}  ${c.red}○ ${offline} offline${c.reset}  ${c.yellow}↻ ${recovering} recovering${c.reset}      ${rgb(139, 92, 246)}║${c.reset}`);
-        console.log(`  ${rgb(139, 92, 246)}║${c.reset}  ${c.dim}Total earnings:${c.reset} ${rgb(52, 211, 153)}⏣ ${totalEarn.toLocaleString()}${c.reset}                        ${rgb(139, 92, 246)}║${c.reset}`);
-        console.log(`  ${rgb(139, 92, 246)}╚${c.reset}${c.dim}${'═'.repeat(50)}${c.reset}${rgb(139, 92, 246)}╝${c.reset}`);
+        recentLogs.push(`>> STATUS: ${active} active, ${paused} paused, ${invalid} invalid, ${offline} offline, ${recovering} recovering`);
+        recentLogs.push(`>> EARNINGS: +${formatCoins(totalEarn)} this session | BALANCE: ${formatCoins(totalBalance)}`);
+        scheduleRender();
         return;
       }
 
-      // ? = show help
+      // ? or h = show help
       if (k === '?' || k === 'h') {
-        console.log(`\n  ${rgb(139, 92, 246)}╔${c.reset}${c.bold}${'═'.repeat(50)}${c.reset}${rgb(139, 92, 246)}╗${c.reset}`);
-        console.log(`  ${rgb(139, 92, 246)}║${c.reset}  ${c.bold}Keyboard Shortcuts${c.reset}                                  ${rgb(139, 92, 246)}║${c.reset}`);
-        console.log(`  ${rgb(139, 92, 246)}╠${c.reset}${c.dim}${'═'.repeat(50)}${c.reset}${rgb(139, 92, 246)}╣${c.reset}`);
-        console.log(`  ${rgb(139, 92, 246)}║${c.reset}  ${c.white}p${c.reset}  Pause all accounts                                ${rgb(139, 92, 246)}║${c.reset}`);
-        console.log(`  ${rgb(139, 92, 246)}║${c.reset}  ${c.white}r${c.reset}  Resume all accounts                               ${rgb(139, 92, 246)}║${c.reset}`);
-        console.log(`  ${rgb(139, 92, 246)}║${c.reset}  ${c.white}s${c.reset}  Show status summary                               ${rgb(139, 92, 246)}║${c.reset}`);
-        console.log(`  ${rgb(139, 92, 246)}║${c.reset}  ${c.white}q${c.reset}  Quit gracefully                                   ${rgb(139, 92, 246)}║${c.reset}`);
-        console.log(`  ${rgb(139, 92, 246)}║${c.reset}  ${c.white}?${c.reset}  Show this help                                    ${rgb(139, 92, 246)}║${c.reset}`);
-        console.log(`  ${rgb(139, 92, 246)}╚${c.reset}${c.dim}${'═'.repeat(50)}${c.reset}${rgb(139, 92, 246)}╝${c.reset}`);
+        recentLogs.push('>> SHORTCUTS: P=pause R=resume S=status Q=quit ?=help');
+        scheduleRender();
         return;
       }
     });