fleetbo-cockpit-cli 1.0.4 → 1.0.6

package/cli.js

@@ -137,7 +137,7 @@ const showEnergyTransfer = async () => {
     for (let i = 0; i <= width; i++) {
         const dots = "█".repeat(i); 
         const empty = "░".repeat(width - i);
-        process.stdout.write(`\r   \x1b[32m⚡ Alex Energy Sync:\x1b[0m [${dots}${empty}] ${Math.round((i / width) * 100)}%`);
+        process.stdout.write(`\r   \x1b[32m⚡ Propulsion Sync:\x1b[0m [${dots}${empty}] ${Math.round((i / width) * 100)}%`);
         await new Promise(r => setTimeout(r, 45));
     }
     process.stdout.write('\n');
@@ -196,7 +196,7 @@ if (command === 'alex') {
                     const filePath = path.join(fullPath, name);
                     if (!fs.existsSync(fullPath)) fs.mkdirSync(fullPath, { recursive: true });
                     fs.writeFileSync(filePath, content);
-                    console.log(`    \x1b[32m[Written]\x1b[0m ${dir}${name}`);
+                    console.log(`   \x1b[32m[Written]\x1b[0m ${dir}${name}`);
                 };
                 
                 if (instructions && Array.isArray(instructions) && instructions.length > 0) {
@@ -225,7 +225,7 @@ if (command === 'alex') {
                 }
                 
                 if (config_offload && (config_offload.dependencies?.length > 0 || config_offload.permissions?.length > 0)) {
-                    process.stdout.write(`      \x1b[33m[Cloud Inject]\x1b[0m Syncing ${config_offload.dependencies.length} libs to Factory...`);
+                    process.stdout.write(`   \x1b[33m[Cloud Inject]\x1b[0m Syncing ${config_offload.dependencies?.length || 0} libs to Factory...`);
                     try {
                         await axios.post(INJECT_DEPS_URL, {
                             projectId: projectId,
@@ -237,7 +237,7 @@ if (command === 'alex') {
                         process.stdout.write(` \x1b[32mOK\x1b[0m\n`);
                     } catch (err) {
                         process.stdout.write(` \x1b[31mFAILED\x1b[0m\n`);
-                        console.error(`      ⚠️ Config sync failed: ${err.message}`);
+                        console.error(`   ⚠️ Config sync failed: ${err.message}`);
                     }
                 }
             }
@@ -315,57 +315,153 @@ if (command === 'alex') {
     
 } 
 // ============================================
-// COMMAND: android / ios
+// COMMAND: android / ios (PROPULSION BUILD)
 // ============================================
 else if (command === 'android' || command === 'ios') {
     checkGitSecurity();
     const platform = command;
     const nativeDir = platform === 'android' ? 'public/native/android/' : 'public/native/ios/';
     const extension = platform === 'android' ? '.kt' : '.swift';
-    const fullPath = path.join(process.cwd(), nativeDir);
+    const nativePath = path.join(process.cwd(), nativeDir);
     
+    // Vérification des modules natifs
     let hasNativeFiles = false;
-    if (fs.existsSync(fullPath)) {
-        const files = fs.readdirSync(fullPath);
-        hasNativeFiles = files.some(file => file.endsWith(extension));
+    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\n`);
+        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;
     
     (async () => {
-        console.log(`\n\x1b[36m⚡ FLEETBO ${platform.toUpperCase()} UPLINK\x1b[0m`);
+        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)
+            // ==========================================================
+            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
+                    }
+                });
+                process.stdout.write(`\x1b[32mOK\x1b[0m\n\n`);
+            } catch (preflightError) {
+                process.stdout.write(`\x1b[31mDENIED\x1b[0m\n`);
+                // Fait sauter le code directement au "catch" global du bas sans jamais builder
+                throw preflightError; 
+            }
+            
+            // Étape 1: Build React
+            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);
+            
+            if (!fs.existsSync(buildPath)) {
+                throw new Error(`Build directory not found: ${buildDir}`);
+            }
+            
+            // Étape 2: Créer le ZIP avec le bundle ET les modules natifs
+            console.log(`\n\x1b[33m[2/3]\x1b[0m Packaging bundle + native modules...`);
             
             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('end', () => resolve(Buffer.concat(chunks)));
                 archive.on('error', reject);
-                archive.directory(path.join(process.cwd(), buildDir), false);
+                archive.on('warning', (err) => {
+                    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();
             });
             
-            console.log(`\n\x1b[33mSyncing ${platform} logic bundle...\x1b[0m`);
+            const sizeMB = (zipBuffer.length / 1024 / 1024).toFixed(2);
+            console.log(`   \x1b[32m✓\x1b[0m Bundle ready: ${sizeMB} MB`);
+            
+            // Étape 3: Upload vers Cloud Function
+            console.log(`\n\x1b[33m[3/3]\x1b[0m Uploading to Fleetbo Factory...`);
             await showEnergyTransfer();
             
             const res = await axios.post(targetUrl, zipBuffer, { 
-                headers: { 'Content-Type': 'application/zip', 'x-project-id': projectId } 
+                headers: { 
+                    'Content-Type': 'application/zip', 
+                    'x-project-id': projectId 
+                },
+                maxContentLength: Infinity,
+                maxBodyLength: Infinity,
+                timeout: 120000 // 2 minutes timeout
             });
             
             if (res.data.success) {
-                console.log(`\n\x1b[1m${platform.toUpperCase()} DEPLOYED\x1b[0m | \x1b[32mAlex ❯\x1b[0m Runtime updated.`);
+                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  Build ID: ${res.data.buildId || 'N/A'}\x1b[0m`);
+                console.log(`\x1b[90m  Your ${platform} bundle is now in the Factory queue.\x1b[0m\n`);
+            } else {
+                throw new Error(res.data.error || 'Unknown error from Factory');
             }
-        } catch (error) { 
-            console.error(`\n\x1b[31m Build Error:\x1b[0m ${error.response?.data?.error || error.message}`);
+            
+        } catch (error) {
+            console.log(`\n\x1b[31m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\x1b[0m`);
+            console.log(`\x1b[31m✗ PROPULSION FAILED\x1b[0m`);
+            console.log(`\x1b[31m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\x1b[0m`);
+            
+            const errorMsg = error.response?.data?.error || error.message;
+            console.error(`\x1b[31m  Error:\x1b[0m ${errorMsg}`);
+            
+            // Messages d'aide selon l'erreur
+            if (errorMsg.includes('Propulsion Limit')) {
+                console.log(`\n\x1b[33m  💡 Tip:\x1b[0m Upgrade to Senior Pilot for more builds.`);
+            } else if (errorMsg.includes('No') && errorMsg.includes('blueprint')) {
+                console.log(`\n\x1b[33m  💡 Tip:\x1b[0m Run "npm run fleetbo alex" to create native modules first.`);
+            }
+            
+            console.log('');
             process.exit(1); 
         }
     })();
@@ -433,10 +529,10 @@ else {
         try {
             await axios.post(UPDATE_NETWORK_URL, { keyApp, networkUrl, tester: testerEmail });
             console.log('\n\x1b[32mEngine started successfully\x1b[0m');
-            console.log(`\n\x1b[32m[Fleetbo]\x1b[1m -------------------------------------------------------------`);
-            console.log('\x1b[32m[Fleetbo] \x1b[1mGO GO GO ! FLEETBO COCKPIT IS READY\x1b[0m');
-            console.log('\x1b[32m[Fleetbo] Start coding and previewing in Cockpit. 🚀\x1b[0m');
-            console.log(`\x1b[32m[Fleetbo]\x1b[1m -------------------------------------------------------------`);
+            console.log(`\n\x1b[32m[Fleetbo]\x1b[0m -------------------------------------------------------------`);
+            console.log('\x1b[32m[Fleetbo]  \x1b[1mGO GO GO ! FLEETBO COCKPIT IS READY\x1b[0m');
+            console.log('\x1b[32m[Fleetbo]  You can now start coding and previewing in Studio. 🚀\x1b[0m');
+            console.log(`\x1b[32m[Fleetbo]\x1b[0m -------------------------------------------------------------`);
             console.log(`\x1b[34mPilot Instruction ❯\x1b[0m Switch to your Fleetbo Cockpit tab to begin.\n`);
         } catch (err) {
             console.error(`[Fleetbo] Sync Error: ${err.message}`);
@@ -445,13 +541,13 @@ else {
     
     async function runDevEnvironment() {
         console.log(`[Fleetbo] 🛡️  Initializing Dev Environment...`);
+        
+        // Mise à jour silencieuse de browserslist
         try {
-            // Mise à jour silencieuse de la DB browserslist pour éliminer le warning "Old Data"
             const npxExec = process.platform === 'win32' ? 'npx.cmd' : 'npx';
             execSync(`${npxExec} -y update-browserslist-db@latest`, { stdio: 'ignore' });
-        } catch (e) {
-            // Si ça échoue (pas d'internet), on continue sans bloquer le démarrage
-        }
+        } catch (e) {}
+        
         killNetworkService();
         killProcessOnPort(PORT);
         
@@ -511,4 +607,4 @@ else {
     }
     
     runDevEnvironment();
-}
+}

package/package.json

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