create-fleetbo-project 1.2.24 → 1.2.26

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 CONTENU DU GARDIEN (CLI.JS) ---
+// --- LE CONTENU DU CLI (Version avec Email Dynamique) ---
 const CLI_SCRIPT_CONTENT = `#!/usr/bin/env node
 
 const { spawn, execSync } = require('child_process');
@@ -25,7 +25,7 @@ const os = require('os');
 const UPDATE_NETWORK_URL = 'https://us-central1-myapp-259bf.cloudfunctions.net/updateDeveloperNetwork';
 const PORT = 3000;
 
-// Nettoyage des ports (Mac/Linux)
+// Gestion des processus système (Mac/Linux)
 function killProcessOnPort(port) {
     try {
         if (process.platform !== 'win32') {
@@ -37,8 +37,8 @@ function killProcessOnPort(port) {
     } catch (e) {}
 }
 
-// Nettoyage spécifique Cloudflare
-function killCloudflared() {
+// Gestion du service réseau
+function killNetworkService() {
     try {
         const cmd = process.platform === 'win32' ? 'taskkill /IM cloudflared.exe /F' : 'pkill cloudflared';
         execSync(cmd + ' 2>/dev/null');
@@ -46,8 +46,8 @@ function killCloudflared() {
 }
 
 async function cleanupAndExit(code = 0) {
-    console.log('\\n[Fleetbo] 🛑 Stopping services...');
-    killCloudflared();
+    console.log('\\n[Fleetbo] 🛑 Stopping development environment...');
+    killNetworkService();
     killProcessOnPort(PORT);
     process.exit(code);
 }
@@ -55,11 +55,15 @@ async function cleanupAndExit(code = 0) {
 process.on('SIGINT', () => cleanupAndExit(0));
 process.on('SIGTERM', () => cleanupAndExit(0));
 
-async function syncFirebase(keyApp, networkUrl) {
+async function syncFirebase(keyApp, networkUrl, testerEmail) {
     try {
-        await axios.post(UPDATE_NETWORK_URL, { keyApp, networkUrl });
+        await axios.post(UPDATE_NETWORK_URL, { 
+            keyApp, 
+            networkUrl,
+            tester: testerEmail 
+        });
         console.log('\\n[Fleetbo] ---------------------------------------------------');
-        console.log(\`[Fleetbo] ✅ Tunnel Active: \${networkUrl}\`);
+        console.log(\`[Fleetbo] ✅ Uplink Status: Online for \${testerEmail}\`);
         console.log(\`[Fleetbo] 🚀 Simulator: https://fleetbo.io/studio/view/\${keyApp}\`);
         console.log('[Fleetbo] ---------------------------------------------------\\n');
     } catch (err) {
@@ -67,23 +71,29 @@ async function syncFirebase(keyApp, networkUrl) {
     }
 }
 
-async function runGuardian() {
-    console.log(\`[Fleetbo] 🛡️  Starting Fleetbo Guardian on \${os.platform()}...\`);
+async function runDevEnvironment() {
+    console.log(\`[Fleetbo] 🛡️  Initializing Developer Environment on \${os.platform()}...\`);
 
     // 1. NETTOYAGE PRÉVENTIF
-    killCloudflared();
+    killNetworkService();
     killProcessOnPort(PORT);
 
     const envPath = path.join(process.cwd(), '.env');
     if (!fs.existsSync(envPath)) {
-        console.error('Error: .env file not found.');
+        console.error('Error: Configuration file not found.');
         process.exit(1);
     }
     dotenv.config({ path: envPath });
     const keyApp = process.env.REACT_KEY_APP;
+    const testerEmail = process.env.REACT_APP_TESTER_EMAIL;
+
+    if (!testerEmail) {
+        console.error('Error: REACT_APP_TESTER_EMAIL missing in .env');
+        process.exit(1);
+    }
 
-    // 2. DÉMARRAGE REACT
-    console.log(\`[Fleetbo] 📦 Booting React Server...\`);
+    // 2. DÉMARRAGE DU SERVEUR LOCAL
+    console.log(\`[Fleetbo] 📦 Starting Local Server...\`);
     const npmCmd = process.platform === 'win32' ? 'npm.cmd' : 'npm';
     
     const devServer = spawn(npmCmd, ['start'], {
@@ -94,53 +104,55 @@ async function runGuardian() {
     devServer.stdout.pipe(process.stdout);
     devServer.stderr.pipe(process.stderr);
 
-    let tunnelStarted = false;
+    let connectionStarted = false;
 
     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. Establishing secure tunnel...\`);
+        if (!connectionStarted && (output.includes('Local:') || output.includes('Compiled successfully'))) {
+            connectionStarted = true;
+            console.log(\`\\n[Fleetbo] 🔗 Local Server Ready. Establishing Secure Uplink...\`);
 
-            // 3. DÉMARRAGE TUNNEL CLOUDFLARE (via npm exec)
+            // 3. DÉMARRAGE DE LA LIAISON (UPLINK)
             const npxCmd = process.platform === 'win32' ? 'npx.cmd' : 'npx';
-            const tunnel = spawn(npxCmd, ['cloudflared', 'tunnel', '--url', \`http://localhost:\${PORT}\`]);
+            const uplink = spawn(npxCmd, ['cloudflared', 'tunnel', '--url', \`http://localhost:\${PORT}\`]);
 
-            // Capture de l'URL dans les logs stderr
-            tunnel.stderr.on('data', (chunk) => {
+            // Capture de l'URL (Silencieux)
+            uplink.stderr.on('data', (chunk) => {
                 const log = chunk.toString();
                 
-                // --- REGEX VALIDÉE ---
                 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);
+                        syncFirebase(keyApp, url, testerEmail);
                     }
                 }
             });
             
-            tunnel.on('error', (err) => {
-                 console.error("[Fleetbo] ❌ Tunnel Error. Ensure 'cloudflared' is installed.");
+            uplink.on('error', (err) => {
+                 console.error("[Fleetbo] ❌ Uplink Error. Network component missing.");
             });
         }
     });
 }
 
-runGuardian();
+runDevEnvironment();
 `;
 
 // --- Analyse des Arguments ---
 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) {
-    console.error('\n ❌ Usage: npx create-fleetbo-project <name> --token=<token>');
+if (!projectNameArg || !bootstrapTokenArg || !userEmailArg) {
+    console.error('\n ❌ Usage: npx create-fleetbo-project <name> --token=<token> --email=<email>');
     process.exit(1);
 }
 
@@ -220,8 +232,13 @@ async function setupProject() {
 
     console.log('   [4/6]  ⚙️  Configuring environment & CLI...');
     
-    // --- MISE À JOUR : Activation du Hot Reload avec WDS_SOCKET_PORT=0 ---
-    const envContent = `REACT_APP_FLEETBO_DB_KEY=${keys.fleetboDBKey}\nREACT_APP_ENTERPRISE_ID=${keys.enterpriseId}\nREACT_KEY_APP=${projectName}\nDANGEROUSLY_DISABLE_HOST_CHECK=true\nWDS_SOCKET_PORT=0\n`;
+    const envContent = `REACT_APP_FLEETBO_DB_KEY=${keys.fleetboDBKey}
+REACT_APP_ENTERPRISE_ID=${keys.enterpriseId}
+REACT_KEY_APP=${projectName}
+REACT_APP_TESTER_EMAIL=${userEmailArg}
+DANGEROUSLY_DISABLE_HOST_CHECK=true
+WDS_SOCKET_PORT=0
+`;
     
     fs.writeFileSync(path.join(projectDir, '.env'), envContent, 'utf8');
     fs.writeFileSync(path.join(projectDir, 'cli.js'), CLI_SCRIPT_CONTENT, 'utf8');
@@ -229,7 +246,7 @@ async function setupProject() {
     console.log('   [5/6]  📚 Installing dependencies...');
     execSync('npm install', { stdio: 'inherit' }); 
     
-    // Installation de cloudflared
+    // Installation silencieuse
     execSync('npm install cloudflared dotenv axios --save-dev', { stdio: 'ignore' });
 
     console.log('   [6/6]  ✨ Finalizing setup...');

package/package.json

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