dankgrinder 7.78.0 → 7.81.0

package/lib/grinder.js

@@ -339,6 +339,17 @@ function colorBanner() {
 
 // ── Simple Logging ─────────────────────────────────────────────
 function log(type, msg, label) {
+  // Route grinding logs through terminal flash events when active
+  if (terminal._active) {
+    const clean = stripAnsi(String(msg || '')).substring(0, 120);
+    const tagClean = stripAnsi(String(label || ''));
+    terminal.flashEvent(
+      type === 'error' ? 'death' : type === 'warn' ? 'warn' : 'info',
+      `${tagClean ? tagClean + ' ' : ''}${clean}`
+    );
+    return;
+  }
+
   const colorIcons = {
     info: `${c.dim}·${c.reset}`, success: `${rgb(52, 211, 153)}✓${c.reset}`,
     error: `${rgb(239, 68, 68)}✗${c.reset}`, warn: `${rgb(251, 191, 36)}!${c.reset}`,
@@ -2750,11 +2761,6 @@ async function start(apiKey, apiUrl, opts = {}) {
   const CLOUD_MODE = opts.cloud === true;
   startTime = Date.now();
 
-  if (CLOUD_MODE) {
-    // In cloud mode, API_KEY is the CLOUD_ADMIN_KEY — not used for user auth.
-    // Per-account keys are fetched per-account from /api/cloud/grinders.
-    console.log('🌥️  Starting in CLOUD MODE — grinding all cloud-enabled accounts');
-  }
   REDIS_URL = process.env.REDIS_URL || '';
   WEBHOOK_URL = process.env.WEBHOOK_URL || '';
 
@@ -2762,15 +2768,14 @@ async function start(apiKey, apiUrl, opts = {}) {
   let hasZlib = false;
   try { require('zlib-sync'); hasZlib = true; } catch {}
 
-  console.log(colorBanner());
-  console.log(
-    `  ${rgb(139, 92, 246)}v${PKG_VERSION}${c.reset}` +
-    `  ${c.dim}·${c.reset}  ${c.white}${AccountWorker.COMMAND_MAP.length} Commands${c.reset}` +
-    `  ${c.dim}·${c.reset}  ${rgb(34, 211, 238)}${CLOUD_MODE ? 'Cloud Mode' : (CLUSTER_ENABLED ? 'Cluster Mode' : 'Standalone')}${c.reset}` +
-    `  ${c.dim}·${c.reset}  ${rgb(52, 211, 153)}Auto-Recovery${c.reset}` +
-    `  ${c.dim}·${c.reset}  ${rgb(251, 191, 36)}Loss Limiter${c.reset}`
-  );
-  log('info', `${c.dim}Fetching accounts...${c.reset}`);
+  // Init terminal FIRST — captures all subsequent console.log output
+  terminal.setVersion(PKG_VERSION);
+  terminal.init({ workers: [], startTime });
+
+  if (CLOUD_MODE) {
+    console.log(`${rgb(139, 92, 246)}🌥️  Starting in CLOUD MODE — grinding all cloud-enabled accounts${c.reset}`);
+  }
+  terminal.startPhase('Fetching accounts...');
 
   const fetchOpts = CLOUD_MODE ? { cloud: true } : {};
   let data = await fetchConfig(4, 2000, fetchOpts);
@@ -2781,9 +2786,11 @@ async function start(apiKey, apiUrl, opts = {}) {
     data = await fetchConfig(4, 2000, fetchOpts);
   }
   if (data && data.error) {
+    terminal.endPhase(`API error: ${data.error}`, false);
     log('error', `${data.error}`);
     return;
   }
+  terminal.endPhase(`API connected — ${data.accounts?.length || 0} accounts`);
 
   // Cloud mode: post heartbeat every 30s
   if (CLOUD_MODE) {
@@ -2828,10 +2835,6 @@ async function start(apiKey, apiUrl, opts = {}) {
     }
   }
 
-  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}`);
-
   // Init rawLogger Redis (uses same URL — logs all raw gateway data)
   if (REDIS_URL) {
     rawLogger.init(redis);
@@ -2876,16 +2879,7 @@ async function start(apiKey, apiUrl, opts = {}) {
         }
       }
     });
-    checks.push(`${rgb(52, 211, 153)}✓${c.reset} ${c.white}RawLog${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}`);
-  console.log(`  ${checks.join('   ')}`);
-  console.log('');
 
   // ── Terminal renderer init ─────────────────────────────────────
   terminal.setVersion(PKG_VERSION);