dankgrinder 5.19.0 → 5.20.0

package/lib/commands/inventory.js

@@ -218,10 +218,13 @@ async function runInventory({ channel, waitForDankMemer, client, accountId, redi
   const allItems = [];
   let { page, total } = parsePageInfo(response);
   LOG.info(`[inv] Page ${page}/${total}`);
+  const visitedPages = new Set([page]);
 
   allItems.push(...parseInventoryPage(response));
 
-  while (page < total) {
+  let guard = 0;
+  while (page < total && guard < Math.max(20, total + 6)) {
+    guard++;
     const buttons = getAllButtons(response);
     const enabled = buttons.filter(b => !b.disabled);
 
@@ -231,13 +234,43 @@ async function runInventory({ channel, waitForDankMemer, client, accountId, redi
       return m ? parseInt(m[1], 10) : null;
     };
 
-    let nextBtn = enabled.find((b) => {
-      const id = String(b.customId || '');
-      if (!/paginator-inventory-list/i.test(id)) return false;
-      if (!/setpage/i.test(id)) return false;
-      return parseTargetPage(id) === page;
+    const classifyButton = (b) => {
+      const id = String(b.customId || '').toLowerCase();
+      const label = String(b.label || '').toLowerCase();
+      const emoji = String(b.emoji?.name || '').toLowerCase();
+      return { id, label, emoji };
+    };
+
+    const directNext = enabled.find((b) => {
+      const { id, label, emoji } = classifyButton(b);
+      if (id.includes('last') || label === '⏭' || emoji.includes('doubleright')) return false;
+      return id.includes('next')
+        || label.includes('next')
+        || label === '▶'
+        || label === '→'
+        || emoji.includes('arrowright');
     });
 
+    let nextBtn = directNext || null;
+
+    if (!nextBtn) {
+      const paginatorCandidates = enabled
+        .map((b) => ({ b, id: String(b.customId || ''), target: parseTargetPage(b.customId || '') }))
+        .filter((x) => /paginator-inventory-list/i.test(x.id) && /setpage/i.test(x.id) && Number.isInteger(x.target));
+
+      // Prefer the smallest target greater than current page.
+      // Fallback to target===current page for legacy/offset paginator ids.
+      const gtCurrent = paginatorCandidates
+        .filter(x => x.target > page)
+        .sort((a, b) => a.target - b.target);
+      if (gtCurrent.length > 0) {
+        nextBtn = gtCurrent[0].b;
+      } else {
+        const eqCurrent = paginatorCandidates.find(x => x.target === page);
+        if (eqCurrent) nextBtn = eqCurrent.b;
+      }
+    }
+
     if (!nextBtn) {
       nextBtn = enabled.find((b) => {
         const id = (b.customId || '').toLowerCase();
@@ -256,35 +289,13 @@ async function runInventory({ channel, waitForDankMemer, client, accountId, redi
 
     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);
-    });
-
     try {
-      await safeClickButton(response, nextBtn);
+      const clicked = await safeClickButton(response, nextBtn);
+      if (clicked) response = clicked;
     } catch {
       break;
     }
 
-    // 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;
@@ -293,12 +304,18 @@ async function runInventory({ channel, waitForDankMemer, client, accountId, redi
     let pageChanged = false;
     for (let attempt = 0; attempt < 4; attempt++) {
       await sleep(attempt === 0 ? 600 : 1200);
+      try {
+        const fresh = await channel.messages.fetch(response.id);
+        if (fresh) response = fresh;
+      } catch {}
       if (isCV2(response)) await ensureCV2(response, true);
       const pageInfo = parsePageInfo(response);
-      if (pageInfo.page > page) {
+      if (pageInfo.page > page && !visitedPages.has(pageInfo.page)) {
         page = pageInfo.page;
         total = pageInfo.total;
+        visitedPages.add(page);
         pageChanged = true;
+        LOG.info(`[inv] Page ${page}/${total}`);
         break;
       }
       // Clear CV2 cache again for next retry
@@ -323,7 +340,7 @@ async function runInventory({ channel, waitForDankMemer, client, accountId, redi
   }
 
   const items = Object.values(itemMap);
-  LOG.success(`[inv] Found ${items.length} unique items across ${total} pages`);
+  LOG.success(`[inv] Found ${items.length} unique items across ${visitedPages.size}/${total} pages`);
 
   const { totalValue, totalMarket } = await enrichItems(items);
   LOG.info(`[inv] Net value: ${c.bold}${c.green}⏣ ${totalValue.toLocaleString()}${c.reset}  Market: ${c.bold}⏣ ${totalMarket.toLocaleString()}${c.reset}`);

package/lib/grinder.js

@@ -1084,14 +1084,19 @@ class AccountWorker {
   }
 
   // ── Check Balance ───────────────────────────────────────────
-  async checkInventory() {
+  async checkInventory(options = {}) {
+    const { force = false, startupProgress = null } = options;
     if (this._invRunning) return;
-    if (this._lastInvCheck && Date.now() - this._lastInvCheck < 300_000) return;
+    if (!force && 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...');
+      if (startupProgress && Number.isInteger(startupProgress.current) && Number.isInteger(startupProgress.total)) {
+        this.log('info', `Checking inventory... (${startupProgress.current}/${startupProgress.total})`);
+      } else {
+        this.log('info', 'Checking inventory...');
+      }
       const result = await commands.runInventory({
         channel: this.channel,
         waitForDankMemer: (timeout) => this.waitForDankMemer(timeout),
@@ -2411,8 +2416,22 @@ async function start(apiKey, apiUrl) {
 
   // 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}`);
+  let invDone = 0;
+  let invFailed = 0;
+  for (let i = 0; i < workers.length; i++) {
+    const w = workers[i];
+    const label = w?.username || w?.account?.label || w?.account?.id || `account-${i + 1}`;
+    log('info', `${c.dim}[inv-startup] ${i + 1}/${workers.length} ${label}${c.reset}`);
+    try {
+      await w.checkInventory({ force: true, startupProgress: { current: i + 1, total: workers.length } });
+      invDone++;
+    } catch {
+      invFailed++;
+    }
+    await new Promise(r => setTimeout(r, 800));
+  }
+  const invSummaryColor = invFailed > 0 ? c.yellow : c.green;
+  log('success', `${c.dim}Inventory phase complete: ${invSummaryColor}${invDone}/${workers.length}${c.reset}${c.dim} done${invFailed > 0 ? `, ${c.yellow}${invFailed} failed${c.reset}${c.dim}` : ''}. Starting grind loops...${c.reset}`);
 
   // Phase 3: Start all grind loops
   for (const w of workers) {

package/package.json

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