dankgrinder 5.0.2 → 5.0.3

package/lib/grinder.js

@@ -565,32 +565,20 @@ async function reportEarnings(accountId, accountName, earned, spent, command) {
   earningsBatch.push({ account_id: accountId, account_name: accountName, earned, spent, command });
 }
 
-const feedBatch = new AsyncBatchQueue(async (batch) => {
+// Command feed sends directly (no batching) for real-time dashboard SSE updates.
+// The dashboard live queue depends on instant delivery via eventBus.emit("sse").
+async function reportCommandFeed(accountId, accountName, data) {
   if (!API_URL) return;
+  const normalized = { ...data };
+  if (typeof normalized.command === 'string') normalized.command = stripAnsi(normalized.command).replace(/\s+/g, ' ').trim();
+  if (typeof normalized.result === 'string') normalized.result = stripAnsi(normalized.result).replace(/\s+/g, ' ').trim();
   try {
-    await fetch(`${API_URL}/api/grinder/command-feed-batch`, {
+    await fetch(`${API_URL}/api/grinder/command-feed`, {
       method: 'POST',
       headers: { Authorization: `Bearer ${API_KEY}`, 'Content-Type': 'application/json' },
-      body: JSON.stringify({ items: batch }),
+      body: JSON.stringify({ account_id: accountId, account_name: accountName, ...normalized }),
     });
-  } catch {
-    for (const item of batch) {
-      try {
-        await fetch(`${API_URL}/api/grinder/command-feed`, {
-          method: 'POST',
-          headers: { Authorization: `Bearer ${API_KEY}`, 'Content-Type': 'application/json' },
-          body: JSON.stringify(item),
-        });
-      } catch {}
-    }
-  }
-}, { maxSize: 100, flushMs: 2000 });
-
-async function reportCommandFeed(accountId, accountName, data) {
-  const normalized = { ...data };
-  if (typeof normalized.command === 'string') normalized.command = stripAnsi(normalized.command).replace(/\s+/g, ' ').trim();
-  if (typeof normalized.result === 'string') normalized.result = stripAnsi(normalized.result).replace(/\s+/g, ' ').trim();
-  feedBatch.push({ account_id: accountId, account_name: accountName, ...normalized });
+  } catch { /* silent — dashboard just won't see this update */ }
 }
 
 function randomDelay(min, max) {
@@ -1886,7 +1874,7 @@ class AccountWorker {
       this.tickTimeout = setTimeout(() => this.tick(), 5000);
       return;
     }
-    if (this.busy) {
+    if (this.busy || this._invRunning) {
       this.tickTimeout = setTimeout(() => this.tick(), 2000);
       return;
     }
@@ -2189,9 +2177,9 @@ class AccountWorker {
       // Handle pending actions from dashboard
       if (Array.isArray(data.pendingActions)) {
         for (const action of data.pendingActions) {
-          if (action.action === 'check_inventory' && !this.busy) {
+          if (action.action === 'check_inventory' && !this.busy && !this._invRunning) {
             this.log('info', 'Dashboard requested inventory check');
-            this.checkInventory().catch(() => {});
+            await this.checkInventory().catch(() => {});
             try {
               await fetch(`${API_URL}/api/grinder/actions`, {
                 method: 'DELETE',
@@ -2280,6 +2268,8 @@ class AccountWorker {
 
         // Let Discord gateway settle before sending first command
         await new Promise(r => setTimeout(r, 2500));
+        // Run initial inventory check (awaited) before grind loop starts
+        await this.checkInventory().catch(() => {});
         this.grindLoop();
         resolve();
       });
@@ -2341,7 +2331,6 @@ async function start(apiKey, apiUrl) {
   API_URL = apiUrl || process.env.DANKGRINDER_URL || 'http://localhost:3000';
   REDIS_URL = process.env.REDIS_URL || '';
   WEBHOOK_URL = process.env.WEBHOOK_URL || '';
-  initRedis();
 
   process.stdout.write('\x1b[2J\x1b[H');
   const tw = Math.min(process.stdout.columns || 80, 78);
@@ -2361,16 +2350,6 @@ async function start(apiKey, apiUrl) {
   );
   console.log(bar);
 
-  const checks = [];
-  checks.push(`${rgb(52, 211, 153)}✓${c.reset} ${c.white}API${c.reset}`);
-  if (REDIS_URL) checks.push(`${rgb(52, 211, 153)}✓${c.reset} ${c.white}Redis${c.reset}`);
-  if (hasZlib) checks.push(`${rgb(52, 211, 153)}✓${c.reset} ${c.white}zlib${c.reset}`);
-  if (WEBHOOK_URL) checks.push(`${rgb(52, 211, 153)}✓${c.reset} ${c.white}Webhook${c.reset}`);
-  if (CLUSTER_ENABLED) {
-    checks.push(`${rgb(52, 211, 153)}✓${c.reset} ${rgb(34, 211, 238)}Cluster${c.reset} ${c.dim}(${NODE_ID.substring(0, 12)})${c.reset}`);
-  }
-  console.log(`  ${checks.join('   ')}`);
-
   log('info', `${c.dim}Fetching accounts...${c.reset}`);
 
   let data = await fetchConfig(4, 2000);
@@ -2381,6 +2360,13 @@ async function start(apiKey, apiUrl) {
     data = await fetchConfig(4, 2000);
   }
 
+  // Pull Redis/Webhook URLs from API config if not in env
+  if (!REDIS_URL && data.redis_url) REDIS_URL = data.redis_url;
+  if (!REDIS_URL && data.redisUrl) REDIS_URL = data.redisUrl;
+  if (!WEBHOOK_URL && data.webhook_url) WEBHOOK_URL = data.webhook_url;
+  if (!WEBHOOK_URL && data.webhookUrl) WEBHOOK_URL = data.webhookUrl;
+  initRedis();
+
   let { accounts } = data;
   if (!accounts || accounts.length === 0) {
     log('error', 'No active accounts. Add them in the dashboard.');
@@ -2397,9 +2383,15 @@ async function start(apiKey, apiUrl) {
     }
   }
 
+  const checks = [];
+  checks.push(`${rgb(52, 211, 153)}✓${c.reset} ${c.white}API${c.reset}`);
+  if (REDIS_URL) checks.push(redis ? `${rgb(52, 211, 153)}✓${c.reset} ${c.white}Redis${c.reset}` : `${rgb(251, 191, 36)}○${c.reset} ${c.dim}Redis (connecting...)${c.reset}`);
+  if (hasZlib) checks.push(`${rgb(52, 211, 153)}✓${c.reset} ${c.white}zlib${c.reset}`);
+  if (WEBHOOK_URL) checks.push(`${rgb(52, 211, 153)}✓${c.reset} ${c.white}Webhook${c.reset}`);
+  if (CLUSTER_ENABLED) {
+    checks.push(`${rgb(52, 211, 153)}✓${c.reset} ${rgb(34, 211, 238)}Cluster${c.reset} ${c.dim}(${NODE_ID.substring(0, 12)})${c.reset}`);
+  }
   checks.push(`${rgb(52, 211, 153)}✓${c.reset} ${c.white}${accounts.length} Account${accounts.length > 1 ? 's' : ''}${c.reset}`);
-  process.stdout.write(c.cursorUp(1));
-  process.stdout.write(c.clearLine + '\r');
   console.log(`  ${checks.join('   ')}`);
   console.log('');
 

package/package.json

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