dankgrinder 6.1.0 → 6.3.0

package/lib/grinder.js

@@ -2400,22 +2400,37 @@ class AccountWorker {
     if (!this.account.discord_token) { this.log('error', 'No token'); return; }
     if (!this.account.channel_id) { this.log('error', 'No channel'); return; }
 
+    const LOGIN_TIMEOUT_MS = 30_000; // 30s max per account login
+
     return new Promise((resolve) => {
+      let resolved = false;
+      const done = () => { if (!resolved) { resolved = true; resolve(); } };
+
+      // Timeout guard — don't let a single account hang the batch
+      const timeoutId = setTimeout(() => {
+        if (!resolved) {
+          this.log('warn', 'Login timed out after 30s — will retry in background');
+          done();
+          // Retry login in background after timeout
+          this._retryLoginBackground();
+        }
+      }, LOGIN_TIMEOUT_MS);
+
       this.client.on('ready', async () => {
+        clearTimeout(timeoutId);
         this.username = this.client.user.tag || this.username;
         this.avatarUrl = this.client.user.displayAvatarURL?.({ format: 'png', dynamic: true, size: 128 }) || null;
-        try {
-          await fetch(`${API_URL}/api/grinder/status`, {
-            method: 'POST',
-            headers: { Authorization: `Bearer ${API_KEY}`, 'Content-Type': 'application/json' },
-            body: JSON.stringify({ account_id: this.account.id, discord_username: this.username, avatar_url: this.avatarUrl }),
-          });
-        } catch { /* silent */ }
+        // Report status non-blocking
+        fetch(`${API_URL}/api/grinder/status`, {
+          method: 'POST',
+          headers: { Authorization: `Bearer ${API_KEY}`, 'Content-Type': 'application/json' },
+          body: JSON.stringify({ account_id: this.account.id, discord_username: this.username, avatar_url: this.avatarUrl }),
+        }).catch(() => {});
 
         this.channel = await this.client.channels.fetch(this.account.channel_id).catch(() => null);
         if (!this.channel) {
           this.log('error', `Channel not found`);
-          resolve(); return;
+          done(); return;
         }
 
         const enabledCmds = [
@@ -2438,49 +2453,108 @@ class AccountWorker {
         this.log('success', `#${chName} · ${enabledCmds.length} cmds`);
         this.setStatus('starting...');
 
-        // Load daily/weekly/monthly done state from Redis
-        if (redis) {
-          for (const cmd of ['daily', 'weekly', 'monthly', 'drops']) {
-            try {
-              const val = await redis.get(`dkg:done:${this.account.id}:${cmd}`);
-              if (val) {
-                const ttlSec = await redis.ttl(`dkg:done:${this.account.id}:${cmd}`);
-                if (ttlSec > 0) {
-                  this.doneToday.set(cmd, Date.now() + ttlSec * 1000);
-                  this.log('info', `${cmd} already claimed (${Math.round(ttlSec / 3600)}h remaining)`);
-                }
-              }
-            } catch {}
+        // Load daily/weekly/monthly done state from Redis (non-blocking for login speed)
+        this._loadRedisState().catch(() => {});
+
+        // Reduced settle time — 200ms is enough for most gateways
+        await new Promise(r => setTimeout(r, 200));
+        done();
+      });
+
+      // Handle login errors so they don't hang
+      this.client.on('error', (err) => {
+        if (!resolved) {
+          clearTimeout(timeoutId);
+          const msg = (err?.message || '').toLowerCase();
+          if (msg.includes('token_invalid') || msg.includes('invalid token') || msg.includes('401')) {
+            this.log('error', `✗ TOKEN INVALID — this token is no longer valid`);
+            this.paused = true;
+            this._tokenInvalid = true;
+          } else {
+            this.log('error', `Login error: ${err?.message || err}`);
           }
-          // Load cached balance from Redis
-          try {
-            const balData = await redis.get(`dkg:bal:${this.account.id}`);
-            if (balData) {
-              const { wallet, bank } = JSON.parse(balData);
-              if (wallet > 0 || bank > 0) {
-                this.stats.balance = wallet;
-                this.stats.bankBalance = bank;
-                await fetch(`${API_URL}/api/grinder/status`, {
-                  method: 'POST',
-                  headers: { Authorization: `Bearer ${API_KEY}`, 'Content-Type': 'application/json' },
-                  body: JSON.stringify({ account_id: this.account.id, balance: wallet, bank_balance: bank, total_balance: wallet + bank }),
-                }).catch(() => {});
-              }
-            }
-          } catch {}
+          done();
         }
-
-        // Let Discord gateway settle (reduced for faster startup)
-        await new Promise(r => setTimeout(r, 500));
-        resolve();
       });
 
       // Attach auto-recovery event listeners before login
       this._attachRecoveryListeners();
-      this.client.login(this.account.discord_token);
+      this.client.login(this.account.discord_token).catch((err) => {
+        clearTimeout(timeoutId);
+        const msg = (err?.message || '').toLowerCase();
+        if (msg.includes('token_invalid') || msg.includes('invalid token') || msg.includes('401') || msg.includes('incorrect login')) {
+          this.log('error', `✗ TOKEN INVALID — check this account's token`);
+          this.paused = true;
+          this._tokenInvalid = true;
+          // Report invalid status to API
+          fetch(`${API_URL}/api/grinder/status`, {
+            method: 'POST',
+            headers: { Authorization: `Bearer ${API_KEY}`, 'Content-Type': 'application/json' },
+            body: JSON.stringify({ account_id: this.account.id, active: false, status: 'token_invalid' }),
+          }).catch(() => {});
+          sendWebhook('Token Invalid', `**${this.account.label || this.account.id}** has an invalid Discord token.`, 0xef4444);
+        } else {
+          this.log('error', `Login failed: ${err?.message || 'unknown error'}`);
+        }
+        done();
+      });
     });
   }
 
+  /** Load Redis cached state in background (non-blocking) */
+  async _loadRedisState() {
+    if (!redis) return;
+    for (const cmd of ['daily', 'weekly', 'monthly', 'drops']) {
+      try {
+        const val = await redis.get(`dkg:done:${this.account.id}:${cmd}`);
+        if (val) {
+          const ttlSec = await redis.ttl(`dkg:done:${this.account.id}:${cmd}`);
+          if (ttlSec > 0) {
+            this.doneToday.set(cmd, Date.now() + ttlSec * 1000);
+            this.log('info', `${cmd} already claimed (${Math.round(ttlSec / 3600)}h remaining)`);
+          }
+        }
+      } catch {}
+    }
+    // Load cached balance from Redis
+    try {
+      const balData = await redis.get(`dkg:bal:${this.account.id}`);
+      if (balData) {
+        const { wallet, bank } = JSON.parse(balData);
+        if (wallet > 0 || bank > 0) {
+          this.stats.balance = wallet;
+          this.stats.bankBalance = bank;
+          await fetch(`${API_URL}/api/grinder/status`, {
+            method: 'POST',
+            headers: { Authorization: `Bearer ${API_KEY}`, 'Content-Type': 'application/json' },
+            body: JSON.stringify({ account_id: this.account.id, balance: wallet, bank_balance: bank, total_balance: wallet + bank }),
+          }).catch(() => {});
+        }
+      }
+    } catch {}
+  }
+
+  /** Retry login in background after a timeout */
+  async _retryLoginBackground() {
+    await new Promise(r => setTimeout(r, 5000));
+    if (this.client && !this.running) {
+      this.log('info', 'Retrying login in background...');
+      try {
+        this.client.destroy();
+        this.client = createLeanClient();
+        this._attachRecoveryListeners();
+        await this.client.login(this.account.discord_token);
+        this.channel = await this.client.channels.fetch(this.account.channel_id).catch(() => null);
+        if (this.channel) {
+          this.username = this.client.user?.tag || this.username;
+          this.log('success', `Background login OK`);
+        }
+      } catch (err) {
+        this.log('error', `Background login failed: ${err?.message || err}`);
+      }
+    }
+  }
+
   stop() {
     this.running = false;
     this.paused = false;
@@ -2610,13 +2684,19 @@ async function start(apiKey, apiUrl) {
   };
 
   // Parallel login in batches of 10 to avoid rate limits while being fast
+  // Within each batch, stagger logins by 100-600ms to avoid gateway flood
   const BATCH_SIZE = 10;
   for (let i = 0; i < accounts.length; i += BATCH_SIZE) {
     if (shutdownCalled) break;
     const batch = accounts.slice(i, Math.min(i + BATCH_SIZE, accounts.length));
 
-    // Login batch in parallel
+    // Staggered parallel login: fire each login with a small jitter delay
     await Promise.all(batch.map(async (acc, idx) => {
+      // Stagger within batch: 0ms for first, 100-600ms for subsequent
+      if (idx > 0) {
+        const jitter = 100 + Math.floor(Math.random() * 500);
+        await new Promise(r => setTimeout(r, jitter));
+      }
       const worker = new AccountWorker(acc, i + idx);
       workers.push(worker);
       workerMap.set(acc.id, worker);
@@ -2633,15 +2713,33 @@ async function start(apiKey, apiUrl) {
     hintGC();
   }
 
-  // Phase 2: Run inventory on ALL accounts in parallel (must complete before grinding)
-  log('info', `${c.dim}Checking inventory for ${workers.length} accounts...${c.reset}`);
+  // Login summary: show invalid tokens clearly
+  const invalidWorkers = workers.filter(w => w._tokenInvalid);
+  const timedOutWorkers = workers.filter(w => !w.channel && !w._tokenInvalid);
+  if (invalidWorkers.length > 0) {
+    console.log('');
+    log('warn', `${rgb(239, 68, 68)}${invalidWorkers.length} account(s) have INVALID tokens:${c.reset}`);
+    for (const w of invalidWorkers) {
+      log('error', `  ✗ ${w.account.label || w.account.id} — token is invalid or expired`);
+    }
+    console.log('');
+  }
+  if (timedOutWorkers.length > 0) {
+    log('warn', `${timedOutWorkers.length} account(s) timed out during login (will retry in background)`);
+  }
+
+  // Filter out workers with invalid tokens from grinding
+  const activeWorkers = workers.filter(w => !w._tokenInvalid);
+
+  // Phase 2: Run inventory on ALL valid accounts in parallel (must complete before grinding)
+  log('info', `${c.dim}Checking inventory for ${activeWorkers.length} accounts...${c.reset}`);
 
   // Parallel inventory checks with single-line progress
   let invDone = 0;
   let invFailed = 0;
-  const total = workers.length;
+  const total = activeWorkers.length;
 
-  await Promise.all(workers.map(async (w, i) => {
+  await Promise.all(activeWorkers.map(async (w, i) => {
     try {
       const invRes = await w.checkInventory({
         force: true,
@@ -2660,15 +2758,15 @@ async function start(apiKey, apiUrl) {
   log('success', `Inventory: ${invDone}/${total} done${invFailed > 0 ? `, ${c.yellow}${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}`);
+    log('error', `${c.red}Inventory phase incomplete: ${invDone}/${activeWorkers.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}`);
+  log('success', `${c.dim}Inventory phase complete: ${invSummaryColor}${invDone}/${activeWorkers.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) {
+  // Phase 3: Start all grind loops (only for valid workers)
+  for (const w of activeWorkers) {
     if (!shutdownCalled) w.grindLoop();
   }
 

package/package.json

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