dankgrinder 5.0.1 → 5.0.3

package/lib/commands/utils.js

@@ -282,7 +282,9 @@ function findSelectMenuOption(msg, label) {
   return null;
 }
 
-// Safe button click — tries library methods first, falls back to raw HTTP for CV2
+// Safe button click — tries library methods first, falls back to raw HTTP for CV2.
+// When CV2 fallback is used, waits for the message to update so callers always
+// get the updated message back (instead of null, which broke multi-round games).
 async function safeClickButton(msg, button) {
   if (typeof button.click === 'function') {
     return button.click();
@@ -295,9 +297,29 @@ async function safeClickButton(msg, button) {
       // Fall through to CV2 raw interaction fallback.
     }
   }
-  // CV2 fallback: send interaction via raw HTTP
+  // CV2 fallback: send interaction via raw HTTP, then wait for the message
+  // to update so we can return the updated message to the caller.
   if (id) {
     await clickCV2Button(msg, id);
+    // Wait for Dank Memer to process the interaction and update the message
+    const updatedMsg = await new Promise((resolve) => {
+      const timeout = setTimeout(() => {
+        msg.client?.removeListener?.('messageUpdate', handler);
+        resolve(null);
+      }, 8000);
+      const handler = (_, newMsg) => {
+        if (newMsg.id === msg.id) {
+          clearTimeout(timeout);
+          msg.client?.removeListener?.('messageUpdate', handler);
+          resolve(newMsg);
+        }
+      };
+      msg.client?.on?.('messageUpdate', handler);
+    });
+    if (updatedMsg) {
+      await ensureCV2(updatedMsg);
+      return updatedMsg;
+    }
     return null;
   }
   throw new Error('No click method available on button');

package/lib/grinder.js

@@ -453,19 +453,16 @@ function renderDashboard() {
 
   lines.push(bar);
 
+  // Use absolute cursor positioning (row 1, col 1) to avoid ghost bar drift
+  process.stdout.write('\x1b[H');
   const prevLines = dashboardLines;
-  if (prevLines > 0) {
-    process.stdout.write(c.cursorUp(prevLines));
-  }
   for (const line of lines) {
     process.stdout.write(c.clearLine + '\r' + line + '\n');
   }
-  // Clear trailing old lines when dashboard shrinks (prevents ghost bars)
-  if (lines.length < prevLines) {
-    for (let i = lines.length; i < prevLines; i++) {
-      process.stdout.write(c.clearLine + '\r\n');
-    }
-    process.stdout.write(c.cursorUp(prevLines - lines.length));
+  // Clear any trailing lines from previous (larger) render
+  const maxClear = Math.max(prevLines - lines.length, 0) + 3;
+  for (let i = 0; i < maxClear; i++) {
+    process.stdout.write(c.clearLine + '\r\n');
   }
   dashboardLines = lines.length;
   dashboardRendering = false;
@@ -568,32 +565,20 @@ async function reportEarnings(accountId, accountName, earned, spent, command) {
   earningsBatch.push({ account_id: accountId, account_name: accountName, earned, spent, command });
 }
 
-const feedBatch = new AsyncBatchQueue(async (batch) => {
+// Command feed sends directly (no batching) for real-time dashboard SSE updates.
+// The dashboard live queue depends on instant delivery via eventBus.emit("sse").
+async function reportCommandFeed(accountId, accountName, data) {
   if (!API_URL) return;
+  const normalized = { ...data };
+  if (typeof normalized.command === 'string') normalized.command = stripAnsi(normalized.command).replace(/\s+/g, ' ').trim();
+  if (typeof normalized.result === 'string') normalized.result = stripAnsi(normalized.result).replace(/\s+/g, ' ').trim();
   try {
-    await fetch(`${API_URL}/api/grinder/command-feed-batch`, {
+    await fetch(`${API_URL}/api/grinder/command-feed`, {
       method: 'POST',
       headers: { Authorization: `Bearer ${API_KEY}`, 'Content-Type': 'application/json' },
-      body: JSON.stringify({ items: batch }),
+      body: JSON.stringify({ account_id: accountId, account_name: accountName, ...normalized }),
     });
-  } catch {
-    for (const item of batch) {
-      try {
-        await fetch(`${API_URL}/api/grinder/command-feed`, {
-          method: 'POST',
-          headers: { Authorization: `Bearer ${API_KEY}`, 'Content-Type': 'application/json' },
-          body: JSON.stringify(item),
-        });
-      } catch {}
-    }
-  }
-}, { maxSize: 100, flushMs: 2000 });
-
-async function reportCommandFeed(accountId, accountName, data) {
-  const normalized = { ...data };
-  if (typeof normalized.command === 'string') normalized.command = stripAnsi(normalized.command).replace(/\s+/g, ' ').trim();
-  if (typeof normalized.result === 'string') normalized.result = stripAnsi(normalized.result).replace(/\s+/g, ' ').trim();
-  feedBatch.push({ account_id: accountId, account_name: accountName, ...normalized });
+  } catch { /* silent — dashboard just won't see this update */ }
 }
 
 function randomDelay(min, max) {
@@ -1535,11 +1520,13 @@ class AccountWorker {
 
       if (cmdResult.holdTightReason) {
         const reason = cmdResult.holdTightReason;
-        this.log('warn', `Hold Tight: /${reason} — 35s cooldown`);
+        const holdSec = 35;
+        this.log('warn', `Hold Tight: /${reason} — ${holdSec}s global cooldown`);
         const reasonMap = { postmemes: 'pm', highlow: 'hl', blackjack: 'bj', 'work shift': 'work shift' };
         const mappedCmd = reasonMap[reason] || reason;
-        await this.setCooldown(mappedCmd, 35);
-        await this.setCooldown(cmdName, 35);
+        await this.setCooldown(mappedCmd, holdSec);
+        await this.setCooldown(cmdName, holdSec);
+        this.globalCooldownUntil = Math.max(this.globalCooldownUntil, Date.now() + holdSec * 1000);
       }
 
       this.stats.successes++;
@@ -1887,7 +1874,7 @@ class AccountWorker {
       this.tickTimeout = setTimeout(() => this.tick(), 5000);
       return;
     }
-    if (this.busy) {
+    if (this.busy || this._invRunning) {
       this.tickTimeout = setTimeout(() => this.tick(), 2000);
       return;
     }
@@ -2025,6 +2012,14 @@ class AccountWorker {
     await this.runCommand(item.cmd, prefix);
     const earned = this.stats.coins - beforeCoins;
 
+    // Grace period for interactive (button-click) commands — Dank Memer
+    // needs time to process the interaction before accepting the next command.
+    // Without this, the next command gets "Hold Tight" errors.
+    const INTERACTIVE_CMDS = new Set(['hl', 'blackjack', 'trivia', 'scratch', 'adventure', 'stream', 'fish']);
+    if (INTERACTIVE_CMDS.has(item.cmd)) {
+      await new Promise(r => setTimeout(r, 2500 + Math.random() * 1500));
+    }
+
     // EMA: track smoothed earnings per command for adaptive scheduling
     if (earned > 0) {
       this._earningsEMA.update(earned);
@@ -2075,14 +2070,8 @@ class AccountWorker {
     if (this.cycleCount > 0 && this.cycleCount % 10 === 0) this.printStats();
     // Rebuild BloomFilter every 50 cycles to clear expired entries
     if (this.cycleCount > 0 && this.cycleCount % 50 === 0) this._rebuildBloom();
-    if (this.cycleCount > 0 && this.cycleCount % 5 === 0) {
-      this.busy = true;
-      await this.checkBalance();
-      this.busy = false;
-    }
-
     if (this.running && !shutdownCalled) {
-      const nextDelay = this.failStreak > 0 ? 1500 : 500;
+      const nextDelay = this.failStreak > 0 ? 3000 : 1500;
       this.tickTimeout = setTimeout(() => this.tick(), nextDelay);
     }
   }
@@ -2090,7 +2079,6 @@ class AccountWorker {
   async grindLoop() {
     if (this.running) return;
     this.running = true;
-    this.busy = false;
     this.paused = false;
     this.dashboardPaused = false;
     this.failStreak = 0;
@@ -2189,9 +2177,9 @@ class AccountWorker {
       // Handle pending actions from dashboard
       if (Array.isArray(data.pendingActions)) {
         for (const action of data.pendingActions) {
-          if (action.action === 'check_inventory' && !this.busy) {
+          if (action.action === 'check_inventory' && !this.busy && !this._invRunning) {
             this.log('info', 'Dashboard requested inventory check');
-            this.checkInventory().catch(() => {});
+            await this.checkInventory().catch(() => {});
             try {
               await fetch(`${API_URL}/api/grinder/actions`, {
                 method: 'DELETE',
@@ -2280,8 +2268,8 @@ class AccountWorker {
 
         // Let Discord gateway settle before sending first command
         await new Promise(r => setTimeout(r, 2500));
-        await this.checkBalance();
-        this.checkInventory().catch(() => {});
+        // Run initial inventory check (awaited) before grind loop starts
+        await this.checkInventory().catch(() => {});
         this.grindLoop();
         resolve();
       });
@@ -2343,7 +2331,6 @@ async function start(apiKey, apiUrl) {
   API_URL = apiUrl || process.env.DANKGRINDER_URL || 'http://localhost:3000';
   REDIS_URL = process.env.REDIS_URL || '';
   WEBHOOK_URL = process.env.WEBHOOK_URL || '';
-  initRedis();
 
   process.stdout.write('\x1b[2J\x1b[H');
   const tw = Math.min(process.stdout.columns || 80, 78);
@@ -2363,16 +2350,6 @@ async function start(apiKey, apiUrl) {
   );
   console.log(bar);
 
-  const checks = [];
-  checks.push(`${rgb(52, 211, 153)}✓${c.reset} ${c.white}API${c.reset}`);
-  checks.push(REDIS_URL ? `${rgb(52, 211, 153)}✓${c.reset} ${c.white}Redis${c.reset}` : `${c.dim}○ Redis${c.reset}`);
-  checks.push(hasZlib ? `${rgb(52, 211, 153)}✓${c.reset} ${c.white}zlib${c.reset}` : `${rgb(251, 191, 36)}○${c.reset} ${c.dim}zlib (npm i zlib-sync)${c.reset}`);
-  checks.push(WEBHOOK_URL ? `${rgb(52, 211, 153)}✓${c.reset} ${c.white}Webhook${c.reset}` : `${c.dim}○ Webhook${c.reset}`);
-  if (CLUSTER_ENABLED) {
-    checks.push(`${rgb(52, 211, 153)}✓${c.reset} ${rgb(34, 211, 238)}Cluster${c.reset} ${c.dim}(${NODE_ID.substring(0, 12)})${c.reset}`);
-  }
-  console.log(`  ${checks.join('   ')}`);
-
   log('info', `${c.dim}Fetching accounts...${c.reset}`);
 
   let data = await fetchConfig(4, 2000);
@@ -2383,6 +2360,13 @@ async function start(apiKey, apiUrl) {
     data = await fetchConfig(4, 2000);
   }
 
+  // Pull Redis/Webhook URLs from API config if not in env
+  if (!REDIS_URL && data.redis_url) REDIS_URL = data.redis_url;
+  if (!REDIS_URL && data.redisUrl) REDIS_URL = data.redisUrl;
+  if (!WEBHOOK_URL && data.webhook_url) WEBHOOK_URL = data.webhook_url;
+  if (!WEBHOOK_URL && data.webhookUrl) WEBHOOK_URL = data.webhookUrl;
+  initRedis();
+
   let { accounts } = data;
   if (!accounts || accounts.length === 0) {
     log('error', 'No active accounts. Add them in the dashboard.');
@@ -2399,9 +2383,15 @@ 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}`);
+  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) {
+    checks.push(`${rgb(52, 211, 153)}✓${c.reset} ${rgb(34, 211, 238)}Cluster${c.reset} ${c.dim}(${NODE_ID.substring(0, 12)})${c.reset}`);
+  }
   checks.push(`${rgb(52, 211, 153)}✓${c.reset} ${c.white}${accounts.length} Account${accounts.length > 1 ? 's' : ''}${c.reset}`);
-  process.stdout.write(c.cursorUp(1));
-  process.stdout.write(c.clearLine + '\r');
   console.log(`  ${checks.join('   ')}`);
   console.log('');
 
@@ -2421,11 +2411,13 @@ async function start(apiKey, apiUrl) {
     }
   }
 
-  console.log('');
   startTime = Date.now();
   dashboardStarted = true;
   setDashboardActive(true);
+  // Clear entire screen so startup logs don't create ghost bars
+  process.stdout.write('\x1b[2J\x1b[H');
   process.stdout.write(c.hide);
+  dashboardLines = 0;
 
   setInterval(() => scheduleRender(), 1000);
   scheduleRender();

package/package.json

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