Merge branch 'main' into seal-on-main

Author: Wesley-Young

acidify-core-js/tsdown.config.ts

@@ -6,24 +6,4 @@ export default defineConfig({
   clean: true,
   dts: false,
   target: false,
-  plugins: [
-    {
-      name: 'hack-eval-require',
-      transform(code, id) {
-        const banner =
-          `import { createRequire as __cr } from "node:module";\n` +
-          `const require = __cr(import.meta.url);\n`;
-        const hitRE = /eval\(\s*['"]require['"]\s*\)/
-        if (!/\.(mjs|js|mts|ts|jsx|tsx)$/.test(id)) return null;
-        if (!hitRE.test(code)) return null;
-        if (code.includes("createRequire as __cr") && code.includes("__cr(import.meta.url)")) {
-          return null;
-        }
-        return {
-          code: banner + code,
-          map: null,
-        };
-      }
-    }
-  ],
 });

acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/internal/context/FlashTransferContext.kt

@@ -4,7 +4,6 @@ import io.ktor.client.*
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
-import kotlinx.coroutines.async
 import kotlinx.io.buffered
 import kotlinx.io.readTo
 import org.ntqqrev.acidify.common.MediaSource
@@ -68,6 +67,8 @@ internal class FlashTransferContext(client: AbstractClient) : AbstractContext(cl
                     sha1StateList = sha1StateList,
                     body = uploadBuffer
                 )
+                val progress = (chunkStart + chunkLength) * 100L / size
+                logger.d { "FlashTransfer 上传进度: $progress%" }
                 if (!success) {
                     return false
                 }
@@ -84,7 +85,7 @@ internal class FlashTransferContext(client: AbstractClient) : AbstractContext(cl
         start: Int,
         sha1StateList: List<ByteArray>,
         body: ByteArray
-    ): Boolean = client.async {
+    ): Boolean {
         val chunkSha1 = body.sha1()
         val end = start + body.size - 1
         val req = FlashTransferUploadReq(
@@ -117,19 +118,18 @@ internal class FlashTransferContext(client: AbstractClient) : AbstractContext(cl
             val responseBytes = response.readRawBytes()
             if (!response.status.isSuccess()) {
                 logger.e { "FlashTransfer 上传块 $start 失败: ${response.status}, ${responseBytes.toHexString()}" }
-                return@async false
+                return false
             }
             val resp = responseBytes.pbDecode<FlashTransferUploadResp>()
             val status = resp.status
             if (status != "success") {
                 logger.e { "FlashTransfer 上传块 $start 失败: $status" }
-                return@async false
+                return false
             }
-            logger.d { "FlashTransfer 上传块 $start 成功" }
-            true
+            return true
         } catch (e: Exception) {
             logger.e(e) { "FlashTransfer 上传块 $start 异常: ${e.message}" }
-            false
+            return false
         }
-    }.await()
+    }
 }

gradle/libs.versions.toml

@@ -9,7 +9,7 @@ kx-coroutines = "1.11.0"
 kx-io = "0.9.0"
 kx-datetime = "0.8.0-0.6.x-compat"
 kx-atomicfu = "0.32.1"
-ktor = "3.4.3"
+ktor = "3.5.0"
 
 acidify-codec = "0.1.0"
 ktfs = "0.2.0"