dankgrinder 5.0.3 → 5.0.6

package/lib/commands/inventory.js

@@ -224,7 +224,6 @@ async function runInventory({ channel, waitForDankMemer, client, accountId, redi
   while (page < total) {
     const buttons = getAllButtons(response);
     const enabled = buttons.filter(b => !b.disabled);
-    const expectedNextPage = page; // page is 1-based, paginator target indexes are usually 0-based
 
     const parseTargetPage = (customId) => {
       if (!customId) return null;
@@ -236,7 +235,7 @@ async function runInventory({ channel, waitForDankMemer, client, accountId, redi
       const id = String(b.customId || '');
       if (!/paginator-inventory-list/i.test(id)) return false;
       if (!/setpage/i.test(id)) return false;
-      return parseTargetPage(id) === expectedNextPage;
+      return parseTargetPage(id) === page;
     });
 
     if (!nextBtn) {
@@ -244,7 +243,6 @@ async function runInventory({ channel, waitForDankMemer, client, accountId, redi
         const id = (b.customId || '').toLowerCase();
         const label = (b.label || '').toLowerCase();
         const emoji = (b.emoji?.name || '').toLowerCase();
-        // Exclude backward/first/last page buttons
         if (id.includes('prev') || id.includes('first') || id.includes('last') || id.includes('back')) return false;
         if (label.includes('prev') || label.includes('back') || label === '◀' || label === '⏮' || label === '←' || label === '⏭') return false;
         if (emoji.includes('arrowleft') || emoji.includes('doubleleft') || emoji.includes('doubleright')) return false;
@@ -254,36 +252,62 @@ async function runInventory({ channel, waitForDankMemer, client, accountId, redi
       });
     }
 
-    if (!nextBtn) {
-      LOG.debug(`[inv] No next button on page ${page}`);
-      break;
-    }
+    if (!nextBtn) break;
+
+    await humanDelay(200, 400);
+
+    // Set up messageUpdate listener BEFORE clicking so we don't miss the update
+    const msgId = response.id;
+    const updatePromise = new Promise((resolve) => {
+      const timeout = setTimeout(() => {
+        client.removeListener('messageUpdate', handler);
+        resolve(null);
+      }, 10000);
+      const handler = (_, m) => {
+        if (m.id === msgId) {
+          clearTimeout(timeout);
+          client.removeListener('messageUpdate', handler);
+          resolve(m);
+        }
+      };
+      client.on('messageUpdate', handler);
+    });
 
-    await humanDelay(150, 350);
     try {
-      const result = await safeClickButton(response, nextBtn);
-      if (result) {
-        response = result;
-      } else {
-        await sleep(1200);
-      }
-    } catch (e) {
-      LOG.error(`[inv] Next page click failed: ${e.message}`);
+      await safeClickButton(response, nextBtn);
+    } catch {
       break;
     }
 
-    // Clear cached CV2 data so ensureCV2 re-fetches the updated message
+    // Wait for actual message update from Discord (page content change)
+    const updated = await updatePromise;
+    if (updated) {
+      response = updated;
+    }
+
+    // Force-refetch CV2 with retries until page actually changes
     delete response._cv2;
     delete response._cv2text;
     delete response._cv2buttons;
-    await sleep(300);
-    if (isCV2(response)) await ensureCV2(response);
-    const pageInfo = parsePageInfo(response);
-    if (pageInfo.page <= page) break;
-    page = pageInfo.page;
-    total = pageInfo.total;
-
-    LOG.info(`[inv] Page ${page}/${total}`);
+
+    let pageChanged = false;
+    for (let attempt = 0; attempt < 4; attempt++) {
+      await sleep(attempt === 0 ? 600 : 1200);
+      if (isCV2(response)) await ensureCV2(response, true);
+      const pageInfo = parsePageInfo(response);
+      if (pageInfo.page > page) {
+        page = pageInfo.page;
+        total = pageInfo.total;
+        pageChanged = true;
+        break;
+      }
+      // Clear CV2 cache again for next retry
+      delete response._cv2;
+      delete response._cv2text;
+      delete response._cv2buttons;
+    }
+
+    if (!pageChanged) break;
     allItems.push(...parseInventoryPage(response));
   }
 
@@ -388,7 +412,7 @@ async function getAllInventories(redis, accountIds) {
 }
 
 module.exports = {
-  runInventory, fetchItemValues, enrichItems,
+  runInventory, fetchItemValues, enrichItems, parsePageInfo,
   getCachedInventory, getAllInventories,
   updateInventoryItem, deleteInventoryItem,
   binarySearchItem, itemNameTrie, itemValueCache,

package/lib/commands/utils.js

@@ -59,11 +59,7 @@ const c = {
 let _dashboardActive = false;
 function setDashboardActive(val) { _dashboardActive = val; }
 
-function log(label, msg) {
-  if (_dashboardActive) return;
-  const time = new Date().toLocaleTimeString('en-US', { hour12: true, hour: '2-digit', minute: '2-digit', second: '2-digit' });
-  console.log(`  ${c.dim}${time}${c.reset}  ${label}  ${msg}`);
-}
+function log() {}
 
 const LOG = {
   info:    (msg) => log(`${c.cyan}│${c.reset}`, msg),
@@ -73,7 +69,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 +255,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 +282,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 +344,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;
 }
@@ -2266,11 +2262,8 @@ class AccountWorker {
           } catch {}
         }
 
-        // Let Discord gateway settle before sending first command
+        // Let Discord gateway settle
         await new Promise(r => setTimeout(r, 2500));
-        // Run initial inventory check (awaited) before grind loop starts
-        await this.checkInventory().catch(() => {});
-        this.grindLoop();
         resolve();
       });
 
@@ -2395,7 +2388,7 @@ async function start(apiKey, apiUrl) {
   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++) {
@@ -2405,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.3",
+  "version": "5.0.6",
   "description": "Dank Memer automation engine — grind coins while you sleep",
   "bin": {
     "dankgrinder": "bin/dankgrinder.js"