neex 0.7.11 → 0.7.15

package/README.md

@@ -7,7 +7,7 @@
 </picture>
 </a>
 
-# Neex v0.7.11
+# Neex
 
 ### Neex - Modern Fullstack Framework Built on Express and Next.js. Fast to Start, Easy to Build, Ready to Deploy.
 

package/dist/src/runner.js

@@ -37,7 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Runner = void 0;
-// src/runner.ts - Updated version
+// src/runner.ts - Fixed version
 const child_process_1 = require("child_process");
 const fsPromises = __importStar(require("fs/promises"));
 const path = __importStar(require("path"));
@@ -52,8 +52,29 @@ class Runner {
         this.serverInfo = new Map();
         this.portRegex = /listening on (?:port |http:\/\/localhost:|https:\/\/localhost:)(\d+)/i;
         this.urlRegex = /(https?:\/\/localhost:[0-9]+(?:\/[^\s]*)?)/i;
+        this.isCleaningUp = false;
         this.options = options;
         this.activeProcesses = new Map();
+        this.setupSignalHandlers();
+    }
+    setupSignalHandlers() {
+        const signals = ['SIGINT', 'SIGTERM', 'SIGQUIT'];
+        signals.forEach((signal) => {
+            process.on(signal, () => {
+                if (!this.isCleaningUp) {
+                    this.isCleaningUp = true;
+                    logger_1.default.printLine(`\nReceived ${signal}. Cleaning up...`, 'warn');
+                    this.cleanup(signal);
+                    process.exit(0);
+                }
+            });
+        });
+        // Handle unexpected exits
+        process.on('beforeExit', () => {
+            if (!this.isCleaningUp) {
+                this.cleanup();
+            }
+        });
     }
     async expandWildcardCommands(commands) {
         const expandedCommands = [];
@@ -75,13 +96,13 @@ class Runner {
                 let foundMatch = false;
                 for (const scriptName in packageJson.scripts) {
                     if (pattern.test(scriptName)) {
-                        expandedCommands.push(scriptName); // Or packageJson.scripts[scriptName] if you want the script value
+                        expandedCommands.push(scriptName);
                         foundMatch = true;
                     }
                 }
                 if (!foundMatch) {
                     logger_1.default.printLine(`No scripts found in package.json matching wildcard: ${command}`, 'warn');
-                    expandedCommands.push(command); // Add original command if no match
+                    expandedCommands.push(command);
                 }
             }
             else {
@@ -105,13 +126,11 @@ class Runner {
                     return { executableCommand: commandToExecute, executionCwd: targetCwd };
                 }
                 else {
-                    // It's a script from package.json, but no 'cd ... && ...' pattern
                     return { executableCommand: scriptValue, executionCwd: baseDir };
                 }
             }
         }
         catch (error) {
-            // Errors like package.json not found, or script not in package.json
             // Will treat as direct command
         }
         return { executableCommand: scriptNameOrCommand, executionCwd: undefined };
