waengine 1.0.2 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waengine",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "🚀 WAEngine - The most powerful WhatsApp Bot Library with Multi-Device Support & EasyBot API",
   "main": "src/index.js",
   "type": "module",
@@ -49,6 +49,7 @@
     "@whiskeysockets/baileys": "^7.0.0-rc.9",
     "pino": "^8.0.0",
     "playwright": "^1.58.1",
+    "qrcode": "^1.5.4",
     "qrcode-terminal": "^0.12.0"
   },
   "devDependencies": {

package/src/client.js

@@ -1,4 +1,4 @@
-import { makeWASocket, useMultiFileAuthState, DisconnectReason, fetchLatestBaileysVersion } from "@whiskeysockets/baileys";
+import { makeWASocket, useMultiFileAuthState, DisconnectReason, fetchLatestBaileysVersion, isJidBroadcast } from "@whiskeysockets/baileys";
 import pino from "pino";
 import { generateQRCode, closeBrowser } from "./qr.js";
 import { Message } from "./message.js";
@@ -48,22 +48,42 @@ export class WhatsAppClient {
             this.socket = makeWASocket({
                 version,
                 auth: state,
-                printQRInTerminal: this.options.printQR,
                 logger: pino({ level: this.options.logLevel }),
                 browser: this.options.browser,
                 generateHighQualityLinkPreview: true,
-                syncFullHistory: false,
-                markOnlineOnConnect: true
+                syncFullHistory: true, // Wichtig für Message-Empfang
+                markOnlineOnConnect: true,
+                getMessage: async (key) => {
+                    // Wichtig für Message-Handling
+                    return { conversation: "Message not found" };
+                },
+                shouldIgnoreJid: jid => isJidBroadcast(jid),
+                // Bessere Message-Synchronisation
+                emitOwnEvents: true,
+                fireInitQueries: true,
+                shouldSyncHistoryMessage: msg => {
+                    return !!msg.message && !msg.key.fromMe;
+                }
             });
         } catch (versionError) {
             this.socket = makeWASocket({
                 auth: state,
-                printQRInTerminal: this.options.printQR,
                 logger: pino({ level: this.options.logLevel }),
                 browser: this.options.browser,
                 generateHighQualityLinkPreview: true,
-                syncFullHistory: false,
-                markOnlineOnConnect: true
+                syncFullHistory: true, // Wichtig für Message-Empfang
+                markOnlineOnConnect: true,
+                getMessage: async (key) => {
+                    // Wichtig für Message-Handling
+                    return { conversation: "Message not found" };
+                },
+                shouldIgnoreJid: jid => isJidBroadcast(jid),
+                // Bessere Message-Synchronisation
+                emitOwnEvents: true,
+                fireInitQueries: true,
+                shouldSyncHistoryMessage: msg => {
+                    return !!msg.message && !msg.key.fromMe;
+                }
             });
         }
 
@@ -75,20 +95,44 @@ export class WhatsAppClient {
         }
 
         return new Promise((resolve, reject) => {
+            // Event-Handler SOFORT registrieren, nicht erst bei "open"
+            this.setupEventHandlers();
+            
             this.socket.ev.on("connection.update", async ({ connection, lastDisconnect, qr }) => {
-                if (qr && !this.options.printQR && !isLoggedIn) {
-                    await generateQRCode(qr);
+                console.log(`🔄 Connection Update: ${connection}`);
+                
+                if (qr) {
+                    console.log("📱 QR-Code empfangen");
+                    if (this.options.printQR) {
+                        // Terminal QR
+                        console.log("\n📱 QR-CODE IM TERMINAL:");
+                        console.log("─".repeat(50));
+                        const qrcode = await import("qrcode-terminal");
+                        qrcode.default.generate(qr, { small: true });
+                        console.log("─".repeat(50));
+                        console.log("📲 Scanne den QR-Code mit WhatsApp!");
+                    } else {
+                        // Browser QR
+                        await generateQRCode(qr);
+                    }
+                }
+                
+                if (connection === "connecting") {
+                    console.log("🔄 Verbinde mit WhatsApp...");
                 }
                 
                 if (connection === "close") {
+                    console.log("🔴 Verbindung geschlossen");
                     const statusCode = lastDisconnect?.error?.output?.statusCode;
                     const shouldReconnect = statusCode !== DisconnectReason.loggedOut;
                     
                     if (shouldReconnect) {
+                        console.log("🔄 Wiederverbindung in 3 Sekunden...");
                         this.isConnected = false;
                         this.socket = null;
                         setTimeout(() => this.connect().then(resolve).catch(reject), 3000);
                     } else {
+                        console.log("👋 Ausgeloggt");
                         await closeBrowser();
                         this.emit('disconnected', { reason: 'logged_out' });
                         reject(new Error('Logged out'));
@@ -96,7 +140,7 @@ export class WhatsAppClient {
                 } else if (connection === "open") {
                     console.log("✅ WhatsApp verbunden!");
                     this.isConnected = true;
-                    this.setupEventHandlers();
+                    await closeBrowser(); // QR Browser schließen
                     this.emit('connected');
                     resolve(this);
                 }
@@ -157,14 +201,51 @@ export class WhatsAppClient {
     }
 
     setupEventHandlers() {
-        // Messages
+        console.log("🔧 Registriere Event-Handler...");
+        
+        // Messages - Verbesserte Message-Erkennung
         this.socket.ev.on("messages.upsert", ({ messages, type }) => {
-            if (type !== "notify") return;
+            console.log(`📨 Messages.upsert - Type: ${type}, Count: ${messages.length}`);
+            
+            // Alle Message-Types verarbeiten, nicht nur "notify"
+            if (type !== "notify" && type !== "append") {
+                console.log(`⚠️ Ignoriere Message-Type: ${type}`);
+                return;
+            }
 
-            messages.forEach(msg => {
-                if (!msg.message || msg.key.fromMe) return;
+            messages.forEach((msg, index) => {
+                console.log(`🔍 Processing message ${index + 1}/${messages.length}`);
+                console.log(`   - From: ${msg.key.remoteJid}`);
+                console.log(`   - FromMe: ${msg.key.fromMe}`);
+                console.log(`   - Message Keys: ${Object.keys(msg.message || {}).join(', ')}`);
+                
+                // Bessere Message-Validierung
+                if (!msg.message) {
+                    console.log("   ❌ Keine Message-Daten");
+                    return;
+                }
+                
+                if (msg.key.fromMe) {
+                    console.log("   ❌ Eigene Nachricht - ignoriert");
+                    return;
+                }
+                
+                // Ignoriere Broadcast-Messages
+                if (msg.key.remoteJid && isJidBroadcast(msg.key.remoteJid)) {
+                    console.log("   ❌ Broadcast-Message - ignoriert");
+                    return;
+                }
 
                 const messageData = this.parseMessage(msg);
+                console.log(`   ✅ Text extrahiert: "${messageData.text}"`);
+                console.log(`   ✅ Type: ${messageData.type}`);
+                
+                // Nur verarbeiten wenn Text vorhanden oder andere unterstützte Typen
+                if (!messageData.text && messageData.type === 'unknown') {
+                    console.log("   ❌ Kein Text und unbekannter Typ");
+                    return;
+                }
+                
                 const messageObj = new Message(this, messageData);
                 
                 // Prefix System - Command Check
@@ -172,6 +253,8 @@ export class WhatsAppClient {
                     const commandText = messageData.text.slice(this.prefix.length).trim();
                     const [command, ...args] = commandText.split(' ');
                     
+                    console.log(`   ⚡ Command erkannt: ${command}`);
+                    
                     messageObj.isCommand = true;
                     messageObj.command = command.toLowerCase();
                     messageObj.args = args;
@@ -183,40 +266,82 @@ export class WhatsAppClient {
                     // Spezifischen Command Handler aufrufen falls vorhanden
                     if (this.commands.has(command.toLowerCase())) {
                         const handler = this.commands.get(command.toLowerCase());
+                        console.log(`   🎯 Führe Command-Handler aus: ${command}`);
                         try {
                             handler(messageObj, args);
                         } catch (error) {
                             console.error(`❌ Fehler in Command '${command}':`, error);
                         }
+                    } else {
+                        console.log(`   ❓ Kein Handler für Command: ${command}`);
                     }
                 } else {
                     messageObj.isCommand = false;
                     messageObj.command = null;
                     messageObj.args = [];
+                    console.log("   📝 Normale Nachricht");
                 }
                 
+                console.log("   📤 Emittiere Message-Event");
                 this.emit('message', messageObj);
+                console.log("   ✅ Message verarbeitet");
             });
         });
 
+        // Zusätzliche Events für bessere Kompatibilität
+        this.socket.ev.on("messages.update", (updates) => {
+            console.log(`📝 Messages.update - Count: ${updates.length}`);
+            this.emit('messages.update', updates);
+        });
+
+        // Bessere Presence-Handling
+        this.socket.ev.on("presence.update", (update) => {
+            console.log(`👤 Presence.update - ID: ${update.id}`);
+            this.emit('presence.update', update);
+        });
+
         // Group updates
         this.socket.ev.on("group-participants.update", (update) => {
+            console.log(`👥 Group-participants.update - Group: ${update.id}`);
             this.emit('group.participants.update', update);
         });
 
-        // Presence updates
-        this.socket.ev.on("presence.update", (update) => {
-            this.emit('presence.update', update);
+        // Chats updates für bessere Synchronisation
+        this.socket.ev.on("chats.upsert", (chats) => {
+            console.log(`💬 Chats.upsert - Count: ${chats.length}`);
+            this.emit('chats.upsert', chats);
+        });
+
+        // Contacts updates
+        this.socket.ev.on("contacts.upsert", (contacts) => {
+            console.log(`📞 Contacts.upsert - Count: ${contacts.length}`);
+            this.emit('contacts.upsert', contacts);
         });
+        
+        console.log("✅ Event-Handler registriert!");
     }
 
     parseMessage(msg) {
-        const text = 
-            msg.message.conversation ||
-            msg.message.extendedTextMessage?.text ||
-            msg.message.imageMessage?.caption ||
-            msg.message.videoMessage?.caption ||
-            null;
+        // Erweiterte Text-Extraktion für verschiedene Message-Typen
+        let text = null;
+        
+        if (msg.message.conversation) {
+            text = msg.message.conversation;
+        } else if (msg.message.extendedTextMessage?.text) {
+            text = msg.message.extendedTextMessage.text;
+        } else if (msg.message.imageMessage?.caption) {
+            text = msg.message.imageMessage.caption;
+        } else if (msg.message.videoMessage?.caption) {
+            text = msg.message.videoMessage.caption;
+        } else if (msg.message.documentMessage?.caption) {
+            text = msg.message.documentMessage.caption;
+        } else if (msg.message.buttonsResponseMessage?.selectedButtonId) {
+            text = msg.message.buttonsResponseMessage.selectedButtonId;
+        } else if (msg.message.listResponseMessage?.singleSelectReply?.selectedRowId) {
+            text = msg.message.listResponseMessage.singleSelectReply.selectedRowId;
+        } else if (msg.message.templateButtonReplyMessage?.selectedId) {
+            text = msg.message.templateButtonReplyMessage.selectedId;
+        }
 
         return {
             id: msg.key.id,
@@ -226,12 +351,14 @@ export class WhatsAppClient {
             timestamp: msg.messageTimestamp,
             type: this.getMessageType(msg.message),
             isGroup: msg.key.remoteJid?.includes("@g.us"),
+            participant: msg.key.participant, // Wichtig für Gruppen
             raw: msg
         };
     }
 
     getMessageType(message) {
         if (message.conversation) return 'text';
+        if (message.extendedTextMessage) return 'text';
         if (message.imageMessage) return 'image';
         if (message.videoMessage) return 'video';
         if (message.audioMessage) return 'audio';
@@ -239,6 +366,11 @@ export class WhatsAppClient {
         if (message.stickerMessage) return 'sticker';
         if (message.locationMessage) return 'location';
         if (message.contactMessage) return 'contact';
+        if (message.buttonsResponseMessage) return 'button_response';
+        if (message.listResponseMessage) return 'list_response';
+        if (message.templateButtonReplyMessage) return 'template_button_reply';
+        if (message.pollCreationMessage) return 'poll';
+        if (message.pollUpdateMessage) return 'poll_update';
         return 'unknown';
     }
 

package/src/qr.js

@@ -6,26 +6,10 @@ let page = null;
 
 export async function generateQRCode(qrData = null) {
     try {
-        // Browser öffnen falls noch nicht offen
-        if (!browser) {
-            console.log("🌐 Öffne Microsoft Edge...");
-            browser = await chromium.launch({
-                channel: "msedge",
-                headless: false
-            });
-        }
-
-        // Neue Seite öffnen falls noch nicht vorhanden
-        if (!page) {
-            page = await browser.newPage();
-            await page.goto("https://web.whatsapp.com");
-            console.log("🌐 Microsoft Edge mit WhatsApp Web geöffnet");
-        }
-
-        // QR-Code anzeigen falls vorhanden
+        // QR-Code im Terminal anzeigen falls vorhanden
         if (qrData) {
             console.log("\n📱 QR-CODE GENERIERT!");
-            console.log("👆 Scanne den QR-Code im Edge Browser ODER hier im Terminal:");
+            console.log("👆 Scanne den QR-Code hier im Terminal:");
             console.log("─".repeat(50));
             
             // QR-Code im Terminal anzeigen
@@ -36,22 +20,147 @@ export async function generateQRCode(qrData = null) {
             console.log("   1. Gehe zu Einstellungen");
             console.log("   2. Tippe auf 'Verknüpfte Geräte'");
             console.log("   3. Tippe auf 'Gerät verknüpfen'");
-            console.log("   4. Scanne den QR-Code");
+            console.log("   4. Scanne den QR-Code OBEN im Terminal");
             console.log("⏳ Warte auf QR-Scan...");
         }
 
+        // Browser öffnen und den richtigen QR-Code anzeigen
+        if (!browser && qrData) {
+            console.log("🌐 Öffne Browser mit korrektem QR-Code...");
+            browser = await chromium.launch({
+                channel: "msedge",
+                headless: false
+            });
+            
+            page = await browser.newPage();
+            
+            // Custom HTML-Seite mit dem richtigen QR-Code erstellen
+            const qrCodeDataURL = await generateQRCodeDataURL(qrData);
+            const html = `
+<!DOCTYPE html>
+<html>
+<head>
+    <title>WAEngine - QR Code Scanner</title>
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+            background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+            margin: 0;
+            padding: 20px;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            min-height: 100vh;
+            color: white;
+        }
+        .container {
+            background: rgba(255, 255, 255, 0.1);
+            backdrop-filter: blur(10px);
+            border-radius: 20px;
+            padding: 40px;
+            text-align: center;
+            box-shadow: 0 8px 32px rgba(0, 0, 0, 0.3);
+            border: 1px solid rgba(255, 255, 255, 0.2);
+        }
+        h1 {
+            margin-bottom: 20px;
+            font-size: 2.5em;
+            text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.3);
+        }
+        .qr-container {
+            background: white;
+            padding: 20px;
+            border-radius: 15px;
+            margin: 20px 0;
+            box-shadow: 0 4px 16px rgba(0, 0, 0, 0.2);
+        }
+        .qr-code {
+            max-width: 300px;
+            height: auto;
+        }
+        .instructions {
+            font-size: 1.2em;
+            line-height: 1.6;
+            margin-top: 20px;
+        }
+        .step {
+            margin: 10px 0;
+            padding: 10px;
+            background: rgba(255, 255, 255, 0.1);
+            border-radius: 10px;
+        }
+        .warning {
+            background: rgba(255, 193, 7, 0.2);
+            border: 2px solid #ffc107;
+            border-radius: 10px;
+            padding: 15px;
+            margin: 20px 0;
+            font-weight: bold;
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <h1>🚀 WAEngine QR Scanner</h1>
+        <div class="qr-container">
+            <img src="${qrCodeDataURL}" alt="QR Code" class="qr-code" />
+        </div>
+        <div class="warning">
+            ⚠️ Scanne NUR diesen QR-Code!<br>
+            Nicht den Standard WhatsApp Web QR-Code!
+        </div>
+        <div class="instructions">
+            <div class="step">📱 1. Öffne WhatsApp auf deinem Handy</div>
+            <div class="step">⚙️ 2. Gehe zu Einstellungen</div>
+            <div class="step">🔗 3. Tippe auf "Verknüpfte Geräte"</div>
+            <div class="step">📷 4. Tippe auf "Gerät verknüpfen"</div>
+            <div class="step">🎯 5. Scanne den QR-Code oben</div>
+        </div>
+    </div>
+    <script>
+        // Auto-refresh QR code every 30 seconds
+        setTimeout(() => {
+            location.reload();
+        }, 30000);
+    </script>
+</body>
+</html>`;
+            
+            await page.setContent(html);
+            console.log("✅ Browser mit korrektem QR-Code geöffnet!");
+        }
+
         return { browser, page };
         
     } catch (error) {
-        console.error("❌ Fehler beim Öffnen von Edge:", error);
+        console.error("❌ Fehler beim QR-Code Browser:", error);
         
         // Fallback: QR nur im Terminal
         if (qrData) {
-            console.log("📱 Fallback - QR-Code im Terminal:");
+            console.log("📱 Fallback - QR-Code nur im Terminal:");
             qrcode.generate(qrData, { small: true });
         }
         
-        throw error;
+        return null;
+    }
+}
+
+// Hilfsfunktion um QR-Code als Data URL zu generieren
+async function generateQRCodeDataURL(qrData) {
+    try {
+        const QRCode = await import('qrcode');
+        return await QRCode.toDataURL(qrData, {
+            width: 300,
+            margin: 2,
+            color: {
+                dark: '#000000',
+                light: '#FFFFFF'
+            }
+        });
+    } catch (error) {
+        console.error("❌ Fehler beim QR-Code DataURL:", error);
+        return 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMzAwIiBoZWlnaHQ9IjMwMCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cmVjdCB3aWR0aD0iMzAwIiBoZWlnaHQ9IjMwMCIgZmlsbD0iI2Y4ZjlmYSIvPjx0ZXh0IHg9IjE1MCIgeT0iMTUwIiBmb250LWZhbWlseT0iQXJpYWwiIGZvbnQtc2l6ZT0iMTYiIGZpbGw9IiM2NjY2NjYiIHRleHQtYW5jaG9yPSJtaWRkbGUiPkVycm9yPC90ZXh0Pjwvc3ZnPg==';
     }
 }
 
@@ -62,4 +171,4 @@ export async function closeBrowser() {
         page = null;
         console.log("🔴 Browser geschlossen");
     }
-}
+}