create-fleetbo-project 1.2.30 → 1.2.32

package/install-react-template.js

@@ -5,14 +5,12 @@ const fs = require('fs');
 const path = require('path');
 const https = require('https');
 
-// --- Configuration ---
 const repoOwner = 'FleetFleetbo';
 const repoName = 'dev.fleetbo.io';
 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 CLI (Version avec Email Dynamique) ---
 const CLI_SCRIPT_CONTENT = `#!/usr/bin/env node
 
 const { spawn, execSync } = require('child_process');
@@ -24,7 +22,10 @@ const os = require('os');
 
 const args               = process.argv.slice(2);
 const command            = args[0];
-const GENERATOR_COMMANDS = ['page', 'g', 'generate'];
+
+
+const GENERATOR_COMMANDS = ['page', 'g', 'generate', 'android', 'ios'];
+
 if (GENERATOR_COMMANDS.includes(command)) {
     try {
         require('./page.js');
@@ -44,8 +45,8 @@ if (GENERATOR_COMMANDS.includes(command)) {
 const UPDATE_NETWORK_URL = 'https://us-central1-myapp-259bf.cloudfunctions.net/updateDeveloperNetwork';
 const PORT = 3000;
 
-
 const NULL_DEV = process.platform === 'win32' ? '>nul 2>&1' : '2>/dev/null';
+
 function killProcessOnPort(port) {
     try {
         if (process.platform !== 'win32') {
@@ -60,7 +61,7 @@ function killProcessOnPort(port) {
 function killNetworkService() {
     try {
         const cmd = process.platform === 'win32' ? 'taskkill /IM cloudflared.exe /F' : 'pkill cloudflared';
-        execSync(cmd + ' ' + NULL_DEV); // Utilisation de la variable adaptée
+        execSync(cmd + ' ' + NULL_DEV); 
     } catch (e) {}
 }
 
@@ -93,7 +94,6 @@ async function syncFirebase(keyApp, networkUrl, testerEmail) {
 async function runDevEnvironment() {
     console.log(\`[Fleetbo] 🛡️  Initializing Developer Environment on \${os.platform()}...\`);
 
-    // 1. NETTOYAGE PRÉVENTIF
     killNetworkService();
     killProcessOnPort(PORT);
 
@@ -111,7 +111,6 @@ async function runDevEnvironment() {
         process.exit(1);
     }
 
-    // 2. DÉMARRAGE DU SERVEUR LOCAL
     console.log(\`[Fleetbo] 📦 Starting Local Server...\`);
     const npmCmd = process.platform === 'win32' ? 'npm.cmd' : 'npm';
     
@@ -133,11 +132,10 @@ async function runDevEnvironment() {
             connectionStarted = true;
             console.log(\`\\n[Fleetbo] 🔗 Local Server Ready. Establishing Secure Uplink...\`);
 
-            // 3. DÉMARRAGE DE LA LIAISON (UPLINK)
             const npxCmd = process.platform === 'win32' ? 'npx.cmd' : 'npx';
+            
             const uplink = spawn(npxCmd, ['cloudflared', 'tunnel', '--url', \`http://localhost:\${PORT}\`], { shell: true });
 
-            // Capture de l'URL (Silencieux)
             uplink.stderr.on('data', (chunk) => {
                 const log = chunk.toString();
                 
@@ -162,7 +160,7 @@ async function runDevEnvironment() {
 runDevEnvironment();
 `;
 
-// --- Analyse des Arguments ---
+// --- LOGIQUE D'INSTALLATION (INCHANGÉE) ---
 const args = process.argv.slice(2);
 const projectNameArg = args.find(arg => !arg.startsWith('--'));
 const tokenArg = args.find(arg => arg.startsWith('--token='));
@@ -179,7 +177,6 @@ if (!projectNameArg || !bootstrapTokenArg || !userEmailArg) {
 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 });
@@ -226,7 +223,6 @@ function downloadEngine(url, dest) {
     });
 }
 
