create-fleetbo-project 1.2.14 → 1.2.18

package/install-react-template.js

@@ -12,33 +12,41 @@ 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 GARDIEN CLOUDFLARE (Version Production Silencieuse) ---
 const CLI_SCRIPT_CONTENT = `#!/usr/bin/env node
 
-const { spawn, exec } = require('child_process');
+const { spawn, execSync } = require('child_process');
 const fs = require('fs');
 const path = require('path');
 const axios = require('axios');
 const dotenv = require('dotenv');
-const ngrok = require('ngrok'); 
 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));
+// Nettoyage des ports (Mac/Linux)
+function killProcessOnPort(port) {
+    try {
+        if (process.platform !== 'win32') {
+            const pid = execSync(\`lsof -ti:\${port} 2>/dev/null\`).toString().trim();
+            if (pid) execSync(\`kill -9 \${pid.split('\\n').join(' ')} 2>/dev/null\`);
+        }
+    } catch (e) {}
+}
 
-// 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());
-    });
+// Nettoyage spécifique Cloudflare
+function killCloudflared() {
+    try {
+        const cmd = process.platform === 'win32' ? 'taskkill /IM cloudflared.exe /F' : 'pkill cloudflared';
+        execSync(cmd + ' 2>/dev/null');
+    } catch (e) {}
 }
 
 async function cleanupAndExit(code = 0) {
-    console.log('\\n[Fleetbo] 🛑 Stopping React...');
-    try { await ngrok.kill(); } catch(e){}
+    console.log('\\n[Fleetbo] 🛑 Stopping services...');
+    killCloudflared();
+    killProcessOnPort(PORT);
     process.exit(code);
 }
 
@@ -60,10 +68,9 @@ 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);
+    // 1. NETTOYAGE PRÉVENTIF
+    killCloudflared();
+    killProcessOnPort(PORT);
 
     const envPath = path.join(process.cwd(), '.env');
     if (!fs.existsSync(envPath)) {
@@ -71,24 +78,15 @@ async function runGuardian() {
         process.exit(1);
     }
     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) {}
-    }
 
+    // 2. DÉMARRAGE REACT
     console.log(\`[Fleetbo] 📦 Booting React Server...\`);
     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);
@@ -96,37 +94,33 @@ async function runGuardian() {
 
     let tunnelStarted = false;
 
-    devServer.stdout.on('data', async (data) => {
+    devServer.stdout.on('data', (data) => {
         const output = data.toString();
         
         if (!tunnelStarted && (output.includes('Local:') || output.includes('Compiled successfully'))) {
             tunnelStarted = true;
-            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
-                });
-                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()}\`
-                    });
-                    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>'");
+            console.log(\`\\n[Fleetbo] 🔗 React is ready. Establishing secure tunnel...\`);
+
+            // 3. DÉMARRAGE TUNNEL CLOUDFLARE (via npm exec pour la compatibilité)
+            const npxCmd = process.platform === 'win32' ? 'npx.cmd' : 'npx';
+            const tunnel = spawn(npxCmd, ['cloudflared', 'tunnel', '--url', \`http://localhost:\${PORT}\`]);
+
+            // Capture de l'URL dans les logs
+            tunnel.stderr.on('data', (chunk) => {
+                const log = chunk.toString();
+                const match = log.match(/https:\/\/[a-zA-Z0-9-]+\.trycloudflare\.com/);
+                if (match) {
+                    const url = match[0];
+                    if (global.currentUrl !== url) {
+                        global.currentUrl = url;
+                        syncFirebase(keyApp, url);
                     }
                 }
-            }
+            });
+            
+            tunnel.on('error', (err) => {
+                 console.error("[Fleetbo] ❌ Tunnel Error. Ensure 'cloudflared' is installed.");
+            });
         }
     });
 }
@@ -137,37 +131,25 @@ 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 <name> --token=<fleetbo-token> [--ngrok=<ngrok-token>]');
+    console.error('\n ❌ Usage: npx create-fleetbo-project <name> --token=<token>');
     process.exit(1);
 }
 
 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,47 +170,22 @@ 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) {
-                    reject(new Error("Redirect found but no location header"));
-                    return;
-                }
+                if (!response.headers.location) { reject(new Error("Redirect error")); return; }
                 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,51 +197,35 @@ 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' });
         fs.unlinkSync(archivePath); 
-    } catch (e) { throw new Error("Failed to extract engine. Ensure 'tar' is available."); }
+    } catch (e) { throw new Error("Extract failed."); }
 
     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
-    if (ngrokTokenArg) {
-        console.log('          ✅ Ngrok token injected into .env');
-        envContent += `NGROK_AUTHTOKEN=${ngrokTokenArg}\n`;
-    } else {
-        console.log('          ℹ️  No Ngrok token provided. Assuming global config.');
-    }
+    // On force le host check pour la compatibilité tunnel
+    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`;
     
     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' });
+    
+    // Installation de cloudflared
+    execSync('npm install cloudflared 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'));
@@ -305,7 +246,6 @@ async function setupProject() {
 setupProject();
 
 
-
 {/*
   
 const { execSync } = require('child_process');

package/package.json

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