@@ -119,7 +138,6 @@ class Runner {
     detectServerInfo(command, data) {
         if (!this.options.isServerMode)
             return;
-        // Get or create server info
         let serverInfo = this.serverInfo.get(command);
         if (!serverInfo) {
             serverInfo = {
@@ -128,25 +146,20 @@ class Runner {
             };
             this.serverInfo.set(command, serverInfo);
         }
-        // Try to detect port from output
         const portMatch = data.match(this.portRegex);
         if (portMatch && portMatch[1]) {
             serverInfo.port = parseInt(portMatch[1], 10);
             serverInfo.status = 'running';
-            // Only log if we just discovered the port
             if (!serverInfo.url) {
                 logger_1.default.printLine(`Server ${command} running on port ${serverInfo.port}`, 'info');
             }
         }
-        // Try to detect full URL from output
         const urlMatch = data.match(this.urlRegex);
         if (urlMatch && urlMatch[1]) {
             serverInfo.url = urlMatch[1];
             serverInfo.status = 'running';
-            // Log the full URL once we detect it
             logger_1.default.printLine(`Server ${command} available at ${chalk_1.default.cyan(serverInfo.url)}`, 'info');
         }
-        // Update server info
         this.serverInfo.set(command, serverInfo);
     }
     async runCommand(originalCommand, currentRetry = 0) {
@@ -172,11 +185,11 @@ class Runner {
                 ...(0, npm_run_path_1.npmRunPathEnv)(),
                 FORCE_COLOR: this.options.color ? '1' : '0'
             };
+            // Fix: Remove detached and handle process groups properly
             const proc = (0, child_process_1.spawn)(cmd, args, {
                 stdio: ['ignore', 'pipe', 'pipe'],
                 shell: true,
                 env,
-                detached: true,
                 cwd
             });
             this.activeProcesses.set(originalCommand, proc);
@@ -313,9 +326,7 @@ class Runner {
             logger_1.default.printLine('No commands to run after wildcard expansion.', 'warn');
             return [];
         }
-        // Initialize logger with the final list of commands
         logger_1.default.setCommands(commands);
-        // Run in parallel or sequential mode
         if (this.options.parallel) {
             if (this.options.isServerMode) {
                 logger_1.default.printLine('Starting servers in parallel mode', 'info');
@@ -330,36 +341,61 @@ class Runner {
         }
     }
     cleanup(signal = 'SIGTERM') {
+        if (this.isCleaningUp)
+            return;
+        this.isCleaningUp = true;
         logger_1.default.printLine('Cleaning up child processes...', 'warn');
+        const promises = [];
         this.activeProcesses.forEach((proc, command) => {
             if (proc.pid && !proc.killed) {
-                try {
-                    // Kill process group
-                    process.kill(-proc.pid, signal);
-                    logger_1.default.printLine(`Sent ${signal} to process group ${proc.pid} (${command})`, 'info');
-                }
-                catch (e) {
-                    // Fallback if killing group failed
+                promises.push(this.killProcess(proc, command, signal));
+            }
+        });
+        // Wait for all processes to be killed
+        Promise.all(promises).then(() => {
+            this.activeProcesses.clear();
+            if (this.options.isServerMode && this.serverInfo.size > 0) {
+                logger_1.default.printLine('Server shutdown summary:', 'info');
+                this.serverInfo.forEach((info, command) => {
+                    const statusColor = info.status === 'running' ? chalk_1.default.green :
+                        info.status === 'error' ? chalk_1.default.red : chalk_1.default.yellow;
+                    logger_1.default.printLine(`  ${command}: ${statusColor(info.status)}`, 'info');
+                });
+            }
+        }).catch((error) => {
+            logger_1.default.printLine(`Error during cleanup: ${error.message}`, 'error');
+        });
+    }
+    async killProcess(proc, command, signal) {
+        return new Promise((resolve) => {
+            const timeout = setTimeout(() => {
+                if (proc.pid && !proc.killed) {
                     try {
-                        proc.kill(signal);
-                        logger_1.default.printLine(`Sent ${signal} to process ${proc.pid} (${command})`, 'info');
+                        proc.kill('SIGKILL');
+                        logger_1.default.printLine(`Force killed process ${proc.pid} (${command}) with SIGKILL`, 'warn');
                     }
-                    catch (errInner) {
-                        logger_1.default.printLine(`Failed to kill process ${proc.pid} (${command}): ${errInner.message}`, 'error');
+                    catch (error) {
+                        logger_1.default.printLine(`Failed to force kill process ${proc.pid} (${command}): ${error.message}`, 'error');
                     }
                 }
+                resolve();
+            }, 5000); // 5 second timeout
+            proc.on('exit', () => {
+                clearTimeout(timeout);
+                logger_1.default.printLine(`Process ${proc.pid} (${command}) exited gracefully`, 'info');
+                resolve();
+            });
+            try {
+                // Try to kill the process gracefully first
+                proc.kill(signal);
+                logger_1.default.printLine(`Sent ${signal} to process ${proc.pid} (${command})`, 'info');
+            }
+            catch (error) {
+                logger_1.default.printLine(`Failed to send ${signal} to process ${proc.pid} (${command}): ${error.message}`, 'error');
+                clearTimeout(timeout);
+                resolve();
             }
         });
-        this.activeProcesses.clear();
-        // Print server status summary if in server mode
-        if (this.options.isServerMode && this.serverInfo.size > 0) {
-            logger_1.default.printLine('Server shutdown summary:', 'info');
-            this.serverInfo.forEach((info, command) => {
-                const statusColor = info.status === 'running' ? chalk_1.default.green :
-                    info.status === 'error' ? chalk_1.default.red : chalk_1.default.yellow;
-                logger_1.default.printLine(`  ${command}: ${statusColor(info.status)}`, 'info');
-            });
-        }
     }
 }
 exports.Runner = Runner;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neex",
-  "version": "0.7.11",
+  "version": "0.7.15",
   "description": "A command-line interface for managing Neex projects, designed to simplify your development workflow.",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",