neex 0.6.60 → 0.6.62

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

@@ -90,29 +90,17 @@ function addStartCommands(program) {
             const isDevelopment = options.watch || process.env.NODE_ENV === 'development';
             const isProduction = !isDevelopment;
             const cpuCount = os_1.default.cpus().length;
-            // Smart worker allocation - more conservative approach
+            // Smart worker allocation
             let workers = options.workers;
             if (!workers) {
                 if (isDevelopment) {
-                    workers = 1; // Always single worker in development
+                    workers = 1;
                 }
                 else {
-                    // 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
-                    }
+                    // For production, use CPU count but cap at reasonable limit
+                    workers = Math.min(cpuCount, 4); // Reduced from 8 to 4 for better resource management
                 }
             }
-            // 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;
@@ -130,26 +118,22 @@ 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 ? `${memoryPerWorker}M` : undefined,
+                memoryLimit: isProduction ? '512M' : undefined,
                 logLevel: options.verbose ? 'debug' : 'info',
                 color: process.stdout.isTTY,
                 verbose: options.verbose,
                 watch: options.watch,
-                maxMemory: options.maxMemory || (isProduction ? `${maxMemoryPerWorker}M` : undefined),
+                maxMemory: options.maxMemory || (isProduction ? '1G' : undefined),
                 maxCrashes: isProduction ? 3 : 10,
                 restartDelay: isProduction ? 1000 : 500,
                 healthCheck,

package/dist/src/dev-manager.js

@@ -52,14 +52,14 @@ class DevManager {
             return { command: parts[0], args: [...parts.slice(1), this.options.file] };
         }
         // Default to tsx for TypeScript files
-        const args = [this.options.file];
+        const args = ['--loader', 'tsx', this.options.file];
         if (this.options.inspect) {
             args.unshift('--inspect');
         }
         if (this.options.inspectBrk) {
             args.unshift('--inspect-brk');
         }
-        return { command: 'tsx', args };
+        return { command: 'node', args };
     }
     clearConsole() {
         if (this.options.clearConsole && process.stdout.isTTY) {

package/dist/src/start-manager.js

@@ -24,7 +24,6 @@ class StartManager {
         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);
@@ -87,10 +86,10 @@ class StartManager {
                 args.push(`--max-old-space-size=${memoryMB}`);
             }
         }
-        if (this.options.inspect && this.options.workers === 1) {
+        if (this.options.inspect) {
             args.push('--inspect');
         }
-        if (this.options.inspectBrk && this.options.workers === 1) {
+        if (this.options.inspectBrk) {
             args.push('--inspect-brk');
         }
         if (this.options.nodeArgs) {
@@ -99,7 +98,6 @@ class StartManager {
         return args;
     }
     async startSingleProcess() {
-        var _a, _b;
         const nodeArgs = this.getNodeArgs();
         const port = this.options.port || 8000;
         const env = {
@@ -107,31 +105,13 @@ class StartManager {
             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'
+            NODE_OPTIONS: '--no-deprecation'
         };
-        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));
-            }
+            silent: false // Let the process handle its own output
         });
         this.masterProcess.on('error', (error) => {
             this.log(`Process error: ${error.message}`, 'error');
@@ -176,21 +156,9 @@ class StartManager {
             });
         });
         if (this.options.verbose) {
-            this.log(`Process started (PID: ${this.masterProcess.pid})`);
+            this.log(`Process started (PID: ${this.masterProcess.pid}, Port: ${port})`);
         }
     }
-    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();
@@ -201,14 +169,9 @@ class StartManager {
             WORKER_ID: workerId.toString(),
             PORT: port.toString(),
             CLUSTER_WORKER: 'true',
-            MASTER_PROCESS: 'false',
             FORCE_COLOR: this.options.color ? '1' : '0',
-            NODE_OPTIONS: '--no-deprecation',
-            SUPPRESS_STARTUP_LOGS: 'true' // Signal to suppress duplicate logs
+            NODE_OPTIONS: '--no-deprecation'
         };
-        if (this.options.verbose) {
-            this.log(`Starting worker ${workerId}`);
-        }
         const workerProcess = (0, child_process_1.fork)(this.options.file, [], {
             cwd: this.options.workingDir,
             env,
@@ -221,14 +184,13 @@ class StartManager {
             restarts: 0,
             startTime: new Date(),
             id: workerId,
-            port: port,
-            ready: false
+            port: port
         };
         this.workers.set(workerId, workerInfo);
-        // Handle worker output with filtering
+        // Handle worker output
         (_a = workerProcess.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
             const message = data.toString().trim();
-            if (message && !this.shouldFilterMessage(message)) {
+            if (message && !message.includes('[dotenv@') && !message.includes('injecting env')) {
                 const prefix = this.options.verbose ?
                     chalk_1.default.dim(`[Worker ${workerId}] `) : '';
                 console.log(prefix + message);
@@ -236,7 +198,7 @@ class StartManager {
         });
         (_b = workerProcess.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (data) => {
             const message = data.toString().trim();
-            if (message && !this.shouldFilterMessage(message)) {
+            if (message && !message.includes('[dotenv@') && !message.includes('injecting env')) {
                 const prefix = this.options.verbose ?
                     chalk_1.default.dim(`[Worker ${workerId}] `) : '';
                 console.error(prefix + chalk_1.default.red(message));
@@ -255,15 +217,11 @@ class StartManager {
         // Wait for worker to be ready
         await new Promise((resolve, reject) => {
             const timeout = setTimeout(() => {
-                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();
                 }
             });
@@ -327,11 +285,11 @@ class StartManager {
     }
     async startCluster() {
         if (this.options.workers === 1) {
+            // Single process mode
             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));
@@ -357,23 +315,16 @@ 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: 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
-                        })),
+                    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()
+                    })),
                     totalRestarts: this.totalRestarts,
                     memory: process.memoryUsage(),
                     cpu: os_1.default.loadavg(),
@@ -428,6 +379,7 @@ class StartManager {
             return;
         this.log('Restarting due to file changes...');
         if (this.options.workers === 1 && this.masterProcess) {
+            // Single process restart
             try {
                 this.masterProcess.kill('SIGTERM');
                 await this.waitForProcessExit(this.masterProcess, 5000);
@@ -440,6 +392,7 @@ class StartManager {
             }, this.options.restartDelay);
         }
         else {
+            // Multi-worker restart
             const restartPromises = [];
             for (const [workerId, workerInfo] of this.workers.entries()) {
                 restartPromises.push((async () => {
@@ -469,9 +422,8 @@ class StartManager {
             await this.startCluster();
             // Success message
             const port = this.options.port || 8000;
-            const actualWorkers = this.options.workers === 1 ? 1 : this.workers.size;
             const workerInfo = this.options.workers === 1 ?
-                '' : ` (${actualWorkers} workers)`;
+                '' : ` (${this.workers.size} workers)`;
             logger_manager_js_1.loggerManager.printLine(`${chalk_1.default.green(figures_1.default.tick)} Server ready on port ${port}${workerInfo}`, 'info');
         }
         catch (error) {

package/package.json

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