lemonade-interactive-loader 1.0.1 → 1.0.2

package/README.md

@@ -73,7 +73,7 @@ The main menu adapts based on whether you have a configuration saved:
 ```
 
 | Command | Description |
-|---------|-------------||
+|---------|-------------|
 | **▶️ Start Server** | Launch Lemonade Server with saved config (when config exists) |
 | **✏️ Edit Configuration** | Update your saved settings interactively |
 | **👁️ View Configuration** | See your current configuration and installed builds |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lemonade-interactive-loader",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Interactive CLI tool to launch Lemonade Server with custom arguments and download llama.cpp releases - Cross-platform (Windows/Linux)",
   "main": "index.js",
   "bin": {

package/src/cli/menu.js

@@ -3,7 +3,7 @@ const { loadConfig } = require('../config');
 const { getAllInstalledAssets, getLlamaServerPath, downloadAndExtractLlamaCpp, deleteInstalledAsset } = require('../services/asset-manager');
 const { selectLlamaCppRelease, selectAsset, askLaunchServer } = require('./prompts');
 const { runSetupWizard } = require('./setup-wizard');
-const { launchLemonadeServer } = require('../services/server');
+const { launchLemonadeServer, setupShutdownHandlers } = require('../services/server');
 const { inferBackendType, formatBytes } = require('../utils/system');
 
 /**
@@ -321,6 +321,8 @@ async function handleCommand(command) {
         console.log('No configuration found. Please run "setup" first.');
         return;
       }
+      // Set up shutdown handlers to kill server on exit
+      setupShutdownHandlers();
       await launchLemonadeServer(config);
       break;
   }
@@ -349,6 +351,10 @@ async function runCLI() {
   }
   
   console.log('\n👋 Goodbye!\n');
+  
+  // Ensure server is shut down when exiting the CLI
+  const { shutdownLemonadeServer } = require('../services/server');
+  shutdownLemonadeServer();
 }
 
 module.exports = {

package/src/services/server.js

@@ -1,9 +1,12 @@
 const fs = require('fs');
-const { execSync } = require('child_process');
+const { execSync, spawn } = require('child_process');
 const { LEMONADE_SERVER_DEFAULT_PATH } = require('../config/constants');
 const { findLlamaServer } = require('../utils/system');
 const { getLlamaServerPath } = require('./asset-manager');
 
+// Track the server process for graceful shutdown
+let serverProcess = null;
+
 /**
  * Build server command arguments
  * @param {Object} config - Server configuration
@@ -154,21 +157,80 @@ async function launchLemonadeServer(config) {
   console.log('\nStarting server...\n');
   
   try {
-    const command = formatCommand(serverPath, args, {});
-    execSync(command, {
+    // Parse the command into executable and arguments
+    const parts = command.trim().split(/\s+/);
+    const executable = parts[0];
+    const execArgs = parts.slice(1);
+    
+    // Spawn the server process
+    serverProcess = spawn(executable, execArgs, {
       stdio: 'inherit',
       env: process.env
     });
+    
+    // Handle process exit
+    serverProcess.on('close', (code) => {
+      console.log(`\nServer exited with code ${code}`);
+      serverProcess = null;
+    });
+    
+    serverProcess.on('error', (err) => {
+      console.error(`Server process error: ${err.message}`);
+    });
+    
   } catch (error) {
-    console.error(`Server exited with error code: ${error.status}`);
+    console.error(`Server exited with error: ${error.message}`);
     if (error.status !== null) {
       process.exit(error.status);
     }
   }
 }
 
+/**
+ * Gracefully shutdown the lemonade server
+ */
+function shutdownLemonadeServer() {
+  if (serverProcess) {
+    console.log('\n\nShutting down Lemonade Server...');
+    
+    // Try graceful shutdown first (SIGTERM)
+    serverProcess.on('exit', () => {
+      console.log('Server shut down successfully.');
+    });
+    
+    serverProcess.on('error', (err) => {
+      console.error(`Error shutting down server: ${err.message}`);
+    });
+    
+    // Send SIGTERM signal
+    serverProcess.kill('SIGTERM');
+    
+    // Force kill after 5 seconds if still running
+    setTimeout(() => {
+      if (serverProcess && !serverProcess.killed) {
+        console.log('Force killing server...');
+        serverProcess.kill('SIGKILL');
+      }
+    }, 5000);
+  }
+}
+
+// Set up signal handlers for graceful shutdown
+function setupShutdownHandlers() {
+  const shutdown = (signal) => {
+    console.log(`\n\nReceived ${signal}. Shutting down...`);
+    shutdownLemonadeServer();
+    setTimeout(() => process.exit(0), 2000);
+  };
+  
+  process.on('SIGINT', () => shutdown('SIGINT')); // Ctrl+C
+  process.on('SIGTERM', () => shutdown('SIGTERM')); // Termination signal
+}
+
 module.exports = {
   buildServerArgs,
   formatCommand,
-  launchLemonadeServer
+  launchLemonadeServer,
+  shutdownLemonadeServer,
+  setupShutdownHandlers
 };