dankgrinder 5.13.0 → 5.14.0

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;
@@ -176,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}`);
     }

package/package.json

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