fleetbo-cockpit-cli 1.0.245 → 1.0.246

package/cli.js

@@ -973,14 +973,13 @@ 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)], {
+        const devServer = spawn(`${npmCmd} run dev --silent -- --host 127.0.0.1 --port ${PORT}`, {
             stdio: ['ignore', 'pipe', 'pipe'],
             shell: true,
             env: { 
@@ -994,14 +993,10 @@ 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 = "";
-
         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 +1012,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 +1025,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 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 startUplink = (attempt) => {
+                    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);
+                        }
+                    };
 
-                        const npxCmd = process.platform === 'win32' ? 'npx.cmd' : 'npx';
+                    uplinkProcess.stdout.on('data', handleUplinkOutput);
+                    uplinkProcess.stderr.on('data', handleUplinkOutput);
 
-                        if (attempt > 0) {
-                            console.log(`\x1b[33m[Fleetbo] Uplink reconnection ${attempt}/${MAX_UPLINK_RETRIES - 1}...\x1b[0m`);
+                    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`);
                         }
+                    });
+                };
 
-                        // 🟢 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.246",
   "description": "Fleetbo CLI - Build native mobile apps with React",
   "author": "Fleetbo",
   "license": "MIT",