dankgrinder 4.9.0 → 4.9.2

package/lib/commands/generic.js

@@ -7,6 +7,7 @@
 const {
   LOG, c, getFullText, parseCoins, getAllButtons, getAllSelectMenus,
   safeClickButton, logMsg, isHoldTight, getHoldTightReason, sleep, humanDelay, needsItem,
+  isCV2, ensureCV2,
 } = require('./utils');
 const { buyItem } = require('./shop');
 
@@ -37,6 +38,7 @@ async function runGeneric({ channel, waitForDankMemer, cmdString, cmdName, clien
     return { result: `hold tight (${reason || 'unknown'})`, coins: 0, holdTightReason: reason };
   }
 
+  if (isCV2(response)) await ensureCV2(response);
   logMsg(response, cmdName);
   const text = getFullText(response);
   const coins = parseCoins(text);

package/lib/grinder.js

@@ -791,6 +791,11 @@ class AccountWorker {
 
   // ── Check Balance ───────────────────────────────────────────
   async checkInventory() {
+    if (this._invRunning) return;
+    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({
@@ -800,23 +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;
     }
   }
 
@@ -856,23 +861,30 @@ 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}`);
+      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}`);
+
+      // 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 */ }
     }
   }
 
@@ -881,16 +893,17 @@ class AccountWorker {
   // handles Hold Tight / cooldowns / item-buying internally.
   async runCommand(cmdName, prefix) {
     let cmdString;
-    const betAmount = Math.max(5000, this.account.bet_amount || 5000);
+    const bjBet = Math.max(5000, this.account.bet_amount || 5000);
+    const gambBet = Math.max(10000, this.account.bet_amount || 10000);
 
     switch (cmdName) {
       case 'dep max':     cmdString = `${prefix} dep max`; break;
       case 'with max':    cmdString = `${prefix} with max`; break;
-      case 'blackjack':   cmdString = `${prefix} bj ${betAmount}`; break;
-      case 'cointoss':    cmdString = `${prefix} cointoss ${betAmount}`; break;
-      case 'roulette':    cmdString = `${prefix} roulette ${betAmount} red`; break;
-      case 'slots':       cmdString = `${prefix} slots ${betAmount}`; break;
-      case 'snakeeyes':   cmdString = `${prefix} snakeeyes ${betAmount}`; break;
+      case 'blackjack':   cmdString = `${prefix} bj ${bjBet}`; break;
+      case 'cointoss':    cmdString = `${prefix} cointoss ${gambBet}`; break;
+      case 'roulette':    cmdString = `${prefix} roulette ${gambBet} red`; break;
+      case 'slots':       cmdString = `${prefix} slots ${gambBet}`; break;
+      case 'snakeeyes':   cmdString = `${prefix} snakeeyes ${gambBet}`; break;
       case 'work shift':  cmdString = `${prefix} work shift`; break;
       case 'weekly':      cmdString = `${prefix} weekly`; break;
       case 'monthly':     cmdString = `${prefix} monthly`; break;
@@ -906,7 +919,7 @@ class AccountWorker {
       client: this.client,
       safeAnswers: cmdName === 'search' ? safeParseJSON(this.account.search_answers, []) :
                    cmdName === 'crime' ? safeParseJSON(this.account.crime_answers, []) : [],
-      betAmount,
+      betAmount: ['blackjack'].includes(cmdName) ? bjBet : gambBet,
       accountId: this.account.id,
       redis,
     };
@@ -1042,7 +1055,10 @@ class AccountWorker {
       const earned = Math.max(0, cmdResult.coins || 0);
       const spent = Math.max(0, cmdResult.lost || 0);
       if (earned > 0) this.stats.coins += earned;
-      if (cmdResult.nextCooldownSec) await this.setCooldown(cmdName, cmdResult.nextCooldownSec);
+      if (cmdResult.nextCooldownSec) {
+        await this.setCooldown(cmdName, cmdResult.nextCooldownSec);
+        this._lastCooldownOverride = cmdResult.nextCooldownSec;
+      }
 
       // Mark time-gated commands as done so we don't re-run this session
       const doneExpiries = { daily: 86400, weekly: 604800, monthly: 2592000, drops: 86400 };
@@ -1065,12 +1081,12 @@ class AccountWorker {
       this.stats.successes++;
       const shortResult = result.substring(0, 30).replace(/\n/g, ' ');
       this.setStatus(`${cmdName} → ${shortResult}`);
-      await sendLog(this.username, cmdString, result, 'success');
+      await sendLog(this.username, cmdName, result, 'success');
       reportEarnings(this.account.id, this.username, earned, spent, cmdName);
     } catch (err) {
       this.stats.errors++;
       this.log('error', `${cmdString} failed: ${err.message}`);
-      await sendLog(this.username, cmdString, err.message, 'error');
+      await sendLog(this.username, cmdName, err.message, 'error');
     }
   }
 
@@ -1351,7 +1367,9 @@ class AccountWorker {
     const backoffMultiplier = this.failStreak > 5 ? Math.min(this.failStreak - 4, 5) : 1;
 
     if (this.commandQueue && this.running && !shutdownCalled) {
-      item.nextRunAt = Date.now() + totalWait * 1000 * backoffMultiplier;
+      const effectiveWait = this._lastCooldownOverride || totalWait;
+      this._lastCooldownOverride = null;
+      item.nextRunAt = Date.now() + effectiveWait * 1000 * backoffMultiplier;
       this.commandQueue.push(item);
     }
 
@@ -1371,7 +1389,7 @@ class AccountWorker {
     this.cycleCount++;
 
     if (this.cycleCount > 0 && this.cycleCount % 10 === 0) this.printStats();
-    if (this.cycleCount > 0 && this.cycleCount % 20 === 0) {
+    if (this.cycleCount > 0 && this.cycleCount % 5 === 0) {
       this.busy = true;
       await this.checkBalance();
       this.busy = false;
@@ -1522,8 +1540,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.0",
+  "version": "4.9.2",
   "description": "Dank Memer automation engine — grind coins while you sleep",
   "bin": {
     "dankgrinder": "bin/dankgrinder.js"