dankgrinder 4.9.3 → 4.9.4

package/lib/commands/generic.js

@@ -7,10 +7,26 @@
 const {
   LOG, c, getFullText, parseCoins, getAllButtons, getAllSelectMenus,
   safeClickButton, logMsg, isHoldTight, getHoldTightReason, sleep, humanDelay, needsItem,
-  isCV2, ensureCV2,
+  isCV2, ensureCV2, stripAnsi,
 } = require('./utils');
 const { buyItem } = require('./shop');
 
+async function waitForEditedMessage(channel, messageId, baselineText, timeoutMs = 12000) {
+  const start = Date.now();
+  while (Date.now() - start < timeoutMs) {
+    await sleep(700);
+    try {
+      if (!channel?.messages?.fetch) continue;
+      const fresh = await channel.messages.fetch(messageId);
+      if (!fresh) continue;
+  if (isCV2(fresh)) await ensureCV2(fresh, true);
+      const next = stripAnsi(getFullText(fresh)).replace(/\s+/g, ' ').trim();
+      if (next && next !== baselineText) return fresh;
+    } catch {}
+  }
+  return null;
+}
+
 /**
  * @param {object} opts
  * @param {object} opts.channel
@@ -41,10 +57,11 @@ async function runGeneric({ channel, waitForDankMemer, cmdString, cmdName, clien
   if (isCV2(response)) await ensureCV2(response);
   logMsg(response, cmdName);
   const text = getFullText(response);
-  const coins = parseCoins(text);
+  const cleanText = stripAnsi(text).replace(/\s+/g, ' ').trim();
+  const coins = parseCoins(cleanText);
 
   // Check if we need an item
-  const missing = needsItem(text);
+  const missing = needsItem(cleanText);
   if (missing) {
     LOG.warn(`[${cmdName}] Missing ${c.bold}${missing}${c.reset} — auto-buying...`);
     const bought = await buyItem({ channel, waitForDankMemer, client, itemName: missing, quantity: 1 });
@@ -55,7 +72,7 @@ async function runGeneric({ channel, waitForDankMemer, cmdString, cmdName, clien
       const r2 = await waitForDankMemer(10000);
       if (r2) {
         logMsg(r2, `${cmdName}-retry`);
-        const t2 = getFullText(r2);
+        const t2 = stripAnsi(getFullText(r2)).replace(/\s+/g, ' ').trim();
         const c2 = parseCoins(t2);
         if (c2 > 0) {
           LOG.coin(`[${cmdName}] ${c.green}+⏣ ${c2.toLocaleString()}${c.reset}`);
@@ -77,25 +94,43 @@ async function runGeneric({ channel, waitForDankMemer, cmdString, cmdName, clien
       await humanDelay();
       try {
         const followUp = await safeClickButton(response, btn);
-        if (followUp) {
-          logMsg(followUp, `${cmdName}-followup`);
-          const fText = getFullText(followUp);
+
+        let postClickMsg = followUp || null;
+        if (!postClickMsg && response.id) {
+          postClickMsg = await waitForEditedMessage(channel, response.id, cleanText, 12000);
+        }
+        if (!postClickMsg) {
+          postClickMsg = await waitForDankMemer(9000);
+        }
+
+        if (postClickMsg) {
+          if (isCV2(postClickMsg)) await ensureCV2(postClickMsg);
+          logMsg(postClickMsg, `${cmdName}-followup`);
+          const fText = stripAnsi(getFullText(postClickMsg)).replace(/\s+/g, ' ').trim();
           const fCoins = parseCoins(fText);
+
           if (fCoins > 0) {
             LOG.coin(`[${cmdName}] ${c.green}+⏣ ${fCoins.toLocaleString()}${c.reset}`);
             return { result: `+⏣ ${fCoins.toLocaleString()}`, coins: fCoins };
           }
+
           // Multi-step: click next button too
-          const nextButtons = getAllButtons(followUp);
+          const nextButtons = getAllButtons(postClickMsg);
           if (nextButtons.length > 0) {
             const nextBtn = nextButtons.find(b => !b.disabled);
             if (nextBtn) {
               await humanDelay();
-              try { await safeClickButton(followUp, nextBtn); } catch {}
+              try { await safeClickButton(postClickMsg, nextBtn); } catch {}
             }
           }
+
+          // For XP-only outputs (like tidy) return concise title text.
+          const firstLine = fText.split(/\s*-#\s*/)[0].trim() || fText;
+          return { result: firstLine.substring(0, 90), coins: 0 };
         }
-      } catch (e) { LOG.error(`[${cmdName}] Click error: ${e.message}`); }
+      } catch (e) {
+        LOG.error(`[${cmdName}] Click error: ${e.message}`);
+      }
     }
   }
 
