dankgrinder 5.0.2 → 5.0.4

package/lib/commands/utils.js

@@ -73,7 +73,7 @@ const LOG = {
   cmd:     (msg) => log(`${c.magenta}▸${c.reset}`, msg),
   coin:    (msg) => log(`${c.yellow}$${c.reset}`, msg),
   buy:     (msg) => log(`${c.blue}♦${c.reset}`, msg),
-  debug:   (msg) => log(`${c.dim}⊙${c.reset}`, msg),
+  debug:   () => {},
 };
 
 // ── Pre-compiled Regex (avoid recompilation in hot paths) ────
@@ -259,9 +259,9 @@ function flattenComponents(components) {
 }
 
 function getAllButtons(msg) {
-  if (msg._cv2buttons?.length > 0) return msg._cv2buttons;
+  if (msg._cv2buttons?.length > 0) return msg._cv2buttons.filter(b => b.style !== 'LINK' && b.style !== 5);
   const all = flattenComponents(msg.components);
-  return all.filter(c => c.type === 2 || c.type === 'BUTTON');
+  return all.filter(c => (c.type === 2 || c.type === 'BUTTON') && c.style !== 'LINK' && c.style !== 5);
 }
 
 function getAllSelectMenus(msg) {
@@ -286,6 +286,10 @@ function findSelectMenuOption(msg, label) {
 // 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) {
+  // Skip LINK buttons (external URLs) — they have style=LINK/5 and no customId
+  if (button.style === 'LINK' || button.style === 5 || (!button.customId && !button.custom_id && typeof button.click !== 'function')) {
+    return null;
+  }
   if (typeof button.click === 'function') {
     return button.click();
   }
@@ -344,66 +348,10 @@ function getHoldTightReason(msg) {
   return match ? match[1].toLowerCase() : null;
 }
 
-// ── Debug Logger ─────────────────────────────────────────────
-function logMsg(msg, label) {
-  if (!msg) { LOG.debug(`[${label}] No message`); return; }
-  // Content
-  if (msg.content) LOG.debug(`[${label}] content: "${msg.content.substring(0, 200).replace(/\n/g, ' ')}"`);
-  // Embeds
-  for (const e of msg.embeds || []) {
-    if (e.title) LOG.debug(`[${label}] title: "${e.title}"`);
-    if (e.description) LOG.debug(`[${label}] desc: "${e.description.substring(0, 200).replace(/\n/g, ' ')}"`);
-    for (const f of e.fields || []) LOG.debug(`[${label}] field: "${f.name}" = "${(f.value || '').substring(0, 150)}"`);
-    if (e.footer?.text) LOG.debug(`[${label}] footer: "${e.footer.text}"`);
-    if (e.image?.url) LOG.debug(`[${label}] image: ${e.image.url.substring(0, 80)}`);
-  }
-  // Components (buttons, selects, CV2 text)
-  for (const row of msg.components || []) {
-    if (!row) continue;
-    if (row.type === 'TEXT_DISPLAY' && row.content)
-      LOG.debug(`[${label}] cv2-text: "${row.content.substring(0, 200).replace(/\n/g, ' ')}"`);
-    if (row.type === 'CONTAINER' || row.type === 'SECTION') {
-      for (const comp of row.components || []) {
-        if (comp.type === 'TEXT_DISPLAY' && comp.content)
-          LOG.debug(`[${label}] cv2-section: "${comp.content.substring(0, 200).replace(/\n/g, ' ')}"`);
-        if (comp.components) {
-          for (const sub of comp.components) {
-            if (sub.type === 'TEXT_DISPLAY' && sub.content)
-              LOG.debug(`[${label}] cv2-nested: "${sub.content.substring(0, 200).replace(/\n/g, ' ')}"`);
-          }
-        }
-      }
-    }
-    for (const comp of row.components || []) {
-      if (comp.type === 'BUTTON' || comp.type === 2)
-        LOG.debug(`[${label}] btn: "${comp.label}" emoji=${comp.emoji?.name || '-'} disabled=${comp.disabled} style=${comp.style} id=${(comp.customId || '').substring(0, 40)}`);
-      if (comp.type === 'STRING_SELECT' || comp.type === 3)
-        LOG.debug(`[${label}] select: ${comp.customId} [${comp.options?.map(o => `${o.label}${o.default ? '*' : ''}`).join(', ')}]`);
-    }
-  }
-}
-
-// ── Dump full message raw (for debugging) ────────────────────
-function dumpMessage(msg, label) {
-  console.log(`\n═══ [${label}] ═══`);
-  console.log(`  author: ${msg.author?.tag} (${msg.author?.id})`);
-  console.log(`  content: "${msg.content || ''}"`);
-  console.log(`  embeds (${msg.embeds?.length || 0}):`);
-  for (const e of msg.embeds || []) {
-    console.log(JSON.stringify({
-      title: e.title, description: e.description,
-      fields: e.fields?.map(f => ({ name: f.name, value: f.value })),
-      footer: e.footer?.text, color: e.color,
-    }, null, 2));
-  }
-  console.log(`  components (${msg.components?.length || 0}):`);
-  for (const row of msg.components || []) {
-    for (const comp of row.components || []) {
-      console.log(`    type=${comp.type} label="${comp.label}" customId="${comp.customId}" disabled=${comp.disabled} style=${comp.style}`);
-      if (comp.options) console.log(`    options: ${JSON.stringify(comp.options.map(o => ({ label: o.label, value: o.value, default: o.default })))}`);
-    }
-  }
-}
+// logMsg / dumpMessage — disabled in production (no-ops).
+// Enable by setting DEBUG_MSGS=1 env var for troubleshooting.
+function logMsg() {}
+function dumpMessage() {}
 
 // ── CV2 (Components V2) Support ──────────────────────────────
 // Discord's CV2 messages (flag 32768) aren't parsed by the selfbot library.

package/lib/grinder.js

@@ -453,17 +453,13 @@ function renderDashboard() {
 
   lines.push(bar);
 
-  // Use absolute cursor positioning (row 1, col 1) to avoid ghost bar drift
+  // Absolute cursor home — always draw from row 1
   process.stdout.write('\x1b[H');
-  const prevLines = dashboardLines;
   for (const line of lines) {
     process.stdout.write(c.clearLine + '\r' + line + '\n');
   }
-  // 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');
-  }
+  // Erase everything below the dashboard (clears ghost bars, trailing lines)
+  process.stdout.write('\x1b[J');
   dashboardLines = lines.length;
   dashboardRendering = false;
 }
@@ -565,32 +561,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) {
@@ -1886,7 +1870,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;
     }
