neex 0.6.54 → 0.6.60

package/dist/src/commands/start-commands.js

@@ -13,10 +13,10 @@ const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 function addStartCommands(program) {
     let startManager = null;
-    // Single optimized start command for production
+    // Production start command
     program
         .command('start [file]')
-        .description('Start production application with automatic optimization')
+        .description('Start production application')
         .option('-d, --dir <directory>', 'Working directory', process.cwd())
         .option('-e, --env <file>', 'Environment file to load', '.env')
         .option('-p, --port <port>', 'Port number', parseInt)
@@ -32,7 +32,7 @@ function addStartCommands(program) {
         .option('--node-args <args>', 'Additional Node.js arguments')
         .action(async (file, options) => {
         try {
-            const targetFile = file || 'dist/index.js';
+            const targetFile = file || 'dist/server.js';
             let resolvedFile = path_1.default.resolve(options.dir, targetFile);
             // Auto-detect main file if not found
             if (!fs_1.default.existsSync(resolvedFile)) {
@@ -53,12 +53,13 @@ function addStartCommands(program) {
                             const commonLocations = [
                                 'dist/server.js',
                                 'dist/app.js',
-                                'build/index.js',
+                                'dist/index.js',
                                 'build/server.js',
-                                'src/index.js',
-                                'src/server.js',
-                                'index.js',
-                                'server.js'
+                                'build/app.js',
+                                'build/index.js',
+                                'server.js',
+                                'app.js',
+                                'index.js'
                             ];
                             let found = false;
                             for (const location of commonLocations) {
@@ -85,25 +86,37 @@ function addStartCommands(program) {
                     throw new Error(`Application file not found: ${resolvedFile}`);
                 }
             }
-            // Detect environment and set optimal configuration
+            // Environment detection
             const isDevelopment = options.watch || process.env.NODE_ENV === 'development';
             const isProduction = !isDevelopment;
             const cpuCount = os_1.default.cpus().length;
-            // Smart worker allocation
+            // Smart worker allocation - more conservative approach
             let workers = options.workers;
             if (!workers) {
                 if (isDevelopment) {
-                    workers = 1; // Single worker for development
+                    workers = 1; // Always single worker in development
                 }
                 else {
-                    // For production, use CPU count but cap at 8 for most applications
-                    workers = Math.min(cpuCount, 8);
+                    // For production, be more conservative
+                    if (cpuCount <= 2) {
+                        workers = 1; // Single worker for small systems
+                    }
+                    else if (cpuCount <= 4) {
+                        workers = 2; // Two workers for medium systems
+                    }
+                    else {
+                        workers = Math.min(Math.floor(cpuCount / 2), 4); // Max 4 workers
+                    }
                 }
             }
-            const healthCheck = options.health !== false && isProduction;
+            // Force single worker for development or debugging
+            if (isDevelopment || options.inspect || options.inspectBrk) {
+                workers = 1;
+            }
+            const healthCheck = options.health !== false;
             const defaultPort = parseInt(process.env.PORT || '8000');
             const port = options.port || defaultPort;
-            // Environment setup
+            // Set NODE_ENV if not already set
             if (!process.env.NODE_ENV) {
                 process.env.NODE_ENV = isProduction ? 'production' : 'development';
             }
@@ -117,24 +130,28 @@ function addStartCommands(program) {
                 logger_manager_js_1.loggerManager.printLine(`Environment: ${process.env.NODE_ENV}`);
                 logger_manager_js_1.loggerManager.printLine(`Port: ${port}`);
                 logger_manager_js_1.loggerManager.printLine(`Workers: ${workers}`);
+                logger_manager_js_1.loggerManager.printLine(`CPU Cores: ${cpuCount}`);
                 if (healthCheck) {
                     logger_manager_js_1.loggerManager.printLine(`Health Check: http://localhost:${options.healthPort}/health`);
                 }
             }
+            // Optimize memory settings based on workers
+            const memoryPerWorker = workers > 1 ? Math.floor(512 / workers) : 512;
+            const maxMemoryPerWorker = workers > 1 ? Math.floor(1024 / workers) : 1024;
             startManager = new start_manager_js_1.StartManager({
                 file: resolvedFile,
                 workingDir: options.dir,
                 envFile: options.env,
                 port,
                 workers,
-                memoryLimit: isProduction ? '512M' : undefined,
+                memoryLimit: isProduction ? `${memoryPerWorker}M` : undefined,
                 logLevel: options.verbose ? 'debug' : 'info',
                 color: process.stdout.isTTY,
                 verbose: options.verbose,
                 watch: options.watch,
-                maxMemory: options.maxMemory || (isProduction ? '1G' : undefined),
+                maxMemory: options.maxMemory || (isProduction ? `${maxMemoryPerWorker}M` : undefined),
                 maxCrashes: isProduction ? 3 : 10,
-                restartDelay: isProduction ? 2000 : 1000,
+                restartDelay: isProduction ? 1000 : 500,
                 healthCheck,
                 healthPort: options.healthPort,
                 gracefulTimeout: options.gracefulTimeout,
@@ -162,14 +179,13 @@ function addStartCommands(program) {
                 startManager = null;
             }
             catch (error) {
-                // Ignore cleanup errors but log in verbose mode
                 if (process.env.VERBOSE) {
                     console.error('Cleanup error:', error);
                 }
             }
         }
     };
-    // Enhanced signal handling
+    // Signal handling
     const handleExit = (signal) => {
         if (startManager) {
             console.log(`\n${chalk_1.default.yellow(figures_1.default.warning)} Received ${signal}, shutting down gracefully...`);
@@ -183,11 +199,9 @@ function addStartCommands(program) {
             process.exit(0);
         }
     };
-    // Register signal handlers
     process.on('SIGINT', () => handleExit('SIGINT'));
     process.on('SIGTERM', () => handleExit('SIGTERM'));
     process.on('SIGUSR2', () => handleExit('SIGUSR2'));
-    // Handle uncaught exceptions
     process.on('uncaughtException', (error) => {
         console.error(`${chalk_1.default.red(figures_1.default.cross)} Uncaught Exception:`, error);
         cleanupStart().then(() => {

package/dist/src/start-manager.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StartManager = void 0;
-// src/start-manager.ts - Fixed and optimized production start manager
+// src/start-manager.ts - Fixed production start manager
 const child_process_1 = require("child_process");
 const chokidar_1 = require("chokidar");
 const logger_manager_js_1 = require("./logger-manager.js");
@@ -23,6 +23,8 @@ class StartManager {
         this.isShuttingDown = false;
         this.totalRestarts = 0;
         this.envLoaded = false;
+        this.masterProcess = null;
+        this.readyWorkers = 0;
         this.options = options;
         this.startTime = new Date();
         this.debouncedRestart = (0, lodash_1.debounce)(this.restartAll.bind(this), options.restartDelay);
@@ -85,10 +87,10 @@ class StartManager {
                 args.push(`--max-old-space-size=${memoryMB}`);
             }
         }
-        if (this.options.inspect) {
+        if (this.options.inspect && this.options.workers === 1) {
             args.push('--inspect');
         }
-        if (this.options.inspectBrk) {
+        if (this.options.inspectBrk && this.options.workers === 1) {
             args.push('--inspect-brk');
         }
         if (this.options.nodeArgs) {
@@ -96,58 +98,147 @@ class StartManager {
         }
         return args;
     }
+    async startSingleProcess() {
+        var _a, _b;
+        const nodeArgs = this.getNodeArgs();
+        const port = this.options.port || 8000;
+        const env = {
+            ...process.env,
+            NODE_ENV: process.env.NODE_ENV || 'production',
+            PORT: port.toString(),
+            FORCE_COLOR: this.options.color ? '1' : '0',
+            NODE_OPTIONS: '--no-deprecation',
+            CLUSTER_WORKER: 'false',
+            MASTER_PROCESS: 'true'
+        };
+        if (this.options.verbose) {
+            this.log(`Starting single process on port ${port}`);
+        }
+        this.masterProcess = (0, child_process_1.fork)(this.options.file, [], {
+            cwd: this.options.workingDir,
+            env,
+            execArgv: nodeArgs,
+            silent: true
+        });
+        // Handle process output with filtering
+        (_a = this.masterProcess.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
+            const message = data.toString().trim();
+            if (message && !this.shouldFilterMessage(message)) {
+                console.log(message);
+            }
+        });
+        (_b = this.masterProcess.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (data) => {
+            const message = data.toString().trim();
+            if (message && !this.shouldFilterMessage(message)) {
+                console.error(chalk_1.default.red(message));
+            }
+        });
+        this.masterProcess.on('error', (error) => {
+            this.log(`Process error: ${error.message}`, 'error');
+        });
+        this.masterProcess.on('exit', (code, signal) => {
+            if (!this.isShuttingDown && code !== 0 && signal !== 'SIGTERM') {
+                this.log(`Process crashed (code: ${code}, signal: ${signal})`, 'error');
+                this.totalRestarts++;
+                if (this.totalRestarts < this.options.maxCrashes) {
+                    setTimeout(() => {
+                        this.startSingleProcess();
+                    }, this.options.restartDelay);
+                }
+                else {
+                    this.log(`Max crashes reached (${this.options.maxCrashes}), not restarting`, 'error');
+                }
+            }
+        });
+        // Wait for process to be ready
+        await new Promise((resolve, reject) => {
+            const timeout = setTimeout(() => {
+                resolve(); // Don't reject, assume it's ready
+            }, 5000);
+            this.masterProcess.on('message', (message) => {
+                if (message && message.type === 'ready') {
+                    clearTimeout(timeout);
+                    resolve();
+                }
+            });
+            this.masterProcess.on('error', (error) => {
+                clearTimeout(timeout);
+                reject(error);
+            });
+            this.masterProcess.on('exit', (code) => {
+                clearTimeout(timeout);
+                if (code !== 0) {
+                    reject(new Error(`Process exited with code ${code}`));
+                }
+                else {
+                    resolve();
+                }
+            });
+        });
+        if (this.options.verbose) {
+            this.log(`Process started (PID: ${this.masterProcess.pid})`);
+        }
+    }
+    shouldFilterMessage(message) {
+        const filters = [
+            '[dotenv@',
+            'injecting env',
+            'Express (',
+            'Local: http://localhost:',
+            'Health Check: http://localhost:',
+            'Environment: production',
+            'Environment: development'
+        ];
+        return filters.some(filter => message.includes(filter));
+    }
     async startWorker(workerId) {
         var _a, _b;
         const nodeArgs = this.getNodeArgs();
-        const basePort = this.options.port || 8000;
-        const workerPort = this.options.workers > 1 ? basePort + workerId - 1 : basePort;
+        const port = this.options.port || 8000;
         const env = {
             ...process.env,
             NODE_ENV: process.env.NODE_ENV || 'production',
             WORKER_ID: workerId.toString(),
-            PORT: workerPort.toString(),
+            PORT: port.toString(),
             CLUSTER_WORKER: 'true',
+            MASTER_PROCESS: 'false',
             FORCE_COLOR: this.options.color ? '1' : '0',
-            // Prevent dotenv from loading again in worker processes
-            DOTENV_CONFIG_PATH: '',
-            NODE_OPTIONS: '--no-deprecation'
+            NODE_OPTIONS: '--no-deprecation',
+            SUPPRESS_STARTUP_LOGS: 'true' // Signal to suppress duplicate logs
         };
+        if (this.options.verbose) {
+            this.log(`Starting worker ${workerId}`);
+        }
         const workerProcess = (0, child_process_1.fork)(this.options.file, [], {
             cwd: this.options.workingDir,
             env,
             execArgv: nodeArgs,
-            silent: true // Capture output to avoid duplication
+            silent: true
         });
         const workerInfo = {
             process: workerProcess,
             pid: workerProcess.pid,
             restarts: 0,
             startTime: new Date(),
-            id: workerId
+            id: workerId,
+            port: port,
+            ready: false
         };
         this.workers.set(workerId, workerInfo);
-        // Handle worker output with proper prefixing
+        // Handle worker output with filtering
         (_a = workerProcess.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
             const message = data.toString().trim();
-            if (message) {
-                // Filter out repetitive dotenv messages
-                if (message.includes('[dotenv@') || message.includes('injecting env')) {
-                    return;
-                }
+            if (message && !this.shouldFilterMessage(message)) {
                 const prefix = this.options.verbose ?
-                    chalk_1.default.dim(`[Worker ${workerId}:${workerPort}] `) : '';
+                    chalk_1.default.dim(`[Worker ${workerId}] `) : '';
                 console.log(prefix + message);
             }
         });
         (_b = workerProcess.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (data) => {
             const message = data.toString().trim();
-            if (message) {
-                // Filter out non-critical warnings
-                if (message.includes('[dotenv@') || message.includes('injecting env')) {
-                    return;
-                }
+            if (message && !this.shouldFilterMessage(message)) {
                 const prefix = this.options.verbose ?
-                    chalk_1.default.dim(`[Worker ${workerId}:${workerPort}] `) : '';
+                    chalk_1.default.dim(`[Worker ${workerId}] `) : '';
                 console.error(prefix + chalk_1.default.red(message));
             }
         });
@@ -156,21 +247,23 @@ class StartManager {
         });
         workerProcess.on('exit', (code, signal) => {
             this.workers.delete(workerId);
-            if (!this.isShuttingDown) {
-                if (code !== 0 && signal !== 'SIGTERM') {
-                    this.log(`Worker ${workerId} crashed (code: ${code}, signal: ${signal})`, 'error');
-                    this.restartWorker(workerId);
-                }
+            if (!this.isShuttingDown && code !== 0 && signal !== 'SIGTERM') {
+                this.log(`Worker ${workerId} crashed (code: ${code}, signal: ${signal})`, 'error');
+                this.restartWorker(workerId);
             }
         });
         // Wait for worker to be ready
         await new Promise((resolve, reject) => {
             const timeout = setTimeout(() => {
-                reject(new Error(`Worker ${workerId} failed to start within timeout`));
-            }, 10000);
+                workerInfo.ready = true;
+                this.readyWorkers++;
+                resolve(); // Don't reject, assume it's ready
+            }, 5000);
             workerProcess.on('message', (message) => {
                 if (message && message.type === 'ready') {
                     clearTimeout(timeout);
+                    workerInfo.ready = true;
+                    this.readyWorkers++;
                     resolve();
                 }
             });
@@ -179,19 +272,17 @@ class StartManager {
                 reject(error);
             });
             workerProcess.on('exit', (code) => {
+                clearTimeout(timeout);
                 if (code !== 0) {
-                    clearTimeout(timeout);
                     reject(new Error(`Worker ${workerId} exited with code ${code}`));
                 }
+                else {
+                    resolve();
+                }
             });
-            // Fallback - assume ready after 2 seconds if no message
-            setTimeout(() => {
-                clearTimeout(timeout);
-                resolve();
-            }, 2000);
         });
         if (this.options.verbose) {
-            this.log(`Worker ${workerId} started (PID: ${workerProcess.pid}, Port: ${workerPort})`);
+            this.log(`Worker ${workerId} started (PID: ${workerProcess.pid})`);
         }
         return workerInfo;
     }
@@ -235,6 +326,12 @@ class StartManager {
         });
     }
     async startCluster() {
+        if (this.options.workers === 1) {
+            await this.startSingleProcess();
+            return;
+        }
+        // Multi-worker mode
+        this.readyWorkers = 0;
         const startPromises = [];
         for (let i = 0; i < this.options.workers; i++) {
             startPromises.push(this.startWorker(i + 1));
@@ -260,19 +357,27 @@ class StartManager {
                 return;
             }
             if (req.url === '/health') {
+                const activeWorkers = this.options.workers === 1 ?
+                    (this.masterProcess ? 1 : 0) :
+                    this.workers.size;
                 const stats = {
                     status: 'ok',
                     uptime: Date.now() - this.startTime.getTime(),
-                    workers: this.workers.size,
-                    activeWorkers: Array.from(this.workers.values()).map(w => ({
-                        id: w.id,
-                        pid: w.pid,
-                        restarts: w.restarts,
-                        uptime: Date.now() - w.startTime.getTime()
-                    })),
+                    workers: activeWorkers,
+                    expectedWorkers: this.options.workers,
+                    activeWorkers: this.options.workers === 1 ?
+                        (this.masterProcess ? [{ id: 1, pid: this.masterProcess.pid, uptime: Date.now() - this.startTime.getTime() }] : []) :
+                        Array.from(this.workers.values()).map(w => ({
+                            id: w.id,
+                            pid: w.pid,
+                            restarts: w.restarts,
+                            uptime: Date.now() - w.startTime.getTime(),
+                            ready: w.ready
+                        })),
                     totalRestarts: this.totalRestarts,
                     memory: process.memoryUsage(),
-                    cpu: os_1.default.loadavg()
+                    cpu: os_1.default.loadavg(),
+                    port: this.options.port || 8000
                 };
                 res.writeHead(200, { 'Content-Type': 'application/json' });
                 res.end(JSON.stringify(stats, null, 2));
@@ -321,67 +426,53 @@ class StartManager {
     async restartAll() {
         if (this.isShuttingDown)
             return;
-        this.log('Restarting all workers due to file changes...');
-        const restartPromises = [];
-        for (const [workerId, workerInfo] of this.workers.entries()) {
-            restartPromises.push((async () => {
-                try {
-                    workerInfo.process.kill('SIGTERM');
-                    await this.waitForProcessExit(workerInfo.process, 5000);
-                }
-                catch (error) {
-                    workerInfo.process.kill('SIGKILL');
-                }
-            })());
-        }
-        await Promise.allSettled(restartPromises);
-        // Wait a bit before restarting
-        setTimeout(() => {
-            this.startCluster();
-        }, this.options.restartDelay);
-    }
-    setupMemoryMonitoring() {
-        if (!this.options.maxMemory)
-            return;
-        const maxMemory = this.parseMemoryLimit(this.options.maxMemory);
-        if (!maxMemory)
-            return;
-        const checkInterval = setInterval(() => {
-            if (this.isShuttingDown) {
-                clearInterval(checkInterval);
-                return;
+        this.log('Restarting due to file changes...');
+        if (this.options.workers === 1 && this.masterProcess) {
+            try {
+                this.masterProcess.kill('SIGTERM');
+                await this.waitForProcessExit(this.masterProcess, 5000);
             }
-            this.workers.forEach((workerInfo, workerId) => {
-                try {
-                    // This is a simplified check - in practice, you'd need to get actual worker memory usage
-                    const usage = process.memoryUsage();
-                    if (usage.heapUsed > maxMemory) {
-                        this.log(`Worker ${workerId} may have exceeded memory limit, restarting`, 'warn');
-                        this.restartWorker(workerId);
+            catch (error) {
+                this.masterProcess.kill('SIGKILL');
+            }
+            setTimeout(() => {
+                this.startSingleProcess();
+            }, this.options.restartDelay);
+        }
+        else {
+            const restartPromises = [];
+            for (const [workerId, workerInfo] of this.workers.entries()) {
+                restartPromises.push((async () => {
+                    try {
+                        workerInfo.process.kill('SIGTERM');
+                        await this.waitForProcessExit(workerInfo.process, 5000);
                     }
-                }
-                catch (error) {
-                    // Ignore monitoring errors
-                }
-            });
-        }, 30000); // Check every 30 seconds
+                    catch (error) {
+                        workerInfo.process.kill('SIGKILL');
+                    }
+                })());
+            }
+            await Promise.allSettled(restartPromises);
+            setTimeout(() => {
+                this.startCluster();
+            }, this.options.restartDelay);
+        }
     }
     async start() {
         try {
-            // Load environment variables only once in the main process
+            // Load environment variables
             this.loadEnvFile();
             // Set up monitoring and health checks
             this.setupHealthCheck();
             this.setupWatcher();
-            this.setupMemoryMonitoring();
-            // Start worker cluster
+            // Start the application
             await this.startCluster();
             // Success message
-            const basePort = this.options.port || 8000;
-            const portInfo = this.options.workers > 1 ?
-                ` on ports ${basePort}-${basePort + this.options.workers - 1}` :
-                ` on port ${basePort}`;
-            logger_manager_js_1.loggerManager.printLine(`${chalk_1.default.green(figures_1.default.tick)} Server ready${portInfo} (${this.workers.size} workers)`, 'info');
+            const port = this.options.port || 8000;
+            const actualWorkers = this.options.workers === 1 ? 1 : this.workers.size;
+            const workerInfo = this.options.workers === 1 ?
+                '' : ` (${actualWorkers} workers)`;
+            logger_manager_js_1.loggerManager.printLine(`${chalk_1.default.green(figures_1.default.tick)} Server ready on port ${port}${workerInfo}`, 'info');
         }
         catch (error) {
             this.log(`Failed to start server: ${error.message}`, 'error');
@@ -399,6 +490,17 @@ class StartManager {
         if (this.healthServer) {
             this.healthServer.close();
         }
+        // Stop single process
+        if (this.masterProcess) {
+            try {
+                this.masterProcess.kill('SIGTERM');
+                await this.waitForProcessExit(this.masterProcess, this.options.gracefulTimeout);
+            }
+            catch (error) {
+                this.masterProcess.kill('SIGKILL');
+            }
+        }
+        // Stop workers
         const shutdownPromises = [];
         for (const [workerId, workerInfo] of this.workers.entries()) {
             shutdownPromises.push((async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neex",
-  "version": "0.6.54",
+  "version": "0.6.60",
   "description": "The Modern Build System for Polyrepo-in-Monorepo Architecture",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",