fleetbo-cockpit-cli 1.0.10 → 1.0.11

package/cli.js

@@ -318,71 +318,72 @@ if (command === 'alex') {
 // COMMAND: android / ios (PROPULSION BUILD)
 // ============================================
 else if (command === 'android' || command === 'ios') {
-    // 🛑 INTERCEPTION IOS : BLOQUAGE NET (MAINTENANCE/BETA)
-    if (command === 'ios') {
-        console.log(`\n\x1b[36m⚡ FLEETBO IOS PROPULSION\x1b[0m`);
-        console.log(`\x1b[33m[0/3] Initializing Neural Uplink...\x1b[0m`);
-        
-        // Simulation d'un petit temps de chargement pour l'effet "OS"
-        await new Promise(r => setTimeout(r, 800));
 
-        console.log(`\n\x1b[31m⛔ PROPULSION ABORTED: iOS Frequency Restricted.\x1b[0m`);
-        console.log(`\x1b[90m   This module is currently reserved for Vanguard Pilots (Closed Beta).\x1b[0m`);
-        console.log(`\x1b[90m   Please engage propulsion on Android frequency for now.\x1b[0m\n`);
-        
-        process.exit(1); // Arrêt propre du processus
-    }
-    checkGitSecurity();
-    const platform = command;
-    const nativeDir = platform === 'android' ? 'public/native/android/' : 'public/native/ios/';
-    const extension = platform === 'android' ? '.kt' : '.swift';
-    const nativePath = path.join(process.cwd(), nativeDir);
-    
-    // Vérification des modules natifs
-    let hasNativeFiles = false;
-    let nativeFileCount = 0;
-    if (fs.existsSync(nativePath)) {
-        const files = fs.readdirSync(nativePath);
-        const nativeFiles = files.filter(file => file.endsWith(extension));
-        hasNativeFiles = nativeFiles.length > 0;
-        nativeFileCount = nativeFiles.length;
-    }
-    
-    if (!hasNativeFiles) {
-        console.log(`\n\x1b[31m⚠️  ENGINE INCOMPLETE:\x1b[0m No native blueprints detected for \x1b[1m${platform.toUpperCase()}\x1b[0m.`);
-        console.log(`\x1b[90mAlex must architect at least one ${extension} module before deployment.\x1b[0m`);
-        console.log(`\x1b[90mRun: npm run fleetbo alex\x1b[0m\n`);
-        process.exit(1);
-    }
-    
-    const targetUrl = platform === 'android' ? ANDROID_BUILD_URL : IOS_BUILD_URL;
-    
+    // 🟢 DÉBUT DE LA PROTECTION (Fonction Async Immédiate)
+    // Cela garantit que le code fonctionne partout, même via 'require()'
     (async () => {
+
+        // 🛑 INTERCEPTION IOS : BLOQUAGE NET (MAINTENANCE/BETA)
+        if (command === 'ios') {
+            console.log(`\n\x1b[36m⚡ FLEETBO IOS PROPULSION\x1b[0m`);
+            console.log(`\x1b[33m[0/3] Initializing Neural Uplink...\x1b[0m`);
+            
+            // ✅ Ce 'await' est maintenant sécurisé
+            await new Promise(r => setTimeout(r, 800));
+
+            console.log(`\n\x1b[31m⛔ PROPULSION ABORTED: iOS Frequency Restricted.\x1b[0m`);
+            console.log(`\x1b[90m   This module is currently reserved for Vanguard Pilots (Closed Beta).\x1b[0m`);
+            console.log(`\x1b[90m   Please engage propulsion on Android frequency for now.\x1b[0m\n`);
+            
+            process.exit(1); 
+        }
+
+        checkGitSecurity();
+        const platform = command;
+        const nativeDir = platform === 'android' ? 'public/native/android/' : 'public/native/ios/';
+        const extension = platform === 'android' ? '.kt' : '.swift';
+        const nativePath = path.join(process.cwd(), nativeDir);
+        
+        // Vérification des modules natifs
+        let hasNativeFiles = false;
+        let nativeFileCount = 0;
+        if (fs.existsSync(nativePath)) {
+            const files = fs.readdirSync(nativePath);
+            const nativeFiles = files.filter(file => file.endsWith(extension));
+            hasNativeFiles = nativeFiles.length > 0;
+            nativeFileCount = nativeFiles.length;
+        }
+        
+        if (!hasNativeFiles) {
+            console.log(`\n\x1b[31m⚠️  ENGINE INCOMPLETE:\x1b[0m No native blueprints detected for \x1b[1m${platform.toUpperCase()}\x1b[0m.`);
+            console.log(`\x1b[90mAlex must architect at least one ${extension} module before deployment.\x1b[0m`);
+            console.log(`\x1b[90mRun: npm run fleetbo alex\x1b[0m\n`);
+            process.exit(1);
+        }
+        
+        const targetUrl = platform === 'android' ? ANDROID_BUILD_URL : IOS_BUILD_URL;
+        
         console.log(`\n\x1b[36m⚡ FLEETBO ${platform.toUpperCase()} PROPULSION\x1b[0m`);
         console.log(`\x1b[90m   ${nativeFileCount} native module(s) detected\x1b[0m\n`);
         
         try {
             // ==========================================================
-            // 🟢 NOUVEAU : ÉTAPE 0 (PRE-FLIGHT CHECK QUOTAS)
+            // PRE-FLIGHT CHECK QUOTAS
             // ==========================================================
             process.stdout.write(`\x1b[33m[0/3]\x1b[0m Checking Propulsion Quotas... `);
             try {
                 await axios.post(targetUrl, {}, { 
                     headers: { 
                         'x-project-id': projectId,
-                        'x-preflight': 'true' // Signale au serveur de ne pas chercher de ZIP
+                        'x-preflight': 'true' 
                     }
                 });
                 process.stdout.write(`\x1b[32mOK\x1b[0m\n\n`);
             } catch (preflightError) {
                 process.stdout.write(`\x1b[31mDENIED\x1b[0m\n`);
-
-                // 🟢 AJOUT CRITIQUE : On capture le message d'erreur du Cloud (JSON)
                 if (preflightError.response && preflightError.response.data && preflightError.response.data.error) {
-                    // On remplace l'erreur technique Axios par le message métier clair
                     throw new Error(preflightError.response.data.error);
                 }
-                // Fait sauter le code directement au "catch" global du bas sans jamais builder
                 throw preflightError; 
             }
             
@@ -390,7 +391,6 @@ else if (command === 'android' || command === 'ios') {
             console.log(`\x1b[33m[1/3]\x1b[0m Building React bundle...`);
             execSync('npm run build', { stdio: 'inherit' });
             
-            // Déterminer le dossier de build
             let buildDir = fs.existsSync(path.join(process.cwd(), 'dist')) ? 'dist' : 'build';
             const buildPath = path.join(process.cwd(), buildDir);
             
@@ -398,7 +398,7 @@ else if (command === 'android' || command === 'ios') {
                 throw new Error(`Build directory not found: ${buildDir}`);
             }
             
-            // Étape 2: Créer le ZIP avec le bundle ET les modules natifs
+            // Étape 2: Créer le ZIP
             console.log(`\n\x1b[33m[2/3]\x1b[0m Packaging bundle + native modules...`);
             
             const zipBuffer = await new Promise((resolve, reject) => {
@@ -412,41 +412,20 @@ else if (command === 'android' || command === 'ios') {
                     if (err.code !== 'ENOENT') reject(err);
                 });
                 
-                // ============================================================
-                // 📦 STRUCTURE DU ZIP (Compatible Fastfile + Cloud Function)
-                // ============================================================
-                // build.zip
-                // └── build/
-                //     ├── index.html        ← Pour assets/ (WebView)
-                //     ├── static/
-                //     └── native/
-                //         └── android/      ← Pour modules/ (.kt)
-                //             └── CameraModule.kt
-                // ============================================================
-                
-                // 1. Ajouter le bundle React (dans build/)
                 archive.directory(buildPath, 'build');
-                console.log(`   \x1b[32m✓\x1b[0m React bundle included`);
-                
-                // 2. Ajouter les modules natifs (dans build/native/android/ ou build/native/ios/)
-                // Le Fastfile cherche: temp/build/native/android/*.kt
-                // La Cloud Function cherche: native/android/*.kt (dans le ZIP)
                 if (fs.existsSync(nativePath)) {
                     archive.directory(nativePath, `build/native/${platform}`);
-                    console.log(`   \x1b[32m✓\x1b[0m Native modules included (${nativeFileCount} files)`);
                 }
-                
                 archive.finalize();
             });
             
             const sizeMB = (zipBuffer.length / 1024 / 1024).toFixed(2);
             console.log(`   \x1b[32m✓\x1b[0m Bundle ready: ${sizeMB} MB`);
             
-            // Étape 3: Upload vers Cloud Function
+            // Étape 3: Upload
             console.log(`\n\x1b[33m[3/3]\x1b[0m Uploading to Fleetbo OS...`);
             await showEnergyTransfer();
             
-           // 🟢 ON UTILISE UNE VARIABLE LOCALE POUR LA RÉPONSE
             let uploadResponse;
             try {
                 uploadResponse = await axios.post(targetUrl, zipBuffer, { 
@@ -456,40 +435,33 @@ else if (command === 'android' || command === 'ios') {
                     },
                     maxContentLength: Infinity,
                     maxBodyLength: Infinity,
-                    timeout: 120000 // 2 minutes timeout
+                    timeout: 120000 
                 });
             } catch (axiosError) {
-                // 🛑 SI AXIOS PLANTE (400, 403, 500), ON LANCE UNE ERREUR CLAIRE POUR LE CATCH GLOBAL
-                // axiosError.response.data contient le JSON renvoyé par FandroidBuild
                 if (axiosError.response && axiosError.response.data && axiosError.response.data.error) {
                     throw new Error(axiosError.response.data.error);
                 } else {
-                    // Timeout ou erreur réseau pure
                     throw new Error(`Connection to OS failed: ${axiosError.message}`);
                 }
             }
             
-            // 🟢 SI AXIOS RÉUSSIT MAIS QUE LA RÉPONSE N'EST PAS UN SUCCÈS LOGIQUE
             if (uploadResponse.data && uploadResponse.data.success) {
                 console.log(`\n\x1b[32m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\x1b[0m`);
                 console.log(`\x1b[32m✓ ${platform.toUpperCase()} PROPULSION SUCCESSFUL\x1b[0m`);
                 console.log(`\x1b[32m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\x1b[0m`);
                 console.log(`\x1b[90m  Deployment ID: ${uploadResponse.data.deploymentId || 'N/A'}\x1b[0m`);
-                console.log(`\x1b[90m  Your ${platform} bundle is now in the OS.\x1b[0m\n`);
+                console.log(`\x1b[90m  ${uploadResponse.data.message || 'Complete.'}\x1b[0m\n`);
             } else {
-                // Ce cas ne devrait pas arriver si le backend est bien codé (il renverrait une erreur HTTP), mais au cas où :
                 throw new Error(uploadResponse.data?.error || 'Unknown logical error from Factory');
             }
             
-        } catch (error) { // <-- LE CATCH GLOBAL (Reste inchangé)
+        } catch (error) { 
             console.log(`\n\x1b[31m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\x1b[0m`);
             console.log(`\x1b[31m✗ PROPULSION FAILED\x1b[0m`);
             console.log(`\x1b[31m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\x1b[0m`);
             
-            // L'erreur est maintenant propre, on l'affiche directement
             console.error(`\x1b[31m  Error:\x1b[0m ${error.message}`);
             
-            // Messages d'aide selon l'erreur
             if (error.message.includes('Limit') || error.message.includes('Quota')) {
                 console.log(`\n\x1b[33m  💡 Tip:\x1b[0m Upgrade to Senior Pilot for more builds.`);
             } else if (error.message.includes('No native module')) {
@@ -497,11 +469,11 @@ else if (command === 'android' || command === 'ios') {
             } else if (error.message.includes('Trial Period Ended')) {
                 console.log(`\n\x1b[33m  💡 Tip:\x1b[0m Your free sprint is over. Upgrade to Senior Pilot on fleetbo.io.`);
             }
-            
             console.log('');
             process.exit(1); 
         }
-    })();
+
+    })(); // 🟢 FIN DE LA PROTECTION
 }
 // ============================================
 // COMMAND: page / g / generate

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetbo-cockpit-cli",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "description": "Fleetbo CLI - Build native mobile apps with React",
   "author": "Fleetbo",
   "license": "MIT",