dankgrinder 5.23.0 → 5.24.0

package/lib/commands/inventory.js

@@ -233,6 +233,7 @@ async function runInventory({ channel, waitForDankMemer, client, accountId, redi
   allItems.push(...parseInventoryPage(response));
 
   let guard = 0;
+  let noChangeCount = 0;
   while (page < total && guard < Math.max(20, total + 6)) {
     guard++;
     const buttons = getAllButtons(response);
@@ -312,12 +313,17 @@ async function runInventory({ channel, waitForDankMemer, client, accountId, redi
     delete response._cv2buttons;
 
     let pageChanged = false;
-    for (let attempt = 0; attempt < 4; attempt++) {
-      await sleep(attempt === 0 ? 600 : 1200);
+    for (let attempt = 0; attempt < 7; attempt++) {
+      await sleep(attempt === 0 ? 700 : 1100 + Math.min(attempt * 150, 600));
       try {
-        const fresh = await channel.messages.fetch(response.id);
+        const fresh = await response.fetch(true);
         if (fresh) response = fresh;
-      } catch {}
+      } catch {
+        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 && !visitedPages.has(pageInfo.page)) {
@@ -337,7 +343,16 @@ async function runInventory({ channel, waitForDankMemer, client, accountId, redi
       delete response._cv2buttons;
     }
 
-    if (!pageChanged) break;
+    if (!pageChanged) {
+      noChangeCount++;
+      if (noChangeCount < 3) {
+        LOG.warn(`[inv] Page stuck at ${page}/${total}; retrying paginator click (${noChangeCount}/2)`);
+        await sleep(900 + Math.floor(Math.random() * 500));
+        continue;
+      }
+      break;
+    }
+    noChangeCount = 0;
     allItems.push(...parseInventoryPage(response));
   }
 

package/lib/grinder.js

@@ -1147,7 +1147,7 @@ class AccountWorker {
           lastErr = e;
           if (attempt < tries) {
             this.log('warn', `Inventory attempt ${attempt}/${tries} failed (${e.message}). Retrying...`);
-            await sleep(1500 + Math.floor(Math.random() * 1500));
+            await new Promise((r) => setTimeout(r, 1500 + Math.floor(Math.random() * 1500)));
             continue;
           }
         }
@@ -2438,17 +2438,31 @@ async function start(apiKey, apiUrl) {
   console.log('');
 
   // Phase 1: Login all accounts (staggered to avoid 429s)
-  const BATCH_SIZE = 5;
-  const BATCH_DELAY_MS = 3000;
+  const LOGIN_PROGRESS_EVERY = 5;
+  const parsedGapMin = Number.parseInt(String(process.env.LOGIN_GAP_MIN_MS || '100'), 10);
+  const parsedGapMax = Number.parseInt(String(process.env.LOGIN_GAP_MAX_MS || '300'), 10);
+  const LOGIN_GAP_MIN_MS = Number.isFinite(parsedGapMin) && parsedGapMin >= 0 ? parsedGapMin : 100;
+  const LOGIN_GAP_MAX_MS = Number.isFinite(parsedGapMax) && parsedGapMax >= LOGIN_GAP_MIN_MS ? parsedGapMax : Math.max(LOGIN_GAP_MIN_MS, 300);
+
+  const randomLoginGap = () => {
+    if (LOGIN_GAP_MAX_MS <= LOGIN_GAP_MIN_MS) return LOGIN_GAP_MIN_MS;
+    return LOGIN_GAP_MIN_MS + Math.floor(Math.random() * (LOGIN_GAP_MAX_MS - LOGIN_GAP_MIN_MS + 1));
+  };
+
   for (let i = 0; i < accounts.length; i++) {
     if (shutdownCalled) break;
     const worker = new AccountWorker(accounts[i], i);
     workers.push(worker);
     workerMap.set(accounts[i].id, worker);
     await worker.start();
-    if ((i + 1) % BATCH_SIZE === 0 && i + 1 < accounts.length) {
-      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));
+    if (i + 1 < accounts.length) {
+      const gapMs = randomLoginGap();
+      if ((i + 1) % LOGIN_PROGRESS_EVERY === 0) {
+        log('info', `${c.dim}Logged in ${i + 1}/${accounts.length}, next account in ${gapMs}ms...${c.reset}`);
+      }
+      await new Promise(r => setTimeout(r, gapMs));
+    }
+    if ((i + 1) % LOGIN_PROGRESS_EVERY === 0) {
       hintGC();
     }
   }

package/package.json

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