create-fleetbo-project 1.2.35 → 1.2.37

package/install-react-template.js

@@ -152,13 +152,33 @@ function killNetworkService() {
     } catch (e) {}
 }
 
+// Variable de verrouillage globale
+let isExiting = false;
+
 async function cleanupAndExit(code = 0) {
-    console.log('\\n[Fleetbo] 🛑 Stopping development environment...');
+    // Si on est déjà en train de sortir, on ignore les autres signaux
+    if (isExiting) return;
+    isExiting = true;
+
+    console.log('\n[Fleetbo] 🛑 Stopping development environment...');
+
+    try {
+        // Nettoyage de l'Uplink dans Firestore
+        await axios.post(UPDATE_NETWORK_URL, { 
+            keyApp: keyApp, 
+            networkUrl: '', 
+            tester: testerEmail 
+        });
+        console.log('[Fleetbo] 🧊 Uplink cleaned successfully.');
+    } catch (e) {
+        // On ne bloque pas si le réseau échoue à la fermeture
+    }
+
     killNetworkService();
     killProcessOnPort(PORT);
     process.exit(code);
 }
-
+// Les écouteurs restent les mêmes, mais la fonction gère maintenant le verrou
 process.on('SIGINT', () => cleanupAndExit(0));
 process.on('SIGTERM', () => cleanupAndExit(0));
 
