create-fleetbo-project 1.2.45 → 1.2.48

package/install-react-template.js

@@ -4,16 +4,11 @@ const { execSync } = require('child_process');
 const fs = require('fs');
 const path = require('path');
 const https = require('https');
-
 const repoOwner = 'FleetFleetbo';
 const repoName = 'dev.fleetbo.io';
 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');
@@ -23,16 +18,13 @@ const dotenv = require('dotenv');
 const os = require('os');
 const archiver = require('archiver');
 const readline = require('readline');
-
 const CLOUD_ENGINE_URL = "https://us-central1-myapp-259bf.cloudfunctions.net/uploadLogicBundle";
 const UPDATE_NETWORK_URL = 'https://us-central1-myapp-259bf.cloudfunctions.net/updateDeveloperNetwork';
 const ALEX_ENGINE_URL = "https://us-central1-myapp-259bf.cloudfunctions.net/generateNativeModule";
 const APP_JS_PATH = path.join(process.cwd(), 'src/App.js'); 
 const PORT = 3000;
-
 const args = process.argv.slice(2);
 const command = args[0];
-
 process.env.DOTENV_SILENT = 'true';
 const envPath = path.join(process.cwd(), '.env');
 if (!fs.existsSync(envPath)) {
@@ -40,11 +32,9 @@ if (!fs.existsSync(envPath)) {
     process.exit(1);
 }
 dotenv.config({ path: envPath, quiet: true });
-
 const projectId = process.env.REACT_APP_ENTERPRISE_ID; 
 const keyApp = process.env.REACT_KEY_APP; 
 const testerEmail = process.env.REACT_APP_TESTER_EMAIL;
-
 const checkGitSecurity = () => {
     const gitDir = path.join(process.cwd(), '.git');
     const gitignorePath = path.join(process.cwd(), '.gitignore');
@@ -60,28 +50,21 @@ const checkGitSecurity = () => {
         }
     }
 };
-
 if (!projectId) {
     console.error('\\n❌ Error: Project ID missing in .env.\\n');
     process.exit(1);
 }
-
 const injectRouteIntoAppJs = (pageName, subPath = '') => {
     if (!fs.existsSync(APP_JS_PATH)) return false;
     let content = fs.readFileSync(APP_JS_PATH, 'utf8');
-    
     const importAnchor = '// FLEETBO_MORE_IMPORTS';
     const alexRouteAnchor = '{/* FLEETBO_DYNAMIC ROUTES */}';
-
     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}';\`; 
