create-fleetbo-project 1.2.21 → 1.2.23

package/install-react-template.js

@@ -12,7 +12,7 @@ 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 GARDIEN RÉSEAU (Version "White Label") ---
+// --- LE CONTENU DU GARDIEN (CLI.JS) ---
 const CLI_SCRIPT_CONTENT = `#!/usr/bin/env node
 
 const { spawn, execSync } = require('child_process');
@@ -25,18 +25,20 @@ const os = require('os');
 const UPDATE_NETWORK_URL = 'https://us-central1-myapp-259bf.cloudfunctions.net/updateDeveloperNetwork';
 const PORT = 3000;
 
-// Gestion des processus (Mac/Linux)
+// 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\`);
+            if (pid) {
+                execSync(\`kill -9 \${pid.split('\\n').join(' ')} 2>/dev/null\`);
+            }
         }
     } catch (e) {}
 }
 
-// Gestion du connecteur réseau
-function killNetworkConnector() {
+// Nettoyage spécifique Cloudflare
+function killCloudflared() {
     try {
         const cmd = process.platform === 'win32' ? 'taskkill /IM cloudflared.exe /F' : 'pkill cloudflared';
         execSync(cmd + ' 2>/dev/null');
@@ -45,7 +47,7 @@ function killNetworkConnector() {
 
 async function cleanupAndExit(code = 0) {
     console.log('\\n[Fleetbo] 🛑 Stopping services...');
-    killNetworkConnector();
+    killCloudflared();
     killProcessOnPort(PORT);
     process.exit(code);
 }
@@ -57,7 +59,7 @@ async function syncFirebase(keyApp, networkUrl) {
     try {
         await axios.post(UPDATE_NETWORK_URL, { keyApp, networkUrl });
         console.log('\\n[Fleetbo] ---------------------------------------------------');
-        console.log(\`[Fleetbo] ✅ Network Ready: Active\`);
+        console.log(\`[Fleetbo] ✅ Tunnel Active: \${networkUrl}\`);
         console.log(\`[Fleetbo] 🚀 Simulator: https://fleetbo.io/studio/view/\${keyApp}\`);
         console.log('[Fleetbo] ---------------------------------------------------\\n');
     } catch (err) {
@@ -68,8 +70,8 @@ async function syncFirebase(keyApp, networkUrl) {
 async function runGuardian() {
     console.log(\`[Fleetbo] 🛡️  Starting Fleetbo Guardian on \${os.platform()}...\`);
 
-    // 1. PRÉPARATION ENVIRONNEMENT
-    killNetworkConnector();
+    // 1. NETTOYAGE PRÉVENTIF
+    killCloudflared();
     killProcessOnPort(PORT);
 
     const envPath = path.join(process.cwd(), '.env');
@@ -92,23 +94,26 @@ async function runGuardian() {
     devServer.stdout.pipe(process.stdout);
     devServer.stderr.pipe(process.stderr);
 
-    let connectionStarted = false;
+    let tunnelStarted = 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] 🔗 React is ready. Establishing Secure Link...\`);
+        if (!tunnelStarted && (output.includes('Local:') || output.includes('Compiled successfully'))) {
+            tunnelStarted = true;
+            console.log(\`\\n[Fleetbo] 🔗 React is ready. Establishing secure tunnel...\`);
 
-            // 3. DÉMARRAGE LINK SÉCURISÉ
+            // 3. DÉMARRAGE TUNNEL CLOUDFLARE
             const npxCmd = process.platform === 'win32' ? 'npx.cmd' : 'npx';
-            const connector = spawn(npxCmd, ['cloudflared', 'tunnel', '--url', \`http://localhost:\${PORT}\`]);
+            const tunnel = spawn(npxCmd, ['cloudflared', 'tunnel', '--url', \`http://localhost:\${PORT}\`]);
 
-            // Capture de l'URL (Silencieux)
-            connector.stderr.on('data', (chunk) => {
+            tunnel.stderr.on('data', (chunk) => {
                 const log = chunk.toString();
-                const match = log.match(/https:\/\/[a-zA-Z0-9-]+\.trycloudflare\.com/);
+                
+                // --- REGEX CORRIGÉE AVEC DOUBLE ÉCHAPPEMENT ---
+                // Dans ce fichier générateur, on doit écrire \\ pour obtenir \ dans le fichier final
+                const match = log.match(/https:\\/\\/[a-zA-Z0-9-]+\\.trycloudflare\\.com/);
+                
                 if (match) {
                     const url = match[0];
                     if (global.currentUrl !== url) {
@@ -118,8 +123,8 @@ async function runGuardian() {
                 }
             });
             
-            connector.on('error', (err) => {
-                 console.error("[Fleetbo] ❌ Connection Error. Essential network components missing.");
+            tunnel.on('error', (err) => {
+                 console.error("[Fleetbo] ❌ Tunnel Error. Ensure 'cloudflared' is installed.");
             });
         }
     });
@@ -214,7 +219,6 @@ async function setupProject() {
     if (!keys.enterpriseId) throw new Error("Invalid keys.");
 
     console.log('   [4/6]  ⚙️  Configuring environment & CLI...');
-    // On force le host check pour la compatibilité réseau
     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');
@@ -223,7 +227,7 @@ async function setupProject() {
     console.log('   [5/6]  📚 Installing dependencies...');
     execSync('npm install', { stdio: 'inherit' }); 
     
-    // Installation des connecteurs réseaux (silencieux)
+    // Installation de cloudflared
     execSync('npm install cloudflared dotenv axios --save-dev', { stdio: 'ignore' });
 
     console.log('   [6/6]  ✨ Finalizing setup...');
@@ -246,7 +250,8 @@ async function setupProject() {
 setupProject();
 
 
-{/*  
+{/*
+  
 const { execSync } = require('child_process');
 const fs = require('fs');
 const path = require('path');

package/package.json

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