Import fix

Update Javalin usage to v7 and Jackson 3
Update javalin to v7
2026-07-16 17:24:07 -05:00 · 2026-05-09 14:47:25 -04:00 · 2026-05-09 14:40:09 -04:00 · 2026-05-09 17:01:05 +00:00
36 changed files with 1298 additions and 1282 deletions
--- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/util/SafePath.kt
+++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/util/SafePath.kt
@@ -9,9 +9,6 @@ package xyz.nulldev.androidcompat.util

 // adopted from: https://github.com/tachiyomiorg/tachiyomi/blob/4cefbce7c34e724b409b6ba127f3c6c5c346ad8d/app/src/main/java/eu/kanade/tachiyomi/util/storage/DiskUtil.kt
 object SafePath {
-    private const val MAX_FILENAME_CHARS = 240
-    private const val MAX_FILENAME_UTF8_BYTES = 240
-
    /**
     * Mutate the given filename to make it valid for a FAT filesystem,
     * replacing any invalid characters with "_". This method doesn't allow hidden files (starting
@@ -30,39 +27,9 @@ object SafePath {
                sb.append('_')
            }
        }
-
-        return truncateFilename(sb.toString())
-    }
-
-    private fun truncateFilename(filename: String): String {
-        // Keep a safety margin under common filesystem limits and satisfy both
-        // character count and UTF-8 byte-length constraints.
-        val output = StringBuilder(minOf(filename.length, MAX_FILENAME_CHARS))
-        var usedBytes = 0
-        var index = 0
-
-        while (index < filename.length && output.length < MAX_FILENAME_CHARS) {
-            val codePoint = Character.codePointAt(filename, index)
-            val codePointBytes = utf8ByteCount(codePoint)
-
-            if (usedBytes + codePointBytes > MAX_FILENAME_UTF8_BYTES) {
-                break
-            }
-
-            output.appendCodePoint(codePoint)
-            usedBytes += codePointBytes
-            index += Character.charCount(codePoint)
-        }
-
-        return output.toString()
-    }
-
-    private fun utf8ByteCount(codePoint: Int): Int =
-        when {
-            codePoint <= 0x7f -> 1
-            codePoint <= 0x7ff -> 2
-            codePoint <= 0xffff -> 3
-            else -> 4
+        // Even though vfat allows 255 UCS-2 chars, we might eventually write to
+        // ext4 through a FUSE layer, so use that limit minus 15 reserved characters.
+        return sb.toString().take(240)
    }

    /**
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,10 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 - .

 ### Fixed
- (CloudFlareInterceptor) Don't send the `cf_clearance` cookie back to Flaresolverr
 - (WebUI) Handle serving non-default webui with "bundled"
- (WebUI) Wait until WebUI is ready to open in browser
- (Downloads) Truncate filenames by byte length to prevent "File name too long" IO errors

 ## [v2.2.2100] + [WebUI: v20260508.01] - 2026-05-08

--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,13 +6,13 @@ jvmTarget = "21"
 okhttp = "5.3.2" # Major version is locked by Tachiyomi extensions
 javalin = "7.2.0"
 jte = "3.2.4"
-jackson = "3.1.3" # jackson version locked by javalin, ref: `io.javalin.core.util.OptionalDependency`
+jackson = "3.1.2" # jackson version locked by javalin, ref: `io.javalin.core.util.OptionalDependency`
 exposed = "0.61.0"
 dex2jar = "2.4.36"
 polyglot = "25.0.3"
 settings = "1.3.0"
 twelvemonkeys = "3.13.1"
-graphqlkotlin = "10.0.0-alpha.3"
+graphqlkotlin = "8.9.0"
 xmlserialization = "0.91.3"
 ktlint = "1.8.0"
 koin = "4.2.1"
@@ -54,7 +54,7 @@ javalin-openapi = { module = "io.javalin:javalin-openapi", version.ref = "javali
 javalin-rendering = { module = "io.javalin:javalin-rendering-jte", version.ref = "javalin" }
 jackson-databind = { module = "tools.jackson.core:jackson-databind", version.ref = "jackson" }
 jackson-kotlin = { module = "tools.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
-jackson-annotations = "com.fasterxml.jackson.core:jackson-annotations:2.21"
+jackson-annotations = "com.fasterxml.jackson.core:jackson-annotations:2.20"
 jte = { module = "gg.jte:jte", version.ref = "jte" }
 kte = { module = "gg.jte:jte-kotlin", version.ref = "jte" }

@@ -73,7 +73,7 @@ h2 = "com.h2database:h2:1.4.200" # current database driver, can't update to h2 v
 hikaricp = "com.zaxxer:HikariCP:7.0.2"

 # Exposed Migrations
-exposed-migrations = "com.github.Suwayomi:exposed-migrations:3.10.1"
+exposed-migrations = "com.github.Suwayomi:exposed-migrations:3.8.0"

 # Dependency Injection
 koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" }
--- a/server/build.gradle.kts
+++ b/server/build.gradle.kts
@@ -171,7 +171,6 @@ tasks {
                "Implementation-Vendor" to "The Suwayomi Project",
                "Specification-Version" to getTachideskVersion(),
                "Implementation-Version" to getTachideskRevision(),
-                "Multi-Release" to true, // needed for polyglot
            )
        }
        archiveBaseName.set(rootProject.name)
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt
@@ -103,7 +103,7 @@ class CloudflareInterceptor(
    companion object {
        private val ERROR_CODES = listOf(403, 503)
        private val SERVER_CHECK = arrayOf("cloudflare-nginx", "cloudflare")
-        val COOKIE_NAMES = listOf("cf_clearance")
+        private val COOKIE_NAMES = listOf("cf_clearance")
        private val CHROME_IMAGE_TEMPLATE_REGEX = Regex("""<title>(.*?) \(\d+×\d+\)</title>""")
    }
 }
@@ -205,11 +205,8 @@ object CFClearance {
                                            session = serverConfig.flareSolverrSessionName.value,
                                            sessionTtlMinutes = serverConfig.flareSolverrSessionTtl.value,
                                            cookies =
-                                                network.cookieStore
-                                                    .get(originalRequest.url)
-                                                    .filter { it.name !in CloudflareInterceptor.COOKIE_NAMES }
-                                                    .map { cookie ->
-                                                        FlareSolverCookie(cookie.name, cookie.value)
+                                                network.cookieStore.get(originalRequest.url).map {
+                                                    FlareSolverCookie(it.name, it.value)
                                                },
                                            returnOnlyCookies = onlyCookies,
                                            maxTimeout = timeout.inWholeMilliseconds.toInt(),
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/AsDataFetcherResult.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/AsDataFetcherResult.kt
@@ -0,0 +1,27 @@
+package suwayomi.tachidesk.graphql
+
+import com.expediagroup.graphql.server.extensions.toGraphQLError
+import graphql.execution.DataFetcherResult
+import io.github.oshai.kotlinlogging.KotlinLogging
+
+val logger = KotlinLogging.logger { }
+
+inline fun <T> asDataFetcherResult(block: () -> T): DataFetcherResult<T?> {
+    val result =
+        runCatching {
+            block()
+        }
+
+    if (result.isFailure) {
+        logger.error(result.exceptionOrNull()) { "asDataFetcherResult: failed due to" }
+        return DataFetcherResult
+            .newResult<T?>()
+            .error(result.exceptionOrNull()?.toGraphQLError())
+            .build()
+    }
+
+    return DataFetcherResult
+        .newResult<T?>()
+        .data(result.getOrNull())
+        .build()
+}
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/cache/CustomCacheMap.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/cache/CustomCacheMap.kt
@@ -3,8 +3,12 @@ package suwayomi.tachidesk.graphql.cache
 import org.dataloader.CacheMap
 import java.util.concurrent.CompletableFuture

-class CustomCacheMap<K : Any, V : Any> : CacheMap<K, V> {
-    private val cache: MutableMap<K, CompletableFuture<V>> = HashMap()
+class CustomCacheMap<K, V> : CacheMap<K, V> {
+    private val cache: MutableMap<K, CompletableFuture<V>>
+
+    init {
+        cache = HashMap()
+    }

    override fun containsKey(key: K): Boolean = cache.containsKey(key)

@@ -14,12 +18,12 @@ class CustomCacheMap<K : Any, V : Any> : CacheMap<K, V> {

    override fun getAll(): Collection<CompletableFuture<V>> = cache.values

-    override fun putIfAbsentAtomically(
+    override fun set(
        key: K,
        value: CompletableFuture<V>,
-    ): CompletableFuture<V> {
+    ): CacheMap<K, V> {
        cache[key] = value
-        return value
+        return this
    }

    override fun delete(key: K): CacheMap<K, V> {
@@ -31,6 +35,4 @@ class CustomCacheMap<K : Any, V : Any> : CacheMap<K, V> {
        cache.clear()
        return this
    }
-
-    override fun size(): Int = cache.size
 }
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/ChapterDataLoader.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/ChapterDataLoader.kt
@@ -24,11 +24,11 @@ import suwayomi.tachidesk.graphql.types.ChapterType
 import suwayomi.tachidesk.manga.model.table.ChapterTable
 import suwayomi.tachidesk.server.JavalinSetup.future

-class ChapterDataLoader : KotlinDataLoader<Int, ChapterType> {
+class ChapterDataLoader : KotlinDataLoader<Int, ChapterType?> {
    override val dataLoaderName = "ChapterDataLoader"

-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType> =
-        DataLoaderFactory.newDataLoader { ids ->
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType?> =
+        DataLoaderFactory.newDataLoader<Int, ChapterType> { ids ->
            future {
                transaction {
                    addLogger(Slf4jSqlDebugLogger)
@@ -48,7 +48,7 @@ class ChaptersForMangaDataLoader : KotlinDataLoader<Int, ChapterNodeList> {
    override val dataLoaderName = "ChaptersForMangaDataLoader"

    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterNodeList> =
-        DataLoaderFactory.newDataLoader { ids ->
+        DataLoaderFactory.newDataLoader<Int, ChapterNodeList> { ids ->
            future {
                transaction {
                    addLogger(Slf4jSqlDebugLogger)
@@ -68,7 +68,7 @@ class DownloadedChapterCountForMangaDataLoader : KotlinDataLoader<Int, Int> {
    override val dataLoaderName = "DownloadedChapterCountForMangaDataLoader"

    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, Int> =
-        DataLoaderFactory.newDataLoader { ids ->
+        DataLoaderFactory.newDataLoader<Int, Int> { ids ->
            future {
                transaction {
                    addLogger(Slf4jSqlDebugLogger)
@@ -90,7 +90,7 @@ class UnreadChapterCountForMangaDataLoader : KotlinDataLoader<Int, Int> {
    override val dataLoaderName = "UnreadChapterCountForMangaDataLoader"

    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, Int> =
-        DataLoaderFactory.newDataLoader { ids ->
+        DataLoaderFactory.newDataLoader<Int, Int> { ids ->
            future {
                transaction {
                    addLogger(Slf4jSqlDebugLogger)
@@ -112,7 +112,7 @@ class BookmarkedChapterCountForMangaDataLoader : KotlinDataLoader<Int, Int> {
    override val dataLoaderName = "BookmarkedChapterCountForMangaDataLoader"

    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, Int> =
-        DataLoaderFactory.newDataLoader { ids ->
+        DataLoaderFactory.newDataLoader<Int, Int> { ids ->
            future {
                transaction {
                    addLogger(Slf4jSqlDebugLogger)
@@ -157,11 +157,11 @@ class HasDuplicateChaptersForMangaDataLoader : KotlinDataLoader<Int, Boolean> {
        }
 }

-class LastReadChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType> {
+class LastReadChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType?> {
    override val dataLoaderName = "LastReadChapterForMangaDataLoader"

-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType> =
-        DataLoaderFactory.newDataLoader { ids ->
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType?> =
+        DataLoaderFactory.newDataLoader<Int, ChapterType?> { ids ->
            future {
                transaction {
                    addLogger(Slf4jSqlDebugLogger)
@@ -177,11 +177,11 @@ class LastReadChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType> {
        }
 }

-class LatestReadChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType> {
+class LatestReadChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType?> {
    override val dataLoaderName = "LatestReadChapterForMangaDataLoader"

-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType> =
-        DataLoaderFactory.newDataLoader { ids ->
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType?> =
+        DataLoaderFactory.newDataLoader<Int, ChapterType?> { ids ->
            future {
                transaction {
                    addLogger(Slf4jSqlDebugLogger)
@@ -197,11 +197,11 @@ class LatestReadChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType> {
        }
 }

-class LatestFetchedChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType> {
+class LatestFetchedChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType?> {
    override val dataLoaderName = "LatestFetchedChapterForMangaDataLoader"

-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType> =
-        DataLoaderFactory.newDataLoader { ids ->
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType?> =
+        DataLoaderFactory.newDataLoader<Int, ChapterType?> { ids ->
            future {
                transaction {
                    addLogger(Slf4jSqlDebugLogger)
@@ -217,11 +217,11 @@ class LatestFetchedChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType
        }
 }

-class LatestUploadedChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType> {
+class LatestUploadedChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType?> {
    override val dataLoaderName = "LatestUploadedChapterForMangaDataLoader"

-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType> =
-        DataLoaderFactory.newDataLoader { ids ->
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType?> =
+        DataLoaderFactory.newDataLoader<Int, ChapterType?> { ids ->
            future {
                transaction {
                    addLogger(Slf4jSqlDebugLogger)
@@ -237,11 +237,11 @@ class LatestUploadedChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterTyp
        }
 }

-class FirstUnreadChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType> {
+class FirstUnreadChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType?> {
    override val dataLoaderName = "FirstUnreadChapterForMangaDataLoader"

-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType> =
-        DataLoaderFactory.newDataLoader { ids ->
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType?> =
+        DataLoaderFactory.newDataLoader<Int, ChapterType?> { ids ->
            future {
                transaction {
                    addLogger(Slf4jSqlDebugLogger)
@@ -257,11 +257,11 @@ class FirstUnreadChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType>
        }
 }

-class HighestNumberedChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType> {
+class HighestNumberedChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType?> {
    override val dataLoaderName = "HighestNumberedChapterForMangaDataLoader"

-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType> =
-        DataLoaderFactory.newDataLoader { ids ->
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType?> =
+        DataLoaderFactory.newDataLoader<Int, ChapterType?> { ids ->
            future {
                transaction {
                    addLogger(Slf4jSqlDebugLogger)
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/ExtensionDataLoader.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/ExtensionDataLoader.kt
@@ -20,10 +20,10 @@ import suwayomi.tachidesk.manga.model.table.ExtensionTable
 import suwayomi.tachidesk.manga.model.table.SourceTable
 import suwayomi.tachidesk.server.JavalinSetup.future

-class ExtensionDataLoader : KotlinDataLoader<String, ExtensionType> {
+class ExtensionDataLoader : KotlinDataLoader<String, ExtensionType?> {
    override val dataLoaderName = "ExtensionDataLoader"

-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<String, ExtensionType> =
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<String, ExtensionType?> =
        DataLoaderFactory.newDataLoader { ids ->
            future {
                transaction {
@@ -40,10 +40,10 @@ class ExtensionDataLoader : KotlinDataLoader<String, ExtensionType> {
        }
 }

-class ExtensionForSourceDataLoader : KotlinDataLoader<Long, ExtensionType> {
+class ExtensionForSourceDataLoader : KotlinDataLoader<Long, ExtensionType?> {
    override val dataLoaderName = "ExtensionForSourceDataLoader"

-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Long, ExtensionType> =
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Long, ExtensionType?> =
        DataLoaderFactory.newDataLoader { ids ->
            future {
                transaction {
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/MangaDataLoader.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/MangaDataLoader.kt
@@ -25,10 +25,10 @@ import suwayomi.tachidesk.manga.model.table.CategoryMangaTable
 import suwayomi.tachidesk.manga.model.table.MangaTable
 import suwayomi.tachidesk.server.JavalinSetup.future

-class MangaDataLoader : KotlinDataLoader<Int, MangaType> {
+class MangaDataLoader : KotlinDataLoader<Int, MangaType?> {
    override val dataLoaderName = "MangaDataLoader"

-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, MangaType> =
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, MangaType?> =
        DataLoaderFactory.newDataLoader { ids ->
            future {
                transaction {
@@ -122,6 +122,6 @@ class MangaForIdsDataLoader : KotlinDataLoader<List<Int>, MangaNodeList> {
                    }
                }
            },
-            DataLoaderOptions.newOptions().setCacheMap(CustomCacheMap<List<Int>, MangaNodeList>()).build(),
+            DataLoaderOptions.newOptions().setCacheMap(CustomCacheMap<List<Int>, MangaNodeList>()),
        )
 }
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/MetaDataLoader.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/MetaDataLoader.kt
@@ -20,11 +20,11 @@ import suwayomi.tachidesk.manga.model.table.MangaMetaTable
 import suwayomi.tachidesk.manga.model.table.SourceMetaTable
 import suwayomi.tachidesk.server.JavalinSetup.future

-class GlobalMetaDataLoader : KotlinDataLoader<String, GlobalMetaType> {
+class GlobalMetaDataLoader : KotlinDataLoader<String, GlobalMetaType?> {
    override val dataLoaderName = "GlobalMetaDataLoader"

-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<String, GlobalMetaType> =
-        DataLoaderFactory.newDataLoader<String, GlobalMetaType> { ids ->
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<String, GlobalMetaType?> =
+        DataLoaderFactory.newDataLoader<String, GlobalMetaType?> { ids ->
            future {
                transaction {
                    addLogger(Slf4jSqlDebugLogger)
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/SourceDataLoader.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/SourceDataLoader.kt
@@ -22,10 +22,10 @@ import suwayomi.tachidesk.manga.model.table.ExtensionTable
 import suwayomi.tachidesk.manga.model.table.SourceTable
 import suwayomi.tachidesk.server.JavalinSetup.future

-class SourceDataLoader : KotlinDataLoader<Long, SourceType> {
+class SourceDataLoader : KotlinDataLoader<Long, SourceType?> {
    override val dataLoaderName = "SourceDataLoader"

-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Long, SourceType> =
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Long, SourceType?> =
        DataLoaderFactory.newDataLoader { ids ->
            future {
                transaction {
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/BackupMutation.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/BackupMutation.kt
@@ -1,5 +1,3 @@
-@file:Suppress("RedundantNullableReturnType", "unused")
-
 package suwayomi.tachidesk.graphql.mutations

 import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/CategoryMutation.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/CategoryMutation.kt
@@ -1,5 +1,3 @@
-@file:Suppress("RedundantNullableReturnType", "unused")
-
 package suwayomi.tachidesk.graphql.mutations

 import graphql.execution.DataFetcherResult
@@ -17,6 +15,7 @@ import org.jetbrains.exposed.sql.or
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.jetbrains.exposed.sql.update
+import suwayomi.tachidesk.graphql.asDataFetcherResult
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.CategoryMetaType
 import suwayomi.tachidesk.graphql.types.CategoryType
@@ -43,12 +42,13 @@ class CategoryMutation {
    )

    @RequireAuth
-    fun setCategoryMeta(input: SetCategoryMetaInput): SetCategoryMetaPayload? {
+    fun setCategoryMeta(input: SetCategoryMetaInput): DataFetcherResult<SetCategoryMetaPayload?> =
+        asDataFetcherResult {
            val (clientMutationId, meta) = input

            Category.modifyMeta(meta.categoryId, meta.key, meta.value)

-        return SetCategoryMetaPayload(clientMutationId, meta)
+            SetCategoryMetaPayload(clientMutationId, meta)
        }

    data class DeleteCategoryMetaInput(
@@ -64,7 +64,8 @@ class CategoryMutation {
    )

    @RequireAuth
-    fun deleteCategoryMeta(input: DeleteCategoryMetaInput): DeleteCategoryMetaPayload? {
+    fun deleteCategoryMeta(input: DeleteCategoryMetaInput): DataFetcherResult<DeleteCategoryMetaPayload?> =
+        asDataFetcherResult {
            val (clientMutationId, categoryId, key) = input

            val (meta, category) =
@@ -89,7 +90,7 @@ class CategoryMutation {
                    } to category
                }

-        return DeleteCategoryMetaPayload(clientMutationId, meta, category)
+            DeleteCategoryMetaPayload(clientMutationId, meta, category)
        }

    data class SetCategoryMetasItem(
@@ -109,7 +110,8 @@ class CategoryMutation {
    )

    @RequireAuth
-    fun setCategoryMetas(input: SetCategoryMetasInput): SetCategoryMetasPayload? {
+    fun setCategoryMetas(input: SetCategoryMetasInput): DataFetcherResult<SetCategoryMetasPayload?> =
+        asDataFetcherResult {
            val (clientMutationId, items) = input

            val metaByCategoryId =
@@ -143,7 +145,7 @@ class CategoryMutation {
                    updatedMetas to categories
                }

-        return SetCategoryMetasPayload(clientMutationId, updatedMetas, categories)
+            SetCategoryMetasPayload(clientMutationId, updatedMetas, categories)
        }

    data class DeleteCategoryMetasItem(
@@ -164,7 +166,8 @@ class CategoryMutation {
    )

    @RequireAuth
-    fun deleteCategoryMetas(input: DeleteCategoryMetasInput): DeleteCategoryMetasPayload? {
+    fun deleteCategoryMetas(input: DeleteCategoryMetasInput): DataFetcherResult<DeleteCategoryMetasPayload?> =
+        asDataFetcherResult {
            val (clientMutationId, items) = input

            items.forEach { item ->
@@ -219,7 +222,7 @@ class CategoryMutation {
                        .distinctBy { it.id }
                }

-        return DeleteCategoryMetasPayload(clientMutationId, allDeletedMetas, categories)
+            DeleteCategoryMetasPayload(clientMutationId, allDeletedMetas, categories)
        }

    data class UpdateCategoryPatch(
@@ -288,7 +291,8 @@ class CategoryMutation {
    }

    @RequireAuth
-    fun updateCategory(input: UpdateCategoryInput): UpdateCategoryPayload? {
+    fun updateCategory(input: UpdateCategoryInput): DataFetcherResult<UpdateCategoryPayload?> =
+        asDataFetcherResult {
            val (clientMutationId, id, patch) = input

            updateCategories(listOf(id), patch)
@@ -298,14 +302,15 @@ class CategoryMutation {
                    CategoryType(CategoryTable.selectAll().where { CategoryTable.id eq id }.first())
                }

-        return UpdateCategoryPayload(
+            UpdateCategoryPayload(
                clientMutationId = clientMutationId,
                category = category,
            )
        }

    @RequireAuth
-    fun updateCategories(input: UpdateCategoriesInput): UpdateCategoriesPayload? {
+    fun updateCategories(input: UpdateCategoriesInput): DataFetcherResult<UpdateCategoriesPayload?> =
+        asDataFetcherResult {
            val (clientMutationId, ids, patch) = input

            updateCategories(ids, patch)
@@ -315,7 +320,7 @@ class CategoryMutation {
                    CategoryTable.selectAll().where { CategoryTable.id inList ids }.map { CategoryType(it) }
                }

-        return UpdateCategoriesPayload(
+            UpdateCategoriesPayload(
                clientMutationId = clientMutationId,
                categories = categories,
            )
@@ -333,7 +338,8 @@ class CategoryMutation {
    )

    @RequireAuth
-    fun updateCategoryOrder(input: UpdateCategoryOrderInput): UpdateCategoryOrderPayload? {
+    fun updateCategoryOrder(input: UpdateCategoryOrderInput): DataFetcherResult<UpdateCategoryOrderPayload?> =
+        asDataFetcherResult {
            val (clientMutationId, categoryId, position) = input
            require(position > 0) {
                "'order' must not be <= 0"
@@ -370,7 +376,7 @@ class CategoryMutation {
                    CategoryTable.selectAll().orderBy(CategoryTable.order).map { CategoryType(it) }
                }

-        return UpdateCategoryOrderPayload(
+            UpdateCategoryOrderPayload(
                clientMutationId = clientMutationId,
                categories = categories,
            )
@@ -391,7 +397,8 @@ class CategoryMutation {
    )

    @RequireAuth
-    fun createCategory(input: CreateCategoryInput): CreateCategoryPayload? {
+    fun createCategory(input: CreateCategoryInput): DataFetcherResult<CreateCategoryPayload?> =
+        asDataFetcherResult {
            val (clientMutationId, name, order, default, includeInUpdate, includeInDownload) = input
            transaction {
                require(CategoryTable.selectAll().where { CategoryTable.name eq input.name }.isEmpty()) {
@@ -435,7 +442,7 @@ class CategoryMutation {
                    CategoryType(CategoryTable.selectAll().where { CategoryTable.id eq id }.first())
                }

-        return CreateCategoryPayload(clientMutationId, category)
+            CreateCategoryPayload(clientMutationId, category)
        }

    data class DeleteCategoryInput(
@@ -450,10 +457,11 @@ class CategoryMutation {
    )

    @RequireAuth
-    fun deleteCategory(input: DeleteCategoryInput): DeleteCategoryPayload? {
+    fun deleteCategory(input: DeleteCategoryInput): DataFetcherResult<DeleteCategoryPayload?> {
+        return asDataFetcherResult {
            val (clientMutationId, categoryId) = input
            if (categoryId == 0) { // Don't delete default category
-            return DeleteCategoryPayload(
+                return@asDataFetcherResult DeleteCategoryPayload(
                    clientMutationId,
                    null,
                    emptyList(),
@@ -488,7 +496,8 @@ class CategoryMutation {
                    } to mangas
                }

-        return DeleteCategoryPayload(clientMutationId, category, mangas)
+            DeleteCategoryPayload(clientMutationId, category, mangas)
+        }
    }

    data class UpdateMangaCategoriesPatch(
@@ -538,7 +547,8 @@ class CategoryMutation {
    }

    @RequireAuth
-    fun updateMangaCategories(input: UpdateMangaCategoriesInput): UpdateMangaCategoriesPayload? {
+    fun updateMangaCategories(input: UpdateMangaCategoriesInput): DataFetcherResult<UpdateMangaCategoriesPayload?> =
+        asDataFetcherResult {
            val (clientMutationId, id, patch) = input

            updateMangas(listOf(id), patch)
@@ -548,14 +558,15 @@ class CategoryMutation {
                    MangaType(MangaTable.selectAll().where { MangaTable.id eq id }.first())
                }

-        return UpdateMangaCategoriesPayload(
+            UpdateMangaCategoriesPayload(
                clientMutationId = clientMutationId,
                manga = manga,
            )
        }

    @RequireAuth
-    fun updateMangasCategories(input: UpdateMangasCategoriesInput): UpdateMangasCategoriesPayload? {
+    fun updateMangasCategories(input: UpdateMangasCategoriesInput): DataFetcherResult<UpdateMangasCategoriesPayload?> =
+        asDataFetcherResult {
            val (clientMutationId, ids, patch) = input

            updateMangas(ids, patch)
@@ -565,7 +576,7 @@ class CategoryMutation {
                    MangaTable.selectAll().where { MangaTable.id inList ids }.map { MangaType(it) }
                }

-        return UpdateMangasCategoriesPayload(
+            UpdateMangasCategoriesPayload(
                clientMutationId = clientMutationId,
                mangas = mangas,
            )
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ChapterMutation.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ChapterMutation.kt
@@ -1,7 +1,6 @@
-@file:Suppress("RedundantNullableReturnType", "unused")
-
 package suwayomi.tachidesk.graphql.mutations

+import graphql.execution.DataFetcherResult
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import org.jetbrains.exposed.dao.id.EntityID
@@ -17,6 +16,7 @@ import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.statements.BatchUpdateStatement
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.jetbrains.exposed.sql.update
+import suwayomi.tachidesk.graphql.asDataFetcherResult
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.ChapterMetaType
 import suwayomi.tachidesk.graphql.types.ChapterType
@@ -120,7 +120,8 @@ class ChapterMutation {
    }

    @RequireAuth
-    fun updateChapter(input: UpdateChapterInput): UpdateChapterPayload? {
+    fun updateChapter(input: UpdateChapterInput): DataFetcherResult<UpdateChapterPayload?> =
+        asDataFetcherResult {
            val (clientMutationId, id, patch) = input

            updateChapters(listOf(id), patch)
@@ -130,14 +131,15 @@ class ChapterMutation {
                    ChapterType(ChapterTable.selectAll().where { ChapterTable.id eq id }.first())
                }

-        return UpdateChapterPayload(
+            UpdateChapterPayload(
                clientMutationId = clientMutationId,
                chapter = chapter,
            )
        }

    @RequireAuth
-    fun updateChapters(input: UpdateChaptersInput): UpdateChaptersPayload? {
+    fun updateChapters(input: UpdateChaptersInput): DataFetcherResult<UpdateChaptersPayload?> =
+        asDataFetcherResult {
            val (clientMutationId, ids, patch) = input

            updateChapters(ids, patch)
@@ -147,7 +149,7 @@ class ChapterMutation {
                    ChapterTable.selectAll().where { ChapterTable.id inList ids }.map { ChapterType(it) }
                }

-        return UpdateChaptersPayload(
+            UpdateChaptersPayload(
                clientMutationId = clientMutationId,
                chapters = chapters,
            )
@@ -164,10 +166,11 @@ class ChapterMutation {
    )

    @RequireAuth
-    fun fetchChapters(input: FetchChaptersInput): CompletableFuture<FetchChaptersPayload?> {
+    fun fetchChapters(input: FetchChaptersInput): CompletableFuture<DataFetcherResult<FetchChaptersPayload?>> {
        val (clientMutationId, mangaId) = input

        return future {
+            asDataFetcherResult {
                Chapter.fetchChapterList(mangaId)

                val chapters =
@@ -185,6 +188,7 @@ class ChapterMutation {
                )
            }
        }
+    }

    data class SetChapterMetaInput(
        val clientMutationId: String? = null,
@@ -197,12 +201,13 @@ class ChapterMutation {
    )

    @RequireAuth
-    fun setChapterMeta(input: SetChapterMetaInput): SetChapterMetaPayload? {
+    fun setChapterMeta(input: SetChapterMetaInput): DataFetcherResult<SetChapterMetaPayload?> =
+        asDataFetcherResult {
            val (clientMutationId, meta) = input

            Chapter.modifyChapterMeta(meta.chapterId, meta.key, meta.value)

-        return SetChapterMetaPayload(clientMutationId, meta)
+            SetChapterMetaPayload(clientMutationId, meta)
        }

    data class DeleteChapterMetaInput(
@@ -218,7 +223,8 @@ class ChapterMutation {
    )

    @RequireAuth
-    fun deleteChapterMeta(input: DeleteChapterMetaInput): DeleteChapterMetaPayload? {
+    fun deleteChapterMeta(input: DeleteChapterMetaInput): DataFetcherResult<DeleteChapterMetaPayload?> =
+        asDataFetcherResult {
            val (clientMutationId, chapterId, key) = input

            val (meta, chapter) =
@@ -243,7 +249,7 @@ class ChapterMutation {
                    } to chapter
                }

-        return DeleteChapterMetaPayload(clientMutationId, meta, chapter)
+            DeleteChapterMetaPayload(clientMutationId, meta, chapter)
        }

    data class SetChapterMetasItem(
@@ -263,7 +269,8 @@ class ChapterMutation {
    )

    @RequireAuth
-    fun setChapterMetas(input: SetChapterMetasInput): SetChapterMetasPayload? {
+    fun setChapterMetas(input: SetChapterMetasInput): DataFetcherResult<SetChapterMetasPayload?> =
+        asDataFetcherResult {
            val (clientMutationId, items) = input

            val metaByChapterId =
@@ -297,7 +304,7 @@ class ChapterMutation {
                    updatedMetas to chapters
                }

-        return SetChapterMetasPayload(clientMutationId, updatedMetas, chapters)
+            SetChapterMetasPayload(clientMutationId, updatedMetas, chapters)
        }

    data class DeleteChapterMetasItem(
@@ -318,7 +325,8 @@ class ChapterMutation {
    )

    @RequireAuth
-    fun deleteChapterMetas(input: DeleteChapterMetasInput): DeleteChapterMetasPayload? {
+    fun deleteChapterMetas(input: DeleteChapterMetasInput): DataFetcherResult<DeleteChapterMetasPayload?> =
+        asDataFetcherResult {
            val (clientMutationId, items) = input

            items.forEach { item ->
@@ -373,7 +381,7 @@ class ChapterMutation {
                        .distinctBy { it.id }
                }

-        return DeleteChapterMetasPayload(clientMutationId, allDeletedMetas, chapters)
+            DeleteChapterMetasPayload(clientMutationId, allDeletedMetas, chapters)
        }

    data class FetchChapterPagesInput(
@@ -397,11 +405,12 @@ class ChapterMutation {
    )

    @RequireAuth
-    fun fetchChapterPages(input: FetchChapterPagesInput): CompletableFuture<FetchChapterPagesPayload?> {
+    fun fetchChapterPages(input: FetchChapterPagesInput): CompletableFuture<DataFetcherResult<FetchChapterPagesPayload?>> {
        val (clientMutationId, chapterId) = input
        val paramsMap = input.toParams()

        return future {
+            asDataFetcherResult {
                var chapter = getChapterDownloadReadyById(chapterId)
                val syncResult = KoreaderSyncService.checkAndPullProgress(chapter.id)
                var syncConflictInfo: SyncConflictInfoType? = null
@@ -459,3 +468,4 @@ class ChapterMutation {
            }
        }
    }
+}
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/DownloadMutation.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/DownloadMutation.kt
@@ -1,5 +1,3 @@
-@file:Suppress("RedundantNullableReturnType", "unused")
-
 package suwayomi.tachidesk.graphql.mutations

 import graphql.execution.DataFetcherResult
@@ -7,6 +5,7 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.withTimeout
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
+import suwayomi.tachidesk.graphql.asDataFetcherResult
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.ChapterType
 import suwayomi.tachidesk.graphql.types.DownloadStatus
@@ -31,12 +30,13 @@ class DownloadMutation {
    )

    @RequireAuth
-    fun deleteDownloadedChapters(input: DeleteDownloadedChaptersInput): DeleteDownloadedChaptersPayload? {
+    fun deleteDownloadedChapters(input: DeleteDownloadedChaptersInput): DataFetcherResult<DeleteDownloadedChaptersPayload?> {
        val (clientMutationId, chapters) = input

+        return asDataFetcherResult {
            Chapter.deleteChapters(chapters)

-        return DeleteDownloadedChaptersPayload(
+            DeleteDownloadedChaptersPayload(
                clientMutationId = clientMutationId,
                chapters =
                    transaction {
@@ -47,6 +47,7 @@ class DownloadMutation {
                    },
            )
        }
+    }

    data class DeleteDownloadedChapterInput(
        val clientMutationId: String? = null,
@@ -59,12 +60,13 @@ class DownloadMutation {
    )

    @RequireAuth
-    fun deleteDownloadedChapter(input: DeleteDownloadedChapterInput): DeleteDownloadedChapterPayload? {
+    fun deleteDownloadedChapter(input: DeleteDownloadedChapterInput): DataFetcherResult<DeleteDownloadedChapterPayload?> {
        val (clientMutationId, chapter) = input

+        return asDataFetcherResult {
            Chapter.deleteChapters(listOf(chapter))

-        return DeleteDownloadedChapterPayload(
+            DeleteDownloadedChapterPayload(
                clientMutationId = clientMutationId,
                chapters =
                    transaction {
@@ -72,6 +74,7 @@ class DownloadMutation {
                    },
            )
        }
+    }

    data class EnqueueChapterDownloadsInput(
        val clientMutationId: String? = null,
@@ -84,10 +87,13 @@ class DownloadMutation {
    )

    @RequireAuth
-    fun enqueueChapterDownloads(input: EnqueueChapterDownloadsInput): CompletableFuture<EnqueueChapterDownloadsPayload?> {
+    fun enqueueChapterDownloads(
+        input: EnqueueChapterDownloadsInput,
+    ): CompletableFuture<DataFetcherResult<EnqueueChapterDownloadsPayload?>> {
        val (clientMutationId, chapters) = input

        return future {
+            asDataFetcherResult {
                DownloadManager.enqueue(DownloadManager.EnqueueInput(chapters))

                EnqueueChapterDownloadsPayload(
@@ -104,6 +110,7 @@ class DownloadMutation {
                )
            }
        }
+    }

    data class EnqueueChapterDownloadInput(
        val clientMutationId: String? = null,
@@ -116,10 +123,11 @@ class DownloadMutation {
    )

    @RequireAuth
-    fun enqueueChapterDownload(input: EnqueueChapterDownloadInput): CompletableFuture<EnqueueChapterDownloadPayload?> {
+    fun enqueueChapterDownload(input: EnqueueChapterDownloadInput): CompletableFuture<DataFetcherResult<EnqueueChapterDownloadPayload?>> {
        val (clientMutationId, chapter) = input

        return future {
+            asDataFetcherResult {
                DownloadManager.enqueue(DownloadManager.EnqueueInput(listOf(chapter)))

                EnqueueChapterDownloadPayload(
@@ -135,6 +143,7 @@ class DownloadMutation {
                )
            }
        }
+    }

    data class DequeueChapterDownloadsInput(
        val clientMutationId: String? = null,
@@ -147,10 +156,13 @@ class DownloadMutation {
    )

    @RequireAuth
-    fun dequeueChapterDownloads(input: DequeueChapterDownloadsInput): CompletableFuture<DequeueChapterDownloadsPayload?> {
+    fun dequeueChapterDownloads(
+        input: DequeueChapterDownloadsInput,
+    ): CompletableFuture<DataFetcherResult<DequeueChapterDownloadsPayload?>> {
        val (clientMutationId, chapters) = input

        return future {
+            asDataFetcherResult {
                DownloadManager.dequeue(DownloadManager.EnqueueInput(chapters))

                DequeueChapterDownloadsPayload(
@@ -169,6 +181,7 @@ class DownloadMutation {
                )
            }
        }
+    }

    data class DequeueChapterDownloadInput(
        val clientMutationId: String? = null,
@@ -181,10 +194,11 @@ class DownloadMutation {
    )

    @RequireAuth
-    fun dequeueChapterDownload(input: DequeueChapterDownloadInput): CompletableFuture<DequeueChapterDownloadPayload?> {
+    fun dequeueChapterDownload(input: DequeueChapterDownloadInput): CompletableFuture<DataFetcherResult<DequeueChapterDownloadPayload?>> {
        val (clientMutationId, chapter) = input

        return future {
+            asDataFetcherResult {
                DownloadManager.dequeue(DownloadManager.EnqueueInput(listOf(chapter)))

                DequeueChapterDownloadPayload(
@@ -203,6 +217,7 @@ class DownloadMutation {
                )
            }
        }
+    }

    data class StartDownloaderInput(
        val clientMutationId: String? = null,
@@ -214,8 +229,9 @@ class DownloadMutation {
    )

    @RequireAuth
-    fun startDownloader(input: StartDownloaderInput): CompletableFuture<StartDownloaderPayload?> =
+    fun startDownloader(input: StartDownloaderInput): CompletableFuture<DataFetcherResult<StartDownloaderPayload?>> =
        future {
+            asDataFetcherResult {
                DownloadManager.start()

                StartDownloaderPayload(
@@ -230,6 +246,7 @@ class DownloadMutation {
                        },
                )
            }
+        }

    data class StopDownloaderInput(
        val clientMutationId: String? = null,
@@ -241,8 +258,9 @@ class DownloadMutation {
    )

    @RequireAuth
-    fun stopDownloader(input: StopDownloaderInput): CompletableFuture<StopDownloaderPayload?> =
+    fun stopDownloader(input: StopDownloaderInput): CompletableFuture<DataFetcherResult<StopDownloaderPayload?>> =
        future {
+            asDataFetcherResult {
                DownloadManager.stop()

                StopDownloaderPayload(
@@ -257,6 +275,7 @@ class DownloadMutation {
                        },
                )
            }
+        }

    data class ClearDownloaderInput(
        val clientMutationId: String? = null,
@@ -268,8 +287,9 @@ class DownloadMutation {
    )

    @RequireAuth
-    fun clearDownloader(input: ClearDownloaderInput): CompletableFuture<ClearDownloaderPayload?> =
+    fun clearDownloader(input: ClearDownloaderInput): CompletableFuture<DataFetcherResult<ClearDownloaderPayload?>> =
        future {
+            asDataFetcherResult {
                DownloadManager.clear()

                ClearDownloaderPayload(
@@ -284,6 +304,7 @@ class DownloadMutation {
                        },
                )
            }
+        }

    data class ReorderChapterDownloadInput(
        val clientMutationId: String? = null,
@@ -297,10 +318,11 @@ class DownloadMutation {
    )

    @RequireAuth
-    fun reorderChapterDownload(input: ReorderChapterDownloadInput): CompletableFuture<ReorderChapterDownloadPayload?> {
+    fun reorderChapterDownload(input: ReorderChapterDownloadInput): CompletableFuture<DataFetcherResult<ReorderChapterDownloadPayload?>> {
        val (clientMutationId, chapter, to) = input

        return future {
+            asDataFetcherResult {
                DownloadManager.reorder(chapter, to)

                ReorderChapterDownloadPayload(
@@ -317,3 +339,4 @@ class DownloadMutation {
            }
        }
    }
+}
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ExtensionMutation.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ExtensionMutation.kt
@@ -1,5 +1,3 @@
-@file:Suppress("RedundantNullableReturnType", "unused")
-
 package suwayomi.tachidesk.graphql.mutations

 import eu.kanade.tachiyomi.source.local.LocalSource
@@ -7,6 +5,7 @@ import graphql.execution.DataFetcherResult
 import io.javalin.http.UploadedFile
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
+import suwayomi.tachidesk.graphql.asDataFetcherResult
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.ExtensionType
 import suwayomi.tachidesk.manga.impl.extension.Extension
@@ -76,10 +75,11 @@ class ExtensionMutation {
    }

    @RequireAuth
-    fun updateExtension(input: UpdateExtensionInput): CompletableFuture<UpdateExtensionPayload?> {
+    fun updateExtension(input: UpdateExtensionInput): CompletableFuture<DataFetcherResult<UpdateExtensionPayload?>> {
        val (clientMutationId, id, patch) = input

        return future {
+            asDataFetcherResult {
                updateExtensions(listOf(id), patch)

                val extension =
@@ -97,12 +97,14 @@ class ExtensionMutation {
                )
            }
        }
+    }

    @RequireAuth
-    fun updateExtensions(input: UpdateExtensionsInput): CompletableFuture<UpdateExtensionsPayload?> {
+    fun updateExtensions(input: UpdateExtensionsInput): CompletableFuture<DataFetcherResult<UpdateExtensionsPayload?>> {
        val (clientMutationId, ids, patch) = input

        return future {
+            asDataFetcherResult {
                updateExtensions(ids, patch)

                val extensions =
@@ -119,6 +121,7 @@ class ExtensionMutation {
                )
            }
        }
+    }

    data class FetchExtensionsInput(
        val clientMutationId: String? = null,
@@ -130,10 +133,11 @@ class ExtensionMutation {
    )

    @RequireAuth
-    fun fetchExtensions(input: FetchExtensionsInput): CompletableFuture<FetchExtensionsPayload?> {
+    fun fetchExtensions(input: FetchExtensionsInput): CompletableFuture<DataFetcherResult<FetchExtensionsPayload?>> {
        val (clientMutationId) = input

        return future {
+            asDataFetcherResult {
                ExtensionsList.fetchExtensions()

                val extensions =
@@ -150,6 +154,7 @@ class ExtensionMutation {
                )
            }
        }
+    }

    data class InstallExternalExtensionInput(
        val clientMutationId: String? = null,
@@ -162,10 +167,13 @@ class ExtensionMutation {
    )

    @RequireAuth
-    fun installExternalExtension(input: InstallExternalExtensionInput): CompletableFuture<InstallExternalExtensionPayload?> {
+    fun installExternalExtension(
+        input: InstallExternalExtensionInput,
+    ): CompletableFuture<DataFetcherResult<InstallExternalExtensionPayload?>> {
        val (clientMutationId, extensionFile) = input

        return future {
+            asDataFetcherResult {
                Extension.installExternalExtension(extensionFile.content(), extensionFile.filename())

                val dbExtension =
@@ -178,3 +186,4 @@ class ExtensionMutation {
            }
        }
    }
+}
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ImageMutation.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ImageMutation.kt
@@ -1,5 +1,3 @@
-@file:Suppress("RedundantNullableReturnType", "unused")
-
 package suwayomi.tachidesk.graphql.mutations

 import suwayomi.tachidesk.graphql.directives.RequireAuth
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/InfoMutation.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/InfoMutation.kt
@@ -1,10 +1,9 @@
-@file:Suppress("RedundantNullableReturnType", "unused")
-
 package suwayomi.tachidesk.graphql.mutations

 import graphql.execution.DataFetcherResult
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.withTimeout
+import suwayomi.tachidesk.graphql.asDataFetcherResult
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.UpdateState.DOWNLOADING
 import suwayomi.tachidesk.graphql.types.UpdateState.ERROR
@@ -27,8 +26,9 @@ class InfoMutation {
    )

    @RequireAuth
-    fun updateWebUI(input: WebUIUpdateInput): CompletableFuture<WebUIUpdatePayload?> {
+    fun updateWebUI(input: WebUIUpdateInput): CompletableFuture<DataFetcherResult<WebUIUpdatePayload?>> {
        return future {
+            asDataFetcherResult {
                withTimeout(30.seconds) {
                    if (WebInterfaceManager.status.value.state === DOWNLOADING) {
                        return@withTimeout WebUIUpdatePayload(input.clientMutationId, WebInterfaceManager.status.value)
@@ -59,10 +59,12 @@ class InfoMutation {
                }
            }
        }
+    }

    @RequireAuth
-    fun resetWebUIUpdateStatus(): CompletableFuture<WebUIUpdateStatus?> =
+    fun resetWebUIUpdateStatus(): CompletableFuture<DataFetcherResult<WebUIUpdateStatus?>> =
        future {
+            asDataFetcherResult {
                withTimeout(30.seconds) {
                    val isUpdateFinished = WebInterfaceManager.status.value.state != DOWNLOADING
                    if (!isUpdateFinished) {
@@ -75,3 +77,4 @@ class InfoMutation {
                }
            }
        }
+}
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/KoreaderSyncMutation.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/KoreaderSyncMutation.kt
@@ -1,11 +1,10 @@
-@file:Suppress("RedundantNullableReturnType", "unused")
-
 package suwayomi.tachidesk.graphql.mutations

 import graphql.execution.DataFetcherResult
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.jetbrains.exposed.sql.update
+import suwayomi.tachidesk.graphql.asDataFetcherResult
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.ChapterType
 import suwayomi.tachidesk.graphql.types.KoSyncConnectPayload
@@ -63,8 +62,9 @@ class KoreaderSyncMutation {
    )

    @RequireAuth
-    fun pushKoSyncProgress(input: PushKoSyncProgressInput): CompletableFuture<PushKoSyncProgressPayload?> =
+    fun pushKoSyncProgress(input: PushKoSyncProgressInput): CompletableFuture<DataFetcherResult<PushKoSyncProgressPayload?>> =
        future {
+            asDataFetcherResult {
                KoreaderSyncService.pushProgress(input.chapterId)

                val chapter =
@@ -82,6 +82,7 @@ class KoreaderSyncMutation {
                    chapter = chapter,
                )
            }
+        }

    data class PullKoSyncProgressInput(
        val clientMutationId: String? = null,
@@ -95,8 +96,9 @@ class KoreaderSyncMutation {
    )

    @RequireAuth
-    fun pullKoSyncProgress(input: PullKoSyncProgressInput): CompletableFuture<PullKoSyncProgressPayload?> =
+    fun pullKoSyncProgress(input: PullKoSyncProgressInput): CompletableFuture<DataFetcherResult<PullKoSyncProgressPayload?>> =
        future {
+            asDataFetcherResult {
                val syncResult = KoreaderSyncService.checkAndPullProgress(input.chapterId)
                var syncConflictInfo: SyncConflictInfoType? = null

@@ -135,3 +137,4 @@ class KoreaderSyncMutation {
                )
            }
        }
+}
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/MangaMutation.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/MangaMutation.kt
@@ -1,7 +1,6 @@
-@file:Suppress("RedundantNullableReturnType", "unused")
-
 package suwayomi.tachidesk.graphql.mutations

+import graphql.execution.DataFetcherResult
 import org.jetbrains.exposed.sql.LikePattern
 import org.jetbrains.exposed.sql.Op
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
@@ -13,6 +12,7 @@ import org.jetbrains.exposed.sql.or
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.jetbrains.exposed.sql.update
+import suwayomi.tachidesk.graphql.asDataFetcherResult
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.MangaMetaType
 import suwayomi.tachidesk.graphql.types.MangaType
@@ -98,10 +98,11 @@ class MangaMutation {
    }

    @RequireAuth
-    fun updateManga(input: UpdateMangaInput): CompletableFuture<UpdateMangaPayload?> {
+    fun updateManga(input: UpdateMangaInput): CompletableFuture<DataFetcherResult<UpdateMangaPayload?>> {
        val (clientMutationId, id, patch) = input

        return future {
+            asDataFetcherResult {
                updateMangas(listOf(id), patch)

                val manga =
@@ -115,12 +116,14 @@ class MangaMutation {
                )
            }
        }
+    }

    @RequireAuth
-    fun updateMangas(input: UpdateMangasInput): CompletableFuture<UpdateMangasPayload?> {
+    fun updateMangas(input: UpdateMangasInput): CompletableFuture<DataFetcherResult<UpdateMangasPayload?>> {
        val (clientMutationId, ids, patch) = input

        return future {
+            asDataFetcherResult {
                updateMangas(ids, patch)

                val mangas =
@@ -134,6 +137,7 @@ class MangaMutation {
                )
            }
        }
+    }

    data class FetchMangaInput(
        val clientMutationId: String? = null,
@@ -146,10 +150,11 @@ class MangaMutation {
    )

    @RequireAuth
-    fun fetchManga(input: FetchMangaInput): CompletableFuture<FetchMangaPayload?> {
+    fun fetchManga(input: FetchMangaInput): CompletableFuture<DataFetcherResult<FetchMangaPayload?>> {
        val (clientMutationId, id) = input

        return future {
+            asDataFetcherResult {
                Manga.fetchManga(id)

                val manga =
@@ -162,6 +167,7 @@ class MangaMutation {
                )
            }
        }
+    }

    data class SetMangaMetaInput(
        val clientMutationId: String? = null,
@@ -174,12 +180,14 @@ class MangaMutation {
    )

    @RequireAuth
-    fun setMangaMeta(input: SetMangaMetaInput): SetMangaMetaPayload? {
+    fun setMangaMeta(input: SetMangaMetaInput): DataFetcherResult<SetMangaMetaPayload?> {
        val (clientMutationId, meta) = input

+        return asDataFetcherResult {
            Manga.modifyMangaMeta(meta.mangaId, meta.key, meta.value)

-        return SetMangaMetaPayload(clientMutationId, meta)
+            SetMangaMetaPayload(clientMutationId, meta)
+        }
    }

    data class DeleteMangaMetaInput(
@@ -195,9 +203,10 @@ class MangaMutation {
    )

    @RequireAuth
-    fun deleteMangaMeta(input: DeleteMangaMetaInput): DeleteMangaMetaPayload? {
+    fun deleteMangaMeta(input: DeleteMangaMetaInput): DataFetcherResult<DeleteMangaMetaPayload?> {
        val (clientMutationId, mangaId, key) = input

+        return asDataFetcherResult {
            val (meta, manga) =
                transaction {
                    val meta =
@@ -220,7 +229,8 @@ class MangaMutation {
                    } to manga
                }

-        return DeleteMangaMetaPayload(clientMutationId, meta, manga)
+            DeleteMangaMetaPayload(clientMutationId, meta, manga)
+        }
    }

    data class SetMangaMetasItem(
@@ -240,9 +250,10 @@ class MangaMutation {
    )

    @RequireAuth
-    fun setMangaMetas(input: SetMangaMetasInput): SetMangaMetasPayload? {
+    fun setMangaMetas(input: SetMangaMetasInput): DataFetcherResult<SetMangaMetasPayload?> {
        val (clientMutationId, items) = input

+        return asDataFetcherResult {
            val metaByMangaId =
                items
                    .flatMap { item ->
@@ -274,7 +285,8 @@ class MangaMutation {
                    updatedMetas to mangas
                }

-        return SetMangaMetasPayload(clientMutationId, updatedMetas, mangas)
+            SetMangaMetasPayload(clientMutationId, updatedMetas, mangas)
+        }
    }

    data class DeleteMangaMetasItem(
@@ -295,9 +307,10 @@ class MangaMutation {
    )

    @RequireAuth
-    fun deleteMangaMetas(input: DeleteMangaMetasInput): DeleteMangaMetasPayload? {
+    fun deleteMangaMetas(input: DeleteMangaMetasInput): DataFetcherResult<DeleteMangaMetasPayload?> {
        val (clientMutationId, items) = input

+        return asDataFetcherResult {
            items.forEach { item ->
                require(!item.keys.isNullOrEmpty() || !item.prefixes.isNullOrEmpty()) {
                    "Either 'keys' or 'prefixes' must be provided for each item"
@@ -350,6 +363,7 @@ class MangaMutation {
                        .distinctBy { it.id }
                }

-        return DeleteMangaMetasPayload(clientMutationId, allDeletedMetas, mangas)
+            DeleteMangaMetasPayload(clientMutationId, allDeletedMetas, mangas)
+        }
    }
 }
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/MetaMutation.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/MetaMutation.kt
@@ -1,5 +1,3 @@
-@file:Suppress("RedundantNullableReturnType", "unused")
-
 package suwayomi.tachidesk.graphql.mutations

 import graphql.execution.DataFetcherResult
@@ -14,6 +12,7 @@ import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.global.impl.GlobalMeta
 import suwayomi.tachidesk.global.model.table.GlobalMetaTable
+import suwayomi.tachidesk.graphql.asDataFetcherResult
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.GlobalMetaType
 import suwayomi.tachidesk.graphql.types.MetaInput
@@ -30,12 +29,14 @@ class MetaMutation {
    )

    @RequireAuth
-    fun setGlobalMeta(input: SetGlobalMetaInput): SetGlobalMetaPayload? {
+    fun setGlobalMeta(input: SetGlobalMetaInput): DataFetcherResult<SetGlobalMetaPayload?> {
        val (clientMutationId, meta) = input

+        return asDataFetcherResult {
            GlobalMeta.modifyMeta(meta.key, meta.value)

-        return SetGlobalMetaPayload(clientMutationId, meta)
+            SetGlobalMetaPayload(clientMutationId, meta)
+        }
    }

    data class DeleteGlobalMetaInput(
@@ -49,9 +50,10 @@ class MetaMutation {
    )

    @RequireAuth
-    fun deleteGlobalMeta(input: DeleteGlobalMetaInput): DeleteGlobalMetaPayload? {
+    fun deleteGlobalMeta(input: DeleteGlobalMetaInput): DataFetcherResult<DeleteGlobalMetaPayload?> {
        val (clientMutationId, key) = input

+        return asDataFetcherResult {
            val meta =
                transaction {
                    val meta =
@@ -69,7 +71,8 @@ class MetaMutation {
                    }
                }

-        return DeleteGlobalMetaPayload(clientMutationId, meta)
+            DeleteGlobalMetaPayload(clientMutationId, meta)
+        }
    }

    data class SetGlobalMetasInput(
@@ -83,9 +86,10 @@ class MetaMutation {
    )

    @RequireAuth
-    fun setGlobalMetas(input: SetGlobalMetasInput): SetGlobalMetasPayload? {
+    fun setGlobalMetas(input: SetGlobalMetasInput): DataFetcherResult<SetGlobalMetasPayload?> {
        val (clientMutationId, metas) = input

+        return asDataFetcherResult {
            val metaMap = metas.associate { it.key to it.value }
            GlobalMeta.modifyMetas(metaMap)

@@ -97,7 +101,8 @@ class MetaMutation {
                        .map { GlobalMetaType(it) }
                }

-        return SetGlobalMetasPayload(clientMutationId, updatedMetas)
+            SetGlobalMetasPayload(clientMutationId, updatedMetas)
+        }
    }

    data class DeleteGlobalMetasInput(
@@ -112,9 +117,10 @@ class MetaMutation {
    )

    @RequireAuth
-    fun deleteGlobalMetas(input: DeleteGlobalMetasInput): DeleteGlobalMetasPayload? {
+    fun deleteGlobalMetas(input: DeleteGlobalMetasInput): DataFetcherResult<DeleteGlobalMetasPayload?> {
        val (clientMutationId, keys, prefixes) = input

+        return asDataFetcherResult {
            require(!keys.isNullOrEmpty() || !prefixes.isNullOrEmpty()) {
                "Either 'keys' or 'prefixes' must be provided"
            }
@@ -147,6 +153,7 @@ class MetaMutation {
                    metas
                }

-        return DeleteGlobalMetasPayload(clientMutationId, metas)
+            DeleteGlobalMetasPayload(clientMutationId, metas)
+        }
    }
 }
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/SettingsMutation.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/SettingsMutation.kt
@@ -1,5 +1,3 @@
-@file:Suppress("RedundantNullableReturnType", "unused")
-
 package suwayomi.tachidesk.graphql.mutations

 import com.expediagroup.graphql.generator.annotations.GraphQLIgnore
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/SourceMutation.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/SourceMutation.kt
@@ -1,5 +1,3 @@
-@file:Suppress("RedundantNullableReturnType", "unused")
-
 package suwayomi.tachidesk.graphql.mutations

 import androidx.preference.CheckBoxPreference
@@ -7,6 +5,7 @@ import androidx.preference.EditTextPreference
 import androidx.preference.ListPreference
 import androidx.preference.MultiSelectListPreference
 import androidx.preference.SwitchPreferenceCompat
+import graphql.execution.DataFetcherResult
 import org.jetbrains.exposed.sql.LikePattern
 import org.jetbrains.exposed.sql.Op
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
@@ -17,6 +16,7 @@ import org.jetbrains.exposed.sql.deleteWhere
 import org.jetbrains.exposed.sql.or
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
+import suwayomi.tachidesk.graphql.asDataFetcherResult
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.FilterChange
 import suwayomi.tachidesk.graphql.types.MangaType
@@ -47,12 +47,14 @@ class SourceMutation {
    )

    @RequireAuth
-    fun setSourceMeta(input: SetSourceMetaInput): SetSourceMetaPayload? {
+    fun setSourceMeta(input: SetSourceMetaInput): DataFetcherResult<SetSourceMetaPayload?> {
        val (clientMutationId, meta) = input

+        return asDataFetcherResult {
            Source.modifyMeta(meta.sourceId, meta.key, meta.value)

-        return SetSourceMetaPayload(clientMutationId, meta)
+            SetSourceMetaPayload(clientMutationId, meta)
+        }
    }

    data class DeleteSourceMetaInput(
@@ -68,9 +70,10 @@ class SourceMutation {
    )

    @RequireAuth
-    fun deleteSourceMeta(input: DeleteSourceMetaInput): DeleteSourceMetaPayload? {
+    fun deleteSourceMeta(input: DeleteSourceMetaInput): DataFetcherResult<DeleteSourceMetaPayload?> {
        val (clientMutationId, sourceId, key) = input

+        return asDataFetcherResult {
            val (meta, source) =
                transaction {
                    val meta =
@@ -97,7 +100,8 @@ class SourceMutation {
                    } to source
                }

-        return DeleteSourceMetaPayload(clientMutationId, meta, source)
+            DeleteSourceMetaPayload(clientMutationId, meta, source)
+        }
    }

    data class SetSourceMetasItem(
@@ -117,9 +121,10 @@ class SourceMutation {
    )

    @RequireAuth
-    fun setSourceMetas(input: SetSourceMetasInput): SetSourceMetasPayload? {
+    fun setSourceMetas(input: SetSourceMetasInput): DataFetcherResult<SetSourceMetasPayload?> {
        val (clientMutationId, items) = input

+        return asDataFetcherResult {
            val metaBySourceId =
                items
                    .flatMap { item ->
@@ -151,7 +156,8 @@ class SourceMutation {
                    updatedMetas to sources
                }

-        return SetSourceMetasPayload(clientMutationId, updatedMetas, sources)
+            SetSourceMetasPayload(clientMutationId, updatedMetas, sources)
+        }
    }

    data class DeleteSourceMetasItem(
@@ -172,9 +178,10 @@ class SourceMutation {
    )

    @RequireAuth
-    fun deleteSourceMetas(input: DeleteSourceMetasInput): DeleteSourceMetasPayload? {
+    fun deleteSourceMetas(input: DeleteSourceMetasInput): DataFetcherResult<DeleteSourceMetasPayload?> {
        val (clientMutationId, items) = input

+        return asDataFetcherResult {
            items.forEach { item ->
                require(!item.keys.isNullOrEmpty() || !item.prefixes.isNullOrEmpty()) {
                    "Either 'keys' or 'prefixes' must be provided for each item"
@@ -227,7 +234,8 @@ class SourceMutation {
                        .distinctBy { it.id }
                }

-        return DeleteSourceMetasPayload(clientMutationId, allDeletedMetas, sources)
+            DeleteSourceMetasPayload(clientMutationId, allDeletedMetas, sources)
+        }
    }

    enum class FetchSourceMangaType {
@@ -252,10 +260,11 @@ class SourceMutation {
    )

    @RequireAuth
-    fun fetchSourceManga(input: FetchSourceMangaInput): CompletableFuture<FetchSourceMangaPayload?> {
+    fun fetchSourceManga(input: FetchSourceMangaInput): CompletableFuture<DataFetcherResult<FetchSourceMangaPayload?>> {
        val (clientMutationId, sourceId, type, page, query, filters) = input

        return future {
+            asDataFetcherResult {
                val source = GetCatalogueSource.getCatalogueSourceOrNull(sourceId)!!
                val mangasPage =
                    when (type) {
@@ -296,6 +305,7 @@ class SourceMutation {
                )
            }
        }
+    }

    data class SourcePreferenceChange(
        val position: Int,
@@ -319,9 +329,10 @@ class SourceMutation {
    )

    @RequireAuth
-    fun updateSourcePreference(input: UpdateSourcePreferenceInput): UpdateSourcePreferencePayload? {
+    fun updateSourcePreference(input: UpdateSourcePreferenceInput): DataFetcherResult<UpdateSourcePreferencePayload?> {
        val (clientMutationId, sourceId, change) = input

+        return asDataFetcherResult {
            Source.setSourcePreference(sourceId, change.position, "") { preference ->
                when (preference) {
                    is SwitchPreferenceCompat -> change.switchState
@@ -333,7 +344,7 @@ class SourceMutation {
                } ?: throw Exception("Expected change to ${preference::class.simpleName}")
            }

-        return UpdateSourcePreferencePayload(
+            UpdateSourcePreferencePayload(
                clientMutationId = clientMutationId,
                preferences = Source.getSourcePreferencesRaw(sourceId).map { preferenceOf(it) },
                source =
@@ -343,3 +354,4 @@ class SourceMutation {
            )
        }
    }
+}
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/TrackMutation.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/TrackMutation.kt
@@ -1,5 +1,3 @@
-@file:Suppress("RedundantNullableReturnType", "unused")
-
 package suwayomi.tachidesk.graphql.mutations

 import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated
@@ -8,6 +6,7 @@ import graphql.execution.DataFetcherResult
 import org.jetbrains.exposed.sql.and
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
+import suwayomi.tachidesk.graphql.asDataFetcherResult
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.TrackRecordType
 import suwayomi.tachidesk.graphql.types.TrackerType
@@ -223,10 +222,11 @@ class TrackMutation {
    )

    @RequireAuth
-    fun trackProgress(input: TrackProgressInput): CompletableFuture<TrackProgressPayload?> {
+    fun trackProgress(input: TrackProgressInput): CompletableFuture<DataFetcherResult<TrackProgressPayload?>> {
        val (clientMutationId, mangaId) = input

        return future {
+            asDataFetcherResult {
                Track.trackChapter(mangaId)
                val trackRecords =
                    transaction {
@@ -241,6 +241,7 @@ class TrackMutation {
                )
            }
        }
+    }

    data class UpdateTrackInput(
        val clientMutationId: String? = null,
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/UpdateMutation.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/UpdateMutation.kt
@@ -1,10 +1,9 @@
-@file:Suppress("RedundantNullableReturnType", "unused")
-
 package suwayomi.tachidesk.graphql.mutations

 import graphql.execution.DataFetcherResult
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.withTimeout
+import suwayomi.tachidesk.graphql.asDataFetcherResult
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.LibraryUpdateStatus
 import suwayomi.tachidesk.graphql.types.UpdateStatus
@@ -29,7 +28,7 @@ class UpdateMutation {
    )

    @RequireAuth
-    fun updateLibrary(input: UpdateLibraryInput): CompletableFuture<UpdateLibraryPayload?> {
+    fun updateLibrary(input: UpdateLibraryInput): CompletableFuture<DataFetcherResult<UpdateLibraryPayload?>> {
        updater.addCategoriesToUpdateQueue(
            Category.getCategoryList().filter { input.categories?.contains(it.id) ?: true },
            clear = true,
@@ -37,6 +36,7 @@ class UpdateMutation {
        )

        return future {
+            asDataFetcherResult {
                UpdateLibraryPayload(
                    input.clientMutationId,
                    updateStatus =
@@ -48,6 +48,7 @@ class UpdateMutation {
                )
            }
        }
+    }

    data class UpdateLibraryMangaInput(
        val clientMutationId: String? = null,
@@ -59,7 +60,7 @@ class UpdateMutation {
    )

    @RequireAuth
-    fun updateLibraryManga(input: UpdateLibraryMangaInput): CompletableFuture<UpdateLibraryMangaPayload?> {
+    fun updateLibraryManga(input: UpdateLibraryMangaInput): CompletableFuture<DataFetcherResult<UpdateLibraryMangaPayload?>> {
        updateLibrary(
            UpdateLibraryInput(
                clientMutationId = input.clientMutationId,
@@ -68,6 +69,7 @@ class UpdateMutation {
        )

        return future {
+            asDataFetcherResult {
                UpdateLibraryMangaPayload(
                    input.clientMutationId,
                    updateStatus =
@@ -77,6 +79,7 @@ class UpdateMutation {
                )
            }
        }
+    }

    data class UpdateCategoryMangaInput(
        val clientMutationId: String? = null,
@@ -89,7 +92,7 @@ class UpdateMutation {
    )

    @RequireAuth
-    fun updateCategoryManga(input: UpdateCategoryMangaInput): CompletableFuture<UpdateCategoryMangaPayload?> {
+    fun updateCategoryManga(input: UpdateCategoryMangaInput): CompletableFuture<DataFetcherResult<UpdateCategoryMangaPayload?>> {
        updateLibrary(
            UpdateLibraryInput(
                clientMutationId = input.clientMutationId,
@@ -98,6 +101,7 @@ class UpdateMutation {
        )

        return future {
+            asDataFetcherResult {
                UpdateCategoryMangaPayload(
                    input.clientMutationId,
                    updateStatus =
@@ -107,6 +111,7 @@ class UpdateMutation {
                )
            }
        }
+    }

    data class UpdateStopInput(
        val clientMutationId: String? = null,
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/UserMutation.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/UserMutation.kt
@@ -1,5 +1,3 @@
-@file:Suppress("RedundantNullableReturnType", "unused")
-
 package suwayomi.tachidesk.graphql.mutations

 import graphql.schema.DataFetchingEnvironment
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/JavalinGraphQLRequestParser.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/JavalinGraphQLRequestParser.kt
@@ -11,7 +11,6 @@ import com.expediagroup.graphql.server.execution.GraphQLRequestParser
 import com.expediagroup.graphql.server.types.GraphQLBatchRequest
 import com.expediagroup.graphql.server.types.GraphQLRequest
 import com.expediagroup.graphql.server.types.GraphQLServerRequest
-import io.github.oshai.kotlinlogging.KotlinLogging
 import io.javalin.http.Context
 import io.javalin.http.UploadedFile
 import io.javalin.json.JavalinJackson
@@ -20,12 +19,11 @@ import io.javalin.json.fromJsonString
 import java.io.IOException

 class JavalinGraphQLRequestParser : GraphQLRequestParser<Context> {
-    private val logger = KotlinLogging.logger {}
+    val jsonMapper = JavalinJackson()

    @Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE")
    override suspend fun parseRequest(context: Context): GraphQLServerRequest? {
        return try {
-            val jsonMapper = context.jsonMapper()
            val contentType = context.contentType()
            val formParam =
                if (
@@ -79,8 +77,7 @@ class JavalinGraphQLRequestParser : GraphQLRequestParser<Context> {
                    )
                }
            }
-        } catch (e: IOException) {
-            logger.error(e) { "Error when parsing request" }
+        } catch (_: IOException) {
            null
        }
    }
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/TachideskGraphQLServer.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/TachideskGraphQLServer.kt
@@ -10,6 +10,7 @@ package suwayomi.tachidesk.graphql.server
 import com.expediagroup.graphql.generator.execution.FlowSubscriptionExecutionStrategy
 import com.expediagroup.graphql.server.execution.GraphQLRequestHandler
 import com.expediagroup.graphql.server.execution.GraphQLServer
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import graphql.ExceptionWhileDataFetching
 import graphql.GraphQL
 import graphql.execution.AsyncExecutionStrategy
@@ -26,7 +27,6 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import suwayomi.tachidesk.graphql.server.subscriptions.ApolloSubscriptionProtocolHandler
 import suwayomi.tachidesk.server.JavalinSetup.future
-import tools.jackson.module.kotlin.jacksonObjectMapper

 class TachideskGraphQLServer(
    requestParser: JavalinGraphQLRequestParser,
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/primitives/Cursor.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/primitives/Cursor.kt
@@ -58,7 +58,7 @@ private class GraphqlCursorCoercing : Coercing<Cursor, String> {
                ),
            )
        }
-        return Cursor(input.value!!)
+        return Cursor(input.value)
    }

    private fun valueToLiteralImpl(input: Any): StringValue = StringValue.newStringValue(input.toString()).build()
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/primitives/DurationAsString.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/primitives/DurationAsString.kt
@@ -71,7 +71,7 @@ private class GraphqlDurationAsStringCoercing : Coercing<Duration, String> {
            )
        }
        return try {
-            Duration.parse(input.value!!)
+            Duration.parse(input.value)
        } catch (e: IllegalArgumentException) {
            throw CoercingParseLiteralException(
                "Invalid duration format: ${input.value}. Expected ISO-8601 duration string (e.g., 'PT30M', 'P1D')",
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/primitives/LongAsString.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/primitives/LongAsString.kt
@@ -53,7 +53,7 @@ private class GraphqlLongAsStringCoercing : Coercing<Long, String> {
                ),
            )
        }
-        return input.value!!.toLong()
+        return input.value.toLong()
    }

    private fun valueToLiteralImpl(input: Any): StringValue = StringValue.newStringValue(input.toString()).build()
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/subscriptions/ApolloSubscriptionProtocolHandler.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/subscriptions/ApolloSubscriptionProtocolHandler.kt
@@ -9,6 +9,9 @@ package suwayomi.tachidesk.graphql.server.subscriptions

 import com.expediagroup.graphql.server.execution.GraphQLRequestHandler
 import com.expediagroup.graphql.server.types.GraphQLRequest
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.module.kotlin.convertValue
+import com.fasterxml.jackson.module.kotlin.readValue
 import io.github.oshai.kotlinlogging.KotlinLogging
 import io.javalin.http.Header
 import io.javalin.websocket.WsContext
@@ -38,9 +41,6 @@ import suwayomi.tachidesk.server.JavalinSetup.Attribute
 import suwayomi.tachidesk.server.JavalinSetup.getAttributeOrSet
 import suwayomi.tachidesk.server.user.UserType
 import suwayomi.tachidesk.server.user.getUserFromToken
-import tools.jackson.databind.ObjectMapper
-import tools.jackson.module.kotlin.convertValue
-import tools.jackson.module.kotlin.readValue

 /**
 * Implementation of the `graphql-transport-ws` protocol defined by Denis Badurina
--- a/server/src/main/kotlin/suwayomi/tachidesk/server/JavalinSetup.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/server/JavalinSetup.kt
@@ -27,10 +27,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.future.future
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withTimeoutOrNull
 import org.eclipse.jetty.server.ServerConnector
 import suwayomi.tachidesk.global.GlobalAPI
 import suwayomi.tachidesk.graphql.GraphQL
@@ -54,7 +51,6 @@ import java.util.concurrent.CompletableFuture
 import kotlin.concurrent.thread
 import kotlin.text.get
 import kotlin.time.Duration.Companion.days
-import kotlin.time.Duration.Companion.seconds

 object JavalinSetup {
    private val logger = KotlinLogging.logger {}
@@ -136,15 +132,10 @@ object JavalinSetup {

                config.events.serverStarted {
                    if (serverConfig.initialOpenInBrowserEnabled.value) {
-                        scope.launch {
-                            withTimeoutOrNull(10.seconds) {
-                                WebInterfaceManager.isSetupComplete.first { it }
-                            }
                        Browser.openInBrowser()
                    }
                }
            }
-            }

        // when JVM is prompted to shutdown, stop javalin gracefully
        Runtime.getRuntime().addShutdownHook(
--- a/server/src/main/kotlin/suwayomi/tachidesk/server/util/WebInterfaceManager.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/server/util/WebInterfaceManager.kt
@@ -27,7 +27,6 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.sample
@@ -91,7 +90,7 @@ object WebInterfaceManager {
    private val preferences = Injekt.get<Application>().getSharedPreferences("server_util", Context.MODE_PRIVATE)
    private var currentUpdateTaskId: String = ""

-    val isSetupComplete = MutableStateFlow(false)
+    private var isSetupComplete = false

    private val json: Json by injectLazy()
    private val network: NetworkHelper by injectLazy()
@@ -197,7 +196,7 @@ object WebInterfaceManager {
        @OptIn(DelicateCoroutinesApi::class)
        GlobalScope.launchIO {
            setupWebUI()
-            isSetupComplete.value = true
+            isSetupComplete = true
        }
    }

@@ -261,7 +260,7 @@ object WebInterfaceManager {
        val lastAutomatedUpdate = preferences.getLong(LAST_WEBUI_UPDATE_CHECK_KEY, System.currentTimeMillis())

        val task = {
-            if (isSetupComplete.value) {
+            if (isSetupComplete) {
                val log =
                    KotlinLogging.logger(
                        "${logger.name}::scheduleWebUIUpdateCheck(" +
--- a/server/src/test/kotlin/suwayomi/tachidesk/SafePathTest.kt
+++ b/server/src/test/kotlin/suwayomi/tachidesk/SafePathTest.kt
@@ -1,50 +0,0 @@
-package suwayomi.tachidesk
-
-import xyz.nulldev.androidcompat.util.SafePath
-import kotlin.test.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue
-
-class SafePathTest {
-    @Test
-    fun invalidCharactersAreReplacedAndEdgesAreTrimmed() {
-        val input = " .a:b*c?d<e>f|g\\h/i. "
-
-        val result = SafePath.buildValidFilename(input)
-
-        assertEquals("a_b_c_d_e_f_g_h_i", result)
-    }
-
-    @Test
-    fun emptyAfterTrimReturnsInvalidMarker() {
-        assertEquals("(invalid)", SafePath.buildValidFilename(" ...   . "))
-    }
-
-    @Test
-    fun resultIsTruncatedTo240Characters() {
-        val input = "a".repeat(300)
-
-        val result = SafePath.buildValidFilename(input)
-
-        assertEquals(240, result.length)
-        assertEquals("a".repeat(240), result)
-    }
-
-    @Test
-    fun mixed256CharactersCanExceed255Utf8Bytes() {
-        val mixed256 =
-            buildString {
-                repeat(128) {
-                    append('a')
-                    append('你')
-                }
-            }
-
-        val result = SafePath.buildValidFilename(mixed256)
-
-        assertEquals(120, result.length)
-        assertEquals(mixed256.take(120), result)
-        assertEquals(240, result.toByteArray(Charsets.UTF_8).size)
-        assertTrue(result.toByteArray(Charsets.UTF_8).size == 240)
-    }
-}
Author	SHA1	Message	Date
Syer10	fbfa80f196	Import fix	2026-05-09 14:47:25 -04:00
Syer10	9d5d88e56c	Update Javalin usage to v7 and Jackson 3	2026-05-09 14:40:09 -04:00
renovate[bot]	d57623fe2e	Update javalin to v7	2026-05-09 17:01:05 +00:00