fluxy-bot 0.15.5 → 0.15.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fluxy-bot",
-  "version": "0.15.5",
+  "version": "0.15.6",
   "releaseNotes": [
     "1. react router implemented",
     "2. new workspace design",

package/supervisor/channels/whatsapp.ts

@@ -120,18 +120,11 @@ export class WhatsAppChannel implements ChannelProvider {
     // If it's already a phone JID, return as-is
     if (jid.endsWith('@s.whatsapp.net')) return jid;
 
-    // Check LID map
+    // Check LID map (only contains our own LID, mapped during connection)
     const mapped = this.lidToPhoneMap.get(jid);
     if (mapped) return mapped;
 
-    // If it's a LID JID and we know our own phone, and this looks like a self-chat LID
-    // LID JIDs typically end with @lid or have a long numeric format
-    if (this.ownPhoneJid && (jid.includes('@lid') || jid.match(/^\d{15,}@/))) {
-      log.info(`[whatsapp] Unmapped LID ${jid} — assuming self-chat, using own phone JID`);
-      this.lidToPhoneMap.set(jid, this.ownPhoneJid);
-      return this.ownPhoneJid;
-    }
-
+    // Unknown LID — don't guess. Return as-is so isSelfChat stays false.
     return jid;
   }
 
@@ -144,11 +137,18 @@ export class WhatsAppChannel implements ChannelProvider {
     const phone = user.id.split(':')[0];
     this.ownPhoneJid = `${phone}@s.whatsapp.net`;
 
-    // user.lid (if available) is the LID JID
-    if ((user as any).lid) {
-      this.lidToPhoneMap.set((user as any).lid, this.ownPhoneJid);
-      log.info(`[whatsapp] LID map: ${(user as any).lid} → ${this.ownPhoneJid}`);
+    // user.lid (if available) is the LID JID — map it and variations
+    const lid = (user as any).lid;
+    if (lid) {
+      // Map the exact LID
+      this.lidToPhoneMap.set(lid, this.ownPhoneJid);
+      // Also map the numeric part without @lid suffix (remoteJid may use @lid format)
+      const lidNum = lid.split(':')[0].split('@')[0];
+      this.lidToPhoneMap.set(`${lidNum}@lid`, this.ownPhoneJid);
+      log.info(`[whatsapp] LID map: ${lid} (and ${lidNum}@lid) → ${this.ownPhoneJid}`);
     }
+
+    log.info(`[whatsapp] Own phone JID: ${this.ownPhoneJid}`);
   }
 
   private async connectInternal(): Promise<void> {
@@ -250,15 +250,23 @@ export class WhatsAppChannel implements ChannelProvider {
 
         const fromMe = msg.key.fromMe || false;
         const rawSender = msg.key.remoteJid || '';
+        const participant = msg.key.participant || '';
+
+        // Debug: log all available sender fields to find the actual sender
+        log.info(`[whatsapp] DEBUG msg.key: remoteJid=${rawSender} fromMe=${fromMe} participant=${participant}`);
+        log.info(`[whatsapp] DEBUG pushName=${msg.pushName || 'none'} verifiedBizName=${(msg as any).verifiedBizName || 'none'}`);
+
+        // The actual sender JID — use participant if available (newer protocol), fallback to remoteJid
+        const actualSender = participant || rawSender;
 
         // Translate LID JIDs to phone JIDs
-        const sender = this.translateJid(rawSender);
+        const sender = this.translateJid(actualSender);
         const pushName = msg.pushName || undefined;
 
-        // Detect self-chat: remoteJid matches our own phone number
-        const isSelfChat = this.ownPhoneJid !== null && sender === this.ownPhoneJid;
+        // Detect self-chat: remoteJid matches our own phone number AND no participant field
+        const isSelfChat = !participant && this.ownPhoneJid !== null && this.translateJid(rawSender) === this.ownPhoneJid;
 
-        log.info(`[whatsapp] Message from ${sender} (raw=${rawSender}, fromMe=${fromMe}, selfChat=${isSelfChat}): ${text.slice(0, 80)}`);
+        log.info(`[whatsapp] Message from ${sender} (raw=${rawSender}, participant=${participant}, fromMe=${fromMe}, selfChat=${isSelfChat}): ${text.slice(0, 80)}`);
 
         this.onMessage(sender, pushName, text, fromMe, isSelfChat);
       }

package/supervisor/index.ts

@@ -403,20 +403,57 @@ export async function startSupervisor() {
         const status = channelManager.getStatus('whatsapp');
         const connected = status?.connected || false;
         res.writeHead(200);
+        const confettiHTML = Array.from({ length: 30 }, (_, i) => {
+          const colors = ['#04D1FE', '#AF27E3', '#FB4072', '#4ade80', '#facc15', '#818cf8'];
+          const color = colors[Math.floor(Math.random() * colors.length)];
+          const left = Math.random() * 100;
+          const delay = i * 0.04;
+          const drift = (Math.random() - 0.5) * 120;
+          const duration = 1.8 + Math.random() * 0.8;
+          return `<div class="confetti-dot" style="left:${left}%;background:${color};animation-delay:${delay}s;animation-duration:${duration}s;--drift:${drift}px"></div>`;
+        }).join('');
+
         res.end(`<!DOCTYPE html><html><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width,initial-scale=1">
 <title>WhatsApp QR</title>
+<link rel="preconnect" href="https://fonts.googleapis.com">
+<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+<link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&family=Space+Grotesk:wght@600;700&display=swap" rel="stylesheet">
 <style>
-  body{background:#222122;color:#fff;font-family:system-ui,-apple-system,sans-serif;display:flex;flex-direction:column;align-items:center;justify-content:center;height:100dvh;margin:0}
-  .qr-container{background:#fff;border-radius:16px;padding:24px;max-width:300px}
-  .qr-container svg{width:100%;height:auto}
-  .status{margin-top:20px;font-size:14px;opacity:0.7}
-  .connected{color:#4ade80;font-size:18px;font-weight:600}
+  *{margin:0;padding:0;box-sizing:border-box}
+  body{background:#212121;color:#f5f5f5;font-family:'Inter',system-ui,-apple-system,sans-serif;display:flex;flex-direction:column;align-items:center;justify-content:center;height:100dvh;margin:0;overflow:hidden}
+  .container{display:flex;flex-direction:column;align-items:center;max-width:360px;width:100%;padding:0 20px}
+
+  .qr-card{background:#2a2a2a;border:1px solid rgba(255,255,255,0.08);border-radius:20px;padding:28px;width:100%;box-shadow:0 0 0 1px rgba(175,39,227,0.1),0 0 20px -5px rgba(175,39,227,0.15);animation:fade-up .5s ease-out both}
+  .qr-inner{background:#fff;border-radius:12px;padding:16px}
+  .qr-inner svg{width:100%;height:auto;display:block}
+
+  .scan-hint{margin-top:20px;font-size:13px;color:#666;text-align:center;animation:fade-up .5s ease-out .2s both}
+
+  .confetti-wrap{position:fixed;top:0;left:0;width:100%;height:100%;pointer-events:none;overflow:hidden}
+  .confetti-dot{position:absolute;width:8px;height:8px;border-radius:50%;top:-10px;animation:confetti-fall 2s ease-out forwards}
+  @keyframes confetti-fall{0%{opacity:1;transform:translateY(0) translateX(0) rotate(0) scale(1)}100%{opacity:0;transform:translateY(100vh) translateX(var(--drift)) rotate(360deg) scale(.5)}}
+
+  .video-wrap{margin-bottom:8px;animation:pop-in .5s cubic-bezier(.34,1.56,.64,1) forwards}
+  .video-wrap video{width:200px;object-fit:contain}
+  @keyframes pop-in{0%{transform:scale(0);opacity:0}100%{transform:scale(1);opacity:1}}
+
+  .text-wrap{text-align:center;animation:fade-up .5s ease-out .3s both}
+  .title{font-family:'Space Grotesk',sans-serif;font-size:22px;font-weight:700;background:linear-gradient(135deg,#04D1FE,#AF27E3,#FB4072);-webkit-background-clip:text;-webkit-text-fill-color:transparent;background-clip:text;margin-bottom:8px}
+  .subtitle{font-size:14px;color:#999;line-height:1.5}
+
+  .loading{font-size:14px;color:#999;animation:pulse 2s ease-in-out infinite}
+  @keyframes pulse{0%,100%{opacity:.5}50%{opacity:1}}
+  @keyframes fade-up{0%{opacity:0;transform:translateY(10px)}100%{opacity:1;transform:translateY(0)}}
 </style></head><body>
+<div class="container">
 ${connected
-  ? '<div class="connected">Connected!</div><p class="status">WhatsApp is linked. You can close this page.</p>'
+  ? `<div class="confetti-wrap">${confettiHTML}</div>
+<div class="video-wrap"><video autoplay muted playsinline><source src="/fluxy_happy_reappearing.mov" type='video/mp4; codecs="hvc1"'><source src="/fluxy_happy_reappearing.webm" type="video/webm"></video></div>
+<div class="text-wrap"><div class="title">Connected!</div><p class="subtitle">WhatsApp is linked. You can close this page.</p></div>`
   : qr
-    ? `<div class="qr-container">${qr}</div><p class="status">Scan with WhatsApp to link</p>`
-    : '<p class="status">Starting WhatsApp... Refresh in a moment.</p>'}
+    ? `<div class="qr-card"><div class="qr-inner">${qr}</div></div><p class="scan-hint">Scan with WhatsApp to link</p>`
+    : '<p class="loading">Starting WhatsApp... Refresh in a moment.</p>'}
+</div>
 ${!connected ? '<script>setTimeout(()=>location.reload(),4000)</script>' : ''}
 </body></html>`);
         return;