fix of build after migration (wat)

2025-09-09 02:00:01 +00:00 · 2024-10-11 23:32:11 +06:00
parent fce7ec8912
commit 301cdaa2c2
28 changed files with 86 additions and 104 deletions
--- a/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/client/TemporalUpload.kt
+++ b/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/client/TemporalUpload.kt
@@ -8,5 +8,5 @@ import io.ktor.client.content.*
 expect suspend fun HttpClient.tempUpload(
    fullTempUploadDraftPath: String,
    file: MPPFile,
-    onUpload: ProgressListener = { _, _ -> }
+    onUpload: ProgressListener = ProgressListener { _, _ -> }
 ): TemporalFileId
--- a/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/client/UniUpload.kt
+++ b/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/client/UniUpload.kt
@@ -4,8 +4,8 @@ import dev.inmo.micro_utils.common.FileName
 import dev.inmo.micro_utils.common.MPPFile
 import dev.inmo.micro_utils.ktor.common.LambdaInputProvider
 import io.ktor.client.HttpClient
+import io.ktor.client.content.*
 import io.ktor.http.Headers
-import io.ktor.utils.io.core.Input
 import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.StringFormat
 import kotlinx.serialization.json.Json
@@ -31,7 +31,7 @@ expect suspend fun <T> HttpClient.uniUpload(
    resultDeserializer: DeserializationStrategy<T>,
    headers: Headers = Headers.Empty,
    stringFormat: StringFormat = Json,
-    onUpload: OnUploadCallback = { _, _ -> }
+    onUpload: ProgressListener = ProgressListener { _, _ -> }
 ): T?

 /**
@@ -46,7 +46,7 @@ suspend fun <T> HttpClient.uniUpload(
    additionalData: Map<String, Any> = emptyMap(),
    headers: Headers = Headers.Empty,
    stringFormat: StringFormat = Json,
-    onUpload: OnUploadCallback = { _, _ -> }
+    onUpload: ProgressListener = ProgressListener { _, _ -> }
 ): T? = uniUpload(
    url,
    additionalData + ("bytes" to file),
@@ -68,7 +68,7 @@ suspend fun <T> HttpClient.uniUpload(
    additionalData: Map<String, Any> = emptyMap(),
    headers: Headers = Headers.Empty,
    stringFormat: StringFormat = Json,
-    onUpload: OnUploadCallback = { _, _ -> }
+    onUpload: ProgressListener = ProgressListener { _, _ -> }
 ): T? = uniUpload(
    url,
    additionalData + ("bytes" to info),
@@ -93,7 +93,7 @@ suspend fun <T> HttpClient.uniUpload(
    additionalData: Map<String, Any> = emptyMap(),
    headers: Headers = Headers.Empty,
    stringFormat: StringFormat = Json,
-    onUpload: OnUploadCallback = { _, _ -> }
+    onUpload: ProgressListener = ProgressListener { _, _ -> }
 ): T? = uniUpload(
    url,
    UniUploadFileInfo(fileName, mimeType, inputAllocator),
--- a/ktor/client/src/jsMain/kotlin/dev/inmo/micro_utils/ktor/client/ActualTemporalUpload.kt
+++ b/ktor/client/src/jsMain/kotlin/dev/inmo/micro_utils/ktor/client/ActualTemporalUpload.kt
@@ -7,8 +7,6 @@ import dev.inmo.micro_utils.ktor.common.TemporalFileId
 import io.ktor.client.HttpClient
 import io.ktor.client.content.*
 import kotlinx.coroutines.*
-import org.w3c.dom.mediasource.ENDED
-import org.w3c.dom.mediasource.ReadyState
 import org.w3c.xhr.*
 import org.w3c.xhr.XMLHttpRequest.Companion.DONE

@@ -29,7 +27,7 @@ suspend fun tempUpload(
    val request = XMLHttpRequest()
    request.responseType = XMLHttpRequestResponseType.TEXT
    request.upload.onprogress = {
-        subscope.launchSafelyWithoutExceptions { onUpload(it.loaded.toLong(), it.total.toLong()) }
+        subscope.launchSafelyWithoutExceptions { onUpload.onProgress(it.loaded.toLong(), it.total.toLong()) }
    }
    request.onload = {
        if (request.status == 200.toShort()) {
--- a/ktor/client/src/jsMain/kotlin/dev/inmo/micro_utils/ktor/client/ActualUniUpload.kt
+++ b/ktor/client/src/jsMain/kotlin/dev/inmo/micro_utils/ktor/client/ActualUniUpload.kt
@@ -1,10 +1,10 @@
 package dev.inmo.micro_utils.ktor.client

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

-import dev.inmo.micro_utils.common.Progress
 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.request.HttpRequestBuilder
 import io.ktor.client.request.forms.InputProvider
@@ -20,7 +19,6 @@ import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.InternalSerializationApi
 import kotlinx.serialization.SerializationStrategy
 import kotlinx.serialization.StringFormat
-import kotlinx.serialization.encodeToString
 import kotlinx.serialization.serializer
 import java.io.File

@@ -39,7 +37,7 @@ actual suspend fun <T> HttpClient.uniUpload(
    resultDeserializer: DeserializationStrategy<T>,
    headers: Headers,
    stringFormat: StringFormat,
-    onUpload: OnUploadCallback
+    onUpload: ProgressListener
 ): T? {
    val withBinary = data.values.any { it is File || it is UniUploadFileInfo }

@@ -76,7 +74,7 @@ actual suspend fun <T> HttpClient.uniUpload(
            appendAll(headers)
        }
        onUpload { bytesSentTotal, contentLength ->
-            onUpload(bytesSentTotal, contentLength)
+            onUpload.onProgress(bytesSentTotal, contentLength)
        }
    }

--- a/ktor/client/src/linuxArm64Main/kotlin/ActualTemporalUpload.kt
+++ b/ktor/client/src/linuxArm64Main/kotlin/ActualTemporalUpload.kt
@@ -5,6 +5,7 @@ import dev.inmo.micro_utils.common.filename
 import dev.inmo.micro_utils.ktor.common.TemporalFileId
 import dev.inmo.micro_utils.mime_types.getMimeTypeOrAny
 import io.ktor.client.HttpClient
+import io.ktor.client.content.*
 import io.ktor.client.plugins.onUpload
 import io.ktor.client.request.forms.formData
 import io.ktor.client.request.forms.submitFormWithBinaryData
--- a/ktor/client/src/linuxArm64Main/kotlin/ActualUniUpload.kt
+++ b/ktor/client/src/linuxArm64Main/kotlin/ActualUniUpload.kt
@@ -1,9 +1,8 @@
 package dev.inmo.micro_utils.ktor.client

 import dev.inmo.micro_utils.common.MPPFile
-import dev.inmo.micro_utils.common.Progress
 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.request.HttpRequestBuilder
 import io.ktor.client.request.forms.InputProvider
@@ -21,7 +20,6 @@ import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.InternalSerializationApi
 import kotlinx.serialization.SerializationStrategy
 import kotlinx.serialization.StringFormat
-import kotlinx.serialization.encodeToString
 import kotlinx.serialization.serializer

 /**
@@ -39,7 +37,7 @@ actual suspend fun <T> HttpClient.uniUpload(
    resultDeserializer: DeserializationStrategy<T>,
    headers: Headers,
    stringFormat: StringFormat,
-    onUpload: OnUploadCallback
+    onUpload: ProgressListener
 ): T? {
    val withBinary = data.values.any { it is MPPFile || it is UniUploadFileInfo }

@@ -75,9 +73,7 @@ actual suspend fun <T> HttpClient.uniUpload(
        headers {
            appendAll(headers)
        }
-        onUpload { bytesSentTotal, contentLength ->
-            onUpload(bytesSentTotal, contentLength)
-        }
+        onUpload(onUpload)
    }

    val response = if (withBinary) {
--- a/ktor/client/src/linuxX64Main/kotlin/ActualTemporalUpload.kt
+++ b/ktor/client/src/linuxX64Main/kotlin/ActualTemporalUpload.kt
@@ -5,6 +5,7 @@ import dev.inmo.micro_utils.common.filename
 import dev.inmo.micro_utils.ktor.common.TemporalFileId
 import dev.inmo.micro_utils.mime_types.getMimeTypeOrAny
 import io.ktor.client.HttpClient
+import io.ktor.client.content.*
 import io.ktor.client.plugins.onUpload
 import io.ktor.client.request.forms.formData
 import io.ktor.client.request.forms.submitFormWithBinaryData
@@ -18,7 +19,7 @@ internal val MPPFile.mimeType: String
 actual suspend fun HttpClient.tempUpload(
    fullTempUploadDraftPath: String,
    file: MPPFile,
-    onUpload: OnUploadCallback
+    onUpload: ProgressListener
 ): TemporalFileId {
    val inputProvider = file.inputProvider()
    val fileId = submitFormWithBinaryData(
--- a/ktor/client/src/linuxX64Main/kotlin/ActualUniUpload.kt
+++ b/ktor/client/src/linuxX64Main/kotlin/ActualUniUpload.kt
@@ -1,9 +1,8 @@
 package dev.inmo.micro_utils.ktor.client

 import dev.inmo.micro_utils.common.MPPFile
-import dev.inmo.micro_utils.common.Progress
 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.request.HttpRequestBuilder
 import io.ktor.client.request.forms.InputProvider
@@ -21,7 +20,6 @@ import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.InternalSerializationApi
 import kotlinx.serialization.SerializationStrategy
 import kotlinx.serialization.StringFormat
-import kotlinx.serialization.encodeToString
 import kotlinx.serialization.serializer

 /**
@@ -39,7 +37,7 @@ actual suspend fun <T> HttpClient.uniUpload(
    resultDeserializer: DeserializationStrategy<T>,
    headers: Headers,
    stringFormat: StringFormat,
-    onUpload: OnUploadCallback
+    onUpload: ProgressListener
 ): T? {
    val withBinary = data.values.any { it is MPPFile || it is UniUploadFileInfo }

@@ -75,9 +73,7 @@ actual suspend fun <T> HttpClient.uniUpload(
        headers {
            appendAll(headers)
        }
-        onUpload { bytesSentTotal, contentLength ->
-            onUpload(bytesSentTotal, contentLength)
-        }
+        onUpload(onUpload)
    }

    val response = if (withBinary) {
--- a/ktor/client/src/mingwX64Main/kotlin/ActualTemporalUpload.kt
+++ b/ktor/client/src/mingwX64Main/kotlin/ActualTemporalUpload.kt
@@ -5,6 +5,7 @@ import dev.inmo.micro_utils.common.filename
 import dev.inmo.micro_utils.ktor.common.TemporalFileId
 import dev.inmo.micro_utils.mime_types.getMimeTypeOrAny
 import io.ktor.client.HttpClient
+import io.ktor.client.content.*
 import io.ktor.client.plugins.onUpload
 import io.ktor.client.request.forms.formData
 import io.ktor.client.request.forms.submitFormWithBinaryData
@@ -18,7 +19,7 @@ internal val MPPFile.mimeType: String
 actual suspend fun HttpClient.tempUpload(
    fullTempUploadDraftPath: String,
    file: MPPFile,
-    onUpload: OnUploadCallback
+    onUpload: ProgressListener
 ): TemporalFileId {
    val inputProvider = file.inputProvider()
    val fileId = submitFormWithBinaryData(
--- a/ktor/client/src/mingwX64Main/kotlin/ActualUniUpload.kt
+++ b/ktor/client/src/mingwX64Main/kotlin/ActualUniUpload.kt
@@ -1,9 +1,8 @@
 package dev.inmo.micro_utils.ktor.client

 import dev.inmo.micro_utils.common.MPPFile
-import dev.inmo.micro_utils.common.Progress
 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.request.HttpRequestBuilder
 import io.ktor.client.request.forms.InputProvider
@@ -21,7 +20,6 @@ import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.InternalSerializationApi
 import kotlinx.serialization.SerializationStrategy
 import kotlinx.serialization.StringFormat
-import kotlinx.serialization.encodeToString
 import kotlinx.serialization.serializer

 /**
@@ -39,7 +37,7 @@ actual suspend fun <T> HttpClient.uniUpload(
    resultDeserializer: DeserializationStrategy<T>,
    headers: Headers,
    stringFormat: StringFormat,
-    onUpload: OnUploadCallback
+    onUpload: ProgressListener
 ): T? {
    val withBinary = data.values.any { it is MPPFile || it is UniUploadFileInfo }

@@ -75,9 +73,7 @@ actual suspend fun <T> HttpClient.uniUpload(
        headers {
            appendAll(headers)
        }
-        onUpload { bytesSentTotal, contentLength ->
-            onUpload(bytesSentTotal, contentLength)
-        }
+        onUpload(onUpload)
    }

    val response = if (withBinary) {