PostsSystem/core
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

fixes in build

Browse Source
This commit is contained in:
InsanusMokrassar 2020-08-11 22:18:57 +06:00
parent 3d3d184636
commit c3cf3f161a
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/content/WriteContentRepoKtorClient.kt
View File

@ -16,15 +16,13 @@ class WriteContentRepoKtorClient(
private val baseUrl: String, private val baseUrl: String,
private val client: HttpClient = HttpClient() private val client: HttpClient = HttpClient()
) : WriteContentRepo { ) : WriteContentRepo {
override val contentCreatedFlow: Flow<RegisteredContent> = createStandardWebsocketFlow( override val contentCreatedFlow: Flow<RegisteredContent> = client.createStandardWebsocketFlow(
client,
"$baseUrl/$contentCreatedFlowRoute" "$baseUrl/$contentCreatedFlowRoute"
) { ) {
standardKtorSerialFormat.load(RegisteredContent.serializer(), it) standardKtorSerialFormat.load(RegisteredContent.serializer(), it)
} }
override val contentDeletedFlow: Flow<RegisteredContent> = createStandardWebsocketFlow( override val contentDeletedFlow: Flow<RegisteredContent> = client.createStandardWebsocketFlow(
client,
"$baseUrl/$contentDeletedFlowRoute" "$baseUrl/$contentDeletedFlowRoute"
) { ) {
standardKtorSerialFormat.load(RegisteredContent.serializer(), it) standardKtorSerialFormat.load(RegisteredContent.serializer(), it)

12
ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/ktor/client/FlowsWebsockets.kt
View File

@ -11,8 +11,7 @@ import kotlinx.coroutines.flow.*
* @param checkReconnection This lambda will be called when it is required to reconnect to websocket to establish * @param checkReconnection This lambda will be called when it is required to reconnect to websocket to establish
* 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
*/ */
inline fun <reified T> createStandardWebsocketFlow( inline fun <reified T> HttpClient.createStandardWebsocketFlow(
client: HttpClient,
url: String, url: String,
crossinline checkReconnection: (Throwable?) -> Boolean = { true }, crossinline checkReconnection: (Throwable?) -> Boolean = { true },
crossinline conversation: suspend (ByteArray) -> T crossinline conversation: suspend (ByteArray) -> T
@ -20,7 +19,7 @@ inline fun <reified T> createStandardWebsocketFlow(
val correctedUrl = url.asCorrectWebSocketUrl val correctedUrl = url.asCorrectWebSocketUrl
return channelFlow { return channelFlow {
val producerScope = this val producerScope = this@channelFlow
do { do {
val reconnect = try { val reconnect = try {
safely( safely(
@ -28,7 +27,7 @@ inline fun <reified T> createStandardWebsocketFlow(
throw it throw it
} }
) { ) {
client.ws( ws(
correctedUrl correctedUrl
) { ) {
while (true) { while (true) {
@ -62,8 +61,3 @@ inline fun <reified T> createStandardWebsocketFlow(
} }
} }
} }
inline fun <reified T> HttpClient.createStandardWebsocketFlow(
url: String,
crossinline conversation: suspend (ByteArray) -> T
) = createStandardWebsocketFlow(this, url, conversation)

3
ktor/tests/src/test/kotlin/com/insanusmokrassar/postssystem/ktor/tests/WebsocketsTest.kt
View File

@ -40,8 +40,7 @@ class WebsocketsTest {
val client = HttpClient { val client = HttpClient {
install(io.ktor.client.features.websocket.WebSockets) install(io.ktor.client.features.websocket.WebSockets)
} }
val incomingWebsocketFlow = createStandardWebsocketFlow( val incomingWebsocketFlow = client.createStandardWebsocketFlow(
client,
"$serverUrl/$suburl", "$serverUrl/$suburl",
{ false } // always skip reconnection { false } // always skip reconnection
) { ) {