waengine 2.2.5 → 2.3.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waengine",
-  "version": "2.2.5",
+  "version": "2.3.5",
   "description": "🚀 WAEngine - The most powerful WhatsApp Bot Library with 860+ Working Features, Complete Baileys Integration & Production-Ready Stability",
   "main": "src/index.js",
   "type": "module",

package/src/console-logger.js

@@ -285,7 +285,8 @@ let sessionMenuShown = false;
 
 export async function showSessionMenuIfNeeded() {
     // Prüfe ob wir vom Session Menu selbst aufgerufen werden
-    if (global.__WAENGINE_SKIP_SESSION_MENU__) {
+    // WICHTIG: Prüfe sowohl global als auch Environment-Variable!
+    if (global.__WAENGINE_SKIP_SESSION_MENU__ || process.env.__WAENGINE_SKIP_SESSION_MENU__ === 'true') {
         return null;
     }
     

package/src/session-menu.js

@@ -18,13 +18,16 @@ const c = {
 };
 
 export class SessionMenu {
-    constructor(baseAuthDir = './auth') {  // Geändert von './sessions' zu './auth'
+    constructor(baseAuthDir = './auth') {
         this.baseAuthDir = baseAuthDir;
-        this.sessionsConfigPath = path.join(baseAuthDir, '..', 'sessions.json');  // Eine Ebene höher
-        this.sessionStatusPath = path.join(baseAuthDir, '..', 'session-status.json');  // Status-Tracking
+        this.sessionsConfigPath = path.join(baseAuthDir, '..', 'sessions.json');
+        this.sessionStatusPath = path.join(baseAuthDir, '..', 'session-status.json');
         this.activeSessions = new Map();
         this.rl = null;
         
+        // Erkenne das Start-Script aus process.argv
+        this.userStartCommand = this.detectStartCommand();
+        
         if (!fs.existsSync(baseAuthDir)) {
             fs.mkdirSync(baseAuthDir, { recursive: true });
         }
@@ -32,6 +35,22 @@ export class SessionMenu {
         this.loadSessionsConfig();
         this.loadSessionStatus();
     }
+    
+    // Erkenne wie der User seinen Bot gestartet hat
+    detectStartCommand() {
+        // process.argv[0] = node
+        // process.argv[1] = script.js
+        const scriptPath = process.argv[1];
+        
+        if (scriptPath) {
+            const scriptName = path.basename(scriptPath);
+            console.log(c.green(`✅ Start-Command erkannt: node ${scriptName}`));
+            return scriptName;
+        }
+        
+        // Fallback
+        return 'index.js';
+    }
 
     loadSessionsConfig() {
         if (fs.existsSync(this.sessionsConfigPath)) {
@@ -101,20 +120,17 @@ export class SessionMenu {
 
         console.log(c.cyan(`\n🚀 Öffne neues Terminal für Session: ${sessionName}...`));
         
-        // Erstelle ein temporäres Start-Script für diese Session
-        const scriptPath = path.join(process.cwd(), `.session-${sessionName}.js`);
+        // Setze Status auf "connecting"
+        this.updateSessionStatus(sessionName, 'connecting');
+        
+        // Erstelle Wrapper-Script für Status-Tracking
+        const wrapperPath = path.join(process.cwd(), `.session-${sessionName}-wrapper.js`);
         const statusPath = path.join(process.cwd(), 'session-status.json');
         
-        const scriptContent = `
-// Auto-generiertes Session-Start-Script für: ${sessionName}
-import { WhatsAppClient } from './index.js';
+        const wrapperContent = `// Session Wrapper für: ${sessionName}
 import fs from 'fs';
+import { spawn } from 'child_process';
 
-console.log('╔════════════════════════════════════════╗');
-console.log('║   WAEngine Session: ${sessionName.padEnd(20)}║');
-console.log('╚════════════════════════════════════════╝\\n');
-
-// Status-Update Funktion
 function updateStatus(status) {
     try {
         let statusData = {};
@@ -131,73 +147,56 @@ function updateStatus(status) {
         
         fs.writeFileSync('${statusPath.replace(/\\/g, '/')}', JSON.stringify(statusData, null, 2));
     } catch (error) {
-        console.error('Status-Update Fehler:', error.message);
+        console.error('❌ Status-Update Fehler:', error.message);
     }
 }
 
-// Status: Verbindet
-updateStatus('connecting');
+console.log('╔════════════════════════════════════════╗');
+console.log('║   WAEngine Session: ${sessionName.padEnd(20)}║');
+console.log('╚════════════════════════════════════════╝\\n');
 
-// Deaktiviere Session Menu für diese Session
-global.__WAENGINE_SKIP_SESSION_MENU__ = true;
+updateStatus('connecting');
 
-const client = new WhatsAppClient({
-    authDir: '${session.authDir.replace(/\\/g, '/')}',
-    printQR: false,
-    silent: false
+// Starte User's Bot-Script mit Environment-Variablen
+const botProcess = spawn('node', ['${this.userStartCommand}'], {
+    env: {
+        ...process.env,
+        WAENGINE_AUTH_DIR: '${session.authDir.replace(/\\/g, '/')}',
+        WAENGINE_SESSION_NAME: '${sessionName}',
+        __WAENGINE_SKIP_SESSION_MENU__: 'true'
+    },
+    stdio: 'inherit'
 });
 
-console.log('🔄 Starte Session ${sessionName}...\\n');
-
-try {
-    await client.connect();
-    
-    // Status: Online
+// Warte kurz und setze Status auf online
+setTimeout(() => {
     updateStatus('online');
     
-    console.log('\\n✅ Session ${sessionName} läuft!');
-    console.log('💬 Bot wartet auf Nachrichten...\\n');
-    
-    // Heartbeat: Status alle 10 Sekunden aktualisieren
+    // Heartbeat alle 10 Sekunden
     setInterval(() => {
         updateStatus('online');
     }, 10000);
-    
-    // Beispiel: Message Handler
-    client.on('message', async (msg) => {
-        console.log(\`📨 Nachricht von \${msg.from}: \${msg.body}\`);
-        
-        // Hier kann der User seinen Bot-Code einfügen
-        if (msg.body === '!ping') {
-            await msg.reply('🏓 Pong!');
-        }
-    });
-    
-} catch (error) {
-    console.error('❌ Fehler beim Starten:', error.message);
+}, 3000);
+
+botProcess.on('exit', (code) => {
+    console.log(\`\\n👋 Bot beendet (Code: \${code})\`);
     updateStatus('offline');
-}
+    process.exit(code);
+});
 
-// Verhindere dass das Script beendet wird
 process.on('SIGINT', () => {
     console.log('\\n👋 Session ${sessionName} wird beendet...');
     updateStatus('offline');
+    botProcess.kill();
     process.exit(0);
 });
-
-process.on('exit', () => {
-    updateStatus('offline');
-});
 `;
 
-        // Schreibe das Script
-        fs.writeFileSync(scriptPath, scriptContent);
-        
-        // Setze Status auf "connecting"
-        this.updateSessionStatus(sessionName, 'connecting');
+        // Schreibe Wrapper-Script
+        fs.writeFileSync(wrapperPath, wrapperContent);
         
-        // Öffne neues Terminal (Windows CMD)
-        const command = `start "WAEngine - ${sessionName}" cmd /k "node ${scriptPath}"`;
+        // Öffne neues Terminal mit Wrapper-Script
+        const command = `start "WAEngine - ${sessionName}" cmd /k "node ${wrapperPath}"`;
         
         try {
             spawn(command, [], {
@@ -207,7 +206,8 @@ process.on('exit', () => {
             });
             
             console.log(c.green(`✅ Neues Terminal geöffnet für: ${sessionName}`));
-            console.log(c.gray(`   Script: ${scriptPath}`));
+            console.log(c.gray(`   Command: node ${this.userStartCommand}`));
+            console.log(c.gray(`   Auth: ${session.authDir}`));
             console.log(c.gray(`   Status wird automatisch aktualisiert...`));
             
             return true;
@@ -215,8 +215,8 @@ process.on('exit', () => {
             console.log(c.red(`❌ Fehler beim Öffnen des Terminals: ${error.message}`));
             
             // Cleanup
-            if (fs.existsSync(scriptPath)) {
-                fs.unlinkSync(scriptPath);
+            if (fs.existsSync(wrapperPath)) {
+                fs.unlinkSync(wrapperPath);
             }
             
             this.updateSessionStatus(sessionName, 'offline');