rds_ssm_connect 1.7.14 → 1.7.15

package/connect.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import { exec } from 'node:child_process'
+import { exec, spawn } from 'node:child_process'
 import { EventEmitter } from 'node:events'
 import fs from 'node:fs/promises'
 import net from 'node:net'
@@ -14,7 +14,7 @@ import {
 } from './configLoader.js'
 
 // Package info for version checking
-const packageJson = { name: 'rds_ssm_connect', version: '1.7.14' }
+const packageJson = { name: 'rds_ssm_connect', version: '1.7.15' }
 
 const execAsync = promisify(exec)
 
@@ -83,20 +83,30 @@ async function checkForUpdates() {
 // Store active child processes for cleanup
 let activeChildProcesses = []
 
+// Kill entire process group (shell + aws-vault + session-manager-plugin).
+// Requires the child to have been spawned with `detached: true` so that
+// setsid() makes it a process group leader.
+function killProcessTree(child) {
+  if (!child || !child.pid) return
+  try {
+    process.kill(-child.pid, 'SIGTERM') // negative PID = kill entire process group
+  } catch (_err) {
+    // ESRCH: process group already exited — safe to ignore
+  }
+}
+
 // Handle graceful shutdown
 function setupProcessCleanup() {
-  const cleanup = () => {
+  const killAll = () => {
     activeChildProcesses.forEach((child) => {
-      if (child && !child.killed) {
-        child.kill('SIGTERM')
-      }
+      killProcessTree(child)
     })
-    process.exit(0)
+    activeChildProcesses = []
   }
 
-  process.on('SIGINT', cleanup)
-  process.on('SIGTERM', cleanup)
-  process.on('exit', cleanup)
+  process.on('SIGINT', () => { killAll(); process.exit(0) })
+  process.on('SIGTERM', () => { killAll(); process.exit(0) })
+  process.on('exit', killAll)
 }
 
 async function readAwsConfig() {
@@ -251,6 +261,7 @@ async function handleTargetNotConnectedError(
   region,
   retryCount,
   maxRetries,
+  onChild,
 ) {
   // Terminate the disconnected instance
   await terminateBastionInstance(ENV, instanceId, region)
@@ -270,6 +281,7 @@ async function handleTargetNotConnectedError(
     region,
     retryCount + 1,
     maxRetries,
+    onChild,
   )
 }
 
@@ -282,7 +294,11 @@ function executePortForwardingCommand(
   region,
 ) {
   const portForwardingCommand = `aws-vault exec ${ENV} -- aws ssm start-session --region ${region} --target ${instanceId} --document-name AWS-StartPortForwardingSessionToRemoteHost --parameters "host=${rdsEndpoint},portNumber='${remotePort}',localPortNumber='${portNumber}'" --cli-connect-timeout 0`
-  const child = exec(portForwardingCommand)
+  const child = spawn(portForwardingCommand, {
+    shell: true,
+    detached: true,
+    stdio: ['ignore', 'pipe', 'pipe'],
+  })
 
   // Register child process for cleanup
   activeChildProcesses.push(child)
@@ -299,6 +315,7 @@ async function startPortForwardingWithConfig(
   region,
   retryCount = 0,
   maxRetries = RETRY_CONFIG.PORT_FORWARDING_MAX_RETRIES,
+  onChild,
 ) {
   return new Promise((resolve, reject) => {
     const child = executePortForwardingCommand(
@@ -309,6 +326,11 @@ async function startPortForwardingWithConfig(
       remotePort,
       region,
     )
+    // Notify caller of the new child (used for per-connection tracking).
+    // If the connection was already disconnected, the callback kills this
+    // child immediately so it doesn't linger as an orphan.
+    if (onChild) onChild(child)
+
     const sessionState = monitorPortForwardingSession(child)
 
     child.on('close', async (code) => {
@@ -331,6 +353,7 @@ async function startPortForwardingWithConfig(
             region,
             retryCount,
             maxRetries,
+            onChild,
           )
           resolve()
         } else if (code !== 0) {
@@ -543,6 +566,18 @@ async function connect(projectKey, profile, options = {}) {
 
   let manualDisconnect = false
   let stopKeepalive = null
+  let currentChild = null // per-connection child tracking
+
+  // Called whenever a new child process is spawned for this connection.
+  // If disconnect() was already called, kills the child immediately so
+  // it doesn't linger as an orphan during retry chains.
+  const onChild = (child) => {
+    currentChild = child
+    if (manualDisconnect) {
+      killProcessTree(child)
+      activeChildProcesses = activeChildProcesses.filter((p) => p !== child)
+    }
+  }
 
   // Emit status updates
   const emit = (event, data) => {
@@ -600,6 +635,7 @@ async function connect(projectKey, profile, options = {}) {
           region,
           0,
           RETRY_CONFIG.PORT_FORWARDING_MAX_RETRIES,
+          onChild,
         )
 
         // Session ended — clean up keepalive
@@ -672,13 +708,12 @@ async function connect(projectKey, profile, options = {}) {
     disconnect: () => {
       manualDisconnect = true
       stopKeepalive?.()
-      // Kill all active child processes
-      activeChildProcesses.forEach((child) => {
-        if (child && !child.killed) {
-          child.kill('SIGTERM')
-        }
-      })
-      activeChildProcesses = []
+      // Kill only THIS connection's child process group
+      if (currentChild) {
+        killProcessTree(currentChild)
+        activeChildProcesses = activeChildProcesses.filter((p) => p !== currentChild)
+        currentChild = null
+      }
     },
     waitForClose: () => portForwardingPromise,
   }

package/gui-adapter.js

@@ -253,19 +253,19 @@ async function handleCommand(command) {
   }
 }
 
-// Handle process signals for cleanup
-function setupCleanup() {
-  const cleanup = () => {
-    for (const [_connId, connection] of activeConnections) {
-      connection.disconnect()
-    }
-    activeConnections.clear()
-    process.exit(0)
+// Disconnect all active connections (idempotent — safe to call multiple times)
+function disconnectAll() {
+  for (const [_connId, connection] of activeConnections) {
+    connection.disconnect()
   }
+  activeConnections.clear()
+}
 
-  process.on('SIGINT', cleanup)
-  process.on('SIGTERM', cleanup)
-  process.on('exit', cleanup)
+// Handle process signals for cleanup
+function setupCleanup() {
+  process.on('SIGINT', () => { disconnectAll(); process.exit(0) })
+  process.on('SIGTERM', () => { disconnectAll(); process.exit(0) })
+  process.on('exit', disconnectAll)
 }
 
 // Main entry point
@@ -294,10 +294,7 @@ async function main() {
   })
 
   rl.on('close', () => {
-    for (const [_connId, connection] of activeConnections) {
-      connection.disconnect()
-    }
-    activeConnections.clear()
+    disconnectAll()
     process.exit(0)
   })
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rds_ssm_connect",
-  "version": "1.7.14",
+  "version": "1.7.15",
   "type": "module",
   "repository": {
     "type": "git",

package/src/App.svelte

@@ -182,7 +182,12 @@ async function confirmClose() {
   } catch (_err) {
     // Best-effort disconnect before closing
   }
-  await invoke('quit_app')
+  try {
+    await invoke('quit_app')
+  } catch (_err) {
+    // If quit_app fails, force close via window API
+    appWindow?.close()
+  }
 }
 
 function cancelClose() {
@@ -428,8 +433,10 @@ async function handleInstallUpdate() {
 
   try {
     await invoke('install_update')
-    statusMessage = 'Update installed! Restart to apply.'
-    // The app will restart automatically after install
+    // App should auto-restart and never reach here, but just in case:
+    isUpdating = false
+    showUpdateBanner = false
+    statusMessage = 'Update installed successfully.'
   } catch (err) {
     errorMessage = `Update failed: ${err}`
     isUpdating = false

package/src-tauri/Cargo.lock

@@ -3057,7 +3057,7 @@ checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
 
 [[package]]
 name = "rds-ssm-connect"
-version = "1.7.14"
+version = "1.7.15"
 dependencies = [
  "reqwest 0.12.28",
  "semver",

package/src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rds-ssm-connect"
-version = "1.7.14"
+version = "1.7.15"
 description = "Secure RDS connections through AWS SSM"
 authors = ["Iaroslav Pyrogov"]
 edition = "2024"

package/src-tauri/src/lib.rs

@@ -818,6 +818,8 @@ async fn install_update(app_handle: AppHandle) -> Result<(), String> {
         .await
         .map_err(|e| format!("Failed to download/install update: {}", e))?;
 
+    app_handle.restart();
+
     Ok(())
 }
 
@@ -836,7 +838,18 @@ async fn open_url(app_handle: AppHandle, url: String) -> Result<(), String> {
 }
 
 #[tauri::command]
-async fn quit_app(app_handle: AppHandle) -> Result<(), String> {
+async fn quit_app(
+    app_handle: AppHandle,
+    state: tauri::State<'_, Arc<TokioMutex<SidecarState>>>,
+) -> Result<(), String> {
+    // Kill the sidecar process (triggers its cleanup handlers which
+    // disconnect all active connections and kill process groups)
+    {
+        let mut guard = state.lock().await;
+        if let Some(child) = guard.child.take() {
+            let _ = child.kill();
+        }
+    }
     app_handle.exit(0);
     Ok(())
 }

package/src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "RDS SSM Connect",
-  "version": "1.7.14",
+  "version": "1.7.15",
   "identifier": "com.rds-ssm-connect.desktop",
   "build": {
     "beforeDevCommand": "npm run dev:vite",