dankgrinder 5.13.0 → 5.16.0

package/lib/commands/shop.js

@@ -15,7 +15,7 @@
 
 const {
   LOG, c, sleep, humanDelay, getFullText,
-  getAllButtons, findSelectMenuOption,
+  getAllButtons, findSelectMenuOption, getAllSelectMenus, safeClickButton,
   logMsg, isHoldTight, isCV2, ensureCV2, stripAnsi,
 } = require('./utils');
 const { LRUCache, Trie } = require('../structures');
@@ -80,6 +80,28 @@ function isBuyFailText(text) {
     || lower.includes('missing items');
 }
 
+function findBuyButtonInMessage(msg, searchTerm, key) {
+  const allBtns = getAllButtons(msg);
+  const normalizedSearch = String(searchTerm || '').toLowerCase().replace(/\s+/g, '');
+  const normalizedKey = String(key || '').toLowerCase().replace(/\s+/g, '');
+  return allBtns.find(b => {
+    const label = String(b.label || '').toLowerCase();
+    const id = String(b.customId || b.custom_id || '').toLowerCase().replace(/\s+/g, '');
+    return label.includes(searchTerm)
+      || (normalizedSearch && id.includes(normalizedSearch))
+      || (normalizedKey && id.includes(normalizedKey));
+  }) || null;
+}
+
+function findNextShopPageButton(msg) {
+  const btns = getAllButtons(msg).filter(b => !b.disabled);
+  return btns.find(b => {
+    const id = String(b.customId || b.custom_id || '').toLowerCase();
+    if (!id.includes('shop-view')) return false;
+    return id.endsWith(':1') || id.includes(':1:');
+  }) || null;
+}
+
 /**
  * Buy an item from the Dank Memer shop.
  *
@@ -137,7 +159,7 @@ async function buyItem({ channel, waitForDankMemer, itemName, quantity = 1, clie
           const row = response.components[i];
           for (const comp of row?.components || []) {
             if ((comp.type === 'STRING_SELECT' || comp.type === 3) &&
-                comp.customId === selectInfo.menuCustomId) {
+                (comp.customId || comp.custom_id) === selectInfo.menuCustomId) {
               menuRowIdx = i;
               break;
             }
@@ -148,34 +170,57 @@ async function buyItem({ channel, waitForDankMemer, itemName, quantity = 1, clie
           menuRowIdx >= 0 ? menuRowIdx : selectInfo.menuCustomId,
           [selectInfo.option.value]
         );
-        if (result) {
-          response = result;
-          if (isCV2(response)) await ensureCV2(response);
-          LOG.success(`Switched to ${targetTab}`);
-        }
+        response = result || (await waitForDankMemer(6000)) || response;
+        if (isCV2(response)) await ensureCV2(response);
+        LOG.success(`Switched to ${targetTab}`);
         await sleep(300);
       } catch (e) {
         LOG.error(`[shop] Tab switch failed: ${e.message}`);
         return false;
       }
     }
+  } else {
+    // If select menu exists but option matching failed due label variations,
+    // try selecting by value from any menu option containing coin/fishing/etc.
+    const menus = getAllSelectMenus(response);
+    const menu = menus.find(m => (m.options || []).length > 0);
+    if (menu) {
+      const desired = (menu.options || []).find(o => (o.label || '').toLowerCase().includes(targetTab.toLowerCase()));
+      if (desired) {
+        try {
+          await response.selectMenu(menu.customId || menu.custom_id, [desired.value]);
+          const maybeUpdated = await waitForDankMemer(6000);
+          if (maybeUpdated) {
+            response = maybeUpdated;
+            if (isCV2(response)) await ensureCV2(response);
+            LOG.success(`Switched to ${targetTab}`);
+          }
+        } catch {}
+      }
+    }
   }
 
-  // Step 3: Find the Buy button for our item
-  const allBtns = getAllButtons(response);
-  const normalizedSearch = String(searchTerm || '').toLowerCase().replace(/\s+/g, '');
-  const normalizedKey = String(key || '').toLowerCase().replace(/\s+/g, '');
-  const buyBtn = allBtns.find(b => {
-    const label = String(b.label || '').toLowerCase();
-    const id = String(b.customId || b.custom_id || '').toLowerCase().replace(/\s+/g, '');
-    return label.includes(searchTerm)
-      || (normalizedSearch && id.includes(normalizedSearch))
-      || (normalizedKey && id.includes(normalizedKey));
-  });
+  // Step 3: Find the Buy button for our item (scan pages in current tab)
+  let buyBtn = null;
+  for (let page = 0; page < 10; page++) {
+    buyBtn = findBuyButtonInMessage(response, searchTerm, key);
+    if (buyBtn) break;
+
+    const nextPageBtn = findNextShopPageButton(response);
+    if (!nextPageBtn) break;
+    try {
+      const moved = await safeClickButton(response, nextPageBtn);
+      response = moved || (await waitForDankMemer(5000)) || response;
+      if (isCV2(response)) await ensureCV2(response);
+      await sleep(200);
+    } catch {
+      break;
+    }
+  }
 
   if (!buyBtn) {
     LOG.warn(`[shop] No button for "${itemName}" (search: "${searchTerm}")`);
-    const named = allBtns.filter(b => b.label);
+    const named = getAllButtons(response).filter(b => b.label);
     if (named.length > 0) {
       LOG.debug(`[shop] Available: ${named.map(b => `"${b.label}"(${b.disabled ? 'DIS' : 'EN'})`).join(', ')}`);
     }

package/lib/commands/stream.js

@@ -1,12 +1,13 @@
 const {
   LOG, c, getFullText, parseCoins, getAllButtons, getAllSelectMenus,
   safeClickButton, logMsg, isHoldTight, getHoldTightReason, sleep, humanDelay, needsItem,
-  isCV2, ensureCV2, stripAnsi,
+  isCV2, ensureCV2, stripAnsi, clickCV2Button,
 } = require('./utils');
 const { buyItem } = require('./shop');
 
 const STREAM_ITEMS = Object.freeze(['keyboard', 'mouse']);
 const STREAM_ACTION_LABELS = Object.freeze(['run ad', 'read chat', 'collect donations']);
+const RE_STREAM_INTERACT_MIN = /interact\s+with\s+your\s+stream\s+every\s+`?(\d+)`?\s*minutes?/i;
 
 function normalizeLower(text) {
   return String(text || '')
@@ -30,6 +31,62 @@ async function refetchMsg(channel, msgId) {
   try { return await channel.messages.fetch(msgId); } catch { return null; }
 }
 
+async function waitForMessageEditById(client, msgId, channelId, timeoutMs = 6000) {
+  if (!client?.on) return null;
+  return new Promise((resolve) => {
+    const timer = setTimeout(() => {
+      try { client.removeListener('messageUpdate', onUpdate); } catch {}
+      resolve(null);
+    }, timeoutMs);
+
+    function onUpdate(_oldMsg, newMsg) {
+      if (!newMsg) return;
+      if (newMsg.id !== msgId) return;
+      if (channelId && newMsg.channel?.id !== channelId && newMsg.channelId !== channelId) return;
+      clearTimeout(timer);
+      try { client.removeListener('messageUpdate', onUpdate); } catch {}
+      resolve(newMsg);
+    }
+
+    client.on('messageUpdate', onUpdate);
+  });
+}
+
+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, client, timeoutMs = 12000 }) {
+  const start = Date.now();
+  const prevSig = messageStateSignature(prevMsg);
+  while (Date.now() - start < timeoutMs) {
+    const byIdUpdate = await waitForMessageEditById(client, prevMsg.id, prevMsg.channel?.id || prevMsg.channelId, 1800);
+    if (byIdUpdate) {
+      await hydrate(byIdUpdate);
+      if (messageStateSignature(byIdUpdate) !== prevSig) return byIdUpdate;
+    }
+
+    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;
@@ -46,11 +103,14 @@ function isLiveDashboard(msg, lowerText) {
   return labels.some(l => l.includes('end stream')) && labels.some(l => STREAM_ACTION_LABELS.some(a => l.includes(a)));
 }
 
-function isStreamManagerScreen(lowerText) {
+function isStreamManagerScreen(msg, lowerText) {
+  const labels = getAllButtons(msg).map(b => (b.label || '').toLowerCase());
+  const hasManagerButtons = labels.some(l => l.includes('go live')) || labels.some(l => l.includes('view setup'));
   return lowerText.includes('stream manager')
     || lowerText.includes('what game do you want to stream')
     || lowerText.includes('view setup')
-    || lowerText.includes('go live');
+    || lowerText.includes('go live')
+    || hasManagerButtons;
 }
 
 function isActionResultText(lowerText) {
@@ -61,6 +121,16 @@ function isActionResultText(lowerText) {
     || lowerText.includes('received');
 }
 
+function parseStreamInteractCooldownSec(text) {
+  const clean = String(stripAnsi(text || '')).replace(/\s+/g, ' ').trim();
+  const mm = clean.match(RE_STREAM_INTERACT_MIN);
+  if (mm) {
+    const mins = parseInt(mm[1], 10);
+    if (Number.isFinite(mins) && mins > 0) return mins * 60;
+  }
+  return 600;
+}
+
 async function selectRandomStreamOption(msg) {
   const menus = getAllSelectMenus(msg);
   if (menus.length === 0) return false;
@@ -113,6 +183,7 @@ async function runStream({ channel, waitForDankMemer, client }) {
   logMsg(response, 'stream');
   let text = getFullText(response);
   let lower = normalizeLower(stripAnsi(text));
+  let nextCooldownSec = parseStreamInteractCooldownSec(text);
 
   // Missing items — buy keyboard + mouse
   const missing = needsItem(lower);
@@ -140,15 +211,18 @@ async function runStream({ channel, waitForDankMemer, client }) {
     logMsg(response, 'stream-retry');
     text = getFullText(response);
     lower = normalizeLower(stripAnsi(text));
+    nextCooldownSec = parseStreamInteractCooldownSec(text);
   }
 
   // Setup flow: manager -> option select (game/platform) -> Go Live -> live dashboard
+  let lastGoLiveCustomId = null;
   for (let step = 0; step < 6; step++) {
     text = getFullText(response);
     lower = normalizeLower(stripAnsi(text));
+  nextCooldownSec = parseStreamInteractCooldownSec(text);
 
-    if (isLiveDashboard(response, lower)) break;
-    if (!isStreamManagerScreen(lower)) break;
+  if (isLiveDashboard(response, lower)) break;
+  if (!isStreamManagerScreen(response, lower)) break;
 
     const selected = await selectRandomStreamOption(response);
     if (selected) {
@@ -162,7 +236,34 @@ async function runStream({ channel, waitForDankMemer, client }) {
     }
 
     const goLiveBtn = getGoLiveButton(response);
+    if (goLiveBtn?.customId || goLiveBtn?.custom_id) {
+      lastGoLiveCustomId = goLiveBtn.customId || goLiveBtn.custom_id;
+    }
     if (!goLiveBtn) {
+      // Parser fallback: game prompt text detected but buttons/selects may be hidden by library.
+      // Use previously known stream-game custom_id directly against current message.
+      if (lower.includes('what game do you want to stream') && lastGoLiveCustomId) {
+        LOG.info('[stream] Go Live button not visible; trying raw stream-game fallback');
+        try {
+          await clickCV2Button(response, lastGoLiveCustomId);
+          const transitioned = await waitForStreamTransition({
+            channel,
+            waitForDankMemer,
+            client,
+            prevMsg: response,
+            timeoutMs: 12000,
+          });
+          if (transitioned) {
+            response = transitioned;
+            await hydrate(response);
+            logMsg(response, `stream-go-live-raw-${step}`);
+            continue;
+          }
+        } catch (e) {
+          LOG.error(`[stream] Raw Go Live fallback failed: ${e.message}`);
+        }
+      }
+
       await sleep(300);
       const fresh = await refetchMsg(channel, response.id);
       if (fresh) {
@@ -176,14 +277,57 @@ 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 liveLooksLikeMessage = Boolean(liveResult?.id && (liveResult?.channel?.id || liveResult?.channelId));
+      let next = liveLooksLikeMessage ? liveResult : null;
+      if (!next) {
+        next = await waitForStreamTransition({
+          channel,
+          waitForDankMemer,
+          client,
+          prevMsg: before,
+          timeoutMs: 12000,
+        });
+      }
+      if (!next) {
+        // Last fallback: explicit refetch of the original message after click.
+        const fetched = await refetchMsg(channel, before.id);
+        if (fetched) next = fetched;
+      }
       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,
+            client,
+            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}`);
     }
@@ -194,11 +338,13 @@ async function runStream({ channel, waitForDankMemer, client }) {
   // Scheduler uses nextCooldownSec=600, so this executes every 10 minutes.
   text = getFullText(response);
   lower = normalizeLower(stripAnsi(text));
+  nextCooldownSec = parseStreamInteractCooldownSec(text);
 
   if (isLiveDashboard(response, lower)) {
     const actions = getLiveActionButtons(response);
     if (actions.length > 0) {
       const action = pickRandom(actions);
+      const actionAt = new Date();
       LOG.info(`[stream] Live action: "${action.label}"`);
       await humanDelay(120, 320);
       try {
@@ -231,10 +377,12 @@ async function runStream({ channel, waitForDankMemer, client }) {
           }
           text = bestText;
           lower = normalizeLower(stripAnsi(text));
+          nextCooldownSec = parseStreamInteractCooldownSec(text);
         }
       } catch (e) {
         LOG.error(`[stream] Action click failed: ${e.message}`);
       }
+      LOG.info(`[stream] Action timestamp: ${actionAt.toISOString()} | next interaction in ${Math.ceil(nextCooldownSec / 60)}m`);
     } else {
       LOG.info('[stream] Live dashboard found but no action buttons available yet');
     }
@@ -244,13 +392,13 @@ async function runStream({ channel, waitForDankMemer, client }) {
   const coins = parseCoins(text);
   if (coins > 0) {
     LOG.coin(`[stream] ${c.green}+⏣ ${coins.toLocaleString()}${c.reset}`);
-    return { result: `stream → +⏣ ${coins.toLocaleString()}`, coins, nextCooldownSec: 600 };
+    return { result: `stream → +⏣ ${coins.toLocaleString()}`, coins, nextCooldownSec };
   }
 
-  if (ended) return { result: 'stream ended', coins: 0, nextCooldownSec: 600 };
+  if (ended) return { result: 'stream ended', coins: 0, nextCooldownSec };
 
   const short = normalizeLower(stripAnsi(text)).substring(0, 60);
-  return { result: short || 'streamed', coins: 0, nextCooldownSec: 600 };
+  return { result: short || 'streamed', coins: 0, nextCooldownSec };
 }
 
 module.exports = { runStream };

package/lib/commands/utils.js

@@ -249,6 +249,17 @@ function flattenComponents(components) {
           _accessoryOf: item,
         });
       }
+      if (acc.type === 3 || acc.type === 'SELECT_MENU' || acc.type === 'STRING_SELECT') {
+        flat.push({
+          type: 'STRING_SELECT',
+          customId: acc.custom_id || acc.customId,
+          options: acc.options || [],
+          disabled: acc.disabled || false,
+          placeholder: acc.placeholder,
+          data: acc,
+          _accessoryOf: item,
+        });
+      }
     }
   }
   return flat;
@@ -273,7 +284,7 @@ function findSelectMenuOption(msg, label) {
   const menus = getAllSelectMenus(msg);
   for (const comp of menus) {
     const opt = (comp.options || []).find(o => o.label?.toLowerCase().includes(label.toLowerCase()));
-    if (opt) return { menuCustomId: comp.customId, option: opt, component: comp };
+    if (opt) return { menuCustomId: comp.customId || comp.custom_id, option: opt, component: comp };
   }
   return null;
 }
@@ -429,13 +440,15 @@ function isCV2(msg) {
 
 async function ensureCV2(msg, force = false) {
   if (!msg) return msg;
-  if (!force && msg._cv2) return msg;
+  const msgEditedTs = msg.editedTimestamp || msg.editedAt?.getTime?.() || null;
+  if (!force && msg._cv2 && msg._cv2EditedTs === msgEditedTs) return msg;
   if (!isCV2(msg)) return msg;
   try {
     if (force) {
       delete msg._cv2;
       delete msg._cv2text;
       delete msg._cv2buttons;
+      delete msg._cv2EditedTs;
       cv2Cache.delete(msg.id);
     }
     const token = msg.client?.token;
@@ -445,10 +458,17 @@ async function ensureCV2(msg, force = false) {
     // LRU cache hit — O(1) lookup avoids redundant HTTP fetches
     const cached = cv2Cache.get(msg.id);
     if (cached && !force) {
-      msg._cv2 = cached;
-      msg._cv2text = _extractCV2Text(cached).trim();
-      msg._cv2buttons = _extractCV2Buttons(cached);
-      return msg;
+      const cachedComponents = Array.isArray(cached) ? cached : cached.components;
+      const cachedEditedTs = Array.isArray(cached) ? null : (cached.editedTimestamp || null);
+
+      // If message has been edited since cache snapshot, ignore stale cache.
+      if (!msgEditedTs || cachedEditedTs === msgEditedTs) {
+        msg._cv2 = cachedComponents;
+        msg._cv2text = _extractCV2Text(cachedComponents).trim();
+        msg._cv2buttons = _extractCV2Buttons(cachedComponents);
+        msg._cv2EditedTs = cachedEditedTs;
+        return msg;
+      }
     }
 
     let raw = null;
@@ -470,10 +490,11 @@ async function ensureCV2(msg, force = false) {
     }
 
     if (raw?.components) {
-      cv2Cache.set(msg.id, raw.components);
+      cv2Cache.set(msg.id, { components: raw.components, editedTimestamp: msgEditedTs });
       msg._cv2 = raw.components;
       msg._cv2text = _extractCV2Text(raw.components).trim();
       msg._cv2buttons = _extractCV2Buttons(raw.components);
+      msg._cv2EditedTs = msgEditedTs;
     }
   } catch (e) { LOG.debug(`[cv2] fetch error: ${e.message}`); }
   return msg;

package/package.json

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