dankgrinder 5.12.0 → 5.14.0

package/lib/commands/shop.js

@@ -16,7 +16,7 @@
 const {
   LOG, c, sleep, humanDelay, getFullText,
   getAllButtons, findSelectMenuOption,
-  logMsg, isHoldTight, isCV2, ensureCV2,
+  logMsg, isHoldTight, isCV2, ensureCV2, stripAnsi,
 } = require('./utils');
 const { LRUCache, Trie } = require('../structures');
 
@@ -61,6 +61,25 @@ for (const [item, searchTerm] of Object.entries(ITEM_SEARCH_TERM)) {
 // commands both detect "need shovel" within seconds of each other)
 const recentPurchases = new LRUCache(16);
 
+function isBuySuccessText(text) {
+  const lower = String(stripAnsi(text || '')).toLowerCase();
+  return lower.includes('success')
+    || lower.includes('successful purchase')
+    || lower.includes('bought')
+    || lower.includes('purchased')
+    || (lower.includes('you bought') && lower.includes('for'));
+}
+
+function isBuyFailText(text) {
+  const lower = String(stripAnsi(text || '')).toLowerCase();
+  return lower.includes('not enough')
+    || lower.includes("can't afford")
+    || lower.includes('insufficient')
+    || lower.includes('you need')
+    || lower.includes('missing item')
+    || lower.includes('missing items');
+}
+
 /**
  * Buy an item from the Dank Memer shop.
  *
@@ -171,14 +190,54 @@ async function buyItem({ channel, waitForDankMemer, itemName, quantity = 1, clie
   // Step 4: Click the Buy button → Modal with quantity input
   LOG.buy(`Clicking "${buyBtn.label}"...`);
   const btnId = buyBtn.customId || buyBtn.custom_id;
-  let modal;
+  let clickResult;
   try {
-    modal = await response.clickButton(btnId);
+    clickResult = await response.clickButton(btnId);
   } catch (e) {
     LOG.error(`[shop] Button click failed: ${e.message}`);
     return false;
   }
 
+  // Some shop buttons buy immediately (no quantity modal).
+  // If we received a message-like response, parse it directly.
+  if (clickResult && !clickResult.components?.[0]?.components?.[0]?.setValue) {
+    if (isCV2(clickResult)) await ensureCV2(clickResult);
+    const directText = getFullText(clickResult);
+    logMsg(clickResult, 'buy-direct-result');
+    if (isBuySuccessText(directText)) {
+      LOG.success(`${c.green}${c.bold}Purchased ${quantity}x ${itemName}!${c.reset}`);
+      recentPurchases.set(key, Date.now());
+      return true;
+    }
+    if (isBuyFailText(directText)) {
+      LOG.warn(`[shop] Direct buy failed for ${itemName}: ${directText.substring(0, 120)}`);
+      return false;
+    }
+
+    // Fallback: wait one follow-up message for purchase outcome text.
+    const follow = await waitForDankMemer(6000);
+    if (follow) {
+      if (isCV2(follow)) await ensureCV2(follow);
+      const fText = getFullText(follow);
+      logMsg(follow, 'buy-direct-followup');
+      if (isBuySuccessText(fText)) {
+        LOG.success(`${c.green}${c.bold}Purchased ${quantity}x ${itemName}!${c.reset}`);
+        recentPurchases.set(key, Date.now());
+        return true;
+      }
+      if (isBuyFailText(fText)) {
+        LOG.warn(`[shop] Buy failed for ${itemName}: ${fText.substring(0, 120)}`);
+        return false;
+      }
+    }
+
+    LOG.success(`Buy click sent for ${itemName} (no modal path)`);
+    recentPurchases.set(key, Date.now());
+    return true;
+  }
+
+  const modal = clickResult;
+
   if (!modal || !modal.components) {
     LOG.warn('[shop] No modal returned from button click');
     return false;
@@ -194,12 +253,12 @@ async function buyItem({ channel, waitForDankMemer, itemName, quantity = 1, clie
       const text = getFullText(result);
       logMsg(result, 'buy-result');
 
-      if (text.toLowerCase().includes('success') || text.toLowerCase().includes('bought') || text.toLowerCase().includes('purchased')) {
+      if (isBuySuccessText(text)) {
         LOG.success(`${c.green}${c.bold}Purchased ${quantity}x ${itemName}!${c.reset}`);
         recentPurchases.set(key, Date.now());
         return true;
       }
-      if (text.toLowerCase().includes('not enough') || text.toLowerCase().includes("can't afford") || text.toLowerCase().includes('insufficient')) {
+      if (isBuyFailText(text)) {
         LOG.warn(`Not enough coins to buy ${itemName}`);
         return false;
       }

package/lib/commands/stream.js

@@ -30,6 +30,35 @@ async function refetchMsg(channel, msgId) {
   try { return await channel.messages.fetch(msgId); } catch { return null; }
 }
 
+function messageStateSignature(msg) {
+  const text = normalizeLower(stripAnsi(getFullText(msg))).slice(0, 220);
+  const btnSig = getAllButtons(msg)
+    .map(b => `${(b.label || '').toLowerCase()}|${(b.customId || b.custom_id || '').toLowerCase()}|${b.disabled ? '1' : '0'}`)
+    .sort()
+    .join(';')
+    .slice(0, 300);
+  return `${text}||${btnSig}`;
+}
+
+async function waitForStreamTransition({ channel, waitForDankMemer, prevMsg, timeoutMs = 12000 }) {
+  const start = Date.now();
+  const prevSig = messageStateSignature(prevMsg);
+  while (Date.now() - start < timeoutMs) {
+    const evt = await waitForDankMemer(1500);
+    if (evt) {
+      await hydrate(evt);
+      if (messageStateSignature(evt) !== prevSig) return evt;
+    }
+
+    const fresh = await refetchMsg(channel, prevMsg.id);
+    if (fresh) {
+      await hydrate(fresh);
+      if (messageStateSignature(fresh) !== prevSig) return fresh;
+    }
+  }
+  return null;
+}
+
 function getGoLiveButton(msg) {
   const buttons = getAllButtons(msg);
   return buttons.find(b => !b.disabled && (b.label || '').toLowerCase().includes('go live')) || null;
@@ -53,6 +82,14 @@ function isStreamManagerScreen(lowerText) {
     || lowerText.includes('go live');
 }
 
+function isActionResultText(lowerText) {
+  return lowerText.includes('you ran an ad')
+    || lowerText.includes('read chat')
+    || lowerText.includes('collect')
+    || lowerText.includes('donation')
+    || lowerText.includes('received');
+}
+
 async function selectRandomStreamOption(msg) {
   const menus = getAllSelectMenus(msg);
   if (menus.length === 0) return false;
@@ -168,14 +205,46 @@ async function runStream({ channel, waitForDankMemer, client }) {
     LOG.info('[stream] Clicking "Go Live"');
     await humanDelay(100, 250);
     try {
+      const before = response;
       const liveResult = await safeClickButton(response, goLiveBtn);
-      const next = liveResult || (await waitForDankMemer(7000)) || (await refetchMsg(channel, response.id));
+      const next = liveResult || (await waitForStreamTransition({
+        channel,
+        waitForDankMemer,
+        prevMsg: before,
+        timeoutMs: 12000,
+      }));
       if (next) {
         response = next;
         await hydrate(response);
         logMsg(response, `stream-go-live-${step}`);
         continue;
       }
+
+      // Some accounts open setup first; try a fallback non-destructive button once.
+      const fallbackBtn = getAllButtons(response).find(b =>
+        !b.disabled &&
+        b.label &&
+        ((b.label || '').toLowerCase().includes('view setup') || (b.label || '').toLowerCase().includes('setup'))
+      );
+      if (fallbackBtn) {
+        LOG.info('[stream] Go Live transition not detected; trying setup fallback');
+        await humanDelay(80, 180);
+        try {
+          const fallbackRes = await safeClickButton(response, fallbackBtn);
+          const afterFallback = fallbackRes || (await waitForStreamTransition({
+            channel,
+            waitForDankMemer,
+            prevMsg: before,
+            timeoutMs: 8000,
+          }));
+          if (afterFallback) {
+            response = afterFallback;
+            await hydrate(response);
+            logMsg(response, `stream-setup-fallback-${step}`);
+            continue;
+          }
+        } catch {}
+      }
     } catch (e) {
       LOG.error(`[stream] Go Live click failed: ${e.message}`);
     }
@@ -195,13 +264,34 @@ async function runStream({ channel, waitForDankMemer, client }) {
       await humanDelay(120, 320);
       try {
         const clicked = await safeClickButton(response, action);
-        const updated = clicked || (await waitForDankMemer(6000)) || (await refetchMsg(channel, response.id));
+        let updated = clicked || (await waitForDankMemer(6000)) || (await refetchMsg(channel, response.id));
         if (updated) {
           response = updated;
           await hydrate(response);
           logMsg(response, 'stream-action');
           text = getFullText(response);
           lower = normalizeLower(stripAnsi(text));
+
+          // Action payouts may appear as a second follow-up message.
+          // Keep checking briefly so earnings are not missed.
+          let bestText = text;
+          let bestCoins = parseCoins(bestText);
+          for (let i = 0; i < 2; i++) {
+            const nextMsg = await waitForDankMemer(5000);
+            if (!nextMsg) break;
+            await hydrate(nextMsg);
+            logMsg(nextMsg, `stream-action-followup-${i}`);
+            const nextText = getFullText(nextMsg);
+            const nextLower = normalizeLower(stripAnsi(nextText));
+            const nextCoins = parseCoins(nextText);
+            if (nextCoins > bestCoins || (bestCoins === 0 && isActionResultText(nextLower))) {
+              bestText = nextText;
+              bestCoins = nextCoins;
+              response = nextMsg;
+            }
+          }
+          text = bestText;
+          lower = normalizeLower(stripAnsi(text));
         }
       } catch (e) {
         LOG.error(`[stream] Action click failed: ${e.message}`);

package/package.json

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