fix of build after migration (wat)

This commit is contained in:
InsanusMokrassar 2024-10-11 23:32:11 +06:00
parent fce7ec8912
commit 301cdaa2c2
28 changed files with 86 additions and 104 deletions

View File

@ -8,5 +8,5 @@ import io.ktor.client.content.*
expect suspend fun HttpClient.tempUpload( expect suspend fun HttpClient.tempUpload(
fullTempUploadDraftPath: String, fullTempUploadDraftPath: String,
file: MPPFile, file: MPPFile,
onUpload: ProgressListener = { _, _ -> } onUpload: ProgressListener = ProgressListener { _, _ -> }
): TemporalFileId ): TemporalFileId

View File

@ -4,8 +4,8 @@ import dev.inmo.micro_utils.common.FileName
import dev.inmo.micro_utils.common.MPPFile import dev.inmo.micro_utils.common.MPPFile
import dev.inmo.micro_utils.ktor.common.LambdaInputProvider import dev.inmo.micro_utils.ktor.common.LambdaInputProvider
import io.ktor.client.HttpClient import io.ktor.client.HttpClient
import io.ktor.client.content.*
import io.ktor.http.Headers import io.ktor.http.Headers
import io.ktor.utils.io.core.Input
import kotlinx.serialization.DeserializationStrategy import kotlinx.serialization.DeserializationStrategy
import kotlinx.serialization.StringFormat import kotlinx.serialization.StringFormat
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
@ -31,7 +31,7 @@ expect suspend fun <T> HttpClient.uniUpload(
resultDeserializer: DeserializationStrategy<T>, resultDeserializer: DeserializationStrategy<T>,
headers: Headers = Headers.Empty, headers: Headers = Headers.Empty,
stringFormat: StringFormat = Json, stringFormat: StringFormat = Json,
onUpload: OnUploadCallback = { _, _ -> } onUpload: ProgressListener = ProgressListener { _, _ -> }
): T? ): T?
/** /**
@ -46,7 +46,7 @@ suspend fun <T> HttpClient.uniUpload(
additionalData: Map<String, Any> = emptyMap(), additionalData: Map<String, Any> = emptyMap(),
headers: Headers = Headers.Empty, headers: Headers = Headers.Empty,
stringFormat: StringFormat = Json, stringFormat: StringFormat = Json,
onUpload: OnUploadCallback = { _, _ -> } onUpload: ProgressListener = ProgressListener { _, _ -> }
): T? = uniUpload( ): T? = uniUpload(
url, url,
additionalData + ("bytes" to file), additionalData + ("bytes" to file),
@ -68,7 +68,7 @@ suspend fun <T> HttpClient.uniUpload(
additionalData: Map<String, Any> = emptyMap(), additionalData: Map<String, Any> = emptyMap(),
headers: Headers = Headers.Empty, headers: Headers = Headers.Empty,
stringFormat: StringFormat = Json, stringFormat: StringFormat = Json,
onUpload: OnUploadCallback = { _, _ -> } onUpload: ProgressListener = ProgressListener { _, _ -> }
): T? = uniUpload( ): T? = uniUpload(
url, url,
additionalData + ("bytes" to info), additionalData + ("bytes" to info),
@ -93,7 +93,7 @@ suspend fun <T> HttpClient.uniUpload(
additionalData: Map<String, Any> = emptyMap(), additionalData: Map<String, Any> = emptyMap(),
headers: Headers = Headers.Empty, headers: Headers = Headers.Empty,
stringFormat: StringFormat = Json, stringFormat: StringFormat = Json,
onUpload: OnUploadCallback = { _, _ -> } onUpload: ProgressListener = ProgressListener { _, _ -> }
): T? = uniUpload( ): T? = uniUpload(
url, url,
UniUploadFileInfo(fileName, mimeType, inputAllocator), UniUploadFileInfo(fileName, mimeType, inputAllocator),

View File

@ -7,8 +7,6 @@ import dev.inmo.micro_utils.ktor.common.TemporalFileId
import io.ktor.client.HttpClient import io.ktor.client.HttpClient
import io.ktor.client.content.* import io.ktor.client.content.*
import kotlinx.coroutines.* import kotlinx.coroutines.*
import org.w3c.dom.mediasource.ENDED
import org.w3c.dom.mediasource.ReadyState
import org.w3c.xhr.* import org.w3c.xhr.*
import org.w3c.xhr.XMLHttpRequest.Companion.DONE import org.w3c.xhr.XMLHttpRequest.Companion.DONE
@ -29,7 +27,7 @@ suspend fun tempUpload(
val request = XMLHttpRequest() val request = XMLHttpRequest()
request.responseType = XMLHttpRequestResponseType.TEXT request.responseType = XMLHttpRequestResponseType.TEXT
request.upload.onprogress = { request.upload.onprogress = {
subscope.launchSafelyWithoutExceptions { onUpload(it.loaded.toLong(), it.total.toLong()) } subscope.launchSafelyWithoutExceptions { onUpload.onProgress(it.loaded.toLong(), it.total.toLong()) }
} }
request.onload = { request.onload = {
if (request.status == 200.toShort()) { if (request.status == 200.toShort()) {

View File

@ -1,10 +1,10 @@
package dev.inmo.micro_utils.ktor.client package dev.inmo.micro_utils.ktor.client
import dev.inmo.micro_utils.common.MPPFile import dev.inmo.micro_utils.common.MPPFile
import dev.inmo.micro_utils.common.Progress
import dev.inmo.micro_utils.coroutines.LinkedSupervisorJob import dev.inmo.micro_utils.coroutines.LinkedSupervisorJob
import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions
import io.ktor.client.HttpClient import io.ktor.client.HttpClient
import io.ktor.client.content.*
import io.ktor.http.Headers import io.ktor.http.Headers
import io.ktor.utils.io.core.readBytes import io.ktor.utils.io.core.readBytes
import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.CompletableDeferred
@ -36,7 +36,7 @@ actual suspend fun <T> HttpClient.uniUpload(
resultDeserializer: DeserializationStrategy<T>, resultDeserializer: DeserializationStrategy<T>,
headers: Headers, headers: Headers,
stringFormat: StringFormat, stringFormat: StringFormat,
onUpload: OnUploadCallback onUpload: ProgressListener
): T? { ): T? {
val formData = FormData() val formData = FormData()
val answer = CompletableDeferred<T?>(currentCoroutineContext().job) val answer = CompletableDeferred<T?>(currentCoroutineContext().job)
@ -66,7 +66,7 @@ actual suspend fun <T> HttpClient.uniUpload(
} }
request.responseType = XMLHttpRequestResponseType.TEXT request.responseType = XMLHttpRequestResponseType.TEXT
request.upload.onprogress = { request.upload.onprogress = {
subscope.launchSafelyWithoutExceptions { onUpload(it.loaded.toLong(), it.total.toLong()) } subscope.launchSafelyWithoutExceptions { onUpload.onProgress(it.loaded.toLong(), it.total.toLong()) }
} }
request.onload = { request.onload = {
if (request.status == 200.toShort()) { if (request.status == 200.toShort()) {

View File

@ -1,8 +1,7 @@
package dev.inmo.micro_utils.ktor.client package dev.inmo.micro_utils.ktor.client
import dev.inmo.micro_utils.common.Progress
import io.ktor.client.HttpClient import io.ktor.client.HttpClient
import io.ktor.client.engine.mergeHeaders import io.ktor.client.content.*
import io.ktor.client.plugins.onUpload import io.ktor.client.plugins.onUpload
import io.ktor.client.request.HttpRequestBuilder import io.ktor.client.request.HttpRequestBuilder
import io.ktor.client.request.forms.InputProvider import io.ktor.client.request.forms.InputProvider
@ -20,7 +19,6 @@ import kotlinx.serialization.DeserializationStrategy
import kotlinx.serialization.InternalSerializationApi import kotlinx.serialization.InternalSerializationApi
import kotlinx.serialization.SerializationStrategy import kotlinx.serialization.SerializationStrategy
import kotlinx.serialization.StringFormat import kotlinx.serialization.StringFormat
import kotlinx.serialization.encodeToString
import kotlinx.serialization.serializer import kotlinx.serialization.serializer
import java.io.File import java.io.File
@ -39,7 +37,7 @@ actual suspend fun <T> HttpClient.uniUpload(
resultDeserializer: DeserializationStrategy<T>, resultDeserializer: DeserializationStrategy<T>,
headers: Headers, headers: Headers,
stringFormat: StringFormat, stringFormat: StringFormat,
onUpload: OnUploadCallback onUpload: ProgressListener
): T? { ): T? {
val withBinary = data.values.any { it is File || it is UniUploadFileInfo } val withBinary = data.values.any { it is File || it is UniUploadFileInfo }
@ -76,7 +74,7 @@ actual suspend fun <T> HttpClient.uniUpload(
appendAll(headers) appendAll(headers)
} }
onUpload { bytesSentTotal, contentLength -> onUpload { bytesSentTotal, contentLength ->
onUpload(bytesSentTotal, contentLength) onUpload.onProgress(bytesSentTotal, contentLength)
} }
} }

View File

@ -5,6 +5,7 @@ import dev.inmo.micro_utils.common.filename
import dev.inmo.micro_utils.ktor.common.TemporalFileId import dev.inmo.micro_utils.ktor.common.TemporalFileId
import dev.inmo.micro_utils.mime_types.getMimeTypeOrAny import dev.inmo.micro_utils.mime_types.getMimeTypeOrAny
import io.ktor.client.HttpClient import io.ktor.client.HttpClient
import io.ktor.client.content.*
import io.ktor.client.plugins.onUpload import io.ktor.client.plugins.onUpload
import io.ktor.client.request.forms.formData import io.ktor.client.request.forms.formData
import io.ktor.client.request.forms.submitFormWithBinaryData import io.ktor.client.request.forms.submitFormWithBinaryData

View File

@ -1,9 +1,8 @@
package dev.inmo.micro_utils.ktor.client package dev.inmo.micro_utils.ktor.client
import dev.inmo.micro_utils.common.MPPFile import dev.inmo.micro_utils.common.MPPFile
import dev.inmo.micro_utils.common.Progress
import io.ktor.client.HttpClient import io.ktor.client.HttpClient
import io.ktor.client.engine.mergeHeaders import io.ktor.client.content.*
import io.ktor.client.plugins.onUpload import io.ktor.client.plugins.onUpload
import io.ktor.client.request.HttpRequestBuilder import io.ktor.client.request.HttpRequestBuilder
import io.ktor.client.request.forms.InputProvider import io.ktor.client.request.forms.InputProvider
@ -21,7 +20,6 @@ import kotlinx.serialization.DeserializationStrategy
import kotlinx.serialization.InternalSerializationApi import kotlinx.serialization.InternalSerializationApi
import kotlinx.serialization.SerializationStrategy import kotlinx.serialization.SerializationStrategy
import kotlinx.serialization.StringFormat import kotlinx.serialization.StringFormat
import kotlinx.serialization.encodeToString
import kotlinx.serialization.serializer import kotlinx.serialization.serializer
/** /**
@ -39,7 +37,7 @@ actual suspend fun <T> HttpClient.uniUpload(
resultDeserializer: DeserializationStrategy<T>, resultDeserializer: DeserializationStrategy<T>,
headers: Headers, headers: Headers,
stringFormat: StringFormat, stringFormat: StringFormat,
onUpload: OnUploadCallback onUpload: ProgressListener
): T? { ): T? {
val withBinary = data.values.any { it is MPPFile || it is UniUploadFileInfo } val withBinary = data.values.any { it is MPPFile || it is UniUploadFileInfo }
@ -75,9 +73,7 @@ actual suspend fun <T> HttpClient.uniUpload(
headers { headers {
appendAll(headers) appendAll(headers)
} }
onUpload { bytesSentTotal, contentLength -> onUpload(onUpload)
onUpload(bytesSentTotal, contentLength)
}
} }
val response = if (withBinary) { val response = if (withBinary) {

View File

@ -5,6 +5,7 @@ import dev.inmo.micro_utils.common.filename
import dev.inmo.micro_utils.ktor.common.TemporalFileId import dev.inmo.micro_utils.ktor.common.TemporalFileId
import dev.inmo.micro_utils.mime_types.getMimeTypeOrAny import dev.inmo.micro_utils.mime_types.getMimeTypeOrAny
import io.ktor.client.HttpClient import io.ktor.client.HttpClient
import io.ktor.client.content.*
import io.ktor.client.plugins.onUpload import io.ktor.client.plugins.onUpload
import io.ktor.client.request.forms.formData import io.ktor.client.request.forms.formData
import io.ktor.client.request.forms.submitFormWithBinaryData import io.ktor.client.request.forms.submitFormWithBinaryData
@ -18,7 +19,7 @@ internal val MPPFile.mimeType: String
actual suspend fun HttpClient.tempUpload( actual suspend fun HttpClient.tempUpload(
fullTempUploadDraftPath: String, fullTempUploadDraftPath: String,
file: MPPFile, file: MPPFile,
onUpload: OnUploadCallback onUpload: ProgressListener
): TemporalFileId { ): TemporalFileId {
val inputProvider = file.inputProvider() val inputProvider = file.inputProvider()
val fileId = submitFormWithBinaryData( val fileId = submitFormWithBinaryData(

View File

@ -1,9 +1,8 @@
package dev.inmo.micro_utils.ktor.client package dev.inmo.micro_utils.ktor.client
import dev.inmo.micro_utils.common.MPPFile import dev.inmo.micro_utils.common.MPPFile
import dev.inmo.micro_utils.common.Progress
import io.ktor.client.HttpClient import io.ktor.client.HttpClient
import io.ktor.client.engine.mergeHeaders import io.ktor.client.content.*
import io.ktor.client.plugins.onUpload import io.ktor.client.plugins.onUpload
import io.ktor.client.request.HttpRequestBuilder import io.ktor.client.request.HttpRequestBuilder
import io.ktor.client.request.forms.InputProvider import io.ktor.client.request.forms.InputProvider
@ -21,7 +20,6 @@ import kotlinx.serialization.DeserializationStrategy
import kotlinx.serialization.InternalSerializationApi import kotlinx.serialization.InternalSerializationApi
import kotlinx.serialization.SerializationStrategy import kotlinx.serialization.SerializationStrategy
import kotlinx.serialization.StringFormat import kotlinx.serialization.StringFormat
import kotlinx.serialization.encodeToString
import kotlinx.serialization.serializer import kotlinx.serialization.serializer
/** /**
@ -39,7 +37,7 @@ actual suspend fun <T> HttpClient.uniUpload(
resultDeserializer: DeserializationStrategy<T>, resultDeserializer: DeserializationStrategy<T>,
headers: Headers, headers: Headers,
stringFormat: StringFormat, stringFormat: StringFormat,
onUpload: OnUploadCallback onUpload: ProgressListener
): T? { ): T? {
val withBinary = data.values.any { it is MPPFile || it is UniUploadFileInfo } val withBinary = data.values.any { it is MPPFile || it is UniUploadFileInfo }
@ -75,9 +73,7 @@ actual suspend fun <T> HttpClient.uniUpload(
headers { headers {
appendAll(headers) appendAll(headers)
} }
onUpload { bytesSentTotal, contentLength -> onUpload(onUpload)
onUpload(bytesSentTotal, contentLength)
}
} }
val response = if (withBinary) { val response = if (withBinary) {

View File

@ -5,6 +5,7 @@ import dev.inmo.micro_utils.common.filename
import dev.inmo.micro_utils.ktor.common.TemporalFileId import dev.inmo.micro_utils.ktor.common.TemporalFileId
import dev.inmo.micro_utils.mime_types.getMimeTypeOrAny import dev.inmo.micro_utils.mime_types.getMimeTypeOrAny
import io.ktor.client.HttpClient import io.ktor.client.HttpClient
import io.ktor.client.content.*
import io.ktor.client.plugins.onUpload import io.ktor.client.plugins.onUpload
import io.ktor.client.request.forms.formData import io.ktor.client.request.forms.formData
import io.ktor.client.request.forms.submitFormWithBinaryData import io.ktor.client.request.forms.submitFormWithBinaryData
@ -18,7 +19,7 @@ internal val MPPFile.mimeType: String
actual suspend fun HttpClient.tempUpload( actual suspend fun HttpClient.tempUpload(
fullTempUploadDraftPath: String, fullTempUploadDraftPath: String,
file: MPPFile, file: MPPFile,
onUpload: OnUploadCallback onUpload: ProgressListener
): TemporalFileId { ): TemporalFileId {
val inputProvider = file.inputProvider() val inputProvider = file.inputProvider()
val fileId = submitFormWithBinaryData( val fileId = submitFormWithBinaryData(

View File

@ -1,9 +1,8 @@
package dev.inmo.micro_utils.ktor.client package dev.inmo.micro_utils.ktor.client
import dev.inmo.micro_utils.common.MPPFile import dev.inmo.micro_utils.common.MPPFile
import dev.inmo.micro_utils.common.Progress
import io.ktor.client.HttpClient import io.ktor.client.HttpClient
import io.ktor.client.engine.mergeHeaders import io.ktor.client.content.*
import io.ktor.client.plugins.onUpload import io.ktor.client.plugins.onUpload
import io.ktor.client.request.HttpRequestBuilder import io.ktor.client.request.HttpRequestBuilder
import io.ktor.client.request.forms.InputProvider import io.ktor.client.request.forms.InputProvider
@ -21,7 +20,6 @@ import kotlinx.serialization.DeserializationStrategy
import kotlinx.serialization.InternalSerializationApi import kotlinx.serialization.InternalSerializationApi
import kotlinx.serialization.SerializationStrategy import kotlinx.serialization.SerializationStrategy
import kotlinx.serialization.StringFormat import kotlinx.serialization.StringFormat
import kotlinx.serialization.encodeToString
import kotlinx.serialization.serializer import kotlinx.serialization.serializer
/** /**
@ -39,7 +37,7 @@ actual suspend fun <T> HttpClient.uniUpload(
resultDeserializer: DeserializationStrategy<T>, resultDeserializer: DeserializationStrategy<T>,
headers: Headers, headers: Headers,
stringFormat: StringFormat, stringFormat: StringFormat,
onUpload: OnUploadCallback onUpload: ProgressListener
): T? { ): T? {
val withBinary = data.values.any { it is MPPFile || it is UniUploadFileInfo } val withBinary = data.values.any { it is MPPFile || it is UniUploadFileInfo }
@ -75,9 +73,7 @@ actual suspend fun <T> HttpClient.uniUpload(
headers { headers {
appendAll(headers) appendAll(headers)
} }
onUpload { bytesSentTotal, contentLength -> onUpload(onUpload)
onUpload(bytesSentTotal, contentLength)
}
} }
val response = if (withBinary) { val response = if (withBinary) {

View File

@ -1,13 +1,12 @@
package dev.inmo.micro_utils.ktor.common package dev.inmo.micro_utils.ktor.common
import io.ktor.utils.io.core.Input import io.ktor.utils.io.streams.*
import io.ktor.utils.io.core.copyTo import kotlinx.io.Source
import io.ktor.utils.io.streams.asOutput import kotlinx.io.readTo
import java.io.File import java.io.File
import java.io.InputStream
import java.util.UUID import java.util.UUID
fun Input.downloadToTempFile( fun Source.downloadToTempFile(
fileName: String = UUID.randomUUID().toString(), fileName: String = UUID.randomUUID().toString(),
fileExtension: String? = ".temp", fileExtension: String? = ".temp",
folder: File? = null folder: File? = null
@ -17,7 +16,7 @@ fun Input.downloadToTempFile(
folder folder
).apply { ).apply {
outputStream().use { outputStream().use {
copyTo(it.asOutput()) it.writePacket(this@downloadToTempFile)
} }
deleteOnExit() deleteOnExit()
} }

View File

@ -1,15 +0,0 @@
package dev.inmo.micro_utils.ktor.server
import io.ktor.server.application.ApplicationCall
import io.ktor.server.response.responseType
import io.ktor.util.InternalAPI
import io.ktor.util.reflect.TypeInfo
@InternalAPI
suspend fun <T : Any> ApplicationCall.respond(
message: T,
typeInfo: TypeInfo
) {
response.responseType = typeInfo
response.pipeline.execute(this, message as Any)
}

View File

@ -4,13 +4,13 @@ import com.benasher44.uuid.uuid4
import io.ktor.http.content.PartData import io.ktor.http.content.PartData
import io.ktor.utils.io.copyTo import io.ktor.utils.io.copyTo
import io.ktor.utils.io.core.copyTo import io.ktor.utils.io.core.copyTo
import io.ktor.utils.io.jvm.javaio.copyTo import io.ktor.utils.io.jvm.javaio.*
import io.ktor.utils.io.streams.asOutput import io.ktor.utils.io.streams.*
import java.io.File import java.io.File
fun PartData.FileItem.download(target: File) { fun PartData.FileItem.download(target: File) {
provider().use { input -> provider().toInputStream().use { input ->
target.outputStream().asOutput().use { target.outputStream().use {
input.copyTo(it) input.copyTo(it)
} }
} }
@ -25,9 +25,9 @@ fun PartData.FileItem.downloadToTemporalFile(): File {
} }
fun PartData.BinaryItem.download(target: File) { fun PartData.BinaryItem.download(target: File) {
provider().use { input -> provider().inputStream().use { input ->
target.outputStream().use { target.outputStream().use {
input.copyTo(it.asOutput()) input.copyTo(it)
} }
} }
} }

View File

@ -1,7 +1,7 @@
package dev.inmo.micro_utils.ktor.server package dev.inmo.micro_utils.ktor.server
import dev.inmo.micro_utils.ktor.server.configurators.KtorApplicationConfigurator import dev.inmo.micro_utils.ktor.server.configurators.KtorApplicationConfigurator
import io.ktor.server.application.Application import io.ktor.server.application.*
import io.ktor.server.cio.CIO import io.ktor.server.cio.CIO
import io.ktor.server.cio.CIOApplicationEngine import io.ktor.server.cio.CIOApplicationEngine
import io.ktor.server.engine.* import io.ktor.server.engine.*
@ -11,20 +11,22 @@ fun <TEngine : ApplicationEngine, TConfiguration : ApplicationEngine.Configurati
engine: ApplicationEngineFactory<TEngine, TConfiguration>, engine: ApplicationEngineFactory<TEngine, TConfiguration>,
host: String = "localhost", host: String = "localhost",
port: Int = Random.nextInt(1024, 65535), port: Int = Random.nextInt(1024, 65535),
additionalEngineEnvironmentConfigurator: ApplicationEngineEnvironmentBuilder.() -> Unit = {}, additionalEngineEnvironmentConfigurator: EngineConnectorBuilder.() -> Unit = {},
additionalConfigurationConfigurator: TConfiguration.() -> Unit = {}, additionalConfigurationConfigurator: TConfiguration.() -> Unit = {},
environment: ApplicationEnvironment = applicationEnvironment(),
block: Application.() -> Unit block: Application.() -> Unit
): TEngine = embeddedServer( ): EmbeddedServer<TEngine, TConfiguration> = embeddedServer<TEngine, TConfiguration>(
engine, engine,
applicationEngineEnvironment { environment,
module(block) {
connector { connector {
this.host = host this.host = host
this.port = port this.port = port
additionalEngineEnvironmentConfigurator()
} }
additionalEngineEnvironmentConfigurator() additionalConfigurationConfigurator()
}, },
additionalConfigurationConfigurator module = block
) )
/** /**
@ -35,15 +37,17 @@ fun <TEngine : ApplicationEngine, TConfiguration : ApplicationEngine.Configurati
fun createKtorServer( fun createKtorServer(
host: String = "localhost", host: String = "localhost",
port: Int = Random.nextInt(1024, 65535), port: Int = Random.nextInt(1024, 65535),
additionalEngineEnvironmentConfigurator: ApplicationEngineEnvironmentBuilder.() -> Unit = {}, additionalEngineEnvironmentConfigurator: EngineConnectorBuilder.() -> Unit = {},
additionalConfigurationConfigurator: CIOApplicationEngine.Configuration.() -> Unit = {}, additionalConfigurationConfigurator: CIOApplicationEngine.Configuration.() -> Unit = {},
environment: ApplicationEnvironment = applicationEnvironment(),
block: Application.() -> Unit block: Application.() -> Unit
): CIOApplicationEngine = createKtorServer( ): EmbeddedServer<CIOApplicationEngine, CIOApplicationEngine.Configuration> = createKtorServer(
CIO, CIO,
host, host,
port, port,
additionalEngineEnvironmentConfigurator, additionalEngineEnvironmentConfigurator,
additionalConfigurationConfigurator, additionalConfigurationConfigurator,
environment,
block block
) )
@ -51,15 +55,17 @@ fun <TEngine : ApplicationEngine, TConfiguration : ApplicationEngine.Configurati
engine: ApplicationEngineFactory<TEngine, TConfiguration>, engine: ApplicationEngineFactory<TEngine, TConfiguration>,
host: String = "localhost", host: String = "localhost",
port: Int = Random.nextInt(1024, 65535), port: Int = Random.nextInt(1024, 65535),
additionalEngineEnvironmentConfigurator: ApplicationEngineEnvironmentBuilder.() -> Unit = {}, additionalEngineEnvironmentConfigurator: EngineConnectorBuilder.() -> Unit = {},
additionalConfigurationConfigurator: TConfiguration.() -> Unit = {}, additionalConfigurationConfigurator: TConfiguration.() -> Unit = {},
environment: ApplicationEnvironment = applicationEnvironment(),
configurators: List<KtorApplicationConfigurator> configurators: List<KtorApplicationConfigurator>
): TEngine = createKtorServer( ): EmbeddedServer<TEngine, TConfiguration> = createKtorServer(
engine, engine,
host, host,
port, port,
additionalEngineEnvironmentConfigurator, additionalEngineEnvironmentConfigurator,
additionalConfigurationConfigurator additionalConfigurationConfigurator,
environment,
) { ) {
configurators.forEach { it.apply { configure() } } configurators.forEach { it.apply { configure() } }
} }
@ -73,6 +79,7 @@ fun createKtorServer(
host: String = "localhost", host: String = "localhost",
port: Int = Random.nextInt(1024, 65535), port: Int = Random.nextInt(1024, 65535),
configurators: List<KtorApplicationConfigurator>, configurators: List<KtorApplicationConfigurator>,
additionalEngineEnvironmentConfigurator: ApplicationEngineEnvironmentBuilder.() -> Unit = {}, additionalEngineEnvironmentConfigurator: EngineConnectorBuilder.() -> Unit = {},
additionalConfigurationConfigurator: CIOApplicationEngine.Configuration.() -> Unit = {}, additionalConfigurationConfigurator: CIOApplicationEngine.Configuration.() -> Unit = {},
): ApplicationEngine = createKtorServer(CIO, host, port, additionalEngineEnvironmentConfigurator, additionalConfigurationConfigurator, configurators) environment: ApplicationEnvironment = applicationEnvironment(),
): EmbeddedServer<CIOApplicationEngine, CIOApplicationEngine.Configuration> = createKtorServer(CIO, host, port, additionalEngineEnvironmentConfigurator, additionalConfigurationConfigurator, environment, configurators)

View File

@ -17,6 +17,7 @@ import io.ktor.server.response.respondText
import io.ktor.server.routing.Route import io.ktor.server.routing.Route
import io.ktor.server.routing.post import io.ktor.server.routing.post
import kotlinx.coroutines.* import kotlinx.coroutines.*
import kotlinx.coroutines.channels.BufferOverflow
import kotlinx.coroutines.flow.* import kotlinx.coroutines.flow.*
import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.sync.withLock
@ -26,7 +27,10 @@ import java.nio.file.attribute.FileTime
class TemporalFilesRoutingConfigurator( class TemporalFilesRoutingConfigurator(
private val subpath: String = DefaultTemporalFilesSubPath, private val subpath: String = DefaultTemporalFilesSubPath,
private val temporalFilesUtilizer: TemporalFilesUtilizer = TemporalFilesUtilizer private val temporalFilesUtilizer: TemporalFilesUtilizer = TemporalFilesUtilizer,
filesFlowReplay: Int = 0,
filesFlowExtraBufferCapacity: Int = Int.MAX_VALUE,
filesFlowOnBufferOverflow: BufferOverflow = BufferOverflow.SUSPEND
) : ApplicationRoutingConfigurator.Element { ) : ApplicationRoutingConfigurator.Element {
interface TemporalFilesUtilizer { interface TemporalFilesUtilizer {
fun start(filesMap: MutableMap<TemporalFileId, MPPFile>, filesMutex: Mutex, onNewFileFlow: Flow<TemporalFileId>): Job fun start(filesMap: MutableMap<TemporalFileId, MPPFile>, filesMutex: Mutex, onNewFileFlow: Flow<TemporalFileId>): Job
@ -74,7 +78,11 @@ class TemporalFilesRoutingConfigurator(
private val temporalFilesMap = mutableMapOf<TemporalFileId, MPPFile>() private val temporalFilesMap = mutableMapOf<TemporalFileId, MPPFile>()
private val temporalFilesMutex = Mutex() private val temporalFilesMutex = Mutex()
private val filesFlow = MutableSharedFlow<TemporalFileId>() private val filesFlow = MutableSharedFlow<TemporalFileId>(
replay = filesFlowReplay,
extraBufferCapacity = filesFlowExtraBufferCapacity,
onBufferOverflow = filesFlowOnBufferOverflow
)
val utilizerJob = temporalFilesUtilizer.start(temporalFilesMap, temporalFilesMutex, filesFlow.asSharedFlow()) val utilizerJob = temporalFilesUtilizer.start(temporalFilesMap, temporalFilesMutex, filesFlow.asSharedFlow())
override fun Route.invoke() { override fun Route.invoke() {
@ -111,7 +119,7 @@ class TemporalFilesRoutingConfigurator(
temporalFilesMap[fileId] = file temporalFilesMap[fileId] = file
} }
call.respondText(fileId.string) call.respondText(fileId.string)
launchSafelyWithoutExceptions { filesFlow.emit(fileId) } filesFlow.emit(fileId)
} ?: call.respond(HttpStatusCode.BadRequest) } ?: call.respond(HttpStatusCode.BadRequest)
} }
} }

View File

@ -6,6 +6,7 @@ import dev.inmo.micro_utils.ktor.common.downloadToTempFile
import io.ktor.http.content.* import io.ktor.http.content.*
import io.ktor.server.application.ApplicationCall import io.ktor.server.application.ApplicationCall
import io.ktor.server.request.receiveMultipart import io.ktor.server.request.receiveMultipart
import io.ktor.utils.io.*
import io.ktor.utils.io.core.* import io.ktor.utils.io.core.*
import kotlinx.coroutines.currentCoroutineContext import kotlinx.coroutines.currentCoroutineContext
import kotlinx.coroutines.isActive import kotlinx.coroutines.isActive
@ -47,7 +48,7 @@ suspend fun ApplicationCall.uniloadMultipart(
onBinaryChannelItem onBinaryChannelItem
) { ) {
when (it.name) { when (it.name) {
"bytes" -> resultInput = it.provider() "bytes" -> resultInput = it.provider().readBuffer()
else -> onCustomFileItem(it) else -> onCustomFileItem(it)
} }
} }

View File

@ -2,8 +2,7 @@ package dev.inmo.micro_utils.ktor.server.configurators
import dev.inmo.micro_utils.ktor.server.configurators.ApplicationRoutingConfigurator.Element import dev.inmo.micro_utils.ktor.server.configurators.ApplicationRoutingConfigurator.Element
import io.ktor.server.application.* import io.ktor.server.application.*
import io.ktor.server.routing.Route import io.ktor.server.routing.*
import io.ktor.server.routing.Routing
import kotlinx.serialization.Contextual import kotlinx.serialization.Contextual
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
@ -19,9 +18,7 @@ class ApplicationRoutingConfigurator(
} }
override fun Application.configure() { override fun Application.configure() {
pluginOrNull(Routing) ?.apply { routing {
rootInstaller.apply { invoke() }
} ?: install(Routing) {
rootInstaller.apply { invoke() } rootInstaller.apply { invoke() }
} }
} }

View File

@ -23,9 +23,7 @@ interface KtorApplicationConfigurator {
} }
override fun Application.configure() { override fun Application.configure() {
pluginOrNull(io.ktor.server.routing.Routing) ?.apply { routing {
rootInstaller.apply { invoke() }
} ?: install(io.ktor.server.routing.Routing) {
rootInstaller.apply { invoke() } rootInstaller.apply { invoke() }
} }
} }

View File

@ -8,7 +8,7 @@ import dev.inmo.micro_utils.repos.ktor.common.key_value.*
import io.ktor.client.HttpClient import io.ktor.client.HttpClient
import io.ktor.client.request.post import io.ktor.client.request.post
import io.ktor.http.* import io.ktor.http.*
import io.ktor.util.InternalAPI import io.ktor.utils.io.InternalAPI
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.coroutines.flow.Flow

View File

@ -8,7 +8,7 @@ import dev.inmo.micro_utils.repos.ktor.common.one_to_many.*
import io.ktor.client.HttpClient import io.ktor.client.HttpClient
import io.ktor.client.request.post import io.ktor.client.request.post
import io.ktor.http.* import io.ktor.http.*
import io.ktor.util.InternalAPI import io.ktor.utils.io.InternalAPI
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.coroutines.flow.Flow

View File

@ -25,7 +25,7 @@ import kotlin.test.Test
import kotlin.test.assertEquals import kotlin.test.assertEquals
class KtorCRUDRepoTests : CommonCRUDRepoTests() { class KtorCRUDRepoTests : CommonCRUDRepoTests() {
private var engine: ApplicationEngine? = null private var engine: EmbeddedServer<*, *>? = null
@BeforeTest @BeforeTest
fun beforeTest() { fun beforeTest() {

View File

@ -27,7 +27,7 @@ import kotlinx.serialization.json.Json
import kotlin.test.* import kotlin.test.*
class KtorKeyValueRepoTests : CommonKeyValueRepoTests() { class KtorKeyValueRepoTests : CommonKeyValueRepoTests() {
private var engine: ApplicationEngine? = null private var engine: EmbeddedServer<*, *>? = null
override val repoCreator: suspend () -> KeyValueRepo<String, String> = { override val repoCreator: suspend () -> KeyValueRepo<String, String> = {
KtorKeyValueRepoClient( KtorKeyValueRepoClient(
@ -77,7 +77,7 @@ class KtorKeyValueRepoTests : CommonKeyValueRepoTests() {
repo, repo,
Int.serializer(), Int.serializer(),
ComplexData.serializer(), ComplexData.serializer(),
Json {} Json
) )
} }
}.start(false) }.start(false)

View File

@ -23,7 +23,7 @@ import kotlinx.serialization.json.Json
import kotlin.test.* import kotlin.test.*
class KtorKeyValuesRepoTests : CommonKeyValuesRepoTests() { class KtorKeyValuesRepoTests : CommonKeyValuesRepoTests() {
private var engine: ApplicationEngine? = null private var engine: EmbeddedServer<*, *>? = null
override val testSequencesSize: Int override val testSequencesSize: Int
get() = 100 get() = 100

View File

@ -13,7 +13,7 @@ import io.ktor.server.websocket.*
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
object KtorRepoTestsHelper { object KtorRepoTestsHelper {
fun beforeTest(routingConfigurator: Routing.() -> Unit): ApplicationEngine { fun beforeTest(routingConfigurator: Routing.() -> Unit): EmbeddedServer<CIOApplicationEngine, CIOApplicationEngine.Configuration> {
return embeddedServer( return embeddedServer(
CIO, CIO,
23456, 23456,
@ -28,7 +28,7 @@ object KtorRepoTestsHelper {
routing(routingConfigurator) routing(routingConfigurator)
}.start(false) }.start(false)
} }
fun afterTest(engine: ApplicationEngine) { fun afterTest(engine: EmbeddedServer<*, *>) {
engine.stop() engine.stop()
} }
fun client(): HttpClient = HttpClient { fun client(): HttpClient = HttpClient {

View File

@ -16,7 +16,7 @@ import io.ktor.server.application.call
import io.ktor.server.response.respond import io.ktor.server.response.respond
import io.ktor.server.routing.Route import io.ktor.server.routing.Route
import io.ktor.server.routing.get import io.ktor.server.routing.get
import io.ktor.util.InternalAPI import io.ktor.utils.io.InternalAPI
import io.ktor.util.reflect.typeInfo import io.ktor.util.reflect.typeInfo
import kotlinx.serialization.* import kotlinx.serialization.*

View File

@ -14,7 +14,7 @@ import io.ktor.server.application.call
import io.ktor.server.response.respond import io.ktor.server.response.respond
import io.ktor.server.routing.Route import io.ktor.server.routing.Route
import io.ktor.server.routing.get import io.ktor.server.routing.get
import io.ktor.util.InternalAPI import io.ktor.utils.io.InternalAPI
import io.ktor.util.reflect.typeInfo import io.ktor.util.reflect.typeInfo
import kotlinx.serialization.* import kotlinx.serialization.*

View File

@ -11,7 +11,7 @@ class TypedSerializerTests {
interface Example { interface Example {
val number: Number val number: Number
} }
val serialFormat = Json { } val serialFormat = Json
@Serializable @Serializable
data class Example1(override val number: Long) : Example data class Example1(override val number: Long) : Example