Revert "migrations onto new libraries"

This reverts commit 647cd7d7b4.
2025-09-14 21:09:24 +00:00 · 2024-07-30 23:30:11 +06:00
parent 9ba4d98c30
commit e68735d061
21 changed files with 83 additions and 93 deletions
--- a/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/ApplicationCallRespondWithTypeInfo.kt
+++ b/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/ApplicationCallRespondWithTypeInfo.kt
@@ -1,9 +1,8 @@
 package dev.inmo.micro_utils.ktor.server

 import io.ktor.server.application.ApplicationCall
-import io.ktor.server.http.*
 import io.ktor.server.response.responseType
-import io.ktor.utils.io.InternalAPI
+import io.ktor.util.InternalAPI
 import io.ktor.util.reflect.TypeInfo

@InternalAPI
@@ -12,5 +11,5 @@ suspend fun <T : Any> ApplicationCall.respond(
    typeInfo: TypeInfo
 ) {
    response.responseType = typeInfo
-    respond(message, typeInfo)
+    response.pipeline.execute(this, message as Any)
 }
--- a/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/DownloadFileItem.kt
+++ b/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/DownloadFileItem.kt
@@ -2,19 +2,21 @@ package dev.inmo.micro_utils.ktor.server

 import com.benasher44.uuid.uuid4
 import io.ktor.http.content.PartData
-import io.ktor.util.cio.*
-import io.ktor.utils.io.*
+import io.ktor.utils.io.copyTo
+import io.ktor.utils.io.core.copyTo
 import io.ktor.utils.io.jvm.javaio.copyTo
-import kotlinx.io.asSink
+import io.ktor.utils.io.streams.asOutput
 import java.io.File

