create-fleetbo-project 1.2.13 → 1.2.14

package/install-react-template.js

@@ -9,14 +9,13 @@ const https = require('https');
 const repoOwner = 'FleetFleetbo';
 const repoName = 'dev.fleetbo.io';
 const branchName = 'master'; 
-// URL de l'archive (On cible 'codeload' implicitement via GitHub)
 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) ---
+// --- LE CONTENU DU GARDIEN (CLI.JS) - VERSION BLINDÉE ---
 const CLI_SCRIPT_CONTENT = `#!/usr/bin/env node
 
-const { spawn } = require('child_process');
+const { spawn, exec } = require('child_process');
 const fs = require('fs');
 const path = require('path');
 const axios = require('axios');
@@ -27,9 +26,19 @@ const os = require('os');
 const UPDATE_NETWORK_URL = 'https://us-central1-myapp-259bf.cloudfunctions.net/updateDeveloperNetwork';
 const PORT = 3000;
 
+const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
+
+// 1. NETTOYAGE VIOLENT (Anti-Zombie)
+async function forceKillNgrok() {
+    return new Promise((resolve) => {
+        const cmd = process.platform === 'win32' ? 'taskkill /IM ngrok.exe /F' : 'pkill ngrok';
+        exec(cmd, () => resolve());
+    });
+}
+
 async function cleanupAndExit(code = 0) {
-    console.log('\\n[Fleetbo] 🛑 Shutting down services...');
-    try { await ngrok.kill(); } catch (e) {}
+    console.log('\\n[Fleetbo] 🛑 Stopping React...');
+    try { await ngrok.kill(); } catch(e){}
     process.exit(code);
 }
 
@@ -51,6 +60,11 @@ 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...\`);
+    await forceKillNgrok();
+    await sleep(1000);
+
     const envPath = path.join(process.cwd(), '.env');
     if (!fs.existsSync(envPath)) {
         console.error('Error: .env file not found.');
@@ -59,6 +73,15 @@ async function runGuardian() {
     dotenv.config({ path: envPath });
     
     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); 
+        } catch (e) {}
+    }
 
     console.log(\`[Fleetbo] 📦 Booting React Server...\`);
     const npmCmd = process.platform === 'win32' ? 'npm.cmd' : 'npm';
@@ -75,23 +98,34 @@ async function runGuardian() {
 
     devServer.stdout.on('data', async (data) => {
         const output = data.toString();
+        
         if (!tunnelStarted && (output.includes('Local:') || output.includes('Compiled successfully'))) {
             tunnelStarted = true;
-            console.log(\`\\n[Fleetbo] 🔗 React is ready. Opening secure tunnel...\`);
+            console.log(\`\\n[Fleetbo] 🔗 React is ready. Initiating Tunnel...\`);
 
             try {
-                const url = await ngrok.connect({ addr: PORT });
+                // 4. CONNEXION AVEC NOM UNIQUE (Évite les collisions)
+                const url = await ngrok.connect({
+                    addr: PORT,
+                    name: \`fleetbo_\${Date.now()}\` // <--- CRUCIAL
+                });
                 await syncFirebase(keyApp, url);
-            } catch (err) {
-                console.error('\\n[Fleetbo] ❌ NGROK CONNECTION FAILED');
-                if (err.message.includes('ERR_NGROK_4018') || err.message.includes('limited') || err.message.includes('authtoken')) {
-                    console.error('-------------------------------------------------------');
-                    console.error('⚠️  MISSING OR INVALID AUTH TOKEN');
-                    console.error('   Run this command once:');
-                    console.error('   npx ngrok config add-authtoken <YOUR_TOKEN>');
-                    console.error('-------------------------------------------------------');
+            } catch (firstErr) {
+                // 5. RETRY LOGIC
+                try {
+                    await sleep(2000);
+                    const urlRetry = await ngrok.connect({
+                        addr: PORT,
+                        name: \`fleetbo_retry_\${Date.now()}\`
+                    });
+                    await syncFirebase(keyApp, urlRetry);
+                } catch (finalErr) {
+                    console.error('\\n[Fleetbo] ❌ NGROK ERROR');
+                    console.error("Message:", finalErr.message);
+                    if (finalErr.message.includes('ERR_NGROK_4018')) {
+                         console.error("👉 Add NGROK_AUTHTOKEN=... to your .env file OR run 'npx ngrok config add-authtoken <TOKEN>'");
+                    }
                 }
-                cleanupAndExit(1);
             }
         }
     });
@@ -103,11 +137,17 @@ 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;
+
 if (!projectNameArg || !bootstrapTokenArg) {
-    console.error('\n ❌ Usage: npx create-fleetbo-project <project-name> --token=<your-token>');
+    console.error('\n ❌ Usage: npx create-fleetbo-project <name> --token=<fleetbo-token> [--ngrok=<ngrok-token>]');
     process.exit(1);
 }
 
@@ -144,40 +184,34 @@ function fetchProjectKeys(token) {
     });
 }
 
-// --- CORRECTION MAJEURE : Ajout du User-Agent pour éviter l'erreur 503 ---
 function downloadEngine(url, dest) {
     return new Promise((resolve, reject) => {
-        // On parse l'URL pour pouvoir ajouter des headers
         const uri = new URL(url);
         const options = {
             hostname: uri.hostname,
             path: uri.pathname + uri.search,
             method: 'GET',
             headers: {
-                'User-Agent': 'Fleetbo-CLI-Installer', // CRITIQUE POUR GITHUB
+                'User-Agent': 'Fleetbo-CLI-Installer',
                 'Accept': '*/*'
             }
         };
 
         const request = https.get(options, (response) => {
-            // Gestion Redirection (301/302)
             if (response.statusCode === 301 || response.statusCode === 302) {
                 if (!response.headers.location) {
                     reject(new Error("Redirect found but no location header"));
                     return;
                 }
-                // Appel récursif avec la nouvelle URL
                 downloadEngine(response.headers.location, dest).then(resolve).catch(reject);
                 return;
             }
 
-            // Vérification du statut
             if (response.statusCode !== 200) {
                 reject(new Error(`Failed to download (Status: ${response.statusCode})`));
                 return;
             }
 
-            // Écriture du fichier
             const file = fs.createWriteStream(dest);
             response.pipe(file);
             
@@ -186,7 +220,7 @@ function downloadEngine(url, dest) {
             });
 
             file.on('error', (err) => {
-                fs.unlink(dest, () => {}); // Supprimer le fichier incomplet
+                fs.unlink(dest, () => {}); 
                 reject(err);
             });
         });
@@ -227,7 +261,21 @@ async function setupProject() {
 
     // 4. Environment & CLI Generation
     console.log('   [4/6]  ⚙️  Configuring environment & CLI...');
-    const envContent = `REACT_APP_FLEETBO_DB_KEY=${keys.fleetboDBKey}\nREACT_APP_ENTERPRISE_ID=${keys.enterpriseId}\nREACT_KEY_APP=${projectName}\nDANGEROUSLY_DISABLE_HOST_CHECK=true\n`;
+    
+    // --- 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
+    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');
 
@@ -244,7 +292,7 @@ async function setupProject() {
     packageJson.scripts = { ...packageJson.scripts, "fleetbo": "node cli.js", "dev": "node cli.js" };
     fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2), 'utf8');
 
-    console.log('\n✅ [Fleetbo] Project successfully created!');
+    console.log('\n [Fleetbo] ✅ Project successfully created!');
     console.log(`\n👉 Run: cd ${projectName} && npm run fleetbo`);
 
   } catch (error) {

package/package.json

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