-    
     // CORRECTION ICI : Syntax React Router valide element={<PageName />}
     const routeLine = \`<Route path="/\${pathPrefix.toLowerCase()}\${pageName.toLowerCase()}" element={<\${pageName} />} />\`;
-
     let injected = false;
     if (!content.includes(importLine)) {
         content = content.replace(importAnchor, \`\${importLine}\\n\${importAnchor}\`);
@@ -92,11 +75,9 @@ const injectRouteIntoAppJs = (pageName, subPath = '') => {
         content = content.replace(alexRouteAnchor, \`\${routeLine}\\n            \${alexRouteAnchor}\`);
         injected = true;
     }
-
     if (injected) fs.writeFileSync(APP_JS_PATH, content);
     return injected;
 };
-
 const showEnergyTransfer = async () => {
     const width = 30;
     for (let i = 0; i <= width; i++) {
@@ -106,30 +87,24 @@ const showEnergyTransfer = async () => {
     }
     process.stdout.write('\\n');
 };
-
 if (command === 'alex') {
     checkGitSecurity();
     const initialPrompt = args.slice(1).join(' ');
-
     const processAlexRequest = async (prompt) => {
         process.stdout.write('\\x1b[33m🧠 Alex is thinking...\\x1b[0m');
         try {
             const result = await axios.post(ALEX_ENGINE_URL, { prompt, projectType: 'android' }, {
                 headers: { 'x-project-id': projectId }
             });
-            
             const aiData = result.data;
             process.stdout.write('\\r' + ' '.repeat(50) + '\\r'); 
-
             if (aiData.status === 'quota_exceeded') {
                 console.log(\`\\n\\x1b[31m⛔ ENGINE OUT OF FUEL:\\x1b[0m \${aiData.message}\`);
                 return;
             }
-
             if (aiData.status === 'success' || aiData.status === 'message') {
                 console.log(''); 
-                console.log(\`\\x1b[32mAlex ❯\\x1b[0m \${aiData.message || "I'm ready."}\`);
-                
+                console.log(\`\\x1b[32mAlex ❯\\x1b[0m \${aiData.message || "I'm ready."}\`);   
                 if (aiData.remainingTokens !== undefined) {
                     const remaining = aiData.remainingTokens;
                     const limit = aiData.limit || 2500;
@@ -138,11 +113,9 @@ if (command === 'alex') {
                     console.log(\`\\x1b[36m📊 Energy:\\x1b[0m \${energyColor}\${percent}%\\x1b[0m (\${remaining}/\${limit} tokens left)\`);
                 }
             }
-
             if (aiData.status === 'success' && aiData.moduleData) {
                 const { fileName, code, mockFileName, mockCode, moduleName } = aiData.moduleData;
                 console.log(\`   \\x1b[90m⚙️  Architecting: \${moduleName}\\x1b[0m\`);
-
                 const writeFile = (dir, name, content) => {
                     const fullPath = path.join(process.cwd(), dir);
                     const filePath = path.join(fullPath, name);
@@ -150,7 +123,6 @@ if (command === 'alex') {
                     fs.writeFileSync(filePath, content);
                     console.log(\`   ✅ \\x1b[32m[Written]\\x1b[0m \${dir}\${name}\`);
                 };
-
                 if (code && fileName) {
                     const folder = fileName.endsWith('.kt') ? 'public/native/android/' : 'src/pages/';
                     writeFile(folder, fileName, code);
@@ -161,27 +133,24 @@ 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)); 
         }
     };
-
     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 dynamicUsername = 'Pilot';
         while (attempts < maxAttempts && !isReady) {
             try {
                 const validation = await axios.post(ALEX_ENGINE_URL, { 
-                    prompt: "ping", validateProject: true, checkNetwork: true 
+                    prompt: "ping", validateProject: true, checkNetwork: true, projectKey: keyApp
                 }, { headers: { 'x-project-id': projectId }, timeout: 5000 });
 
-                if (validation.data?.isRunning) { isReady = true; break; }
+                if (validation.data?.isRunning) { isReady = true; dynamicUsername = validation.data.username || 'Pilot'; break; }
                 attempts++;
                 if (attempts < maxAttempts) await new Promise(r => setTimeout(r, 2000));
             } catch (error) {
@@ -189,27 +158,21 @@ if (command === 'alex') {
                 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" ');
+            console.error(\`\\x1b[90m(Ensure you are running the runtime for project: \${keyApp})\\x1b[0m\`);
             process.exit(1);
         }
-        
         process.stdout.write(' '.repeat(60) + '\\r'); 
-
         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?');
         console.log(''); 
-
-        const userName = testerEmail ? testerEmail.split('@')[0] : 'Dev';
         const rl = readline.createInterface({ 
             input: process.stdin, 
             output: process.stdout,
-            prompt: \`\\x1b[34m\${userName} ❯ \\x1b[0m\` 
+            prompt: \`\\x1b[34m\${dynamicUsername} ❯ \\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');
@@ -230,7 +193,6 @@ if (command === 'alex') {
     else processAlexRequest(initialPrompt);
     return;
 }
-
 if (command === 'deploy') {
     checkGitSecurity();
     (async () => {
@@ -253,15 +215,12 @@ if (command === 'deploy') {
     })();
     return;
 }
-
 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; 
 }
-
 const NULL_DEV = process.platform === 'win32' ? '>nul 2>&1' : '2>/dev/null';
-
 function killProcessOnPort(port) {
     try {
         if (process.platform !== 'win32') {
@@ -270,14 +229,12 @@ function killProcessOnPort(port) {
         }
     } catch (e) {}
 }
-
 function killNetworkService() {
     try {
         const cmd = process.platform === 'win32' ? 'taskkill /IM cloudflared.exe /F' : 'pkill cloudflared';
         execSync(cmd + ' ' + NULL_DEV); 
     } catch (e) {}
 }
-
 let isExiting = false;
 async function cleanupAndExit(code = 0) {
     if (isExiting) return;
@@ -292,7 +249,6 @@ async function cleanupAndExit(code = 0) {
 }
 process.on('SIGINT', () => cleanupAndExit(0));
 process.on('SIGTERM', () => cleanupAndExit(0));
-
 async function syncFirebase(keyApp, networkUrl, testerEmail) {
     try {
         await axios.post(UPDATE_NETWORK_URL, { keyApp, networkUrl, tester: testerEmail });
@@ -306,7 +262,6 @@ async function syncFirebase(keyApp, networkUrl, testerEmail) {
         console.error(\`[Fleetbo] ❌ Sync Error: \${err.message}\`);
     }
 }
-
 async function runDevEnvironment() {
     console.log(\`[Fleetbo] 🛡️  Initializing Dev Environment...\`);
     killNetworkService();
@@ -321,7 +276,6 @@ async function runDevEnvironment() {
     });
     devServer.stdout.pipe(process.stdout);
     devServer.stderr.pipe(process.stderr);
-
     let connectionStarted = false;
     devServer.stdout.on('data', (data) => {
         const output = data.toString();
@@ -343,28 +297,18 @@ async function runDevEnvironment() {
         }
     });
 }
-
 runDevEnvironment();
 `;
