dankgrinder 6.37.0 → 6.42.0

package/lib/rawLogger.js

@@ -151,24 +151,26 @@ function detectCommand(d) {
   // Non-gambling CV2
   if (cv2Text.includes('fishing') || cv2Text.includes('fisherfolk')) return 'fish';
   if (cv2Text.includes('deposit') || cv2Text.includes('bank account')) return 'deposit';
-  if (cv2Text.includes('begging') || cv2Text.includes('imagine begging')) return 'beg';
-  if (cv2Text.includes('hunting') || cv2Text.includes('went hunting') || cv2Text.includes('hunting rifle') || cv2Text.includes('your aim was so bad') || cv2Text.includes('animals laughed') || cv2Text.includes('animals attacked') || cv2Text.includes('barely escaped') || cv2Text.includes('fell asleep in a tree') || cv2Text.includes('caught nothing') || cv2Text.includes('brought back literally nothing') || cv2Text.includes('rifle broke')) return 'hunt';
-  if (cv2Text.includes('digging') || cv2Text.includes('found nothing while') || cv2Text.includes('you dig') || cv2Text.includes('dug in the dirt') || cv2Text.includes('brought back') && (cv2Text.includes('ant') || cv2Text.includes('worm') || cv2Text.includes('stickbug') || cv2Text.includes('ladybug'))) return 'dig';
+  if (cv2Text.includes('begging') || cv2Text.includes('imagine begging') || cv2Text.includes('wumpus gives you') || (cv2Text.includes('you received') && !cv2Text.includes('search') && !cv2Text.includes('hunt') && !cv2Text.includes('dig'))) return 'beg';
+  if (cv2Text.includes('hunting') || cv2Text.includes('went hunting') || cv2Text.includes('hunting rifle') || cv2Text.includes('your aim was so bad') || cv2Text.includes('animals laughed') || cv2Text.includes('animals attacked') || cv2Text.includes('barely escaped') || cv2Text.includes('fell asleep in a tree') || cv2Text.includes('caught nothing') || cv2Text.includes('brought back literally nothing') || cv2Text.includes('rifle broke') || (cv2Text.includes('brought back') && (cv2Text.includes('deer') || cv2Text.includes('wolf') || cv2Text.includes('bear') || cv2Text.includes('boar') || cv2Text.includes('lion') || cv2Text.includes('rabbit') || cv2Text.includes('squirrel') || cv2Text.includes('moose') || cv2Text.includes('bird') || cv2Text.includes('elk') || cv2Text.includes('hunting') || cv2Text.includes('capybara')))) return 'hunt';
+  if (cv2Text.includes('digging') || cv2Text.includes('found nothing while') || cv2Text.includes('you dig') || cv2Text.includes('dug in the dirt') || (cv2Text.includes('brought back') && (cv2Text.includes('ant') || cv2Text.includes('worm') || cv2Text.includes('stickbug') || cv2Text.includes('ladybug')))) return 'dig';
   if (cv2Text.includes('great work') || cv2Text.includes('for your shift') || cv2Text.includes('working as') || cv2Text.includes('work shift') || cv2Text.includes('what color was') || cv2Text.includes('remember words order') || cv2Text.includes('remember the colors') || cv2Text.includes('remember the emojis') || cv2Text.includes('what word was repeated') || cv2Text.includes('unscramble') || cv2Text.includes('remember the number') || cv2Text.includes('click the buttons in correct order') || cv2Text.includes('babysitter') || cv2Text.includes('click the matching')) return 'work';
+  // Quest completions (before generic daily/weekly)
+  if (cv2Text.includes('locations') && (cv2Text.includes('inventory locations') || cv2Text.includes('found locations') || cv2Text.includes('completed your') || cv2Text.includes('locations remaining'))) return 'search';
   if (cv2Text.includes('weekly')) return 'weekly';
   if (cv2Text.includes('daily')) return 'daily';
-  if (cv2Text.includes('inventory')) return 'inventory';
+  // Only match inventory if it looks like an actual inventory display (header format or sellable indicator)
+  if (cv2Text.includes('inventory') && (cv2Text.includes('###') || cv2Text.includes('sellable') || cv2Text.includes('<:reply:'))) return 'inventory';
   if (cv2Text.includes('profile') || cv2Text.includes('level:')) return 'profile';
   if (cv2Text.includes('balances') && cv2Text.includes('global rank')) return 'balance';
 
   // Check content text (plain message content)
   const contentText = (d.content || '').toLowerCase();
   if (contentText.includes('balances') && contentText.includes('global rank')) return 'balance';
-  if (contentText.includes('your aim was so bad') || contentText.includes('animals laughed')) return 'hunt';
-  if (contentText.includes('imagine going into the woods')) return 'hunt';
+  if (contentText.includes('your aim was so bad') || contentText.includes('animals laughed') || contentText.includes('imagine going into the woods')) return 'hunt';
   if (contentText.includes('you ran an ad for') && contentText.includes('received')) return 'stream';
   if (contentText.includes('you can\'t interact with your stream')) return 'stream';
-  if (contentText.includes('you dug in the dirt') || contentText.includes('found nothing while digging')) return 'dig';
+  if (contentText.includes('you dug in the dirt') || (contentText.includes('found nothing while digging') && (contentText.includes('dug') || contentText.includes('dirt')))) return 'dig';
 
   // Check embed text
   const embedText = extractEmbedText(d.embeds).toLowerCase();
@@ -197,8 +199,8 @@ function detectCommand(d) {
     return 'search';
   }
   // Hunt / dig
-  if (embedText.includes('hunting') || embedText.includes('came back with') || embedText.includes('hunting rifle') || embedText.includes('dragon\'s fireball') || embedText.includes('dodge the') || embedText.includes('went hunting') || embedText.includes('your aim was so bad') || embedText.includes('animals laughed') || embedText.includes('animals attacked') || embedText.includes('barely escaped') || embedText.includes('fell asleep in a tree') || embedText.includes('caught nothing') || embedText.includes('brought back literally nothing') || embedText.includes('rifle broke') || embedText.includes('imagine going into the woods')) return 'hunt';
-  if (embedText.includes('digging') || embedText.includes('you dig') || embedText.includes('dug in the dirt') || embedText.includes('found nothing while') || embedText.includes('what are the odds lol') || embedText.includes('brought back') && (embedText.includes('ant') || embedText.includes('worm') || embedText.includes('stickbug') || embedText.includes('ladybug'))) return 'dig';
+  if (embedText.includes('hunting') || embedText.includes('came back with') || embedText.includes('hunting rifle') || embedText.includes('dragon\'s fireball') || embedText.includes('dodge the') || embedText.includes('went hunting') || embedText.includes('your aim was so bad') || embedText.includes('animals laughed') || embedText.includes('animals attacked') || embedText.includes('barely escaped') || embedText.includes('fell asleep in a tree') || embedText.includes('caught nothing') || embedText.includes('brought back literally nothing') || embedText.includes('rifle broke') || embedText.includes('imagine going into the woods') || (embedText.includes('brought back') && (embedText.includes('deer') || embedText.includes('wolf') || embedText.includes('bear') || embedText.includes('boar') || embedText.includes('lion') || embedText.includes('rabbit') || embedText.includes('squirrel') || embedText.includes('moose') || embedText.includes('bird') || embedText.includes('elk') || embedText.includes('capybara')))) return 'hunt';
+  if (embedText.includes('digging') || embedText.includes('you dig') || embedText.includes('dug in the dirt') || embedText.includes('found nothing while') || embedText.includes('what are the odds lol') || (embedText.includes('brought back') && (embedText.includes('ant') || embedText.includes('worm') || embedText.includes('stickbug') || embedText.includes('ladybug')))) return 'dig';
   // Work — match both minigame prompt AND completion
   if (embedText.includes('work') && (embedText.includes('shift') || embedText.includes('mini-game') || embedText.includes('color') || embedText.includes('what color') || embedText.includes('babysitter') || embedText.includes('great work') || embedText.includes('for your shift'))) return 'work';
   if (embedText.includes('you were given') && embedText.includes('shift')) return 'work';
@@ -207,7 +209,7 @@ function detectCommand(d) {
   // Postmemes
   if (embedText.includes('pick a meme') || embedText.includes('meme posting')) return 'postmemes';
   // Stream
-  if (embedText.includes('stream manager') || embedText.includes('go live') || embedText.includes('what game do you want to stream') || embedText.includes('you ran an ad for') || embedText.includes('you received') && embedText.includes('from your sponsors') || embedText.includes('### chat') && embedText.includes('hasanbabi')) return 'stream';
+  if (embedText.includes('stream manager') || embedText.includes('go live') || embedText.includes('what game do you want to stream') || embedText.includes('you ran an ad for') || (embedText.includes('you received') && embedText.includes('from your sponsors')) || (embedText.includes('### chat') && embedText.includes('hasanbabi'))) return 'stream';
   if (embedText.includes('you can\'t interact with your stream') || embedText.includes('stream can last')) return 'stream';
   // Deposit
   if (embedText.includes('deposited') && embedText.includes('bank balance')) return 'deposit';
@@ -228,7 +230,7 @@ function detectCommand(d) {
   // Farm
   if (embedText.includes('farm') && (embedText.includes('harvest') || embedText.includes('plant') || embedText.includes('hoe') || embedText.includes('water'))) return 'farm';
   // Beg
-  if (embedText.includes('begging')) return 'beg';
+  if (embedText.includes('begging') || embedText.includes('wumpus gives you') || embedText.includes('life saver') || embedText.includes('lifesaver')) return 'beg';
   // Daily/weekly quest
   if (embedText.includes('daily quest')) return 'daily';
   // Fish

package/lib/structures.js

@@ -443,6 +443,25 @@ class MinHeap {
 
   peek() { return this.heap[0]; }
 
+  /**
+   * Remove a specific node from the heap by reference.
+   * Used by CommandScheduler.unschedule() to cancel a pending scheduled command.
+   * O(n) — linear scan since we store node references in a Map.
+   */
+  remove(node) {
+    const idx = this.heap.indexOf(node);
+    if (idx === -1) return false;
+    const last = this.heap.pop();
+    if (idx < this.heap.length) {
+      this.heap[idx] = last;
+      // Bubble up or sink down depending on where the removed item was
+      if (this._bubbleUp(idx) === idx) {
+        this._sinkDown(idx);
+      }
+    }
+    return true;
+  }
+
   _bubbleUp(i) {
     while (i > 0) {
       const parent = (i - 1) >>> 1;
@@ -680,31 +699,6 @@ class AsyncBatchQueue {
   destroy() { if (this._timer) clearTimeout(this._timer); this.queue.length = 0; }
 }
 
-// ═══════════════════════════════════════════════════════════════
-// JitterBackoff – Decorrelated jitter (AWS-style), O(1)
-// Standard exponential backoff causes "thundering herd" when 10K
-// accounts retry simultaneously. Decorrelated jitter spreads them:
-//   sleep = min(cap, random_between(base, sleep_prev * 3))
-// This is the recommended strategy from AWS Architecture Blog.
-// ═══════════════════════════════════════════════════════════════
-class JitterBackoff {
-  constructor(baseMs = 1000, capMs = 30000) {
-    this.baseMs = baseMs;
-    this.capMs = capMs;
-    this._sleep = baseMs;
-    this.attempt = 0;
-  }
-
-  next() {
-    this._sleep = Math.min(this.capMs, this.baseMs + Math.random() * (this._sleep * 3 - this.baseMs));
-    this.attempt++;
-    return this._sleep;
-  }
-
-  reset() { this._sleep = this.baseMs; this.attempt = 0; }
-  get current() { return this._sleep; }
-}
-
 module.exports = {
   BloomFilter,
   LRUCache,
@@ -721,5 +715,4 @@ module.exports = {
   ObjectPool,
   TimerWheel,
   AsyncBatchQueue,
-  JitterBackoff,
 };

package/package.json

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

package/lib/commands/scratch.js

@@ -1,83 +0,0 @@
-/**
- * Scratch command handler.
- * Send "pls scratch", click through scratch card buttons.
- * Requires level 25 — checks profile level before running.
- */
-
-const {
-  LOG, c, getFullText, parseCoins, getAllButtons, safeClickButton,
-  logMsg, isHoldTight, getHoldTightReason, sleep, humanDelay,
-} = require('./utils');
-const { meetsLevelRequirement } = require('./profile');
-
-/**
- * @param {object} opts
- * @param {object} opts.channel
- * @param {function} opts.waitForDankMemer
- * @param {string} [opts.accountId]
- * @param {object} [opts.redis]
- * @returns {Promise<{result: string, coins: number}>}
- */
-async function runScratch({ channel, waitForDankMemer, accountId, redis }) {
-  // Check level 25 requirement before wasting a command
-  const canRun = await meetsLevelRequirement({ channel, waitForDankMemer, accountId, redis }, 25);
-  if (!canRun) {
-    LOG.warn(`[scratch] Skipped — need level 25`);
-    return { result: 'skipped (need level 25)', coins: 0, skipReason: 'level' };
-  }
-  LOG.cmd(`${c.white}${c.bold}pls scratch${c.reset}`);
-
-  await channel.send('pls scratch');
-  const response = await waitForDankMemer(10000);
-
-  if (!response) {
-    LOG.warn('[scratch] No response');
-    return { result: 'no response', coins: 0 };
-  }
-
-  if (isHoldTight(response)) {
-    const reason = getHoldTightReason(response);
-    LOG.warn(`[scratch] Hold Tight${reason ? ` (reason: /${reason})` : ''} — waiting 30s`);
-    await sleep(30000);
-    return { result: `hold tight (${reason || 'unknown'})`, coins: 0, holdTightReason: reason };
-  }
-
-  logMsg(response, 'scratch');
-  const buttons = getAllButtons(response);
-
-  if (buttons.length === 0) {
-    const text = getFullText(response);
-    const coins = parseCoins(text);
-    if (coins > 0) {
-      LOG.coin(`[scratch] ${c.green}+⏣ ${coins.toLocaleString()}${c.reset}`);
-      return { result: `scratch → +⏣ ${coins.toLocaleString()}`, coins };
-    }
-    return { result: text.substring(0, 60) || 'done', coins: 0 };
-  }
-
-  // Click through all scratch card cells
-  let lastResponse = response;
-  let clickCount = 0;
-  for (let i = 0; i < Math.min(buttons.length, 9); i++) {
-    const btn = buttons[i];
-    if (btn && !btn.disabled) {
-      await humanDelay(300, 700);
-      try {
-        const followUp = await safeClickButton(lastResponse, btn);
-        if (followUp) { lastResponse = followUp; clickCount++; }
-      } catch { break; }
-    }
-  }
-
-  const finalText = getFullText(lastResponse);
-  const coins = parseCoins(finalText);
-
-  if (coins > 0) {
-    LOG.coin(`[scratch] ${clickCount} clicks → ${c.green}+⏣ ${coins.toLocaleString()}${c.reset}`);
-    return { result: `scratch (${clickCount} clicks) → +⏣ ${coins.toLocaleString()}`, coins };
-  }
-
-  return { result: `scratch done (${clickCount} clicks)`, coins: 0 };
-}
-
-module.exports = { runScratch };