From 28d7170aca8e4e4b3a0b676df30dce77bf0a9fb9 Mon Sep 17 00:00:00 2001
From: Chris Rankin <chris.rankin@r3.com>
Date: Fri, 10 Feb 2017 16:36:20 +0000
Subject: [PATCH] CORPRIV-660: Allow user to launch Web server for each node.

---
 .../net/corda/demobench/model/Explorer.kt     |  6 +-
 .../net/corda/demobench/model/WebServer.kt    | 40 +++++++++++++
 .../demobench/model/WebServerController.kt    | 19 +++++++
 .../corda/demobench/views/NodeTerminalView.kt | 57 +++++++++++++------
 .../demobench/views/NodeTerminalView.fxml     |  1 +
 5 files changed, 104 insertions(+), 19 deletions(-)
 create mode 100644 tools/demobench/src/main/kotlin/net/corda/demobench/model/WebServer.kt
 create mode 100644 tools/demobench/src/main/kotlin/net/corda/demobench/model/WebServerController.kt

diff --git a/tools/demobench/src/main/kotlin/net/corda/demobench/model/Explorer.kt b/tools/demobench/src/main/kotlin/net/corda/demobench/model/Explorer.kt
index 3bef43206d..4323e74d2c 100644
--- a/tools/demobench/src/main/kotlin/net/corda/demobench/model/Explorer.kt
+++ b/tools/demobench/src/main/kotlin/net/corda/demobench/model/Explorer.kt
@@ -12,8 +12,8 @@ class Explorer(val explorerController: ExplorerController) : AutoCloseable {
     fun open(config: NodeConfig, onExit: (NodeConfig) -> Unit) {
         val explorerDir = config.explorerDir.toFile()
 
-        if (!explorerDir.isDirectory() && !explorerDir.mkdirs()) {
-            log.warn("Failed to create working directory '{}'", explorerDir.getAbsolutePath())
+        if (!explorerDir.isDirectory && !explorerDir.mkdirs()) {
+            log.warn("Failed to create working directory '{}'", explorerDir.absolutePath)
             onExit(config)
             return
         }
@@ -30,6 +30,8 @@ class Explorer(val explorerController: ExplorerController) : AutoCloseable {
         )
         process = p
 
+        log.info("Launched Node Explorer for '{}'", config.legalName)
+
         executor.submit {
             val exitValue = p.waitFor()
             process = null
diff --git a/tools/demobench/src/main/kotlin/net/corda/demobench/model/WebServer.kt b/tools/demobench/src/main/kotlin/net/corda/demobench/model/WebServer.kt
new file mode 100644
index 0000000000..977ad666a9
--- /dev/null
+++ b/tools/demobench/src/main/kotlin/net/corda/demobench/model/WebServer.kt
@@ -0,0 +1,40 @@
+package net.corda.demobench.model
+
+import org.slf4j.LoggerFactory
+import java.util.concurrent.Executors
+
+class WebServer(val webServerController: WebServerController) : AutoCloseable {
+    private val log = LoggerFactory.getLogger(WebServer::class.java)
+
+    private val executor = Executors.newSingleThreadExecutor()
+    private var process: Process? = null
+
+    fun open(config: NodeConfig, onExit: (NodeConfig) -> Unit) {
+        val nodeDir = config.nodeDir.toFile()
+
+        if (!nodeDir.isDirectory) {
+            log.warn("Working directory '{}' does not exist.", nodeDir.absolutePath)
+            onExit(config)
+            return
+        }
+
+        val p = webServerController.execute(config.nodeDir)
+        process = p
+
+        log.info("Launched Web Server for '{}'", config.legalName)
+
+        executor.submit {
+            val exitValue = p.waitFor()
+            process = null
+
+            log.info("Web Server for '{}' has exited (value={})", config.legalName, exitValue)
+            onExit(config)
+        }
+    }
+
+    override fun close() {
+        executor.shutdown()
+        process?.destroy()
+    }
+
+}
diff --git a/tools/demobench/src/main/kotlin/net/corda/demobench/model/WebServerController.kt b/tools/demobench/src/main/kotlin/net/corda/demobench/model/WebServerController.kt
new file mode 100644
index 0000000000..dd2118bc36
--- /dev/null
+++ b/tools/demobench/src/main/kotlin/net/corda/demobench/model/WebServerController.kt
@@ -0,0 +1,19 @@
+package net.corda.demobench.model
+
+import tornadofx.Controller
+import java.nio.file.Path
+
+class WebServerController : Controller() {
+
+    private val jvm by inject<JVMConfig>()
+    private val cordaPath = jvm.applicationDir.resolve("corda").resolve("corda.jar")
+
+    init {
+        log.info("Web Server JAR: $cordaPath")
+    }
+
+    internal fun execute(cwd: Path) = jvm.execute(cordaPath, cwd, "--webserver")
+
+    fun webServer() = WebServer(this)
+
+}
\ No newline at end of file
diff --git a/tools/demobench/src/main/kotlin/net/corda/demobench/views/NodeTerminalView.kt b/tools/demobench/src/main/kotlin/net/corda/demobench/views/NodeTerminalView.kt
index b511ccbecf..531a5dbcd8 100644
--- a/tools/demobench/src/main/kotlin/net/corda/demobench/views/NodeTerminalView.kt
+++ b/tools/demobench/src/main/kotlin/net/corda/demobench/views/NodeTerminalView.kt
@@ -23,6 +23,7 @@ class NodeTerminalView : Fragment() {
 
     private val nodeController by inject<NodeController>()
     private val explorerController by inject<ExplorerController>()
+    private val webServerController by inject<WebServerController>()
 
     private val nodeName by fxid<Label>()
     private val p2pPort by fxid<PropertyLabel>()
@@ -31,10 +32,12 @@ class NodeTerminalView : Fragment() {
     private val balance by fxid<PropertyLabel>()
 
     private val viewDatabaseButton by fxid<Button>()
+    private val launchWebButton by fxid<Button>()
     private val launchExplorerButton by fxid<Button>()
 
     private var isClosed: Boolean = false
     private val explorer = explorerController.explorer()
+    private val webServer = webServerController.webServer()
     private val viewer = DBViewer()
     private var rpc: NodeRPC? = null
     private var pty: R3Pty? = null
@@ -62,23 +65,9 @@ class NodeTerminalView : Fragment() {
             swingTerminal.content = r3pty.terminal
             nodeController.runCorda(r3pty, config)
 
-            viewDatabaseButton.setOnAction {
-                viewer.openBrowser(config.h2Port)
-            }
-
-            /*
-             * We only want to run one explorer for each node.
-             * So disable the "launch" button when we have
-             * launched the explorer and only reenable it when
-             * the explorer has exited.
-             */
-            launchExplorerButton.setOnAction {
-                launchExplorerButton.isDisable = true
-
-                explorer.open(config, onExit = {
-                    launchExplorerButton.isDisable = false
-                })
-            }
+            configureDatabaseButton(config)
+            configureExplorerButton(config)
+            configureWebButton(config)
 
             /*
              * Start RPC client that will update node statistics on UI.
@@ -93,6 +82,39 @@ class NodeTerminalView : Fragment() {
 
         launchExplorerButton.isDisable = false
         viewDatabaseButton.isDisable = false
+        launchWebButton.isDisable = false
+    }
+
+    /*
+     * We only want to run one explorer for each node.
+     * So disable the "launch" button when we have
+     * launched the explorer and only reenable it when
+     * the explorer has exited.
+     */
+    fun configureExplorerButton(config: NodeConfig) {
+        launchExplorerButton.setOnAction {
+            launchExplorerButton.isDisable = true
+
+            explorer.open(config, onExit = {
+                launchExplorerButton.isDisable = false
+            })
+        }
+    }
+
+    fun configureDatabaseButton(config: NodeConfig) {
+        viewDatabaseButton.setOnAction {
+            viewer.openBrowser(config.h2Port)
+        }
+    }
+
+    fun configureWebButton(config: NodeConfig) {
+        launchWebButton.setOnAction {
+            launchWebButton.isDisable = true
+
+            webServer.open(config, onExit = {
+                launchWebButton.isDisable = false
+            })
+        }
     }
 
     fun launchRPC(config: NodeConfig) = NodeRPC(config, start = { enable(config) }, invoke = { ops ->
@@ -116,6 +138,7 @@ class NodeTerminalView : Fragment() {
 
     fun close() {
         if (!isClosed) {
+            webServer.close()
             explorer.close()
             viewer.close()
             rpc?.close()
diff --git a/tools/demobench/src/main/resources/net/corda/demobench/views/NodeTerminalView.fxml b/tools/demobench/src/main/resources/net/corda/demobench/views/NodeTerminalView.fxml
index 9333f7c85f..7eef196a7d 100644
--- a/tools/demobench/src/main/resources/net/corda/demobench/views/NodeTerminalView.fxml
+++ b/tools/demobench/src/main/resources/net/corda/demobench/views/NodeTerminalView.fxml
@@ -26,6 +26,7 @@
                 </VBox>
                 <Pane prefHeight="200.0" prefWidth="200.0" HBox.hgrow="ALWAYS" />
                 <Button fx:id="viewDatabaseButton" disable="true" mnemonicParsing="false" prefHeight="92.0" prefWidth="115.0" styleClass="big-button" text="View&#10;Database" textAlignment="CENTER" />
+                <Button fx:id="launchWebButton" disable="true" mnemonicParsing="false" prefHeight="92.0" prefWidth="115.0" styleClass="big-button" text="Launch&#10;Web Server" textAlignment="CENTER" />
                 <Button fx:id="launchExplorerButton" disable="true" mnemonicParsing="false" prefHeight="92.0" prefWidth="115.0" styleClass="big-button" text="Launch&#10;Explorer" textAlignment="CENTER" />
             </children>
         </HBox>