@@ -171,9 +191,9 @@ async function syncFirebase(keyApp, networkUrl, testerEmail) {
         });
         console.log('\\n[Fleetbo] ---------------------------------------------------\\n');
         console.log(\`[Fleetbo] ✅ Uplink Status: Online for \${testerEmail}\`);
-        console.log(\`[Fleetbo] 🚀 Simulator: https://fleetbo.io/studio/view/\${keyApp}\`);
-        console.log(\'[Fleetbo] 👉 Your studio is ready. You can now open the link above.\n');
-        console.log('[Fleetbo] ---------------------------------------------------\\n');
+        console.log(\`[Fleetbo] 🚀 Fleetbo Studio: https://fleetbo.io/studio/view/\${keyApp}\`);
+        console.log(\'[Fleetbo] 👉 Your studio is ready. You can now open the link above.\');
+        console.log('\\n[Fleetbo] ---------------------------------------------------\\n');
     } catch (err) {
         console.error(\`[Fleetbo] ⚠️ Sync Error: \${err.message}\`);
     }

package/package.json

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

package/recov.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');
@@ -21,31 +19,121 @@ const path = require('path');
 const axios = require('axios');
 const dotenv = require('dotenv');
 const os = require('os');
+const archiver = require('archiver');
+
+const CLOUD_ENGINE_URL = "https://us-central1-myapp-259bf.cloudfunctions.net/uploadLogicBundle";
+const UPDATE_NETWORK_URL = 'https://us-central1-myapp-259bf.cloudfunctions.net/updateDeveloperNetwork';
+const PORT = 3000;
+
+const args = process.argv.slice(2);
+const command = args[0];
+
+const envPath = path.join(process.cwd(), '.env');
+if (!fs.existsSync(envPath)) {
+    console.error('❌ Error: Configuration file (.env) not found.');
+    process.exit(1);
+}
+dotenv.config({ path: envPath });
+
+const projectId = process.env.REACT_APP_ENTERPRISE_ID; 
+const keyApp = process.env.REACT_KEY_APP; 
+const testerEmail = process.env.REACT_APP_TESTER_EMAIL;
+
+if (!projectId) {
+    console.error('\\n❌ Error: Project ID is missing.');
+    console.error('👉 Please check your .env file.');
+    console.error('   It must contain: REACT_APP_ENTERPRISE_ID=your_project_id\\n');
+    process.exit(1);
+}
+
+if (command === 'deploy') {
+    (async () => {
+        console.log('\\n\\x1b[36m%s\\x1b[0m', '⚡  FLEETBO CLOUD ENGINE v1.0');
+        console.log('\\x1b[32m%s\\x1b[0m', 'Target Runtime:', keyApp);
+        console.log('------------------------------------------------');
+
+        console.log('🔨  \\x1b[33mCompiling local assets...\\x1b[0m');
+        try {
+            execSync('npm run build', { stdio: 'inherit' });
+        } catch (e) {
+            console.error('\\n❌  Build failed. Fix errors and try again.');
+            process.exit(1);
+        }
+
+        let buildDir = 'dist';
+        if (!fs.existsSync(path.join(process.cwd(), 'dist')) && fs.existsSync(path.join(process.cwd(), 'build'))) {
+            buildDir = 'build';
+        }
+
+        if (!fs.existsSync(path.join(process.cwd(), buildDir))) {
+            console.error(\`\\n❌  Error: Build folder '\${buildDir}' not found.\`);
+            process.exit(1);
+        }
+
+        console.log('\\n📦  \\x1b[33mProcessing Neural Logic...\\x1b[0m');
+        console.log(\`    Detected stack: React (\${buildDir})\`);
+
+        try {
+            const zipBuffer = await new Promise((resolve, reject) => {
+                const chunks = [];
+                const archive = archiver('zip', { zlib: { level: 9 } });
+
+                archive.on('data', (chunk) => chunks.push(chunk));
+                archive.on('error', (err) => reject(err));
+                archive.on('end', () => resolve(Buffer.concat(chunks)));
+
+                archive.directory(path.join(process.cwd(), buildDir), false);
+                archive.finalize();
+            });
+
+            console.log('☁️   \\x1b[33mEstablishing Uplink to Switch-Engine...\\x1b[0m');
+
+            const response = await axios.post(CLOUD_ENGINE_URL, zipBuffer, {
+                headers: {
+                    'Content-Type': 'application/zip', 
+                    'x-project-id': projectId,
+                    'Content-Length': zipBuffer.length 
+                },
+                maxContentLength: Infinity,
+                maxBodyLength: Infinity
+            });
+
+            console.log('------------------------------------------------');
+            console.log('✅  \\x1b[1m\\x1b[32mDEPLOYMENT SUCCESSFUL\\x1b[0m');
+            console.log(\`    Build ID: \${response.data.buildId}\`);
+            console.log(\`    Payload:  \${(zipBuffer.length / 1024 / 1024).toFixed(2)} MB\`);
+            console.log('\\n📱  \\x1b[36mNative Runtime has been hot-swapped.\\x1b[0m');
+            console.log('    Your app is live.\\n');
+
+        } catch (error) {
+            console.error('\\n❌  \\x1b[31mCRITICAL FAILURE\\x1b[0m');
+            if (error.response) {
+                console.error(\`    Server responded with \${error.response.status}: "\${error.response.statusText}".\`);
+                console.error(\`    Details: \${JSON.stringify(error.response.data)}\`);
+            } else {
+                console.error(\`    \${error.message}\`);
+            }
+            process.exit(1);
+        }
+    })();
+    return;
+}
+
+const GENERATOR_COMMANDS = ['page', 'g', 'generate', 'android', 'ios'];
 
-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);
-        }
+        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') {
@@ -60,7 +148,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) {}
 }
 
@@ -81,9 +169,10 @@ async function syncFirebase(keyApp, networkUrl, testerEmail) {
             networkUrl,
             tester: testerEmail 
         });
-        console.log('\\n[Fleetbo] ---------------------------------------------------');
+        console.log('\\n[Fleetbo] ---------------------------------------------------\\n');
         console.log(\`[Fleetbo] ✅ Uplink Status: Online for \${testerEmail}\`);
         console.log(\`[Fleetbo] 🚀 Simulator: https://fleetbo.io/studio/view/\${keyApp}\`);
+        console.log(\'[Fleetbo] 👉 Your studio is ready. You can now open the link above.\n');
         console.log('[Fleetbo] ---------------------------------------------------\\n');
     } catch (err) {
         console.error(\`[Fleetbo] ⚠️ Sync Error: \${err.message}\`);
@@ -93,25 +182,14 @@ 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);
 
-    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';
     
@@ -132,15 +210,15 @@ async function runDevEnvironment() {
         if (!connectionStarted && (output.includes('Local:') || output.includes('Compiled successfully'))) {
             connectionStarted = true;
             console.log(\`\\n[Fleetbo] 🔗 Local Server Ready. Establishing Secure Uplink...\`);
+            console.log(\`\\n[Fleetbo] 🛑 STOP! DO NOT open the Studio yet.\`);
+            console.log(\`\\n[Fleetbo] ⏳ Establishing Secure Uplink... Please wait...\`);
+
 
-            // 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) {
@@ -162,7 +240,6 @@ async function runDevEnvironment() {
 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='));
@@ -179,7 +256,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 +302,6 @@ function downloadEngine(url, dest) {
     });
 }
 
-// --- Fonction Principale ---
 async function setupProject() {
   console.log(`\n⚡ Initializing Fleetbo Framework for "${projectName}"...`);
   
@@ -252,39 +327,46 @@ async function setupProject() {
 
     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
-            `;
+    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' });
+    execSync('npm install cloudflared dotenv axios archiver --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" };
+    
+    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`);
+    console.log(`\n👉 Run: cd ${projectName}`);
+    console.log(`👉 Start Dev:  npm run fleetbo`);
+    console.log(`👉 Deploy App: npm run fleetbo deploy`);
 
   } catch (error) {
     console.error('\n❌ Setup failed:', error.message);