dankgrinder 5.25.0 → 5.260.0

package/lib/grinder.js

@@ -605,6 +605,51 @@ function safeParseJSON(str, fallback = []) {
   try { return JSON.parse(str || '[]'); } catch { return fallback; }
 }
 
+// ── Command Result Formatter ──────────────────────────────────
+// Clean command names and format results with color codes
+const CMD_NAMES_CLEAN = {
+  bj: 'Blackjack', blackjack: 'Blackjack', hl: 'High Low', pm: 'Post Memes', postmemes: 'Post Memes',
+  ct: 'Coin Toss', cointoss: 'Coin Toss', se: 'Snake Eyes', snakeeyes: 'Snake Eyes',
+  hunt: 'Hunt', dig: 'Dig', fish: 'Fish', beg: 'Beg', search: 'Search', crime: 'Crime',
+  tidy: 'Tidy', farm: 'Farm', daily: 'Daily', weekly: 'Weekly', monthly: 'Monthly',
+  scratch: 'Scratch', adventure: 'Adventure', trivia: 'Trivia', stream: 'Stream',
+  drops: 'Drops', use: 'Use Item', dep: 'Deposit', deposit: 'Deposit', inv: 'Inventory',
+  work: 'Work', stream: 'Stream', roulette: 'Roulette', slots: 'Slots',
+};
+
+function formatCommandName(cmd) {
+  if (!cmd) return '?';
+  const clean = cmd.replace(/^pls\s+/, '').replace(/\s+\d+.*$/, '').trim().toLowerCase();
+  return CMD_NAMES_CLEAN[clean] || clean.charAt(0).toUpperCase() + clean.slice(1);
+}
+
+function formatCommandResult(cmdName, result, earned, spent) {
+  const name = formatCommandName(cmdName);
+  const net = (earned || 0) - (spent || 0);
+
+  // Extract clean result text
+  let cleanResult = stripAnsi(result || '').replace(/\n/g, ' ').substring(0, 40);
+
+  // Check for common failure/hold patterns
+  if (cleanResult.toLowerCase().includes('hold tight')) return `${name}: ${c.yellow}Hold Tight${c.reset}`;
+  if (cleanResult.toLowerCase().includes('cooldown')) return `${name}: ${c.dim}On Cooldown${c.reset}`;
+  if (cleanResult.toLowerCase().includes('no response')) return `${name}: ${c.red}No Response${c.reset}`;
+
+  // Format with earnings/losses
+  if (net > 0) {
+    return `${name}: ${c.green}+⏣ ${net.toLocaleString()}${c.reset}`;
+  } else if (net < 0) {
+    return `${name}: ${c.red}-⏣ ${Math.abs(net).toLocaleString()}${c.reset}`;
+  } else if (earned === 0 && spent === 0) {
+    // No coins changed - show result context
+    if (cleanResult.includes('completed') || cleanResult.includes('done')) {
+      return `${name}: ${c.dim}Done${c.reset}`;
+    }
+    return `${name}: ${c.dim}${cleanResult || 'Complete'}${c.reset}`;
+  }
+  return `${name}: ${c.dim}${cleanResult || 'Complete'}${c.reset}`;
+}
+
 // ── Coin Parser — prefers Net:/Winnings: fields, falls back to max ⏣ ──
 function parseCoins(text) {
   if (!text) return 0;
@@ -1139,7 +1184,10 @@ class AccountWorker {
             accountId: this.account.id,
             redis,
             onPageProgress: ({ page, total }) => {
-              this.log('info', `Inventory pages: ${page}/${total}`);
+              // Update same line instead of spamming new lines - uses cursor control
+              const progress = `[inv] ${this.username}: ${page}/${total} pages`;
+              const erase = '\x1b[2K\r'; // Clear line + carriage return
+              process.stdout.write(`${erase}${this.color}${progress}${c.reset}`);
             },
           });
 
@@ -1147,6 +1195,8 @@ class AccountWorker {
             throw new Error(`incomplete pages (${result.pagesVisited || 0}/${result.pagesTotal || 0})`);
           }
 
