dankgrinder 5.0.4 → 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),

package/package.json

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