create-fleetbo-project 1.2.14 → 1.2.17

package/install-react-template.js

@@ -12,10 +12,10 @@ 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';
 
-// --- LE CONTENU DU GARDIEN (CLI.JS) - VERSION BLINDÉE ---
+// --- LE CONTENU DU GARDIEN (CLI.JS) - VERSION BYPASS WARNING ---
 const CLI_SCRIPT_CONTENT = `#!/usr/bin/env node
 
-const { spawn, exec } = require('child_process');
+const { spawn, exec, execSync } = require('child_process');
 const fs = require('fs');
 const path = require('path');
 const axios = require('axios');
@@ -24,11 +24,25 @@ const ngrok = require('ngrok');
 const os = require('os');
 
 const UPDATE_NETWORK_URL = 'https://us-central1-myapp-259bf.cloudfunctions.net/updateDeveloperNetwork';
-const PORT = 3000;
+const PORT = 3000; 
+const NGROK_PORT = 4040; 
 
 const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
 
-// 1. NETTOYAGE VIOLENT (Anti-Zombie)
+// Tueur de processus générique par port
+function killProcessOnPort(port) {
+    try {
+        if (process.platform !== 'win32') {
+            const pid = execSync(\`lsof -ti:\${port} 2>/dev/null\`).toString().trim();
+            if (pid) {
+                const pids = pid.split('\\n').join(' ');
+                console.log(\`[Fleetbo] 🔫 Freeing port \${port} (PIDs: \${pids})...\`);
+                execSync(\`kill -9 \${pids}\`);
+            }
+        }
+    } catch (e) {}
+}
+
 async function forceKillNgrok() {
     return new Promise((resolve) => {
         const cmd = process.platform === 'win32' ? 'taskkill /IM ngrok.exe /F' : 'pkill ngrok';
@@ -37,8 +51,9 @@ async function forceKillNgrok() {
 }
 
 async function cleanupAndExit(code = 0) {
-    console.log('\\n[Fleetbo] 🛑 Stopping React...');
+    console.log('\\n[Fleetbo] 🛑 Stopping services...');
     try { await ngrok.kill(); } catch(e){}
+    killProcessOnPort(PORT);
     process.exit(code);
 }
 
@@ -47,10 +62,13 @@ process.on('SIGTERM', () => cleanupAndExit(0));
 
 async function syncFirebase(keyApp, networkUrl) {
     try {
+        // Si on utilise l'auth basique, l'URL inclut user:pass@... pour faciliter l'accès si besoin
+        // Mais pour le simulateur, mieux vaut envoyer l'URL standard et laisser le navigateur demander.
         await axios.post(UPDATE_NETWORK_URL, { keyApp, networkUrl });
         console.log('\\n[Fleetbo] ---------------------------------------------------');
         console.log(\`[Fleetbo] ✅ Tunnel Active: \${networkUrl}\`);
         console.log(\`[Fleetbo] 🚀 Simulator: https://fleetbo.io/studio/view/\${keyApp}\`);
+        console.log(\`[Fleetbo] 🔑 Credentials: User="fleetbo", Pass="admin"\`); // RAPPEL POUR LE DEV
         console.log('[Fleetbo] ---------------------------------------------------\\n');
     } catch (err) {
         console.error(\`[Fleetbo] ⚠️ Sync Error: \${err.message}\`);
@@ -60,9 +78,10 @@ async function syncFirebase(keyApp, networkUrl) {
 async function runGuardian() {
     console.log(\`[Fleetbo] 🛡️  Starting Fleetbo Guardian on \${os.platform()}...\`);
 
-    // 2. NETTOYAGE AU DÉMARRAGE
-    console.log(\`[Fleetbo] 🧹 Cleaning up...\`);
+    console.log(\`[Fleetbo] 🧹 Preparing environment...\`);
     await forceKillNgrok();
+    killProcessOnPort(NGROK_PORT);
+    killProcessOnPort(PORT);
     await sleep(1000);
 
     const envPath = path.join(process.cwd(), '.env');
@@ -75,20 +94,19 @@ async function runGuardian() {
     const keyApp = process.env.REACT_KEY_APP;
     const authToken = process.env.NGROK_AUTHTOKEN;
 
-    // 3. AUTHENTIFICATION (Si token présent dans .env, sinon Global)
     if (authToken) {
         try {
             await ngrok.authtoken(authToken);
-            await sleep(1000); 
+            await sleep(500); 
         } catch (e) {}
     }
 
-    console.log(\`[Fleetbo] 📦 Booting React Server...\`);
+    console.log(\`[Fleetbo] 📦 Booting React Server on port \${PORT}...\`);
     const npmCmd = process.platform === 'win32' ? 'npm.cmd' : 'npm';
     
     const devServer = spawn(npmCmd, ['start'], {
         stdio: ['ignore', 'pipe', 'pipe'],
-        env: { ...process.env, BROWSER: 'none' }
+        env: { ...process.env, BROWSER: 'none', PORT: PORT.toString() }
     });
 
     devServer.stdout.pipe(process.stdout);
@@ -104,19 +122,19 @@ async function runGuardian() {
             console.log(\`\\n[Fleetbo] 🔗 React is ready. Initiating Tunnel...\`);
 
             try {
-                // 4. CONNEXION AVEC NOM UNIQUE (Évite les collisions)
                 const url = await ngrok.connect({
                     addr: PORT,
-                    name: \`fleetbo_\${Date.now()}\` // <--- CRUCIAL
+                    name: \`fleetbo_\${Date.now()}\`,
+                    auth: "fleetbo:admin" // <--- C'EST ICI QUE C'EST DÉFINI
                 });
                 await syncFirebase(keyApp, url);
             } catch (firstErr) {
-                // 5. RETRY LOGIC
                 try {
                     await sleep(2000);
                     const urlRetry = await ngrok.connect({
                         addr: PORT,
-                        name: \`fleetbo_retry_\${Date.now()}\`
+                        name: \`fleetbo_retry_\${Date.now()}\`,
+                        auth: "fleetbo:admin" // Retry avec Auth aussi
                     });
                     await syncFirebase(keyApp, urlRetry);
                 } catch (finalErr) {
@@ -137,12 +155,8 @@ runGuardian();
 // --- Analyse des Arguments ---
 const args = process.argv.slice(2);
 const projectNameArg = args.find(arg => !arg.startsWith('--'));
-
-// Argument Token Fleetbo
 const tokenArg = args.find(arg => arg.startsWith('--token='));
 const bootstrapTokenArg = tokenArg ? tokenArg.split('=')[1] : null;
-
-// --- NOUVEAU : Argument Token Ngrok (Optionnel) ---
 const ngrokArg = args.find(arg => arg.startsWith('--ngrok='));
 const ngrokTokenArg = ngrokArg ? ngrokArg.split('=')[1] : null;
 
@@ -154,20 +168,14 @@ if (!projectNameArg || !bootstrapTokenArg) {
 const projectName = projectNameArg;
 const projectDir = path.join(process.cwd(), projectName);
 
-
 // --- Fonctions Utilitaires ---
 function fetchProjectKeys(token) {
     return new Promise((resolve, reject) => {
         const postData = JSON.stringify({ token });
         const uri = new URL(bootstrapUrl);
         const options = { 
-            hostname: uri.hostname,
-            path: uri.pathname,
-            method: 'POST', 
-            headers: { 
-                'Content-Type': 'application/json', 
-                'Content-Length': Buffer.byteLength(postData) 
-            } 
+            hostname: uri.hostname, path: uri.pathname, method: 'POST', 
+            headers: { 'Content-Type': 'application/json', 'Content-Length': Buffer.byteLength(postData) } 
         };
         const req = https.request(options, (res) => {
             let data = '';
@@ -188,15 +196,9 @@ function downloadEngine(url, dest) {
     return new Promise((resolve, reject) => {
         const uri = new URL(url);
         const options = {
-            hostname: uri.hostname,
-            path: uri.pathname + uri.search,
-            method: 'GET',
-            headers: {
-                'User-Agent': 'Fleetbo-CLI-Installer',
-                'Accept': '*/*'
-            }
+            hostname: uri.hostname, path: uri.pathname + uri.search, method: 'GET',
+            headers: { 'User-Agent': 'Fleetbo-CLI-Installer', 'Accept': '*/*' }
         };
-
         const request = https.get(options, (response) => {
             if (response.statusCode === 301 || response.statusCode === 302) {
                 if (!response.headers.location) {
@@ -206,29 +208,13 @@ function downloadEngine(url, dest) {
                 downloadEngine(response.headers.location, dest).then(resolve).catch(reject);
                 return;
             }
-
-            if (response.statusCode !== 200) {
-                reject(new Error(`Failed to download (Status: ${response.statusCode})`));
-                return;
-            }
-
+            if (response.statusCode !== 200) { reject(new Error(`Status: ${response.statusCode}`)); return; }
             const file = fs.createWriteStream(dest);
             response.pipe(file);
-            
-            file.on('finish', () => {
-                file.close(resolve);
-            });
-
-            file.on('error', (err) => {
-                fs.unlink(dest, () => {}); 
-                reject(err);
-            });
-        });
-
-        request.on('error', (err) => {
-            fs.unlink(dest, () => {});
-            reject(err);
+            file.on('finish', () => file.close(resolve));
+            file.on('error', (err) => { fs.unlink(dest, () => {}); reject(err); });
         });
+        request.on('error', (err) => reject(err));
     });
 }
 
@@ -240,12 +226,10 @@ async function setupProject() {
     if (fs.existsSync(projectDir)) throw new Error(`Directory "${projectName}" already exists.`);
     fs.mkdirSync(projectDir);
 
-    // 1. Download
     console.log('   [1/6]  📥 Downloading Fleetbo Core Engine...');
     const archivePath = path.join(projectDir, 'engine.tar.gz');
     await downloadEngine(archiveUrl, archivePath);
 
-    // 2. Extract
     console.log('   [2/6]  📦 Scaffolding project structure...');
     try {
         execSync(`tar -xf "${archivePath}" -C "${projectDir}" --strip-components=1`, { stdio: 'ignore' });
@@ -254,37 +238,25 @@ async function setupProject() {
 
     process.chdir(projectDir);
 
-    // 3. Auth
     console.log('   [3/6]  🔑 Authenticating with Fleetbo Cloud...');
     const keys = await fetchProjectKeys(bootstrapTokenArg);
     if (!keys.enterpriseId) throw new Error("Invalid keys.");
 
-    // 4. Environment & CLI Generation
     console.log('   [4/6]  ⚙️  Configuring environment & CLI...');
-    
-    // --- CRÉATION DU .ENV ---
-    let envContent = `REACT_APP_FLEETBO_DB_KEY=${keys.fleetboDBKey}\n`;
-    envContent += `REACT_APP_ENTERPRISE_ID=${keys.enterpriseId}\n`;
-    envContent += `REACT_KEY_APP=${projectName}\n`;
-    envContent += `DANGEROUSLY_DISABLE_HOST_CHECK=true\n`;
-
-    // Ajout conditionnel du token Ngrok
+    let envContent = `REACT_APP_FLEETBO_DB_KEY=${keys.fleetboDBKey}\nREACT_APP_ENTERPRISE_ID=${keys.enterpriseId}\nREACT_KEY_APP=${projectName}\nDANGEROUSLY_DISABLE_HOST_CHECK=true\n`;
     if (ngrokTokenArg) {
         console.log('          ✅ Ngrok token injected into .env');
         envContent += `NGROK_AUTHTOKEN=${ngrokTokenArg}\n`;
     } else {
         console.log('          ℹ️  No Ngrok token provided. Assuming global config.');
     }
-    
     fs.writeFileSync(path.join(projectDir, '.env'), envContent, 'utf8');
     fs.writeFileSync(path.join(projectDir, 'cli.js'), CLI_SCRIPT_CONTENT, 'utf8');
 
-    // 5. Deps
     console.log('   [5/6]  📚 Installing dependencies...');
     execSync('npm install', { stdio: 'inherit' }); 
     execSync('npm install ngrok dotenv axios --save-dev', { stdio: 'ignore' });
 
-    // 6. Finalize
     console.log('   [6/6]  ✨ Finalizing setup...');
     const packageJsonPath = path.join(projectDir, 'package.json');
     const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
@@ -306,6 +278,8 @@ setupProject();
 
 
 
+
+
 {/*
   
 const { execSync } = require('child_process');

package/package.json

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