-suspend fun PartData.FileItem.download(target: File) {
-    provider().copyAndClose(
-        target.writeChannel()
-    )
+fun PartData.FileItem.download(target: File) {
+    provider().use { input ->
+        target.outputStream().asOutput().use {
+            input.copyTo(it)
+        }
+    }
 }

-suspend fun PartData.FileItem.downloadToTemporalFile(): File {
+fun PartData.FileItem.downloadToTemporalFile(): File {
    val outputFile = File.createTempFile(uuid4().toString(), ".temp").apply {
        deleteOnExit()
    }
@@ -25,7 +27,7 @@ suspend fun PartData.FileItem.downloadToTemporalFile(): File {
 fun PartData.BinaryItem.download(target: File) {
    provider().use { input ->
        target.outputStream().use {
-            input.transferTo(it.asSink())
+            input.copyTo(it.asOutput())
        }
    }
 }
--- a/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/NewFlowsWebsocket.kt
+++ b/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/NewFlowsWebsocket.kt
@@ -5,14 +5,14 @@ import dev.inmo.micro_utils.ktor.common.*
 import io.ktor.http.URLProtocol
 import io.ktor.server.application.install
 import io.ktor.server.application.pluginOrNull
-import io.ktor.server.routing.Routing
+import io.ktor.server.routing.Route
 import io.ktor.server.routing.application
 import io.ktor.server.websocket.*
 import io.ktor.websocket.send
 import kotlinx.coroutines.flow.Flow
 import kotlinx.serialization.SerializationStrategy

-inline fun <reified T : Any> Routing.includeWebsocketHandling(
+inline fun <reified T : Any> Route.includeWebsocketHandling(
    suburl: String,
    flow: Flow<T>,
    protocol: URLProtocol? = null,
--- a/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/StartServer.kt
+++ b/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/StartServer.kt
@@ -1,7 +1,7 @@
 package dev.inmo.micro_utils.ktor.server

 import dev.inmo.micro_utils.ktor.server.configurators.KtorApplicationConfigurator
-import io.ktor.server.application.*
+import io.ktor.server.application.Application
 import io.ktor.server.cio.CIO
 import io.ktor.server.cio.CIOApplicationEngine
 import io.ktor.server.engine.*
@@ -11,22 +11,20 @@ fun <TEngine : ApplicationEngine, TConfiguration : ApplicationEngine.Configurati
    engine: ApplicationEngineFactory<TEngine, TConfiguration>,
    host: String = "localhost",
    port: Int = Random.nextInt(1024, 65535),
-    additionalEngineEnvironmentConfigurator: EngineConnectorBuilder.() -> Unit = {},
+    additionalEngineEnvironmentConfigurator: ApplicationEngineEnvironmentBuilder.() -> Unit = {},
    additionalConfigurationConfigurator: TConfiguration.() -> Unit = {},
-    environment: ApplicationEnvironment = applicationEnvironment(),
    block: Application.() -> Unit
-): EmbeddedServer<TEngine, TConfiguration> = embeddedServer<TEngine, TConfiguration>(
+): TEngine = embeddedServer(
    engine,
-    environment,
-    {
+    applicationEngineEnvironment {
+        module(block)
        connector {
            this.host = host
            this.port = port
-            additionalEngineEnvironmentConfigurator()
        }
-        additionalConfigurationConfigurator()
+        additionalEngineEnvironmentConfigurator()
    },
-    module = block
+    additionalConfigurationConfigurator
 )

 /**
@@ -37,17 +35,15 @@ fun <TEngine : ApplicationEngine, TConfiguration : ApplicationEngine.Configurati
 fun createKtorServer(
    host: String = "localhost",
    port: Int = Random.nextInt(1024, 65535),
-    additionalEngineEnvironmentConfigurator: EngineConnectorBuilder.() -> Unit = {},
+    additionalEngineEnvironmentConfigurator: ApplicationEngineEnvironmentBuilder.() -> Unit = {},
    additionalConfigurationConfigurator: CIOApplicationEngine.Configuration.() -> Unit = {},
-    environment: ApplicationEnvironment = applicationEnvironment(),
    block: Application.() -> Unit
-): EmbeddedServer<CIOApplicationEngine, CIOApplicationEngine.Configuration> = createKtorServer(
+): CIOApplicationEngine = createKtorServer(
    CIO,
    host,
    port,
    additionalEngineEnvironmentConfigurator,
    additionalConfigurationConfigurator,
-    environment,
    block
 )

@@ -55,17 +51,15 @@ fun <TEngine : ApplicationEngine, TConfiguration : ApplicationEngine.Configurati
    engine: ApplicationEngineFactory<TEngine, TConfiguration>,
    host: String = "localhost",
    port: Int = Random.nextInt(1024, 65535),
-    additionalEngineEnvironmentConfigurator: EngineConnectorBuilder.() -> Unit = {},
+    additionalEngineEnvironmentConfigurator: ApplicationEngineEnvironmentBuilder.() -> Unit = {},
    additionalConfigurationConfigurator: TConfiguration.() -> Unit = {},
-    environment: ApplicationEnvironment = applicationEnvironment(),
    configurators: List<KtorApplicationConfigurator>
-): EmbeddedServer<TEngine, TConfiguration> = createKtorServer(
+): TEngine = createKtorServer(
    engine,
    host,
    port,
    additionalEngineEnvironmentConfigurator,
-    additionalConfigurationConfigurator,
-    environment,
+    additionalConfigurationConfigurator
 ) {
    configurators.forEach { it.apply { configure() } }
 }
@@ -79,7 +73,6 @@ fun createKtorServer(
    host: String = "localhost",
    port: Int = Random.nextInt(1024, 65535),
    configurators: List<KtorApplicationConfigurator>,
-    additionalEngineEnvironmentConfigurator: EngineConnectorBuilder.() -> Unit = {},
+    additionalEngineEnvironmentConfigurator: ApplicationEngineEnvironmentBuilder.() -> Unit = {},
    additionalConfigurationConfigurator: CIOApplicationEngine.Configuration.() -> Unit = {},
-    environment: ApplicationEnvironment = applicationEnvironment(),
-): EmbeddedServer<CIOApplicationEngine, CIOApplicationEngine.Configuration> = createKtorServer(CIO, host, port, additionalEngineEnvironmentConfigurator, additionalConfigurationConfigurator, environment, configurators)
+): ApplicationEngine = createKtorServer(CIO, host, port, additionalEngineEnvironmentConfigurator, additionalConfigurationConfigurator, configurators)
--- a/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/TemporalFilesRoutingConfigurator.kt
+++ b/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/TemporalFilesRoutingConfigurator.kt
@@ -14,10 +14,9 @@ import io.ktor.server.application.call
 import io.ktor.server.request.receiveMultipart
 import io.ktor.server.response.respond
 import io.ktor.server.response.respondText
-import io.ktor.server.routing.Routing
+import io.ktor.server.routing.Route
 import io.ktor.server.routing.post
 import kotlinx.coroutines.*
-import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -27,10 +26,7 @@ import java.nio.file.attribute.FileTime

 class TemporalFilesRoutingConfigurator(
    private val subpath: String = DefaultTemporalFilesSubPath,
-    private val temporalFilesUtilizer: TemporalFilesUtilizer = TemporalFilesUtilizer,
-    filesFlowReplay: Int = 0,
-    filesFlowExtraBufferCapacity: Int = Int.MAX_VALUE,
-    filesFlowOnBufferOverflow: BufferOverflow = BufferOverflow.SUSPEND
+    private val temporalFilesUtilizer: TemporalFilesUtilizer = TemporalFilesUtilizer
 ) : ApplicationRoutingConfigurator.Element {
    interface TemporalFilesUtilizer {
        fun start(filesMap: MutableMap<TemporalFileId, MPPFile>, filesMutex: Mutex, onNewFileFlow: Flow<TemporalFileId>): Job
@@ -78,14 +74,10 @@ class TemporalFilesRoutingConfigurator(

    private val temporalFilesMap = mutableMapOf<TemporalFileId, MPPFile>()
    private val temporalFilesMutex = Mutex()
-    private val filesFlow = MutableSharedFlow<TemporalFileId>(
-        replay = filesFlowReplay,
-        extraBufferCapacity = filesFlowExtraBufferCapacity,
-        onBufferOverflow = filesFlowOnBufferOverflow
-    )
+    private val filesFlow = MutableSharedFlow<TemporalFileId>()
    val utilizerJob = temporalFilesUtilizer.start(temporalFilesMap, temporalFilesMutex, filesFlow.asSharedFlow())

-    override fun Routing.invoke() {
+    override fun Route.invoke() {
        post(subpath) {
            val multipart = call.receiveMultipart()

@@ -119,7 +111,7 @@ class TemporalFilesRoutingConfigurator(
                    temporalFilesMap[fileId] = file
                }
                call.respondText(fileId.string)
-                filesFlow.emit(fileId)
+                launchSafelyWithoutExceptions { filesFlow.emit(fileId) }
            } ?: call.respond(HttpStatusCode.BadRequest)
        }
    }
--- a/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/UniloadMultipart.kt
+++ b/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/UniloadMultipart.kt
@@ -6,7 +6,6 @@ import dev.inmo.micro_utils.ktor.common.downloadToTempFile
 import io.ktor.http.content.*
 import io.ktor.server.application.ApplicationCall
 import io.ktor.server.request.receiveMultipart
-import io.ktor.utils.io.*
 import io.ktor.utils.io.core.*
 import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.isActive
@@ -48,7 +47,7 @@ suspend fun ApplicationCall.uniloadMultipart(
        onBinaryChannelItem
    ) {
        when (it.name) {
-            "bytes" -> resultInput = it.provider().readBuffer()
+            "bytes" -> resultInput = it.provider()
            else -> onCustomFileItem(it)
        }
    }
--- a/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/configurators/ApplicationRoutingConfigurator.kt
+++ b/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/configurators/ApplicationRoutingConfigurator.kt
@@ -2,7 +2,8 @@ package dev.inmo.micro_utils.ktor.server.configurators

 import dev.inmo.micro_utils.ktor.server.configurators.ApplicationRoutingConfigurator.Element
 import io.ktor.server.application.*
-import io.ktor.server.routing.*
+import io.ktor.server.routing.Route
+import io.ktor.server.routing.Routing
 import kotlinx.serialization.Contextual
 import kotlinx.serialization.Serializable

@@ -10,7 +11,7 @@ import kotlinx.serialization.Serializable
 class ApplicationRoutingConfigurator(
    private val elements: List<@Contextual Element>
 ) : KtorApplicationConfigurator {
-    fun interface Element { operator fun Routing.invoke() }
+    fun interface Element { operator fun Route.invoke() }
    private val rootInstaller = Element {
        elements.forEach {
            it.apply { invoke() }
@@ -18,7 +19,9 @@ class ApplicationRoutingConfigurator(
    }

    override fun Application.configure() {
-        routing {
+        pluginOrNull(Routing) ?.apply {
+            rootInstaller.apply { invoke() }
+        } ?: install(Routing) {
            rootInstaller.apply { invoke() }
        }
    }