dankgrinder 5.22.0 → 5.24.0

package/lib/commands/inventory.js

@@ -202,14 +202,21 @@ async function runInventory({ channel, waitForDankMemer, client, accountId, redi
 
   if (!response) {
     LOG.warn('[inv] No response');
-    return { result: 'no response', items: [] };
+    return { result: 'no response', items: [], complete: false, pagesVisited: 0, pagesTotal: 0 };
   }
 
   if (isHoldTight(response)) {
     const reason = getHoldTightReason(response);
     LOG.warn(`[inv] Hold Tight${reason ? ` (reason: ${reason})` : ''}`);
     await sleep(30000);
-    return { result: `hold tight (${reason || 'unknown'})`, items: [], holdTightReason: reason };
+    return {
+      result: `hold tight (${reason || 'unknown'})`,
+      items: [],
+      holdTightReason: reason,
+      complete: false,
+      pagesVisited: 0,
+      pagesTotal: 0,
+    };
   }
 
   if (isCV2(response)) await ensureCV2(response);
@@ -226,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);
@@ -305,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)) {
@@ -330,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));
   }
 
@@ -346,13 +368,19 @@ async function runInventory({ channel, waitForDankMemer, client, accountId, redi
   }
 
   const items = Object.values(itemMap);
-  LOG.success(`[inv] Found ${items.length} unique items across ${visitedPages.size}/${total} pages`);
+  const pagesVisited = visitedPages.size;
+  const pagesTotal = Math.max(total || 1, 1);
+  const complete = page >= total || pagesVisited >= pagesTotal;
+  LOG.success(`[inv] Found ${items.length} unique items across ${pagesVisited}/${pagesTotal} pages`);
+  if (!complete) {
+    LOG.warn(`[inv] Incomplete pagination detected: stopped at page ${page}/${pagesTotal}`);
+  }
 
   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}`);
 
   // Store in Redis — NO EXPIRY (permanent until next update)
-  if (redis && accountId) {
+  if (complete && redis && accountId) {
     try {
       const payload = {
         items,
@@ -366,6 +394,8 @@ async function runInventory({ channel, waitForDankMemer, client, accountId, redi
     } catch (e) {
       LOG.error(`[inv] Redis store failed: ${e.message}`);
     }
+  } else if (!complete) {
+    LOG.warn('[inv] Skipping Redis store for incomplete inventory scan');
   }
 
   return {
@@ -374,6 +404,9 @@ async function runInventory({ channel, waitForDankMemer, client, accountId, redi
     totalValue,
     totalMarket,
     coins: 0,
+    complete,
+    pagesVisited,
+    pagesTotal,
   };
 }
 

package/lib/grinder.js

@@ -1085,42 +1085,78 @@ class AccountWorker {
 
   // ── Check Balance ───────────────────────────────────────────
   async checkInventory(options = {}) {
-    const { force = false, startupProgress = null } = options;
-    if (this._invRunning) return;
-    if (!force && this._lastInvCheck && Date.now() - this._lastInvCheck < 300_000) return;
+    const {
+      force = false,
+      startupProgress = null,
+      requireComplete = false,
+      maxAttempts = 1,
+    } = options;
+    if (this._invRunning) return { ok: false, skipped: 'busy' };
+    if (!force && this._lastInvCheck && Date.now() - this._lastInvCheck < 300_000) return { ok: false, skipped: 'recent' };
     this._invRunning = true;
     this._lastInvCheck = Date.now();
     this.busy = true;
     try {
-      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),
-        client: this.client,
-        accountId: this.account.id,
-        redis,
-        onPageProgress: ({ page, total }) => {
-          this.log('info', `Inventory pages: ${page}/${total}`);
-        },
-      });
-      this.log('success', `Inventory: ${result.items?.length || 0} items, ⏣ ${(result.totalValue || 0).toLocaleString()} net`);
-      try {
-        await fetch(`${API_URL}/api/grinder/inventory`, {
-          method: 'POST',
-          headers: { Authorization: `Bearer ${API_KEY}`, 'Content-Type': 'application/json' },
-          body: JSON.stringify({
-            account_id: this.account.id,
-            items: result.items || [],
-            totalValue: result.totalValue || 0,
-          }),
-        });
-      } catch {}
+      const tries = Math.max(1, Number.isFinite(maxAttempts) ? maxAttempts : 1);
+      let lastErr = null;
+      for (let attempt = 1; attempt <= tries; attempt++) {
+        if (startupProgress && Number.isInteger(startupProgress.current) && Number.isInteger(startupProgress.total)) {
+          this.log('info', `Checking inventory... (${startupProgress.current}/${startupProgress.total}) [try ${attempt}/${tries}]`);
+        } else {
+          this.log('info', `Checking inventory...${tries > 1 ? ` [try ${attempt}/${tries}]` : ''}`);
+        }
+
+        try {
+          const result = await commands.runInventory({
+            channel: this.channel,
+            waitForDankMemer: (timeout) => this.waitForDankMemer(timeout),
+            client: this.client,
+            accountId: this.account.id,
+            redis,
+            onPageProgress: ({ page, total }) => {
+              this.log('info', `Inventory pages: ${page}/${total}`);
+            },
+          });
+
+          if (requireComplete && !result.complete) {
+            throw new Error(`incomplete pages (${result.pagesVisited || 0}/${result.pagesTotal || 0})`);
+          }
+
+          this.log('success', `Inventory: ${result.items?.length || 0} items, ⏣ ${(result.totalValue || 0).toLocaleString()} net`);
+          try {
+            await fetch(`${API_URL}/api/grinder/inventory`, {
+              method: 'POST',
+              headers: { Authorization: `Bearer ${API_KEY}`, 'Content-Type': 'application/json' },
+              body: JSON.stringify({
+                account_id: this.account.id,
+                items: result.items || [],
+                totalValue: result.totalValue || 0,
+              }),
+            });
+          } catch {}
+
+          return {
+            ok: true,
+            complete: !!result.complete,
+            pagesVisited: result.pagesVisited || 0,
+            pagesTotal: result.pagesTotal || 0,
+            attempts: attempt,
+            result,
+          };
+        } catch (e) {
+          lastErr = e;
+          if (attempt < tries) {
+            this.log('warn', `Inventory attempt ${attempt}/${tries} failed (${e.message}). Retrying...`);
+            await new Promise((r) => setTimeout(r, 1500 + Math.floor(Math.random() * 1500)));
+            continue;
+          }
+        }
+      }
+
+      throw lastErr || new Error('inventory check failed');
     } catch (e) {
       this.log('error', `Inventory check failed: ${e.message}`);
+      return { ok: false, error: e.message };
     } finally {
       this._invRunning = false;
       this.busy = false;
@@ -2402,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();
     }
   }
@@ -2425,14 +2475,26 @@ async function start(apiKey, apiUrl) {
     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++;
+      const invRes = await w.checkInventory({
+        force: true,
+        startupProgress: { current: i + 1, total: workers.length },
+        requireComplete: true,
+        maxAttempts: 3,
+      });
+      if (invRes?.ok) invDone++;
+      else invFailed++;
     } catch {
       invFailed++;
     }
     const invComplete = invDone + invFailed;
     log('info', `${c.dim}[inv-startup-progress] ${invComplete}/${workers.length} complete (${invDone} ok, ${invFailed} failed)${c.reset}`);
   }));
+
+  if (invFailed > 0) {
+    log('error', `${c.red}Inventory phase incomplete: ${invDone}/${workers.length} complete, ${invFailed} failed/incomplete. Not starting grind loops.${c.reset}`);
+    return;
+  }
+
   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}`);
 

package/package.json

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