fleetbo-cockpit-cli 1.0.166 → 1.0.168

package/cli.js

@@ -27,7 +27,6 @@ const CACHE_URL = "https://getmodulecache-jqycakhlxa-uc.a.run.app";
 const PORT = 3000;
 
 let uplinkProcess = null;
-let devServerProcess = null;
 const args = process.argv.slice(2);
 const command = args[0];
 
@@ -986,31 +985,25 @@ else {
     
     function killProcessOnPort(port) {
         try {
-            if (process.platform === 'win32') {
-                execSync(`for /f "tokens=5" %a in ('netstat -aon ^| find ":${port}"') do taskkill /F /PID %a`, { stdio: 'ignore', shell: true });
-            } else {
+            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 killDevServer() {
-        if (!devServerProcess) return;
-        try {
-            if (process.platform === 'win32') {
-                execSync(`taskkill /pid ${devServerProcess.pid} /T /F`, { stdio: 'ignore' });
-            } else {
-                devServerProcess.kill('SIGKILL');
-            }
-        } catch (e) {}
-        devServerProcess = null;
-    }
     
     const killNetworkService = () => {
         if (uplinkProcess) {
             try {
-                uplinkProcess.kill('SIGINT');
+                if (process.platform === 'win32') {
+                    // Windows ne supporte pas SIGINT sur les process enfants
+                    // On utilise taskkill pour forcer la fermeture propre
+                    try {
+                        execSync(`taskkill /pid ${uplinkProcess.pid} /T /F`, { stdio: 'ignore' });
+                    } catch (e) {}
+                } else {
+                    uplinkProcess.kill('SIGINT');
+                }
                 console.log('[Fleetbo] Engine closed.');
             } catch (e) {
                 console.error('[Fleetbo] Error closing tunnel:', e.message);
@@ -1019,7 +1012,7 @@ else {
     };
     
     let isExiting = false;
-    
+
     async function cleanupAndExit(code = 0) {
         if (isExiting) return;
         isExiting = true;
@@ -1031,12 +1024,21 @@ else {
             console.error('[Fleetbo] Network cleanup warning:', e.message);
         }
         killNetworkService();
-        killDevServer();
         killProcessOnPort(PORT);
         console.log('[Fleetbo] Bye.');
         process.exit(code);
     }
-    
+
+    // 🪟 WINDOWS FIX : Ctrl+C est intercepté par cmd.exe avant Node.js
+    // On capture le signal au niveau stdin pour éviter l'invite "O/N"
+    if (process.platform === 'win32') {
+        const rl = require('readline').createInterface({
+            input: process.stdin,
+            output: process.stdout
+        });
+        rl.on('SIGINT', () => cleanupAndExit(0));
+    }
+
     process.on('SIGINT', () => cleanupAndExit(0));
     process.on('SIGTERM', () => cleanupAndExit(0));
     
@@ -1070,7 +1072,7 @@ else {
         const npmCmd = process.platform === 'win32' ? 'npm.cmd' : 'npm';
 
         // ✅ On passe la chaîne complète, SANS tableau d'arguments du tout !
-        devServerProcess = spawn(`${npmCmd} run dev --silent`, {
+        const devServer = spawn(`${npmCmd} run dev --silent`, {
             stdio: ['ignore', 'pipe', 'pipe'],
             shell: true,
             env: { 
@@ -1079,7 +1081,6 @@ else {
                 PORT: PORT.toString(), 
             }
         });
-        const devServer = devServerProcess;
         //devServer.stdout.pipe(process.stdout);
         devServer.stderr.pipe(process.stderr);
 

package/package.json

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