Improves process handling (#282)

Author: jmgomez

nimcheck.nim

@@ -99,5 +99,4 @@ proc nimCheck*(filePath: string, nimPath: string): Future[seq[CheckResult]] {.as
     parseCheckResults(lines)
 
   finally:
-    if not process.isNil: 
-      discard process.kill()
+    await shutdownChildProcess(process)

nimexpand.nim

@@ -44,8 +44,7 @@ proc nimExpandMacro*(nimPath: string, suggest: Suggest, filePath: string): Futur
     let output = string.fromBytes(process.stdoutStream.read().await)  
     result = extractMacroExpansion(output, line)
   finally:
-    if not process.isNil: 
-      discard process.kill()
+    await shutdownChildProcess(process)
 
 
 proc extractArcExpansion*(output: string, procName: string): string =
@@ -79,8 +78,7 @@ proc nimExpandArc*(nimPath: string, suggest: Suggest, filePath: string): Future[
     result = extractArcExpansion(output, procName)
     # debug "nimExpandArc", output = output, result = result
     if result.len == 0:
-      result = &"#Couldnt expand arc for `{procName}`. Showing raw output instead (nimPath). \n"
+      result = &"#Couldnt expand arc for `{procName}`. Showing raw output instead \n"
       result.add output      
   finally:
-    if not process.isNil: 
-      discard process.kill()
+    await shutdownChildProcess(process)

suggestapi.nim

@@ -268,11 +268,7 @@ proc markFailed(self: Project, errMessage: string) {.raises: [].} =
 
 proc stop*(self: Project) =
   debug "Stopping nimsuggest for ", root = self.file
-  try:
-    let res = self.process.kill()
-    debug "Stopped nimsuggest ", res = res
-  except Exception as ex:
-    writeStackTrace(ex)
+  asyncSpawn shutdownChildProcess(self.process)
 
 proc doWithTimeout*[T](fut: Future[T], timeout: int, s: string): owned(Future[bool]) =
   var retFuture = newFuture[bool]("asyncdispatch.`doWithTimeout`")

utils.nim

@@ -1,5 +1,5 @@
 import std/[unicode, uri, strformat, os, strutils, options, json, jsonutils, sugar, net]
-import chronos, chronicles
+import chronos, chronicles, chronos/asyncproc
 import "$nim/compiler/pathutils"
 import json_rpc/private/jrpc_sys
 type
@@ -339,4 +339,15 @@ proc getNimScriptAPITemplatePath*(): string =
 
   if not result.fileExists:
     writeFile(result, NIM_SCRIPT_API_TEMPLATE)
-  debug "NimScriptApiPath", path = result
+  debug "NimScriptApiPath", path = result
+
+proc shutdownChildProcess*(p: AsyncProcessRef): Future[void]  {.async.} =
+  try:
+    let exitCode = await p.terminateAndWaitForExit(2.seconds)    # debug "Process terminated with exit code: ", exitCode
+  except CatchableError:
+    try:
+      let forcedExitCode = await p.killAndWaitForExit(3.seconds)
+      debug "Process forcibly killed with exit code: ", exitCode = forcedExitCode
+    except CatchableError:
+      debug "Could not kill process in time either!"
+      writeStackTrace()