+          // Add newline after inventory progress
+          process.stdout.write('\n');
           this.log('success', `Inventory: ${result.items?.length || 0} items, ⏣ ${(result.totalValue || 0).toLocaleString()} net`);
           try {
             await fetch(`${API_URL}/api/grinder/inventory`, {
@@ -1549,7 +1599,8 @@ class AccountWorker {
 
       const earned = Math.max(0, cmdResult.coins || 0);
       const spent = Math.max(0, cmdResult.lost || 0);
-      if (earned > 0) this.stats.coins += earned;
+      // Track net earnings (add wins, subtract losses)
+      this.stats.coins += (earned - spent);
       if (cmdResult.nextCooldownSec) {
         await this.setCooldown(cmdName, cmdResult.nextCooldownSec);
         this._lastCooldownOverride = cmdResult.nextCooldownSec;
@@ -1596,8 +1647,9 @@ class AccountWorker {
       }
 
       this.stats.successes++;
-      const shortResult = result.substring(0, 30).replace(/\n/g, ' ');
-      this.setStatus(`${cmdName} → ${shortResult}`);
+      // Format result with clean command name and colored earnings
+      const formattedResult = formatCommandResult(cmdName, result, earned, spent);
+      this.setStatus(formattedResult);
       await sendLog(this.username, cmdName, result, 'success');
       reportEarnings(this.account.id, this.username, earned, spent, cmdName);
 
@@ -2346,8 +2398,8 @@ class AccountWorker {
           } catch {}
         }
 
-        // Let Discord gateway settle
-        await new Promise(r => setTimeout(r, 2500));
+        // Let Discord gateway settle (reduced for faster startup)
+        await new Promise(r => setTimeout(r, 500));
         resolve();
       });
 
@@ -2472,43 +2524,58 @@ async function start(apiKey, apiUrl) {
   console.log(`  ${checks.join('   ')}`);
   console.log('');
 
-  // Phase 1: Login all accounts (staggered to avoid 429s)
-  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);
+  // Phase 1: Login all accounts (optimized for speed)
+  const LOGIN_PROGRESS_EVERY = 10;
+  // Reduced delays: 50-150ms between logins (faster startup for 1k+ accounts)
+  const parsedGapMin = Number.parseInt(String(process.env.LOGIN_GAP_MIN_MS || '50'), 10);
+  const parsedGapMax = Number.parseInt(String(process.env.LOGIN_GAP_MAX_MS || '150'), 10);
+  const LOGIN_GAP_MIN_MS = Number.isFinite(parsedGapMin) && parsedGapMin >= 0 ? parsedGapMin : 50;
+  const LOGIN_GAP_MAX_MS = Number.isFinite(parsedGapMax) && parsedGapMax >= LOGIN_GAP_MIN_MS ? parsedGapMax : Math.max(LOGIN_GAP_MIN_MS, 150);
 
   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++) {
+  // Parallel login in batches of 10 to avoid rate limits while being fast
+  const BATCH_SIZE = 10;
+  for (let i = 0; i < accounts.length; i += BATCH_SIZE) {
     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 < accounts.length) {
+    const batch = accounts.slice(i, Math.min(i + BATCH_SIZE, accounts.length));
+
+    // Login batch in parallel
+    await Promise.all(batch.map(async (acc, idx) => {
+      const worker = new AccountWorker(acc, i + idx);
+      workers.push(worker);
+      workerMap.set(acc.id, worker);
+      await worker.start();
+    }));
+
+    // Small gap between batches
+    if (i + BATCH_SIZE < 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}`);
-      }
+      log('info', `${c.dim}Logged in ${Math.min(i + BATCH_SIZE, accounts.length)}/${accounts.length}...${c.reset}`);
       await new Promise(r => setTimeout(r, gapMs));
     }
-    if ((i + 1) % LOGIN_PROGRESS_EVERY === 0) {
-      hintGC();
-    }
+
+    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}`);
   let invDone = 0;
   let invFailed = 0;
-  await Promise.all(workers.map(async (w, i) => {
+
+  // Use sequential inventory checks with single-line progress update
+  const totalAccounts = workers.length;
+  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}`);
+
+    // Update single line instead of spamming new lines
+    const progressLine = `\x1b[2K\r${c.dim}[inv] ${i + 1}/${totalAccounts}: ${label}${c.reset}`;
+    process.stdout.write(progressLine);
+
     try {
       const invRes = await w.checkInventory({
         force: true,
@@ -2521,9 +2588,11 @@ async function start(apiKey, apiUrl) {
     } catch {
       invFailed++;
     }
-    const invComplete = invDone + invFailed;
-    log('info', `${c.dim}[inv-startup-progress] ${invComplete}/${workers.length} complete (${invDone} ok, ${invFailed} failed)${c.reset}`);
-  }));
+  }
+
+  // Newline after progress
+  process.stdout.write('\n');
+  log('success', `${c.dim}Inventory: ${invDone}/${workers.length} complete${invFailed > 0 ? `, ${c.yellow}${invFailed} failed${c.reset}${c.dim}` : ''}${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}`);

package/package.json

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