fleetbo-cockpit-cli 1.0.174 → 1.0.176

package/cli.js

@@ -48,6 +48,23 @@ const projectId   = process.env.VITE_FLEETBO_ENTERPRISE_ID;
 const keyApp      = process.env.VITE_FLEETBO_KEY_APP;
 const testerEmail = process.env.VITE_FLEETBO_TESTER_EMAIL;
 
+// ═══════════════════════════════════════════════════════
+// DÉTECTION AUTOMATIQUE DU FRAMEWORK JS (React ou Vue)
+// Lit package.json — aucune configuration manuelle requise
+// ═══════════════════════════════════════════════════════
+const detectFramework = () => {
+    try {
+        const pkgPath = path.join(process.cwd(), 'package.json');
+        if (!fs.existsSync(pkgPath)) return 'react';
+        const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
+        const deps = { ...pkg.dependencies, ...pkg.devDependencies };
+        if (deps['vue'] || deps['@vue/core'] || deps['nuxt']) return 'vue';
+        return 'react';
+    } catch (e) {
+        return 'react';
+    }
+};
+const JS_FRAMEWORK = detectFramework();
 
 if (!projectId) {
     console.error('\n\x1b[31m❌ Error: Project ID missing in .env.\x1b[0m\n');
@@ -355,7 +372,7 @@ if (command === 'alex') {
             
             const promptWithTime = prompt + `\n\n[SYSTEM INFO: The exact current timestamp is ${exactTime}. Use it STRICTLY for your signature '// ⚡ Forged by Alex on...' at the bottom of your files.]`;
 
-            const result = await axios.post(ALEX_ENGINE_URL, { prompt: promptWithTime, projectType: 'android' }, {
+            const result = await axios.post(ALEX_ENGINE_URL, { prompt: promptWithTime, projectType: 'android', jsFramework: JS_FRAMEWORK }, {
                 headers: { 'x-project-id': projectId }
             });
 
@@ -594,6 +611,7 @@ if (command === 'alex') {
         // AI ENGINE STATUS
         console.log('');
         console.log(`\x1b[32m✓\x1b[0m  ${providerLabel} \x1b[90m· ${modelLabel}\x1b[0m`);
+        console.log(`\x1b[32m✓\x1b[0m  ${JS_FRAMEWORK === 'vue' ? '\x1b[32mVue.js\x1b[0m' : '\x1b[36mReact\x1b[0m'} \x1b[90m· JS Framework detected\x1b[0m`);
 
         // FORGE CAPABILITIES
         console.log('');
@@ -1048,12 +1066,10 @@ else {
     }
     
     async function runDevEnvironment() {
-        console.log(`[Fleetbo] 🛡️  Initializing Dev Environment...`);
-        
-
+        console.log(`[Fleetbo] 🛡️  Initializing Universal Dev Environment...`);
         
         killNetworkService();
-        killProcessOnPort(PORT);
+        killProcessOnPort(PORT); // On tue le 3000 par précaution, au cas où
         
         if (!testerEmail) { 
             console.error('\x1b[31mError: FLEETBO_APP_TESTER_EMAIL missing in .env\x1b[0m'); 
@@ -1062,20 +1078,21 @@ else {
         
         const npmCmd = process.platform === 'win32' ? 'npm.cmd' : 'npm';
 
-        // ✅ On passe la chaîne complète, SANS tableau d'arguments du tout !
+        // Lancement agnostique du serveur de dev (React, Vue, etc.)
         const devServer = spawn(`${npmCmd} run dev --silent`, {
             stdio: ['ignore', 'pipe', 'pipe'],
             shell: true,
             env: { 
                 ...process.env, 
-                NODE_OPTIONS: '--no-deprecation',
-                PORT: PORT.toString(), 
+                NODE_OPTIONS: '--no-deprecation'
+                // On a retiré le forçage du PORT ici pour laisser Vite choisir (souvent 5173 pour Vue)
             }
         });
-        //devServer.stdout.pipe(process.stdout);
+
         devServer.stderr.pipe(process.stderr);
 
         let connectionStarted = false;
+        let detectedPort = PORT; // 3000 par défaut
         
         devServer.stdout.on('data', (data) => {
             const output = data.toString();
@@ -1083,45 +1100,36 @@ else {
             // 🛡️ FILTRE ANTI-PLOMBERIE FLEETBO
             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',
-                'ready in',
-                'Local:',     // 👈 Plus simple et infaillible
-                'Network:',   // 👈 Plus simple et infaillible
-                'press h + enter',
-                '> vite',
-                '> fleetbo',
-                '> npx fleetbo-cockpit-cli@latest'
+                'Attempting to bind to HOST', 'If this was unintentional', 'Learn more here:',
+                'Starting the development server', 'You can now view', 'vite v', 'VITE v',
+                'ready in', 'Local:', 'Network:', 'press h + enter', '> vite', '> fleetbo', '> npx fleetbo-cockpit-cli@latest'
             ];
 
             const filteredOutput = lines.filter(line => {
-                // On nettoie les codes couleurs invisibles avant de lire
                 const cleanLine = line.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, '');
                 return !forbiddenTerms.some(term => cleanLine.includes(term));
             }).join('\n');
 
-            // S'il reste quelque chose d'utile (un console.log du dev, un warning, une vraie erreur), on l'affiche
             if (filteredOutput.trim() !== '') {
                 process.stdout.write(filteredOutput + '\n');
             }
             
-            // 🚀 DÉTECTION DU DÉMARRAGE ET LANCEMENT DE L'UPLINK
-            if (!connectionStarted && (output.includes('localhost') || output.includes('ready in'))){
+            // 🚀 MAGIE 1 : DÉTECTION DU PORT RÉEL (Vite/Vue ou React)
+            // Cherche un pattern comme http://localhost:5173 ou http://127.0.0.1:3000
+            const portMatch = output.match(/http:\/\/(?:localhost|127\.0\.0\.1):(\d+)/);
+            if (portMatch) {
+                detectedPort = portMatch[1]; // On capture le vrai port !
+            }
+
+            // 🚀 MAGIE 2 : DÉTECTION DU DÉMARRAGE ET LANCEMENT DE L'UPLINK SUR LE BON PORT
+            if (!connectionStarted && (output.includes('localhost') || output.includes('ready in') || output.includes('Local:'))){
                 connectionStarted = true;
 
                 console.log('\n\x1b[33mFleetbo OS ❯\x1b[0m ---------------------------------------------------');
-                console.log(`\x1b[33mFleetbo OS ❯\x1b[0m  Establishing Secure Uplink...`);
+                console.log(`\x1b[33mFleetbo OS ❯\x1b[0m  Establishing Secure Uplink on port ${detectedPort}...`);
                 console.log(`\x1b[33mFleetbo OS ❯\x1b[0m  Please wait for the green message...`);
                 console.log('\x1b[33mFleetbo OS ❯\x1b[0m ---------------------------------------------------');
 
-                // ============================================
-                // UPLINK avec auto-retry (Fleetbo OS Resilience)
-                // ============================================
                 const MAX_UPLINK_RETRIES = 5;
                 const RETRY_DELAYS = [0, 10, 20, 30, 45];
                 let uplinkFound = false;
@@ -1135,8 +1143,8 @@ else {
                         console.log(`\x1b[33m[Fleetbo] 🔄 Uplink reconnection ${attempt}/${MAX_UPLINK_RETRIES - 1}...\x1b[0m`);
                     }
 
-                   // ✅ La commande complète, SANS tableau !
-                    const uplinkCommand = `${npxCmd} -y cloudflared tunnel --url http://127.0.0.1:${PORT} --http-host-header 127.0.0.1:${PORT}`;
+                    // ✅ LE TUNNEL CLOUDFLARE UTILISE LE PORT DÉTECTÉ DYNAMIQUEMENT !
+                    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) => {
@@ -1145,7 +1153,6 @@ else {
                         const match = text.match(/https:\/\/[a-zA-Z0-9-]+\.trycloudflare\.com/);
                         if (match) {
                             uplinkFound = true;
-                            // ⚡ Stabilisation du noyau : on attend 1.5s
                             setTimeout(() => {
                                 syncFirebase(process.env.VITE_FLEETBO_KEY_APP, match[0], process.env.VITE_FLEETBO_TESTER_EMAIL);
                             }, 1500);
@@ -1155,14 +1162,13 @@ else {
                     uplinkProcess.stdout.on('data', handleUplinkOutput);
                     uplinkProcess.stderr.on('data', handleUplinkOutput);
 
-                    uplinkProcess.on('error', (err) => {
+                    uplinkProcess.on('error', () => {
                         if (uplinkFound) return;
                         console.error(`\x1b[31m[Fleetbo] ⚠️  Uplink Connection failed to establish.\x1b[0m`);
                     });
 
-                    uplinkProcess.on('close', (code) => {
+                    uplinkProcess.on('close', () => {
                         if (uplinkFound) return;
-
                         const nextAttempt = attempt + 1;
                         if (nextAttempt < MAX_UPLINK_RETRIES) {
                             const delay = RETRY_DELAYS[nextAttempt] || 30;
@@ -1170,9 +1176,6 @@ else {
                             setTimeout(() => startUplink(nextAttempt), delay * 1000);
                         } else {
                             console.error(`\x1b[31m[Fleetbo] ❌ Secure Uplink could not be established.\x1b[0m`);
-                            console.error(`\x1b[90m[Fleetbo] Fleetbo OS network is temporarily unavailable.\x1b[0m`);
-                            console.error(`\x1b[90m[Fleetbo] Your dev server is still running on http://localhost:${PORT}\x1b[0m`);
-                            console.error(`\x1b[90m[Fleetbo] Restart with "npm run fleetbo" when the network is back.\x1b[0m`);
                         }
                     });
                 };

package/package.json

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