mirror of
https://github.com/ethauvin/kobalt.git
synced 2025-04-27 08:38:13 -07:00
Jersey server.
This commit is contained in:
Cedric Beust
parent
4424db7e0c
commit
f79d9f9497
9 changed files with 254 additions and 193 deletions
74
src/main/kotlin/com/beust/kobalt/app/remote/JerseyServer.kt
Normal file
74
src/main/kotlin/com/beust/kobalt/app/remote/JerseyServer.kt
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
package com.beust.kobalt.app.remote
|
||||
|
||||
import com.beust.kobalt.Args
|
||||
import com.beust.kobalt.api.Kobalt
|
||||
import com.beust.kobalt.api.Project
|
||||
import com.google.gson.Gson
|
||||
import org.glassfish.jersey.jetty.JettyHttpContainerFactory
|
||||
import org.glassfish.jersey.server.ResourceConfig
|
||||
import org.glassfish.jersey.server.ServerProperties
|
||||
import javax.ws.rs.GET
|
||||
import javax.ws.rs.Path
|
||||
import javax.ws.rs.Produces
|
||||
import javax.ws.rs.QueryParam
|
||||
import javax.ws.rs.core.MediaType
|
||||
import javax.ws.rs.core.UriBuilder
|
||||
|
||||
class JerseyServer(val initCallback: (String) -> List<Project>, val cleanUpCallback: () -> Unit)
|
||||
: KobaltServer .IServer {
|
||||
|
||||
companion object {
|
||||
lateinit var initCallback: (String) -> List<Project>
|
||||
lateinit var cleanUpCallback: () -> Unit
|
||||
}
|
||||
|
||||
init {
|
||||
JerseyServer.initCallback = initCallback
|
||||
JerseyServer.cleanUpCallback = cleanUpCallback
|
||||
}
|
||||
|
||||
override fun run(port: Int) {
|
||||
val baseUri = UriBuilder.fromUri("http://localhost/").port(port).build()
|
||||
val config = ResourceConfig(KobaltResource::class.java)
|
||||
with (JettyHttpContainerFactory.createServer(baseUri, config)) {
|
||||
try {
|
||||
start()
|
||||
join()
|
||||
} finally {
|
||||
destroy()
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@Path("/v0")
|
||||
class KobaltResource : ResourceConfig() {
|
||||
init {
|
||||
property(ServerProperties.TRACING, "ALL")
|
||||
}
|
||||
|
||||
@GET
|
||||
@Path("ping")
|
||||
@Produces(MediaType.TEXT_PLAIN)
|
||||
fun getDependencies() = "pong"
|
||||
|
||||
@GET
|
||||
@Path("getDependencies")
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
fun getDependencies(@QueryParam("buildFile") buildFile: String) : String {
|
||||
try {
|
||||
val dependencyData = Kobalt.INJECTOR.getInstance(DependencyData::class.java)
|
||||
val args = Kobalt.INJECTOR.getInstance(Args::class.java)
|
||||
|
||||
val projects = JerseyServer.initCallback(buildFile)
|
||||
val dd = dependencyData.dependenciesDataFor(buildFile, args)
|
||||
val result = Gson().toJson(dd)
|
||||
return result
|
||||
} catch(ex: Exception) {
|
||||
return "Error: " + ex.message
|
||||
} finally {
|
||||
JerseyServer.cleanUpCallback()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,32 +1,14 @@
|
|||
package com.beust.kobalt.app.remote
|
||||
|
||||
import com.beust.kobalt.Args
|
||||
import com.beust.kobalt.api.Kobalt
|
||||
import com.beust.kobalt.api.Project
|
||||
import com.beust.kobalt.homeDir
|
||||
import com.beust.kobalt.internal.remote.CommandData
|
||||
import com.beust.kobalt.internal.remote.ICommandSender
|
||||
import com.beust.kobalt.internal.remote.PingCommand
|
||||
import com.beust.kobalt.misc.KFiles
|
||||
import com.beust.kobalt.misc.log
|
||||
import com.google.gson.Gson
|
||||
import com.google.gson.JsonObject
|
||||
import com.google.gson.JsonParser
|
||||
import org.glassfish.jersey.jetty.JettyHttpContainerFactory
|
||||
import org.glassfish.jersey.server.ResourceConfig
|
||||
import org.glassfish.jersey.server.ServerProperties
|
||||
import java.io.*
|
||||
import java.io.File
|
||||
import java.io.FileWriter
|
||||
import java.lang.management.ManagementFactory
|
||||
import java.net.ServerSocket
|
||||
import java.net.SocketException
|
||||
import java.util.*
|
||||
import java.util.concurrent.Callable
|
||||
import javax.ws.rs.GET
|
||||
import javax.ws.rs.Path
|
||||
import javax.ws.rs.Produces
|
||||
import javax.ws.rs.QueryParam
|
||||
import javax.ws.rs.core.MediaType
|
||||
import javax.ws.rs.core.UriBuilder
|
||||
|
||||
/**
|
||||
* Launch a Kobalt server. If @param{force} is specified, a new server will be launched even if one was detected
|
||||
|
|
@ -35,40 +17,29 @@ import javax.ws.rs.core.UriBuilder
|
|||
* The callbacks are used to initialize and clean up the state before and after each command, so that Kobalt's state
|
||||
* can be properly reset, making the server reentrant.
|
||||
*/
|
||||
class KobaltServer(val force: Boolean, val port: Int = 1234,
|
||||
class KobaltServer(val force: Boolean, val givenPort: Int? = null,
|
||||
val initCallback: (String) -> List<Project>,
|
||||
val cleanUpCallback: () -> Unit) : Callable<Int>, ICommandSender {
|
||||
val cleanUpCallback: () -> Unit) : Callable<Int> {
|
||||
// var outgoing: PrintWriter? = null
|
||||
val pending = arrayListOf<CommandData>()
|
||||
|
||||
companion object {
|
||||
lateinit var initCallback: (String) -> List<Project>
|
||||
lateinit var cleanUpCallback: () -> Unit
|
||||
interface IServer {
|
||||
fun run(port: Int)
|
||||
}
|
||||
|
||||
init {
|
||||
KobaltServer.initCallback = initCallback
|
||||
KobaltServer.cleanUpCallback = cleanUpCallback
|
||||
}
|
||||
|
||||
private val COMMAND_CLASSES = listOf(GetDependenciesCommand::class.java, PingCommand::class.java)
|
||||
private val COMMANDS = COMMAND_CLASSES.map {
|
||||
Kobalt.INJECTOR.getInstance(it).let { Pair(it.name, it) }
|
||||
}.toMap()
|
||||
|
||||
override fun call() : Int {
|
||||
val availablePort = ProcessUtil.findAvailablePort(port)
|
||||
val port = givenPort ?: ProcessUtil.findAvailablePort(1234)
|
||||
try {
|
||||
if (createServerFile(port, force)) {
|
||||
// oldRun(port)
|
||||
privateRun(port)
|
||||
// OldServer(initCallback, cleanUpCallback).run(port)
|
||||
JerseyServer(initCallback, cleanUpCallback).run(port)
|
||||
// WasabiServer(initCallback, cleanUpCallback).run(port)
|
||||
}
|
||||
} catch(ex: Exception) {
|
||||
ex.printStackTrace()
|
||||
} finally {
|
||||
deleteServerFile()
|
||||
}
|
||||
return availablePort
|
||||
return port
|
||||
}
|
||||
|
||||
val SERVER_FILE = KFiles.joinDir(homeDir(KFiles.KOBALT_DOT_DIR, "kobaltServer.properties"))
|
||||
|
|
@ -95,144 +66,5 @@ class KobaltServer(val force: Boolean, val port: Int = 1234,
|
|||
log(1, "KobaltServer deleting $SERVER_FILE")
|
||||
File(SERVER_FILE).delete()
|
||||
}
|
||||
|
||||
lateinit var serverInfo: ServerInfo
|
||||
|
||||
class ServerInfo(val port: Int) {
|
||||
lateinit var reader: BufferedReader
|
||||
lateinit var writer: PrintWriter
|
||||
var serverSocket : ServerSocket? = null
|
||||
|
||||
init {
|
||||
reset()
|
||||
}
|
||||
|
||||
fun reset() {
|
||||
if (serverSocket != null) {
|
||||
serverSocket!!.close()
|
||||
}
|
||||
serverSocket = ServerSocket(port)
|
||||
var clientSocket = serverSocket!!.accept()
|
||||
reader = BufferedReader(InputStreamReader(clientSocket.inputStream))
|
||||
writer = PrintWriter(clientSocket.outputStream, true)
|
||||
}
|
||||
}
|
||||
|
||||
@Path("/v0")
|
||||
class MyResource : ResourceConfig() {
|
||||
init {
|
||||
property(ServerProperties.TRACING, "ALL")
|
||||
}
|
||||
|
||||
@GET
|
||||
@Path("ping")
|
||||
@Produces(MediaType.TEXT_PLAIN)
|
||||
fun getDependencies() = "pong"
|
||||
|
||||
@GET
|
||||
@Path("getDependencies")
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
fun getDependencies(@QueryParam("buildFile") buildFile: String) : String {
|
||||
try {
|
||||
val dependencyData = Kobalt.INJECTOR.getInstance(DependencyData::class.java)
|
||||
val args = Kobalt.INJECTOR.getInstance(Args::class.java)
|
||||
|
||||
val projects = initCallback(buildFile)
|
||||
val dd = dependencyData.dependenciesDataFor(buildFile, args)
|
||||
val result = Gson().toJson(dd)
|
||||
return result
|
||||
} catch(ex: Exception) {
|
||||
return "Error: " + ex.message
|
||||
} finally {
|
||||
cleanUpCallback()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun privateRun(port: Int) {
|
||||
log(1, "Listening to port $port")
|
||||
|
||||
val baseUri = UriBuilder.fromUri("http://localhost/").port(port).build()
|
||||
val config = ResourceConfig(MyResource::class.java)
|
||||
with (JettyHttpContainerFactory.createServer(baseUri, config)) {
|
||||
try {
|
||||
start()
|
||||
join()
|
||||
} finally {
|
||||
destroy()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun oldRun(port: Int) {
|
||||
log(1, "Listening to port $port")
|
||||
var quit = false
|
||||
serverInfo = ServerInfo(port)
|
||||
while (!quit) {
|
||||
if (pending.size > 0) {
|
||||
log(1, "Emptying the queue, size $pending.size()")
|
||||
synchronized(pending) {
|
||||
pending.forEach { sendData(it) }
|
||||
pending.clear()
|
||||
}
|
||||
}
|
||||
var commandName: String? = null
|
||||
try {
|
||||
var line = serverInfo.reader.readLine()
|
||||
while (!quit && line != null) {
|
||||
log(1, "Received from client $line")
|
||||
val jo = JsonParser().parse(line) as JsonObject
|
||||
commandName = jo.get("name").asString
|
||||
if ("quit" == commandName) {
|
||||
log(1, "Quitting")
|
||||
quit = true
|
||||
} else {
|
||||
runCommand(jo, initCallback)
|
||||
|
||||
// Done, send a quit to the client
|
||||
sendData(CommandData("quit", ""))
|
||||
|
||||
// Clean up all the plug-in actors
|
||||
cleanUpCallback()
|
||||
line = serverInfo.reader.readLine()
|
||||
}
|
||||
}
|
||||
if (line == null) {
|
||||
log(1, "Received null line, resetting the server")
|
||||
serverInfo.reset()
|
||||
}
|
||||
} catch(ex: SocketException) {
|
||||
log(1, "Client disconnected, resetting")
|
||||
serverInfo.reset()
|
||||
} catch(ex: Throwable) {
|
||||
ex.printStackTrace()
|
||||
if (commandName != null) {
|
||||
sendData(CommandData(commandName, null, ex.message))
|
||||
}
|
||||
log(1, "Command failed: ${ex.message}")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun runCommand(jo: JsonObject, initCallback: (String) -> List<Project>) {
|
||||
val command = jo.get("name").asString
|
||||
if (command != null) {
|
||||
(COMMANDS[command] ?: COMMANDS["ping"])!!.run(this, jo, initCallback)
|
||||
} else {
|
||||
error("Did not find a name in command: $jo")
|
||||
}
|
||||
}
|
||||
|
||||
override fun sendData(commandData: CommandData) {
|
||||
val content = Gson().toJson(commandData)
|
||||
if (serverInfo.writer != null) {
|
||||
serverInfo.writer!!.println(content)
|
||||
} else {
|
||||
log(1, "Queuing $content")
|
||||
synchronized(pending) {
|
||||
pending.add(commandData)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
120
src/main/kotlin/com/beust/kobalt/app/remote/OldServer.kt
Normal file
120
src/main/kotlin/com/beust/kobalt/app/remote/OldServer.kt
Normal file
|
|
@ -0,0 +1,120 @@
|
|||
package com.beust.kobalt.app.remote
|
||||
|
||||
import com.beust.kobalt.api.Kobalt
|
||||
import com.beust.kobalt.api.Project
|
||||
import com.beust.kobalt.internal.remote.CommandData
|
||||
import com.beust.kobalt.internal.remote.ICommandSender
|
||||
import com.beust.kobalt.internal.remote.PingCommand
|
||||
import com.beust.kobalt.misc.log
|
||||
import com.google.gson.Gson
|
||||
import com.google.gson.JsonObject
|
||||
import com.google.gson.JsonParser
|
||||
import java.io.BufferedReader
|
||||
import java.io.InputStreamReader
|
||||
import java.io.PrintWriter
|
||||
import java.net.ServerSocket
|
||||
import java.net.SocketException
|
||||
|
||||
class OldServer(val initCallback: (String) -> List<Project>, val cleanUpCallback: () -> Unit)
|
||||
: KobaltServer.IServer, ICommandSender {
|
||||
val pending = arrayListOf<CommandData>()
|
||||
|
||||
override fun run(port: Int) {
|
||||
log(1, "Listening to port $port")
|
||||
var quit = false
|
||||
serverInfo = ServerInfo(port)
|
||||
while (!quit) {
|
||||
if (pending.size > 0) {
|
||||
log(1, "Emptying the queue, size $pending.size()")
|
||||
synchronized(pending) {
|
||||
pending.forEach { sendData(it) }
|
||||
pending.clear()
|
||||
}
|
||||
}
|
||||
var commandName: String? = null
|
||||
try {
|
||||
var line = serverInfo.reader.readLine()
|
||||
while (!quit && line != null) {
|
||||
log(1, "Received from client $line")
|
||||
val jo = JsonParser().parse(line) as JsonObject
|
||||
commandName = jo.get("name").asString
|
||||
if ("quit" == commandName) {
|
||||
log(1, "Quitting")
|
||||
quit = true
|
||||
} else {
|
||||
runCommand(jo, initCallback)
|
||||
|
||||
// Done, send a quit to the client
|
||||
sendData(CommandData("quit", ""))
|
||||
|
||||
// Clean up all the plug-in actors
|
||||
cleanUpCallback()
|
||||
line = serverInfo.reader.readLine()
|
||||
}
|
||||
}
|
||||
if (line == null) {
|
||||
log(1, "Received null line, resetting the server")
|
||||
serverInfo.reset()
|
||||
}
|
||||
} catch(ex: SocketException) {
|
||||
log(1, "Client disconnected, resetting")
|
||||
serverInfo.reset()
|
||||
} catch(ex: Throwable) {
|
||||
ex.printStackTrace()
|
||||
if (commandName != null) {
|
||||
sendData(CommandData(commandName, null, ex.message))
|
||||
}
|
||||
log(1, "Command failed: ${ex.message}")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private val COMMAND_CLASSES = listOf(GetDependenciesCommand::class.java, PingCommand::class.java)
|
||||
private val COMMANDS = COMMAND_CLASSES.map {
|
||||
Kobalt.INJECTOR.getInstance(it).let { Pair(it.name, it) }
|
||||
}.toMap()
|
||||
|
||||
private fun runCommand(jo: JsonObject, initCallback: (String) -> List<Project>) {
|
||||
val command = jo.get("name").asString
|
||||
if (command != null) {
|
||||
(COMMANDS[command] ?: COMMANDS["ping"])!!.run(this, jo, initCallback)
|
||||
} else {
|
||||
error("Did not find a name in command: $jo")
|
||||
}
|
||||
}
|
||||
|
||||
lateinit var serverInfo: ServerInfo
|
||||
|
||||
class ServerInfo(val port: Int) {
|
||||
lateinit var reader: BufferedReader
|
||||
lateinit var writer: PrintWriter
|
||||
var serverSocket : ServerSocket? = null
|
||||
|
||||
init {
|
||||
reset()
|
||||
}
|
||||
|
||||
fun reset() {
|
||||
if (serverSocket != null) {
|
||||
serverSocket!!.close()
|
||||
}
|
||||
serverSocket = ServerSocket(port)
|
||||
var clientSocket = serverSocket!!.accept()
|
||||
reader = BufferedReader(InputStreamReader(clientSocket.inputStream))
|
||||
writer = PrintWriter(clientSocket.outputStream, true)
|
||||
}
|
||||
}
|
||||
|
||||
override fun sendData(commandData: CommandData) {
|
||||
val content = Gson().toJson(commandData)
|
||||
if (serverInfo.writer != null) {
|
||||
serverInfo.writer!!.println(content)
|
||||
} else {
|
||||
log(1, "Queuing $content")
|
||||
synchronized(pending) {
|
||||
pending.add(commandData)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
37
src/main/kotlin/com/beust/kobalt/app/remote/WasabiServer.kt
Normal file
37
src/main/kotlin/com/beust/kobalt/app/remote/WasabiServer.kt
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
//package com.beust.kobalt.app.remote
|
||||
//
|
||||
//import com.beust.kobalt.Args
|
||||
//import com.beust.kobalt.api.Project
|
||||
//
|
||||
//class WasabiServer(val initCallback: (String) -> List<Project>, val cleanUpCallback: () -> Unit)
|
||||
// : KobaltServer.IServer {
|
||||
// override fun run(port: Int) {
|
||||
// with(AppServer(AppConfiguration(port))) {
|
||||
// get("/", { response.send("Hello World!") })
|
||||
// get("/v0/getDependencies",
|
||||
// {
|
||||
// val buildFile = request.queryParams["buildFile"]
|
||||
// if (buildFile != null) {
|
||||
//
|
||||
// val projects = initCallback(buildFile)
|
||||
// val result = try {
|
||||
// val dependencyData = Kobalt.INJECTOR.getInstance(DependencyData::class.java)
|
||||
// val args = Kobalt.INJECTOR.getInstance(Args::class.java)
|
||||
//
|
||||
// val dd = dependencyData.dependenciesDataFor(buildFile, args)
|
||||
// Gson().toJson(dd)
|
||||
// } catch(ex: Exception) {
|
||||
// "Error: " + ex.message
|
||||
// } finally {
|
||||
// cleanUpCallback()
|
||||
// }
|
||||
//
|
||||
// response.send(result)
|
||||
// }
|
||||
// }
|
||||
// )
|
||||
// start()
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
//
|
||||
Loading…
Add table
Add a link
Reference in a new issue