mirror of
https://github.com/InsanusMokrassar/MicroUtils.git
synced 2024-11-26 20:18:48 +00:00
commit
58cded28d3
13
CHANGELOG.md
13
CHANGELOG.md
@ -1,5 +1,18 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 0.16.6
|
||||||
|
|
||||||
|
* `Startup`:
|
||||||
|
* `Launcher`:
|
||||||
|
* Improvements in `StartLauncherPlugin#start` methods
|
||||||
|
* Add opportunity to pass second argument on `JVM` platform as log level
|
||||||
|
* `Repos`:
|
||||||
|
* `Ktor`:
|
||||||
|
* `Client`:
|
||||||
|
* All clients repos got opportunity to customize their flows
|
||||||
|
* `Exposed`:
|
||||||
|
* Extensions `eqOrIsNull` and `neqOrIsNotNull` for `Column`
|
||||||
|
|
||||||
## 0.16.5
|
## 0.16.5
|
||||||
|
|
||||||
* `Versions`:
|
* `Versions`:
|
||||||
|
@ -14,5 +14,5 @@ crypto_js_version=4.1.1
|
|||||||
# Project data
|
# Project data
|
||||||
|
|
||||||
group=dev.inmo
|
group=dev.inmo
|
||||||
version=0.16.5
|
version=0.16.6
|
||||||
android_code_version=173
|
android_code_version=174
|
||||||
|
@ -19,7 +19,7 @@ import kotlinx.coroutines.isActive
|
|||||||
* connection. Must return true in case if must be reconnected. By default always reconnecting
|
* connection. Must return true in case if must be reconnected. By default always reconnecting
|
||||||
*/
|
*/
|
||||||
@Warning("This feature is internal and should not be used directly. It is can be changed without any notification and warranty on compile-time or other guaranties")
|
@Warning("This feature is internal and should not be used directly. It is can be changed without any notification and warranty on compile-time or other guaranties")
|
||||||
inline fun <reified T : Any> openBaseWebSocketFlow(
|
inline fun <T : Any> openBaseWebSocketFlow(
|
||||||
noinline checkReconnection: suspend (Throwable?) -> Boolean = { true },
|
noinline checkReconnection: suspend (Throwable?) -> Boolean = { true },
|
||||||
noinline webSocketSessionRequest: suspend SendChannel<T>.() -> Unit
|
noinline webSocketSessionRequest: suspend SendChannel<T>.() -> Unit
|
||||||
): Flow<T> {
|
): Flow<T> {
|
||||||
@ -57,7 +57,7 @@ inline fun <reified T : Any> HttpClient.openWebSocketFlow(
|
|||||||
): Flow<T> {
|
): Flow<T> {
|
||||||
pluginOrNull(WebSockets) ?: error("Plugin $WebSockets must be installed for using createStandardWebsocketFlow")
|
pluginOrNull(WebSockets) ?: error("Plugin $WebSockets must be installed for using createStandardWebsocketFlow")
|
||||||
|
|
||||||
return openBaseWebSocketFlow<T>(checkReconnection) {
|
return openBaseWebSocketFlow(checkReconnection) {
|
||||||
val block: suspend DefaultClientWebSocketSession.() -> Unit = {
|
val block: suspend DefaultClientWebSocketSession.() -> Unit = {
|
||||||
while (isActive) {
|
while (isActive) {
|
||||||
send(receiveDeserialized<T>())
|
send(receiveDeserialized<T>())
|
||||||
|
@ -0,0 +1,23 @@
|
|||||||
|
package dev.inmo.micro_utils.repos.exposed
|
||||||
|
|
||||||
|
import org.jetbrains.exposed.sql.Column
|
||||||
|
import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
|
||||||
|
import org.jetbrains.exposed.sql.SqlExpressionBuilder.isNotNull
|
||||||
|
import org.jetbrains.exposed.sql.SqlExpressionBuilder.isNull
|
||||||
|
import org.jetbrains.exposed.sql.SqlExpressionBuilder.neq
|
||||||
|
|
||||||
|
fun <T> Column<T?>.eqOrIsNull(
|
||||||
|
value: T?
|
||||||
|
) = if (value == null) {
|
||||||
|
isNull()
|
||||||
|
} else {
|
||||||
|
eq(value)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun <T> Column<T?>.neqOrIsNotNull(
|
||||||
|
value: T?
|
||||||
|
) = if (value == null) {
|
||||||
|
isNotNull()
|
||||||
|
} else {
|
||||||
|
neq(value)
|
||||||
|
}
|
@ -1,12 +1,17 @@
|
|||||||
package dev.inmo.micro_utils.repos.ktor.client.crud
|
package dev.inmo.micro_utils.repos.ktor.client.crud
|
||||||
|
|
||||||
|
import dev.inmo.micro_utils.ktor.client.createStandardWebsocketFlow
|
||||||
import dev.inmo.micro_utils.ktor.common.*
|
import dev.inmo.micro_utils.ktor.common.*
|
||||||
import dev.inmo.micro_utils.pagination.PaginationResult
|
import dev.inmo.micro_utils.pagination.PaginationResult
|
||||||
import dev.inmo.micro_utils.repos.*
|
import dev.inmo.micro_utils.repos.*
|
||||||
|
import dev.inmo.micro_utils.repos.ktor.common.crud.deletedObjectsIdsFlowRouting
|
||||||
|
import dev.inmo.micro_utils.repos.ktor.common.crud.newObjectsFlowRouting
|
||||||
|
import dev.inmo.micro_utils.repos.ktor.common.crud.updatedObjectsFlowRouting
|
||||||
import io.ktor.client.HttpClient
|
import io.ktor.client.HttpClient
|
||||||
import io.ktor.http.ContentType
|
import io.ktor.http.ContentType
|
||||||
import io.ktor.util.reflect.TypeInfo
|
import io.ktor.util.reflect.TypeInfo
|
||||||
import io.ktor.util.reflect.typeInfo
|
import io.ktor.util.reflect.typeInfo
|
||||||
|
import kotlinx.coroutines.flow.Flow
|
||||||
import kotlinx.serialization.*
|
import kotlinx.serialization.*
|
||||||
|
|
||||||
class KtorCRUDRepoClient<ObjectType, IdType, InputValue> (
|
class KtorCRUDRepoClient<ObjectType, IdType, InputValue> (
|
||||||
@ -21,6 +26,15 @@ class KtorCRUDRepoClient<ObjectType, IdType, InputValue> (
|
|||||||
baseUrl: String,
|
baseUrl: String,
|
||||||
httpClient: HttpClient,
|
httpClient: HttpClient,
|
||||||
contentType: ContentType,
|
contentType: ContentType,
|
||||||
|
newObjectsFlow: Flow<ObjectType> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, newObjectsFlowRouting),
|
||||||
|
),
|
||||||
|
updatedObjectsFlow: Flow<ObjectType> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, updatedObjectsFlowRouting),
|
||||||
|
),
|
||||||
|
deletedObjectsIdsFlow: Flow<IdType> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, deletedObjectsIdsFlowRouting),
|
||||||
|
),
|
||||||
noinline idSerializer: suspend (IdType) -> String
|
noinline idSerializer: suspend (IdType) -> String
|
||||||
) = KtorCRUDRepoClient(
|
) = KtorCRUDRepoClient(
|
||||||
KtorReadCRUDRepoClient(
|
KtorReadCRUDRepoClient(
|
||||||
@ -35,7 +49,10 @@ class KtorCRUDRepoClient<ObjectType, IdType, InputValue> (
|
|||||||
KtorWriteCrudRepoClient<ObjectType, IdType, InputValue>(
|
KtorWriteCrudRepoClient<ObjectType, IdType, InputValue>(
|
||||||
baseUrl,
|
baseUrl,
|
||||||
httpClient,
|
httpClient,
|
||||||
contentType
|
contentType,
|
||||||
|
newObjectsFlow,
|
||||||
|
updatedObjectsFlow,
|
||||||
|
deletedObjectsIdsFlow
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -44,11 +61,23 @@ class KtorCRUDRepoClient<ObjectType, IdType, InputValue> (
|
|||||||
subpart: String,
|
subpart: String,
|
||||||
httpClient: HttpClient,
|
httpClient: HttpClient,
|
||||||
contentType: ContentType,
|
contentType: ContentType,
|
||||||
|
newObjectsFlow: Flow<ObjectType> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, newObjectsFlowRouting),
|
||||||
|
),
|
||||||
|
updatedObjectsFlow: Flow<ObjectType> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, updatedObjectsFlowRouting),
|
||||||
|
),
|
||||||
|
deletedObjectsIdsFlow: Flow<IdType> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, deletedObjectsIdsFlowRouting),
|
||||||
|
),
|
||||||
noinline idSerializer: suspend (IdType) -> String
|
noinline idSerializer: suspend (IdType) -> String
|
||||||
) = KtorCRUDRepoClient<ObjectType, IdType, InputValue>(
|
) = KtorCRUDRepoClient<ObjectType, IdType, InputValue>(
|
||||||
buildStandardUrl(baseUrl, subpart),
|
buildStandardUrl(baseUrl, subpart),
|
||||||
httpClient,
|
httpClient,
|
||||||
contentType,
|
contentType,
|
||||||
|
newObjectsFlow,
|
||||||
|
updatedObjectsFlow,
|
||||||
|
deletedObjectsIdsFlow,
|
||||||
idSerializer
|
idSerializer
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@ -80,11 +109,23 @@ inline fun <reified ObjectType, reified IdType, reified InputValue> KtorCRUDRepo
|
|||||||
subpart: String,
|
subpart: String,
|
||||||
httpClient: HttpClient,
|
httpClient: HttpClient,
|
||||||
contentType: ContentType,
|
contentType: ContentType,
|
||||||
|
newObjectsFlow: Flow<ObjectType> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, newObjectsFlowRouting),
|
||||||
|
),
|
||||||
|
updatedObjectsFlow: Flow<ObjectType> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, updatedObjectsFlowRouting),
|
||||||
|
),
|
||||||
|
deletedObjectsIdsFlow: Flow<IdType> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, deletedObjectsIdsFlowRouting),
|
||||||
|
),
|
||||||
noinline idSerializer: suspend (IdType) -> String
|
noinline idSerializer: suspend (IdType) -> String
|
||||||
) = KtorCRUDRepoClient<ObjectType, IdType, InputValue>(
|
) = KtorCRUDRepoClient<ObjectType, IdType, InputValue>(
|
||||||
buildStandardUrl(baseUrl, subpart),
|
buildStandardUrl(baseUrl, subpart),
|
||||||
httpClient,
|
httpClient,
|
||||||
contentType,
|
contentType,
|
||||||
|
newObjectsFlow,
|
||||||
|
updatedObjectsFlow,
|
||||||
|
deletedObjectsIdsFlow,
|
||||||
idSerializer
|
idSerializer
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -53,19 +53,22 @@ class KtorWriteCrudRepoClient<ObjectType, IdType, InputValue> (
|
|||||||
inline operator fun <reified ObjectType, reified IdType, reified InputValue> invoke(
|
inline operator fun <reified ObjectType, reified IdType, reified InputValue> invoke(
|
||||||
baseUrl: String,
|
baseUrl: String,
|
||||||
httpClient: HttpClient,
|
httpClient: HttpClient,
|
||||||
contentType: ContentType
|
contentType: ContentType,
|
||||||
|
newObjectsFlow: Flow<ObjectType> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, newObjectsFlowRouting),
|
||||||
|
),
|
||||||
|
updatedObjectsFlow: Flow<ObjectType> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, updatedObjectsFlowRouting),
|
||||||
|
),
|
||||||
|
deletedObjectsIdsFlow: Flow<IdType> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, deletedObjectsIdsFlowRouting),
|
||||||
|
),
|
||||||
) = KtorWriteCrudRepoClient<ObjectType, IdType, InputValue>(
|
) = KtorWriteCrudRepoClient<ObjectType, IdType, InputValue>(
|
||||||
baseUrl,
|
baseUrl,
|
||||||
httpClient,
|
httpClient,
|
||||||
httpClient.createStandardWebsocketFlow(
|
newObjectsFlow,
|
||||||
buildStandardUrl(baseUrl, newObjectsFlowRouting),
|
updatedObjectsFlow,
|
||||||
),
|
deletedObjectsIdsFlow,
|
||||||
httpClient.createStandardWebsocketFlow(
|
|
||||||
buildStandardUrl(baseUrl, updatedObjectsFlowRouting),
|
|
||||||
),
|
|
||||||
httpClient.createStandardWebsocketFlow(
|
|
||||||
buildStandardUrl(baseUrl, deletedObjectsIdsFlowRouting),
|
|
||||||
),
|
|
||||||
{
|
{
|
||||||
contentType(contentType)
|
contentType(contentType)
|
||||||
setBody(it)
|
setBody(it)
|
||||||
|
@ -1,10 +1,14 @@
|
|||||||
package dev.inmo.micro_utils.repos.ktor.client.key.value
|
package dev.inmo.micro_utils.repos.ktor.client.key.value
|
||||||
|
|
||||||
|
import dev.inmo.micro_utils.ktor.client.createStandardWebsocketFlow
|
||||||
import dev.inmo.micro_utils.ktor.common.*
|
import dev.inmo.micro_utils.ktor.common.*
|
||||||
import dev.inmo.micro_utils.repos.*
|
import dev.inmo.micro_utils.repos.*
|
||||||
|
import dev.inmo.micro_utils.repos.ktor.common.key_value.onNewValueRoute
|
||||||
|
import dev.inmo.micro_utils.repos.ktor.common.key_value.onValueRemovedRoute
|
||||||
import io.ktor.client.HttpClient
|
import io.ktor.client.HttpClient
|
||||||
import io.ktor.http.ContentType
|
import io.ktor.http.ContentType
|
||||||
import io.ktor.http.encodeURLQueryComponent
|
import io.ktor.http.encodeURLQueryComponent
|
||||||
|
import kotlinx.coroutines.flow.Flow
|
||||||
import kotlinx.serialization.*
|
import kotlinx.serialization.*
|
||||||
|
|
||||||
class KtorKeyValueRepoClient<Key, Value> (
|
class KtorKeyValueRepoClient<Key, Value> (
|
||||||
@ -20,6 +24,12 @@ class KtorKeyValueRepoClient<Key, Value> (
|
|||||||
httpClient: HttpClient,
|
httpClient: HttpClient,
|
||||||
contentType: ContentType,
|
contentType: ContentType,
|
||||||
noinline idSerializer: suspend (Key) -> String,
|
noinline idSerializer: suspend (Key) -> String,
|
||||||
|
onNewValue: Flow<Pair<Key, Value>> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, onNewValueRoute),
|
||||||
|
),
|
||||||
|
onValueRemoved: Flow<Key> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, onValueRemovedRoute),
|
||||||
|
),
|
||||||
noinline valueSerializer: suspend (Value) -> String
|
noinline valueSerializer: suspend (Value) -> String
|
||||||
) = KtorKeyValueRepoClient(
|
) = KtorKeyValueRepoClient(
|
||||||
KtorReadKeyValueRepoClient(
|
KtorReadKeyValueRepoClient(
|
||||||
@ -28,7 +38,9 @@ class KtorKeyValueRepoClient<Key, Value> (
|
|||||||
KtorWriteKeyValueRepoClient(
|
KtorWriteKeyValueRepoClient(
|
||||||
baseUrl,
|
baseUrl,
|
||||||
httpClient,
|
httpClient,
|
||||||
contentType
|
contentType,
|
||||||
|
onNewValue,
|
||||||
|
onValueRemoved
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
inline operator fun <reified Key, reified Value> invoke(
|
inline operator fun <reified Key, reified Value> invoke(
|
||||||
@ -37,12 +49,20 @@ class KtorKeyValueRepoClient<Key, Value> (
|
|||||||
httpClient: HttpClient,
|
httpClient: HttpClient,
|
||||||
contentType: ContentType,
|
contentType: ContentType,
|
||||||
noinline idSerializer: suspend (Key) -> String,
|
noinline idSerializer: suspend (Key) -> String,
|
||||||
|
onNewValue: Flow<Pair<Key, Value>> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, onNewValueRoute),
|
||||||
|
),
|
||||||
|
onValueRemoved: Flow<Key> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, onValueRemovedRoute),
|
||||||
|
),
|
||||||
noinline valueSerializer: suspend (Value) -> String
|
noinline valueSerializer: suspend (Value) -> String
|
||||||
) = KtorKeyValueRepoClient(
|
) = KtorKeyValueRepoClient(
|
||||||
buildStandardUrl(baseUrl, subpart),
|
buildStandardUrl(baseUrl, subpart),
|
||||||
httpClient,
|
httpClient,
|
||||||
contentType,
|
contentType,
|
||||||
idSerializer,
|
idSerializer,
|
||||||
|
onNewValue,
|
||||||
|
onValueRemoved,
|
||||||
valueSerializer
|
valueSerializer
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -60,17 +60,19 @@ class KtorWriteKeyValueRepoClient<Key, Value>(
|
|||||||
inline operator fun <reified Key, reified Value> invoke(
|
inline operator fun <reified Key, reified Value> invoke(
|
||||||
baseUrl: String,
|
baseUrl: String,
|
||||||
httpClient: HttpClient,
|
httpClient: HttpClient,
|
||||||
contentType: ContentType
|
contentType: ContentType,
|
||||||
|
onNewValue: Flow<Pair<Key, Value>> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, onNewValueRoute),
|
||||||
|
),
|
||||||
|
onValueRemoved: Flow<Key> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, onValueRemovedRoute),
|
||||||
|
),
|
||||||
) = KtorWriteKeyValueRepoClient<Key, Value>(
|
) = KtorWriteKeyValueRepoClient<Key, Value>(
|
||||||
baseUrl,
|
baseUrl,
|
||||||
httpClient,
|
httpClient,
|
||||||
contentType,
|
contentType,
|
||||||
httpClient.createStandardWebsocketFlow(
|
onNewValue,
|
||||||
buildStandardUrl(baseUrl, onNewValueRoute),
|
onValueRemoved,
|
||||||
),
|
|
||||||
httpClient.createStandardWebsocketFlow(
|
|
||||||
buildStandardUrl(baseUrl, onValueRemovedRoute),
|
|
||||||
),
|
|
||||||
typeInfo<List<Key>>(),
|
typeInfo<List<Key>>(),
|
||||||
typeInfo<List<Value>>(),
|
typeInfo<List<Value>>(),
|
||||||
typeInfo<Map<Key, Value>>()
|
typeInfo<Map<Key, Value>>()
|
||||||
|
@ -1,10 +1,15 @@
|
|||||||
package dev.inmo.micro_utils.repos.ktor.client.key.values
|
package dev.inmo.micro_utils.repos.ktor.client.key.values
|
||||||
|
|
||||||
|
import dev.inmo.micro_utils.ktor.client.createStandardWebsocketFlow
|
||||||
import dev.inmo.micro_utils.ktor.common.*
|
import dev.inmo.micro_utils.ktor.common.*
|
||||||
import dev.inmo.micro_utils.repos.*
|
import dev.inmo.micro_utils.repos.*
|
||||||
|
import dev.inmo.micro_utils.repos.ktor.common.one_to_many.onDataClearedRoute
|
||||||
|
import dev.inmo.micro_utils.repos.ktor.common.one_to_many.onNewValueRoute
|
||||||
|
import dev.inmo.micro_utils.repos.ktor.common.one_to_many.onValueRemovedRoute
|
||||||
import io.ktor.client.HttpClient
|
import io.ktor.client.HttpClient
|
||||||
import io.ktor.http.ContentType
|
import io.ktor.http.ContentType
|
||||||
import io.ktor.http.encodeURLQueryComponent
|
import io.ktor.http.encodeURLQueryComponent
|
||||||
|
import kotlinx.coroutines.flow.Flow
|
||||||
import kotlinx.serialization.*
|
import kotlinx.serialization.*
|
||||||
|
|
||||||
class KtorKeyValuesRepoClient<Key, Value> (
|
class KtorKeyValuesRepoClient<Key, Value> (
|
||||||
@ -20,6 +25,15 @@ class KtorKeyValuesRepoClient<Key, Value> (
|
|||||||
httpClient: HttpClient,
|
httpClient: HttpClient,
|
||||||
contentType: ContentType,
|
contentType: ContentType,
|
||||||
noinline keySerializer: suspend (Key) -> String,
|
noinline keySerializer: suspend (Key) -> String,
|
||||||
|
onNewValue: Flow<Pair<Key, Value>> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, onNewValueRoute),
|
||||||
|
),
|
||||||
|
onValueRemoved: Flow<Pair<Key, Value>> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, onValueRemovedRoute),
|
||||||
|
),
|
||||||
|
onDataCleared: Flow<Key> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, onDataClearedRoute),
|
||||||
|
),
|
||||||
noinline valueSerializer: suspend (Value) -> String
|
noinline valueSerializer: suspend (Value) -> String
|
||||||
) = KtorKeyValuesRepoClient(
|
) = KtorKeyValuesRepoClient(
|
||||||
KtorReadKeyValuesRepoClient(
|
KtorReadKeyValuesRepoClient(
|
||||||
@ -32,7 +46,10 @@ class KtorKeyValuesRepoClient<Key, Value> (
|
|||||||
KtorWriteKeyValuesRepoClient(
|
KtorWriteKeyValuesRepoClient(
|
||||||
baseUrl,
|
baseUrl,
|
||||||
httpClient,
|
httpClient,
|
||||||
contentType
|
contentType,
|
||||||
|
onNewValue,
|
||||||
|
onValueRemoved,
|
||||||
|
onDataCleared
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
inline operator fun <reified Key : Any, reified Value : Any> invoke(
|
inline operator fun <reified Key : Any, reified Value : Any> invoke(
|
||||||
@ -41,12 +58,24 @@ class KtorKeyValuesRepoClient<Key, Value> (
|
|||||||
httpClient: HttpClient,
|
httpClient: HttpClient,
|
||||||
contentType: ContentType,
|
contentType: ContentType,
|
||||||
noinline keySerializer: suspend (Key) -> String,
|
noinline keySerializer: suspend (Key) -> String,
|
||||||
|
onNewValue: Flow<Pair<Key, Value>> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, onNewValueRoute),
|
||||||
|
),
|
||||||
|
onValueRemoved: Flow<Pair<Key, Value>> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, onValueRemovedRoute),
|
||||||
|
),
|
||||||
|
onDataCleared: Flow<Key> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, onDataClearedRoute),
|
||||||
|
),
|
||||||
noinline valueSerializer: suspend (Value) -> String
|
noinline valueSerializer: suspend (Value) -> String
|
||||||
) = KtorKeyValuesRepoClient(
|
) = KtorKeyValuesRepoClient(
|
||||||
buildStandardUrl(baseUrl, subpart),
|
buildStandardUrl(baseUrl, subpart),
|
||||||
httpClient,
|
httpClient,
|
||||||
contentType,
|
contentType,
|
||||||
keySerializer,
|
keySerializer,
|
||||||
|
onNewValue,
|
||||||
|
onValueRemoved,
|
||||||
|
onDataCleared,
|
||||||
valueSerializer
|
valueSerializer
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@ -59,13 +88,25 @@ inline fun <reified Key : Any, reified Value : Any> KtorKeyValuesRepoClient(
|
|||||||
keySerializer: SerializationStrategy<Key>,
|
keySerializer: SerializationStrategy<Key>,
|
||||||
valueSerializer: SerializationStrategy<Value>,
|
valueSerializer: SerializationStrategy<Value>,
|
||||||
serialFormat: StringFormat,
|
serialFormat: StringFormat,
|
||||||
|
onNewValue: Flow<Pair<Key, Value>> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, onNewValueRoute),
|
||||||
|
),
|
||||||
|
onValueRemoved: Flow<Pair<Key, Value>> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, onValueRemovedRoute),
|
||||||
|
),
|
||||||
|
onDataCleared: Flow<Key> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, onDataClearedRoute),
|
||||||
|
),
|
||||||
) = KtorKeyValuesRepoClient<Key, Value>(
|
) = KtorKeyValuesRepoClient<Key, Value>(
|
||||||
baseUrl,
|
baseUrl,
|
||||||
httpClient,
|
httpClient,
|
||||||
contentType,
|
contentType,
|
||||||
{
|
{
|
||||||
serialFormat.encodeToString(keySerializer, it).encodeURLQueryComponent()
|
serialFormat.encodeToString(keySerializer, it).encodeURLQueryComponent()
|
||||||
}
|
},
|
||||||
|
onNewValue,
|
||||||
|
onValueRemoved,
|
||||||
|
onDataCleared
|
||||||
) {
|
) {
|
||||||
serialFormat.encodeToString(valueSerializer, it).encodeURLQueryComponent()
|
serialFormat.encodeToString(valueSerializer, it).encodeURLQueryComponent()
|
||||||
}
|
}
|
||||||
@ -77,13 +118,25 @@ inline fun <reified Key : Any, reified Value : Any> KtorKeyValuesRepoClient(
|
|||||||
keySerializer: SerializationStrategy<Key>,
|
keySerializer: SerializationStrategy<Key>,
|
||||||
valueSerializer: SerializationStrategy<Value>,
|
valueSerializer: SerializationStrategy<Value>,
|
||||||
serialFormat: BinaryFormat,
|
serialFormat: BinaryFormat,
|
||||||
|
onNewValue: Flow<Pair<Key, Value>> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, onNewValueRoute),
|
||||||
|
),
|
||||||
|
onValueRemoved: Flow<Pair<Key, Value>> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, onValueRemovedRoute),
|
||||||
|
),
|
||||||
|
onDataCleared: Flow<Key> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, onDataClearedRoute),
|
||||||
|
),
|
||||||
) = KtorKeyValuesRepoClient<Key, Value>(
|
) = KtorKeyValuesRepoClient<Key, Value>(
|
||||||
baseUrl,
|
baseUrl,
|
||||||
httpClient,
|
httpClient,
|
||||||
contentType,
|
contentType,
|
||||||
{
|
{
|
||||||
serialFormat.encodeHex(keySerializer, it)
|
serialFormat.encodeHex(keySerializer, it)
|
||||||
}
|
},
|
||||||
|
onNewValue,
|
||||||
|
onValueRemoved,
|
||||||
|
onDataCleared
|
||||||
) {
|
) {
|
||||||
serialFormat.encodeHex(valueSerializer, it)
|
serialFormat.encodeHex(valueSerializer, it)
|
||||||
}
|
}
|
||||||
|
@ -84,20 +84,23 @@ class KtorWriteKeyValuesRepoClient<Key : Any, Value : Any>(
|
|||||||
inline operator fun <reified Key : Any, reified Value : Any> invoke(
|
inline operator fun <reified Key : Any, reified Value : Any> invoke(
|
||||||
baseUrl: String,
|
baseUrl: String,
|
||||||
httpClient: HttpClient,
|
httpClient: HttpClient,
|
||||||
contentType: ContentType
|
contentType: ContentType,
|
||||||
|
onNewValue: Flow<Pair<Key, Value>> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, onNewValueRoute),
|
||||||
|
),
|
||||||
|
onValueRemoved: Flow<Pair<Key, Value>> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, onValueRemovedRoute),
|
||||||
|
),
|
||||||
|
onDataCleared: Flow<Key> = httpClient.createStandardWebsocketFlow(
|
||||||
|
buildStandardUrl(baseUrl, onDataClearedRoute),
|
||||||
|
),
|
||||||
) = KtorWriteKeyValuesRepoClient<Key, Value>(
|
) = KtorWriteKeyValuesRepoClient<Key, Value>(
|
||||||
baseUrl,
|
baseUrl,
|
||||||
httpClient,
|
httpClient,
|
||||||
contentType,
|
contentType,
|
||||||
httpClient.createStandardWebsocketFlow(
|
onNewValue,
|
||||||
buildStandardUrl(baseUrl, onNewValueRoute),
|
onValueRemoved,
|
||||||
),
|
onDataCleared,
|
||||||
httpClient.createStandardWebsocketFlow(
|
|
||||||
buildStandardUrl(baseUrl, onValueRemovedRoute),
|
|
||||||
),
|
|
||||||
httpClient.createStandardWebsocketFlow(
|
|
||||||
buildStandardUrl(baseUrl, onDataClearedRoute),
|
|
||||||
),
|
|
||||||
typeInfo<Key>(),
|
typeInfo<Key>(),
|
||||||
typeInfo<Value>(),
|
typeInfo<Value>(),
|
||||||
typeInfo<Map<Key, List<Value>>>()
|
typeInfo<Map<Key, List<Value>>>()
|
||||||
|
@ -14,6 +14,7 @@ import kotlinx.coroutines.launch
|
|||||||
import kotlinx.serialization.SerialFormat
|
import kotlinx.serialization.SerialFormat
|
||||||
import kotlinx.serialization.StringFormat
|
import kotlinx.serialization.StringFormat
|
||||||
import kotlinx.serialization.json.JsonObject
|
import kotlinx.serialization.json.JsonObject
|
||||||
|
import kotlinx.serialization.json.decodeFromJsonElement
|
||||||
import kotlinx.serialization.json.jsonObject
|
import kotlinx.serialization.json.jsonObject
|
||||||
import org.koin.core.Koin
|
import org.koin.core.Koin
|
||||||
import org.koin.core.KoinApplication
|
import org.koin.core.KoinApplication
|
||||||
@ -93,18 +94,19 @@ object StartLauncherPlugin : StartPlugin {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Will create [KoinApplication], init, load modules using [StartLauncherPlugin] and start plugins using the same base
|
* Will create [KoinApplication], init, load modules using [StartLauncherPlugin] and start plugins using the same base
|
||||||
* plugin
|
* plugin. It is basic [start] method which accepts both [config] and [rawConfig] which suppose to be the same or
|
||||||
|
* at least [rawConfig] must contain serialized variant of [config]
|
||||||
*
|
*
|
||||||
* @param rawConfig It is expected that this [JsonObject] will contain serialized [Config] ([StartLauncherPlugin] will
|
* @param rawConfig It is expected that this [JsonObject] will contain serialized [Config] ([StartLauncherPlugin] will
|
||||||
* deserialize it in its [StartLauncherPlugin.setupDI]
|
* deserialize it in its [StartLauncherPlugin.setupDI]
|
||||||
*/
|
*/
|
||||||
suspend fun start(rawConfig: JsonObject) {
|
suspend fun start(config: Config, rawConfig: JsonObject) {
|
||||||
|
|
||||||
logger.i("Start initialization")
|
logger.i("Start initialization")
|
||||||
val koinApp = KoinApplication.init()
|
val koinApp = KoinApplication.init()
|
||||||
koinApp.modules(
|
koinApp.modules(
|
||||||
module {
|
module {
|
||||||
setupDI(rawConfig)
|
setupDI(config, rawConfig)
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
logger.i("Modules loaded")
|
logger.i("Modules loaded")
|
||||||
@ -116,26 +118,26 @@ object StartLauncherPlugin : StartPlugin {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Will create [KoinApplication], init, load modules using [StartLauncherPlugin] and start plugins using the same base
|
* Call [start] with deserialized [Config] as config and [rawConfig] as is
|
||||||
* plugin
|
|
||||||
*
|
*
|
||||||
* @param config In difference with other [start] method here config is already deserialized and this config will
|
* @param rawConfig It is expected that this [JsonObject] will contain serialized [Config]
|
||||||
* be converted to [JsonObject] as raw config. That means that all plugins from [config] will receive
|
*/
|
||||||
* serialized version of [config] in [StartPlugin.setupDI] method
|
suspend fun start(rawConfig: JsonObject) {
|
||||||
|
|
||||||
|
start(defaultJson.decodeFromJsonElement(Config.serializer(), rawConfig), rawConfig)
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Call [start] with deserialized [Config] as is and serialize it to [JsonObject] to pass as the first parameter
|
||||||
|
* to the basic [start] method
|
||||||
|
*
|
||||||
|
* @param config Will be converted to [JsonObject] as raw config. That means that all plugins from [config] will
|
||||||
|
* receive serialized version of [config] in [StartPlugin.setupDI] method
|
||||||
*/
|
*/
|
||||||
suspend fun start(config: Config) {
|
suspend fun start(config: Config) {
|
||||||
|
|
||||||
logger.i("Start initialization")
|
start(config, defaultJson.encodeToJsonElement(Config.serializer(), config).jsonObject)
|
||||||
val koinApp = KoinApplication.init()
|
|
||||||
logger.i("Koin app created")
|
|
||||||
koinApp.modules(
|
|
||||||
module {
|
|
||||||
setupDI(config)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
startKoin(koinApp)
|
|
||||||
logger.i("Koin started")
|
|
||||||
startPlugin(koinApp.koin)
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package dev.inmo.micro_utils.startup.launcher
|
package dev.inmo.micro_utils.startup.launcher
|
||||||
|
|
||||||
import dev.inmo.kslog.common.KSLog
|
import dev.inmo.kslog.common.KSLog
|
||||||
|
import dev.inmo.kslog.common.LogLevel
|
||||||
import dev.inmo.kslog.common.i
|
import dev.inmo.kslog.common.i
|
||||||
import kotlinx.serialization.json.jsonObject
|
import kotlinx.serialization.json.jsonObject
|
||||||
import java.io.File
|
import java.io.File
|
||||||
@ -23,10 +24,25 @@ import java.io.File
|
|||||||
* In that case in `build/distributions` folder you will be able to find zip and tar files with all required
|
* In that case in `build/distributions` folder you will be able to find zip and tar files with all required
|
||||||
* tools for application running (via their `bin/app_name` binary). In that case yoy will not need to pass
|
* tools for application running (via their `bin/app_name` binary). In that case yoy will not need to pass
|
||||||
* `--args=...` and launch will look like `./bin/app_name sample.config.json`
|
* `--args=...` and launch will look like `./bin/app_name sample.config.json`
|
||||||
|
*
|
||||||
|
* ## Debug mode
|
||||||
|
*
|
||||||
|
* You may pass the second parameter, one of [LogLevel] enum variants to setup [KSLog] minimal logging level. Sample:
|
||||||
|
*
|
||||||
|
* ```bash
|
||||||
|
* ./gradlew run --args="sample.config.json DEBUG" // enable debugging output
|
||||||
|
* ```
|
||||||
|
*
|
||||||
|
* OR
|
||||||
|
* ```bash
|
||||||
|
* ./gradlew run --args="sample.config.json WARNING" // enable logging since WARNING
|
||||||
|
* ```
|
||||||
|
*
|
||||||
|
* **Default level is [LogLevel.INFO]**
|
||||||
*/
|
*/
|
||||||
suspend fun main(args: Array<String>) {
|
suspend fun main(args: Array<String>) {
|
||||||
|
|
||||||
KSLog.default = KSLog("Launcher")
|
KSLog.default = KSLog("Launcher", args.getOrNull(1) ?.let { LogLevel.valueOf(it) } ?: LogLevel.INFO)
|
||||||
val (configPath) = args
|
val (configPath) = args
|
||||||
val file = File(configPath)
|
val file = File(configPath)
|
||||||
KSLog.i("Start read config from ${file.absolutePath}")
|
KSLog.i("Start read config from ${file.absolutePath}")
|
||||||
|
Loading…
Reference in New Issue
Block a user