refactor(yogurt): use ktfs 0.2.0 and modern DSL

Author: Wesley-Young

gradle/libs.versions.toml

@@ -13,7 +13,7 @@ ktor = "3.4.2"
 
 milky = "1.2.0"
 acidify-codec = "0.1.0"
-ktfs = "0.1.1"
+ktfs = "0.2.0"
 kompress = "1.3.1"
 qr-matrix = "0.1.0"
 xmlutil = "1.0.0-rc2"

yogurt/src/commonMain/kotlin/org/ntqqrev/yogurt/Initialization.kt

@@ -15,15 +15,15 @@ import org.ntqqrev.yogurt.YogurtApp.t
 import org.ntqqrev.yogurt.util.logHandler
 
 suspend fun Application.initializePC(): Bot = withFs {
-    val sessionStore: SessionStore = if (exists(sessionStorePath)) {
+    val sessionStore: SessionStore = if (sessionStorePath.exists) {
         SessionStore.fromJson(sessionStorePath.readText())
     } else SessionStore.empty()
 
     var signProvider: SignProvider
     var appInfo: AppInfo
 
     fun readCustomAppInfo(): AppInfo {
-        return if (exists(customAppInfoPath)) {
+        return if (customAppInfoPath.exists) {
             AppInfo.fromJson(customAppInfoPath.readText())
         } else {
             throw IllegalStateException("未在 $customAppInfoPath 下找到自定义 AppInfo 文件")
@@ -88,7 +88,7 @@ suspend fun Application.initializeAndroid(): AndroidBot = withFs {
     require(config.protocol.uin != 0L && config.protocol.password.isNotEmpty()) {
         "使用 Android 协议登录时，请在配置文件中填写 uin 和 password 字段"
     }
-    val sessionStore: AndroidSessionStore = if (exists(androidSessionStorePath)) {
+    val sessionStore: AndroidSessionStore = if (androidSessionStorePath.exists) {
         AndroidSessionStore.fromJson(androidSessionStorePath.readText()).takeIf {
             it.uin == config.protocol.uin && it.password == config.protocol.password
         } ?: run {
@@ -103,7 +103,7 @@ suspend fun Application.initializeAndroid(): AndroidBot = withFs {
         password = config.protocol.password
     ).also {
         t.println("未找到 Android SessionStore，正在创建新的 SessionStore 并保存到文件...")
-        androidSessionStorePath.write(it.toJson())
+        androidSessionStorePath.writeText(it.toJson())
     }
     val signProvider: AndroidSignProvider = if (!config.protocol.androidUseLegacySign) {
         AndroidUrlSignProvider(config.protocol.signApiUrl)
@@ -123,7 +123,7 @@ suspend fun Application.initializeAndroid(): AndroidBot = withFs {
     val appInfo: AndroidAppInfo = when (config.protocol.version) {
         "fetched" -> throw IllegalStateException("Android 协议不支持通过 Sign API 获取 AppInfo，请使用内置版本或自定义版本")
 
-        "custom" -> if (exists(customAppInfoPath)) {
+        "custom" -> if (customAppInfoPath.exists) {
             AndroidAppInfo.fromJson(customAppInfoPath.readText())
         } else {
             throw IllegalStateException("未在 $customAppInfoPath 下找到自定义 AppInfo 文件")

yogurt/src/commonMain/kotlin/org/ntqqrev/yogurt/YogurtApp.kt

@@ -65,7 +65,7 @@ object YogurtApp {
                 Milky Version:  ${BuildKonfig.milkyVersion} ($milkyVersion)
                 Build Time:     ${BuildKonfig.buildTime}
                 Listen Address: ${config.milky.http.host}:${config.milky.http.port}${config.milky.http.prefix}
-                Data Directory: ${withFs { resolve(Path(".")) }}
+                Data Directory: ${withFs { Path(".").absolute }}
             """.trimIndent()
         )
 

yogurt/src/commonMain/kotlin/org/ntqqrev/yogurt/config/Common.kt

@@ -75,10 +75,10 @@ val jsonModule = Json {
 }
 
 fun loadConfigAndUpdate(): YogurtConfigV3 = withFs {
-    if (!exists(configPath)) {
+    if (!configPath.exists) {
         val defaultConfig = YogurtConfigV3()
-        configPath.write(jsonModule.encodeToString(defaultConfig))
-        println("配置文件已生成于 ${resolve(configPath)}")
+        configPath.writeText(jsonModule.encodeToString(defaultConfig))
+        println("配置文件已生成于 ${configPath.absolute}")
         println("请根据需要进行修改，修改完成后按 Enter 键继续...")
         readln()
     }
@@ -91,7 +91,7 @@ fun loadConfigAndUpdate(): YogurtConfigV3 = withFs {
         else -> error("不支持的配置版本 $configVersion")
     }
 
-    configPath.write(jsonModule.encodeToString(config))
+    configPath.writeText(jsonModule.encodeToString(config))
 
     return@withFs config
 }

yogurt/src/commonMain/kotlin/org/ntqqrev/yogurt/scripting/Configure.kt

@@ -210,11 +210,11 @@ private suspend fun QuickJs.loadScripts() = withFs {
         .resolve<AbstractBot>()
         .createLogger("ScriptLoader")
 
-    if (!exists(scriptsPath)) {
+    if (!scriptsPath.exists) {
         createDirectories(scriptsPath)
     }
 
-    val scripts = list(scriptsPath)
+    val scripts = scriptsPath.children
         .filter { it.name.endsWith(".yogurtx.js") }
         .map {
             ctx.async {

yogurt/src/commonMain/kotlin/org/ntqqrev/yogurt/util/QRCodeUtils.kt

@@ -51,8 +51,8 @@ fun Application.configureQRCodeDisplay() = launch {
             """.trimIndent()
         )
         withFs {
-            qrCodePath.write(it.png)
-            t.println("二维码文件已保存至 ${resolve(qrCodePath)}")
+            qrCodePath.writeBytes(it.png)
+            t.println("二维码文件已保存至 ${qrCodePath.absolute}")
         }
     }
 }

yogurt/src/commonMain/kotlin/org/ntqqrev/yogurt/util/ResourceUtils.kt

@@ -25,7 +25,7 @@ suspend fun resolveUri(uri: String): MediaSource = withContext(Dispatchers.IO) {
     when {
         uri.startsWith("file://") -> withFs {
             val filePath = Path(uri.removePrefix("file://").decodeURLPart())
-            if (!exists(filePath)) {
+            if (!filePath.exists) {
                 throw IOException("File not found: $filePath")
             }
             LocalFileMediaSource(filePath)
@@ -58,9 +58,9 @@ fun createTempFile(kind: String, ext: String = "tmp"): Path = withFs {
             SystemTemporaryDirectory,
             "yogurt-$kind-${Random.nextLong().toULong().toString(16)}.$ext",
         )
-    } while (exists(candidate))
+    } while (candidate.exists)
     // Touch the file
-    sink(candidate).buffered().use { }
+    candidate.writeText("")
     candidate
 }
 
@@ -77,8 +77,7 @@ abstract class LazyMediaSource : MediaSource() {
 
 class LocalFileMediaSource(val path: Path) : LazyMediaSource() {
     override val size: Long = withFs {
-        metadataOrNull(path)?.size
-            ?: throw IOException("File not found: $path")
+        path.metadataOrNull?.size ?: throw IOException("File not found: $path")
     }
 
     override fun openRawSource(): RawSource = withFs {

yogurt/src/commonMain/kotlin/org/ntqqrev/yogurt/util/SecurityUtils.kt

@@ -4,5 +4,5 @@ import kotlinx.io.files.Path
 import org.ntqqrev.ktfs.withFs
 
 val isDockerEnv: Boolean by lazy {
-    withFs { exists(Path("/.dockerenv")) }
+    withFs { Path("/.dockerenv").exists }
 }

yogurt/src/commonMain/kotlin/org/ntqqrev/yogurt/util/SessionStoreUtils.kt

@@ -17,12 +17,12 @@ fun Application.configureSessionStoreAutoSave() = launch {
     if (isPC) {
         bot.eventFlow.filterIsInstance<SessionStoreUpdatedEvent>().collect {
             logger.i { "SessionStore 已更新，正在保存至文件..." }
-            withFs { sessionStorePath.write(it.sessionStore.toJson()) }
+            withFs { sessionStorePath.writeText(it.sessionStore.toJson()) }
         }
     } else if (isAndroid) {
         bot.eventFlow.filterIsInstance<AndroidSessionStoreUpdatedEvent>().collect {
             logger.i { "Android SessionStore 已更新，正在保存至文件..." }
-            withFs { androidSessionStorePath.write(it.sessionStore.toJson()) }
+            withFs { androidSessionStorePath.writeText(it.sessionStore.toJson()) }
         }
     }
 }