dankgrinder 8.103.0 → 8.107.0

package/lib/grinder.js

@@ -670,6 +670,7 @@ class AccountWorker {
     this._levelQuestActive = false;
     this._levelQuestQueue = [];
     this._levelQuestDone = new Set();
+  this._levelQuestProgressCache = new Map();
     this._questBetOverride = null;
   this._lastCommandMeta = null;
     this._commandRunning = false;  // prevents grinding commands from overlapping with quest commands
@@ -1558,6 +1559,11 @@ class AccountWorker {
         if (lvMatch) {
           const targetLv = parseInt(lvMatch[1]);
           cmdResult.levelLocked = targetLv;
+          const progress = this._parseLevelQuestProgress(targetLv, allDetectionText);
+          if (progress) {
+            cmdResult.levelQuestProgress = progress;
+            this._mergeLevelQuestProgress(targetLv, progress);
+          }
           this.log('warn', `Command /${cmdName} requires Level ${targetLv} quests`);
         }
       }
@@ -1746,10 +1752,10 @@ class AccountWorker {
         this._lastCommandMeta.nonPlay = true;
         this._lastCommandMeta.levelLocked = targetLv;
         this.log('warn', `Command /${cmdName} is LOCKED at Level ${targetLv} — starting quest unlock flow`);
-        if (this._startLevelQuests(targetLv)) {
+        if (this._startLevelQuests(targetLv, cmdResult.levelQuestProgress || null)) {
           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)`);
+          this.log('warn', `[QUEST] Level ${targetLv} quests already done or not defined — waiting for verification`);
         }
         // Don't count as success — skip normal post-command processing
         return;
@@ -1924,11 +1930,56 @@ class AccountWorker {
     ],
   };
 
-  _startLevelQuests(targetLevel) {
+  _parseLevelQuestProgress(targetLevel, rawText) {
+    if (targetLevel !== 5) return null;
+    const text = String(rawText || '');
+    const out = {};
+    const re = /(\d[\d,]*)\s*\/\s*50,000[\s\S]{0,180}?<\/(slots|cointoss|snakeeyes):/gi;
+    let m;
+    while ((m = re.exec(text)) !== null) {
+      const cur = parseInt(String(m[1] || '').replace(/,/g, ''), 10);
+      const cmd = String(m[2] || '').toLowerCase();
+      if (Number.isFinite(cur) && cmd) out[cmd] = Math.max(0, cur);
+    }
+    return Object.keys(out).length > 0 ? out : null;
+  }
+
+  _mergeLevelQuestProgress(targetLevel, progressHint) {
+    if (!progressHint || targetLevel !== 5) return;
+    const prev = this._levelQuestProgressCache.get(targetLevel) || {};
+    const merged = { ...prev };
+    for (const [cmd, val] of Object.entries(progressHint)) {
+      const n = Number(val);
+      if (!Number.isFinite(n) || n < 0) continue;
+      merged[cmd] = Math.max(merged[cmd] || 0, n);
+    }
+    this._levelQuestProgressCache.set(targetLevel, merged);
+  }
+
+  _startLevelQuests(targetLevel, progressHint = null) {
     if (this._levelQuestDone.has(targetLevel)) return false;
     const quests = AccountWorker.LEVEL_QUESTS[targetLevel];
     if (!quests || quests.length === 0) return false;
-    this._levelQuestQueue = quests.map(q => ({ ...q, level: targetLevel, _lostSoFar: 0 }));
+
+    this._mergeLevelQuestProgress(targetLevel, progressHint);
+    const cached = this._levelQuestProgressCache.get(targetLevel) || {};
+    const seededQueue = quests
+      .map(q => {
+        const target = Number(q.loseTarget || 0);
+        const seeded = target > 0 ? Math.min(target, Math.max(0, Number(cached[q.cmd] || 0))) : 0;
+        return { ...q, level: targetLevel, _lostSoFar: seeded };
+      })
+      .filter(q => !(q.loseTarget && q._lostSoFar >= q.loseTarget));
+
+    if (seededQueue.length === 0) {
+      this.log('info', `[QUEST] Level ${targetLevel} tasks already complete from progress cache — verifying unlock`);
+      this._verifyLevelUnlock = targetLevel;
+      this.setStatus('verifying level...');
+      this.commandQueue = null;
+      return false;
+    }
+
+    this._levelQuestQueue = seededQueue;
     this._levelQuestActive = true;
     this._questBetOverride = null;
     // Clear commandQueue so no stale grinding commands fire after quests finish
@@ -1936,7 +1987,10 @@ class AccountWorker {
     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 => {
-      if (q.loseTarget) return `"${q.cmd}" lose ⏣${q.loseTarget.toLocaleString()}`;
+      if (q.loseTarget) {
+        const rem = Math.max(0, q.loseTarget - (q._lostSoFar || 0));
+        return `"${q.cmd}" lose ⏣${rem.toLocaleString()} more`;
+      }
       return `"${q.cmd}" x${q.times}`;
     }).join(', ');
     this.log('info', `[QUEST] Quests: ${questList}`);
@@ -2204,11 +2258,13 @@ class AccountWorker {
         if (currentLv >= targetLv) {
           this.log('success', `[QUEST] Level ${targetLv} verified ✓ — level unlocked!`);
           this._level = currentLv;
+          this._levelQuestProgressCache.delete(targetLv);
         } 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);
+          const cached = this._levelQuestProgressCache.get(targetLv) || null;
+          this._startLevelQuests(targetLv, cached);
           this.tickTimeout = setTimeout(() => this.tick(), 2000);
           return;
         }
@@ -2231,7 +2287,6 @@ class AccountWorker {
       } else {
         this._questBetOverride = quest.bet || null;
       }
-      const questBetUsed = this._questBetOverride;
       const prefix = this.account.use_slash ? '/' : 'pls';
 
       if (quest.loseTarget) {
@@ -2250,7 +2305,7 @@ class AccountWorker {
       this._commandRunning = true;
       this.busy = true;
       await this.runCommand(quest.cmd, prefix);
-    const questMeta = this._lastCommandMeta || {};
+      const questMeta = this._lastCommandMeta || {};
       this._commandRunning = false;
       this.busy = false;
       this._questBetOverride = null;
@@ -2270,13 +2325,9 @@ class AccountWorker {
           quest._minBet = Math.max(quest._minBet || 1, questMeta.newMinBet);
         }
 
-        // Fallback only for actual played rounds where parsed/observed loss was zero.
-        if (!nonPlay && lostThisRound === 0 && (questBetUsed || quest.bet)) {
-          lostThisRound = questBetUsed || quest.bet;
-        }
-
         if (!nonPlay) {
           quest._lostSoFar = (quest._lostSoFar || 0) + lostThisRound;
+          this._mergeLevelQuestProgress(quest.level, { [quest.cmd]: quest._lostSoFar });
         }
 
         this.log('info', `[QUEST] ${quest.cmd} — lost ⏣${quest._lostSoFar.toLocaleString()} / ⏣${quest.loseTarget.toLocaleString()}`);

package/package.json

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