@@ -2189,9 +2173,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',
@@ -2278,9 +2262,8 @@ class AccountWorker {
           } catch {}
         }
 
-        // Let Discord gateway settle before sending first command
+        // Let Discord gateway settle
         await new Promise(r => setTimeout(r, 2500));
-        this.grindLoop();
         resolve();
       });
 
@@ -2341,7 +2324,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);
@@ -2361,16 +2343,6 @@ async function start(apiKey, apiUrl) {
   );
   console.log(bar);
 
-  const checks = [];
-  checks.push(`${rgb(52, 211, 153)}✓${c.reset} ${c.white}API${c.reset}`);
-  if (REDIS_URL) checks.push(`${rgb(52, 211, 153)}✓${c.reset} ${c.white}Redis${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}`);
-  }
-  console.log(`  ${checks.join('   ')}`);
-
   log('info', `${c.dim}Fetching accounts...${c.reset}`);
 
   let data = await fetchConfig(4, 2000);
@@ -2381,6 +2353,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.');
@@ -2397,13 +2376,19 @@ 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('');
 
-  // All accounts run simultaneously — stagger logins in batches to avoid 429s
+  // Phase 1: Login all accounts (staggered to avoid 429s)
   const BATCH_SIZE = 5;
   const BATCH_DELAY_MS = 3000;
   for (let i = 0; i < accounts.length; i++) {
@@ -2413,12 +2398,22 @@ async function start(apiKey, apiUrl) {
     workerMap.set(accounts[i].id, worker);
     await worker.start();
     if ((i + 1) % BATCH_SIZE === 0 && i + 1 < accounts.length) {
-      log('info', `${c.dim}Started ${i + 1}/${accounts.length} accounts, next batch in ${BATCH_DELAY_MS / 1000}s...${c.reset}`);
+      log('info', `${c.dim}Logged in ${i + 1}/${accounts.length}, next batch in ${BATCH_DELAY_MS / 1000}s...${c.reset}`);
       await new Promise(r => setTimeout(r, BATCH_DELAY_MS));
       hintGC();
     }
   }
 
+  // Phase 2: Run inventory on ALL accounts (must complete before any grinding)
+  log('info', `${c.dim}Checking inventory for all ${workers.length} accounts...${c.reset}`);
+  await Promise.all(workers.map(w => w.checkInventory().catch(() => {})));
+  log('success', `${c.dim}All inventories checked. Starting grind loops...${c.reset}`);
+
+  // Phase 3: Start all grind loops
+  for (const w of workers) {
+    if (!shutdownCalled) w.grindLoop();
+  }
+
   startTime = Date.now();
   dashboardStarted = true;
   setDashboardActive(true);

package/package.json

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