dankgrinder 5.16.0 → 5.19.0

package/lib/commands/shop.js

@@ -29,6 +29,13 @@ const ITEM_COSTS = Object.freeze({
   'adventure ticket': 250000,
   'keyboard': 10000,
   'mouse': 10000,
+  'hoe': 25000,
+  'watering can': 25000,
+  'water can': 25000,
+  'water bucket': 100000,
+  'seeds': 5000,
+  'seed': 5000,
+  'corn seeds': 5000,
 });
 
 const ITEM_SEARCH_TERM = Object.freeze({
@@ -39,6 +46,13 @@ const ITEM_SEARCH_TERM = Object.freeze({
   'adventure ticket': 'ticket',
   'keyboard': 'keyboard',
   'mouse': 'mouse',
+  'hoe': 'hoe',
+  'watering can': 'water can',
+  'water can': 'water can',
+  'water bucket': 'water bucket',
+  'seeds': 'seeds',
+  'seed': 'seed',
+  'corn seeds': 'corn seeds',
 });
 
 const ITEM_SHOP_TAB = Object.freeze({
@@ -49,6 +63,13 @@ const ITEM_SHOP_TAB = Object.freeze({
   'adventure ticket': 'Coin Shop',
   'keyboard': 'Coin Shop',
   'mouse': 'Coin Shop',
+  'hoe': 'Coin Shop',
+  'watering can': 'Coin Shop',
+  'water can': 'Coin Shop',
+  'water bucket': 'Coin Shop',
+  'seeds': 'Coin Shop',
+  'seed': 'Coin Shop',
+  'corn seeds': 'Coin Shop',
 });
 
 // Trie for item button label matching — O(k) vs O(n) linear scan
@@ -102,50 +123,34 @@ function findNextShopPageButton(msg) {
   }) || null;
 }
 
-/**
- * Buy an item from the Dank Memer shop.
- *
- * @param {object} opts
- * @param {object} opts.channel
- * @param {function} opts.waitForDankMemer
- * @param {string} opts.itemName - e.g. 'Hunting Rifle', 'Shovel'
- * @param {number} [opts.quantity=1]
- * @param {object} [opts.client] - Discord client
- * @returns {Promise<boolean>} true if purchase succeeded
- */
-async function buyItem({ channel, waitForDankMemer, itemName, quantity = 1, client }) {
-  const key = itemName.toLowerCase();
-  const searchTerm = ITEM_SEARCH_TERM[key] || key.split(' ').pop();
-  const targetTab = ITEM_SHOP_TAB[key] || 'Coin Shop';
-
-  // LRU dedup: skip if we bought this item in the last 10 seconds
-  const lastBuy = recentPurchases.get(key);
-  if (lastBuy && Date.now() - lastBuy < 10000) {
-    LOG.info(`[shop] Skipping ${itemName} — just purchased ${Math.round((Date.now() - lastBuy) / 1000)}s ago`);
-    return true;
-  }
-
-  LOG.buy(`Opening shop to buy ${c.bold}${quantity}x ${itemName}${c.reset}`);
+function normalizeShopRequest(itemName, quantity = 1) {
+  const key = String(itemName || '').toLowerCase();
+  return {
+    itemName,
+    quantity,
+    key,
+    searchTerm: ITEM_SEARCH_TERM[key] || key.split(' ').pop(),
+    targetTab: ITEM_SHOP_TAB[key] || 'Coin Shop',
+  };
+}
 
-  // Step 1: Open shop
+async function openShopView({ channel, waitForDankMemer }) {
   await channel.send('pls shop view');
   let response = await waitForDankMemer(10000);
 
-  if (!response) {
-    LOG.warn('[shop] No response to pls shop view');
-    return false;
-  }
+  if (!response) return { ok: false, reason: 'no-response', response: null };
   if (isHoldTight(response)) {
     LOG.warn('[shop] Hold tight — waiting 30s');
     await sleep(30000);
-    return false;
+    return { ok: false, reason: 'hold-tight', response: null };
   }
 
   if (isCV2(response)) await ensureCV2(response);
-
   logMsg(response, 'shop');
+  return { ok: true, reason: 'ok', response };
+}
 
-  // Step 2: Switch shop tab if needed (e.g. Fishing Shop for fishing pole)
+async function ensureShopTab({ response, waitForDankMemer, targetTab }) {
   const selectInfo = findSelectMenuOption(response, targetTab);
   if (selectInfo) {
     const isAlreadySelected = (selectInfo.component.options || [])
@@ -176,12 +181,9 @@ async function buyItem({ channel, waitForDankMemer, itemName, quantity = 1, clie
         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) {
@@ -199,8 +201,10 @@ async function buyItem({ channel, waitForDankMemer, itemName, quantity = 1, clie
       }
     }
   }
+  return response;
+}
 
-  // Step 3: Find the Buy button for our item (scan pages in current tab)
+async function findBuyButtonPaged({ response, waitForDankMemer, searchTerm, key }) {
   let buyBtn = null;
   for (let page = 0; page < 10; page++) {
     buyBtn = findBuyButtonInMessage(response, searchTerm, key);
@@ -217,22 +221,16 @@ async function buyItem({ channel, waitForDankMemer, itemName, quantity = 1, clie
       break;
     }
   }
+  return { response, buyBtn };
+}
 
-  if (!buyBtn) {
-    LOG.warn(`[shop] No button for "${itemName}" (search: "${searchTerm}")`);
-    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(', ')}`);
-    }
-    return false;
-  }
-
+async function performBuyFromButton({ response, buyBtn, waitForDankMemer, itemName, quantity, key }) {
+  if (!buyBtn) return { ok: false, reason: 'not-found', response };
   if (buyBtn.disabled) {
     LOG.warn(`[shop] "${buyBtn.label}" is DISABLED — not enough coins for ${itemName}`);
-    return false;
+    return { ok: false, reason: 'disabled', response };
   }
 
-  // Step 4: Click the Buy button → Modal with quantity input
   LOG.buy(`Clicking "${buyBtn.label}"...`);
   const btnId = buyBtn.customId || buyBtn.custom_id;
   let clickResult;
@@ -240,11 +238,9 @@ async function buyItem({ channel, waitForDankMemer, itemName, quantity = 1, clie
     clickResult = await response.clickButton(btnId);
   } catch (e) {
     LOG.error(`[shop] Button click failed: ${e.message}`);
-    return false;
+    return { ok: false, reason: 'click-failed', response };
   }
 
-  // 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);
@@ -252,14 +248,13 @@ async function buyItem({ channel, waitForDankMemer, itemName, quantity = 1, clie
     if (isBuySuccessText(directText)) {
       LOG.success(`${c.green}${c.bold}Purchased ${quantity}x ${itemName}!${c.reset}`);
       recentPurchases.set(key, Date.now());
-      return true;
+      return { ok: true, reason: 'direct-success', response: clickResult };
     }
     if (isBuyFailText(directText)) {
       LOG.warn(`[shop] Direct buy failed for ${itemName}: ${directText.substring(0, 120)}`);
-      return false;
+      return { ok: false, reason: 'direct-failed', response: clickResult };
     }
 
-    // Fallback: wait one follow-up message for purchase outcome text.
     const follow = await waitForDankMemer(6000);
     if (follow) {
       if (isCV2(follow)) await ensureCV2(follow);
@@ -268,27 +263,26 @@ async function buyItem({ channel, waitForDankMemer, itemName, quantity = 1, clie
       if (isBuySuccessText(fText)) {
         LOG.success(`${c.green}${c.bold}Purchased ${quantity}x ${itemName}!${c.reset}`);
         recentPurchases.set(key, Date.now());
-        return true;
+        return { ok: true, reason: 'followup-success', response: follow };
       }
       if (isBuyFailText(fText)) {
         LOG.warn(`[shop] Buy failed for ${itemName}: ${fText.substring(0, 120)}`);
-        return false;
+        return { ok: false, reason: 'followup-failed', response: follow };
       }
+      return { ok: true, reason: 'followup-unknown', response: follow };
     }
 
     LOG.success(`Buy click sent for ${itemName} (no modal path)`);
     recentPurchases.set(key, Date.now());
-    return true;
+    return { ok: true, reason: 'direct-unknown', response: clickResult };
   }
 
   const modal = clickResult;
-
   if (!modal || !modal.components) {
     LOG.warn('[shop] No modal returned from button click');
-    return false;
+    return { ok: false, reason: 'no-modal', response };
   }
 
-  // Step 5: Set quantity and submit the modal
   LOG.buy(`Modal "${modal.title}" — qty=${quantity}`);
   try {
     modal.components[0].components[0].setValue(String(quantity));
@@ -301,20 +295,129 @@ async function buyItem({ channel, waitForDankMemer, itemName, quantity = 1, clie
       if (isBuySuccessText(text)) {
         LOG.success(`${c.green}${c.bold}Purchased ${quantity}x ${itemName}!${c.reset}`);
         recentPurchases.set(key, Date.now());
-        return true;
+        return { ok: true, reason: 'modal-success', response: result };
       }
       if (isBuyFailText(text)) {
         LOG.warn(`Not enough coins to buy ${itemName}`);
-        return false;
+        return { ok: false, reason: 'modal-failed', response: result };
       }
+      return { ok: true, reason: 'modal-unknown', response: result };
     }
 
     LOG.success(`Modal submitted for ${quantity}x ${itemName} (assuming success)`);
-    return true;
+    return { ok: true, reason: 'modal-submitted', response };
   } catch (e) {
     LOG.error(`[shop] Modal submit failed: ${e.message}`);
+    return { ok: false, reason: 'modal-submit-failed', response };
+  }
+}
+
+/**
+ * Buy an item from the Dank Memer shop.
+ *
+ * @param {object} opts
+ * @param {object} opts.channel
+ * @param {function} opts.waitForDankMemer
+ * @param {string} opts.itemName - e.g. 'Hunting Rifle', 'Shovel'
+ * @param {number} [opts.quantity=1]
+ * @param {object} [opts.client] - Discord client
+ * @returns {Promise<boolean>} true if purchase succeeded
+ */
+async function buyItem({ channel, waitForDankMemer, itemName, quantity = 1, client }) {
+  const { key, searchTerm, targetTab } = normalizeShopRequest(itemName, quantity);
+
+  // LRU dedup: skip if we bought this item in the last 10 seconds
+  const lastBuy = recentPurchases.get(key);
+  if (lastBuy && Date.now() - lastBuy < 10000) {
+    LOG.info(`[shop] Skipping ${itemName} — just purchased ${Math.round((Date.now() - lastBuy) / 1000)}s ago`);
+    return true;
+  }
+
+  LOG.buy(`Opening shop to buy ${c.bold}${quantity}x ${itemName}${c.reset}`);
+
+  // Step 1: Open shop
+  const opened = await openShopView({ channel, waitForDankMemer });
+  if (!opened.ok) {
+    LOG.warn('[shop] No response to pls shop view');
     return false;
   }
+  let response = opened.response;
+
+  // Step 2: Switch shop tab if needed
+  response = await ensureShopTab({ response, waitForDankMemer, targetTab });
+
+  // Step 3: Find the Buy button for our item (scan pages in current tab)
+  const located = await findBuyButtonPaged({ response, waitForDankMemer, searchTerm, key });
+  response = located.response;
+  const buyBtn = located.buyBtn;
+
+  if (!buyBtn) {
+    LOG.warn(`[shop] No button for "${itemName}" (search: "${searchTerm}")`);
+    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(', ')}`);
+    }
+    return false;
+  }
+
+  if (buyBtn.disabled) {
+    LOG.warn(`[shop] "${buyBtn.label}" is DISABLED — not enough coins for ${itemName}`);
+    return false;
+  }
+
+  // Step 4/5: purchase
+  const bought = await performBuyFromButton({ response, buyBtn, waitForDankMemer, itemName, quantity, key });
+  return !!bought.ok;
+}
+
+async function buyItemsBatch({ channel, waitForDankMemer, client, items = [] }) {
+  const requests = items
+    .map(i => normalizeShopRequest(i.itemName || i.item || '', i.quantity || i.qty || 1))
+    .filter(r => r.itemName && r.quantity > 0);
+
+  if (requests.length === 0) return { ok: true, results: [] };
+
+  const opened = await openShopView({ channel, waitForDankMemer });
+  if (!opened.ok) return { ok: false, results: requests.map(r => ({ itemName: r.itemName, success: false, reason: opened.reason })) };
+
+  let response = opened.response;
+  const results = [];
+
+  for (const req of requests) {
+    const lastBuy = recentPurchases.get(req.key);
+    if (lastBuy && Date.now() - lastBuy < 10000) {
+      results.push({ itemName: req.itemName, success: true, reason: 'recent' });
+      continue;
+    }
+
+    response = await ensureShopTab({ response, waitForDankMemer, targetTab: req.targetTab });
+    const located = await findBuyButtonPaged({ response, waitForDankMemer, searchTerm: req.searchTerm, key: req.key });
+    response = located.response;
+
+    if (!located.buyBtn) {
+      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(', ')}`);
+      }
+      results.push({ itemName: req.itemName, success: false, reason: 'not-found' });
+      continue;
+    }
+
+    const bought = await performBuyFromButton({
+      response,
+      buyBtn: located.buyBtn,
+      waitForDankMemer,
+      itemName: req.itemName,
+      quantity: req.quantity,
+      key: req.key,
+    });
+    response = bought.response || response;
+    results.push({ itemName: req.itemName, success: !!bought.ok, reason: bought.reason });
+
+    await sleep(300);
+  }
+
+  return { ok: results.every(r => r.success), results };
 }
 
-module.exports = { buyItem, ITEM_COSTS };
+module.exports = { buyItem, buyItemsBatch, ITEM_COSTS };

package/lib/commands/utils.js

@@ -311,7 +311,8 @@ async function safeClickButton(msg, button) {
   // CV2 fallback: send interaction via raw HTTP, then wait for the message
   // to update so we can return the updated message to the caller.
   if (id) {
-    await clickCV2Button(msg, id);
+    const interactionAck = await clickCV2Button(msg, id);
+    if (interactionAck) msg._lastInteractionAck = interactionAck;
     // Wait for Dank Memer to process the interaction and update the message
     const updatedMsg = await new Promise((resolve) => {
       const timeout = setTimeout(() => {
@@ -523,7 +524,73 @@ async function clickCV2Button(msg, customId) {
     Authorization: token, 'Content-Type': 'application/json',
   }, payload);
   if (resp.status >= 400) throw new Error(`CV2 click ${resp.status}: ${resp.body.substring(0, 200)}`);
-  return null;
+
+  let parsed = null;
+  try {
+    parsed = resp.body ? JSON.parse(resp.body) : null;
+  } catch {
+    parsed = null;
+  }
+
+  const data = parsed?.data || null;
+  if (!data && !parsed) return null;
+
+  return {
+    interactionStatus: resp.status,
+    interactionType: parsed?.type ?? null,
+    flags: data?.flags ?? parsed?.flags ?? 0,
+    content: data?.content ?? parsed?.content ?? '',
+    embeds: data?.embeds ?? parsed?.embeds ?? [],
+    components: data?.components ?? parsed?.components ?? [],
+    raw: parsed || resp.body,
+  };
+}
+
+async function clickCV2SelectMenu(msg, customId, values = []) {
+  const token = msg.client?.token;
+  const chId = msg.channelId || msg.channel?.id;
+  const gId = msg.guildId || msg.guild?.id;
+  if (!token) throw new Error('No token for CV2 select');
+  const sessionId = msg.client?.ws?.shards?.first?.()?.sessionId;
+  const nonce = `${BigInt(Date.now() - 1420070400000) << 22n}`;
+  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: 3,
+      custom_id: customId,
+      values: Array.isArray(values) ? values.map(v => String(v)) : [],
+    },
+  };
+  if (gId) payloadObj.guild_id = String(gId);
+  if (sessionId) payloadObj.session_id = sessionId;
+
+  const resp = await _httpPost('https://discord.com/api/v9/interactions', {
+    Authorization: token, 'Content-Type': 'application/json',
+  }, JSON.stringify(payloadObj));
+  if (resp.status >= 400) throw new Error(`CV2 select ${resp.status}: ${resp.body.substring(0, 200)}`);
+
+  let parsed = null;
+  try {
+    parsed = resp.body ? JSON.parse(resp.body) : null;
+  } catch {
+    parsed = null;
+  }
+
+  const data = parsed?.data || null;
+  if (!data && !parsed) return null;
+  return {
+    interactionStatus: resp.status,
+    interactionType: parsed?.type ?? null,
+    flags: data?.flags ?? parsed?.flags ?? 0,
+    content: data?.content ?? parsed?.content ?? '',
+    embeds: data?.embeds ?? parsed?.embeds ?? [],
+    components: data?.components ?? parsed?.components ?? [],
+    raw: parsed || resp.body,
+  };
 }
 
 // ── Item Detection (Aho-Corasick Automaton) ──────────────────
@@ -596,6 +663,7 @@ module.exports = {
   isCV2,
   ensureCV2,
   clickCV2Button,
+  clickCV2SelectMenu,
   // Shared structures and optimized constants
   strings,
   cv2Cache,

package/lib/grinder.js

@@ -1353,6 +1353,7 @@ class AccountWorker {
         case 'search':      cmdResult = await commands.runSearch(cmdOpts); break;
         case 'crime':       cmdResult = await commands.runCrime(cmdOpts); break;
         case 'hl':          cmdResult = await commands.runHighLow(cmdOpts); break;
+  case 'farm':        cmdResult = await commands.runFarm(cmdOpts); break;
         case 'pm':          cmdResult = await commands.runPostMemes(cmdOpts); break;
         case 'hunt':        cmdResult = await commands.runHunt(cmdOpts); break;
         case 'dig':         cmdResult = await commands.runDig(cmdOpts); break;

package/package.json

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