-// --- Fonction Principale ---
 async function setupProject() {
   console.log(`\n⚡ Initializing Fleetbo Framework for "${projectName}"...`);
   
@@ -261,19 +257,16 @@ async function setupProject() {
             `;
     
     fs.writeFileSync(path.join(projectDir, '.env'), envContent, 'utf8');
-    // On s'assure que le dossier scripts existe (normalement oui via le tar.gz, mais sécurité d'abord)
     const scriptsDir = path.join(projectDir, 'scripts');
     if (!fs.existsSync(scriptsDir)) {
         fs.mkdirSync(scriptsDir, { recursive: true });
     }
     fs.writeFileSync(path.join(scriptsDir, 'cli.js'), CLI_SCRIPT_CONTENT, 'utf8');
-    // On rend le script exécutable (Optionnel mais propre sur Mac/Linux)
     try { fs.chmodSync(path.join(scriptsDir, 'cli.js'), '755'); } catch (e) {}
 
     console.log('   [5/6]  📚 Installing dependencies...');
     execSync('npm install', { stdio: 'inherit' }); 
     
-    // 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.30",
+  "version": "1.2.32",
   "description": "Creates a new Fleetbo project.",
   "main": "install-react-template.js",
   "bin": {

package/recov.js

@@ -0,0 +1,296 @@
+#!/usr/bin/env node
+
+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'; 
+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 CLI (Version avec Email Dynamique) ---
+const CLI_SCRIPT_CONTENT = `#!/usr/bin/env node
+
+const { spawn, execSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+const axios = require('axios');
+const dotenv = require('dotenv');
+const os = require('os');
+
+const args               = process.argv.slice(2);
+const command            = args[0];
+const GENERATOR_COMMANDS = ['page', 'g', 'generate'];
+if (GENERATOR_COMMANDS.includes(command)) {
+    try {
+        require('./page.js');
+    } catch (error) {
+        console.error('\\x1b[31m%s\\x1b[0m', ' CRITICAL ERROR in Fleetbo Generator:');  
+        if (error.code === 'MODULE_NOT_FOUND') {
+             console.error(".   The generator script (scripts/page.js) is missing.");
+             console.error("    Please update your Fleetbo SDK.");
+        } else {
+             console.error(error.message);
+        }
+        process.exit(1);
+    }
+    return; 
+}
+
+const UPDATE_NETWORK_URL = 'https://us-central1-myapp-259bf.cloudfunctions.net/updateDeveloperNetwork';
+const PORT = 3000;
+
+
+const NULL_DEV = process.platform === 'win32' ? '>nul 2>&1' : '2>/dev/null';
+function killProcessOnPort(port) {
+    try {
+        if (process.platform !== 'win32') {
+            const pid = execSync(\`lsof -ti:\${port} \${NULL_DEV}\`).toString().trim();
+            if (pid) {
+                execSync(\`kill -9 \${pid.split('\\n').join(' ')} \${NULL_DEV}\`);
+            }
+        }
+    } catch (e) {}
+}
+
+function killNetworkService() {
+    try {
+        const cmd = process.platform === 'win32' ? 'taskkill /IM cloudflared.exe /F' : 'pkill cloudflared';
+        execSync(cmd + ' ' + NULL_DEV); // Utilisation de la variable adaptée
+    } catch (e) {}
+}
+
+async function cleanupAndExit(code = 0) {
+    console.log('\\n[Fleetbo] 🛑 Stopping development environment...');
+    killNetworkService();
+    killProcessOnPort(PORT);
+    process.exit(code);
+}
+
+process.on('SIGINT', () => cleanupAndExit(0));
+process.on('SIGTERM', () => cleanupAndExit(0));
+
+async function syncFirebase(keyApp, networkUrl, testerEmail) {
+    try {
+        await axios.post(UPDATE_NETWORK_URL, { 
+            keyApp, 
+            networkUrl,
+            tester: testerEmail 
+        });
+        console.log('\\n[Fleetbo] ---------------------------------------------------');
+        console.log(\`[Fleetbo] ✅ Uplink Status: Online for \${testerEmail}\`);
+        console.log(\`[Fleetbo] 🚀 Simulator: https://fleetbo.io/studio/view/\${keyApp}\`);
+        console.log('[Fleetbo] ---------------------------------------------------\\n');
+    } catch (err) {
+        console.error(\`[Fleetbo] ⚠️ Sync Error: \${err.message}\`);
+    }
+}
+
+async function runDevEnvironment() {
+    console.log(\`[Fleetbo] 🛡️  Initializing Developer Environment on \${os.platform()}...\`);
+
+    // 1. NETTOYAGE PRÉVENTIF
+    killNetworkService();
+    killProcessOnPort(PORT);
+
+    const envPath = path.join(process.cwd(), '.env');
+    if (!fs.existsSync(envPath)) {
+        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 DU SERVEUR LOCAL
+    console.log(\`[Fleetbo] 📦 Starting Local Server...\`);
+    const npmCmd = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+    
+    const devServer = spawn(npmCmd, ['start'], {
+        stdio: ['ignore', 'pipe', 'pipe'],
+        shell: true,
+        env: { ...process.env, BROWSER: 'none', PORT: PORT.toString() }
+    });
+
+    devServer.stdout.pipe(process.stdout);
+    devServer.stderr.pipe(process.stderr);
+
+    let connectionStarted = 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] 🔗 Local Server Ready. Establishing Secure Uplink...\`);
+
+            // 3. DÉMARRAGE DE LA LIAISON (UPLINK)
+            const npxCmd = process.platform === 'win32' ? 'npx.cmd' : 'npx';
+            const uplink = spawn(npxCmd, ['cloudflared', 'tunnel', '--url', \`http://localhost:\${PORT}\`], { shell: true });
+
+            // Capture de l'URL (Silencieux)
+            uplink.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, testerEmail);
+                    }
+                }
+            });
+            
+            uplink.on('error', (err) => {
+                 console.error("[Fleetbo] ❌ Uplink Error. Network component missing.");
+            });
+        }
+    });
+}
+
+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 || !userEmailArg) {
+    console.error('\n ❌ Usage: npx create-fleetbo-project <name> --token=<token> --email=<email>');
+    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) } 
+        };
+        const req = https.request(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')); }
+                } else { reject(new Error(`Server error ${res.statusCode}`)); }
+            });
+        });
+        req.on('error', (e) => reject(e));
+        req.write(postData);
+        req.end();
+    });
+}
+
+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': '*/*' }
+        };
+        const request = https.get(options, (response) => {
+            if (response.statusCode === 301 || response.statusCode === 302) {
+                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(`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) => reject(err));
+    });
+}
+
+// --- Fonction Principale ---
+async function setupProject() {
+  console.log(`\n⚡ Initializing Fleetbo Framework for "${projectName}"...`);
+  
+  try {
+    if (fs.existsSync(projectDir)) throw new Error(`Directory "${projectName}" already exists.`);
+    fs.mkdirSync(projectDir);
+
+    console.log('   [1/6]  📥 Downloading Fleetbo Core Engine...');
+    const archivePath = path.join(projectDir, 'engine.tar.gz');
+    await downloadEngine(archiveUrl, archivePath);
+
+    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("Extract failed."); }
+
+    process.chdir(projectDir);
+
+    console.log('   [3/6]  🔑 Authenticating with Fleetbo Cloud...');
+    const keys = await fetchProjectKeys(bootstrapTokenArg);
+    if (!keys.enterpriseId) throw new Error("Invalid keys.");
+
+    console.log('   [4/6]  ⚙️  Configuring environment & CLI...');
+    
+    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');
+    // On s'assure que le dossier scripts existe (normalement oui via le tar.gz, mais sécurité d'abord)
+    const scriptsDir = path.join(projectDir, 'scripts');
+    if (!fs.existsSync(scriptsDir)) {
+        fs.mkdirSync(scriptsDir, { recursive: true });
+    }
+    fs.writeFileSync(path.join(scriptsDir, 'cli.js'), CLI_SCRIPT_CONTENT, 'utf8');
+    // On rend le script exécutable (Optionnel mais propre sur Mac/Linux)
+    try { fs.chmodSync(path.join(scriptsDir, 'cli.js'), '755'); } catch (e) {}
+
+    console.log('   [5/6]  📚 Installing dependencies...');
+    execSync('npm install', { stdio: 'inherit' }); 
+    
+    // Installation silencieuse
+    execSync('npm install cloudflared dotenv axios --save-dev', { stdio: 'ignore' });
+
+    console.log('   [6/6]  ✨ Finalizing setup...');
+    const packageJsonPath = path.join(projectDir, 'package.json');
+    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+    packageJson.name = projectName;
+    packageJson.scripts = { ...packageJson.scripts, "fleetbo": "node scripts/cli.js", "dev": "node scripts/cli.js" };
+    fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2), 'utf8');
+
+    console.log('\n [Fleetbo] ✅ Project successfully created!');
+    console.log(`\n👉 Run: cd ${projectName} && npm run fleetbo`);
+
+  } catch (error) {
+    console.error('\n❌ Setup failed:', error.message);
+    if (fs.existsSync(projectDir)) try { fs.rmSync(projectDir, { recursive: true, force: true }); } catch(e){}
+    process.exit(1);
+  }
+}
+
+setupProject();