properly shutdown flatpaks

if `fileName` ends with "flatpak", capture app id and then use `flatpak kill appId` to shutdown rather than sending SIGTERM. SIGTERM by itself doesn't work since flatpaks are run inside a container which also needs to be shutdown

fixes #196

Author: rfvgyhn

src/MinEdLauncher/App.fs

@@ -313,7 +313,7 @@ let rec private launchLoop initialLaunch settings playableProducts (session: EdS
     | Console.ProductSelection.Product selectedProduct ->
         let! p = Product.validateForRun settings.CbLauncherDir settings.WatchForCrashes selectedProduct |> Result.mapError InvalidProductState
         let pArgs() = processArgs selectedProduct
-        let logStart (ps: ProcessStartInfo list) = ps |> List.iter (fun p -> Log.info $"Starting process %s{p.FileName}")        
+        let logStart (ps: LauncherProcess list) = ps |> List.iter (fun p -> Log.info $"Starting process %s{p.Name}")        
         let persistentStartInfos, relaunchStartInfos =
             let relaunchProcesses = settings.Processes |> List.filter _.RestartOnRelaunch |> List.map _.Info
             match persistentRunning with
@@ -580,14 +580,14 @@ let run settings launcherVersion cancellationToken = taskResult {
 
     let processesToStop =
         runningProcesses
-        |> List.filter (fun p ->
+        |> List.choose (fun (p, l) ->
            settings.Processes
-           |> List.tryFind (fun s -> s.Info.FileName = p.StartInfo.FileName && s.KeepOpen = false)
-           |> Option.isSome) 
+           |> List.tryFind (fun s -> s.Info.StartInfo.FileName = p.StartInfo.FileName && s.KeepOpen = false)
+           |> Option.map (fun _ -> p, l)) 
 
     Process.stopProcesses settings.ShutdownTimeout processesToStop
-    settings.ShutdownProcesses |> List.iter (fun p -> Log.info $"Starting process %s{p.FileName}")
-    Process.launchProcesses true settings.ShutdownProcesses |> Process.waitForExit
+    settings.ShutdownProcesses |> List.iter (fun p -> Log.info $"Starting process %s{p.Name}")
+    Process.launchProcesses true settings.ShutdownProcesses |> List.map fst |> Process.waitForExit
 
     return didLoop
 } 

src/MinEdLauncher/Process.fs

@@ -1,44 +1,56 @@
 module MinEdLauncher.Process
 
+open System
 open System.ComponentModel
 open System.Diagnostics
+open MinEdLauncher.Types
 
-let launchProcesses printOutput (processes:ProcessStartInfo list) =
+let launchProcesses printOutput (processes:LauncherProcess list) =
     processes
-    |> List.choose (fun p ->
+    |> List.choose (fun l ->
         try
-            let p = Process.Start(p)
+            let p = Process.Start(l.StartInfo)
             p.BeginErrorReadLine()
             p.BeginOutputReadLine()
 
             if printOutput then
                 p.OutputDataReceived.Add(fun a -> if a.Data <> null then printfn $"  %s{a.Data}")
                 p.ErrorDataReceived.Add(fun a -> if a.Data <> null then printfn $"  %s{a.Data}")
 
-            p |> Some
+            (p, l) |> Some
         with
         | :? Win32Exception as e ->
-            Log.exn e $"""Unable to start process %s{p.FileName}
+            Log.exn e $"""Unable to start process %s{l.Name}
     HRESULT: 0x{e.ErrorCode:X}
     Win32 Error Code: {e.NativeErrorCode}
     """
             None
         | e ->
-            Log.exn e $"Unable to start process %s{p.FileName}"
+            Log.exn e $"Unable to start process %s{l.Name}"
             None)
 
-let stopProcesses timeout (processes: Process list) =
+let stopProcesses (timeout: TimeSpan) (processes: (Process * LauncherProcess) list) =
     processes
-    |> List.iter (fun p ->
+    |> List.iter (fun (p, l) ->
         use p = p
         if p.HasExited then
             Log.debug $"Process %i{p.Id} already exited"            
         else
-            Log.debug $"Stopping process %s{p.ProcessName}"
-            match Interop.termProcess timeout p with
-            | Ok () ->
-                Log.info $"Stopped process %s{p.ProcessName}"
-            | Error msg -> Log.warn msg)
+            let name = match l with Host _ -> p.ProcessName | Flatpak _ -> l.Name
+            Log.debug $"Stopping process %s{name}"
+            match l.ShutdownCommand with
+            | Some startInfo ->
+                try
+                    use p = Process.Start(startInfo)
+                    if not (p.WaitForExit(timeout)) then
+                        Log.warn $"Process did not exit within %i{int timeout.TotalSeconds} seconds"
+                    else
+                        Log.info $"Stopped process %s{name}"
+                with e -> Log.exn e $"Failed to stop process %s{name}"
+            | None ->
+                match Interop.termProcess timeout p with
+                | Ok () -> Log.info $"Stopped process %s{name}"
+                | Error msg -> Log.warn msg)
 
 let waitForExit (processes: Process list) =
     processes

src/MinEdLauncher/Settings.fs

@@ -259,7 +259,17 @@ let private mapProcessConfig p =
     pInfo.UseShellExecute <- false
     pInfo.RedirectStandardOutput <- true
     pInfo.RedirectStandardError <- true
-    pInfo
+    if p.FileName.EndsWith("flatpak") then
+        match pInfo.Arguments.Split(' ', StringSplitOptions.RemoveEmptyEntries ||| StringSplitOptions.TrimEntries) |> Array.toList with
+        | "run" :: args -> 
+            args
+            |> Seq.skipWhile _.StartsWith('-')
+            |> Seq.tryHead
+            |> Option.map (fun appId -> Flatpak (appId, pInfo))
+            |> Option.defaultWith (fun () -> (Host pInfo))
+        | _ -> (Host pInfo)
+    else
+        Host pInfo
 let getSettings args appDir fileConfig = task {
     let findCbLaunchDir paths =
         appDir :: paths

src/MinEdLauncher/Types.fs

@@ -108,6 +108,13 @@ type AuthorizedProduct =
       SortKey: int
       Sku: string
       TestApi: bool }
+type LauncherProcess = Host of ProcessStartInfo | Flatpak of appId: string * startInfo: ProcessStartInfo with
+    member this.Name = match this with Host startInfo -> startInfo.FileName | Flatpak (appId, _) -> appId
+    member this.StartInfo = match this with Host startInfo -> startInfo | Flatpak (_, startInfo) -> startInfo
+    member this.ShutdownCommand =
+        match this with
+        | Host _ -> None
+        | Flatpak (appId, startInfo) -> Some(ProcessStartInfo(startInfo.FileName, $"kill %s{appId}"))
 type LauncherSettings =
     { Platform: Platform
       DisplayMode: DisplayMode
@@ -126,8 +133,8 @@ type LauncherSettings =
       CheckForLauncherUpdates: bool
       MaxConcurrentDownloads: int
       ForceUpdate: string Set
-      Processes: {| Info: ProcessStartInfo; RestartOnRelaunch: bool; KeepOpen: bool |} list
-      ShutdownProcesses: ProcessStartInfo list
+      Processes: {| Info: LauncherProcess; RestartOnRelaunch: bool; KeepOpen: bool |} list
+      ShutdownProcesses: LauncherProcess list
       FilterOverrides: OrdinalIgnoreCaseMap<string>
       AdditionalProducts: AuthorizedProduct list
       DryRun: bool