create-fleetbo-project 1.2.43 → 1.2.44

package/install-react-template.js

@@ -11,7 +11,9 @@ const branchName = 'master';
 const archiveUrl = `https://github.com/${repoOwner}/${repoName}/archive/refs/heads/${branchName}.tar.gz`;
 const bootstrapUrl = 'https://us-central1-myapp-259bf.cloudfunctions.net/bootstrapProject';
 
-
+// ------------------------------------------------------------------
+// CONTENU DU CLI (Intégré pour génération automatique)
+// ------------------------------------------------------------------
 const CLI_SCRIPT_CONTENT = `#!/usr/bin/env node
 const { spawn, execSync } = require('child_process');
 const fs = require('fs');
@@ -73,6 +75,7 @@ const injectRouteIntoAppJs = (pageName, subPath = '') => {
 
     if (!content.includes(alexRouteAnchor)) return false;
 
+    // Chemin dynamique selon si c'est une page ou un mock
     const pathPrefix = subPath ? \`\${subPath}/\` : '';
     const importLine = \`import \${pageName} from './pages/\${pathPrefix}\${pageName}';\`; 
     const routeLine = \`<Route path="/\${pathPrefix.toLowerCase()}\${pageName.toLowerCase()}" element=<\${\${pageName} />} />\`;
@@ -83,6 +86,7 @@ const injectRouteIntoAppJs = (pageName, subPath = '') => {
         injected = true;
     }
     if (!content.includes(routeLine)) {
+        // Injection précise dans l'ancre Alex
         content = content.replace(alexRouteAnchor, \`\${routeLine}\\n            \${alexRouteAnchor}\`);
         injected = true;
     }
@@ -113,17 +117,24 @@ if (command === 'alex') {
             });
             
             const aiData = result.data;
+            // 1. On efface "Alex is thinking..."
             process.stdout.write('\\r' + ' '.repeat(50) + '\\r'); 
 
+            // --- 1. GESTION DU QUOTA (EN ROUGE) ---
             if (aiData.status === 'quota_exceeded') {
                 console.log(\`\\n\\x1b[31m⛔ ENGINE OUT OF FUEL:\\x1b[0m \${aiData.message}\`);
                 return;
             }
 
+            // --- 2. AFFICHAGE DE LA RÉPONSE ---
             if (aiData.status === 'success' || aiData.status === 'message') {
+                // ✅ AJOUT : Saut de ligne pour séparer de votre commande "username ❯"
                 console.log(''); 
+
+                // Alex répond en Vert
                 console.log(\`\\x1b[32mAlex ❯\\x1b[0m \${aiData.message || "I'm ready."}\`);
                 
+                // Jauge d'énergie (Bleu/Vert/Rouge)
                 if (aiData.remainingTokens !== undefined) {
                     const remaining = aiData.remainingTokens;
                     const limit = aiData.limit || 2500;
@@ -133,6 +144,7 @@ if (command === 'alex') {
                 }
             }
 
+            // --- 4. TRAITEMENT DES FICHIERS (SI PRÉSENTS) ---
             if (aiData.status === 'success' && aiData.moduleData) {
                 const { fileName, code, mockFileName, mockCode, moduleName } = aiData.moduleData;
                 console.log(\`   \\x1b[90m⚙️  Architecting: \${moduleName}\\x1b[0m\`);
@@ -155,6 +167,7 @@ if (command === 'alex') {
                     writeFile('src/pages/mocks/', 'Quick.jsx', mockCode); 
                 }
             }
+
         } catch (error) { 
             process.stdout.write('\\r' + ' '.repeat(50) + '\\r');
             console.error('\\n\\x1b[31m❌ Alex Error:\\x1b[0m ' + (error.response?.data?.message || error.message)); 
@@ -163,29 +176,68 @@ if (command === 'alex') {
 
     const startAlexSession = async () => {
         process.stdout.write('\\x1b[33m🛡️  Alex is checking runtime state...\\x1b[0m\\r');
-        let attempts = 0; const maxAttempts = 5; let isReady = false;
+        
+        let attempts = 0;
+        const maxAttempts = 5;
+        let isReady = false;
+        
         while (attempts < maxAttempts && !isReady) {
             try {
-                const validation = await axios.post(ALEX_ENGINE_URL, { prompt: "ping", validateProject: true, checkNetwork: true }, { headers: { 'x-project-id': projectId }, timeout: 5000 });
+                const validation = await axios.post(ALEX_ENGINE_URL, { 
+                    prompt: "ping", validateProject: true, checkNetwork: true 
+                }, { headers: { 'x-project-id': projectId }, timeout: 5000 });
+
                 if (validation.data?.isRunning) { isReady = true; break; }
-                attempts++; if (attempts < maxAttempts) await new Promise(r => setTimeout(r, 2000));
-            } catch (error) { attempts++; await new Promise(r => setTimeout(r, 2000)); }
+                attempts++;
+                if (attempts < maxAttempts) await new Promise(r => setTimeout(r, 2000));
+            } catch (error) {
+                attempts++;
+                await new Promise(r => setTimeout(r, 2000));
+            }
         }
+        
         if (!isReady) {
             console.error('\\n\\x1b[31m⚠️  ENGINE OFFLINE:\\x1b[0m Start Fleetbo runtime first: "npm run fleetbo" ');
             process.exit(1);
         }
-        process.stdout.write(' '.repeat(60) + '\\r');
+        
+        // --- INITIALISATION DE L'INTERFACE VISUELLE ---
+        process.stdout.write(' '.repeat(60) + '\\r'); // Efface le status de validation
+
+        // 1. Accueil Alex (Vert)
         console.log('\\n\\x1b[32m🤖 Alex is now online.\\x1b[0m');
-        console.log('\\x1b[32mAlex ❯\\x1b[0m Welcome! I am Alex, your architect. What are we building today?\\n');
+        console.log('\\x1b[32mAlex ❯\\x1b[0m Welcome! I am Alex, your architect. What are we building today?');
+        
+        // 2. Premier saut de ligne pour l'esthétique
+        console.log(''); 
+
+        // 3. Configuration du prompt Développeur (Bleu)
         const userName = testerEmail ? testerEmail.split('@')[0] : 'Dev';
-        const rl = readline.createInterface({ input: process.stdin, output: process.stdout, prompt: \`\\x1b[34m\${userName} ❯ \\x1b[0m\` });
+        const rl = readline.createInterface({ 
+            input: process.stdin, 
+            output: process.stdout,
+            prompt: \`\\x1b[34m\${userName} ❯ \\x1b[0m\` 
+        });
+        
         rl.prompt();
+        
         rl.on('line', async (line) => {
-            if (['exit', 'quit'].includes(line.trim().toLowerCase())) { console.log('\\n\\x1b[90m👋 Alex session closed.\\x1b[0m'); rl.close(); return; }
-            if (line.trim()) { await processAlexRequest(line.trim()); console.log(''); }
+            if (['exit', 'quit'].includes(line.trim().toLowerCase())) { 
+                console.log('\\n\\x1b[90m👋 Alex session closed.\\x1b[0m');
+                rl.close(); 
+                return; 
+            }
+            
+            if (line.trim()) {
+                await processAlexRequest(line.trim());
+                // ✅ SAUT DE LIGNE après la réponse d'Alex
+                console.log(''); 
+            }
+            
             rl.prompt();
-        }).on('close', () => { process.exit(0); });
+        }).on('close', () => {
+            process.exit(0);
+        });
     };
 
     if (!initialPrompt || initialPrompt === '?') startAlexSession();
@@ -216,13 +268,20 @@ if (command === 'deploy') {
     return;
 }
 
+// ==========================================
+// 2. COMMANDE: GENERATE (Original préservé)
+// ==========================================
 const GENERATOR_COMMANDS = ['page', 'g', 'generate', 'android', 'ios'];
 if (GENERATOR_COMMANDS.includes(command)) {
     try { require('./page.js'); } catch (e) { console.error(e.message); process.exit(1); }
     return; 
 }
 
+// ==========================================
+// 3. COMMANDE: DEV / CLEANUP (Original préservé)
+// ==========================================
 const NULL_DEV = process.platform === 'win32' ? '>nul 2>&1' : '2>/dev/null';
+
 function killProcessOnPort(port) {
     try {
         if (process.platform !== 'win32') {
@@ -231,6 +290,7 @@ function killProcessOnPort(port) {
         }
     } catch (e) {}
 }
+
 function killNetworkService() {
     try {
         const cmd = process.platform === 'win32' ? 'taskkill /IM cloudflared.exe /F' : 'pkill cloudflared';
@@ -240,10 +300,15 @@ function killNetworkService() {
 
 let isExiting = false;
 async function cleanupAndExit(code = 0) {
-    if (isExiting) return; isExiting = true;
+    if (isExiting) return;
+    isExiting = true;
     console.log('\\n[Fleetbo] 🛑 Stopping environment...');
-    try { await axios.post(UPDATE_NETWORK_URL, { keyApp, networkUrl: '', tester: testerEmail }); } catch (e) {}
-    killNetworkService(); killProcessOnPort(PORT); process.exit(code);
+    try {
+        await axios.post(UPDATE_NETWORK_URL, { keyApp, networkUrl: '', tester: testerEmail });
+    } catch (e) {}
+    killNetworkService();
+    killProcessOnPort(PORT);
+    process.exit(code);
 }
 process.on('SIGINT', () => cleanupAndExit(0));
 process.on('SIGTERM', () => cleanupAndExit(0));
@@ -251,27 +316,44 @@ process.on('SIGTERM', () => cleanupAndExit(0));
 async function syncFirebase(keyApp, networkUrl, testerEmail) {
     try {
         await axios.post(UPDATE_NETWORK_URL, { keyApp, networkUrl, tester: testerEmail });
+        
         console.log(\`\\n\\x1b[32m[Fleetbo]\\x1b[0m -------------------------------------------------------------\`);
         console.log('\\x1b[32m[Fleetbo]  GO GO GO ! FLEETBO STUDIO IS READY \\x1b[0m');
         console.log(\`\\x1b[32m[Fleetbo]  Link: https://fleetbo.io/studio/\${keyApp}\\x1b[0m\`);
         console.log('\\x1b[32m[Fleetbo]  You can now start coding and previewing in Studio. 🚀\\x1b[0m');
         console.log(\`\\x1b[32m[Fleetbo]\\x1b[0m -------------------------------------------------------------\`);
-    } catch (err) { console.error(\`[Fleetbo] ❌ Sync Error: \${err.message}\`); }
+    } catch (err) {
+        console.error(\`[Fleetbo] ❌ Sync Error: \${err.message}\`);
+    }
 }
 
 async function runDevEnvironment() {
     console.log(\`[Fleetbo] 🛡️  Initializing Dev Environment...\`);
-    killNetworkService(); killProcessOnPort(PORT);
+    killNetworkService();
+    killProcessOnPort(PORT);
+    if (!testerEmail) { console.error('Error: REACT_APP_TESTER_EMAIL missing'); process.exit(1); }
+    
     const npmCmd = process.platform === 'win32' ? 'npm.cmd' : 'npm';
-    const devServer = spawn(npmCmd, ['start'], { stdio: ['ignore', 'pipe', 'pipe'], shell: true, env: { ...process.env, BROWSER: 'none', PORT: PORT.toString() } });
-    devServer.stdout.pipe(process.stdout); devServer.stderr.pipe(process.stderr);
+    const devServer = spawn(npmCmd, ['start'], {
+        stdio: ['ignore', 'pipe', 'pipe'],
+        shell: true,
+        env: { ...process.env, BROWSER: 'none', PORT: PORT.toString() }
+    });
+    devServer.stdout.pipe(process.stdout);
+    devServer.stderr.pipe(process.stderr);
+
     let connectionStarted = false;
     devServer.stdout.on('data', (data) => {
         const output = data.toString();
         if (!connectionStarted && (output.includes('Local:') || output.includes('Compiled successfully'))) {
             connectionStarted = true;
+
             console.log('\\n[Fleetbo] ---------------------------------------------------');
-            console.log(\`[Fleetbo] 🔗 Establishing Secure Uplink...\\n[Fleetbo] 🛑 DO NOT open the Fleetbo Studio yet.\\n[Fleetbo] ⏳ Please wait green message...\\n[Fleetbo] ---------------------------------------------------\`);
+            console.log(\`[Fleetbo] 🔗 Establishing Secure Uplink...\`);
+            console.log(\`[Fleetbo] 🛑 DO NOT open the Fleetbo Studio yet. \`);
+            console.log(\`[Fleetbo] ⏳ Please wait green message...\`);
+            console.log('[Fleetbo] ---------------------------------------------------');
+
             const npxCmd = process.platform === 'win32' ? 'npx.cmd' : 'npx';
             const uplink = spawn(npxCmd, ['cloudflared', 'tunnel', '--url', \`http://localhost:\${PORT}\`], { shell: true });
             uplink.stderr.on('data', (chunk) => {
@@ -281,7 +363,13 @@ async function runDevEnvironment() {
         }
     });
 }
-runDevEnvironment();`.replace(/`/g, '\\`').replace(/\${/g, '\\${');
+
+runDevEnvironment();
+`;
+
+// ------------------------------------------------------------------
+// FIN CONTENU CLI
+// ------------------------------------------------------------------
 
 
 const args = process.argv.slice(2);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-fleetbo-project",
-  "version": "1.2.43",
+  "version": "1.2.44",
   "description": "Creates a new Fleetbo project.",
   "main": "install-react-template.js",
   "bin": {