@noego/app 0.0.14 → 0.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noego/app",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "description": "Production build tool for Dinner/Forge apps.",
   "type": "module",
   "bin": {
@@ -34,6 +34,7 @@
     "http-proxy": "^1.18.1",
     "picomatch": "^2.3.1",
     "rxjs": "^7.8.1",
+    "tree-kill": "^1.2.2",
     "yaml": "^2.6.0"
   },
   "peerDependencies": {

package/src/commands/dev.js

@@ -1,6 +1,6 @@
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { spawn, execSync } from 'node:child_process';
+import { spawn } from 'node:child_process';
 import { createBuildContext } from '../build/context.js';
 import { findConfigFile } from '../runtime/index.js';
 import { loadConfig } from '../runtime/config-loader.js';
@@ -10,39 +10,19 @@ import { debounceTime, filter, exhaustMap, tap, catchError, takeUntil, finalize,
 import { waitForPortFree } from '../utils/port.js';
 import { stopProcess, killProcessTree as killProcessTreeUtil } from '../utils/process-observable.js';
 import { watcherToObservable, FileEventType } from '../utils/file-watcher-observable.js';
+import treeKill from 'tree-kill';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 /**
  * Kill a process and all its descendants (entire process tree)
- * This ensures no orphaned processes remain when killing a parent
+ * Uses tree-kill for cross-platform recursive process tree termination
  */
 function killProcessTree(pid, signal = 'SIGKILL') {
   if (!pid) return;
 
   try {
-    // On Unix systems, use pkill to kill all descendants
-    if (process.platform !== 'win32') {
-      // Kill all child processes first
-      try {
-        execSync(`pkill -P ${pid}`, { stdio: 'ignore' });
-      } catch (e) {
-        // No children or already dead, that's fine
-      }
-      // Then kill the parent
-      try {
-        process.kill(pid, signal);
-      } catch (e) {
-        // Process may already be dead
-      }
-    } else {
-      // On Windows, use taskkill with /T flag to kill process tree
-      try {
-        execSync(`taskkill /pid ${pid} /T /F`, { stdio: 'ignore' });
-      } catch (e) {
-        // Process may already be dead
-      }
-    }
+    treeKill(pid, signal);
   } catch (error) {
     // Ignore errors - process might already be dead
   }
@@ -500,12 +480,24 @@ async function runSplitServeWithWatch(context, tsxExecutable, tsxArgs, baseEnv,
         // Auto-restart on crash if under limit
         if (backendCrashRestarts < MAX_CRASH_RESTARTS) {
           backendCrashRestarts++;
-          logger.warn(`[BACKEND] Crash detected. Auto-restart ${backendCrashRestarts}/${MAX_CRASH_RESTARTS} in ${CRASH_RESTART_DELAY}ms...`);
-          setTimeout(() => {
-            if (!isShuttingDown) {
-              startBackend();
+          logger.warn(`[BACKEND] Crash detected. Auto-restart ${backendCrashRestarts}/${MAX_CRASH_RESTARTS}...`);
+
+          // Wait for port to be free before restarting (fixes race condition)
+          backendProc = null;
+          waitForPortFree(backendPort, 10000, 100).subscribe({
+            next: () => {
+              if (!isShuttingDown) {
+                logger.info(`[BACKEND] Port ${backendPort} is free, restarting...`);
+                startBackend();
+              }
+            },
+            error: (err) => {
+              logger.warn(`[BACKEND] Port wait warning: ${err.message}. Attempting restart anyway...`);
+              if (!isShuttingDown) {
+                startBackend();
+              }
             }
-          }, CRASH_RESTART_DELAY);
+          });
         } else {
           logger.error(`[BACKEND] Exceeded max crash restarts (${MAX_CRASH_RESTARTS}). Shutting down...`);
           shutdown('backend-exceeded-restarts', 1, 'backend-crash');
@@ -550,12 +542,24 @@ async function runSplitServeWithWatch(context, tsxExecutable, tsxArgs, baseEnv,
         // Auto-restart on crash if under limit
         if (frontendCrashRestarts < MAX_CRASH_RESTARTS) {
           frontendCrashRestarts++;
-          logger.warn(`[FRONTEND] Crash detected. Auto-restart ${frontendCrashRestarts}/${MAX_CRASH_RESTARTS} in ${CRASH_RESTART_DELAY}ms...`);
-          setTimeout(() => {
-            if (!isShuttingDown) {
-              startFrontend();
+          logger.warn(`[FRONTEND] Crash detected. Auto-restart ${frontendCrashRestarts}/${MAX_CRASH_RESTARTS}...`);
+
+          // Wait for port to be free before restarting (fixes race condition)
+          frontendProc = null;
+          waitForPortFree(frontendPort, 10000, 100).subscribe({
+            next: () => {
+              if (!isShuttingDown) {
+                logger.info(`[FRONTEND] Port ${frontendPort} is free, restarting...`);
+                startFrontend();
+              }
+            },
+            error: (err) => {
+              logger.warn(`[FRONTEND] Port wait warning: ${err.message}. Attempting restart anyway...`);
+              if (!isShuttingDown) {
+                startFrontend();
+              }
             }
-          }, CRASH_RESTART_DELAY);
+          });
         } else {
           logger.error(`[FRONTEND] Exceeded max crash restarts (${MAX_CRASH_RESTARTS}). Shutting down...`);
           shutdown('frontend-exceeded-restarts', 1, 'frontend-crash');

package/src/runtime/runtime.js

@@ -372,7 +372,7 @@ async function setupProxy(app, backendPort, config) {
  */
 async function runBackendService(config) {
   const appBootModule = await import(toFileUrl(config.app.boot_abs));
-  const backendApp = appBootModule.default(config);
+  const backendApp = await appBootModule.default(config);
 
   attachCookiePolyfill(backendApp);
   
@@ -402,7 +402,7 @@ async function runBackendService(config) {
  */
 async function runFrontendService(config) {
   const appBootModule = await import(toFileUrl(config.app.boot_abs));
-  const frontendApp = appBootModule.default(config);
+  const frontendApp = await appBootModule.default(config);
 
   attachCookiePolyfill(frontendApp);
   
@@ -684,9 +684,9 @@ async function runRouterService(config) {
  */
 export async function runCombinedServices(config, options = {}) {
   const { hasBackend = true, hasFrontend = true } = options;
-  
+
   const appBootModule = await import(toFileUrl(config.app.boot_abs));
-  const app = appBootModule.default(config);
+  const app = await appBootModule.default(config);
 
   attachCookiePolyfill(app);