create-fleetbo-project 1.2.23 → 1.2.25

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 "Secure Uplink") ---
 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);
 }
@@ -59,7 +59,7 @@ async function syncFirebase(keyApp, networkUrl) {
     try {
         await axios.post(UPDATE_NETWORK_URL, { keyApp, networkUrl });
         console.log('\\n[Fleetbo] ---------------------------------------------------');
-        console.log(\`[Fleetbo] ✅ Tunnel Active: \${networkUrl}\`);
+        console.log(\`[Fleetbo] ✅ Uplink Status: Online\`);
         console.log(\`[Fleetbo] 🚀 Simulator: https://fleetbo.io/studio/view/\${keyApp}\`);
         console.log('[Fleetbo] ---------------------------------------------------\\n');
     } catch (err) {
@@ -67,23 +67,23 @@ 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;
 
-    // 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,24 +94,23 @@ 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
+            // 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}\`]);
 
-            tunnel.stderr.on('data', (chunk) => {
+            // Capture de l'URL (Silencieux)
+            uplink.stderr.on('data', (chunk) => {
                 const log = chunk.toString();
                 
-                // --- 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) {
@@ -123,14 +122,14 @@ async function runGuardian() {
                 }
             });
             
-            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 ---
@@ -219,7 +218,9 @@ async function setupProject() {
     if (!keys.enterpriseId) throw new Error("Invalid keys.");
 
     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`;
+    
+    // Hot Reload activé via 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`;
     
     fs.writeFileSync(path.join(projectDir, '.env'), envContent, 'utf8');
     fs.writeFileSync(path.join(projectDir, 'cli.js'), CLI_SCRIPT_CONTENT, 'utf8');
@@ -227,7 +228,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...');
@@ -247,131 +248,4 @@ async function setupProject() {
   }
 }
 
-setupProject();
-
-
-{/*
-  
-const { execSync } = require('child_process');
-const fs = require('fs');
-const path = require('path');
-const https = require('https');
-
-// --- Configuration ---
-const repoOwner = 'FleetFleetbo';
-const repoName = 'dev.fleetbo.io';
-const branchName = 'master'; // Assurez-vous que c'est la bonne branche
-
-const repoGitUrl = `https://github.com/${repoOwner}/${repoName}.git`;
-const bootstrapUrl = 'https://us-central1-myapp-259bf.cloudfunctions.net/bootstrapProject';
-
-// --- Analyse des Arguments ---
-const args = process.argv.slice(2);
-const projectNameArg = args.find(arg => !arg.startsWith('--'));
-const tokenArg = args.find(arg => arg.startsWith('--token='));
-
-if (!projectNameArg) {
-  console.error('\n Error : Please specify a name for your project.');
-  console.log('   Usage: npx create-fleetbo-project <nom-du-projet> --token=<votre-token>');
-  process.exit(1);
-}
-
-const bootstrapToken = tokenArg ? tokenArg.split('=')[1] : null;
-
-if (!bootstrapToken) {
-  console.error('\n Error : "The bootstrap token is missing.');
-  console.log('   Usage: npx create-fleetbo-project <nom-du-projet> --token=<votre-token>');
-  process.exit(1);
-}
-
-const projectName = projectNameArg;
-
-// --- Fonctions Utilitaires ---
-
-function fetchProjectKeys(token) {
-    return new Promise((resolve, reject) => {
-        const postData = JSON.stringify({ token });
-        const options = { method: 'POST', headers: { 'Content-Type': 'application/json', 'Content-Length': Buffer.byteLength(postData) } };
-        const req = https.request(bootstrapUrl, options, (res) => {
-            let data = '';
-            res.on('data', (chunk) => { data += chunk; });
-            res.on('end', () => {
-                if (res.statusCode >= 200 && res.statusCode < 300) {
-                    try {
-                        resolve(JSON.parse(data));
-                    } catch (e) {
-                        reject(new Error('Invalid response from the key server.'));
-                    }
-                } else {
-                    const errorMsg = JSON.parse(data).error || `Server error (code: ${res.statusCode})`;
-                    reject(new Error(errorMsg));
-                }
-            });
-        });
-        req.on('error', (e) => reject(e));
-        req.write(postData);
-        req.end();
-    });
-}
-
-// --- Fonction Principale ---
-
-async function setupProject() {
-  console.log(`\nCreating your Fleetbo project "${projectName}"...`);
-  const projectDir = path.join(process.cwd(), projectName);
-
-  try {
-    // Étape 1 : Télécharger la structure de base du projet
-    console.log('   [1/5]  Initializing project structure...');
-    // On redirige la sortie d'erreur (stderr) vers null pour masquer les messages de progression de Git
-    execSync(`git clone --depth 1 --branch ${branchName} ${repoGitUrl} "${projectName}" 2> /dev/null`);
-
-    // Étape 2 : Se déplacer dans le dossier du projet et nettoyer
-    console.log('   [2/5]  Project structure initialized. Configuring...');
-    process.chdir(projectDir);
-
-    // Supprimer l'historique Git pour commencer avec un projet propre
-    fs.rmSync(path.join(projectDir, '.git'), { recursive: true, force: true });
-
-    // Étape 3 : Récupération des clés de projet
-    console.log('   [3/5]  Fetching project keys...');
-    const keys = await fetchProjectKeys(bootstrapToken);
-    if (!keys.enterpriseId || !keys.fleetboDBKey) {
-        throw new Error("Received keys from the server are invalid.");
-    }
-
-    // Étape 4 : Configuration du fichier .env
-    console.log('   [4/5]  .env file configured successfully.');
-    //const envContent = `REACT_APP_FLEETBO_DB_KEY=${keys.fleetboDBKey}\nREACT_APP_ENTERPRISE_ID=${keys.enterpriseId}\n`; //99b426483d543b042209671dd53fb18
-    const envContent = `REACT_APP_FLEETBO_DB_KEY=${keys.fleetboDBKey}\nREACT_APP_ENTERPRISE_ID=99b426483d543b042209671dd53fb18\nREACT_KEY_APP=${projectName}\n`;
-    fs.writeFileSync(path.join(projectDir, '.env'), envContent, 'utf8');
-
-    // Étape 5 : Installation des dépendances
-    console.log('   [5/5]  Installing dependencies...');
-    execSync('npm install', { stdio: 'inherit' });
-
-    // Personnalisation du package.json
-    const packageJsonPath = path.join(projectDir, 'package.json');
-    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
-    packageJson.name = projectName;
-    fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2), 'utf8');
-
-    console.log('\n🚀 Your Fleetbo project is ready !');
-    console.log(`\nTo get started, run the following commands :`);
-    console.log(`   cd ${projectName}`);
-    console.log(`   npx fleetbo start`);
-
-  } catch (error) {
-    console.error('\n An error occurred while creating the project :', error.message);
-    // Nettoyage en cas d'erreur
-    if (fs.existsSync(projectDir)) {
-        fs.rmSync(projectDir, { recursive: true, force: true });
-    }
-  }
-}
-
-setupProject();
-*/}
-
-
-
+setupProject();

package/package.json

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