dankgrinder 8.109.0 → 8.110.0

package/lib/commands/adventure.js

@@ -108,14 +108,31 @@ const SAFE_KEYWORDS = Object.freeze(['flee', 'run', 'hide', 'avoid', 'ignore', '
 const RISKY_KEYWORDS = Object.freeze(['reach', 'grab', 'fight', 'attack', 'steal', 'open', 'touch', 'eat', 'drink']);
 const ADVENTURE_PREFERRED_TYPES = Object.freeze(['space', 'out west']);
 
-function pickSafeChoice(choices) {
+function pickSafeChoice(choices, adventureAnswers) {
   if (choices.length === 0) return null;
   if (choices.length === 1) return choices[0];
 
-  // Check labels for safe/risky keywords
   const labels = choices.map(b => (b.label || '').toLowerCase());
 
-  // Prefer safe keywords
+  // ── 1) Config answer maps (dmg pattern — highest priority) ──
+  if (adventureAnswers) {
+    for (const [question, answers] of Object.entries(adventureAnswers)) {
+      const matched = labels.find(l => l.includes(question));
+      if (matched && Array.isArray(answers)) {
+        for (const answer of answers) {
+          const found = choices.find(c =>
+            (c.label || '').toLowerCase().includes(answer.toLowerCase())
+          );
+          if (found) {
+            LOG.info(`[adventure] Config answer: "${found.label}" matched question "${question}"`);
+            return found;
+          }
+        }
+      }
+    }
+  }
+
+  // ── 2) Hardcoded safe keywords ──
   for (let i = 0; i < labels.length; i++) {
     for (let k = 0; k < SAFE_KEYWORDS.length; k++) {
       const kw = SAFE_KEYWORDS[k];
@@ -126,7 +143,7 @@ function pickSafeChoice(choices) {
     }
   }
 
-  // Avoid risky keywords
+  // ── 3) Avoid risky keywords ──
   const nonRisky = choices.filter((b, i) => {
     return !RISKY_KEYWORDS.some(kw => labels[i].includes(kw));
   });
@@ -143,7 +160,7 @@ function pickSafeChoice(choices) {
 }
 
 // ── Play through all adventure rounds ────────────────────────────
-async function playAdventureRounds(channel, msg) {
+async function playAdventureRounds(channel, msg, adventureAnswers) {
   let current = msg;
   let interactions = 0;
   const MAX_INTERACTIONS = 30;
@@ -171,7 +188,7 @@ async function playAdventureRounds(channel, msg) {
     // ── If there are choices, pick one first ─────────────────
     if (choices.length > 0) {
       LOG.info(`[adventure] ${choices.length} choices: [${choices.map(b => `"${b.label}"`).join(', ')}]`);
-      const choice = pickSafeChoice(choices);
+      const choice = pickSafeChoice(choices, adventureAnswers);
       if (choice) {
         LOG.info(`[adventure] → Choosing: "${choice.label}"`);
         await sleep(50);
@@ -258,9 +275,10 @@ async function playAdventureRounds(channel, msg) {
  * @param {object} opts.channel - Discord channel
  * @param {function} opts.waitForDankMemer - Waits for Dank Memer response
  * @param {object} [opts.client] - Discord client (for modal handling in shop)
+ * @param {object} [opts.adventureAnswers] - Per-type answer map from AccountWorker.ADVENTURE_ANSWERS
  * @returns {Promise<{result: string, coins: number, nextCooldownSec: number|null}>}
  */
-async function runAdventure({ channel, waitForDankMemer, client }) {
+async function runAdventure({ channel, waitForDankMemer, client, adventureAnswers }) {
   LOG.cmd(`${c.white}${c.bold}pls adventure${c.reset}`);
 
   // Step 1: Send the command
@@ -334,7 +352,7 @@ async function runAdventure({ channel, waitForDankMemer, client }) {
   if (hasNextBtn && menus.length === 0) {
     // Already mid-adventure from a previous run — jump straight to rounds
     LOG.info('[adventure] Resuming mid-adventure...');
-    const { text: finalText, coins, interactions, rewards, finalMsg } = await playAdventureRounds(channel, response);
+    const { text: finalText, coins, interactions, rewards, finalMsg } = await playAdventureRounds(channel, response, adventureAnswers);
     return buildResult(finalText, coins, interactions, rewards, finalMsg);
   }
 
@@ -434,7 +452,7 @@ async function runAdventure({ channel, waitForDankMemer, client }) {
   }
 
   // ── Play through all adventure rounds ──────────────────────
-  const { text: finalText, coins, interactions, rewards, finalMsg } = await playAdventureRounds(channel, response);
+  const { text: finalText, coins, interactions, rewards, finalMsg } = await playAdventureRounds(channel, response, adventureAnswers);
   return buildResult(finalText, coins, interactions, rewards, finalMsg);
 }
 

package/lib/grinder.js

@@ -598,6 +598,37 @@ class MinHeap {
 
   get size() { return this.heap.length; }
 
+  // ── Message handler registration (dmg pattern) ──────────────
+  // Allows plugins/commands to register handlers for gateway events.
+  // handlers: { messageCreate: Map<name, fn>, messageUpdate: Map<name, fn> }
+  // ── Dispatch events to registered handlers (dmg pattern) ──
+  _dispatchToHandlers(event, msg) {
+    const handlers = this._handlers[event];
+    if (!handlers || handlers.size === 0) return;
+    for (const [name, fn] of handlers) {
+      try {
+        const result = fn(msg);
+        if (result && typeof result.then === 'function') {
+          result.catch(e => this.log('error', `[handler:${name}] ${e.message}`));
+        }
+      } catch (e) {
+        this.log('error', `[handler:${name}] ${e.message}`);
+      }
+    }
+  }
+
+  _registerHandler(event, name, fn) {
+    if (this._handlers[event]) {
+      this._handlers[event].set(name, fn);
+    }
+  }
+
+  _unregisterHandler(event, name) {
+    if (this._handlers[event]) {
+      this._handlers[event].delete(name);
+    }
+  }
+
   _bubbleUp(i) {
     while (i > 0) {
       const parent = (i - 1) >> 1;
@@ -677,6 +708,14 @@ class AccountWorker {
     this._commandRunning = false;  // prevents grinding commands from overlapping with quest commands
     this._verifyLevelUnlock = null; // holds level to verify after quest completion
     this.commandQueue = null;
+
+    // ── Message handler routing (dmg pattern) ─────────────────
+    // Map of event → handler functions. Plugins register here.
+    // Usage: _handlers.messageCreate.get('adventure')?.(msg)
+    this._handlers = {
+      messageCreate: new Map(),
+      messageUpdate: new Map(),
+    };
     this.lastHealthCheck = Date.now();
     this.doneToday = new Map();
 
@@ -762,6 +801,8 @@ class AccountWorker {
       }
       function handler(msg) {
         if (msg.author.id === DANK_MEMER_ID && msg.channel.id === self.channel.id) {
+          // ── Dispatch to registered handlers (dmg pattern) ────
+          self._dispatchToHandlers('messageCreate', msg);
           const hasComponentPayload = Array.isArray(msg.components)
             && msg.components.some(c => c && (c.components || c.content || c.type || c.label || c.customId));
           const hasContent = (msg.content && msg.content.length > 0)
@@ -791,6 +832,8 @@ class AccountWorker {
           // Reject edits to messages created well before our command was sent
           const msgTs = newMsg.createdTimestamp || newMsg.createdAt?.getTime?.() || 0;
           if (msgTs > 0 && msgTs < sentAt - 1500) return;
+          // ── Dispatch to registered handlers ─────────────────
+          self._dispatchToHandlers('messageUpdate', newMsg);
           cleanup();
           resolve(newMsg);
         }
@@ -1356,6 +1399,7 @@ class AccountWorker {
       client: this.client,
       safeAnswers: cmdName === 'search' ? safeParseJSON(this.account.search_answers, []) :
                    cmdName === 'crime' ? safeParseJSON(this.account.crime_answers, []) : [],
+      adventureAnswers: AccountWorker.ADVENTURE_ANSWERS,
       betAmount: this._questBetOverride || (['blackjack'].includes(cmdName) ? bjBet : gambBet),
       accountId: this.account.id,
       redis,
@@ -1821,6 +1865,42 @@ class AccountWorker {
   ].map(Object.freeze);
 
   // ── Level Quest System — blocks grinding until quests complete ──
+  // ── Adventure answer maps (per type) ──────────────────────────
+  // Pattern: question text → answer choice to click
+  // Supports: space, out west, brazil, vacation, halloween, museum
+  static ADVENTURE_ANSWERS = {
+    space: {
+      'what do you want to do': ['search for debris', 'scavenge wreckage'],
+      'how do you respond': ['stay calm', 'analyze situation'],
+      'what do you choose': ['try to communicate', 'observe first'],
+    },
+    west: {
+      'what do you do': ['draw first', 'hide behind cover'],
+      'how do you respond': ['draw', 'shoot'],
+      'sheriff wants': ['accept bounty', 'decline'],
+    },
+    brazil: {
+      'what do you want to do': ['search for treasure', 'ask locals'],
+      'how do you respond': ['negotiate', 'accept offer'],
+      'locals offer': ['take the deal', 'refuse'],
+    },
+    vacation: {
+      'stranger offers': ['accept', 'decline'],
+      'what do you do': ['explore', 'rest'],
+      'something suspicious': ['investigate', 'ignore'],
+    },
+    halloween: {
+      'knock at door': ['open it', 'hide'],
+      'what do you do': ['investigate', 'run away'],
+      'ghost appears': ['speak to it', 'hide'],
+    },
+    museum: {
+      'what do you do': ['touch exhibit', 'keep distance'],
+      'alarm sounds': ['hide', 'run'],
+      'guard asks': ['tell truth', 'lie'],
+    },
+  };
+
   static LEVEL_QUESTS = {
     1: [
       { cmd: 'beg',    times: 2 },

package/lib/rawLogger.js

@@ -457,6 +457,20 @@ async function store(d, event) {
         pipe.ltrim(accKey, 0, 4999);
         pipe.expire(accKey, LOG_TTL);
       }
+      // Track ephemeral in memory for quick access before they vanish
+      if (parsed.isEphemeral || (d.flags & 32832)) {
+        let chMap = ephemeralByChannel.get(d.channel_id);
+        if (!chMap) {
+          chMap = new Map();
+          ephemeralByChannel.set(d.channel_id, chMap);
+        }
+        chMap.set(d.id, parsed);
+        // Cap per-channel ephemeral buffer at 50
+        if (chMap.size > 50) {
+          const firstKey = chMap.keys().next().value;
+          chMap.delete(firstKey);
+        }
+      }
       // Ephemeral log
       if (parsed.isEphemeral || (d.flags & 32832)) {
         pipe.lpush('raw:ephemeral:log', `${d.id}:${parsed._capturedAt}:${parsed.command}:${d.channel_id}`);
@@ -494,8 +508,17 @@ function onDmEvent(fn) { dmListeners.push(fn); }
 
 // ── Ephemeral message callbacks ──
 const ephemeralListeners = [];
+const ephemeralByChannel = new Map(); // channelId → Map<msgId, parsed msg>
+
 function onNextEphemeral(fn) { ephemeralListeners.push(fn); }
 
+// Track ephemeral messages per channel — useful for reading state before vanish
+function getEphemeralMsgs(channelId, count = 20) {
+  const map = ephemeralByChannel.get(channelId);
+  if (!map) return [];
+  return [...map.values()].slice(-count);
+}
+
 function _notifyEphemeral(parsed) {
   if (!ephemeralListeners.length) return;
   const listeners = [...ephemeralListeners];

package/package.json

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