@@ -108,6 +143,7 @@ async function runGeneric({ channel, waitForDankMemer, cmdString, cmdName, clien
         if (freshMsg) response = freshMsg;
       }
     } catch { /* proceed with original */ }
+
     // Find row index of first select menu
     let menuRowIdx = -1;
     for (let i = 0; i < (response.components || []).length; i++) {
@@ -118,6 +154,7 @@ async function runGeneric({ channel, waitForDankMemer, cmdString, cmdName, clien
       }
       if (menuRowIdx >= 0) break;
     }
+
     const menu = menuRowIdx >= 0 ? response.components?.[menuRowIdx]?.components?.[0] : null;
     const options = menu?.options || [];
     if (options.length > 0 && menuRowIdx >= 0) {
@@ -127,14 +164,16 @@ async function runGeneric({ channel, waitForDankMemer, cmdString, cmdName, clien
         await response.selectMenu(menuRowIdx, [opt.value]);
         const followUp = await waitForDankMemer(8000);
         if (followUp) {
-          const fText = getFullText(followUp);
+          const fText = stripAnsi(getFullText(followUp)).replace(/\s+/g, ' ').trim();
           const fCoins = parseCoins(fText);
           if (fCoins > 0) {
             LOG.coin(`[${cmdName}] ${opt.label} → ${c.green}+⏣ ${fCoins.toLocaleString()}${c.reset}`);
             return { result: `${opt.label} → +⏣ ${fCoins.toLocaleString()}`, coins: fCoins };
           }
         }
-      } catch (e) { LOG.error(`[${cmdName}] Select error: ${e.message}`); }
+      } catch (e) {
+        LOG.error(`[${cmdName}] Select error: ${e.message}`);
+      }
     }
   }
 
