Make tincctl calls properly async

3 files changed, 38 insertions, 20 deletions

diff --git a/app/src/main/java/org/pacien/tincapp/commands/Executor.kt b/app/src/main/java/org/pacien/tincapp/commands/Executor.kt
index c93de64..eccd2f9 100644
--- a/app/src/main/java/org/pacien/tincapp/commands/Executor.kt
+++ b/app/src/main/java/org/pacien/tincapp/commands/Executor.kt
@@ -1,7 +1,9 @@
 package org.pacien.tincapp.commands
 
+import java8.util.concurrent.CompletableFuture
 import java.io.BufferedReader
 import java.io.IOException
+import java.io.InputStream
 import java.io.InputStreamReader
 
 /**
@@ -9,6 +11,8 @@ import java.io.InputStreamReader
  */
 internal object Executor {
 
+    class CommandExecutionException(msg: String) : Exception(msg)
+
     init {
         System.loadLibrary("exec")
     }
@@ -18,17 +22,23 @@ internal object Executor {
      */
     private external fun forkExec(argcv: Array<String>): Int
 
-    @Throws(IOException::class)
+    private fun read(stream: InputStream) = BufferedReader(InputStreamReader(stream)).readLines()
+
     fun forkExec(cmd: Command) {
-        if (forkExec(cmd.asArray()) == -1)
-            throw IOException()
+        if (forkExec(cmd.asArray()) == -1) throw CommandExecutionException("Could not fork child process.")
     }
 
-    @Throws(IOException::class)
-    fun call(cmd: Command): List<String> {
-        val proc = ProcessBuilder(cmd.asList()).start()
-        val outputReader = BufferedReader(InputStreamReader(proc.inputStream))
-        return outputReader.readLines()
+    fun call(cmd: Command): CompletableFuture<List<String>> {
+        val proc = try {
+            ProcessBuilder(cmd.asList()).start()
+        } catch (e: IOException) {
+            throw CommandExecutionException(e.message ?: "Could not start process.")
+        }
+
+        return CompletableFuture.supplyAsync<List<String>> {
+            if (proc.waitFor() == 0) read(proc.inputStream)
+            else throw CommandExecutionException(read(proc.errorStream).lastOrNull() ?: "Non-zero exit status.")
+        }
     }
 
 }
diff --git a/app/src/main/java/org/pacien/tincapp/commands/Tinc.kt b/app/src/main/java/org/pacien/tincapp/commands/Tinc.kt
index 9b57233..120525d 100644
--- a/app/src/main/java/org/pacien/tincapp/commands/Tinc.kt
+++ b/app/src/main/java/org/pacien/tincapp/commands/Tinc.kt
@@ -1,7 +1,7 @@
 package org.pacien.tincapp.commands
 
+import java8.util.concurrent.CompletableFuture
 import org.pacien.tincapp.context.AppPaths
-import java.io.IOException
 
 /**
  * @author pacien
@@ -13,19 +13,29 @@ object Tinc {
                     .withOption("config", AppPaths.confDir(netName).absolutePath)
                     .withOption("pidfile", AppPaths.pidFile(netName).absolutePath)
 
-    @Throws(IOException::class)
-    fun stop(netName: String) {
-        Executor.call(newCommand(netName).withArguments("stop"))
-    }
+    fun stop(netName: String): CompletableFuture<Unit> =
+            Executor.call(newCommand(netName).withArguments("stop"))
+                    .thenApply { }
 
-    @Throws(IOException::class)
-    fun dumpNodes(netName: String, reachable: Boolean = false): List<String> =
+    fun dumpNodes(netName: String, reachable: Boolean = false): CompletableFuture<List<String>> =
             Executor.call(
                     if (reachable) newCommand(netName).withArguments("dump", "reachable", "nodes")
                     else newCommand(netName).withArguments("dump", "nodes"))
 
-    @Throws(IOException::class)
-    fun info(netName: String, node: String): String =
-            Executor.call(newCommand(netName).withArguments("info", node)).joinToString("\n")
+    fun info(netName: String, node: String): CompletableFuture<String> =
+            Executor.call(newCommand(netName).withArguments("info", node))
+                    .thenApply<String> { it.joinToString("\n") }
+
+    fun init(netName: String): CompletableFuture<String> =
+            Executor.call(Command(AppPaths.tinc().absolutePath)
+                    .withOption("config", AppPaths.confDir(netName).absolutePath)
+                    .withArguments("init", netName))
+                    .thenApply<String> { it.joinToString("\n") }
+
+    fun join(netName: String, invitationUrl: String): CompletableFuture<String> =
+            Executor.call(Command(AppPaths.tinc().absolutePath)
+                    .withOption("config", AppPaths.confDir(netName).absolutePath)
+                    .withArguments("join", invitationUrl))
+                    .thenApply<String> { it.joinToString("\n") }
 
 }
diff --git a/app/src/main/java/org/pacien/tincapp/commands/Tincd.kt b/app/src/main/java/org/pacien/tincapp/commands/Tincd.kt
index 19ebfbd..db113cc 100644
--- a/app/src/main/java/org/pacien/tincapp/commands/Tincd.kt
+++ b/app/src/main/java/org/pacien/tincapp/commands/Tincd.kt
@@ -1,14 +1,12 @@
 package org.pacien.tincapp.commands
 
 import org.pacien.tincapp.context.AppPaths
-import java.io.IOException
 
 /**
  * @author pacien
  */
 object Tincd {
 
-    @Throws(IOException::class)
     fun start(netName: String, fd: Int) {
         Executor.forkExec(Command(AppPaths.tincd().absolutePath)
                 .withOption("no-detach")