dankgrinder 8.94.0 → 8.96.0

package/lib/grinder.js

@@ -671,6 +671,8 @@ class AccountWorker {
     this._levelQuestQueue = [];
     this._levelQuestDone = new Set();
     this._questBetOverride = null;
+    this._commandRunning = false;  // prevents grinding commands from overlapping with quest commands
+    this._verifyLevelUnlock = null; // holds level to verify after quest completion
     this.commandQueue = null;
     this.lastHealthCheck = Date.now();
     this.doneToday = new Map();
@@ -1729,8 +1731,11 @@ class AccountWorker {
       // Detect level-locked command → start quest mode
       if (cmdResult.levelLocked) {
         const targetLv = cmdResult.levelLocked;
+        this.log('warn', `Command /${cmdName} is LOCKED at Level ${targetLv} — starting quest unlock flow`);
         if (this._startLevelQuests(targetLv)) {
-          this.log('info', `[QUEST] Detected locked command — target Level ${targetLv}`);
+          this.log('info', `[QUEST] Quest mode activated for Level ${targetLv} — grinding will resume after quests complete`);
+        } else {
+          this.log('warn', `[QUEST] Level ${targetLv} quests already done or not defined — grinding continues (may re-trigger)`);
         }
       }
 
@@ -1908,7 +1913,12 @@ class AccountWorker {
     this._levelQuestQueue = quests.map(q => ({ ...q, level: targetLevel }));
     this._levelQuestActive = true;
     this._questBetOverride = null;
+    // Clear commandQueue so no stale grinding commands fire after quests finish
+    this.commandQueue = null;
+    this._commandRunning = false;  // cancel any in-flight grinding command
     this.log('info', `[QUEST] Level ${targetLevel} quests started — grinding PAUSED`);
+    const questList = this._levelQuestQueue.map(q => `"${q.cmd}" x${q.times}`).join(', ');
+    this.log('info', `[QUEST] Quests: ${questList}`);
     return true;
   }
 
@@ -2162,6 +2172,33 @@ class AccountWorker {
 
   // ── Main Non-Blocking Grind Scheduler ───────────────────────
   async tick() {
+    // ── Level-unlock verification: runs after quests complete ──
+    if (this._verifyLevelUnlock) {
+      const targetLv = this._verifyLevelUnlock;
+      this.setStatus(`verifying level ${targetLv}...`);
+      try {
+        const profile = await this.checkProfile(true);
+        const currentLv = profile.level || this._level || 0;
+        if (currentLv >= targetLv) {
+          this.log('success', `[QUEST] Level ${targetLv} verified ✓ — level unlocked!`);
+          this._level = currentLv;
+        } else {
+          this.log('warn', `[QUEST] Level ${targetLv} NOT verified — still at ${currentLv}. Re-triggering quests.`);
+          // Re-trigger quests for this level
+          this._levelQuestDone.delete(targetLv);
+          this._startLevelQuests(targetLv);
+          this.tickTimeout = setTimeout(() => this.tick(), 2000);
+          return;
+        }
+      } catch (e) {
+        this.log('warn', `[QUEST] Level verification failed: ${e.message} — continuing anyway`);
+      }
+      this._verifyLevelUnlock = null;
+      this.setStatus('idle');
+      this.tickTimeout = setTimeout(() => this.tick(), 2000);
+      return;
+    }
+
     // BLOCK: quest mode active — run quests only, no normal grinding
     if (this._levelQuestActive && this._levelQuestQueue.length > 0) {
       const quest = this._levelQuestQueue[0];
@@ -2169,15 +2206,26 @@ class AccountWorker {
       const prefix = this.account.use_slash ? '/' : 'pls';
       this.setStatus(`[L${quest.level}] QUEST ${quest.cmd} (${quest.times}x left)`);
       this.lastStatus = `[L${quest.level}] ${quest.cmd}`;
+      this._commandRunning = true;
+      this.busy = true;  // also set busy so grinding tick path blocks while quest runs
       await this.runCommand(quest.cmd, prefix);
+      this._commandRunning = false;
+      this.busy = false;
       this._questBetOverride = null;
       quest.times--;
       if (quest.times <= 0) this._levelQuestQueue.shift();
       if (this._levelQuestQueue.length === 0) {
         this._levelQuestActive = false;
         this._levelQuestDone.add(quest.level);
-        this.log('success', `[QUEST] Level ${quest.level} quests DONE — resuming grinding`);
-        this.setStatus('idle');
+        const justCompletedLevel = quest.level;
+        this.log('success', `[QUEST] Level ${justCompletedLevel} quests DONE — verifying unlock...`);
+        // Null out commandQueue so buildCommandQueue picks only unlocked commands
+        this.commandQueue = null;
+        this.setStatus('verifying level...');
+        // Wait a moment for Dank Memer to process the unlock, then verify level
+        this._verifyLevelUnlock = justCompletedLevel;
+        this.tickTimeout = setTimeout(() => this.tick(), 3000);
+        return;
       }
       this.tickTimeout = setTimeout(() => this.tick(), 2500);
       return;
@@ -2198,6 +2246,11 @@ class AccountWorker {
       this.tickTimeout = setTimeout(() => this.tick(), 2000);
       return;
     }
+    // Block grinding if a quest command is currently running (race condition guard)
+    if (this._commandRunning) {
+      this.tickTimeout = setTimeout(() => this.tick(), 1500);
+      return;
+    }
 
     const now = Date.now();
 

package/lib/rawLogger.js

@@ -528,14 +528,42 @@ function attachDmLogger(client, opts = {}) {
     if (targetAuthorId && d.author?.id !== targetAuthorId) return;
 
     const content = d.content || '';
+    // Also extract individual embed field values for richer level-up detection
+    const embedFieldsText = (d.embeds || []).map(e => {
+      const fields = (e.fields || []).map(f => `${f.name || ''} ${f.value || ''}`).join('\n');
+      return `${e.title || ''} ${e.description || ''} ${e.footer?.text || ''} ${e.author?.name || ''} ${fields}`;
+    }).join('\n');
     const embedText = extractEmbedText(d.embeds).toLowerCase();
-    const allText = (content + '\n' + embedText).toLowerCase();
+    const allText = (content + '\n' + embedFieldsText + '\n' + embedText).toLowerCase();
 
     // Detect event type
     let dmEvent = null;
-    if (allText.includes('leveled up') || allText.includes('level up')) {
-      const m = allText.match(/level\s+(\d+)\s+to\s+(\d+)/i);
-      dmEvent = { type: 'levelup', from: m ? parseInt(m[1]) : 0, to: m ? parseInt(m[2]) : 0 };
+    if (allText.includes('leveled up') || allText.includes('level up') || allText.includes('to level')) {
+      // Try multiple level-up patterns (Dank Memer varies the message format):
+      //   "You leveled up from level X to Y"
+      //   "You leveled up! You're now level Y"
+      //   "You are now level Y"
+      //   "You advanced to level Y"
+      //   "Congratulations! Level Y"
+      let fromLv = 0, toLv = 0;
+      const m1 = allText.match(/level\s+(\d+)\s+to\s+level?\s*(\d+)/i);
+      const m2 = allText.match(/leveled?\s*up[!\s]+(?:.*?)?(?:to\s+)?(?:level\s+)?(\d+)/i);
+      const m3 = allText.match(/(?:you(?:'re| are) now|now at|advanced? to|reached|congratulations.*?level)\s+(?:level\s+)?(\d+)/i);
+      const m4 = allText.match(/(?:now\s+)?(?:at\s+)?level\s*(\d+)/i);
+      const m5 = allText.match(/to level\s*(\d+)/i);
+
+      if (m1) { fromLv = parseInt(m1[1]); toLv = parseInt(m1[2]); }
+      else if (m2) { toLv = parseInt(m2[1]); }
+      else if (m3) { toLv = parseInt(m3[1]); }
+      else if (m4) { toLv = parseInt(m4[1]); }
+      else if (m5) { toLv = parseInt(m5[1]); }
+
+      if (toLv > 0) {
+        dmEvent = { type: 'levelup', from: fromLv, to: toLv };
+      } else if ((allText.includes('leveled up') || allText.includes('level up')) && verboseMode) {
+        // Level-up keyword found but no number matched — log for debugging
+        console.log(`  [DM LEVELUP] detected keyword but no number matched in: "${allText.substring(0, 200)}"`);
+      }
     } else if (allText.includes('lifesaver protected') || allText.includes('you died')) {
       // Parse lifesaver count from button labels: "You have 0 Life Saver left"
       let lsLeft = -1;

package/package.json

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