@@ -143,7 +182,11 @@ async function runGeneric({ channel, waitForDankMemer, cmdString, cmdName, clien
     return { result: `+⏣ ${coins.toLocaleString()}`, coins };
   }
 
-  return { result: text.substring(0, 60) || 'done', coins: 0 };
+  if (cmdName === 'tidy') {
+    return { result: 'tidy → no coins (xp only)', coins: 0 };
+  }
+
+  return { result: cleanText.substring(0, 90) || 'done', coins: 0 };
 }
 
 /**

package/lib/commands/utils.js

@@ -68,24 +68,49 @@ function getFullText(msg) {
   return text;
 }
 
+function stripAnsi(text) {
+  if (!text) return '';
+  return String(text).replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, '');
+}
+
 function parseCoins(text) {
   if (!text) return 0;
+  const cleanText = stripAnsi(text);
   // Prefer "Net:" if present (accurate earned/lost from Dank Memer)
-  const netMatch = text.match(/Net:\s*\*{0,2}\s*[⏣o]\s*\*{0,2}([+-]?[\d,]+)/i);
+  const netMatch = cleanText.match(/Net:\s*\*{0,2}\s*[⏣o]\s*\*{0,2}([+-]?[\d,]+)/i);
   if (netMatch) {
     const net = parseInt(netMatch[1].replace(/,/g, ''));
     return net > 0 ? net : 0;
   }
-  const winMatch = text.match(/Winnings:\s*\*{0,2}\s*[⏣o]\s*\*{0,2}([\d,]+)/i);
+  const winMatch = cleanText.match(/Winnings:\s*\*{0,2}\s*[⏣o]\s*\*{0,2}([\d,]+)/i);
   if (winMatch) {
     const w = parseInt(winMatch[1].replace(/,/g, ''));
     if (w > 0) return w;
   }
+
+  // Tidy/CV2 reward blocks often use "You received:" with non-⏣ symbols.
+  const receivedMatch = cleanText.match(/you\s+received\s*:\s*[\s\S]{0,80}?([\d,]+)/i);
+  if (receivedMatch) {
+    const r = parseInt(receivedMatch[1].replace(/,/g, ''), 10);
+    if (r > 0) return r;
+  }
+
+  // CV2 pattern: <:Coin:ID> NUMBER
+  const coinEmojiMatches = [...cleanText.matchAll(/<a?:Coin:\d+>\s*([\d,]+)/gi)];
+  if (coinEmojiMatches.length > 0) {
+    let best = 0;
+    for (const m of coinEmojiMatches) {
+      const v = parseInt((m[1] || '0').replace(/,/g, ''), 10) || 0;
+      if (v > best) best = v;
+    }
+    if (best > 0) return best;
+  }
+
   // Prefer "placed in your wallet" pattern (daily, beg, etc.)
-  const walletMatch = text.match(/⏣\s*([\d,]+)\s*was placed/i);
+  const walletMatch = cleanText.match(/⏣\s*([\d,]+)\s*was placed/i);
   if (walletMatch) return parseInt(walletMatch[1].replace(/,/g, ''));
   // Fallback: max ⏣ number
-  const matches = text.match(/⏣\s*([\d,]+)/g);
+  const matches = cleanText.match(/⏣\s*([\d,]+)/g);
   if (!matches) return 0;
   let best = 0;
   for (const m of matches) {
@@ -119,16 +144,19 @@ function parseNetCoins(text) {
  */
 function parseBalance(msg) {
   if (!msg) return 0;
-  const text = getFullText(msg);
+  const text = stripAnsi(getFullText(msg));
 
   // Try standard embed wallet pattern
   const walletMatch = text.match(/wallet[:\s]*[⏣💰]?\s*([\d,]+)/i);
   if (walletMatch) return parseInt(walletMatch[1].replace(/,/g, ''));
 
   // CV2 pattern: <:Coin:ID> NUMBER (first number after Coin emoji = wallet)
-  const coinEmojiMatch = text.match(/<:Coin:\d+>\s*([\d,]+)/);
+  const coinEmojiMatch = text.match(/<a?:Coin:\d+>\s*([\d,]+)/i);
   if (coinEmojiMatch) return parseInt(coinEmojiMatch[1].replace(/,/g, ''));
 
+  const bankEmojiMatch = text.match(/<a?:Bank:\d+>\s*([\d,]+)/i);
+  if (bankEmojiMatch) return parseInt(bankEmojiMatch[1].replace(/,/g, ''));
+
   // Fallback: ⏣ prefixed
   const coins = parseCoins(text);
   if (coins > 0) return coins;
@@ -206,8 +234,12 @@ async function safeClickButton(msg, button) {
     return button.click();
   }
   const id = button.customId || button.custom_id;
-  if (id && typeof msg.clickButton === 'function' && !isCV2(msg)) {
-    return msg.clickButton(id);
+  if (id && typeof msg.clickButton === 'function') {
+    try {
+      return await msg.clickButton(id);
+    } catch {
+      // Fall through to CV2 raw interaction fallback.
+    }
   }
   // CV2 fallback: send interaction via raw HTTP
   if (id) {
@@ -366,19 +398,39 @@ function isCV2(msg) {
   return msg.components?.length > 0 && msg.components.every(c => !c);
 }
 
-async function ensureCV2(msg) {
-  if (!msg || msg._cv2) return msg;
+async function ensureCV2(msg, force = false) {
+  if (!msg) return msg;
+  if (!force && msg._cv2) return msg;
   if (!isCV2(msg)) return msg;
   try {
+    if (force) {
+      delete msg._cv2;
+      delete msg._cv2text;
+      delete msg._cv2buttons;
+    }
     const token = msg.client?.token;
     const chId = msg.channelId || msg.channel?.id;
     if (!token || !chId) return msg;
-    // Use listing endpoint — single-message endpoint is bot-only
-    const msgs = await _httpGet(
-      `https://discord.com/api/v9/channels/${chId}/messages?limit=5&around=${msg.id}`,
-      { Authorization: token }
-    );
-    const raw = Array.isArray(msgs) ? msgs.find(m => m.id === msg.id) : null;
+    // Try single-message endpoint first (usually freshest for edited CV2 messages).
+    let raw = null;
+    try {
+      raw = await _httpGet(
+        `https://discord.com/api/v9/channels/${chId}/messages/${msg.id}`,
+        { Authorization: token }
+      );
+    } catch {
+      raw = null;
+    }
+
+    // Fallback to listing endpoint when single fetch is unavailable.
+    if (!raw || !raw.components) {
+      const msgs = await _httpGet(
+        `https://discord.com/api/v9/channels/${chId}/messages?limit=5&around=${msg.id}`,
+        { Authorization: token }
+      );
+      raw = Array.isArray(msgs) ? msgs.find(m => m.id === msg.id) : null;
+    }
+
     if (raw?.components) {
       msg._cv2 = raw.components;
       msg._cv2text = _extractCV2Text(raw.components).trim();
@@ -393,15 +445,20 @@ async function clickCV2Button(msg, customId) {
   const chId = msg.channelId || msg.channel?.id;
   const gId = msg.guildId || msg.guild?.id;
   if (!token) throw new Error('No token for CV2 click');
-  const sessionId = msg.client.ws?.shards?.first()?.sessionId || 'unknown';
+  const sessionId = msg.client?.ws?.shards?.first?.()?.sessionId;
   const nonce = `${BigInt(Date.now() - 1420070400000) << 22n}`;
-  const payload = JSON.stringify({
-    type: 3, application_id: DANK_MEMER_ID, nonce,
-    channel_id: chId, guild_id: gId,
-    message_id: msg.id, message_flags: msg.flags?.bitfield || 0,
-    session_id: sessionId,
+  const payloadObj = {
+    type: 3,
+    application_id: String(msg.applicationId || DANK_MEMER_ID),
+    nonce,
+    channel_id: String(chId),
+    message_id: String(msg.id),
     data: { component_type: 2, custom_id: customId },
-  });
+  };
+  if (gId) payloadObj.guild_id = String(gId);
+  if (sessionId) payloadObj.session_id = sessionId;
+
+  const payload = JSON.stringify(payloadObj);
   const resp = await _httpPost('https://discord.com/api/v9/interactions', {
     Authorization: token, 'Content-Type': 'application/json',
   }, payload);
@@ -441,6 +498,7 @@ module.exports = {
   sleep,
   humanDelay,
   getFullText,
+  stripAnsi,
   parseCoins,
   parseNetCoins,
   parseBalance,

package/lib/grinder.js

@@ -828,18 +828,40 @@ class AccountWorker {
   async checkBalance() {
     const prefix = this.account.use_slash ? '/' : 'pls';
     await this.channel.send(`${prefix} bal`);
-    const response = await this.waitForDankMemer(10000);
+    let response = await this.waitForDankMemer(10000);
+
+    // Fallback for slash setup: sometimes "/ bal" misses and only "/balance" works.
+    if (!response && this.account.use_slash) {
+      await this.channel.send('/balance');
+      response = await this.waitForDankMemer(10000);
+    }
+
     if (response) {
       if (isCV2(response)) await ensureCV2(response);
-      const text = getFullText(response);
+      let text = stripAnsi(getFullText(response)).replace(/\s+/g, ' ').trim();
+
+      // Dank Memer sometimes sends empty first payload then edits in the full card.
+      if (!text && response.id) {
+        const edited = await this.waitForMessageUpdate(response.id, 5000);
+        if (edited) {
+          if (isCV2(edited)) await ensureCV2(edited);
+          text = stripAnsi(getFullText(edited)).replace(/\s+/g, ' ').trim();
+        }
+      }
+
+      if (!text) {
+        this.log('warn', 'Balance response was empty after waiting for update');
+        return;
+      }
 
       let wallet = 0;
       let bank = 0;
       let matched = '';
 
-      // CV2 format: <:Coin:ID> 3,272,896 and <:Bank:ID> 275,000 / 275,000
-      const coinMatch = text.match(/<[a:]?:Coin:\d+>\s*([\d,]+)/i);
-      const bankEmojiMatch = text.match(/<[a:]?:Bank:\d+>\s*([\d,]+)/i);
+    // CV2 format: <:Coin:ID> 3,272,896 and <:Bank:ID> 275,000 / 275,000
+    const coinMatch = text.match(/<a?:Coin:\d+>\s*([\d,]+)/i);
+    const bankEmojiMatch = text.match(/<a?:Bank:\d+>\s*([\d,]+)/i);
+    const bankSlashMatch = text.match(/(?:<a?:Bank:\d+>\s*)?([\d,]+)\s*\/\s*[\d,]+/i);
 
       // Legacy embed format: Wallet: ⏣ 1,234,567
       const walletMatch = text.match(/wallet[:\s]*\*{0,2}\s*[⏣💰]?\s*\*{0,2}\s*([\d,]+)/i);
@@ -861,8 +883,13 @@ class AccountWorker {
 
       if (bankEmojiMatch) {
         bank = parseInt(bankEmojiMatch[1].replace(/,/g, ''), 10);
+        matched += matched ? '+bank-emoji' : 'bank-emoji';
       } else if (bankTextMatch) {
         bank = parseInt(bankTextMatch[1].replace(/,/g, ''), 10);
+        matched += matched ? '+bank-text' : 'bank-text';
+      } else if (bankSlashMatch) {
+        bank = parseInt(bankSlashMatch[1].replace(/,/g, ''), 10);
+        matched += matched ? '+bank-slash' : 'bank-slash';
       }
 
       if (wallet === 0 && bank === 0) {
@@ -873,7 +900,7 @@ class AccountWorker {
 
       this.stats.balance = wallet;
       this.stats.bankBalance = bank;
-      this.log('bal', `Wallet: ${c.bold}${c.green}⏣ ${wallet.toLocaleString()}${c.reset}  Bank: ${c.bold}${c.cyan}⏣ ${bank.toLocaleString()}${c.reset}  ${c.dim}(${matched || 'none'})${c.reset}`);
+  this.log('bal', `Wallet: ${c.bold}${c.green}⏣ ${wallet.toLocaleString()}${c.reset}  Bank: ${c.bold}${c.cyan}⏣ ${bank.toLocaleString()}${c.reset}  Total: ${c.bold}⏣ ${(wallet + bank).toLocaleString()}${c.reset}  ${c.dim}(${matched || 'none'})${c.reset}`);
 
       // Store in Redis for persistence
       if (redis) {

package/package.json

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