fleetbo-cockpit-cli 1.0.245 → 1.0.247

package/cli.js

@@ -899,6 +899,9 @@ else if (['page', 'g', 'generate'].includes(command)) {
 }
 else {
     const NULL_DEV = process.platform === 'win32' ? '>nul 2>&1' : '2>/dev/null';
+
+    // 🟢 FIX 1 : On crée une variable pour garder la trace du serveur Vite
+    let devServerProcess = null;
     
     function killProcessOnPort(port) {
         try {
@@ -909,21 +912,23 @@ else {
         } catch (e) {}
     }
     
-    const killNetworkService = () => {
-        if (uplinkProcess) {
-            try {
-                if (process.platform === 'win32') {
-                    spawn('taskkill', ['/pid', String(uplinkProcess.pid), '/T', '/F'], {
-                        stdio: 'ignore', detached: true, shell: false
-                    }).unref();
-                } else {
-                    uplinkProcess.kill('SIGINT');
-                }
-                console.log('[Fleetbo] Engine closed.');
-            } catch (e) {
-                console.error('[Fleetbo] Error closing tunnel:', e.message);
+    // 🟢 FIX 2 : On tue TOUS les processus enfants (Cloudflare ET Vite) proprement
+    const killAllServices = () => {
+        const killProc = (proc) => {
+            if (proc && proc.pid) {
+                try {
+                    if (process.platform === 'win32') {
+                        spawn('taskkill', ['/pid', String(proc.pid), '/T', '/F'], {
+                            stdio: 'ignore', detached: true, shell: false
+                        }).unref();
+                    } else {
+                        proc.kill('SIGINT');
+                    }
+                } catch (e) {}
             }
-        }
+        };
+        killProc(uplinkProcess);
+        killProc(devServerProcess); 
     };
     
     let isExiting = false;
@@ -940,6 +945,15 @@ else {
         }
         killNetworkService();
         killProcessOnPort(PORT);
+
+        try {
+            // 🟢 FIX 3 : On met un timeout ultra-court (1s) pour ne jamais bloquer la sortie
+            await axios.post(UPDATE_NETWORK_URL, { keyApp, networkUrl: '', tester: testerEmail }, { timeout: 1000 });
+            console.log('\x1b[32m[Fleetbo] Network status reset to offline.\x1b[0m');
+        } catch (e) {
+            // On ignore silencieusement si ça échoue, le but principal est de quitter.
+        }
+
         console.log('[Fleetbo] Bye.');
         process.exit(code);
     }
@@ -973,14 +987,14 @@ else {
         killProcessOnPort(PORT);
         
         if (!testerEmail) { 
-            console.error('\x1b[31m[Error] VITE_FLEETBO_TESTER_EMAIL missing in .env\x1b[0m'); 
+            console.error('\x1b[31m[Error] FLEETBO_APP_TESTER_EMAIL missing in .env\x1b[0m'); 
             process.exit(1); 
         }
         
         const npmCmd = process.platform === 'win32' ? 'npm.cmd' : 'npm';
 
-        // 🟢 FIX 1 : On sépare les arguments dans un tableau pour éviter les crashs de processus sous Windows
-        const devServer = spawn(npmCmd, ['run', 'dev', '--silent', '--', '--host', '127.0.0.1', '--port', String(PORT)], {
+        // 🟢 (Inclut la correction des arguments Arrays vue précédemment)
+        devServerProcess = spawn(npmCmd, ['run', 'dev', '--silent', '--', '--host', '127.0.0.1', '--port', String(PORT)], {
             stdio: ['ignore', 'pipe', 'pipe'],
             shell: true,
             env: { 
@@ -993,15 +1007,14 @@ else {
 
         let connectionStarted = false;
         let detectedPort = PORT; 
-        
-        // 🟢 FIX 2 : Un Buffer mémoire pour ne pas rater les textes coupés en deux !
-        let viteBuffer = "";
 
+        // 🟢 (Inclut la correction du Buffer de texte vue précédemment)
+        let viteBuffer = "";
+        
         devServer.stdout.on('data', (data) => {
-            const chunkText = data.toString();
-            viteBuffer += chunkText; // On accumule tout l'historique
+            const output = data.toString();
             
-            const lines = chunkText.split('\n');
+            const lines = output.split('\n');
             const forbiddenTerms = [
                 'Attempting to bind to HOST', 'If this was unintentional', 'Learn more here:',
                 'Starting the development server', 'You can now view', 'vite v', 'VITE v', 'Port', 'is in use',
@@ -1017,12 +1030,12 @@ else {
                 process.stdout.write(filteredOutput + '\n');
             }
             
-            if (!connectionStarted) {
-                // On cherche l'URL de Vite dans l'historique COMPLET
-                const portMatch = viteBuffer.match(/http:\/\/(?:localhost|127\.0\.0\.1):(\d+)/);
+            const portMatch = output.match(/http:\/\/(?:localhost|127\.0\.0\.1):(\d+)/);
 
-                if (portMatch) {
-                    detectedPort = portMatch[1]; 
+            if (portMatch) {
+                detectedPort = portMatch[1]; 
+                
+                if (!connectionStarted) {
                     connectionStarted = true;
 
                     console.log('\x1b[33mFleetbo OS ❯\x1b[0m ---------------------------------------------------');
@@ -1030,62 +1043,57 @@ else {
                     console.log(`\x1b[33mFleetbo OS ❯\x1b[0m Please wait for the green message...`);
                     console.log('\x1b[33mFleetbo OS ❯\x1b[0m ---------------------------------------------------\n');
 
-                    const MAX_UPLINK_RETRIES = 5;
-                    const RETRY_DELAYS = [0, 10, 20, 30, 45];
-                    let uplinkFound = false;
+                const MAX_UPLINK_RETRIES = 5;
+                const RETRY_DELAYS = [0, 10, 20, 30, 45];
+                let uplinkFound = false;
+
+                const startUplink = (attempt) => {
+                    if (uplinkFound) return;
+
+                    const npxCmd = process.platform === 'win32' ? 'npx.cmd' : 'npx';
+
+                    if (attempt > 0) {
+                        console.log(`\x1b[33m[Fleetbo] Uplink reconnection ${attempt}/${MAX_UPLINK_RETRIES - 1}...\x1b[0m`);
+                    }
 
-                    const startUplink = (attempt) => {
+                    const uplinkCommand = `${npxCmd} -y cloudflared tunnel --url http://127.0.0.1:${detectedPort} --http-host-header 127.0.0.1:${detectedPort}`;
+                    uplinkProcess = spawn(uplinkCommand, { shell: true });
+
+                    const handleUplinkOutput = (chunk) => {
+                        const text = chunk.toString();
                         if (uplinkFound) return;
+                        const match = text.match(/https:\/\/[a-zA-Z0-9-]+\.trycloudflare\.com/);
+                        if (match) {
+                            uplinkFound = true;
+                            setTimeout(() => {
+                                syncFirebase(process.env.VITE_FLEETBO_KEY_APP, match[0], process.env.VITE_FLEETBO_TESTER_EMAIL);
+                            }, 1500);
+                        }
+                    };
+
+                    uplinkProcess.stdout.on('data', handleUplinkOutput);
+                    uplinkProcess.stderr.on('data', handleUplinkOutput);
 
-                        const npxCmd = process.platform === 'win32' ? 'npx.cmd' : 'npx';
+                    uplinkProcess.on('error', () => {
+                        if (uplinkFound) return;
+                        console.error(`\x1b[31m[Fleetbo] Uplink Connection failed to establish.\x1b[0m`);
+                    });
 
-                        if (attempt > 0) {
-                            console.log(`\x1b[33m[Fleetbo] Uplink reconnection ${attempt}/${MAX_UPLINK_RETRIES - 1}...\x1b[0m`);
+                    uplinkProcess.on('close', () => {
+                        if (uplinkFound) return;
+                        const nextAttempt = attempt + 1;
+                        if (nextAttempt < MAX_UPLINK_RETRIES) {
+                            const delay = RETRY_DELAYS[nextAttempt] || 30;
+                            console.log(`\x1b[33m[Fleetbo] Uplink interrupted. Fleetbo OS retrying in ${delay}s... (${nextAttempt}/${MAX_UPLINK_RETRIES - 1})\x1b[0m`);
+                            setTimeout(() => startUplink(nextAttempt), delay * 1000);
+                        } else {
+                            console.error(`\x1b[31m[Fleetbo] Secure Uplink could not be established.\x1b[0m`);
                         }
+                    });
+                };
 
-                        // 🟢 FIX 3 : Safe spawn array pour Cloudflared
-                        uplinkProcess = spawn(npxCmd, ['-y', 'cloudflared', 'tunnel', '--url', `http://127.0.0.1:${detectedPort}`, '--http-host-header', `127.0.0.1:${detectedPort}`], { shell: true });
-
-                        // 🟢 FIX 4 : Buffer cumulatif pour l'URL Cloudflare
-                        let uplinkBuffer = "";
-
-                        const handleUplinkOutput = (chunk) => {
-                            if (uplinkFound) return;
-                            
-                            uplinkBuffer += chunk.toString(); // On accumule
-                            
-                            // On cherche dans le buffer consolidé
-                            const match = uplinkBuffer.match(/https:\/\/[a-zA-Z0-9-]+\.trycloudflare\.com/i);
-                            if (match) {
-                                uplinkFound = true;
-                                setTimeout(() => {
-                                    syncFirebase(process.env.VITE_FLEETBO_KEY_APP, match[0], process.env.VITE_FLEETBO_TESTER_EMAIL);
-                                }, 1500);
-                            }
-                        };
-
-                        uplinkProcess.stdout.on('data', handleUplinkOutput);
-                        uplinkProcess.stderr.on('data', handleUplinkOutput);
-
-                        uplinkProcess.on('error', () => {
-                            if (uplinkFound) return;
-                            console.error(`\x1b[31m[Fleetbo] Uplink Connection failed to establish.\x1b[0m`);
-                        });
-
-                        uplinkProcess.on('close', () => {
-                            if (uplinkFound) return;
-                            const nextAttempt = attempt + 1;
-                            if (nextAttempt < MAX_UPLINK_RETRIES) {
-                                const delay = RETRY_DELAYS[nextAttempt] || 30;
-                                console.log(`\x1b[33m[Fleetbo] Uplink interrupted. Fleetbo OS retrying in ${delay}s... (${nextAttempt}/${MAX_UPLINK_RETRIES - 1})\x1b[0m`);
-                                setTimeout(() => startUplink(nextAttempt), delay * 1000);
-                            } else {
-                                console.error(`\x1b[31m[Fleetbo] Secure Uplink could not be established.\x1b[0m`);
-                            }
-                        });
-                    };
+                startUplink(0);
 
-                    startUplink(0);
                 }
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetbo-cockpit-cli",
-  "version": "1.0.245",
+  "version": "1.0.247",
   "description": "Fleetbo CLI - Build native mobile apps with React",
   "author": "Fleetbo",
   "license": "MIT",