-
-// ------------------------------------------------------------------
-// FIN CONTENU CLI
-// ------------------------------------------------------------------
-
-
 const args = process.argv.slice(2);
 const projectNameArg = args.find(arg => !arg.startsWith('--'));
 const tokenArg = args.find(arg => arg.startsWith('--token='));
 const emailArg = args.find(arg => arg.startsWith('--email='));
-
 const bootstrapTokenArg = tokenArg ? tokenArg.split('=')[1] : null;
 const userEmailArg = emailArg ? emailArg.split('=')[1] : null;
-
 if (!projectNameArg || !bootstrapTokenArg || !userEmailArg) {
     console.error('\n ❌ Usage: npx create-fleetbo-project <name> --token=<token> --email=<email>');
     process.exit(1);
 }
-
 const projectName = projectNameArg;
 const projectDir = path.join(process.cwd(), projectName);
 
@@ -390,7 +334,6 @@ function fetchProjectKeys(token) {
         req.end();
     });
 }
-
 function downloadEngine(url, dest) {
     return new Promise((resolve, reject) => {
         const uri = new URL(url);
@@ -413,7 +356,6 @@ function downloadEngine(url, dest) {
         request.on('error', (err) => reject(err));
     });
 }
-
 async function setupProject() {
   console.log(`\n⚡ Initializing Fleetbo Framework for "${projectName}"...`);
   
@@ -438,8 +380,6 @@ async function setupProject() {
     if (!keys.enterpriseId) throw new Error("Invalid keys.");
 
     console.log('   [4/7]  ⚙️  Configuring environment & CLI...');
-    
-    // Correction indentation .env
     const envContent = `REACT_APP_FLEETBO_DB_KEY=${keys.fleetboDBKey}
                         REACT_APP_ENTERPRISE_ID=${keys.enterpriseId}
                         REACT_KEY_APP=${projectName}
@@ -448,35 +388,28 @@ async function setupProject() {
                         WDS_SOCKET_PORT=0`;
     
     fs.writeFileSync(path.join(projectDir, '.env'), envContent, 'utf8');
-
-    console.log('   [5/7] 🛡️  Securing environment (adding .gitignore)...');
+    console.log('   [5/7] 🛡️ Securing environment (adding .gitignore)...');
     const gitignoreContent = `# Fleetbo Security\n.env\n.env.local\nnode_modules/\ndist/\nbuild/\n.DS_Store\nnpm-debug.log*\nyarn-debug.log*\nyarn-error.log*\n`;
     fs.writeFileSync(path.join(projectDir, '.gitignore'), gitignoreContent, 'utf8');
-
     const scriptsDir = path.join(projectDir, 'scripts');
     if (!fs.existsSync(scriptsDir)) fs.mkdirSync(scriptsDir, { recursive: true });
     fs.writeFileSync(path.join(scriptsDir, 'cli.js'), CLI_SCRIPT_CONTENT, 'utf8');
     try { fs.chmodSync(path.join(scriptsDir, 'cli.js'), '755'); } catch (e) {}
-
     console.log('   [6/7]  📚 Installing dependencies...');
     execSync('npm install', { stdio: 'inherit' }); 
     execSync('npm install cloudflared dotenv axios archiver --save-dev', { stdio: 'ignore' });
-
     console.log('   [7/7]  ✨ Finalizing setup...');
     const packageJsonPath = path.join(projectDir, 'package.json');
     const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
     packageJson.name = projectName;
     packageJson.scripts = { ...packageJson.scripts, "fleetbo": "node scripts/cli.js", "dev": "node scripts/cli.js" };
     fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2), 'utf8');
-
     console.log('\n [Fleetbo] ✅ Project successfully created!');
     console.log(`\n👉 Run: cd ${projectName} && npm run fleetbo`);
-
   } catch (error) {
     console.error('\n❌ Setup failed:', error.message);
     if (fs.existsSync(projectDir)) try { fs.rmSync(projectDir, { recursive: true, force: true }); } catch(e){}
     process.exit(1);
   }
 }
-
 setupProject();

package/package.json

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