From 95c1cdec5b0e65a0f617d5fa88d1d49a7abcfe95 Mon Sep 17 00:00:00 2001 From: Robert Jaros Date: Thu, 26 Apr 2018 15:41:32 +0200 Subject: Automatic JSON-RPC conectivity. CallAgent component for remote JSON-RPC and AJAX. --- .../kotlin/pl/treksoft/kvision/remote/JsonRpc.kt | 37 ++++++++++++++ .../pl/treksoft/kvision/remote/ServiceManager.kt | 58 ++++++++++++++++++---- 2 files changed, 86 insertions(+), 9 deletions(-) create mode 100644 kvision-common/src/main/kotlin/pl/treksoft/kvision/remote/JsonRpc.kt (limited to 'kvision-common/src/main/kotlin/pl/treksoft') diff --git a/kvision-common/src/main/kotlin/pl/treksoft/kvision/remote/JsonRpc.kt b/kvision-common/src/main/kotlin/pl/treksoft/kvision/remote/JsonRpc.kt new file mode 100644 index 00000000..7953ea01 --- /dev/null +++ b/kvision-common/src/main/kotlin/pl/treksoft/kvision/remote/JsonRpc.kt @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2017-present Robert Jaros + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package pl.treksoft.kvision.remote + +import kotlinx.serialization.Serializable + +@Serializable +data class JsonRpcRequest(val id: Int, val method: String, val params: List, val jsonrpc: String = "2.0") { + constructor() : this(0, "", listOf()) +} + +@Serializable +data class JsonRpcResponse( + val id: Int? = null, + val result: String? = null, + val error: String? = null, + val jsonrpc: String = "2.0" +) diff --git a/kvision-common/src/main/kotlin/pl/treksoft/kvision/remote/ServiceManager.kt b/kvision-common/src/main/kotlin/pl/treksoft/kvision/remote/ServiceManager.kt index 4a6be56b..b3db5d0e 100644 --- a/kvision-common/src/main/kotlin/pl/treksoft/kvision/remote/ServiceManager.kt +++ b/kvision-common/src/main/kotlin/pl/treksoft/kvision/remote/ServiceManager.kt @@ -23,7 +23,20 @@ package pl.treksoft.kvision.remote import kotlinx.coroutines.experimental.Deferred -const val SERVICE_PREFIX = "/kv_service" +enum class RpcHttpMethod { + POST, + PUT, + DELETE, + OPTIONS +} + +enum class HttpMethod { + GET, + POST, + PUT, + DELETE, + OPTIONS +} /** * Multiplatform service manager. @@ -33,57 +46,84 @@ expect open class ServiceManager(service: T? = null) { * Binds a given route with a function of the receiver. * @param route a route * @param function a function of the receiver + * @param method a HTTP method + * @param prefix an URL address prefix */ - protected inline fun bind(route: String, noinline function: T.(Request?) -> Deferred) + protected inline fun bind( + route: String, + noinline function: T.(Request?) -> Deferred, + method: RpcHttpMethod = RpcHttpMethod.POST, + prefix: String = "/" + ) /** * Binds a given route with a function of the receiver. * @param route a route * @param function a function of the receiver + * @param method a HTTP method + * @param prefix an URL address prefix */ protected inline fun bind( route: String, - noinline function: T.(PAR, Request?) -> Deferred + noinline function: T.(PAR, Request?) -> Deferred, + method: RpcHttpMethod = RpcHttpMethod.POST, + prefix: String = "/" ) /** * Binds a given route with a function of the receiver. * @param route a route * @param function a function of the receiver + * @param method a HTTP method + * @param prefix an URL address prefix */ protected inline fun bind( route: String, - noinline function: T.(PAR1, PAR2, Request?) -> Deferred + noinline function: T.(PAR1, PAR2, Request?) -> Deferred, + method: RpcHttpMethod = RpcHttpMethod.POST, + prefix: String = "/" ) /** * Binds a given route with a function of the receiver. * @param route a route * @param function a function of the receiver + * @param method a HTTP method + * @param prefix an URL address prefix */ protected inline fun bind( route: String, - noinline function: T.(PAR1, PAR2, PAR3, Request?) -> Deferred + noinline function: T.(PAR1, PAR2, PAR3, Request?) -> Deferred, + method: RpcHttpMethod = RpcHttpMethod.POST, + prefix: String = "/" ) /** * Binds a given route with a function of the receiver. * @param route a route * @param function a function of the receiver + * @param method a HTTP method + * @param prefix an URL address prefix */ protected inline fun bind( route: String, - noinline function: T.(PAR1, PAR2, PAR3, PAR4, Request?) -> Deferred + noinline function: T.(PAR1, PAR2, PAR3, PAR4, Request?) -> Deferred, + method: RpcHttpMethod = RpcHttpMethod.POST, + prefix: String = "/" ) /** * Binds a given route with a function of the receiver. * @param route a route * @param function a function of the receiver + * @param method a HTTP method + * @param prefix an URL address prefix */ protected inline fun bind( route: String, - noinline function: T.(PAR1, PAR2, PAR3, PAR4, PAR5, Request?) -> Deferred + noinline function: T.(PAR1, PAR2, PAR3, PAR4, PAR5, Request?) -> Deferred, + method: RpcHttpMethod = RpcHttpMethod.POST, + prefix: String = "/" ) /** @@ -93,7 +133,7 @@ expect open class ServiceManager(service: T? = null) { fun applyRoutes(k: JoobyServer) /** - * Returns the list of defined bindings. + * Returns the map of defined paths. */ - fun getCalls(): Map + fun getCalls(): Map> } -- cgit