perf: update ktor, kotlin

app/src/main/kotlin/li/songe/gkd/debug/HttpService.kt

@@ -5,10 +5,10 @@ import android.content.Intent
 import com.blankj.utilcode.util.LogUtils
 import io.ktor.http.ContentType
 import io.ktor.serialization.kotlinx.json.json
-import io.ktor.server.application.call
 import io.ktor.server.application.install
 import io.ktor.server.cio.CIO
 import io.ktor.server.cio.CIOApplicationEngine
+import io.ktor.server.engine.EmbeddedServer
 import io.ktor.server.engine.embeddedServer
 import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.server.request.receive
@@ -22,6 +22,7 @@ import io.ktor.server.routing.route
 import io.ktor.server.routing.routing
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -57,19 +58,21 @@ import java.io.File
 
 
 class HttpService : Service() {
-    private val scope = CoroutineScope(Dispatchers.Default)
+    private val scope = MainScope()
+    private val httpServerPortFlow = storeFlow.map(scope) { s -> s.httpServerPort }
+
+    private var server: EmbeddedServer<CIOApplicationEngine, CIOApplicationEngine.Configuration>? =
+        null
 
-    private var server: CIOApplicationEngine? = null
     override fun onCreate() {
         super.onCreate()
         isRunning.value = true
         localNetworkIpsFlow.value = getIpAddressInLocalNetwork()
-        val httpServerPortFlow = storeFlow.map(scope) { s -> s.httpServerPort }
         scope.launchTry(Dispatchers.IO) {
             httpServerPortFlow.collect { port ->
                 server?.stop()
                 server = try {
-                    createServer(port).apply { start() }
+                    scope.createServer(port).apply { start() }
                 } catch (e: Exception) {
                     LogUtils.d("HTTP服务启动失败", e)
                     null
@@ -86,17 +89,12 @@ class HttpService : Service() {
 
     override fun onDestroy() {
         super.onDestroy()
+        scope.cancel()
         isRunning.value = false
         localNetworkIpsFlow.value = emptyList()
-
-        scope.launchTry(Dispatchers.IO) {
-            server?.stop()
         if (storeFlow.value.autoClearMemorySubs) {
             deleteSubscription(LOCAL_HTTP_SUBS_ID)
         }
-            delay(3000)
-            scope.cancel()
-        }
     }
 
     companion object {
@@ -150,8 +148,7 @@ private val httpSubsItem by lazy {
     )
 }
 
-private fun createServer(port: Int): CIOApplicationEngine {
+private fun CoroutineScope.createServer(port: Int) = embeddedServer(CIO, port) {
-    return embeddedServer(CIO, port) {
     install(KtorCorsPlugin)
     install(KtorErrorPlugin)
     install(ContentNegotiation) { json(keepNullJson) }
@@ -240,5 +237,4 @@ private fun createServer(port: Int): CIOApplicationEngine {
             }
         }
     }
-    }
 }

app/src/main/kotlin/li/songe/gkd/util/Github.kt

@@ -84,6 +84,7 @@ suspend fun uploadFileToGithub(
         }))
     }.body<UploadPoliciesAssetsResponse>()
 
+    val byteArray = file.readBytes()
     // upload to s3
     client.post(policiesResp.upload_url) {
         setCommonHeaders(cookie)
@@ -91,13 +92,13 @@ suspend fun uploadFileToGithub(
             policiesResp.form.forEach { (key, value) ->
                 append(key, value)
             }
-            append("file", file.readBytes(), Headers.build {
+            append("file", byteArray, Headers.build {
                 append(HttpHeaders.ContentType, "application/x-zip-compressed")
                 append(HttpHeaders.ContentDisposition, "filename=\"file.zip\"")
             })
         }))
         onUpload { bytesSentTotal, contentLength ->
-            listener(bytesSentTotal / contentLength.toFloat())
+            listener(bytesSentTotal / (contentLength ?: byteArray.size).toFloat())
         }
     }
 

app/src/main/kotlin/li/songe/gkd/util/Upgrade.kt

@@ -44,8 +44,8 @@ data class NewVersion(
     val versionName: String,
     val changelog: String,
     val downloadUrl: String,
+    val fileSize: Long,
     val versionLogs: List<VersionLog> = emptyList(),
-    val fileSize: Long? = null,
 )
 
 @Serializable
@@ -97,12 +97,12 @@ private fun UpdateStatus.startDownload(viewModel: MainViewModel, newVersion: New
     job = viewModel.viewModelScope.launch(Dispatchers.IO) {
         try {
             val channel = client.get(URI(UPDATE_URL).resolve(newVersion.downloadUrl).toString()) {
-                onDownload { bytesSentTotal, contentLength ->
+                onDownload { bytesSentTotal, _ ->
                     // contentLength 在某些机型上概率错误
                     val downloadStatus = downloadStatusFlow.value
                     if (downloadStatus is LoadStatus.Loading) {
                         downloadStatusFlow.value = LoadStatus.Loading(
-                            bytesSentTotal.toFloat() / (newVersion.fileSize ?: contentLength)
+                            bytesSentTotal.toFloat() / (newVersion.fileSize)
                         )
                     } else if (downloadStatus is LoadStatus.Failure) {
                         // 提前终止下载

gradle/libs.versions.toml

@@ -1,12 +1,12 @@
 [versions]
-kotlin = "2.0.20"
+kotlin = "2.0.21"
-ksp = "2.0.20-1.0.25"
+ksp = "2.0.21-RC-1.0.25"
 android = "8.7.0"
 compose = "1.7.3"
 rikka = "4.4.0"
 room = "2.6.1"
 paging = "3.3.2"
-ktor = "2.3.12"
+ktor = "3.0.0"
 destinations = "2.1.0-beta12"
 coil = "2.7.0"
 shizuku = "13.1.5"