dankgrinder 4.9.1 → 4.9.3

package/lib/commands/adventure.js

@@ -349,10 +349,15 @@ async function runAdventure({ channel, waitForDankMemer, client }) {
 
     const menu = response.components[menuRowIdx]?.components[0];
     const options = menu?.options || [];
-    if (options.length > 0 && menuRowIdx >= 0) {
-      lastAdventureIndex = (lastAdventureIndex + 1) % options.length;
-      const opt = options[lastAdventureIndex];
-      LOG.info(`[adventure] Selecting [${lastAdventureIndex + 1}/${options.length}]: "${opt.label}"`);
+    const PREFERRED = ['space', 'out west'];
+    const preferred = options.filter(o =>
+      PREFERRED.some(kw => (o.label || '').toLowerCase().includes(kw) || (o.value || '').toLowerCase().includes(kw))
+    );
+    const pool = preferred.length > 0 ? preferred : options;
+
+    if (pool.length > 0 && menuRowIdx >= 0) {
+      const opt = pool[Math.floor(Math.random() * pool.length)];
+      LOG.info(`[adventure] Selecting: "${opt.label}" (from ${pool.length} options)`);
       try {
         const selectResult = await response.selectMenu(menuRowIdx, [opt.value]);
         if (selectResult) {

package/lib/commands/crime.js

@@ -6,6 +6,7 @@
 const {
   LOG, c, getFullText, parseCoins, getAllButtons, safeClickButton,
   logMsg, isHoldTight, getHoldTightReason, sleep, humanDelay,
+  isCV2, ensureCV2,
 } = require('./utils');
 
 const SAFE_CRIME_OPTIONS = [
@@ -71,8 +72,9 @@ async function runCrime({ channel, waitForDankMemer, safeAnswers }) {
     return { result: `hold tight (${reason || 'unknown'})`, coins: 0, holdTightReason: reason };
   }
 
+  if (isCV2(response)) await ensureCV2(response);
   logMsg(response, 'crime');
-  const buttons = getAllButtons(response);
+  let buttons = getAllButtons(response);
 
   if (buttons.length === 0) {
     const text = getFullText(response);
@@ -80,10 +82,15 @@ async function runCrime({ channel, waitForDankMemer, safeAnswers }) {
     return { result: text.substring(0, 60), coins: 0 };
   }
 
-  const btn = pickSafeButton(buttons, safeAnswers);
+  let btn = pickSafeButton(buttons, safeAnswers);
   if (!btn) {
-    LOG.warn('[crime] No safe button found');
-    return { result: 'no safe option', coins: 0 };
+    const clickable = buttons.filter(b => !b.disabled);
+    btn = clickable.length > 0 ? clickable[Math.floor(Math.random() * clickable.length)] : null;
+    if (!btn) {
+      LOG.warn('[crime] No clickable button found');
+      return { result: 'no clickable option', coins: 0 };
+    }
+    LOG.info(`[crime] No safe match — picking random: "${btn.label}"`);
   }
 
   LOG.info(`[crime] Picking: "${btn.label}"`);

package/lib/commands/search.js

@@ -6,6 +6,7 @@
 const {
   LOG, c, getFullText, parseCoins, getAllButtons, safeClickButton,
   logMsg, isHoldTight, getHoldTightReason, sleep, humanDelay,
+  isCV2, ensureCV2,
 } = require('./utils');
 
 const SAFE_SEARCH_LOCATIONS = [
@@ -74,8 +75,9 @@ async function runSearch({ channel, waitForDankMemer, safeAnswers }) {
     return { result: `hold tight (${reason || 'unknown'})`, coins: 0, holdTightReason: reason };
   }
 
+  if (isCV2(response)) await ensureCV2(response);
   logMsg(response, 'search');
-  const buttons = getAllButtons(response);
+  let buttons = getAllButtons(response);
 
   if (buttons.length === 0) {
     const text = getFullText(response);
@@ -83,10 +85,15 @@ async function runSearch({ channel, waitForDankMemer, safeAnswers }) {
     return { result: text.substring(0, 60), coins: 0 };
   }
 
-  const btn = pickSafeButton(buttons, safeAnswers);
+  let btn = pickSafeButton(buttons, safeAnswers);
   if (!btn) {
-    LOG.warn('[search] No safe button found');
-    return { result: 'no safe option', coins: 0 };
+    const clickable = buttons.filter(b => !b.disabled);
+    btn = clickable.length > 0 ? clickable[Math.floor(Math.random() * clickable.length)] : null;
+    if (!btn) {
+      LOG.warn('[search] No clickable button found');
+      return { result: 'no clickable option', coins: 0 };
+    }
+    LOG.info(`[search] No safe match — picking random: "${btn.label}"`);
   }
 
   LOG.info(`[search] Picking: "${btn.label}"`);

package/lib/grinder.js

@@ -795,6 +795,7 @@ class AccountWorker {
     if (this._lastInvCheck && Date.now() - this._lastInvCheck < 300_000) return;
     this._invRunning = true;
     this._lastInvCheck = Date.now();
+    this.busy = true;
     try {
       this.log('info', 'Checking inventory...');
       const result = await commands.runInventory({
@@ -804,25 +805,23 @@ class AccountWorker {
         accountId: this.account.id,
         redis,
       });
-      if (result.items?.length > 0) {
-        this.log('success', `Inventory: ${result.items.length} items, ⏣ ${(result.totalValue || 0).toLocaleString()} net`);
-        // Report inventory to API
-        try {
-          await fetch(`${API_URL}/api/grinder/inventory`, {
-            method: 'POST',
-            headers: { Authorization: `Bearer ${API_KEY}`, 'Content-Type': 'application/json' },
-            body: JSON.stringify({
-              account_id: this.account.id,
-              items: result.items,
-              totalValue: result.totalValue,
-            }),
-          });
-        } catch {}
-      }
+      this.log('success', `Inventory: ${result.items?.length || 0} items, ⏣ ${(result.totalValue || 0).toLocaleString()} net`);
+      try {
+        await fetch(`${API_URL}/api/grinder/inventory`, {
+          method: 'POST',
+          headers: { Authorization: `Bearer ${API_KEY}`, 'Content-Type': 'application/json' },
+          body: JSON.stringify({
+            account_id: this.account.id,
+            items: result.items || [],
+            totalValue: result.totalValue || 0,
+          }),
+        });
+      } catch {}
     } catch (e) {
       this.log('error', `Inventory check failed: ${e.message}`);
     } finally {
       this._invRunning = false;
+      this.busy = false;
     }
   }
 
@@ -836,6 +835,7 @@ class AccountWorker {
 
       let wallet = 0;
       let bank = 0;
+      let matched = '';
 
       // CV2 format: <:Coin:ID> 3,272,896 and <:Bank:ID> 275,000 / 275,000
       const coinMatch = text.match(/<[a:]?:Coin:\d+>\s*([\d,]+)/i);
@@ -845,15 +845,18 @@ class AccountWorker {
       const walletMatch = text.match(/wallet[:\s]*\*{0,2}\s*[⏣💰]?\s*\*{0,2}\s*([\d,]+)/i);
       const bankTextMatch = text.match(/bank[:\s]*\*{0,2}\s*[⏣💰]?\s*\*{0,2}\s*([\d,]+)/i);
 
-      // Fallback: just ⏣ followed by number (pick largest)
-      const coinSymMatch = text.match(/[⏣]\s*([\d,]+)/);
+      // Fallback: any numbers near ⏣ or just plain numbers in CV2 text
+      const allNums = [...text.matchAll(/(?:⏣\s*)?(\d[\d,]*\d)/g)].map(m => parseInt(m[1].replace(/,/g, ''), 10)).filter(n => n > 0);
 
       if (coinMatch) {
         wallet = parseInt(coinMatch[1].replace(/,/g, ''), 10);
+        matched = 'cv2-emoji';
       } else if (walletMatch) {
         wallet = parseInt(walletMatch[1].replace(/,/g, ''), 10);
-      } else if (coinSymMatch) {
-        wallet = parseInt(coinSymMatch[1].replace(/,/g, ''), 10);
+        matched = 'legacy-wallet';
+      } else if (allNums.length > 0) {
+        wallet = Math.max(...allNums);
+        matched = 'fallback-nums';
       }
 
       if (bankEmojiMatch) {
@@ -862,23 +865,36 @@ class AccountWorker {
         bank = parseInt(bankTextMatch[1].replace(/,/g, ''), 10);
       }
 
-      if (wallet > 0 || bank > 0) {
-        this.stats.balance = wallet;
-        this.stats.bankBalance = bank;
-        this.log('bal', `Wallet: ${c.bold}${c.green}⏣ ${wallet.toLocaleString()}${c.reset}  Bank: ${c.bold}${c.cyan}⏣ ${bank.toLocaleString()}${c.reset}`);
+      if (wallet === 0 && bank === 0) {
+        this.log('warn', `Balance parse returned 0 — raw text: "${text.substring(0, 200)}"`);
+        // Don't overwrite a known-good balance with 0
+        if (this.stats.balance > 0 || this.stats.bankBalance > 0) return;
+      }
+
+      this.stats.balance = wallet;
+      this.stats.bankBalance = bank;
+      this.log('bal', `Wallet: ${c.bold}${c.green}⏣ ${wallet.toLocaleString()}${c.reset}  Bank: ${c.bold}${c.cyan}⏣ ${bank.toLocaleString()}${c.reset}  ${c.dim}(${matched || 'none'})${c.reset}`);
+
+      // Store in Redis for persistence
+      if (redis) {
         try {
-          await fetch(`${API_URL}/api/grinder/status`, {
-            method: 'POST',
-            headers: { Authorization: `Bearer ${API_KEY}`, 'Content-Type': 'application/json' },
-            body: JSON.stringify({
-              account_id: this.account.id,
-              balance: wallet,
-              bank_balance: bank,
-              total_balance: wallet + bank,
-            }),
-          });
-        } catch { /* silent */ }
+          await redis.set(`dkg:bal:${this.account.id}`, JSON.stringify({ wallet, bank, ts: Date.now() }));
+        } catch {}
       }
+
+      // Always report to dashboard API
+      try {
+        await fetch(`${API_URL}/api/grinder/status`, {
+          method: 'POST',
+          headers: { Authorization: `Bearer ${API_KEY}`, 'Content-Type': 'application/json' },
+          body: JSON.stringify({
+            account_id: this.account.id,
+            balance: wallet,
+            bank_balance: bank,
+            total_balance: wallet + bank,
+          }),
+        });
+      } catch { /* silent */ }
     }
   }
 
@@ -895,7 +911,7 @@ class AccountWorker {
       case 'with max':    cmdString = `${prefix} with max`; break;
       case 'blackjack':   cmdString = `${prefix} bj ${bjBet}`; break;
       case 'cointoss':    cmdString = `${prefix} cointoss ${gambBet}`; break;
-      case 'roulette':    cmdString = `${prefix} roulette ${gambBet} red`; break;
+      case 'roulette':    cmdString = `${prefix} roulette ${gambBet} ${Math.random() < 0.5 ? 'red' : 'black'}`; break;
       case 'slots':       cmdString = `${prefix} slots ${gambBet}`; break;
       case 'snakeeyes':   cmdString = `${prefix} snakeeyes ${gambBet}`; break;
       case 'work shift':  cmdString = `${prefix} work shift`; break;
@@ -1534,8 +1550,39 @@ class AccountWorker {
         this.log('success', `#${chName} · ${enabledCmds.length} cmds`);
         this.setStatus('starting...');
 
+        // Load daily/weekly/monthly done state from Redis
+        if (redis) {
+          for (const cmd of ['daily', 'weekly', 'monthly', 'drops']) {
+            try {
+              const val = await redis.get(`dkg:done:${this.account.id}:${cmd}`);
+              if (val) {
+                const ttlSec = await redis.ttl(`dkg:done:${this.account.id}:${cmd}`);
+                if (ttlSec > 0) {
+                  this.doneToday.set(cmd, Date.now() + ttlSec * 1000);
+                  this.log('info', `${cmd} already claimed (${Math.round(ttlSec / 3600)}h remaining)`);
+                }
+              }
+            } catch {}
+          }
+          // Load cached balance from Redis
+          try {
+            const balData = await redis.get(`dkg:bal:${this.account.id}`);
+            if (balData) {
+              const { wallet, bank } = JSON.parse(balData);
+              if (wallet > 0 || bank > 0) {
+                this.stats.balance = wallet;
+                this.stats.bankBalance = bank;
+                await fetch(`${API_URL}/api/grinder/status`, {
+                  method: 'POST',
+                  headers: { Authorization: `Bearer ${API_KEY}`, 'Content-Type': 'application/json' },
+                  body: JSON.stringify({ account_id: this.account.id, balance: wallet, bank_balance: bank, total_balance: wallet + bank }),
+                }).catch(() => {});
+              }
+            }
+          } catch {}
+        }
+
         await this.checkBalance();
-        // Check inventory on startup
         this.checkInventory().catch(() => {});
         this.grindLoop();
         resolve();

package/package.json

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