dankgrinder 6.42.0 → 6.45.0

package/lib/commands/inventory.js

@@ -198,7 +198,7 @@ async function runInventory({ channel, waitForDankMemer, client, accountId, redi
   LOG.cmd(`${c.white}${c.bold}pls inv${c.reset}`);
 
   await channel.send('pls inv');
-  let response = await waitForDankMemer(10000);
+  let response = await waitForDankMemer(15000);
 
   if (!response) {
     LOG.warn('[inv] No response');

package/lib/grinder.js

@@ -2026,16 +2026,6 @@ class AccountWorker {
         return;
       }
 
-      // Died flag from crime/search handler (death detected in the command response)
-      if (cmdResult.died) {
-        this.log('error', `${cmdName} → DIED! Checking lifesaver count...`);
-        // The DM will come separately with the actual death details
-        // For now, be cautious — set a short cooldown and let DM listener handle the rest
-        await this.setCooldown('crime', 300); // 5 min cooldown to check DMs
-        await this.setCooldown('search', 300);
-        return;
-      }
-
       // Premium-only command detection — disable permanently
       if (resultLower.includes('only available on premium') || resultLower.includes('premium') ||
           resultLower.includes('buy the ability to use this command') ||
@@ -2625,6 +2615,18 @@ class AccountWorker {
       return;
     }
 
+    // Startup delay: don't send commands for the first 30s after grindLoop() starts.
+    // This prevents flooding Dank Memer during the Phase 2 inventory check which
+    // sends pls inv for all accounts simultaneously after login.
+    if (this._startupDelayUntil && now < this._startupDelayUntil) {
+      const waitMs = this._startupDelayUntil - now;
+      this.setStatus('warming up...');
+      item.nextRunAt = now + waitMs + 1000;
+      if (this.commandQueue) this.commandQueue.push(item);
+      this.tickTimeout = setTimeout(() => this.tick(), waitMs + 1000);
+      return;
+    }
+
     this.busy = true;
 
     // ── Run command (with interactive retry) ───────────────────
@@ -2765,6 +2767,11 @@ class AccountWorker {
     this.failStreak = 0;
     this.cycleCount = 0;
     this.lastCommandRun = 0;
+    // Delay first command by 30s to avoid competing with Phase 2 inventory check
+    // which sends pls inv for all accounts simultaneously after login.
+    // Without this, the grind loop floods Dank Memer with commands during the
+    // login surge, triggering rate-limits that cause Phase 2 inventory to fail.
+    this._startupDelayUntil = Date.now() + 30000;
     await this._loadLearnedCooldowns();
     this.commandQueue = await this.buildCommandQueue();
     this.lastHealthCheck = Date.now();
@@ -3165,19 +3172,38 @@ async function start(apiKey, apiUrl) {
   // Init rawLogger Redis (uses same URL — logs all raw gateway data)
   if (REDIS_URL) {
     rawLogger.init(REDIS_URL).catch(() => {});
-    // Listen for DM death events across all accounts
+    // Live DM listener: detect deaths and level-ups in real-time across all accounts
     rawLogger.onDmEvent((event, raw) => {
-      if (event.type === 'death' && event.lifesaversLeft === 0) {
-        const channelId = raw.channel_id;
-        // Find which worker uses this DM channel and disable their crime/search
-        for (const w of workers) {
-          if (w.client?.user?.dmChannel?.id === channelId || w.channel?.id) {
-            w.log?.('error', `DEATH in DMs! 0 lifesavers — disabling crime/search`);
-            w.setCooldown?.('crime', 86400);
-            w.setCooldown?.('search', 86400);
+      const dmChannelId = raw.channel_id;
+
+      // Find which worker owns this DM channel
+      const worker = workers.find(w => w._dmChannelId === dmChannelId);
+      if (!worker) return;
+
+      if (event.type === 'death') {
+        const lsLeft = event.lifesaversLeft;
+
+        if (lsLeft === 0) {
+          // 0 lifesavers — disable crime/search immediately
+          worker.log?.('error', `DEATH in DMs! 0 lifesavers — disabling crime/search`);
+          worker.setCooldown?.('crime', 86400);
+          worker.setCooldown?.('search', 86400);
+          worker._lifesavers = 0;
+          sendWebhook?.('DEATH ALERT (DM)', `**${worker.username}** died! **0 lifesavers!**\nCrime/search auto-disabled.`, 0xef4444);
+        } else if (lsLeft > 0) {
+          // Lifesaver(s) used — update count in real-time
+          worker._lifesavers = lsLeft;
+          worker.log?.('warn', `Lifesaver used! ${lsLeft} remaining.`);
+          if (lsLeft <= 2) {
+            sendWebhook?.('LOW LIFESAVERS', `**${worker.username}** died! Only **${lsLeft}** lifesaver(s) left!`, 0xfbbf24);
           }
         }
-        sendWebhook?.('DEATH ALERT (DM)', `Account died! **0 lifesavers!**\nCrime/search auto-disabled.`, 0xef4444);
+      } else if (event.type === 'levelup') {
+        // Level up — update in-memory level
+        if (event.to > 0) {
+          worker._level = event.to;
+          worker.log?.('info', `Level up! Now level ${event.to}.`);
+        }
       }
     });
     checks.push(`${rgb(52, 211, 153)}✓${c.reset} ${c.white}RawLog${c.reset}`);
@@ -3385,7 +3411,7 @@ async function start(apiKey, apiUrl) {
     const num = `${c.dim}${(i + 1).toString().padStart(iColNum - 1)}${c.reset}`;
     const name = (w.username || w.account.label || '?').substring(0, iColName).padEnd(iColName);
     let invRes;
-    try { invRes = await w.checkInventory({ force: true, requireComplete: true, maxAttempts: 3, silent: true }); }
+    try { invRes = await w.checkInventory({ force: true, requireComplete: true, maxAttempts: 5, silent: true }); }
     catch { invRes = { ok: false }; }
     invPending--;
     const items = invRes?.ok ? (invRes.result?.items?.length || 0) : 0;

package/package.json

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