Update graphqlkotlin to v9

.editorconfig

@@ -11,8 +11,4 @@ ktlint_standard_if-else-wrapping=disabled
 ktlint_standard_no-consecutive-comments=disabled
 
 [**/generated/**]
-ktlint=disabled
+ktlint=disabled
-
-[*.json]
-indent_size=2
-indent_style = space

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -42,7 +42,7 @@ body:
       label: Suwayomi-Server version
       description: You can find your Suwayomi-Server version in **More → About**.
       placeholder: |
-        Example: "v2.3.2238"
+        Example: "v2.1.1867"
     validations:
       required: true
 
@@ -143,13 +143,11 @@ body:
       options:
         - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open or closed issue.
           required: true
-        - label: I have checked the ongoing preview changelog of **[Suwayomi-WebUI](https://github.com/Suwayomi/Suwayomi-WebUI/blob/master/CHANGELOG.md)** and **[Suwayomi-Server](https://github.com/Suwayomi/Suwayomi-Server/blob/master/CHANGELOG.md)** and this bug has **NOT** been listed as fixed
-          required: true
         - label: I have written a short but informative title (ideally less than ~100 characters).
           required: true
         - label: I have tried the troubleshooting guide described in [README.md](https://github.com/Suwayomi/Suwayomi-Server?tab=readme-ov-file#troubleshooting-and-support)
           required: true
-        - label: I have updated the (**[Suwayomi-WebUI](https://github.com/suwayomi/suwayomi-webui/releases/latest)** and **[Suwayomi-Server](https://github.com/suwayomi/suwayomi-server/releases/latest)**) to the latest versions
+        - label: I have updated to the **[latest version](https://github.com/suwayomi/suwayomi-server/releases/latest)**.
           required: true
         - label: I have filled out all of the requested information in this form, including specific version numbers.
           required: true

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -31,7 +31,7 @@ body:
           required: true
         - label: I have written a short but informative title (ideally less than ~100 characters).
           required: true
-        - label: I have updated the (**[Suwayomi-WebUI](https://github.com/suwayomi/suwayomi-webui/releases/latest)** and **[Suwayomi-Server](https://github.com/suwayomi/suwayomi-server/releases/latest)**) to the latest versions
+        - label: I have updated to the **[latest version](https://github.com/suwayomi/suwayomi-server/releases/latest)**.
           required: true
         - label: I have filled out all of the requested information in this form, including specific version numbers.
           required: true

.github/pull_request_template.md

@@ -1,6 +0,0 @@
-<!--
-Pull Request Checklist:
-- Mention what the pull request does and the reasons behind the changes
-- Mention all issues the pull request is closing
-- Make sure to update the CHANGELOG accordingly if necessary based on the LAST stable release
--->

.github/workflows/build_pull_request.yml

@@ -67,7 +67,7 @@ jobs:
           export LD_PRELOAD="$(pwd)/scripts/resources/catch_abort.so"
           JAR=$(ls ./server/build/*.jar| head -1)
           set +e
-          timeout 30s java \
+          timeout 30s java -DcrashOnFailedMigration=true \
               -Dsuwayomi.tachidesk.config.server.systemTrayEnabled=false \
               -Dsuwayomi.tachidesk.config.server.initialOpenInBrowserEnabled=false \
               -Dsuwayomi.tachidesk.config.server.databaseType=POSTGRESQL \
@@ -83,7 +83,7 @@ jobs:
             exit "$ecode"
           fi
 
-          timeout 30s java \
+          timeout 30s java -DcrashOnFailedMigration=true \
               -Dsuwayomi.tachidesk.config.server.systemTrayEnabled=false \
               -Dsuwayomi.tachidesk.config.server.initialOpenInBrowserEnabled=false \
               -jar "$JAR"
@@ -96,10 +96,6 @@ jobs:
           fi
           exit 0
 
-      - name: "Run tests"
-        working-directory: master
-        run: ./gradlew test --stacktrace
-
   check_docs:
     name: Validate that all options are documented
     runs-on: ubuntu-latest

.github/workflows/build_push.yml

@@ -54,14 +54,14 @@ jobs:
         run: ./gradlew :server:shadowJar --stacktrace
 
       - name: Upload Jar
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
           name: jar
           path: master/server/build/*.jar
           if-no-files-found: error
 
       - name: Upload icons
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
           name: icon
           path: master/server/src/main/resources/icon
@@ -71,7 +71,7 @@ jobs:
         run: tar -cvzf scripts.tar.gz -C master/ scripts/
 
       - name: Upload scripts.tar.gz
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
           name: scripts
           path: scripts.tar.gz
@@ -103,7 +103,7 @@ jobs:
         run: jlink --add-modules java.base,java.compiler,java.datatransfer,java.desktop,java.instrument,java.logging,java.management,java.naming,java.prefs,java.scripting,java.se,java.security.jgss,java.security.sasl,java.sql,java.transaction.xa,java.xml,jdk.attach,jdk.crypto.ec,jdk.jdi,jdk.management,jdk.net,jdk.unsupported,jdk.unsupported.desktop,jdk.zipfs,jdk.accessibility --output suwa --strip-debug --no-man-pages --no-header-files --compress=2
 
       - name: Upload JRE package
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
           name: ${{ matrix.name }}-jre
           path: suwa
@@ -134,26 +134,26 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download Jar
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
         with:
           name: jar
           path: server/build
 
       - name: Download JRE
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
         if: matrix.name != 'linux-assets' && matrix.name != 'debian-all'
         with:
           name: ${{ matrix.jre }}-jre
           path: jre
 
       - name: Download icons
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
         with:
           name: icon
           path: server/src/main/resources/icon
 
       - name: Download scripts.tar.gz
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
         with:
           name: scripts
 
@@ -164,7 +164,7 @@ jobs:
           scripts/bundler.sh -o upload/ ${{ matrix.name }}
 
       - name: Upload ${{ matrix.name }} release
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
           name: ${{ matrix.name }}
           path: upload/*
@@ -174,35 +174,35 @@ jobs:
     needs: bundle
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: jar
           path: release
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: debian-all
           path: release
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: appimage
           path: release
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: linux-assets
           path: release
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: linux-x64
           path: release
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: macOS-x64
           path: release
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: macOS-arm64
           path: release
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: windows-x64
           path: release
@@ -240,7 +240,7 @@ jobs:
           git push origin $TAG
 
       - name: Upload Preview Release
-        uses: softprops/action-gh-release@v3
+        uses: softprops/action-gh-release@v2
         with:
           token: ${{ secrets.DEPLOY_PREVIEW_TOKEN }}
           repository: "Suwayomi/Suwayomi-Server-preview"

.github/workflows/docker_build_stable.yml

@@ -11,5 +11,5 @@ jobs:
     steps:         
       - name: run docker build and publish script
         run: |
-          curl -X POST -H "Accept: application/vnd.github.v3+json" -H "Authorization: token ${{ secrets.DEPLOY_DOCKER_TOKEN }}" -d '{"ref":"main", "inputs":{"tachidesk_release_type": "stable"}}' https://api.github.com/repos/suwayomi/suwayomi-server-docker/actions/workflows/build_container_images.yml/dispatches
+          curl -X POST -H "Accept: application/vnd.github.v3+json" -H "Authorization: token ${{ secrets.DEPLOY_PREVIEW_TOKEN }}" -d '{"ref":"main", "inputs":{"tachidesk_release_type": "stable"}}' https://api.github.com/repos/suwayomi/docker-tachidesk/actions/workflows/build_container_images.yml/dispatches
           

.github/workflows/publish.yml

@@ -56,14 +56,14 @@ jobs:
         run: ./gradlew :server:downloadWebUI :server:shadowJar --stacktrace
 
       - name: Upload Jar
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
           name: jar
           path: master/server/build/*.jar
           if-no-files-found: error
 
       - name: Upload icons
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
           name: icon
           path: master/server/src/main/resources/icon
@@ -73,7 +73,7 @@ jobs:
         run: tar -cvzf scripts.tar.gz -C master/ scripts/
 
       - name: Upload scripts.tar.gz
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
           name: scripts
           path: scripts.tar.gz
@@ -105,7 +105,7 @@ jobs:
         run: jlink --add-modules java.base,java.compiler,java.datatransfer,java.desktop,java.instrument,java.logging,java.management,java.naming,java.prefs,java.scripting,java.se,java.security.jgss,java.security.sasl,java.sql,java.transaction.xa,java.xml,jdk.attach,jdk.crypto.ec,jdk.jdi,jdk.management,jdk.net,jdk.unsupported,jdk.unsupported.desktop,jdk.zipfs,jdk.accessibility --output suwa --strip-debug --no-man-pages --no-header-files --compress=2
 
       - name: Upload JDK package
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
           name: ${{ matrix.name }}-jre
           path: suwa
@@ -136,26 +136,26 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download Jar
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
         with:
           name: jar
           path: server/build
 
       - name: Download JRE
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
         if: matrix.name != 'linux-assets' && matrix.name != 'debian-all'
         with:
           name: ${{ matrix.jre }}-jre
           path: jre
 
       - name: Download icons
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
         with:
           name: icon
           path: server/src/main/resources/icon
 
       - name: Download scripts.tar.gz
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
         with:
           name: scripts
 
@@ -166,7 +166,7 @@ jobs:
           scripts/bundler.sh -o upload/ ${{ matrix.name }}
 
       - name: Upload ${{ matrix.name }} files
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
           name: ${{ matrix.name }}
           path: upload/*
@@ -177,35 +177,35 @@ jobs:
     needs: bundle
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: jar
           path: release
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: debian-all
           path: release
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: appimage
           path: release
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: linux-assets
           path: release
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: linux-x64
           path: release
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: macOS-x64
           path: release
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: macOS-arm64
           path: release
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: windows-x64
           path: release
@@ -214,7 +214,7 @@ jobs:
         run: cd release && sha256sum * > Checksums.sha256
 
       - name: Release
-        uses: softprops/action-gh-release@v3
+        uses: softprops/action-gh-release@v2
         with:
           token: ${{ secrets.DEPLOY_RELEASE_TOKEN }}
           draft: true

.github/workflows/wiki.yml

@@ -1,7 +1,6 @@
 name: GitHub Wiki upload
 
 on:
-  workflow_dispatch:
   push:
     branches:
       - master
@@ -24,8 +23,6 @@ jobs:
         with:
           repository: ${{github.repository}}
           path: ${{github.repository}}
-          fetch-depth: 0 # fetch history & tags to determine stable version
-          fetch-tags: true
 
       - name: Checkout Wiki
         uses: actions/checkout@v6
@@ -38,13 +35,6 @@ jobs:
           set -e
           cd $GITHUB_WORKSPACE/${{github.repository}}.wiki
           cp -r $GITHUB_WORKSPACE/${{github.repository}}/docs/* .
-          
-          stable="$(git -C $GITHUB_WORKSPACE/${{github.repository}} describe --abbrev=0 --tags)"
-          if ! git -C $GITHUB_WORKSPACE/${{github.repository}} log --exit-code --pretty= "$stable.." -- docs/Configuring-Suwayomi‐Server.md; then
-            echo "Changes to config detected, embedding link to stable"
-            sed -i '1s/^/> [!WARNING]\n> This document describes the settings available in the preview version. Please head to ['$stable'](https:\/\/github.com\/Suwayomi\/Suwayomi-Server\/blob\/'$stable'\/docs\/Configuring-Suwayomi%E2%80%90Server.md) for the current stable version\n\n/' Configuring-Suwayomi‐Server.md
-          fi
-          
           git config --local user.email "action@github.com"
           git config --local user.name "GitHub Action"
           git add .

.github/workflows/winget.yml

@@ -1,52 +1,19 @@
 name: Publish to WinGet
-
 on:
   workflow_dispatch:
     inputs:
       version:
         description: Version
         required: false
-        type: string
-  release:
-    types: [published]
 
 jobs:
   publish:
     runs-on: windows-latest # action can only be run on windows
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Determine version
-        id: version
-        shell: bash
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          if [ -n "${{ inputs.version }}" ]; then
-            VERSION="${{ inputs.version }}"
-          elif [ "${{ github.event_name }}" = "release" ]; then
-            VERSION="${{ github.event.release.tag_name }}"
-          else
-            VERSION="$(gh release view --json tagName -q .tagName)"
-          fi
-
-          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
-
-      - name: Sync winget-pkgs fork with upstream
-        shell: bash
-        env:
-          GH_TOKEN: ${{ secrets.WINGET_PUBLISH_PAT }}
-        run: |
-          gh api \
-            --method POST \
-            -H "Accept: application/vnd.github+json" \
-            "repos/Suwayomi/winget-pkgs/merge-upstream" \
-            -f branch=master
-
       - uses: vedantmgoyal2009/winget-releaser@v2
         with:
           identifier: Suwayomi.Suwayomi-Server
           installers-regex: '.*x64.msi$'
           token: ${{ secrets.WINGET_PUBLISH_PAT }}
-          version: ${{ steps.version.outputs.version }}
+          version: ${{ inputs.version || github.ref_name }}
-          release-tag: ${{ steps.version.outputs.version }}
+          release-tag: ${{ inputs.version || github.ref_name  }}

AndroidCompat/src/main/java/android/graphics/Bitmap.java

@@ -345,57 +345,6 @@ public final class Bitmap {
         return image.getRGB(x, y);
     }
 
-    /**
-     * <p>Write the specified {@link Color} into the bitmap (assuming it is
-     * mutable) at the x,y coordinate. The color must be a
-     * non-premultiplied ARGB value in the {@link ColorSpace.Named#SRGB sRGB}
-     * color space.</p>
-     *
-     * @param x     The x coordinate of the pixel to replace (0...width-1)
-     * @param y     The y coordinate of the pixel to replace (0...height-1)
-     * @param color The ARGB color to write into the bitmap
-     *
-     * @throws IllegalStateException if the bitmap is not mutable
-     * @throws IllegalArgumentException if x, y are outside of the bitmap's
-     *         bounds.
-     */
-    public void setPixel(int x, int y, @ColorInt int color) {
-        checkPixelAccess(x, y);
-        image.setRGB(x, y, color);
-    }
-
-    /**
-     * <p>Replace pixels in the bitmap with the colors in the array. Each element
-     * in the array is a packed int representing a non-premultiplied ARGB
-     * {@link Color} in the {@link ColorSpace.Named#SRGB sRGB} color space.</p>
-     *
-     * @param pixels   The colors to write to the bitmap
-     * @param offset   The index of the first color to read from pixels[]
-     * @param stride   The number of colors in pixels[] to skip between rows.
-     *                 Normally this value will be the same as the width of
-     *                 the bitmap, but it can be larger (or negative).
-     * @param x        The x coordinate of the first pixel to write to in
-     *                 the bitmap.
-     * @param y        The y coordinate of the first pixel to write to in
-     *                 the bitmap.
-     * @param width    The number of colors to copy from pixels[] per row
-     * @param height   The number of rows to write to the bitmap
-     *
-     * @throws IllegalStateException if the bitmap is not mutable
-     * @throws IllegalArgumentException if x, y, width, height are outside of
-     *         the bitmap's bounds.
-     * @throws ArrayIndexOutOfBoundsException if the pixels array is too small
-     *         to receive the specified number of pixels.
-     */
-    public void setPixels(@NonNull @ColorInt int[] pixels, int offset, int stride,
-            int x, int y, int width, int height) {
-        if (width == 0 || height == 0) {
-            return; // nothing to do
-        }
-        checkPixelsAccess(x, y, width, height, offset, stride, pixels);
-        image.setRGB(x, y, width, height, pixels, offset, stride);
-    }
-
     public void eraseColor(int c) {
         java.awt.Color color = Color.valueOf(c).toJavaColor();
         Graphics2D graphics = image.createGraphics();

AndroidCompat/src/main/java/android/widget/EditText.java

@@ -7,26 +7,14 @@ package android.widget;
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-public class EditText extends TextView {
+public class EditText {
-    public EditText(android.content.Context context) {
+    public EditText(android.content.Context context) { throw new RuntimeException("Stub!"); }
-        super(context);
-        throw new RuntimeException("Stub!");
-    }
 
-    public EditText(android.content.Context context, android.util.AttributeSet attrs) {
+    public EditText(android.content.Context context, android.util.AttributeSet attrs) { throw new RuntimeException("Stub!"); }
-        super(context);
-        throw new RuntimeException("Stub!");
-    }
 
-    public EditText(android.content.Context context, android.util.AttributeSet attrs, int defStyleAttr) {
+    public EditText(android.content.Context context, android.util.AttributeSet attrs, int defStyleAttr) { throw new RuntimeException("Stub!"); }
-        super(context);
-        throw new RuntimeException("Stub!");
-    }
 
-    public EditText(android.content.Context context, android.util.AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+    public EditText(android.content.Context context, android.util.AttributeSet attrs, int defStyleAttr, int defStyleRes) { throw new RuntimeException("Stub!"); }
-        super(context);
-        throw new RuntimeException("Stub!");
-    }
 
     public boolean getFreezesText() { throw new RuntimeException("Stub!"); }
 

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,41 +27,11 @@ object SafePath {
                 sb.append('_')
             }
         }
-
+        // Even though vfat allows 255 UCS-2 chars, we might eventually write to
-        return truncateFilename(sb.toString())
+        // ext4 through a FUSE layer, so use that limit minus 15 reserved characters.
+        return sb.toString().take(240)
     }
 
-    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
-        }
-
     /**
      * Returns true if the given character is a valid filename character, false otherwise.
      */

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/webkit/CefHelper.kt

@@ -1,47 +0,0 @@
-package xyz.nulldev.androidcompat.webkit
-
-import io.github.oshai.kotlinlogging.KotlinLogging
-import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.callbackFlow
-import kotlinx.coroutines.flow.first
-import org.cef.CefApp
-import org.cef.CefClient
-
-private val logger = KotlinLogging.logger {}
-
-object CefHelper {
-    val cefApp = MutableStateFlow<Result<CefApp?>>(Result.success(null))
-
-    suspend fun createClient(): CefClient {
-        val app = waitForInit().first()
-        val client = app.createClient()
-        JsHandler(client) // This adds itself to a global map
-        return client
-    }
-
-    fun waitForInit() =
-        callbackFlow {
-            val app = cefApp.first { it.isFailure || it.getOrThrow() != null }.getOrThrow()!!
-            app.onInitialization {
-                logger.debug { "CEF: Initialization state $it" }
-                when (it) {
-                    CefApp.CefAppState.INITIALIZED -> {
-                        trySend(app)
-                        close()
-                    }
-
-                    CefApp.CefAppState.SHUTTING_DOWN, CefApp.CefAppState.TERMINATED -> {
-                        close(CefException("Shutting down"))
-                    }
-
-                    else -> {}
-                }
-            }
-            awaitClose {}
-        }
-
-    class CefException(
-        msg: String,
-    ) : Exception(msg)
-}

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/webkit/KcefHelper.kt

@@ -1,136 +0,0 @@
-package xyz.nulldev.androidcompat.webkit
-
-import io.github.oshai.kotlinlogging.KotlinLogging
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.Json
-import org.cef.CefClient
-import org.cef.browser.CefBrowser
-import org.cef.browser.CefFrame
-import org.cef.browser.CefMessageRouter
-import org.cef.callback.CefQueryCallback
-import org.cef.handler.CefMessageRouterHandlerAdapter
-import kotlin.random.Random
-
-private val logger = KotlinLogging.logger {}
-private val jsHandler: MutableMap<CefClient, JsHandler> = mutableMapOf()
-
-fun CefBrowser.evaluateJavaScript(
-    expression: String,
-    cb: (String?) -> Unit,
-) = jsHandler[this.client]!!.eval(this, expression, cb)
-
-fun CefBrowser.dispose() {
-    stopLoad()
-    setCloseAllowed()
-    close(true)
-}
-
-class JsHandler : CefMessageRouterHandlerAdapter {
-    private val handler: MutableMap<String, (String?) -> Unit> = mutableMapOf()
-
-    constructor(client: CefClient) {
-        val config = CefMessageRouter.CefMessageRouterConfig()
-        config.jsQueryFunction = QUERY_FN
-        config.jsCancelFunction = QUERY_CANCEL_FN
-        client.addMessageRouter(CefMessageRouter.create(config, this))
-        jsHandler[client] = this
-    }
-
-    fun eval(
-        frame: CefFrame,
-        expression: String,
-        cb: (String?) -> Unit,
-    ) {
-        val id = Random.nextBytes(48).toHexString()
-        handler[id] = cb
-        frame.executeJavaScript(expression.toCode(id), "about:cef", 0)
-    }
-
-    fun eval(
-        browser: CefBrowser,
-        expression: String,
-        cb: (String?) -> Unit,
-    ) {
-        val id = Random.nextBytes(48).toHexString()
-        handler[id] = cb
-        browser.executeJavaScript(expression.toCode(id), "about:cef", 0)
-    }
-
-    override fun onQuery(
-        browser: CefBrowser?,
-        frame: CefFrame?,
-        queryId: Long,
-        request: String?,
-        persistent: Boolean,
-        callback: CefQueryCallback?,
-    ): Boolean {
-        super.onQuery(browser, frame, queryId, request, persistent, callback)
-
-        if (request != null) {
-            val invoke =
-                try {
-                    Json.decodeFromString<FunctionCall>(request)
-                } catch (e: Exception) {
-                    logger.warn(e) { "Invalid request received" }
-                    return false
-                }
-            val handler = handler.remove(invoke.id) ?: return false
-            handler(invoke.result)
-            callback?.success("")
-            return true
-        }
-
-        return false
-    }
-
-    @Serializable
-    private data class FunctionCall(
-        val id: String,
-        val result: String? = null,
-    )
-
-    companion object {
-        const val QUERY_FN = "__\$_evalQuery"
-        const val QUERY_CANCEL_FN = "__\$_evalQueryCancel"
-
-        private fun Char.isLineBreak(): Boolean = this == '\n' || this == '\r'
-
-        private fun String.containsLineBreak(): Boolean =
-            this.any {
-                it.isLineBreak()
-            }
-
-        private fun String.asFunctionBody(): String =
-            let { expression ->
-                when {
-                    expression.containsLineBreak() -> expression
-                    expression.trim().startsWith("return", false) -> expression
-                    else -> "return $expression"
-                }
-            }
-
-        private fun String.toCode(id: String): String =
-            """
-            function payload() {
-              ${this.asFunctionBody()}
-            }
-
-            try {
-              var result = payload();
-
-              window.${QUERY_FN}({
-                  request: JSON.stringify({ id: "$id", result }),
-                  onSuccess: function (response) {},
-                  onFailure: function (error_code, error_message) {}
-              });
-            } catch (e) {
-              console.error("Failed to eval $id", e)
-              window.${QUERY_CANCEL_FN}({
-                  request: JSON.stringify({ id: "$id", error: ""+e }),
-                  onSuccess: function (response) {},
-                  onFailure: function (error_code, error_message) {}
-              });
-            }
-            """.trimIndent()
-    }
-}

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/webkit/KcefWebViewProvider.kt

@@ -51,10 +51,12 @@ import android.webkit.WebViewProvider.ScrollDelegate
 import android.webkit.WebViewProvider.ViewDelegate
 import android.webkit.WebViewRenderProcess
 import android.webkit.WebViewRenderProcessClient
-import kotlinx.coroutines.runBlocking
+import dev.datlag.kcef.KCEF
+import dev.datlag.kcef.KCEFBrowser
+import dev.datlag.kcef.KCEFClient
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
-import org.cef.CefClient
 import org.cef.CefSettings
 import org.cef.browser.CefBrowser
 import org.cef.browser.CefFrame
@@ -68,7 +70,6 @@ import org.cef.handler.CefLoadHandler
 import org.cef.handler.CefLoadHandlerAdapter
 import org.cef.handler.CefMessageRouterHandlerAdapter
 import org.cef.handler.CefPermissionHandler
-import org.cef.handler.CefRenderHandlerAdapter
 import org.cef.handler.CefRequestHandler
 import org.cef.handler.CefRequestHandlerAdapter
 import org.cef.handler.CefResourceHandler
@@ -83,14 +84,12 @@ import org.cef.network.CefPostDataElement
 import org.cef.network.CefRequest
 import org.cef.network.CefResponse
 import org.koin.mp.KoinPlatformTools
-import java.awt.Rectangle
 import java.io.BufferedWriter
 import java.io.File
 import java.io.IOException
-import java.nio.ByteBuffer
 import java.util.concurrent.Executor
-import javax.swing.JPanel
+import kotlin.collections.Map
-import kotlin.math.min
+import kotlin.reflect.KClass
 import kotlin.reflect.KFunction
 import kotlin.reflect.full.declaredMemberFunctions
 import kotlin.reflect.jvm.javaMethod
@@ -101,13 +100,12 @@ class KcefWebViewProvider(
     private val settings = KcefWebSettings()
     private var viewClient = WebViewClient()
     private var chromeClient = WebChromeClient()
-    private val renderHandler = RenderHandler()
     private val mappings: MutableList<FunctionMapping> = mutableListOf()
     private val urlHttpMapping: MutableMap<String, String> = mutableMapOf()
     private var initialRequestData: InitialRequestData? = null
 
-    private var kcefClient: CefClient? = null
+    private var kcefClient: KCEFClient? = null
-    private var browser: CefBrowser? = null
+    private var browser: KCEFBrowser? = null
 
     private val handler = Handler(view.webViewLooper)
 
@@ -119,8 +117,8 @@ class KcefWebViewProvider(
         private val initHandler: InitBrowserHandler by KoinPlatformTools.defaultContext().get().inject()
     }
 
-    interface InitBrowserHandler {
+    public interface InitBrowserHandler {
-        fun init(provider: KcefWebViewProvider): Unit
+        public fun init(provider: KcefWebViewProvider): Unit
     }
 
     private data class InitialRequestData(
@@ -196,7 +194,7 @@ class KcefWebViewProvider(
         }
     }
 
-    private class DisplayHandler : CefDisplayHandlerAdapter() {
+    private inner class DisplayHandler : CefDisplayHandlerAdapter() {
         override fun onConsoleMessage(
             browser: CefBrowser,
             level: CefSettings.LogSeverity,
@@ -224,7 +222,6 @@ class KcefWebViewProvider(
         }
     }
 
-    @Suppress("DEPRECATION")
     private inner class LoadHandler : CefLoadHandlerAdapter() {
         override fun onLoadEnd(
             browser: CefBrowser,
@@ -371,7 +368,7 @@ class KcefWebViewProvider(
             callback: CefCallback,
         ): Boolean {
             val data = resolvedData ?: return false
-            val bytesToTransfer = min(bytesToRead, data.size - readOffset)
+            val bytesToTransfer = Math.min(bytesToRead, data.size - readOffset)
             Log.v(
                 TAG,
                 "readResponse: $readOffset/${data.size}, reading $bytesToRead->$bytesToTransfer",
@@ -383,7 +380,7 @@ class KcefWebViewProvider(
         }
     }
 
-    private class WebResponseResourceHandler(
+    private inner class WebResponseResourceHandler(
         val webResponse: WebResourceResponse,
     ) : ArrayResponseResourceHandler() {
         override fun processRequest(
@@ -413,7 +410,7 @@ class KcefWebViewProvider(
         }
     }
 
-    private class HtmlResponseResourceHandler(
+    private inner class HtmlResponseResourceHandler(
         val html: String,
     ) : ArrayResponseResourceHandler() {
         override fun processRequest(
@@ -444,7 +441,7 @@ class KcefWebViewProvider(
                     view,
                     CefWebResourceRequest(request, frame, false),
                 )
-            Log.v(TAG, "Resource ${request.url}, result is cancel? $cancel")
+            Log.v(TAG, "Resource ${request?.url}, result is cancel? $cancel")
 
             handler.post { viewClient.onLoadResource(view, frame?.url) }
 
@@ -471,7 +468,7 @@ class KcefWebViewProvider(
                 }
             if (response == null) {
                 // prefer user's response override
-                urlHttpMapping[request.url.trimEnd('/')]?.let {
+                urlHttpMapping.get(request.url.trimEnd('/'))?.let {
                     return HtmlResponseResourceHandler(it)
                 }
             }
@@ -480,7 +477,6 @@ class KcefWebViewProvider(
         }
     }
 
-    @Suppress("DEPRECATION")
     private inner class RequestHandler : CefRequestHandlerAdapter() {
         override fun getResourceRequestHandler(
             browser: CefBrowser,
@@ -490,13 +486,11 @@ class KcefWebViewProvider(
             isDownload: Boolean,
             requestInitiator: String,
             disableDefaultHandling: BoolRef,
-        ): CefResourceRequestHandler = ResourceRequestHandler()
+        ): CefResourceRequestHandler? = ResourceRequestHandler()
 
         override fun onRenderProcessTerminated(
             browser: CefBrowser,
             status: CefRequestHandler.TerminationStatus,
-            errorCode: Int,
-            errorString: String,
         ) {
             handler.post {
                 viewClient.onRenderProcessGone(
@@ -515,33 +509,18 @@ class KcefWebViewProvider(
         override fun onRequestMediaAccessPermission(
             browser: CefBrowser,
             frame: CefFrame,
-            requestingUrl: String,
+            requesting_url: String,
-            requestedPermissions: Int,
+            requested_permissions: Int,
             callback: CefMediaAccessCallback,
         ): Boolean {
             handler.post {
-                Log.v(TAG, "Checking permission for $requestingUrl: $requestedPermissions")
+                Log.v(TAG, "Checking permission for $requesting_url: $requested_permissions")
-                chromeClient.onPermissionRequest(CefPermissionRequest(requestingUrl, requestedPermissions, callback))
+                chromeClient.onPermissionRequest(CefPermissionRequest(requesting_url, requested_permissions, callback))
             }
             return true
         }
     }
 
-    private class RenderHandler : CefRenderHandlerAdapter() {
-        override fun getViewRect(browser: CefBrowser): Rectangle = Rectangle(0, 0, 1280, 2856)
-
-        override fun onPaint(
-            browser: CefBrowser,
-            popup: Boolean,
-            dirtyRects: Array<Rectangle>,
-            buffer: ByteBuffer,
-            width: Int,
-            height: Int,
-        ) {
-            // do nothing
-        }
-    }
-
     override fun init(
         javaScriptInterfaces: Map<String, Any>?,
         privateBrowsing: Boolean,
@@ -549,18 +528,16 @@ class KcefWebViewProvider(
         Log.v(TAG, "KcefWebViewProvider: initialize")
         destroy()
         kcefClient =
-            runBlocking {
+            KCEF.newClientBlocking().apply {
-                CefHelper.createClient().apply {
+                addDisplayHandler(DisplayHandler())
-                    addDisplayHandler(DisplayHandler())
+                addLoadHandler(LoadHandler())
-                    addLoadHandler(LoadHandler())
+                addRequestHandler(RequestHandler())
-                    addRequestHandler(RequestHandler())
+                addPermissionHandler(PermissionHandler())
-                    addPermissionHandler(PermissionHandler())
 
-                    val config = CefMessageRouter.CefMessageRouterConfig()
+                val config = CefMessageRouter.CefMessageRouterConfig()
-                    config.jsQueryFunction = QUERY_FN
+                config.jsQueryFunction = QUERY_FN
-                    config.jsCancelFunction = QUERY_CANCEL_FN
+                config.jsCancelFunction = QUERY_CANCEL_FN
-                    addMessageRouter(CefMessageRouter.create(config, MessageRouterHandler()))
+                addMessageRouter(CefMessageRouter.create(config, MessageRouterHandler()))
-                }
             }
         initHandler.init(this)
     }
@@ -637,8 +614,7 @@ class KcefWebViewProvider(
             kcefClient!!
                 .createBrowser(
                     loadUrl,
-                    CefRendering.CefRenderingWithHandler(renderHandler, JPanel()),
+                    CefRendering.OFFSCREEN,
-                    false,
                 ).apply {
                     // NOTE: Without this, we don't seem to be receiving any events
                     createImmediately()
@@ -662,8 +638,7 @@ class KcefWebViewProvider(
             kcefClient!!
                 .createBrowser(
                     url,
-                    CefRendering.CefRenderingWithHandler(renderHandler, JPanel()),
+                    CefRendering.OFFSCREEN,
-                    false,
                 ).apply {
                     // NOTE: Without this, we don't seem to be receiving any events
                     createImmediately()
@@ -689,19 +664,27 @@ class KcefWebViewProvider(
         browser?.close(true)
         browser?.dispose()
         chromeClient.onProgressChanged(view, 0)
-        val url = baseUrl ?: "about:blank"
-        urlHttpMapping[url.trimEnd('/')] = data
 
         browser =
-            kcefClient!!
+            (
-                .createBrowser(
+                baseUrl?.let { url ->
-                    url,
+                    urlHttpMapping.put(url.trimEnd('/'), data)
-                    CefRendering.CefRenderingWithHandler(renderHandler, JPanel()),
+                    kcefClient!!.createBrowser(
-                    false,
+                        url,
-                ).apply {
+                        CefRendering.OFFSCREEN,
-                    // NOTE: Without this, we don't seem to be receiving any events
+                    )
-                    createImmediately()
                 }
+                    ?: run {
+                        kcefClient!!.createBrowserWithHtml(
+                            data,
+                            KCEFBrowser.BLANK_URI,
+                            CefRendering.OFFSCREEN,
+                        )
+                    }
+            ).apply {
+                // NOTE: Without this, we don't seem to be receiving any events
+                createImmediately()
+            }
         Log.d(TAG, "Page loaded from data at base URL $baseUrl")
     }
 
@@ -711,11 +694,11 @@ class KcefWebViewProvider(
     ) {
         browser!!.evaluateJavaScript(
             script.removePrefix("javascript:"),
-        )
             {
                 Log.v(TAG, "JS returned: $it")
                 it?.let { handler.post { resultCallback?.onReceiveValue(it) } }
-            }
+            },
+        )
     }
 
     override fun saveWebArchive(filename: String): Unit = throw RuntimeException("Stub!")
@@ -795,23 +778,15 @@ class KcefWebViewProvider(
 
     override fun getContentWidth(): Int = throw RuntimeException("Stub!")
 
-    override fun pauseTimers() {
+    override fun pauseTimers(): Unit = throw RuntimeException("Stub!")
-        Log.v(TAG, "pauseTimers: doing nothing")
-    }
 
-    override fun resumeTimers() {
+    override fun resumeTimers(): Unit = throw RuntimeException("Stub!")
-        Log.v(TAG, "resumeTimers: doing nothing")
-    }
 
-    override fun onPause() {
+    override fun onPause(): Unit = throw RuntimeException("Stub!")
-        Log.v(TAG, "onPause: doing nothing")
-    }
 
-    override fun onResume() {
+    override fun onResume(): Unit = throw RuntimeException("Stub!")
-        Log.v(TAG, "onResume: doing nothing")
-    }
 
-    override fun isPaused(): Boolean = false
+    override fun isPaused(): Boolean = throw RuntimeException("Stub!")
 
     override fun freeMemory(): Unit = throw RuntimeException("Stub!")
 
@@ -865,7 +840,6 @@ class KcefWebViewProvider(
 
     override fun getWebChromeClient(): WebChromeClient = chromeClient
 
-    @Suppress("DEPRECATION")
     override fun setPictureListener(listener: PictureListener): Unit = throw RuntimeException("Stub!")
 
     @Serializable
@@ -888,7 +862,7 @@ class KcefWebViewProvider(
         obj: Any,
         interfaceName: String,
     ) {
-        val cls = obj::class
+        val cls = obj::class as KClass<Any>
         mappings.addAll(
             cls.declaredMemberFunctions.map {
                 // This is ridiculous, but necessary, otherwise "public final" throws
@@ -950,8 +924,7 @@ class KcefWebViewProvider(
     override fun getRendererPriorityWaivedWhenNotVisible(): Boolean = throw RuntimeException("Stub!")
 
     @SuppressWarnings("unused")
-    override fun setTextClassifier(textClassifier: TextClassifier?) {
+    override fun setTextClassifier(textClassifier: TextClassifier?) {}
-    }
 
     override fun getTextClassifier(): TextClassifier = TextClassifier.NO_OP
 
@@ -977,13 +950,11 @@ class KcefWebViewProvider(
         override fun onProvideAutofillVirtualStructure(
             @SuppressWarnings("unused") structure: android.view.ViewStructure,
             @SuppressWarnings("unused") flags: Int,
-        ) {
+        ) {}
-        }
 
         override fun autofill(
             @SuppressWarnings("unused") values: SparseArray<AutofillValue>,
-        ) {
+        ) {}
-        }
 
         override fun isVisibleToUserForAutofill(
             @SuppressWarnings("unused") virtualId: Int,
@@ -994,8 +965,7 @@ class KcefWebViewProvider(
         override fun onProvideContentCaptureStructure(
             @SuppressWarnings("unused") structure: android.view.ViewStructure,
             @SuppressWarnings("unused") flags: Int,
-        ) {
+        ) {}
-        }
 
         override fun getAccessibilityNodeProvider(): AccessibilityNodeProvider = throw RuntimeException("Stub!")
 
@@ -1065,8 +1035,7 @@ class KcefWebViewProvider(
         override fun onMovedToDisplay(
             displayId: Int,
             config: Configuration,
-        ) {
+        ) {}
-        }
 
         override fun onVisibilityChanged(
             changedView: View,

README.md

@@ -7,8 +7,9 @@
 - [What is Suwayomi?](#what-is-suwayomi)
   - [Features](#features)
 - [Suwayomi client projects](#suwayomi-client-projects)
-  - [Integrated clients](#integrated-clients)
+  - [Actively Developed Clients](#actively-developed-clients)
-  - [Other clients](#other-clients-potentially-inactive-or-abandoned)
+  - [Inactive Clients (functional but outdated)](#inactive-clients-functional-but-outdated)
+  - [Abandoned Clients (functionality unknown)](#abandoned-clients-functionality-unknown)
 - [Downloading and Running the app](#downloading-and-running-the-app)
   - [Using Operating System Specific Bundles](#using-operating-system-specific-bundles)
     - [Windows](#windows)
@@ -37,7 +38,7 @@
 # What is Suwayomi?
 <img src="https://github.com/Suwayomi/Suwayomi-Server/raw/master/server/src/main/resources/icon/faviconlogo.png" alt="drawing" width="200"/>
 
-A free and open source manga reader server that runs extensions built for [Mihon (Tachiyomi)](https://mihon.app/).
+A free and open source manga reader server that runs extensions built for [Mihon (Tachiyomi)](https://mihon.app/). 
 
 Suwayomi is an independent Mihon (Tachiyomi) compatible software and is **not a Fork of** Mihon (Tachiyomi).
 
@@ -68,21 +69,18 @@ You can use Mihon (Tachiyomi) to access your Suwayomi-Server. For more info look
 **You need a client/user interface app as a front-end for Suwayomi-Server, if you [Directly Download Suwayomi-Server](https://github.com/Suwayomi/Suwayomi-Server/releases/latest) you'll get a bundled version of [Suwayomi-WebUI](https://github.com/Suwayomi/Suwayomi-WebUI) with it.**
 
 Here's a list of known clients/user interfaces for Suwayomi-Server (checkout the respective GitHub repository for their features):
-
+##### Actively Developed Clients
-##### Integrated clients
+- [Suwayomi-WebUI](https://github.com/Suwayomi/Suwayomi-WebUI): The web front-end that Suwayomi-Server ships with by default.
-
+- [Suwayomi-VUI](https://github.com/Suwayomi/Suwayomi-VUI): A Suwayomi-Server preview focused web frontend built with svelte
-These clients are built-in options, and the server can keep them automatically up-to-date.
+- [Tachidesk-VaadinUI](https://github.com/Suwayomi/Tachidesk-VaadinUI): A Web front-end for Suwayomi-Server built with Vaadin.
-
+- [Moku](https://github.com/Youwes09/Moku): A fast, minimal Tauri + Svelte desktop client with clean and minimal UI.
-- [Suwayomi-WebUI](https://github.com/Suwayomi/Suwayomi-WebUI): Web app, PWA
+##### Inactive Clients (functional but outdated)
-- [Suwayomi-VUI](https://github.com/Suwayomi/Suwayomi-VUI): Web app, PWA
+- [Tachidesk-JUI](https://github.com/Suwayomi/Tachidesk-JUI): The native desktop front-end for Suwayomi-Server.
-
+- [Tachidesk-Sorayomi](https://github.com/Suwayomi/Tachidesk-Sorayomi): A Flutter front-end for Desktop(Linux, windows, etc.), Web and Android with a User Interface inspired by Mihon (Tachiyomi).
-##### Other clients (potentially inactive or abandoned)
+#####  Abandoned Clients (functionality unknown)
-- [Tachidesk-VaadinUI](https://github.com/Suwayomi/Tachidesk-VaadinUI): Desktop app (windows, linux, mac); UI in the browser, manages its own suwayomi server instance
+- [Tachidesk-qtui](https://github.com/Suwayomi/Tachidesk-qtui): A C++/Qt front-end for mobile devices(Android/linux), feature support is basic.
-- [Moku](https://github.com/Youwes09/Moku): Desktop app (windows, linux, mac), can manage its own suwayomi server instance
+- [Tachidesk-GTK](https://github.com/mahor1221/Tachidesk-GTK): A native Rust/GTK desktop client.
-- [Tachidesk-JUI](https://github.com/Suwayomi/Tachidesk-JUI): Desktop app (windows, linux, mac); can manage its own suwayomi server instance
+- [Equinox](https://github.com/Suwayomi/Equinox): A web user interface made with Vue.js.
-- [Tachidesk-Sorayomi](https://github.com/Suwayomi/Tachidesk-Sorayomi): Web app; Desktop app (windows, linux, mac); Android app; requires access to a running server
-- [Tachidesk-qtui](https://github.com/Suwayomi/Tachidesk-qtui): Android app; iOS app Desktop app (linux); requires access to a running server
-- [Suwayomi Client for KOReader](https://github.com/LK4D4/suwayomi.koplugin): KOReader plugin; works anywhere KOReader can run (Android, Kindle, Kobo, etc.); requires access to a running server
 
 # Downloading and Running the app
 ## Using Operating System Specific Bundles
@@ -107,21 +105,22 @@ Download the latest `linux-x64`(x86_64) release from [the releases section](http
 
 #### WebView support (GNU/Linux)
 
-WebView support is implemented via [JCEF](https://github.com/JetBrains/jcef).
+WebView support is implemented via [KCEF](https://github.com/DATL4G/KCEF).
 This is optional, and is only necessary to support some extensions.
 
-To have a functional WebView, some X11 dependencies are required for rendering Chromium.
+To have a functional WebView, several dependencies are required; aside from X11 libraries necessary for rendering Chromium, some JNI bindings are necessary: gluegen and jogl (found in Ubuntu as `libgluegen2-jni` and `libjogl2-jni`).
-These include `libxrender`, `libxcomposite` `libxdamage`, `libxkbcommon` and `libxtst`.
+Note that on some systems (e.g. Ubuntu), the JNI libraries are not automatically found, see below.
 
-A CEF server is launched on startup, which loads the X11 libraries.
+A KCEF server is launched on startup, which loads the X11 libraries.
 If those are missing, you should see "Could not load 'jcef' library".
 If so, use `ldd ~/.local/share/Tachidesk/bin/kcef/libjcef.so | grep not` to figure out which libraries are not found on your system.
 
-Refer to the [Dockerfile](https://github.com/Suwayomi/Suwayomi-Server-docker/blob/main/Dockerfile) for more details.
+The JNI bindings are only loaded when a browser is actually launched.
+This is done by extensions that rely on WebView, not by Suwayomi itself.
+If there is a problem loading the JNI libraries, you should see a message indicating the library and the search path.
+This search path includes the current working directory, if you do not want to modify system directories.
 
-Note that it is required to have an X session active and available to Suwayomi (i.e. `DISPLAY` is set).
+Refer to the [Dockerfile](https://github.com/Suwayomi/Suwayomi-Server-docker/blob/main/Dockerfile) for more details.
-It is not enough to have `WAYLAND_DISPLAY`, if your environment does not provide xwayland (or if you run Suwayomi as a service), you need to use a tool like [`Xvfb`](https://en.wikipedia.org/wiki/Xvfb).
-The Dockerfile linked above also does this.
 
 ## Other methods of getting Suwayomi
 ### Docker

build.gradle.kts

@@ -25,7 +25,6 @@ allprojects {
         maven("https://github.com/Suwayomi/Suwayomi-Server/raw/android-jar/")
         maven("https://jitpack.io")
         maven("https://jogamp.org/deployment/maven")
-        maven("https://packages.jetbrains.team/maven/p/ij/intellij-dependencies")
     }
 }
 
@@ -54,7 +53,7 @@ subprojects {
             }
             compilerOptions {
                 jvmTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
-                freeCompilerArgs.add("-Xcontext-parameters")
+                freeCompilerArgs.add("-Xcontext-receivers")
             }
         }
     }

buildSrc/src/main/kotlin/Constants.kt

@@ -10,11 +10,9 @@ import java.io.BufferedReader
 const val MainClass = "suwayomi.tachidesk.MainKt"
 
 // should be bumped with each stable release
-val getTachideskVersion = { "v2.3.${getCommitCount()}" }
+val getTachideskVersion = { "v2.1.${getCommitCount()}" }
 
-val webUIRevisionTag = "r3147"
+val webUIRevisionTag = "r2643"
-
-val webviewJbrRelease = "jbr-release-25.0.3b508.4"
 
 private val getCommitCount = {
     runCatching {

docs/Configuring-Suwayomi‐Server.md

@@ -63,14 +63,6 @@ server.webUISubpath = ""
 - `server.webUIUpdateCheckInterval` the interval time in hours at which to check for updates. Use `0` to disable update checking.
 - `server.webUISubpath` controls on which sub-path the UI is served; by default, it will be accessible on `/` (i.e. directly), with this setting it can also be set to appear at e.g. `/suwayomi`
 
-
-### webView
-```
-server.kcefEnabled = true
-```
-- `server.kcefEnabled` controls if KCEF WebView provider is enabled.
-
-
 ### Downloader
 ```
 server.downloadAsCbz = true
@@ -159,20 +151,15 @@ server.systemTrayEnabled = true
 server.maxLogFiles = 31
 server.maxLogFileSize = "10mb"
 server.maxLogFolderSize = "100mb"
-
+server.extensionRepos = []
+server.maxSourcesInParallel = 6
 ```
 - `server.debugLogsEnabled` controls whether if Suwayomi-Server should print more information while being run inside a Terminal/CMD/Powershell window. 
 - `server.systemTrayEnabled = true` whether if Suwayomi-Server should show a System Tray Icon, disabling this on headless servers is recommended.
 - `server.maxLogFiles = 31` sets the maximum number of days to keep files before they get deleted.
 - `server.maxLogFileSize = "10mb"` sets the maximum size of a log file - values are formatted like: 1 (bytes), 1KB (kilobytes), 1MB (megabytes), 1GB (gigabytes)
 - `server.maxLogFolderSize = "100mb"` sets the maximum size of all saved log files - values are formatted like: 1 (bytes), 1KB (kilobytes), 1MB (megabytes), 1GB (gigabytes)
-
+- `server.extensionRepos` is a list of extension repositories for custom sources. Uses the same format as Mihon; each entry is expected to be a string URL pointing to a JSON file representing the repository.
-### Extension/Source
-```
-server.extensionStores = []
-server.maxSourcesInParallel = 6
-```
-- `server.extensionStores` is a list of extension stores (previously called repositories) for custom sources. Uses the same format as Mihon; each entry is expected to be a string URL pointing to a JSON or PROTOBUF file representing the repository.
 - `server.maxSourcesInParallel = 6` sets how many sources can do requests (updates, downloads) in parallel. Updates/downloads are grouped by source and all mangas of a source are updated/downloaded synchronously. Range: 1 <= n <= 20.
 
 ### Backup
@@ -237,7 +224,6 @@ server.opdsShowOnlyUnreadChapters = false
 server.opdsShowOnlyDownloadedChapters = false
 server.opdsChapterSortOrder = "DESC"
 server.opdsCbzMimetype = "MODERN"
-server.opdsSkipChapterMetadataFeed = false
 ```
 - `server.opdsUseBinaryFileSizes = false` controls if Suwayomi should display file sizes in binary units (KiB, MiB, GiB) or decimal (KB, MB, GB) in OPDS listings.
 - `server.opdsItemsPerPage = 50` sets the number of items per page in OPDS listings. Range: 10 <= n <= 5000.
@@ -247,7 +233,6 @@ server.opdsSkipChapterMetadataFeed = false
 - `server.opdsShowOnlyDownloadedChapters = false` controls if OPDS listings should only include downloaded chapters.
 - `server.opdsChapterSortOrder = "DESC"` sets the default chapter sort order in OPDS listings, either `"ASC"` or `"DESC"`
 - `server.opdsCbzMimetype = "MODERN"` controls which mimetype to use for CBZ downloads. This affects the offered link in OPDS, as well as the content type of the CBZ download. Allowed is MODERN (current IANA standard), LEGACY (deprecated mimetype for .cbz) and COMPATIBLE (deprecated mimetype for all comic archives). Use LEGACY or COMPATIBLE if older clients don't offer the chapter download (note that the chapter needs to first be downloaded in Suwayomi, before it is available in OPDS).
-- `server.opdsSkipChapterMetadataFeed = false` controls if the metadata feed should be skipped. When enabled, download and streaming links are provided directly in the chapter list. This improves compatibility with automated downloaders (like KOReader). KoSync strategies are applied, but `PROMPT` conflicts are ignored (treating local progress as priority).
 
 ### KOReader Sync
 ```
@@ -283,28 +268,6 @@ server.useHikariConnectionPool = true
 - `server.databasePassword` the username with which to authenticate at the PostgreSQL instance.
 - `server.useHikariConnectionPool` use Hikari Connection Pool to connect to the database.
 
-### SyncYomi
-```
-server.syncYomiEnabled = false
-server.syncYomiHost = ""
-server.syncYomiApiKey = ""
-server.syncDataManga = true
-server.syncDataChapters = true
-server.syncDataTracking = true
-server.syncDataHistory = true
-server.syncDataCategories = true
-server.syncInterval = "0s"
-```
-- `server.syncYomiEnabled` controls whether SyncYomi is enabled.
-- `server.syncYomiHost` base URL of the SyncYomi server instance. e.g. `http://localhost:8282`
-- `server.syncYomiApiKey` API key to authenticate with SyncYomi. You must use the same API key in both Suwayomi and SyncYomi.
-- `server.syncDataManga` enables syncing manga.
-- `server.syncDataChapters` enables syncing chapters.
-- `server.syncDataTracking` enables syncing tracking data.
-- `server.syncDataHistory` enables syncing reading history.
-- `server.syncDataCategories` enables syncing categories.
-- `server.syncInterval` interval between automatic sync operations. Use `0s` to disable.
-
 **Note:** The example [docker-compose.yml file](https://github.com/Suwayomi/Suwayomi-Server-docker/blob/main/docker-compose.yml) contains everything you need to get started with Suwayomi+PostgreSQL. Please be aware that PostgreSQL support is currently still in beta.
 
 **Note:** These settings are excluded from backups, so a backup can be used to easily switch database installations by setting up the connection first, then restoring the backup.

docs/Troubleshooting.md

@@ -1,92 +1,19 @@
-# Troubleshooting
-
-This page is laid out in several sections, where each section describes a specific problem, followed by one or more possible solutions.
-
-At the end, you will find a General section, which is the nuclear option if nothing else works.
-
-For further support, visit the [official Suwayomi Discord server](https://discord.gg/DDZdqZWaHA).  
-In such cases, it will be helpful to have logs ready. You can find them in [The Data Directory](./The-Data-Directory) in the logs directory.
-
-**All steps below assume that you have stopped Suwayomi**.
-
-
-## Broken database
-
-- `failed due to
-org.jetbrains.exposed.exceptions.ExposedSQLException: org.h2.jdbc.JdbcSQLSyntaxErrorException: Column "CATEGORY.SORT_ORDER" not found`
-- `org.h2.jdbc.JdbcSQLSyntaxErrorException: Column "CHAPTER.KOREADER_HASH" not found`
-- `java.lang.IllegalStateException: Unable to read the page at position 96170708817765466`
-- Any other error text that includes "SQL Statement"
-
-Your database is either corrupted or incompatible.
-
-One of these is the cause:
-- You were running a preview version and decided to downgrade to stable.
-- You did not shut down Suwayomi properly.
-- Suwayomi crashed in an unexpected way.
-
-Solutions:
-- If you downgraded, upgrade to preview again.
-- Otherwise, you will need to reset and restore from a backup. See [General Troubleshooting](#general-troubleshooting) below.
-
-
-## `HTTP error 429`
-
-The source (or, if trackers are enabled, possibly the tracker) has blocked you for sending too many requests.  
-Note that Mass-Migration can result in an unexpectedly high number of requests to both the source and any configured trackers.
-
-Solution: Use other/more sources, download less, and wait between request-heavy actions.
-
-
-## Extension times out
-
-- `Timed out waiting for 20000 ms…`
-- `Timed out waiting for page list`
-
-First, check if this is an extension issue or a Suwayomi issue.
-On the manga page of the problematic entry, click "Open in WebView".
-
-Solutions:
-- If the WebView loads: The issue is with the extension. Search [the issues](https://github.com/Suwayomi/Suwayomi-Server/issues) and discord if there are known problems with that extension.
-- If the WebView errors: Go to [The Data Directory](./The-Data-Directory) and remove the `bin` and `cache` folders.
-    - If the WebView still does not work after a restart, your installation is incomplete. On Linux, refer to [the README](https://github.com/Suwayomi/Suwayomi-Server#webview-support-gnulinux).
-
-
-## Flaresolverr required
-
-- `java.io.IOException: Cloudflare bypass currently disabled`
-
-The source you are using has enabled CloudFlare's bot protection.
-If you open the source's website in your browser, you should see the "Confirm I'm human" page.
-
-Solution:
-- Download and set up [Flaresolverr](https://github.com/FlareSolverr/FlareSolverr) or [Byparr](https://github.com/ThePhaseless/Byparr). Make sure to run Flaresolverr/Byparr every time you use this source.
-
-
-## Flaresolverr not running
-
-- `java.io.IOException: Failed to connect to localhost/[0:0:0:0:0:0:0:1]:8191`
-
-You have configured Flaresolverr by enabling the `server.flareSolverrEnabled` setting, but Flaresolverr is not installed and/or running.
-
-Solutions:
-- Install Flaresolverr if you haven't already (see previous section). Then ensure it is running (Windows: do not close the console window!).
-- If it is running, ensure the configured url in `server.flareSolverrUrl` is correct. There is usually no need to change this.
-- If it is running and the url is correct, check your firewall settings, your system may be blocking access to Flaresolverr.
-
-
 ## General Troubleshooting
 This guide will try to fix Suwayomi by reseting it to a clean installation state.
 
-> [!WARNING]
-> This will remove all your data, including the library.
-> Make sure you have copied your backups as described above!
-
 - Make sure you have a recent backup of your library or create one in the app (if possible) because we **are going to wipe all Suwayomi data**.
 - Make sure Suwayomi is not running (right click on tray icon and quit or kill it through the way your Operating System provides)
 - Clear all browsing data on your browser if you use Suwayomi from a browser.
-- Delete the Suwayomi data directory located below and re-run the app. See the article [The Data Directory](./The-Data-Directory) for information on how to find it.
+- Delete the Suwayomi data directory located below and re-run the app.
-    - If you wish to keep your downloads, you may also attempt to surgically remove only parts. You will need to remove `database.mv.db`, `database.trace.db`, `bin`, `cache`, `extensions`, `settings`, `webUI`. Removing only a subset of these files and folders may fail to resolve the problem.
+
-- Open Suwayomi and go to Settings > Backup > Restore Backup, and select the latest backup you have.
+Note: Replace `<Account>` with the currently logged in account/username on your pc.
-    - Restoring from backup does not restore your downloads. If you chose to keep them in the above step, you will now need to re-download all manga. Suwayomi will pick up on the existing files and not actually download anything that isn't new.
+
+On Mac OS X : `/Users/<Account>/Library/Application Support/Tachidesk`
+
+On Windows XP : `C:\Documents and Settings\<Account>\Application Data\Local Settings\Tachidesk`
+
+On Windows 7 and later : `C:\Users\<Account>\AppData\Local\Tachidesk`
+
+On Unix/Linux : `/home/<account>/.local/share/Tachidesk`
+
 - In the case that you have to periodically perform this fix or the problem persists or the method failed to fix it, open an issue or Join the [Suwayomi discord server](https://discord.gg/DDZdqZWaHA) to hang out with the community and to receive support and help.

gradle/libs.versions.toml

@@ -1,23 +1,22 @@
 [versions]
-kotlin = "2.4.0"
+kotlin = "2.3.10"
-coroutines = "1.11.0"
+coroutines = "1.10.2"
-serialization = "1.11.0"
+serialization = "1.10.0"
 jvmTarget = "21"
-okhttp = "5.4.0" # Major version is locked by Tachiyomi extensions
+okhttp = "5.3.2" # Major version is locked by Tachiyomi extensions
-javalin = "7.2.2"
+javalin = "6.7.0"
-jte = "3.2.4"
+jte = "3.2.3"
-jackson = "3.2.0" # jackson version locked by javalin, ref: `io.javalin.core.util.OptionalDependency`
+jackson = "2.18.3" # jackson version locked by javalin, ref: `io.javalin.core.util.OptionalDependency`
-exposed = "1.2.0"
+exposed = "0.61.0"
-dex2jar = "2.4.37"
+dex2jar = "2.4.34"
-polyglot = "25.0.3"
+polyglot = "24.2.2"
 settings = "1.3.0"
-twelvemonkeys = "3.13.1"
+twelvemonkeys = "3.13.0"
-graphqlkotlin = "10.0.0"
+graphqlkotlin = "9.2.0"
 xmlserialization = "0.91.3"
 ktlint = "1.8.0"
-koin = "4.2.2"
+koin = "4.1.1"
-moko = "0.26.4"
+moko = "0.26.0"
-jcef = "144.0.15-g72717cf-chromium-144.0.7559.172-api-1.21-262-b37"
 
 [libraries]
 # Kotlin
@@ -38,25 +37,24 @@ serialization-xml-core = { module = "io.github.pdvrieze.xmlutil:core", version.r
 serialization-xml = { module = "io.github.pdvrieze.xmlutil:serialization-jvm", version.ref = "xmlserialization" }
 
 # Logging
-slf4japi = "org.slf4j:slf4j-api:2.0.18"
+slf4japi = "org.slf4j:slf4j-api:2.0.17"
-logback = "ch.qos.logback:logback-classic:1.5.34"
+logback = "ch.qos.logback:logback-classic:1.5.32"
-kotlinlogging = "io.github.oshai:kotlin-logging-jvm:8.0.4"
+kotlinlogging = "io.github.oshai:kotlin-logging-jvm:8.0.01"
 
 # OkHttp
 okhttp-core = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
 okhttp-logging = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" }
 okhttp-dnsoverhttps = { module = "com.squareup.okhttp3:okhttp-dnsoverhttps", version.ref = "okhttp" }
 okhttp-brotli = { module = "com.squareup.okhttp3:okhttp-brotli", version.ref = "okhttp" }
-okhttp-zstd = { module = "com.squareup.okhttp3:okhttp-zstd", version.ref = "okhttp" }
+okio = "com.squareup.okio:okio:3.16.4"
-okio = "com.squareup.okio:okio:3.17.0"
 
 # Javalin api
 javalin-core = { module = "io.javalin:javalin", version.ref = "javalin" }
 javalin-openapi = { module = "io.javalin:javalin-openapi", version.ref = "javalin" }
-javalin-rendering = { module = "io.javalin:javalin-rendering-jte", version.ref = "javalin" }
+javalin-rendering = { module = "io.javalin:javalin-rendering", version.ref = "javalin" }
-jackson-databind = { module = "tools.jackson.core:jackson-databind", version.ref = "jackson" }
+jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
-jackson-kotlin = { module = "tools.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
+jackson-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
-jackson-annotations = "com.fasterxml.jackson.core:jackson-annotations:2.22"
+jackson-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations", version.ref = "jackson" }
 jte = { module = "gg.jte:jte", version.ref = "jte" }
 kte = { module = "gg.jte:jte-kotlin", version.ref = "jte" }
 
@@ -70,14 +68,12 @@ exposed-core = { module = "org.jetbrains.exposed:exposed-core", version.ref = "e
 exposed-dao = { module = "org.jetbrains.exposed:exposed-dao", version.ref = "exposed" }
 exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc", version.ref = "exposed" }
 exposed-javatime = { module = "org.jetbrains.exposed:exposed-java-time", version.ref = "exposed" }
-exposed-kotlintime = { module = "org.jetbrains.exposed:exposed-kotlin-datetime", version.ref = "exposed" }
+postgres = "org.postgresql:postgresql:42.7.10"
-exposed-json = { module = "org.jetbrains.exposed:exposed-json ", version.ref = "exposed" }
+h2 = "com.h2database:h2:1.4.200" # current database driver, can't update to h2 v2 without sql migration
-postgres = "org.postgresql:postgresql:42.7.11"
+hikaricp = "com.zaxxer:HikariCP:7.0.2"
-h2 = "com.h2database:h2:2.4.240"
-hikaricp = "com.zaxxer:HikariCP:7.1.0"
 
 # 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" }
@@ -90,10 +86,10 @@ systemtray-desktop = "com.dorkbox:Desktop:1.1" # version locked by SystemTray
 # dependencies of Tachiyomi extensions
 injekt = "com.github.null2264:injekt-koin:ee267b2e27"
 rxjava = "io.reactivex:rxjava:1.3.8"
-jsoup = "org.jsoup:jsoup:1.22.2"
+jsoup = "org.jsoup:jsoup:1.22.1"
 
 # Config
-config = "com.typesafe:config:1.4.9"
+config = "com.typesafe:config:1.4.5"
 config4k = "io.github.config4k:config4k:0.7.0"
 
 # Sort
@@ -109,7 +105,7 @@ dex2jar-tools = { module = "de.femtopedia.dex2jar:dex-tools", version.ref = "dex
 
 # APK
 apk-parser = "net.dongliu:apk-parser:2.6.10"
-apksig = "com.android.tools.build:apksig:9.2.1"
+apksig = "com.android.tools.build:apksig:9.0.1"
 
 # Xml
 xmlpull = "xmlpull:xmlpull:1.1.3.4a"
@@ -119,13 +115,13 @@ appdirs = "ca.gosyer:kotlin-multiplatform-appdirs:2.0.0"
 cache4k = "io.github.reactivecircus.cache4k:cache4k:0.14.0"
 zip4j = "net.lingala.zip4j:zip4j:2.11.6"
 commonscompress = "org.apache.commons:commons-compress:1.28.0"
-junrar = "com.github.junrar:junrar:7.6.0"
+junrar = "com.github.junrar:junrar:7.5.7"
 
 # AES/CBC/PKCS7Padding Cypher provider
-bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.84"
+bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.83"
 
 # AndroidX annotations
-android-annotations = "androidx.annotation:annotation:1.10.0"
+android-annotations = "androidx.annotation:annotation:1.9.1"
 
 # Substitute for duktape-android
 polyglot-core = { module = "org.graalvm.polyglot:polyglot", version.ref = "polyglot" }
@@ -136,7 +132,7 @@ settings-core = { module = "com.russhwolf:multiplatform-settings-jvm", version.r
 settings-serialization = { module = "com.russhwolf:multiplatform-settings-serialization-jvm", version.ref = "settings" }
 
 # ICU4J
-icu4j = "com.ibm.icu:icu4j:78.3"
+icu4j = "com.ibm.icu:icu4j:78.2"
 
 # Image Decoding implementation provider
 twelvemonkeys-common-lang = { module = "com.twelvemonkeys.common:common-lang", version.ref = "twelvemonkeys" }
@@ -147,10 +143,10 @@ twelvemonkeys-imageio-metadata = { module = "com.twelvemonkeys.imageio:imageio-m
 twelvemonkeys-imageio-jpeg = { module = "com.twelvemonkeys.imageio:imageio-jpeg", version.ref = "twelvemonkeys" }
 twelvemonkeys-imageio-webp = { module = "com.twelvemonkeys.imageio:imageio-webp", version.ref = "twelvemonkeys" }
 
-imageio-webp = "com.github.usefulness:webp-imageio:0.11.0"
+imageio-webp = "com.github.usefulness:webp-imageio:0.10.2"
 
 # Testing
-mockk = "io.mockk:mockk:1.14.11"
+mockk = "io.mockk:mockk:1.14.9"
 
 # cron scheduler
 cron4j = "it.sauronsoftware.cron4j:cron4j:2.2.5"
@@ -159,10 +155,10 @@ cron4j = "it.sauronsoftware.cron4j:cron4j:2.2.5"
 cronUtils = "com.cronutils:cron-utils:9.2.1"
 
 # Webview
-jcef = { module = "org.jetbrains.intellij.deps.jcef:jcef", version.ref = "jcef" }
+kcef = "dev.datlag:kcef:2024.04.20.4"
 
 # User
-jwt = "com.auth0:java-jwt:4.5.2"
+jwt = "com.auth0:java-jwt:4.5.1"
 
 # lint - used for renovate to update ktlint version
 ktlint = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint" }
@@ -177,16 +173,16 @@ kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", versi
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin"}
 
 # Linter
-ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "14.2.0"}
+ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "14.0.1"}
 
 # Build config
-buildconfig = { id = "com.github.gmazzo.buildconfig", version = "6.0.10"}
+buildconfig = { id = "com.github.gmazzo.buildconfig", version = "6.0.7"}
 
 # Download
 download = { id = "de.undercouch.download", version = "5.7.0"}
 
 # ShadowJar
-shadowjar = { id = "com.gradleup.shadow", version = "8.3.11"}
+shadowjar = { id = "com.gradleup.shadow", version = "8.3.9"}
 
 # Moko
 moko = { id = "dev.icerock.mobile.multiplatform-resources", version.ref = "moko" }
@@ -216,7 +212,7 @@ shared = [
     "dex2jar-tools",
     "apk-parser",
     "jackson-annotations",
-    "jcef",
+    "kcef"
 ]
 
 sharedTest = [
@@ -229,7 +225,6 @@ okhttp = [
     "okhttp-logging",
     "okhttp-dnsoverhttps",
     "okhttp-brotli",
-    "okhttp-zstd",
 ]
 javalin = [
     "javalin-core",
@@ -247,8 +242,6 @@ exposed = [
     "exposed-dao",
     "exposed-jdbc",
     "exposed-javatime",
-    "exposed-kotlintime",
-    "exposed-json",
 ]
 systemtray = [
     "systemtray-core",

gradle/wrapper/gradle-wrapper.properties

@@ -1,9 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
-retries=0
-retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

gradlew.bat

@@ -23,8 +23,8 @@
 @rem
 @rem ##########################################################################
 
-@rem Set local scope for the variables, and ensure extensions are enabled
+@rem Set local scope for the variables with windows NT shell
-setlocal EnableExtensions
+if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
@@ -51,7 +51,7 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2
 
-"%COMSPEC%" /c exit 1
+goto fail
 
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
@@ -65,7 +65,7 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2
 
-"%COMSPEC%" /c exit 1
+goto fail
 
 :execute
 @rem Setup the command line
@@ -73,10 +73,21 @@ echo location of your Java installation. 1>&2
 
 
 @rem Execute Gradle
-@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
-@rem which allows us to clear the local environment before executing the java command
-endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
 
-:exitWithErrorLevel
+:end
-@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
+@rem End local scope for the variables with windows NT shell
-"%COMSPEC%" /c exit %ERRORLEVEL%
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

renovate.json

@@ -16,43 +16,14 @@
       "depNameTemplate": "zulu",
       "datasourceTemplate": "custom.zulu",
       "versioningTemplate": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+).*$"
-    },
-    {
-      "customType": "regex",
-      "managerFilePatterns": [
-        "/buildSrc/src/main/kotlin/Constants.kt/"
-      ],
-      "matchStrings": [
-        "val\\s+webviewJbrRelease\\s*=\\s*\"(?<currentValue>[^\"]+)\""
-      ],
-      "depNameTemplate": "JetBrainsRuntime",
-      "packageNameTemplate": "JetBrains/JetBrainsRuntime",
-      "datasourceTemplate": "github-releases",
-      "versioningTemplate": "regex:^jbr-release-(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)b(?<build>\\d+)\\.(?<revision>\\d+)$"
     }
   ],
   "customDatasources": {
     "zulu": {
       "defaultRegistryUrlTemplate": "https://api.azul.com/metadata/v1/zulu/packages?availability_types=ca&release_status=both&java_package_type=jre&crac_supported=false&javafx_bundled=false&support_term=lts&arch=x86&os=linux&archive_type=zip&page_size=1000&include_fields=java_package_features,release_status,support_term,os,arch,hw_bitness,abi,java_package_type,javafx_bundled,sha256_hash,cpu_gen,size,archive_type,certifications,lib_c_type,crac_supported&page=1&azul_com=true",
       "transformTemplates": [
-        "{ \"releases\": $map($, function($v) { { \"version\": $join([$string($v.distro_version[0]), \".\", $string($v.distro_version[1]), \".\", $string($v.distro_version[2]), \"_\", $string($v.java_version[0]), \".\", $string($v.java_version[1]), \".\", $string($v.java_version[2])]) } }) }"
+        "{\"releases\": $$.$join([$join($map(distro_version[[0..2]], $string), \".\"), \"_\", $join($map(java_version, $string), \".\")])}"
       ]
     }
-  },
+  }
-  "packageRules": [
-    {
-      "matchPackageNames": [
-        "org.jetbrains.intellij.deps.jcef:jcef",
-        "JetBrains/JetBrainsRuntime"
-      ],
-      "groupName": "JCEF + JetBrains Runtime",
-      "groupSlug": "jcef-jbr"
-    },
-    {
-      "matchPackageNames": [
-        "com.github.Suwayomi:android-jar"
-      ],
-      "enabled": false
-    }
-  ]
 }

scripts/bundler.sh

@@ -26,7 +26,7 @@ main() {
   set -- "${POSITIONAL_ARGS[@]}"
 
   OS="$1"
-  JAR="$(ls server/build/*.jar | tail -n1)" || error $LINENO "No JAR found in server/build/" 1
+  JAR="$(ls server/build/*.jar | tail -n1)"
   RELEASE_NAME="$(echo "${JAR%.*}" | xargs basename)-$OS"
   RELEASE_VERSION=$(echo "$JAR" | grep -oP "v\K[0-9]+\.[0-9]+\.[0-9]+")
   #RELEASE_REVISION_NUMBER="$(tmp="${JAR%.*}" && echo "${tmp##*-}" | tr -d r)"
@@ -34,21 +34,22 @@ main() {
 
   # clean temporary directory on function return
   trap "rm -rf $RELEASE_NAME/" RETURN
-  mkdir "$RELEASE_NAME/" || error $LINENO "Failed to create release directory" 1
+  mkdir "$RELEASE_NAME/"
 
   download_launcher
 
   if [ ! -f scripts/resources/catch_abort.so ]; then
-    gcc -fPIC -shared scripts/resources/catch_abort.c -lpthread -o scripts/resources/catch_abort.so || error $LINENO "Failed to compile catch_abort" 1
+    gcc -fPIC -shared scripts/resources/catch_abort.c -lpthread -o scripts/resources/catch_abort.so
   fi
 
-  JRE_ZULU="25.34.17_25.0.3"
+  JRE_ZULU="25.30.17_25.0.1"
   JRE_RELEASE="jre${JRE_ZULU#*_}" # e.g. jre25.0.1
   ZULU_RELEASE="zulu${JRE_ZULU%_*}" # e.g. zulu25.30.17
 
   case "$OS" in
     debian-all)
       RELEASE="$RELEASE_NAME.deb"
+      download_jogamp "linux-*" # it's easier to bundle them ourselves than to handle Debian's path conventions
       make_deb_package
       move_release_to_output_dir
       ;;
@@ -56,6 +57,7 @@ main() {
       JRE="$ZULU_RELEASE-ca-$JRE_RELEASE-linux_x64.zip"
       JRE_DIR="${JRE%.*}"
       JRE_URL="https://cdn.azul.com/zulu/bin/$JRE"
+      download_jogamp "linux-amd64"
       setup_jre
 
       RELEASE="$RELEASE_NAME.AppImage"
@@ -65,7 +67,7 @@ main() {
     linux-assets)
       RELEASE="$RELEASE_NAME.tar.gz"
       copy_linux_package_assets_to "$RELEASE_NAME/"
-      tar -I "gzip -9" -cvf "$RELEASE" "$RELEASE_NAME/" || error $LINENO "Failed to create tar.gz" 1
+      tar -I "gzip -9" -cvf "$RELEASE" "$RELEASE_NAME/"
       move_release_to_output_dir
       ;;
     linux-x64)
@@ -75,6 +77,7 @@ main() {
       ELECTRON="electron-$electron_version-linux-x64.zip"
       ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
       download_electron
+      download_jogamp "linux-amd64"
       setup_jre
       tree "$RELEASE_NAME"
 
@@ -89,6 +92,7 @@ main() {
       ELECTRON="electron-$electron_version-darwin-x64.zip"
       ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
       download_electron
+      download_jogamp "macosx-universal"
       setup_jre
       tree "$RELEASE_NAME"
 
@@ -103,6 +107,7 @@ main() {
       ELECTRON="electron-$electron_version-darwin-arm64.zip"
       ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
       download_electron
+      download_jogamp "macosx-universal"
       setup_jre
       tree "$RELEASE_NAME"
 
@@ -117,6 +122,7 @@ main() {
       ELECTRON="electron-$electron_version-win32-x64.zip"
       ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
       download_electron
+      download_jogamp "windows-amd64"
       setup_jre
       tree "$RELEASE_NAME"
 
@@ -139,50 +145,52 @@ move_release_to_output_dir() {
    if [ -f "$OUTPUT_DIR/$RELEASE" ]; then
      rm "$OUTPUT_DIR/$RELEASE"
    fi
-   mv "$RELEASE" "$OUTPUT_DIR/" || error $LINENO "Failed to move release to output dir" 1
+   mv "$RELEASE" "$OUTPUT_DIR/"
 }
 
 download_launcher() {
-  LAUNCHER_URL=$(curl -sf "https://api.github.com/repos/Suwayomi/Suwayomi-Launcher/releases/latest" | grep "browser_download_url" | grep ".jar" | head -n 1 | cut -d '"' -f 4)
+  LAUNCHER_URL=$(curl -s "https://api.github.com/repos/Suwayomi/Suwayomi-Launcher/releases/latest" | grep "browser_download_url" | grep ".jar" | head -n 1 | cut -d '"' -f 4)
-  if [ -z "$LAUNCHER_URL" ]; then
+  curl -L "$LAUNCHER_URL" -o "Suwayomi-Launcher.jar"
-    error $LINENO "Failed to determine launcher URL from GitHub API" 1
+  mv "Suwayomi-Launcher.jar" "$RELEASE_NAME/Suwayomi-Launcher.jar"
+}
+
+download_jogamp() {
+  local platform="$1"
+  if [ ! -f jogamp-all-platforms.7z ]; then
+    curl "https://jogamp.org/deployment/jogamp-current/archive/jogamp-all-platforms.7z" -o jogamp-all-platforms.7z
   fi
-  curl -fL "$LAUNCHER_URL" -o "Suwayomi-Launcher.jar" || error $LINENO "Failed to download launcher JAR" 1
+
-  mv "Suwayomi-Launcher.jar" "$RELEASE_NAME/Suwayomi-Launcher.jar" || error $LINENO "Failed to move launcher JAR" 1
+  7z x jogamp-all-platforms.7z "jogamp-all-platforms/lib/$platform/"
+  mkdir -p "$RELEASE_NAME/natives/"
+  mv jogamp-all-platforms/lib/* "$RELEASE_NAME/natives/"
+  rm -rf jogamp-all-platforms
 }
 
 download_electron() {
   if [ ! -f "$ELECTRON" ]; then
-    curl -fL "$ELECTRON_URL" -o "$ELECTRON" || error $LINENO "Failed to download electron" 1
+    curl -L "$ELECTRON_URL" -o "$ELECTRON"
   fi
 
-  unzip "$ELECTRON" -d "$RELEASE_NAME/electron/" || error $LINENO "Failed to extract electron" 1
+  unzip "$ELECTRON" -d "$RELEASE_NAME/electron/"
 }
 
 setup_jre() {
   if [ -d "jre" ]; then
-    if [ ! -f "./jre/bin/java.exe" ]; then
+    chmod +x ./jre/bin/java
-      chmod +x ./jre/bin/java || error $LINENO "Failed to set java executable permission" 1
+    chmod +x ./jre/lib/jspawnhelper
-      chmod +x ./jre/lib/jspawnhelper || error $LINENO "Failed to set jspawnhelper executable permission" 1
+    mv "jre" "$RELEASE_NAME/jre"
-    fi
-    mv "jre" "$RELEASE_NAME/jre" || error $LINENO "Failed to move jre" 1
   else
     if [ ! -f "$JRE" ]; then
-      curl -fL "$JRE_URL" -o "$JRE" || error $LINENO "Failed to download JRE" 1
+      curl -L "$JRE_URL" -o "$JRE"
     fi
 
     local ext="${JRE##*.}"
     if [ "$ext" = "zip" ]; then
-      unzip "$JRE" || error $LINENO "Failed to extract JRE zip" 1
+      unzip "$JRE"
     else
-      tar xvf "$JRE" || error $LINENO "Failed to extract JRE tar" 1
+      tar xvf "$JRE"
-    fi
-    mv "$JRE_DIR" "$RELEASE_NAME/jre" || error $LINENO "Failed to move extracted JRE" 1
-
-    if [ ! -f "$RELEASE_NAME/jre/bin/java.exe" ]; then
-      chmod +x "$RELEASE_NAME/jre/bin/java" || error $LINENO "Failed to set java executable permission" 1
-      chmod +x "$RELEASE_NAME/jre/lib/jspawnhelper" || error $LINENO "Failed to set jspawnhelper executable permission" 1
     fi
+    mv "$JRE_DIR" "$RELEASE_NAME/jre"
   fi
 }
 
@@ -190,31 +198,31 @@ copy_linux_package_assets_to() {
   local output_dir
   output_dir="$(readlink -e "$1" || exit 1)"
 
-  cp "scripts/resources/pkg/suwayomi-server.sh" "$output_dir/" || error $LINENO "Failed to copy server script" 1
+  cp "scripts/resources/pkg/suwayomi-server.sh" "$output_dir/"
-  cp "scripts/resources/pkg/suwayomi-server.desktop" "$output_dir/" || error $LINENO "Failed to copy server desktop file" 1
+  cp "scripts/resources/pkg/suwayomi-server.desktop" "$output_dir/"
-  cp "scripts/resources/pkg/suwayomi-launcher.sh" "$output_dir/" || error $LINENO "Failed to copy launcher script" 1
+  cp "scripts/resources/pkg/suwayomi-launcher.sh" "$output_dir/"
-  cp "scripts/resources/pkg/suwayomi-launcher.desktop" "$output_dir/" || error $LINENO "Failed to copy launcher desktop file" 1
+  cp "scripts/resources/pkg/suwayomi-launcher.desktop" "$output_dir/"
-  cp "scripts/resources/pkg/systemd"/* "$output_dir/" || error $LINENO "Failed to copy systemd files" 1
+  cp "scripts/resources/pkg/systemd"/* "$output_dir/"
   cp "server/src/main/resources/icon/faviconlogo-128.png" \
-    "$output_dir/suwayomi-server.png" || error $LINENO "Failed to copy icon" 1
+    "$output_dir/suwayomi-server.png"
 }
 
 make_linux_bundle() {
   mkdir "$RELEASE_NAME/bin"
-  cp "$JAR" "$RELEASE_NAME/bin/Suwayomi-Server.jar" || error $LINENO "Failed to copy server jar" 1
+  cp "$JAR" "$RELEASE_NAME/bin/Suwayomi-Server.jar"
-  cp "scripts/resources/suwayomi-launcher.sh" "$RELEASE_NAME/" || error $LINENO "Failed to copy launcher script" 1
+  cp "scripts/resources/suwayomi-launcher.sh" "$RELEASE_NAME/"
-  cp "scripts/resources/suwayomi-server.sh" "$RELEASE_NAME/" || error $LINENO "Failed to copy server script" 1
+  cp "scripts/resources/suwayomi-server.sh" "$RELEASE_NAME/"
-  cp "scripts/resources/catch_abort.so" "$RELEASE_NAME/bin/" || error $LINENO "Failed to copy catch_abort" 1
+  cp "scripts/resources/catch_abort.so" "$RELEASE_NAME/bin/"
 
-  tar -I "gzip -9" -cvf "$RELEASE" "$RELEASE_NAME/" || error $LINENO "Failed to create tar.gz" 1
+  tar -I "gzip -9" -cvf "$RELEASE" "$RELEASE_NAME/"
 }
 
 make_macos_bundle() {
   mkdir "$RELEASE_NAME/bin"
-  cp "$JAR" "$RELEASE_NAME/bin/Suwayomi-Server.jar" || error $LINENO "Failed to copy server jar" 1
+  cp "$JAR" "$RELEASE_NAME/bin/Suwayomi-Server.jar"
-  cp "scripts/resources/Suwayomi Launcher.command" "$RELEASE_NAME/" || error $LINENO "Failed to copy launcher command" 1
+  cp "scripts/resources/Suwayomi Launcher.command" "$RELEASE_NAME/"
 
-  tar -I "gzip -9" -cvf "$RELEASE" "$RELEASE_NAME/" || error $LINENO "Failed to create tar.gz" 1
+  tar -I "gzip -9" -cvf "$RELEASE" "$RELEASE_NAME/"
 }
 
 # https://wiki.debian.org/SimplePackagingTutorial
@@ -225,27 +233,28 @@ make_deb_package() {
   #behind $RELEASE_VERSION is underscore "_"
   local upstream_source="suwayomi-server_$RELEASE_VERSION.orig.tar.gz"
 
-  mkdir "$RELEASE_NAME/$source_dir/" || error $LINENO "Failed to create source directory" 1
+  mkdir "$RELEASE_NAME/$source_dir/"
-  mv "$RELEASE_NAME/Suwayomi-Launcher.jar" "$RELEASE_NAME/$source_dir/Suwayomi-Launcher.jar" || error $LINENO "Failed to move launcher jar" 1
+  mv "$RELEASE_NAME/natives" "$RELEASE_NAME/$source_dir/natives"
-  cp "$JAR" "$RELEASE_NAME/$source_dir/Suwayomi-Server.jar" || error $LINENO "Failed to copy server jar" 1
+  mv "$RELEASE_NAME/Suwayomi-Launcher.jar" "$RELEASE_NAME/$source_dir/Suwayomi-Launcher.jar"
+  cp "$JAR" "$RELEASE_NAME/$source_dir/Suwayomi-Server.jar"
   copy_linux_package_assets_to "$RELEASE_NAME/$source_dir/"
-  cp "scripts/resources/catch_abort.so" "$RELEASE_NAME/$source_dir/" || error $LINENO "Failed to copy catch_abort" 1
+  cp "scripts/resources/catch_abort.so" "$RELEASE_NAME/$source_dir/"
-  tar -I "gzip" -C "$RELEASE_NAME/" -cvf "$upstream_source" "$source_dir" || error $LINENO "Failed to create source tar.gz" 1
+  tar -I "gzip" -C "$RELEASE_NAME/" -cvf "$upstream_source" "$source_dir"
 
-  cp -r "scripts/resources/deb/" "$RELEASE_NAME/$source_dir/debian/" || error $LINENO "Failed to copy debian resources" 1
+  cp -r "scripts/resources/deb/" "$RELEASE_NAME/$source_dir/debian/"
-  sed -i "s/\$pkgver/$RELEASE_VERSION/" "$RELEASE_NAME/$source_dir/debian/changelog" || error $LINENO "Failed to update changelog" 1
+  sed -i "s/\$pkgver/$RELEASE_VERSION/" "$RELEASE_NAME/$source_dir/debian/changelog"
-  sed -i "s/\$pkgrel/1/"                "$RELEASE_NAME/$source_dir/debian/changelog" || error $LINENO "Failed to update changelog" 1
+  sed -i "s/\$pkgrel/1/"                "$RELEASE_NAME/$source_dir/debian/changelog"
 
   if [ "${CI:-}" = true ]; then
-    sudo apt update || error $LINENO "Failed to update apt" 1
+    sudo apt update
-    sudo apt install devscripts build-essential dh-exec || error $LINENO "Failed to install build deps" 1
+    sudo apt install devscripts build-essential dh-exec
   fi
-  cd "$RELEASE_NAME/$source_dir/" || error $LINENO "Failed to change directory" 1
+  cd "$RELEASE_NAME/$source_dir/"
-  dpkg-buildpackage --no-sign --build=all || error $LINENO "Debian package build failed" 1
+  dpkg-buildpackage --no-sign --build=all
-  cd - || error $LINENO "Failed to return to previous directory" 1
+  cd -
 
   local deb="suwayomi-server_$RELEASE_VERSION-1_all.deb"
-  mv "$RELEASE_NAME/$deb" "$RELEASE" || error $LINENO "Failed to move resulting .deb" 1
+  mv "$RELEASE_NAME/$deb" "$RELEASE"
 }
 
 # https://linuxconfig.org/building-a-hello-world-appimage-on-linux
@@ -253,20 +262,20 @@ make_appimage() {
   local APPIMAGE_URL="https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
   local APPIMAGE_TOOLNAME="appimagetool-x86_64.AppImage"
   mkdir "$RELEASE_NAME/bin/"
-  cp "$JAR" "$RELEASE_NAME/bin/Suwayomi-Server.jar" || error $LINENO "Failed to copy server jar" 1
+  cp "$JAR" "$RELEASE_NAME/bin/Suwayomi-Server.jar"
 
-  cp "scripts/resources/pkg/suwayomi-server.desktop" "$RELEASE_NAME/suwayomi-server.desktop" || error $LINENO "Failed to copy desktop file" 1
+  cp "scripts/resources/pkg/suwayomi-server.desktop" "$RELEASE_NAME/suwayomi-server.desktop"
-  cp "server/src/main/resources/icon/faviconlogo.png" "$RELEASE_NAME/suwayomi-server.png" || error $LINENO "Failed to copy icon" 1
+  cp "server/src/main/resources/icon/faviconlogo.png" "$RELEASE_NAME/suwayomi-server.png"
-  cp "scripts/resources/appimage/AppRun" "$RELEASE_NAME/AppRun" || error $LINENO "Failed to copy AppRun" 1
+  cp "scripts/resources/appimage/AppRun" "$RELEASE_NAME/AppRun"
-  chmod +x "$RELEASE_NAME/AppRun" || error $LINENO "Failed to make AppRun executable" 1
+  chmod +x "$RELEASE_NAME/AppRun"
 
   if [ "${CI:-}" = true ]; then
-    sudo apt update || error $LINENO "Failed to update apt" 1
+    sudo apt update
-    sudo apt install libfuse2 || error $LINENO "Failed to install libfuse2" 1
+    sudo apt install libfuse2
   fi
-  curl -fL $APPIMAGE_URL -o $APPIMAGE_TOOLNAME || error $LINENO "Failed to download appimagetool" 1
+  curl -L $APPIMAGE_URL -o $APPIMAGE_TOOLNAME
-  chmod +x $APPIMAGE_TOOLNAME || error $LINENO "Failed to make appimagetool executable" 1
+  chmod +x $APPIMAGE_TOOLNAME
-  ARCH=x86_64 ./$APPIMAGE_TOOLNAME "$RELEASE_NAME" "$RELEASE" || error $LINENO "AppImage creation failed" 1
+  ARCH=x86_64 ./$APPIMAGE_TOOLNAME "$RELEASE_NAME" "$RELEASE"
 }
 
 make_windows_bundle() {
@@ -291,7 +300,7 @@ make_windows_bundle() {
   #local rcedit_url="https://github.com/electron/rcedit/releases/download/v0.1.1/$rcedit"
   ## change electron's icon
   #if [ ! -f "$rcedit" ]; then
-    #curl -fL "$rcedit_url" -o "$rcedit" || error $LINENO "Failed to download rcedit" 1
+    #curl -L "$rcedit_url" -o "$rcedit"
   #fi
 
   #local icon="server/src/main/resources/icon/faviconlogo.ico"
@@ -299,35 +308,38 @@ make_windows_bundle() {
   #    --set-icon "$icon"
 
   mkdir "$RELEASE_NAME/bin"
-  cp "$JAR" "$RELEASE_NAME/bin/Suwayomi-Server.jar" || error $LINENO "Failed to copy server jar" 1
+  cp "$JAR" "$RELEASE_NAME/bin/Suwayomi-Server.jar"
-  cp "scripts/resources/Suwayomi Launcher.bat" "$RELEASE_NAME" || error $LINENO "Failed to copy launcher bat" 1
+  cp "scripts/resources/Suwayomi Launcher.bat" "$RELEASE_NAME"
 
-  zip -9 -r "$RELEASE" "$RELEASE_NAME" || error $LINENO "Failed to create windows bundle zip" 1
+  zip -9 -r "$RELEASE" "$RELEASE_NAME"
 }
 
 make_windows_package() {
   if [ "${CI:-}" = true ]; then
-    sudo apt update || error $LINENO "Failed to update apt" 1
+    sudo apt update
-    sudo apt install -y wixl || error $LINENO "Failed to install wixl" 1
+    sudo apt install -y wixl
   fi
 
   find "$RELEASE_NAME/jre" \
   | wixl-heat --var var.SourceDir -p "$RELEASE_NAME/" \
-    --directory-ref jre --component-group jre >"$RELEASE_NAME/jre.wxs" || error $LINENO "Failed to heat jre" 1
+    --directory-ref jre --component-group jre >"$RELEASE_NAME/jre.wxs"
   find "$RELEASE_NAME/electron" \
   | wixl-heat --var var.SourceDir -p "$RELEASE_NAME/" \
-    --directory-ref electron --component-group electron >"$RELEASE_NAME/electron.wxs" || error $LINENO "Failed to heat electron" 1
+    --directory-ref electron --component-group electron >"$RELEASE_NAME/electron.wxs"
+  find "$RELEASE_NAME/natives" \
+  | wixl-heat --var var.SourceDir -p "$RELEASE_NAME/" \
+    --directory-ref natives --component-group natives >"$RELEASE_NAME/natives.wxs"
 
   find "$RELEASE_NAME/bin" \
   | wixl-heat --var var.SourceDir -p "$RELEASE_NAME/" \
-    --directory-ref bin --component-group bin >"$RELEASE_NAME/bin.wxs" || error $LINENO "Failed to heat bin" 1
+    --directory-ref bin --component-group bin >"$RELEASE_NAME/bin.wxs"
 
   local icon="server/src/main/resources/icon/faviconlogo.ico"
   local arch=${OS##*-}
 
   wixl -D ProductVersion="$RELEASE_VERSION" -D SourceDir="$RELEASE_NAME" \
     -D Icon="$icon" --arch "$arch" "scripts/resources/msi/suwayomi-server-$arch.wxs" \
-    "$RELEASE_NAME/jre.wxs" "$RELEASE_NAME/electron.wxs" "$RELEASE_NAME/bin.wxs" -o "$RELEASE" || error $LINENO "Windows package build failed" 1
+    "$RELEASE_NAME/jre.wxs" "$RELEASE_NAME/electron.wxs" "$RELEASE_NAME/natives.wxs" "$RELEASE_NAME/bin.wxs" -o "$RELEASE"
 }
 
 # Error handler

scripts/resources/deb/install

@@ -2,6 +2,7 @@
 
 Suwayomi-Server.jar         usr/share/java/suwayomi-server/bin/
 Suwayomi-Launcher.jar       usr/share/java/suwayomi-server/
+natives/*                   usr/share/java/suwayomi-server/natives/
 suwayomi-server.png         usr/share/pixmaps/
 suwayomi-server.desktop     usr/share/applications/
 suwayomi-launcher.desktop   usr/share/applications/

scripts/resources/msi/suwayomi-server-x64.wxs

@@ -17,6 +17,7 @@
         <Directory Id="INSTALLDIR" Name="Suwayomi-Server" >
           <Directory Id="jre"/>
           <Directory Id="electron"/>
+          <Directory Id="natives"/>
           <Directory Id="bin"/>
         </Directory>
       </Directory>
@@ -62,6 +63,7 @@
       <ComponentRef Id="SuwayomiLauncherBAT" />
       <ComponentRef Id="ProgramMenuDir" />
       <ComponentGroupRef Id="electron" />
+      <ComponentGroupRef Id="natives" />
     </Feature>
 
     <Icon Id="Suwayomi.ico" SourceFile="$(var.Icon)" />

server/build.gradle.kts

@@ -159,8 +159,6 @@ buildConfig {
 
     buildConfigField("String", "GITHUB", quoteWrap("https://github.com/Suwayomi/Suwayomi-Server"))
     buildConfigField("String", "DISCORD", quoteWrap("https://discord.gg/DDZdqZWaHA"))
-    buildConfigField("String", "JCEF_VERSION", quoteWrap(libs.versions.jcef.get()))
-    buildConfigField("String", "JCEF_JBR_RELEASE", quoteWrap(webviewJbrRelease))
 }
 
 tasks {
@@ -173,8 +171,6 @@ tasks {
                 "Implementation-Vendor" to "The Suwayomi Project",
                 "Specification-Version" to getTachideskVersion(),
                 "Implementation-Version" to getTachideskRevision(),
-                "Multi-Release" to true, // needed for polyglot
-                "X-JBR-Release" to webviewJbrRelease,
             )
         }
         archiveBaseName.set(rootProject.name)
@@ -185,11 +181,7 @@ tasks {
     }
 
     test {
-        useJUnitPlatform {
+        useJUnitPlatform()
-            if (!project.hasProperty("masstest")) {
-                exclude("**/masstest/*")
-            }
-        }
         testLogging {
             showStandardStreams = true
             events("passed", "skipped", "failed")

server/i18n/src/commonMain/moko-resources/values/base/strings.xml

@@ -50,7 +50,6 @@
     <!-- OPDS errors -->
     <string name="opds_error_manga_not_found">Series with ID %1$d not found.</string>
     <string name="opds_error_chapter_not_found">Chapter with index %1$d not found.</string>
-    <string name="opds_error_chapters_not_found">No chapters found or the source is unreachable on page %1$d.</string>
 
     <!-- OPDS facets (Filters and Sorting) -->
     <string name="opds_facetgroup_sort_order">Sort Order</string>
@@ -154,7 +153,4 @@
     <string name="login_label_login">Log In</string>
     <string name="login_placeholder_username">Type username...</string>
     <string name="login_placeholder_password">Secret...</string>
-
-    <string name="opds_chapter_title_oneshot">Oneshot</string>
-    <string name="opds_chapter_title_fallback">Chapter %1$s</string>
 </resources>

server/i18n/src/commonMain/moko-resources/values/de/strings.xml

@@ -8,7 +8,7 @@
     <string name="opds_feeds_root">Suwayomi OPDS Katalog</string>
     <string name="opds_feeds_chapter_details">%1$s | %2$s | Details</string>
     <string name="opds_feeds_sources_title">Alle Quellen</string>
-    <string name="opds_feeds_genres_title">Genren</string>
+    <string name="opds_feeds_genres_title">Genres</string>
     <string name="opds_feeds_genres_entry_content">Durchsuche Serien nach Genre</string>
     <string name="opds_feeds_status_entry_content">Durchsuche Serien nach Publikationsstatus</string>
     <string name="opds_feeds_languages_title">Sprachen</string>
@@ -122,7 +122,4 @@
     <string name="webview_label_login_required">Deine Konfiguration erfordert die Anmeldung. Bitte gib Benutzername und Passwort ein.</string>
     <string name="opds_linktitle_first_page">Erste Seite</string>
     <string name="opds_linktitle_last_page">Letzte Seite</string>
-    <string name="opds_error_chapters_not_found">Keine Kapitel gefunden oder die Quelle ist nicht erreichbar auf Seite %1$d.</string>
-    <string name="opds_chapter_title_fallback">Kapitel %1$s</string>
-    <string name="opds_chapter_title_oneshot">Oneshot</string>
 </resources>

server/i18n/src/commonMain/moko-resources/values/el/strings.xml

@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="opds_feeds_root">Suwayomi OPDS Κατάλογος</string>
-    <string name="opds_feeds_manga_chapters">Κεφάλαια %1$s</string>
-    <string name="opds_feeds_chapter_details">%1$s | %2$s | Λεπτομέρειες</string>
-    <string name="opds_feeds_explore_title">Εξερεύνηση</string>
-    <string name="opds_feeds_explore_entry_content">Εξερεύνησε νέες σειρές από τις πηγές σου</string>
-    <string name="opds_feeds_history_title">Ιστορικό</string>
-    <string name="opds_feeds_history_entry_content">Πρόσφατα διαβασμένα κεφάλαια</string>
-    <string name="opds_feeds_all_series_in_library_title">Όλες οι σειρές</string>
-    <string name="opds_feeds_all_series_in_library_entry_content">Περιήγηση σε όλες τις σειρές της βιβλιοθήκης σου</string>
-    <string name="opds_feeds_library_sources_title">Πηγές</string>
-    <string name="opds_feeds_library_sources_entry_content">Περιήγηση σε σειρές της βιβλιοθήκης σου φιλτραρισμένες κατά πηγή</string>
-    <string name="opds_feeds_categories_title">Κατηγορίες</string>
-    <string name="opds_feeds_categories_entry_content">Περιήγηση σε σειρές οργανωμένες κατά κατηγορία</string>
-    <string name="opds_feeds_genres_title">Είδη</string>
-    <string name="opds_feeds_genres_entry_content">Περιήγηση σε σειρές κατά ετικέτες είδους</string>
-    <string name="opds_feeds_status_title">Κατάσταση</string>
-    <string name="opds_feeds_status_entry_content">Περιήγηση σε σειρές κατά κατάσταση δημοσίευσης</string>
-    <string name="opds_feeds_languages_title">Γλώσσες</string>
-    <string name="opds_feeds_languages_entry_content">Περιήγηση σε σειρές κατά γλώσσα περιεχομένου</string>
-    <string name="opds_feeds_library_updates_title">Ιστορικό ενημερώσεων βιβλιοθήκης</string>
-    <string name="opds_feeds_library_updates_entry_content">Πρόσφατα ενημερωμένα κεφάλαια από τη βιβλιοθήκη σου</string>
-    <string name="opds_feeds_search_results_title">Αποτελέσματα αναζήτησης</string>
-    <string name="opds_feeds_sources_title">Όλες οι πηγές</string>
-    <string name="opds_feeds_category_specific_title">Κατηγορία: %1$s</string>
-    <string name="opds_feeds_genre_specific_title">Είδος: %1$s</string>
-    <string name="opds_feeds_status_specific_title">Κατάσταση: %1$s</string>
-    <string name="opds_feeds_language_specific_title">Γλώσσα: %1$s</string>
-    <string name="opds_feeds_source_specific_title">Πηγή: %1$s</string>
-    <string name="opds_feeds_library_source_specific_title">Βιβλιοθήκη - Πηγή: %1$s</string>
-    <string name="opds_feeds_source_specific_popular_title">Πηγή: %1$s - Δημοφιλές</string>
-    <string name="opds_feeds_source_specific_latest_title">Πηγή: %1$s - Τελευταίο</string>
-    <string name="opds_search_shortname">Suwayomi OPDS Αναζήτηση</string>
-    <string name="opds_search_description">Αναζήτηση σειρών στον κατάλογο.</string>
-    <string name="opds_error_manga_not_found">Η σειρά με ID %1$d δεν βρέθηκε.</string>
-    <string name="opds_error_chapter_not_found">Το κεφάλαιο με δείκτη %1$d δεν βρέθηκε.</string>
-    <string name="opds_facetgroup_sort_order">Σειρά ταξινόμησης</string>
-    <string name="opds_facetgroup_filter_read_status">Φίλτρο κατά κατάσταση ανάγνωσης</string>
-    <string name="opds_facetgroup_filter_content">Φίλτρο περιεχομένου</string>
-    <string name="opds_facetgroup_filter_source">Φίλτρο κατά πηγή</string>
-    <string name="opds_facetgroup_filter_category">Φίλτρο κατά κατηγορία</string>
-    <string name="opds_facetgroup_filter_status">Φίλτρο κατά κατάσταση</string>
-    <string name="opds_facetgroup_filter_language">Φίλτρο κατά γλώσσα</string>
-    <string name="opds_facetgroup_filter_genre">Φίλτρο κατά είδος</string>
-    <string name="opds_facet_sort_oldest_first">Παλαιότερα πρώτα</string>
-    <string name="opds_facet_sort_newest_first">Νεότερα πρώτα</string>
-    <string name="opds_facet_sort_date_asc">Ημερομηνία αύξουσα</string>
-    <string name="opds_facet_sort_date_desc">Ημερομηνία φθίνουσα</string>
-    <string name="opds_facet_sort_popular">Δημοφιλές</string>
-    <string name="opds_facet_sort_latest">Τελευταίο</string>
-    <string name="opds_facet_sort_alpha_asc">Αλφαβητικά Α-Ω</string>
-    <string name="opds_facet_sort_alpha_desc">Αλφαβητικά Ω-Α</string>
-    <string name="opds_facet_sort_last_read_desc">Τελευταία ανάγνωση</string>
-    <string name="opds_facet_sort_latest_chapter_desc">Τελευταίο κεφάλαιο</string>
-    <string name="opds_facet_sort_date_added_desc">Ημερομηνία προσθήκης</string>
-    <string name="opds_facet_sort_unread_desc">Αδιάβαστα κεφάλαια</string>
-    <string name="opds_facet_filter_all">Όλα</string>
-    <string name="opds_facet_filter_all_chapters">Όλα τα κεφάλαια</string>
-    <string name="opds_facet_filter_unread_only">Αδιάβαστα</string>
-    <string name="opds_facet_filter_read_only">Διαβασμένα</string>
-    <string name="opds_facet_filter_downloaded">Ληφθέντα</string>
-    <string name="opds_facet_filter_ongoing">Σε εξέλιξη</string>
-    <string name="opds_facet_filter_completed">Ολοκληρωμένα</string>
-    <string name="opds_facet_all_sources">Όλες οι πηγές</string>
-    <string name="opds_facet_all_categories">Όλες οι κατηγορίες</string>
-    <string name="opds_facet_all_statuses">Όλες οι καταστάσεις</string>
-    <string name="opds_facet_all_languages">Όλες οι γλώσσες</string>
-    <string name="opds_facet_all_genres">Όλα τα είδη</string>
-    <string name="opds_linktitle_catalog_root">Ρίζα καταλόγου</string>
-    <string name="opds_linktitle_search_catalog">Αναζήτηση καταλόγου</string>
-    <string name="opds_linktitle_first_page">Πρώτη σελίδα</string>
-    <string name="opds_linktitle_previous_page">Προηγούμενη σελίδα</string>
-    <string name="opds_linktitle_next_page">Επόμενη σελίδα</string>
-    <string name="opds_linktitle_last_page">Τελευταία σελίδα</string>
-    <string name="opds_linktitle_self_feed">Τρέχουσα ροή</string>
-    <string name="opds_linktitle_view_on_web">Προβολή στο Web</string>
-    <string name="opds_linktitle_stream_pages_start">Διάβασε Online</string>
-    <string name="opds_linktitle_stream_pages_continue">Συνέχισε να διαβάζεις Online</string>
-    <string name="opds_linktitle_stream_pages_start_local">Διάβασε Online (Τοπική πρόοδος)</string>
-    <string name="opds_linktitle_stream_pages_continue_local">Συνέχισε να διαβάζεις Online (Τοπική πρόοδος)</string>
-    <string name="opds_linktitle_stream_pages_start_remote">Διάβασε Online (Συγχρονισμένο από %1$s)</string>
-    <string name="opds_linktitle_stream_pages_continue_remote">Συνέχισε να διαβάζεις Online (Συγχρονισμένο από %1$s)</string>
-    <string name="opds_linktitle_download_cbz">Λήψη CBZ</string>
-    <string name="opds_linktitle_chapter_cover">Εξώφυλλο κεφαλαίου</string>
-    <string name="opds_linktitle_view_chapter_details">Λεπτομέρειες κεφαλαίου &amp; Σελίδες</string>
-    <string name="opds_chapter_status_read">✅</string>
-    <string name="opds_chapter_status_in_progress">⌛</string>
-    <string name="opds_chapter_status_unread">⭕</string>
-    <string name="opds_chapter_status_downloaded">⬇️</string>
-    <string name="opds_chapter_status_synced">🌐</string>
-    <string name="opds_chapter_details_base">Σειρά: %1$s | %2$s</string>
-    <string name="opds_chapter_details_scanlator">| Από %1$s</string>
-    <string name="opds_chapter_details_progress">| Πρόοδος: %1$d από %2$d</string>
-    <string name="opds_manga_summary_status">Κατάσταση: %1$s</string>
-    <string name="opds_manga_summary_source">Πηγή: %1$s</string>
-    <string name="opds_manga_summary_language">Γλώσσα: %1$s</string>
-    <string name="manga_status_ongoing">Σε εξέλιξη</string>
-    <string name="manga_status_completed">Ολοκληρωμένο</string>
-    <string name="manga_status_licensed">Υπό άδεια</string>
-    <string name="manga_status_publishing_finished">Δημοσίευση ολοκληρωμένη</string>
-    <string name="manga_status_cancelled">Ακυρωμένο</string>
-    <string name="manga_status_on_hiatus">Σε παύση</string>
-    <string name="manga_status_unknown">Άγνωστο</string>
-    <string name="label_error">Σφάλμα</string>
-    <string name="label_version">Έκδοση <xliff:g id="version" example="v2.0.1833">%1$s</xliff:g></string>
-    <string name="label_close">Κλείσε</string>
-    <string name="webview_label_title">Suwayomi WebView</string>
-    <string name="webview_label_disconnected">Αποσυνδεδεμένο, κάνε ανανέωση</string>
-    <string name="webview_label_reversescroll">Αντίστροφη κύλιση</string>
-    <string name="webview_label_bindingshint">Σημείωση: Όταν η εστίαση είναι στο τμήμα WebView, καμία συντόμευση πληκτρολογίου, συμπεριλαμβανομένης της ανανέωσης, δεν θα αντιμετωπίζεται από το πρόγραμμα περιήγησης.</string>
-    <string name="webview_label_init">Αρχικοποίηση... Παρακαλώ περίμενε</string>
-    <string name="webview_label_getstarted">Εισήγαγε μια διεύθυνση URL για να ξεκινήσεις</string>
-    <string name="webview_label_loading">Φόρτωση σελίδας...</string>
-    <string name="webview_label_copy">Αντιγραφή στο πρόχειρο</string>
-    <string name="webview_label_copy_description">Η αυτόματη αντιγραφή στο πρόχειρο απέτυχε, χρησιμοποίησε το παρακάτω πεδίο για να αντιγράψεις χειροκίνητα την τιμή.</string>
-    <string name="webview_label_login_required">Η διαμόρφωσή σου απαιτεί σύνδεση. Εισήγαγε όνομα χρήστη και κωδικό.</string>
-    <string name="webview_placeholder_url">Εισήγαγε URL...</string>
-    <string name="login_label_title">Suwayomi Σύνδεση</string>
-    <string name="login_label_username">Όνομα χρήστη</string>
-    <string name="login_label_password">Κωδικός</string>
-    <string name="login_label_login">Σύνδεση</string>
-    <string name="login_placeholder_username">Πληκτρολόγησε όνομα χρήστη...</string>
-    <string name="login_placeholder_password">Μυστικό...</string>
-    <string name="opds_error_chapters_not_found">Δεν βρέθηκαν κεφάλαια ή η πηγή είναι μη διαθέσιμη στη σελίδα %1$d.</string>
-    <string name="opds_chapter_title_fallback">Κεφάλαιο %1$s</string>
-</resources>

server/i18n/src/commonMain/moko-resources/values/es/strings.xml

@@ -122,6 +122,4 @@
     <string name="webview_label_login_required">Su configuración requiere que inicie sesión. Introduzca su nombre de usuario y contraseña.</string>
     <string name="opds_linktitle_first_page">Primera página</string>
     <string name="opds_linktitle_last_page">Última página</string>
-    <string name="opds_error_chapters_not_found">No se encontraron capítulos o la fuente no está disponible en la página %1$d.</string>
-    <string name="opds_chapter_title_fallback">Capítulo %1$s</string>
 </resources>

server/i18n/src/commonMain/moko-resources/values/fr/strings.xml

@@ -122,7 +122,4 @@
     <string name="login_label_login">Se connecter</string>
     <string name="login_placeholder_username">Tapez le nom d\'utilisateur…</string>
     <string name="login_placeholder_password">Secret…</string>
-    <string name="opds_error_chapters_not_found">Aucun chapitre trouvé ou la source est inaccessible à la page %1$d.</string>
-    <string name="opds_chapter_title_fallback">Chapitre %1$s</string>
-    <string name="opds_chapter_title_oneshot">One shot</string>
 </resources>

server/i18n/src/commonMain/moko-resources/values/it/strings.xml

@@ -122,6 +122,4 @@
     <string name="login_label_login">Accedi</string>
     <string name="login_placeholder_username">Digita il nome utente...</string>
     <string name="login_placeholder_password">Segreto...</string>
-    <string name="opds_error_chapters_not_found">Nessun capitolo trovato o la fonte non è raggiungibile alla pagina %1$d.</string>
-    <string name="opds_chapter_title_fallback">Capitolo %1$s</string>
 </resources>

server/i18n/src/commonMain/moko-resources/values/ja/strings.xml

@@ -60,7 +60,4 @@
     <string name="opds_feeds_library_sources_title">ソース</string>
     <string name="opds_feeds_library_sources_entry_content">ソース別にライブラリ内のマンガを閲覧</string>
     <string name="opds_feeds_search_results_title">検索結果</string>
-    <string name="opds_error_chapters_not_found">ページ %1$d で章が見つからないか、ソースに接続できません。</string>
-    <string name="opds_chapter_title_oneshot">読み切り</string>
-    <string name="opds_chapter_title_fallback">第 %1$s 話</string>
 </resources>

server/i18n/src/commonMain/moko-resources/values/pl/strings.xml

@@ -76,6 +76,4 @@
     <string name="opds_facet_filter_all">Wszystkie</string>
     <string name="opds_facet_filter_downloaded">Pobrane</string>
     <string name="opds_facet_filter_ongoing">Trwające</string>
-    <string name="opds_error_chapters_not_found">Nie znaleziono rozdziałów lub źródło jest nieosiągalne na stronie %1$d.</string>
-    <string name="opds_chapter_title_fallback">Rozdział %1$s</string>
 </resources>

server/i18n/src/commonMain/moko-resources/values/pt/strings.xml

@@ -122,6 +122,4 @@
     <string name="login_label_login">Entrar</string>
     <string name="login_placeholder_username">Digite o nome de usuário...</string>
     <string name="login_placeholder_password">Segredo...</string>
-    <string name="opds_error_chapters_not_found">Nenhum capítulo encontrado ou a fonte está inacessível na página %1$d.</string>
-    <string name="opds_chapter_title_fallback">Capítulo %1$s</string>
 </resources>

server/i18n/src/commonMain/moko-resources/values/ru/strings.xml

@@ -122,7 +122,4 @@
     <string name="opds_search_description">Ищите тайтлы в каталоге.</string>
     <string name="opds_error_manga_not_found">Тайтл с ID %1$d не найден.</string>
     <string name="opds_chapter_details_base">Тайтл: %1$s | %2$s</string>
-    <string name="opds_error_chapters_not_found">Главы не найдены или источник недоступен на странице %1$d.</string>
-    <string name="opds_chapter_title_fallback">Глава %1$s</string>
-    <string name="opds_chapter_title_oneshot">Ваншот</string>
 </resources>

server/i18n/src/commonMain/moko-resources/values/ta/strings.xml

@@ -53,7 +53,4 @@
     <string name="opds_chapter_status_unread">⭕</string>
     <string name="opds_chapter_details_base">%1$s | %2$s</string>
     <string name="opds_feeds_genre_specific_title">இசைவகை: %1$s</string>
-    <string name="opds_error_chapters_not_found">பக்கம் %1$d இல் அத்தியாயங்கள் எதுவும் காணப்படவில்லை அல்லது மூலத்தை அணுக முடியவில்லை.</string>
-    <string name="opds_chapter_title_oneshot">ஒன்-ஷாட்</string>
-    <string name="opds_chapter_title_fallback">அத்தியாயம் %1$s</string>
 </resources>

server/i18n/src/commonMain/moko-resources/values/vi/strings.xml

@@ -122,6 +122,4 @@
     <string name="webview_label_login_required">Cấu hình của bạn yêu cầu bạn phải đăng nhập. Vui lòng nhập tên người dùng và mật khẩu.</string>
     <string name="opds_linktitle_first_page">Trang đầu</string>
     <string name="opds_linktitle_last_page">Trang cuối</string>
-    <string name="opds_error_chapters_not_found">Không tìm thấy chương nào hoặc nguồn không thể truy cập tại trang %1$d.</string>
-    <string name="opds_chapter_title_fallback">Chương %1$s</string>
 </resources>

server/i18n/src/commonMain/moko-resources/values/zh-rCN/strings.xml

@@ -122,7 +122,4 @@
     <string name="login_placeholder_username">输入用户名…</string>
     <string name="login_placeholder_password">密匙…</string>
     <string name="label_error">错误</string>
-    <string name="opds_error_chapters_not_found">第 %1$d 页未找到任何章节，或图源无法访问。</string>
-    <string name="opds_chapter_title_fallback">第 %1$s 章</string>
-    <string name="opds_chapter_title_oneshot">单篇</string>
 </resources>

server/server-config-generate/src/main/kotlin/suwayomi/tachidesk/server/settings/generation/SettingsBackupServerSettingsGenerator.kt

@@ -2,6 +2,7 @@ package suwayomi.tachidesk.server.settings.generation
 
 import suwayomi.tachidesk.server.settings.SettingsRegistry
 import java.io.File
+import kotlin.text.appendLine
 
 object SettingsBackupServerSettingsGenerator {
     fun generate(

server/server-config-generate/src/main/kotlin/suwayomi/tachidesk/server/settings/generation/SettingsBackupSettingsHandlerGenerator.kt

@@ -2,6 +2,7 @@ package suwayomi.tachidesk.server.settings.generation
 
 import suwayomi.tachidesk.server.settings.SettingsRegistry
 import java.io.File
+import kotlin.text.appendLine
 
 object SettingsBackupSettingsHandlerGenerator {
     fun generate(

server/server-config-generate/src/main/kotlin/suwayomi/tachidesk/server/settings/generation/SettingsGraphqlTypeGenerator.kt

@@ -2,6 +2,7 @@ package suwayomi.tachidesk.server.settings.generation
 
 import suwayomi.tachidesk.server.settings.SettingsRegistry
 import java.io.File
+import kotlin.text.appendLine
 
 object SettingsGraphqlTypeGenerator {
     fun generate(

server/server-config/src/main/kotlin/suwayomi/tachidesk/server/ServerConfig.kt

@@ -15,15 +15,17 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.conflate
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.onEach
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.sql.SortOrder
 import suwayomi.tachidesk.graphql.types.AuthMode
 import suwayomi.tachidesk.graphql.types.CbzMediaType
 import suwayomi.tachidesk.graphql.types.DatabaseType
@@ -54,14 +56,16 @@ import suwayomi.tachidesk.server.settings.PathSetting
 import suwayomi.tachidesk.server.settings.SettingGroup
 import suwayomi.tachidesk.server.settings.SettingsRegistry
 import suwayomi.tachidesk.server.settings.StringSetting
-import uy.kohesive.injekt.injectLazy
 import xyz.nulldev.ts.config.GlobalConfigManager
 import xyz.nulldev.ts.config.SystemPropertyOverridableConfigModule
+import kotlin.collections.associate
+import kotlin.getValue
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.days
 import kotlin.time.Duration.Companion.hours
 import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
+import uy.kohesive.injekt.injectLazy
 
 val mutableConfigValueScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
 
@@ -71,21 +75,6 @@ val serverConfig: ServerConfig by lazy { GlobalConfigManager.module() }
 
 private val application: Application by injectLazy()
 
-@OptIn(ExperimentalCoroutinesApi::class)
-fun <T> subscribeTo(
-    flow: Flow<T>,
-    ignoreInitialValue: Boolean = true,
-    onChange: suspend (value: T) -> Unit,
-) {
-    val actualFlow =
-        if (ignoreInitialValue) {
-            flow.drop(1)
-        } else {
-            flow
-        }
-    actualFlow.distinctUntilChanged().conflate().onEach { onChange(it) }.launchIn(mutableConfigValueScope)
-}
-
 // Settings are ordered by "protoNumber".
 class ServerConfig(
     getConfig: () -> Config,
@@ -276,38 +265,30 @@ class ServerConfig(
         description = "Ignore re-uploaded chapters from auto-download",
     )
 
-    @Deprecated("Will get removed", replaceWith = ReplaceWith("extensionStores"))
+    val extensionRepos: MutableStateFlow<List<String>> by ListSetting<String>(
-    val extensionRepos: MutableStateFlow<List<String>> by MigratedConfigValue(
         protoNumber = 22,
         group = SettingGroup.EXTENSION,
         privacySafe = false,
         defaultValue = emptyList(),
-        deprecated =
+        itemValidator = { url ->
-            SettingsRegistry.SettingDeprecated(
+            if (url.matches(repoMatchRegex)) {
-                message = "Replaced with addExtensionStore and removeExtensionStore mutations",
+                null
-                migrateConfigValue = {
+            } else {
-                    @Suppress("UNCHECKED_CAST")
+                "Invalid repository URL format"
-                    (it.unwrapped() as? List<String>)
+            }
-                        ?.map {
+        },
-                            if (it.contains("github.com")) {
+        itemToValidValue = { url ->
-                                it.replace(repoMatchRegex) {
+            if (url.matches(repoMatchRegex)) {
-                                    "https://raw.githubusercontent.com/${it.groupValues[2]}/${it.groupValues[3]}/" +
+                url
-                                        (it.groupValues.getOrNull(4)?.ifBlank { null } ?: "repo") +
+            } else {
-                                        "/" +
+                null
-                                        (it.groupValues.getOrNull(5)?.ifBlank { null } ?: "index.min.json")
+            }
-                                }
+        },
-                            } else {
-                                it
-                            }
-                        }
-                },
-            ),
-        readMigrated = { extensionStores.value },
-        setMigrated = { extensionStores.value = it.distinct() },
         typeInfo =
             SettingsRegistry.PartialTypeInfo(
                 specificType = "List<String>",
             ),
+        description = "example: [\"https://github.com/MY_ACCOUNT/MY_REPO/tree/repo\"]",
     )
 
     val maxSourcesInParallel: MutableStateFlow<Int> by IntSetting(
@@ -601,7 +582,7 @@ class ServerConfig(
         privacySafe = true,
         defaultValue = SortOrder.DESC,
         enumClass = SortOrder::class,
-        typeInfo = SettingsRegistry.PartialTypeInfo(imports = listOf("org.jetbrains.exposed.v1.core.SortOrder")),
+        typeInfo = SettingsRegistry.PartialTypeInfo(imports = listOf("org.jetbrains.exposed.sql.SortOrder")),
     )
 
     val authMode: MutableStateFlow<AuthMode> by EnumSetting(
@@ -1035,107 +1016,7 @@ class ServerConfig(
         description = "Use Hikari Connection Pool to connect to the database.",
     )
 
-    val kcefEnabled: MutableStateFlow<Boolean> by BooleanSetting(
-        protoNumber = 86,
-        group = SettingGroup.WEB_VIEW,
-        privacySafe = true,
-        defaultValue = true,
-        description = "Enable the WebView via CEF (Chromium)"
-    )
 
-    val syncYomiEnabled: MutableStateFlow<Boolean> by BooleanSetting(
-        protoNumber = 87,
-        defaultValue = false,
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true
-    )
-
-    val syncYomiHost: MutableStateFlow<String> by StringSetting(
-        protoNumber = 88,
-        defaultValue = "",
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true,
-    )
-
-    val syncYomiApiKey: MutableStateFlow<String> by StringSetting(
-        protoNumber = 89,
-        defaultValue = "",
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = false,
-    )
-
-    val syncDataManga: MutableStateFlow<Boolean> by BooleanSetting(
-        protoNumber = 90,
-        defaultValue = true,
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true,
-    )
-
-    val syncDataChapters: MutableStateFlow<Boolean> by BooleanSetting(
-        protoNumber = 91,
-        defaultValue = true,
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true,
-    )
-
-    val syncDataTracking: MutableStateFlow<Boolean> by BooleanSetting(
-        protoNumber = 92,
-        defaultValue = true,
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true,
-    )
-
-    val syncDataHistory: MutableStateFlow<Boolean> by BooleanSetting(
-        protoNumber = 93,
-        defaultValue = true,
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true,
-    )
-
-    val syncDataCategories: MutableStateFlow<Boolean> by BooleanSetting(
-        protoNumber = 94,
-        defaultValue = true,
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true,
-    )
-
-    val syncInterval: MutableStateFlow<Duration> by DurationSetting(
-        protoNumber = 95,
-        defaultValue = 0.seconds,
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true,
-    )
-
-    val opdsSkipChapterMetadataFeed: MutableStateFlow<Boolean> by BooleanSetting(
-        protoNumber = 96,
-        group = SettingGroup.OPDS,
-        privacySafe = true,
-        defaultValue = false,
-        description = "Skips the metadata feed and provides download/stream links directly in the chapter list. Improves compatibility with KOReader auto-downloader. KoSync strategies are applied, but PROMPT conflicts are ignored (treating local progress as priority)."
-    )
-
-    val extensionStores: MutableStateFlow<List<String>> by ListSetting<String>(
-        protoNumber = 97,
-        group = SettingGroup.EXTENSION,
-        privacySafe = true,
-        defaultValue = emptyList(),
-        requiresRestart = true,
-        itemValidator = { url ->
-            if (url.isNotEmpty()) {
-                null
-            } else {
-                "Invalid store URL format"
-            }
-        },
-        itemToValidValue = { url ->
-            url.ifEmpty { null }
-        },
-        typeInfo =
-            SettingsRegistry.PartialTypeInfo(
-                specificType = "List<String>",
-            ),
-        description = "List of extension store index URLs",
-    )
 
     /** ****************************************************************** **/
     /**                                                                    **/
@@ -1180,7 +1061,18 @@ class ServerConfig(
         flow: Flow<T>,
         onChange: suspend (value: T) -> Unit,
         ignoreInitialValue: Boolean = true,
-    ) = subscribeTo(flow, ignoreInitialValue, onChange)
+    ) {
+        val actualFlow =
+            if (ignoreInitialValue) {
+                flow.drop(1)
+            } else {
+                flow
+            }
+
+        val sharedFlow = MutableSharedFlow<T>(extraBufferCapacity = 1, onBufferOverflow = BufferOverflow.DROP_OLDEST)
+        actualFlow.distinctUntilChanged().mapLatest { sharedFlow.emit(it) }.launchIn(mutableConfigValueScope)
+        sharedFlow.onEach { onChange(it) }.launchIn(mutableConfigValueScope)
+    }
 
     fun <T> subscribeTo(
         flow: Flow<T>,

server/server-config/src/main/kotlin/suwayomi/tachidesk/server/settings/SettingGroup.kt

@@ -17,8 +17,6 @@ enum class SettingGroup(
     CLOUDFLARE("Cloudflare"),
     OPDS("OPDS"),
     KOREADER_SYNC("KOReader sync"),
-    WEB_VIEW("WebView"),
-    SYNCYOMI("SyncYomi")
     ;
 
     override fun toString(): String = value

server/server-config/src/main/kotlin/suwayomi/tachidesk/server/settings/SettingsRegistry.kt

@@ -2,6 +2,7 @@ package suwayomi.tachidesk.server.settings
 
 import com.typesafe.config.ConfigValue
 import com.typesafe.config.parser.ConfigDocument
+import kotlin.collections.find
 import kotlin.reflect.KClass
 
 /**
@@ -88,6 +89,4 @@ object SettingsRegistry {
     fun get(name: String): SettingMetadata? = settings[name]
 
     fun getAll(): Map<String, SettingMetadata> = settings.toMap()
-
-    fun clear() = settings.clear()
 }

server/src/main/kotlin/eu/kanade/tachiyomi/AppModule.kt

@@ -71,7 +71,7 @@ fun createAppModule(app: Application): Module {
             }
         }
 
-        single<ProtoBuf> {
+        single {
             ProtoBuf
         }
     }

server/src/main/kotlin/eu/kanade/tachiyomi/network/HttpException.kt

@@ -1,15 +0,0 @@
-package eu.kanade.tachiyomi.network
-
-import okhttp3.Response
-
-/**
- * Exception that handles HTTP codes considered not successful by OkHttp.
- * Use it to have a standardized error message in the app across the extensions.
- *
- * @see Response.isSuccessful
- * @since tachiyomix 1.6
- * @param code [Int] the HTTP status code
- */
-class HttpException(
-    val code: Int,
-) : IllegalStateException("HTTP error $code")

server/src/main/kotlin/eu/kanade/tachiyomi/network/JavaScriptEngine.kt

@@ -2,25 +2,26 @@ package eu.kanade.tachiyomi.network
 
 import android.content.Context
 import app.cash.quickjs.QuickJs
-import eu.kanade.tachiyomi.util.lang.withIOContext
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 
 /**
  * Util for evaluating JavaScript in sources.
  */
-@Suppress("UNUSED", "UNCHECKED_CAST")
 class JavaScriptEngine(
-    context: Context,
+    @Suppress("UNUSED_PARAMETER") context: Context,
 ) {
     /**
      * Evaluate arbitrary JavaScript code and get the result as a primitive type
      * (e.g., String, Int).
      *
-     * @since tachiyomix 1.4
+     * @since extensions-lib 1.4
      * @param script JavaScript to execute.
      * @return Result of JavaScript code as a primitive type.
      */
+    @Suppress("UNUSED", "UNCHECKED_CAST")
     suspend fun <T> evaluate(script: String): T =
-        withIOContext {
+        withContext(Dispatchers.IO) {
             QuickJs.create().use {
                 it.evaluate(script) as T
             }

server/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt

@@ -9,6 +9,7 @@ package eu.kanade.tachiyomi.network
 
 import android.content.Context
 import eu.kanade.tachiyomi.network.interceptor.CloudflareInterceptor
+import eu.kanade.tachiyomi.network.interceptor.IgnoreGzipInterceptor
 import eu.kanade.tachiyomi.network.interceptor.UncaughtExceptionInterceptor
 import eu.kanade.tachiyomi.network.interceptor.UserAgentInterceptor
 import io.github.oshai.kotlinlogging.KotlinLogging
@@ -21,8 +22,9 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import okhttp3.Cache
 import okhttp3.OkHttpClient
+import okhttp3.brotli.BrotliInterceptor
 import okhttp3.logging.HttpLoggingInterceptor
-import suwayomi.tachidesk.manga.impl.util.source.GetSource
+import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource
 import java.net.CookieHandler
 import java.net.CookieManager
 import java.net.CookiePolicy
@@ -62,7 +64,7 @@ class NetworkHelper(
         userAgent
             .drop(1)
             .onEach {
-                GetSource.unregisterAllSources() // need to reset the headers
+                GetCatalogueSource.unregisterAllCatalogueSources() // need to reset the headers
             }.launchIn(GlobalScope)
     }
 
@@ -82,6 +84,8 @@ class NetworkHelper(
                         ),
                     ).addInterceptor(UncaughtExceptionInterceptor())
                     .addInterceptor(UserAgentInterceptor(::defaultUserAgentProvider))
+                    .addNetworkInterceptor(IgnoreGzipInterceptor())
+                    .addNetworkInterceptor(BrotliInterceptor)
 
             // if (preferences.verboseLogging().get()) {
             val httpLoggingInterceptor =
@@ -124,7 +128,5 @@ class NetworkHelper(
 //    val client by lazy { baseClientBuilder.cache(Cache(cacheDir, cacheSize)).build() }
     val client by lazy { baseClientBuilder.build() }
 
-    @Deprecated("The regular client handles Cloudflare by default")
-    @Suppress("UNUSED")
     val cloudflareClient by lazy { client }
 }

server/src/main/kotlin/eu/kanade/tachiyomi/network/OkHttpExtensions.kt

@@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.network
 
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.serialization.DeserializationStrategy
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.okio.decodeFromBufferedSource
 import kotlinx.serialization.serializer
@@ -15,14 +16,11 @@ import rx.Observable
 import rx.Producer
 import rx.Subscription
 import java.io.IOException
-import kotlin.concurrent.atomics.AtomicBoolean
+import java.util.concurrent.atomic.AtomicBoolean
-import kotlin.concurrent.atomics.ExperimentalAtomicApi
 import kotlin.coroutines.resumeWithException
 
 val jsonMime = "application/json; charset=utf-8".toMediaType()
 
-@OptIn(ExperimentalAtomicApi::class)
-@Deprecated("Use suspend APIs instead")
 fun Call.asObservable(): Observable<Response> {
     return Observable.unsafeCreate { subscriber ->
         // Since Call is a one-shot type, clone it for each new subscriber.
@@ -30,11 +28,9 @@ fun Call.asObservable(): Observable<Response> {
 
         // Wrap the call in a helper which handles both unsubscription and backpressure.
         val requestArbiter =
-            object : Producer, Subscription {
+            object : AtomicBoolean(), Producer, Subscription {
-                val boolean = AtomicBoolean(false)
-
                 override fun request(n: Long) {
-                    if (n == 0L || !boolean.compareAndSet(expectedValue = false, newValue = true)) return
+                    if (n == 0L || !compareAndSet(false, true)) return
 
                     try {
                         val response = call.execute()
@@ -42,15 +38,15 @@ fun Call.asObservable(): Observable<Response> {
                             subscriber.onNext(response)
                             subscriber.onCompleted()
                         }
-                    } catch (e: Exception) {
+                    } catch (error: Exception) {
                         if (!subscriber.isUnsubscribed) {
-                            subscriber.onError(e)
+                            subscriber.onError(error)
                         }
                     }
                 }
 
                 override fun unsubscribe() {
-                    call.cancel()
+                    // call.cancel()
                 }
 
                 override fun isUnsubscribed(): Boolean = call.isCanceled()
@@ -61,50 +57,50 @@ fun Call.asObservable(): Observable<Response> {
     }
 }
 
-@Deprecated("Use suspend APIs instead")
+fun Call.asObservableSuccess(): Observable<Response> =
-fun Call.asObservableSuccess(): Observable<Response> {
+    asObservable()
-    @Suppress("DEPRECATION")
+        .doOnNext { response ->
-    return asObservable().doOnNext { response ->
+            if (!response.isSuccessful) {
-        if (!response.isSuccessful) {
+                response.close()
-            response.close()
+                throw HttpException(response.code)
-            throw HttpException(response.code)
-        }
-    }
-}
-
-// Based on https://github.com/square/okhttp/blob/master/okhttp-coroutines/src/main/kotlin/okhttp3/coroutines/ExecuteAsync.kt
-// and https://github.com/gildor/kotlin-coroutines-okhttp
-private suspend fun Call.await(callStack: Array<StackTraceElement>): Response {
-    return suspendCancellableCoroutine { continuation ->
-        continuation.invokeOnCancellation {
-            try {
-                this.cancel()
-            } catch (_: Throwable) {
-                // ignore
             }
         }
 
-        this.enqueue(
+// Based on https://github.com/gildor/kotlin-coroutines-okhttp
+private suspend fun Call.await(callStack: Array<StackTraceElement>): Response {
+    return suspendCancellableCoroutine { continuation ->
+        val callback =
             object : Callback {
-                override fun onFailure(
-                    call: Call,
-                    e: IOException,
-                ) {
-                    if (continuation.isCancelled) return
-                    val exception = IOException(e.message, e).apply { stackTrace = callStack }
-                    continuation.resumeWithException(exception)
-                }
-
                 override fun onResponse(
                     call: Call,
                     response: Response,
                 ) {
-                    continuation.resume(response) { _, value, _ ->
+                    continuation.resume(response) { _, resourceToClose, _ ->
-                        value.close()
+                        response.body.close()
+                        resourceToClose.close()
                     }
                 }
-            },
+
-        )
+                override fun onFailure(
+                    call: Call,
+                    e: IOException,
+                ) {
+                    // Don't bother with resuming the continuation if it is already cancelled.
+                    if (continuation.isCancelled) return
+                    val exception = IOException(e.message, e).apply { stackTrace = callStack }
+                    continuation.resumeWithException(exception)
+                }
+            }
+
+        enqueue(callback)
+
+        continuation.invokeOnCancellation {
+            try {
+                cancel()
+            } catch (ex: Throwable) {
+                // Ignore cancel exception
+            }
+        }
     }
 }
 
@@ -114,7 +110,7 @@ suspend fun Call.await(): Response {
 }
 
 /**
- * Similar to [await] but throws [HttpException] if [Response.isSuccessful] returns false
+ * @since extensions-lib 1.5
  */
 suspend fun Call.awaitSuccess(): Response {
     val callStack = Exception().stackTrace.run { copyOfRange(1, size) }
@@ -144,14 +140,19 @@ fun OkHttpClient.newCachelessCallWithProgress(
     return progressClient.newCall(request)
 }
 
-context(_: Json)
+context(Json)
 inline fun <reified T> Response.parseAs(): T = decodeFromJsonResponse(serializer(), this)
 
-context(json: Json)
+@OptIn(ExperimentalSerializationApi::class)
+context(Json)
 fun <T> decodeFromJsonResponse(
     deserializer: DeserializationStrategy<T>,
     response: Response,
 ): T =
     response.body.source().use {
-        json.decodeFromBufferedSource(deserializer, it)
+        decodeFromBufferedSource(deserializer, it)
     }
+
+class HttpException(
+    val code: Int,
+) : IllegalStateException("HTTP error $code")

server/src/main/kotlin/eu/kanade/tachiyomi/network/ProgressResponseBody.kt

@@ -35,11 +35,7 @@ class ProgressResponseBody(
                 val bytesRead = super.read(sink, byteCount)
                 // read() returns the number of bytes read, or -1 if this source is exhausted.
                 totalBytesRead += if (bytesRead != -1L) bytesRead else 0
-                progressListener.update(
+                progressListener.update(totalBytesRead, responseBody.contentLength(), bytesRead == -1L)
-                    totalBytesRead,
-                    responseBody.contentLength(),
-                    bytesRead == -1L,
-                )
                 return bytesRead
             }
         }

server/src/main/kotlin/eu/kanade/tachiyomi/network/Requests.kt

@@ -6,7 +6,6 @@ import okhttp3.CacheControl
 import okhttp3.FormBody
 import okhttp3.Headers
 import okhttp3.HttpUrl
-import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Request
 import okhttp3.RequestBody
 import java.util.concurrent.TimeUnit.MINUTES
@@ -19,7 +18,13 @@ fun GET(
     url: String,
     headers: Headers = DEFAULT_HEADERS,
     cache: CacheControl = DEFAULT_CACHE_CONTROL,
-): Request = GET(url.toHttpUrl(), headers, cache)
+): Request =
+    Request
+        .Builder()
+        .url(url)
+        .headers(headers)
+        .cacheControl(cache)
+        .build()
 
 /**
  * @since extensions-lib 1.4

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,12 +205,9 @@ object CFClearance {
                                             session = serverConfig.flareSolverrSessionName.value,
                                             sessionTtlMinutes = serverConfig.flareSolverrSessionTtl.value,
                                             cookies =
-                                                network.cookieStore
+                                                network.cookieStore.get(originalRequest.url).map {
-                                                    .get(originalRequest.url)
+                                                    FlareSolverCookie(it.name, it.value)
-                                                    .filter { it.name !in CloudflareInterceptor.COOKIE_NAMES }
+                                                },
-                                                    .map { cookie ->
-                                                        FlareSolverCookie(cookie.name, cookie.value)
-                                                    },
                                             returnOnlyCookies = onlyCookies,
                                             maxTimeout = timeout.inWholeMilliseconds.toInt(),
                                             postData =

server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/IgnoreGzipInterceptor.kt

@@ -0,0 +1,21 @@
+package eu.kanade.tachiyomi.network.interceptor
+
+import okhttp3.Interceptor
+import okhttp3.Response
+
+/**
+ * To use [okhttp3.brotli.BrotliInterceptor] as a network interceptor,
+ * add [IgnoreGzipInterceptor] right before it.
+ *
+ * This nullifies the transparent gzip of [okhttp3.internal.http.BridgeInterceptor]
+ * so gzip and Brotli are explicitly handled by the [okhttp3.brotli.BrotliInterceptor].
+ */
+class IgnoreGzipInterceptor : Interceptor {
+    override fun intercept(chain: Interceptor.Chain): Response {
+        var request = chain.request()
+        if (request.header("Accept-Encoding") == "gzip") {
+            request = request.newBuilder().removeHeader("Accept-Encoding").build()
+        }
+        return chain.proceed(request)
+    }
+}

server/src/main/kotlin/eu/kanade/tachiyomi/source/CatalogueSource.kt

@@ -2,12 +2,6 @@ package eu.kanade.tachiyomi.source
 
 import eu.kanade.tachiyomi.source.model.FilterList
 import eu.kanade.tachiyomi.source.model.MangasPage
-import eu.kanade.tachiyomi.source.model.Page
-import eu.kanade.tachiyomi.source.model.SChapter
-import eu.kanade.tachiyomi.source.model.SManga
-import eu.kanade.tachiyomi.source.model.SMangaUpdate
-import kotlinx.coroutines.async
-import kotlinx.coroutines.supervisorScope
 import rx.Observable
 import suwayomi.tachidesk.manga.impl.util.lang.awaitSingle
 
@@ -17,62 +11,68 @@ interface CatalogueSource : Source {
      */
     override val lang: String
 
-    @Suppress("DEPRECATION")
+    /**
-    override suspend fun getPopularManga(page: Int): MangasPage = fetchPopularManga(page).awaitSingle()
+     * Whether the source has support for latest updates.
+     */
+    val supportsLatest: Boolean
 
+    /**
+     * Get a page with a list of manga.
+     *
+     * @since extensions-lib 1.5
+     * @param page the page number to retrieve.
+     */
     @Suppress("DEPRECATION")
-    override suspend fun getLatestUpdates(page: Int): MangasPage = fetchLatestUpdates(page).awaitSingle()
+    suspend fun getPopularManga(page: Int): MangasPage = fetchPopularManga(page).awaitSingle()
 
+    /**
+     * Get a page with a list of manga.
+     *
+     * @since extensions-lib 1.5
+     * @param page the page number to retrieve.
+     * @param query the search query.
+     * @param filters the list of filters to apply.
+     */
     @Suppress("DEPRECATION")
-    override suspend fun getSearchManga(
+    suspend fun getSearchManga(
         page: Int,
         query: String,
         filters: FilterList,
     ): MangasPage = fetchSearchManga(page, query, filters).awaitSingle()
 
-    @Suppress("DEPRECATION")
-    override suspend fun getMangaUpdate(
-        manga: SManga,
-        chapters: List<SChapter>,
-        fetchDetails: Boolean,
-        fetchChapters: Boolean,
-    ): SMangaUpdate =
-        supervisorScope {
-            val asyncManga = if (fetchDetails) async { fetchMangaDetails(manga).awaitSingle() } else null
-            val asyncChapters = if (fetchChapters) async { fetchChapterList(manga).awaitSingle() } else null
-            SMangaUpdate(asyncManga?.await() ?: manga, asyncChapters?.await() ?: chapters)
-        }
-
-    @Suppress("DEPRECATION")
-    override suspend fun getPageList(chapter: SChapter): List<Page> = fetchPageList(chapter).awaitSingle()
-
     /**
-     * Returns an observable containing a page with a list of manga.
+     * Get a page with a list of latest manga updates.
      *
+     * @since extensions-lib 1.5
      * @param page the page number to retrieve.
      */
-    @Deprecated("Use the suspend API instead", ReplaceWith("getPopularManga"))
+    @Suppress("DEPRECATION")
-    fun fetchPopularManga(page: Int): Observable<MangasPage> = throw UnsupportedOperationException()
+    suspend fun getLatestUpdates(page: Int): MangasPage = fetchLatestUpdates(page).awaitSingle()
 
     /**
-     * Returns an observable containing a page with a list of manga.
+     * Returns the list of filters for the source.
-     *
-     * @param page the page number to retrieve.
-     * @param query the search query.
-     * @param filters the list of filters to apply.
      */
-    @Deprecated("Use the suspend API instead", ReplaceWith("getSearchManga"))
+    fun getFilterList(): FilterList
+
+    @Deprecated(
+        "Use the non-RxJava API instead",
+        ReplaceWith("getPopularManga"),
+    )
+    fun fetchPopularManga(page: Int): Observable<MangasPage> = throw IllegalStateException("Not used")
+
+    @Deprecated(
+        "Use the non-RxJava API instead",
+        ReplaceWith("getSearchManga"),
+    )
     fun fetchSearchManga(
         page: Int,
         query: String,
         filters: FilterList,
-    ): Observable<MangasPage> = throw UnsupportedOperationException()
+    ): Observable<MangasPage> = throw IllegalStateException("Not used")
 
-    /**
+    @Deprecated(
-     * Returns an observable containing a page with a list of latest manga updates.
+        "Use the non-RxJava API instead",
-     *
+        ReplaceWith("getLatestUpdates"),
-     * @param page the page number to retrieve.
+    )
-     */
+    fun fetchLatestUpdates(page: Int): Observable<MangasPage> = throw IllegalStateException("Not used")
-    @Deprecated("Use the suspend API instead", ReplaceWith("getLatestUpdates"))
-    fun fetchLatestUpdates(page: Int): Observable<MangasPage> = throw UnsupportedOperationException()
 }

server/src/main/kotlin/eu/kanade/tachiyomi/source/PreferenceScreen.kt

@@ -1,4 +0,0 @@
-package eu.kanade.tachiyomi.source
-
-@Suppress("unused")
-typealias PreferenceScreen = androidx.preference.PreferenceScreen

server/src/main/kotlin/eu/kanade/tachiyomi/source/Source.kt

@@ -1,12 +1,10 @@
 package eu.kanade.tachiyomi.source
 
-import eu.kanade.tachiyomi.source.model.FilterList
-import eu.kanade.tachiyomi.source.model.MangasPage
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
-import eu.kanade.tachiyomi.source.model.SMangaUpdate
 import rx.Observable
+import suwayomi.tachidesk.manga.impl.util.lang.awaitSingle
 
 /**
  * A basic interface for creating a source. It could be an online source, a local source, etc.
@@ -26,86 +24,53 @@ interface Source {
         get() = ""
 
     /**
-     * Whether the source has support for latest updates.
+     * Get the updated details for a manga.
+     *
+     * @since extensions-lib 1.5
+     * @param manga the manga to update.
+     * @return the updated manga.
      */
-    val supportsLatest: Boolean
+    @Suppress("DEPRECATION")
+    suspend fun getMangaDetails(manga: SManga): SManga = fetchMangaDetails(manga).awaitSingle()
 
     /**
-     * Returns the list of filters for the source.
+     * Get all the available chapters for a manga.
+     *
+     * @since extensions-lib 1.5
+     * @param manga the manga to update.
+     * @return the chapters for the manga.
      */
-    fun getFilterList(): FilterList = FilterList()
+    @Suppress("DEPRECATION")
-
+    suspend fun getChapterList(manga: SManga): List<SChapter> = fetchChapterList(manga).awaitSingle()
-    /**
-     * Get a page with a list of manga.
-     *
-     * @since tachiyomix 1.6
-     * @param page the page number to retrieve.
-     */
-    suspend fun getPopularManga(page: Int): MangasPage
-
-    /**
-     * Get a page with a list of latest manga updates.
-     *
-     * @since tachiyomix 1.6
-     * @param page the page number to retrieve.
-     */
-    suspend fun getLatestUpdates(page: Int): MangasPage
-
-    /**
-     * Get a page with a list of manga.
-     *
-     * @since tachiyomix 1.6
-     * @param page the page number to retrieve.
-     * @param query the search query.
-     * @param filters the list of filters to apply.
-     */
-    suspend fun getSearchManga(
-        page: Int,
-        query: String,
-        filters: FilterList,
-    ): MangasPage
-
-    /**
-     * Fetches updated information for a manga.
-     *
-     * Depending on the provided flags or source availability, this may include
-     * updated manga metadata, available chapters, or both.
-     *
-     * If a value is not requested, the existing provided value can be returned as-is.
-     * The host app may apply any returned updates regardless of the flags,
-     * so care should be taken to only return accurate and intentional changes.
-     *
-     * @since tachiyomix 1.6
-     * @param manga The manga to fetch updates for.
-     * @param chapters Existing chapters of the manga
-     * @param fetchDetails Whether to fetch updated manga details.
-     * @param fetchChapters Whether to fetch available chapters.
-     */
-    suspend fun getMangaUpdate(
-        manga: SManga,
-        chapters: List<SChapter>,
-        fetchDetails: Boolean,
-        fetchChapters: Boolean,
-    ): SMangaUpdate
 
     /**
      * Get the list of pages a chapter has. Pages should be returned
      * in the expected order; the index is ignored.
      *
-     * @since tachiyomix 1.6
+     * @since extensions-lib 1.5
      * @param chapter the chapter.
      * @return the pages for the chapter.
      */
-    suspend fun getPageList(chapter: SChapter): List<Page>
+    @Suppress("DEPRECATION")
+    suspend fun getPageList(chapter: SChapter): List<Page> = fetchPageList(chapter).awaitSingle()
 
-    @Deprecated("Use the combined suspend API instead", ReplaceWith("getMangaUpdate"))
+    @Deprecated(
-    fun fetchMangaDetails(manga: SManga): Observable<SManga> = throw UnsupportedOperationException()
+        "Use the non-RxJava API instead",
+        ReplaceWith("getMangaDetails"),
+    )
+    fun fetchMangaDetails(manga: SManga): Observable<SManga> = throw IllegalStateException("Not used")
 
-    @Deprecated("Use the combined suspend API instead", ReplaceWith("getMangaUpdate"))
+    @Deprecated(
-    fun fetchChapterList(manga: SManga): Observable<List<SChapter>> = throw UnsupportedOperationException()
+        "Use the non-RxJava API instead",
+        ReplaceWith("getChapterList"),
+    )
+    fun fetchChapterList(manga: SManga): Observable<List<SChapter>> = throw IllegalStateException("Not used")
 
-    @Deprecated("Use the suspend API instead", ReplaceWith("getPageList"))
+    @Deprecated(
-    fun fetchPageList(chapter: SChapter): Observable<List<Page>> = throw UnsupportedOperationException()
+        "Use the non-RxJava API instead",
+        ReplaceWith("getPageList"),
+    )
+    fun fetchPageList(chapter: SChapter): Observable<List<Page>> = throw IllegalStateException("Not used")
 }
 
 // fun Source.icon(): Drawable? = Injekt.get<ExtensionManager>().getAppIconForSource(this)

server/src/main/kotlin/eu/kanade/tachiyomi/source/local/LocalSource.kt

@@ -23,15 +23,12 @@ import eu.kanade.tachiyomi.source.model.MangasPage
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
-import eu.kanade.tachiyomi.source.model.SMangaUpdate
 import eu.kanade.tachiyomi.util.chapter.ChapterRecognition
 import eu.kanade.tachiyomi.util.lang.compareToCaseInsensitiveNaturalOrder
 import eu.kanade.tachiyomi.util.storage.EpubFile
 import io.github.oshai.kotlinlogging.KotlinLogging
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
 import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.supervisorScope
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromStream
@@ -39,12 +36,11 @@ import nl.adaptivity.xmlutil.ExperimentalXmlUtilApi
 import nl.adaptivity.xmlutil.core.KtXmlReader
 import nl.adaptivity.xmlutil.serialization.XML
 import org.apache.commons.compress.archivers.zip.ZipFile
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.insert
-import org.jetbrains.exposed.v1.jdbc.insert
+import org.jetbrains.exposed.sql.insertAndGetId
-import org.jetbrains.exposed.v1.jdbc.insertAndGetId
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource.registerCatalogueSource
-import suwayomi.tachidesk.manga.impl.util.source.GetSource.registerSource
 import suwayomi.tachidesk.manga.impl.util.storage.ImageUtil
 import suwayomi.tachidesk.manga.model.table.ExtensionTable
 import suwayomi.tachidesk.manga.model.table.SourceTable
@@ -170,20 +166,8 @@ class LocalSource(
         return MangasPage(mangas.toList(), false)
     }
 
-    override suspend fun getMangaUpdate(
-        manga: SManga,
-        chapters: List<SChapter>,
-        fetchDetails: Boolean,
-        fetchChapters: Boolean,
-    ): SMangaUpdate =
-        supervisorScope {
-            val asyncManga = if (fetchDetails) async { getMangaDetails(manga) } else null
-            val asyncChapters = if (fetchChapters) async { getChapterList(manga) } else null
-            SMangaUpdate(asyncManga?.await() ?: manga, asyncChapters?.await() ?: chapters)
-        }
-
     // Manga details related
-    private suspend fun getMangaDetails(manga: SManga): SManga =
+    override suspend fun getMangaDetails(manga: SManga): SManga =
         withContext(Dispatchers.IO) {
             coverManager.find(manga.url)?.let {
                 manga.thumbnail_url = it.absolutePath
@@ -304,7 +288,7 @@ class LocalSource(
     }
 
     // Chapters
-    private suspend fun getChapterList(manga: SManga): List<SChapter> =
+    override suspend fun getChapterList(manga: SManga): List<SChapter> =
         fileSystem
             .getFilesInMangaDirectory(manga.url)
             // Only keep supported formats
@@ -482,8 +466,7 @@ class LocalSource(
                             it[versionName] = "1.2"
                             it[versionCode] = 0
                             it[lang] = LANG
-                            it[extensionLib] = "1.2"
+                            it[isNsfw] = false
-                            it[contentWarning] = 0
                             it[isInstalled] = true
                         }
 
@@ -492,12 +475,13 @@ class LocalSource(
                         it[name] = NAME
                         it[lang] = LANG
                         it[extension] = extensionId
+                        it[isNsfw] = false
                     }
                 }
             }
 
             val fs = LocalSourceFileSystem(applicationDirs)
-            registerSource(ID to LocalSource(fs, LocalCoverManager(fs)))
+            registerCatalogueSource(ID to LocalSource(fs, LocalCoverManager(fs)))
         }
     }
 }

server/src/main/kotlin/eu/kanade/tachiyomi/source/model/MangasPage.kt

@@ -1,22 +1,6 @@
 package eu.kanade.tachiyomi.source.model
 
-class MangasPage(
+data class MangasPage(
     val mangas: List<SManga>,
     val hasNextPage: Boolean,
-) {
+)
-    @Deprecated("MangasPage is now a regular class")
-    operator fun component1(): List<SManga> = mangas
-
-    @Deprecated("MangasPage is now a regular class")
-    operator fun component2(): Boolean = hasNextPage
-
-    @Deprecated("MangasPage is now a regular class")
-    fun copy(
-        mangas: List<SManga> = this.mangas,
-        hasNextPage: Boolean = this.hasNextPage,
-    ): MangasPage =
-        MangasPage(
-            mangas = mangas,
-            hasNextPage = hasNextPage,
-        )
-}

server/src/main/kotlin/eu/kanade/tachiyomi/source/model/Page.kt

@@ -27,4 +27,12 @@ open class Page(
                 -1
             }
     }
+
+    companion object {
+        const val QUEUE = 0
+        const val LOAD_PAGE = 1
+        const val DOWNLOAD_IMAGE = 2
+        const val READY = 3
+        const val ERROR = 4
+    }
 }

server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SChapter.kt

@@ -2,7 +2,6 @@
 
 package eu.kanade.tachiyomi.source.model
 
-import kotlinx.serialization.json.JsonObject
 import java.io.Serializable
 
 interface SChapter : Serializable {
@@ -10,25 +9,12 @@ interface SChapter : Serializable {
 
     var name: String
 
+    var date_upload: Long
+
     var chapter_number: Float
 
     var scanlator: String?
 
-    var date_upload: Long
-
-    /**
-     * Extra metadata associated with the chapter.
-     *
-     * The JSON object is not visible to users and intended for internal or source-specific
-     * purposes. Apps may define their own namespaced keys (e.g., `"mihon.*"`) for sources to populate.
-     *
-     * This allows apps to attach and ask for custom information without affecting the visible
-     * chapter data.
-     *
-     * @since tachiyomix 1.6
-     */
-    var memo: JsonObject
-
     fun copyFrom(other: SChapter) {
         name = other.name
         url = other.url

server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SChapterImpl.kt

@@ -2,19 +2,14 @@
 
 package eu.kanade.tachiyomi.source.model
 
-import kotlinx.serialization.json.JsonObject
-import suwayomi.tachidesk.manga.impl.util.lang.EMPTY
-
 class SChapterImpl : SChapter {
     override lateinit var url: String
 
     override lateinit var name: String
 
+    override var date_upload: Long = 0
+
     override var chapter_number: Float = -1f
 
     override var scanlator: String? = null
-
-    override var date_upload: Long = 0
-
-    override var memo: JsonObject = JsonObject.EMPTY
 }

server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SManga.kt

@@ -2,7 +2,6 @@
 
 package eu.kanade.tachiyomi.source.model
 
-import kotlinx.serialization.json.JsonObject
 import java.io.Serializable
 
 interface SManga : Serializable {
@@ -10,58 +9,22 @@ interface SManga : Serializable {
 
     var title: String
 
-    var thumbnail_url: String?
-
     var artist: String?
 
     var author: String?
 
-    var status: Int
-
     var description: String?
 
     var genre: String?
 
+    var status: Int
+
+    var thumbnail_url: String?
+
     var update_strategy: UpdateStrategy
 
     var initialized: Boolean
 
-    /**
-     * Extra metadata associated with the manga.
-     *
-     * The JSON object is not visible to users and intended for internal or source-specific
-     * purposes. Apps may define their own namespaced keys (e.g., `"mihon.*"`) for sources to populate.
-     *
-     * This allows apps to attach and ask for custom information without affecting the visible
-     * manga data.
-     *
-     * @since tachiyomix 1.6
-     */
-    var memo: JsonObject
-
-    fun getGenres(): List<String>? {
-        if (genre.isNullOrBlank()) return null
-        return genre
-            ?.split(", ")
-            ?.map { it.trim() }
-            ?.filterNot { it.isBlank() }
-            ?.distinct()
-    }
-
-    fun copy() =
-        create().also {
-            it.url = url
-            it.title = title
-            it.artist = artist
-            it.author = author
-            it.description = description
-            it.genre = genre
-            it.status = status
-            it.thumbnail_url = thumbnail_url
-            it.update_strategy = update_strategy
-            it.initialized = initialized
-        }
-
     companion object {
         const val UNKNOWN = 0
         const val ONGOING = 1
@@ -74,3 +37,30 @@ interface SManga : Serializable {
         fun create(): SManga = SMangaImpl()
     }
 }
+
+// fun SManga.toMangaInfo(): MangaInfo {
+//    return MangaInfo(
+//        key = this.url,
+//        title = this.title,
+//        artist = this.artist ?: "",
+//        author = this.author ?: "",
+//        description = this.description ?: "",
+//        genres = this.genre?.split(", ") ?: emptyList(),
+//        status = this.status,
+//        cover = this.thumbnail_url ?: ""
+//    )
+// }
+//
+// fun MangaInfo.toSManga(): SManga {
+//    val mangaInfo = this
+//    return SManga.create().apply {
+//        url = mangaInfo.key
+//        title = mangaInfo.title
+//        artist = mangaInfo.artist
+//        author = mangaInfo.author
+//        description = mangaInfo.description
+//        genre = mangaInfo.genres.joinToString(", ")
+//        status = mangaInfo.status
+//        thumbnail_url = mangaInfo.cover
+//    }
+// }

server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SMangaImpl.kt

@@ -2,29 +2,24 @@
 
 package eu.kanade.tachiyomi.source.model
 
-import kotlinx.serialization.json.JsonObject
-import suwayomi.tachidesk.manga.impl.util.lang.EMPTY
-
 class SMangaImpl : SManga {
     override lateinit var url: String
 
     override lateinit var title: String
 
-    override var thumbnail_url: String? = null
-
     override var artist: String? = null
 
     override var author: String? = null
 
-    override var status: Int = 0
-
     override var description: String? = null
 
     override var genre: String? = null
 
+    override var status: Int = 0
+
+    override var thumbnail_url: String? = null
+
     override var update_strategy: UpdateStrategy = UpdateStrategy.ALWAYS_UPDATE
 
     override var initialized: Boolean = false
-
-    override var memo: JsonObject = JsonObject.EMPTY
 }

server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SMangaUpdate.kt

@@ -1,7 +0,0 @@
-package eu.kanade.tachiyomi.source.model
-
-@Suppress("UNUSED")
-class SMangaUpdate(
-    val manga: SManga,
-    val chapters: List<SChapter>,
-)

server/src/main/kotlin/eu/kanade/tachiyomi/source/model/UpdateStrategy.kt

@@ -1,22 +1,6 @@
 package eu.kanade.tachiyomi.source.model
 
-/**
- * Define the update strategy for a single [SManga].
- * The strategy used will only take effect on the library update.
- *
- * @since extensions-lib 1.4
- */
 enum class UpdateStrategy {
-    /**
-     * Series marked as always update will be included in the library
-     * update if they aren't excluded by additional restrictions.
-     */
     ALWAYS_UPDATE,
-
-    /**
-     * Series marked as only fetch once will be automatically skipped
-     * during library updates. Useful for cases where the series is previously
-     * known to be finished and have only a single chapter, for example.
-     */
     ONLY_FETCH_ONCE,
 }

server/src/main/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt

@@ -25,6 +25,7 @@ import java.security.MessageDigest
 /**
  * A simple implementation for sources from a website.
  */
+@Suppress("unused")
 abstract class HttpSource : CatalogueSource {
     /**
      * Network service.
@@ -36,24 +37,11 @@ abstract class HttpSource : CatalogueSource {
      */
     abstract val baseUrl: String
 
-    /**
-     * Returns the base (home) URL of the website as a string.
-     *
-     * This is typically the root address that serves as the main entry point
-     * to the site's content, such as "https://mihon.tech".
-     *
-     * This method is used in the browse screen to determine the URL
-     * opened when tapping "Open in WebView".
-     *
-     * @return The website’s home page URL. Defaults to [baseUrl].
-     */
-    open fun getHomeUrl(): String = baseUrl
-
     /**
      * Version id used to generate the source id. If the site completely changes and urls are
      * incompatible, you may increase this value and it'll be considered as a new source.
      */
-    open val versionId: Int = 1
+    open val versionId = 1
 
     /**
      * ID of the source. By default it uses a generated id using the first 16 characters (64 bits)
@@ -65,7 +53,7 @@ abstract class HttpSource : CatalogueSource {
      *
      * Note: the generated ID sets the sign bit to `0`.
      */
-    override val id: Long by lazy { generateId(name, lang, versionId) }
+    override val id by lazy { generateId() }
 
     /**
      * Headers used for requests.
@@ -75,7 +63,10 @@ abstract class HttpSource : CatalogueSource {
     /**
      * Default network client for doing requests.
      */
-    open val client: OkHttpClient get() = network.client
+    open val client: OkHttpClient
+        get() = network.client
+
+    private fun generateId(): Long = generateId("${name.lowercase()}/$lang/$versionId")
 
     /**
      * Generates a unique ID for the source based on the provided [name], [lang] and
@@ -100,6 +91,10 @@ abstract class HttpSource : CatalogueSource {
         versionId: Int,
     ): Long {
         val key = "${name.lowercase()}/$lang/$versionId"
+        return generateId(key)
+    }
+
+    private fun generateId(key: String): Long {
         val bytes = MessageDigest.getInstance("MD5").digest(key.toByteArray())
         return (0..7).map { bytes[it].toLong() and 0xff shl 8 * (7 - it) }.reduce(Long::or) and Long.MAX_VALUE
     }
@@ -107,7 +102,7 @@ abstract class HttpSource : CatalogueSource {
     /**
      * Headers builder for requests. Implementations can override this method for custom headers.
      */
-    protected open fun headersBuilder(): Headers.Builder =
+    protected open fun headersBuilder() =
         Headers.Builder().apply {
             add("User-Agent", network.defaultUserAgentProvider())
         }
@@ -115,7 +110,7 @@ abstract class HttpSource : CatalogueSource {
     /**
      * Visible name of the source.
      */
-    override fun toString(): String = "$name (${lang.uppercase()})"
+    override fun toString() = "$name (${lang.uppercase()})"
 
     /**
      * Returns an observable containing a page with a list of manga. Normally it's not needed to
@@ -123,8 +118,7 @@ abstract class HttpSource : CatalogueSource {
      *
      * @param page the page number to retrieve.
      */
-    @Suppress("DEPRECATION")
+    @Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getPopularManga"))
-    @Deprecated("Use the suspend API instead", ReplaceWith("getPopularManga"))
     override fun fetchPopularManga(page: Int): Observable<MangasPage> =
         client
             .newCall(popularMangaRequest(page))
@@ -138,24 +132,14 @@ abstract class HttpSource : CatalogueSource {
      *
      * @param page the page number to retrieve.
      */
-    @Deprecated(
+    protected abstract fun popularMangaRequest(page: Int): Request
-        message =
-            "The helper functions are inherently limiting and hides the underlying implementation. " +
-                "Source developers should make their own implementation according to their needs.",
-    )
-    protected open fun popularMangaRequest(page: Int): Request = throw UnsupportedOperationException()
 
     /**
      * Parses the response from the site and returns a [MangasPage] object.
      *
      * @param response the response from the site.
      */
-    @Deprecated(
+    protected abstract fun popularMangaParse(response: Response): MangasPage
-        message =
-            "The helper functions are inherently limiting and hides the underlying implementation. " +
-                "Source developers should make their own implementation according to their needs.",
-    )
-    protected open fun popularMangaParse(response: Response): MangasPage = throw UnsupportedOperationException()
 
     /**
      * Returns an observable containing a page with a list of manga. Normally it's not needed to
@@ -165,17 +149,22 @@ abstract class HttpSource : CatalogueSource {
      * @param query the search query.
      * @param filters the list of filters to apply.
      */
-    @Suppress("DEPRECATION")
+    @Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getSearchManga"))
-    @Deprecated("Use the suspend API instead", ReplaceWith("getSearchManga"))
     override fun fetchSearchManga(
         page: Int,
         query: String,
         filters: FilterList,
     ): Observable<MangasPage> =
-        client
+        Observable
-            .newCall(searchMangaRequest(page, query, filters))
+            .defer {
-            .asObservableSuccess()
+                try {
-            .map { response ->
+                    client.newCall(searchMangaRequest(page, query, filters)).asObservableSuccess()
+                } catch (e: NoClassDefFoundError) {
+                    // RxJava doesn't handle Errors, which tends to happen during global searches
+                    // if an old extension using non-existent classes is still around
+                    throw RuntimeException(e)
+                }
+            }.map { response ->
                 searchMangaParse(response)
             }
 
@@ -186,36 +175,25 @@ abstract class HttpSource : CatalogueSource {
      * @param query the search query.
      * @param filters the list of filters to apply.
      */
-    @Deprecated(
+    protected abstract fun searchMangaRequest(
-        message =
-            "The helper functions are inherently limiting and hides the underlying implementation. " +
-                "Source developers should make their own implementation according to their needs.",
-    )
-    protected open fun searchMangaRequest(
         page: Int,
         query: String,
         filters: FilterList,
-    ): Request = throw UnsupportedOperationException()
+    ): Request
 
     /**
      * Parses the response from the site and returns a [MangasPage] object.
      *
      * @param response the response from the site.
      */
-    @Deprecated(
+    protected abstract fun searchMangaParse(response: Response): MangasPage
-        message =
-            "The helper functions are inherently limiting and hides the underlying implementation. " +
-                "Source developers should make their own implementation according to their needs.",
-    )
-    protected open fun searchMangaParse(response: Response): MangasPage = throw UnsupportedOperationException()
 
     /**
      * Returns an observable containing a page with a list of latest manga updates.
      *
      * @param page the page number to retrieve.
      */
-    @Suppress("DEPRECATION")
+    @Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getLatestUpdates"))
-    @Deprecated("Use the suspend API instead", ReplaceWith("getLatestUpdates"))
     override fun fetchLatestUpdates(page: Int): Observable<MangasPage> =
         client
             .newCall(latestUpdatesRequest(page))
@@ -229,33 +207,26 @@ abstract class HttpSource : CatalogueSource {
      *
      * @param page the page number to retrieve.
      */
-    @Deprecated(
+    protected abstract fun latestUpdatesRequest(page: Int): Request
-        message =
-            "The helper functions are inherently limiting and hides the underlying implementation. " +
-                "Source developers should make their own implementation according to their needs.",
-    )
-    protected open fun latestUpdatesRequest(page: Int): Request = throw UnsupportedOperationException()
 
     /**
      * Parses the response from the site and returns a [MangasPage] object.
      *
      * @param response the response from the site.
      */
-    @Deprecated(
+    protected abstract fun latestUpdatesParse(response: Response): MangasPage
-        message =
-            "The helper functions are inherently limiting and hides the underlying implementation. " +
-                "Source developers should make their own implementation according to their needs.",
-    )
-    protected open fun latestUpdatesParse(response: Response): MangasPage = throw UnsupportedOperationException()
 
     /**
-     * Returns an observable with the updated details for a manga. Normally it's not needed to
+     * Get the updated details for a manga.
-     * override this method.
+     * Normally it's not needed to override this method.
      *
-     * @param manga the manga to be updated.
+     * @param manga the manga to update.
+     * @return the updated manga.
      */
     @Suppress("DEPRECATION")
-    @Deprecated("Use the combined suspend API instead", replaceWith = ReplaceWith("getMangaUpdate"))
+    override suspend fun getMangaDetails(manga: SManga): SManga = fetchMangaDetails(manga).awaitSingle()
+
+    @Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getMangaDetails"))
     override fun fetchMangaDetails(manga: SManga): Observable<SManga> =
         client
             .newCall(mangaDetailsRequest(manga))
@@ -270,11 +241,6 @@ abstract class HttpSource : CatalogueSource {
      *
      * @param manga the manga to be updated.
      */
-    @Deprecated(
-        message =
-            "The helper functions are inherently limiting and hides the underlying implementation. " +
-                "Source developers should make their own implementation according to their needs.",
-    )
     open fun mangaDetailsRequest(manga: SManga): Request = GET(baseUrl + manga.url, headers)
 
     /**
@@ -282,28 +248,37 @@ abstract class HttpSource : CatalogueSource {
      *
      * @param response the response from the site.
      */
-    @Deprecated(
+    protected abstract fun mangaDetailsParse(response: Response): SManga
-        message =
-            "The helper functions are inherently limiting and hides the underlying implementation. " +
-                "Source developers should make their own implementation according to their needs.",
-    )
-    protected open fun mangaDetailsParse(response: Response): SManga = throw UnsupportedOperationException()
 
     /**
-     * Returns an observable with the updated chapter list for a manga. Normally it's not needed to
+     * Get all the available chapters for a manga.
-     * override this method.
+     * Normally it's not needed to override this method.
      *
-     * @param manga the manga to look for chapters.
+     * @param manga the manga to update.
+     * @return the chapters for the manga.
+     * @throws LicensedMangaChaptersException if a manga is licensed and therefore no chapters are available.
      */
     @Suppress("DEPRECATION")
-    @Deprecated("Use the combined suspend API instead", replaceWith = ReplaceWith("getMangaUpdate"))
+    override suspend fun getChapterList(manga: SManga): List<SChapter> {
+        if (manga.status == SManga.LICENSED) {
+            throw LicensedMangaChaptersException()
+        }
+
+        return fetchChapterList(manga).awaitSingle()
+    }
+
+    @Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getChapterList"))
     override fun fetchChapterList(manga: SManga): Observable<List<SChapter>> =
-        client
+        if (manga.status != SManga.LICENSED) {
-            .newCall(chapterListRequest(manga))
+            client
-            .asObservableSuccess()
+                .newCall(chapterListRequest(manga))
-            .map { response ->
+                .asObservableSuccess()
-                chapterListParse(response)
+                .map { response ->
-            }
+                    chapterListParse(response)
+                }
+        } else {
+            Observable.error(LicensedMangaChaptersException())
+        }
 
     /**
      * Returns the request for updating the chapter list. Override only if it's needed to override
@@ -311,11 +286,6 @@ abstract class HttpSource : CatalogueSource {
      *
      * @param manga the manga to look for chapters.
      */
-    @Deprecated(
-        message =
-            "The helper functions are inherently limiting and hides the underlying implementation. " +
-                "Source developers should make their own implementation according to their needs.",
-    )
     protected open fun chapterListRequest(manga: SManga): Request = GET(baseUrl + manga.url, headers)
 
     /**
@@ -323,20 +293,19 @@ abstract class HttpSource : CatalogueSource {
      *
      * @param response the response from the site.
      */
-    @Deprecated(
+    protected abstract fun chapterListParse(response: Response): List<SChapter>
-        message =
-            "The helper functions are inherently limiting and hides the underlying implementation. " +
-                "Source developers should make their own implementation according to their needs.",
-    )
-    protected open fun chapterListParse(response: Response): List<SChapter> = throw UnsupportedOperationException()
 
     /**
-     * Returns an observable with the page list for a chapter.
+     * Get the list of pages a chapter has. Pages should be returned
+     * in the expected order; the index is ignored.
      *
-     * @param chapter the chapter whose page list has to be fetched.
+     * @param chapter the chapter.
+     * @return the pages for the chapter.
      */
     @Suppress("DEPRECATION")
-    @Deprecated("Use the suspend API instead", ReplaceWith("getPageList"))
+    override suspend fun getPageList(chapter: SChapter): List<Page> = fetchPageList(chapter).awaitSingle()
+
+    @Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getPageList"))
     override fun fetchPageList(chapter: SChapter): Observable<List<Page>> =
         client
             .newCall(pageListRequest(chapter))
@@ -351,11 +320,6 @@ abstract class HttpSource : CatalogueSource {
      *
      * @param chapter the chapter whose page list has to be fetched.
      */
-    @Deprecated(
-        message =
-            "The helper functions are inherently limiting and hides the underlying implementation. " +
-                "Source developers should make their own implementation according to their needs.",
-    )
     protected open fun pageListRequest(chapter: SChapter): Request = GET(baseUrl + chapter.url, headers)
 
     /**
@@ -363,47 +327,31 @@ abstract class HttpSource : CatalogueSource {
      *
      * @param response the response from the site.
      */
-    @Deprecated(
+    protected abstract fun pageListParse(response: Response): List<Page>
-        message =
-            "The helper functions are inherently limiting and hides the underlying implementation. " +
-                "Source developers should make their own implementation according to their needs.",
-    )
-    protected open fun pageListParse(response: Response): List<Page> = throw UnsupportedOperationException()
 
     /**
      * Returns an observable with the page containing the source url of the image. If there's any
      * error, it will return null instead of throwing an exception.
      *
+     * @since extensions-lib 1.5
      * @param page the page whose source image has to be fetched.
      */
     @Suppress("DEPRECATION")
-    @Deprecated("Use the suspend API instead", ReplaceWith("getImageUrl"))
+    open suspend fun getImageUrl(page: Page): String = fetchImageUrl(page).awaitSingle()
+
+    @Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getImageUrl"))
     open fun fetchImageUrl(page: Page): Observable<String> =
         client
             .newCall(imageUrlRequest(page))
             .asObservableSuccess()
             .map { imageUrlParse(it) }
 
-    /**
-     * Returns the image url for the provided [page]. The function is only called if [Page.imageUrl] is null.
-     *
-     * @since tachiyomix 1.6
-     * @param page the page whose source image has to be fetched.
-     */
-    @Suppress("DEPRECATION")
-    open suspend fun getImageUrl(page: Page): String = fetchImageUrl(page).awaitSingle()
-
     /**
      * Returns the request for getting the url to the source image. Override only if it's needed to
      * override the url, send different headers or request method like POST.
      *
      * @param page the chapter whose page list has to be fetched
      */
-    @Deprecated(
-        message =
-            "The helper functions are inherently limiting and hides the underlying implementation. " +
-                "Source developers should make their own implementation according to their needs.",
-    )
     protected open fun imageUrlRequest(page: Page): Request = GET(page.url, headers)
 
     /**
@@ -411,14 +359,16 @@ abstract class HttpSource : CatalogueSource {
      *
      * @param response the response from the site.
      */
-    @Deprecated(
+    protected abstract fun imageUrlParse(response: Response): String
-        message =
-            "The helper functions are inherently limiting and hides the underlying implementation. " +
-                "Source developers should make their own implementation according to their needs.",
-    )
-    protected open fun imageUrlParse(response: Response): String = throw UnsupportedOperationException()
 
-    suspend fun getImage(page: Page): Response =
+    /**
+     * Returns the response of the source image.
+     * Typically does not need to be overridden.
+     *
+     * @since extensions-lib 1.5
+     * @param page the page whose source image has to be downloaded.
+     */
+    open suspend fun getImage(page: Page): Response =
         client
             .newCachelessCallWithProgress(imageRequest(page), page)
             .awaitSuccess()
@@ -437,7 +387,6 @@ abstract class HttpSource : CatalogueSource {
      *
      * @param url the full url to the chapter.
      */
-    @Suppress("Unused")
     fun SChapter.setUrlWithoutDomain(url: String) {
         this.url = getUrlWithoutDomain(url)
     }
@@ -448,7 +397,6 @@ abstract class HttpSource : CatalogueSource {
      *
      * @param url the full url to the manga.
      */
-    @Suppress("Unused")
     fun SManga.setUrlWithoutDomain(url: String) {
         this.url = getUrlWithoutDomain(url)
     }
@@ -469,7 +417,7 @@ abstract class HttpSource : CatalogueSource {
                 out += "#" + uri.fragment
             }
             out
-        } catch (_: URISyntaxException) {
+        } catch (e: URISyntaxException) {
             orig
         }
 
@@ -480,7 +428,6 @@ abstract class HttpSource : CatalogueSource {
      * @param manga the manga
      * @return url of the manga
      */
-    @Suppress("DEPRECATION")
     open fun getMangaUrl(manga: SManga): String = mangaDetailsRequest(manga).url.toString()
 
     /**
@@ -490,7 +437,6 @@ abstract class HttpSource : CatalogueSource {
      * @param chapter the chapter
      * @return url of the chapter
      */
-    @Suppress("DEPRECATION")
     open fun getChapterUrl(chapter: SChapter): String = pageListRequest(chapter).url.toString()
 
     /**
@@ -500,9 +446,15 @@ abstract class HttpSource : CatalogueSource {
      * @param chapter the chapter to be added.
      * @param manga the manga of the chapter.
      */
-    @Deprecated("All modifications should be done when constructing the chapter")
     open fun prepareNewChapter(
         chapter: SChapter,
         manga: SManga,
     ) {}
+
+    /**
+     * Returns the list of filters for the source.
+     */
+    override fun getFilterList() = FilterList()
 }
+
+class LicensedMangaChaptersException : Exception("Licensed - No chapters to show")

server/src/main/kotlin/eu/kanade/tachiyomi/source/online/ParsedHttpSource.kt

@@ -12,20 +12,12 @@ import org.jsoup.nodes.Element
 /**
  * A simple implementation for sources from a website using Jsoup, an HTML parser.
  */
-@Deprecated(
-    message =
-        "In most cases sources only require a subset of the methods from this class. " +
-            "Source developers should make their own implementation according to their needs.",
-)
 abstract class ParsedHttpSource : HttpSource() {
     /**
      * Parses the response from the site and returns a [MangasPage] object.
      *
      * @param response the response from the site.
      */
-    @Deprecated(
-        "The helper functions are inherently limiting and hides the underlying implementation. Source developers should make their own implementation according to their needs.",
-    )
     override fun popularMangaParse(response: Response): MangasPage {
         val document = response.asJsoup()
 
@@ -66,9 +58,6 @@ abstract class ParsedHttpSource : HttpSource() {
      *
      * @param response the response from the site.
      */
-    @Deprecated(
-        "The helper functions are inherently limiting and hides the underlying implementation. Source developers should make their own implementation according to their needs.",
-    )
     override fun searchMangaParse(response: Response): MangasPage {
         val document = response.asJsoup()
 
@@ -109,9 +98,6 @@ abstract class ParsedHttpSource : HttpSource() {
      *
      * @param response the response from the site.
      */
-    @Deprecated(
-        "The helper functions are inherently limiting and hides the underlying implementation. Source developers should make their own implementation according to their needs.",
-    )
     override fun latestUpdatesParse(response: Response): MangasPage {
         val document = response.asJsoup()
 
@@ -152,9 +138,6 @@ abstract class ParsedHttpSource : HttpSource() {
      *
      * @param response the response from the site.
      */
-    @Deprecated(
-        "The helper functions are inherently limiting and hides the underlying implementation. Source developers should make their own implementation according to their needs.",
-    )
     override fun mangaDetailsParse(response: Response): SManga = mangaDetailsParse(response.asJsoup())
 
     /**
@@ -169,9 +152,6 @@ abstract class ParsedHttpSource : HttpSource() {
      *
      * @param response the response from the site.
      */
-    @Deprecated(
-        "The helper functions are inherently limiting and hides the underlying implementation. Source developers should make their own implementation according to their needs.",
-    )
     override fun chapterListParse(response: Response): List<SChapter> {
         val document = response.asJsoup()
         return document.select(chapterListSelector()).map { chapterFromElement(it) }
@@ -194,9 +174,6 @@ abstract class ParsedHttpSource : HttpSource() {
      *
      * @param response the response from the site.
      */
-    @Deprecated(
-        "The helper functions are inherently limiting and hides the underlying implementation. Source developers should make their own implementation according to their needs.",
-    )
     override fun pageListParse(response: Response): List<Page> = pageListParse(response.asJsoup())
 
     /**
@@ -211,9 +188,6 @@ abstract class ParsedHttpSource : HttpSource() {
      *
      * @param response the response from the site.
      */
-    @Deprecated(
-        "The helper functions are inherently limiting and hides the underlying implementation. Source developers should make their own implementation according to their needs.",
-    )
     override fun imageUrlParse(response: Response): String = imageUrlParse(response.asJsoup())
 
     /**

server/src/main/kotlin/eu/kanade/tachiyomi/source/online/ResolvableSource.kt

@@ -1,44 +1,26 @@
 package eu.kanade.tachiyomi.source.online
 
 import eu.kanade.tachiyomi.source.Source
-import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 
 /**
- * A source that may handle opening an SManga or SChapter for a given URI.
+ * A source that may handle opening an SManga for a given URI.
  *
  * @since extensions-lib 1.5
  */
+@Suppress("unused")
 interface ResolvableSource : Source {
     /**
-     * Returns what the given URI may open.
+     * Whether this source may potentially handle the given URI.
-     * Returns [UriType.Unknown] if the source is not able to resolve the URI.
      *
      * @since extensions-lib 1.5
      */
-    fun getUriType(uri: String): UriType
+    fun canResolveUri(uri: String): Boolean
 
     /**
-     * Called if [getUriType] is [UriType.Manga].
+     * Called if canHandleUri is true. Returns the corresponding SManga, if possible.
-     * Returns the corresponding SManga, if possible.
      *
      * @since extensions-lib 1.5
      */
     suspend fun getManga(uri: String): SManga?
-
-    /**
-     * Called if [getUriType] is [UriType.Chapter].
-     * Returns the corresponding SChapter, if possible.
-     *
-     * @since extensions-lib 1.5
-     */
-    suspend fun getChapter(uri: String): SChapter?
-}
-
-sealed interface UriType {
-    data object Manga : UriType
-
-    data object Chapter : UriType
-
-    data object Unknown : UriType
 }

server/src/main/kotlin/suwayomi/tachidesk/global/impl/GlobalMeta.kt

@@ -1,12 +1,10 @@
 package suwayomi.tachidesk.global.impl
 
-import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.batchInsert
-import org.jetbrains.exposed.v1.core.statements.BatchUpdateStatement
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.batchInsert
+import org.jetbrains.exposed.sql.statements.BatchUpdateStatement
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.statements.toExecutable
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.global.model.table.GlobalMetaTable
 
 /*
@@ -34,14 +32,13 @@ object GlobalMeta {
             val (existingMeta, newMeta) = meta.toList().partition { (key) -> key in dbMetaMap.keys }
 
             if (existingMeta.isNotEmpty()) {
-                BatchUpdateStatement(GlobalMetaTable)
+                BatchUpdateStatement(GlobalMetaTable).apply {
-                    .apply {
+                    existingMeta.forEach { (key, value) ->
-                        existingMeta.forEach { (key, value) ->
+                        addBatch(EntityID(dbMetaMap[key]!![GlobalMetaTable.id].value, GlobalMetaTable))
-                            addBatch(EntityID(dbMetaMap[key]!![GlobalMetaTable.id].value, GlobalMetaTable))
+                        this[GlobalMetaTable.value] = value
-                            this[GlobalMetaTable.value] = value
+                    }
-                        }
+                    execute(this@transaction)
-                    }.toExecutable()
+                }
-                    .execute(this@transaction)
             }
 
             if (newMeta.isNotEmpty()) {

server/src/main/kotlin/suwayomi/tachidesk/global/impl/KcefWebView.kt

@@ -1,14 +1,15 @@
 package suwayomi.tachidesk.global.impl
 
+import dev.datlag.kcef.KCEF
+import dev.datlag.kcef.KCEFBrowser
+import dev.datlag.kcef.KCEFClient
 import eu.kanade.tachiyomi.network.NetworkHelper
 import io.github.oshai.kotlinlogging.KotlinLogging
-import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import okhttp3.Cookie
 import okhttp3.HttpUrl
-import org.cef.CefClient
 import org.cef.CefSettings
 import org.cef.browser.CefBrowser
 import org.cef.browser.CefFrame
@@ -25,9 +26,6 @@ import org.cef.network.CefCookie
 import org.cef.network.CefCookieManager
 import org.cef.network.CefRequest
 import uy.kohesive.injekt.injectLazy
-import xyz.nulldev.androidcompat.webkit.CefHelper
-import xyz.nulldev.androidcompat.webkit.dispose
-import xyz.nulldev.androidcompat.webkit.evaluateJavaScript
 import java.awt.Component
 import java.awt.HeadlessException
 import java.awt.Rectangle
@@ -49,8 +47,8 @@ import javax.swing.JPanel
 class KcefWebView {
     private val logger = KotlinLogging.logger {}
     private val renderHandler = RenderHandler()
-    private var kcefClient: CefClient? = null
+    private var kcefClient: KCEFClient? = null
-    private var browser: CefBrowser? = null
+    private var browser: KCEFBrowser? = null
     private var width = 1000
     private var height = 1000
 
@@ -78,8 +76,7 @@ class KcefWebView {
         }
     }
 
-    @Serializable
+    @Serializable sealed class Event
-    sealed class Event
 
     @Serializable
     @SerialName("consoleMessage")
@@ -250,12 +247,10 @@ class KcefWebView {
     init {
         destroy()
         kcefClient =
-            runBlocking {
+            KCEF.newClientBlocking().apply {
-                CefHelper.createClient().apply {
+                addDisplayHandler(DisplayHandler())
-                    addDisplayHandler(DisplayHandler())
+                addLoadHandler(LoadHandler())
-                    addLoadHandler(LoadHandler())
+                addRequestHandler(RequestHandler())
-                    addRequestHandler(RequestHandler())
-                }
             }
 
         logger.debug { "Start loading cookies" }
@@ -294,7 +289,6 @@ class KcefWebView {
                 .createBrowser(
                     url,
                     CefRendering.CefRenderingWithHandler(renderHandler, JPanel()),
-                    false,
                     // NOTE: with a context, we don't seem to be getting any cookies
                 ).apply {
                     // NOTE: Without this, we don't seem to be receiving any events

server/src/main/kotlin/suwayomi/tachidesk/global/impl/WebView.kt

@@ -6,7 +6,7 @@ import io.javalin.websocket.WsMessageContext
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
-import org.eclipse.jetty.websocket.core.CloseStatus
+import org.eclipse.jetty.websocket.api.CloseStatus
 import suwayomi.tachidesk.manga.impl.update.Websocket
 
 object WebView : Websocket<String>() {

server/src/main/kotlin/suwayomi/tachidesk/global/impl/sync/SyncManager.kt

@@ -1,519 +0,0 @@
-package suwayomi.tachidesk.global.impl.sync
-
-import android.app.Application
-import android.content.Context
-import io.github.oshai.kotlinlogging.KotlinLogging
-import kotlinx.coroutines.DelicateCoroutinesApi
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.protobuf.ProtoBuf
-import org.jetbrains.exposed.v1.core.and
-import org.jetbrains.exposed.v1.core.eq
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.update
-import suwayomi.tachidesk.graphql.types.StartSyncResult
-import suwayomi.tachidesk.manga.impl.Category
-import suwayomi.tachidesk.manga.impl.Library.handleMangaThumbnail
-import suwayomi.tachidesk.manga.impl.backup.BackupFlags
-import suwayomi.tachidesk.manga.impl.backup.proto.ProtoBackupImport
-import suwayomi.tachidesk.manga.impl.backup.proto.handlers.BackupCategoryHandler
-import suwayomi.tachidesk.manga.impl.backup.proto.handlers.BackupMangaHandler
-import suwayomi.tachidesk.manga.impl.backup.proto.handlers.BackupSourceHandler
-import suwayomi.tachidesk.manga.impl.backup.proto.models.Backup
-import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupChapter
-import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupManga
-import suwayomi.tachidesk.manga.model.dataclass.ChapterDataClass
-import suwayomi.tachidesk.manga.model.dataclass.MangaDataClass
-import suwayomi.tachidesk.manga.model.table.CategoryMangaTable
-import suwayomi.tachidesk.manga.model.table.CategoryTable
-import suwayomi.tachidesk.manga.model.table.ChapterTable
-import suwayomi.tachidesk.manga.model.table.MangaTable
-import suwayomi.tachidesk.manga.model.table.toDataClass
-import suwayomi.tachidesk.server.serverConfig
-import suwayomi.tachidesk.util.HAScheduler
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
-import kotlin.time.Clock
-import kotlin.time.Duration.Companion.seconds
-import kotlin.time.Instant
-import kotlin.time.measureTime
-
-@Serializable
-data class SyncData(
-    val backup: Backup? = null,
-)
-
-object SyncManager {
-    private val syncPreferences = Injekt.get<Application>().getSharedPreferences("sync", Context.MODE_PRIVATE)
-    private val logger = KotlinLogging.logger {}
-
-    private var currentTaskId: String? = null
-    private val syncMutex = Mutex()
-
-    private val _lastSyncState: MutableStateFlow<SyncState?> = MutableStateFlow(null)
-    val lastSyncState: StateFlow<SyncState?> = _lastSyncState.asStateFlow()
-
-    @OptIn(DelicateCoroutinesApi::class)
-    fun scheduleSyncTask() {
-        serverConfig.subscribeTo(
-            combine(
-                serverConfig.syncYomiEnabled,
-                serverConfig.syncInterval,
-            ) { enabled, interval -> Pair(enabled, interval) },
-            { (enabled, interval) ->
-                currentTaskId?.let { HAScheduler.deschedule(it) }
-
-                currentTaskId =
-                    if (enabled && interval > 0.seconds) {
-                        val lastSyncDate =
-                            syncPreferences
-                                .getLong("last_scheduled_sync", 0L)
-                                .takeIf { it != 0L }
-                                ?.let { Instant.fromEpochMilliseconds(it) }
-
-                        if (lastSyncDate == null) {
-                            syncPreferences
-                                .edit()
-                                .putLong("last_scheduled_sync", Clock.System.now().toEpochMilliseconds())
-                                .apply()
-                        }
-
-                        val delay =
-                            if (lastSyncDate != null) {
-                                ((interval) - (Clock.System.now() - lastSyncDate)).coerceAtLeast(0.seconds)
-                            } else {
-                                interval
-                            }
-
-                        HAScheduler.schedule(
-                            {
-                                startSync(periodic = true)
-
-                                syncPreferences
-                                    .edit()
-                                    .putLong("last_scheduled_sync", Clock.System.now().toEpochMilliseconds())
-                                    .apply()
-                            },
-                            interval = interval.inWholeMilliseconds,
-                            delay = delay.inWholeMilliseconds,
-                            name = "sync",
-                        )
-                    } else {
-                        syncPreferences
-                            .edit()
-                            .remove("last_scheduled_sync")
-                            .apply()
-                        null
-                    }
-            },
-            ignoreInitialValue = false,
-        )
-    }
-
-    @OptIn(DelicateCoroutinesApi::class)
-    fun startSync(periodic: Boolean = false): StartSyncResult {
-        if (!serverConfig.syncYomiEnabled.value) {
-            return StartSyncResult.SYNC_DISABLED
-        }
-
-        if (!syncMutex.tryLock()) {
-            return StartSyncResult.SYNC_IN_PROGRESS
-        }
-
-        GlobalScope.launch {
-            try {
-                syncData(periodic)
-            } finally {
-                syncMutex.unlock()
-            }
-        }
-
-        return StartSyncResult.SUCCESS
-    }
-
-    suspend fun ensureSync() {
-        if (!serverConfig.syncYomiEnabled.value) {
-            return
-        }
-
-        if (syncMutex.tryLock()) {
-            // there is no ongoing sync, so start one
-            try {
-                syncData()
-            } finally {
-                syncMutex.unlock()
-            }
-        } else {
-            // wait for the ongoing sync to finish
-            syncMutex.withLock {}
-        }
-    }
-
-    private suspend fun syncData(periodic: Boolean = false) {
-        val startInstant = Clock.System.now()
-        _lastSyncState.value = SyncState.Started(startInstant)
-
-        try {
-            logger.info {
-                if (periodic) {
-                    "Starting periodic sync"
-                } else {
-                    "Starting manual sync"
-                }
-            }
-
-            transaction {
-                MangaTable.update({ MangaTable.isSyncing eq true }) {
-                    it[isSyncing] = false
-                }
-                ChapterTable.update({ ChapterTable.isSyncing eq true }) {
-                    it[isSyncing] = false
-                }
-                CategoryTable.update({ CategoryTable.isSyncing eq true }) {
-                    it[isSyncing] = false
-                }
-            }
-
-            val backupFlags =
-                BackupFlags(
-                    includeManga = serverConfig.syncDataManga.value,
-                    includeCategories = serverConfig.syncDataCategories.value,
-                    includeChapters = serverConfig.syncDataChapters.value,
-                    includeTracking = serverConfig.syncDataTracking.value,
-                    includeHistory = serverConfig.syncDataHistory.value,
-                    includeClientData = false,
-                    includeServerSettings = false,
-                )
-
-            _lastSyncState.value = SyncState.CreatingBackup(startInstant)
-            val backupMangas = BackupMangaHandler.backup(backupFlags)
-            val backup =
-                Backup(
-                    backupMangas,
-                    BackupCategoryHandler.backup(backupFlags).filter { it.name != Category.DEFAULT_CATEGORY_NAME },
-                    BackupSourceHandler.backup(backupMangas, backupFlags),
-                    emptyMap(),
-                    null,
-                )
-
-            val syncData =
-                SyncData(
-                    backup = backup,
-                )
-
-            val remoteBackup =
-                SyncYomiSyncService.doSync(syncData, startInstant) {
-                    _lastSyncState.value = it
-                }
-
-            if (remoteBackup == null) {
-                logger.debug { "Skip restore due to network issues" }
-                finishWithError(startInstant, "Network error", periodic)
-                return
-            }
-
-            if (remoteBackup === syncData.backup) {
-                // nothing changed
-                logger.debug { "Skip restore due to remote was overwrite from local" }
-                finishWithSuccess(startInstant, periodic)
-                return
-            }
-
-            // Stop the sync early if the remote backup is null or empty
-            if (remoteBackup.backupManga.isEmpty() && remoteBackup.backupCategories.isEmpty() && remoteBackup.backupSources.isEmpty()) {
-                logger.error { "No data found on remote server." }
-                finishWithError(startInstant, "No data found on remote server.", periodic)
-                return
-            }
-
-            val isLibraryEmpty =
-                transaction {
-                    MangaTable
-                        .selectAll()
-                        .where { MangaTable.inLibrary eq true }
-                        .empty()
-                }
-
-            // Check if it's first sync based on lastSyncTimestamp
-            if (syncPreferences.getLong("last_sync_timestamp", 0) == 0L && !isLibraryEmpty) {
-                // It's first sync no need to restore data. (just update remote data)
-                finishWithSuccess(startInstant, periodic)
-                return
-            }
-
-            val (filteredFavorites, nonFavorites) = filterFavoritesAndNonFavorites(remoteBackup)
-            updateNonFavorites(nonFavorites)
-
-            val newSyncData =
-                backup.copy(
-                    backupManga = filteredFavorites,
-                    backupCategories = remoteBackup.backupCategories,
-                    backupSources = remoteBackup.backupSources,
-                )
-
-            val hasMangaChanges = filteredFavorites.isNotEmpty()
-            val hasCategoryChanges = remoteBackup.backupCategories != backup.backupCategories
-            val hasSourceChanges = remoteBackup.backupSources != backup.backupSources
-
-            if (!hasMangaChanges && !hasCategoryChanges && !hasSourceChanges) {
-                // update the sync timestamp
-                finishWithSuccess(startInstant, periodic)
-                return
-            }
-
-            if (serverConfig.syncDataCategories.value) {
-                val mergedUids = newSyncData.backupCategories.map { it.uid }.toSet()
-                val mergedNames = newSyncData.backupCategories.map { it.name }.toSet()
-                val localCategories = Category.getCategoryList().filterNot { it.default } // Exclude system category
-                val categoriesToDelete =
-                    localCategories.filter {
-                        it.uid !in mergedUids && it.name !in mergedNames
-                    }
-                if (categoriesToDelete.isNotEmpty()) {
-                    transaction {
-                        categoriesToDelete.forEach {
-                            Category.removeCategory(it.id)
-                        }
-                    }
-                }
-            }
-
-            val backupStream = ProtoBuf.encodeToByteArray(Backup.serializer(), newSyncData).inputStream()
-            val restoreId =
-                ProtoBackupImport.restore(
-                    sourceStream = backupStream,
-                    flags = backupFlags,
-                    isSync = true,
-                )
-            _lastSyncState.value = SyncState.Restoring(startInstant, restoreId)
-
-            ProtoBackupImport.notifyFlow.first {
-                val restoreState = ProtoBackupImport.getRestoreState(restoreId)
-
-                restoreState == ProtoBackupImport.BackupRestoreState.Success ||
-                    restoreState == ProtoBackupImport.BackupRestoreState.Failure
-            }
-
-            // update the sync timestamp
-            finishWithSuccess(startInstant, periodic)
-        } catch (e: Throwable) {
-            logger.error { "Error syncing: ${e.message}" }
-            finishWithError(startInstant, "${e::class.qualifiedName}: ${e.message}", periodic)
-        }
-    }
-
-    private fun finishWithSuccess(
-        startInstant: Instant,
-        periodic: Boolean,
-    ) {
-        syncPreferences
-            .edit()
-            .putLong("last_sync_timestamp", Clock.System.now().toEpochMilliseconds())
-            .apply()
-        _lastSyncState.value = SyncState.Success(startInstant)
-
-        logger.info {
-            if (periodic) {
-                "Periodic sync completed successfully"
-            } else {
-                "Manual sync completed successfully"
-            }
-        }
-    }
-
-    private fun finishWithError(
-        startInstant: Instant,
-        message: String,
-        periodic: Boolean,
-    ) {
-        _lastSyncState.value = SyncState.Error(startInstant, message)
-
-        logger.info {
-            if (periodic) {
-                "Periodic sync failed: $message"
-            } else {
-                "Manual sync failed: $message"
-            }
-        }
-    }
-
-    private fun isMangaDifferent(
-        localManga: MangaDataClass,
-        remoteManga: BackupManga,
-    ): Boolean {
-        if (localManga.version != remoteManga.version) {
-            return true
-        }
-
-        val localChapters =
-            transaction {
-                ChapterTable
-                    .selectAll()
-                    .where { ChapterTable.manga eq localManga.id }
-                    .map { ChapterTable.toDataClass(it) }
-            }
-
-        if (areChaptersDifferent(localChapters, remoteManga.chapters)) {
-            return true
-        }
-
-        val localCategories =
-            transaction {
-                CategoryMangaTable
-                    .innerJoin(CategoryTable)
-                    .selectAll()
-                    .where { CategoryMangaTable.manga eq localManga.id }
-                    .map { it[CategoryTable.order] }
-            }
-
-        return localCategories.toSet() != remoteManga.categories.toSet()
-    }
-
-    private fun areChaptersDifferent(
-        localChapters: List<ChapterDataClass>,
-        remoteChapters: List<BackupChapter>,
-    ): Boolean {
-        val localChapterMap = localChapters.associateBy { it.url }
-        val remoteChapterMap = remoteChapters.associateBy { it.url }
-
-        if (localChapterMap.size != remoteChapterMap.size) {
-            return true
-        }
-
-        for ((url, localChapter) in localChapterMap) {
-            val remoteChapter = remoteChapterMap[url]
-
-            // If a matching remote chapter doesn't exist, or the version numbers are different, consider them different
-            if (remoteChapter == null || localChapter.version != remoteChapter.version) {
-                return true
-            }
-        }
-
-        return false
-    }
-
-    private fun filterFavoritesAndNonFavorites(backup: Backup): Pair<List<BackupManga>, List<BackupManga>> {
-        val favorites = mutableListOf<BackupManga>()
-        val nonFavorites = mutableListOf<BackupManga>()
-
-        val elapsedTime =
-            measureTime {
-                logger.debug { "Starting to filter favorites and non-favorites from backup data." }
-
-                backup.backupManga.forEach { remoteManga ->
-                    val localManga =
-                        transaction {
-                            MangaTable
-                                .selectAll()
-                                .where {
-                                    (MangaTable.sourceReference eq remoteManga.source) and
-                                        (MangaTable.url eq remoteManga.url)
-                                }.limit(1)
-                                .map { MangaTable.toDataClass(it) }
-                                .firstOrNull()
-                        }
-
-                    when {
-                        // Checks if the manga is in favorites and needs updating or adding
-                        remoteManga.favorite -> {
-                            if (localManga == null || isMangaDifferent(localManga, remoteManga)) {
-                                logger.debug { "Adding to favorites: ${remoteManga.title}" }
-                                favorites.add(remoteManga)
-                            } else {
-                                logger.debug { "Already up-to-date favorite: ${remoteManga.title}" }
-                            }
-                        }
-
-                        // Handle non-favorites
-                        !remoteManga.favorite -> {
-                            logger.debug { "Adding to non-favorites: ${remoteManga.title}" }
-                            nonFavorites.add(remoteManga)
-                        }
-                    }
-                }
-            }
-
-        logger.debug {
-            "Filtering completed in $elapsedTime. Favorites found: ${favorites.size}, Non-favorites found: ${nonFavorites.size}"
-        }
-
-        return Pair(favorites, nonFavorites)
-    }
-
-    private fun updateNonFavorites(nonFavorites: List<BackupManga>) {
-        nonFavorites.forEach { nonFavorite ->
-            val localManga =
-                transaction {
-                    MangaTable
-                        .selectAll()
-                        .where {
-                            (MangaTable.sourceReference eq nonFavorite.source) and
-                                (MangaTable.url eq nonFavorite.url)
-                        }.limit(1)
-                        .map { MangaTable.toDataClass(it) }
-                        .firstOrNull()
-                }
-
-            if (localManga != null) {
-                if (localManga.inLibrary != nonFavorite.favorite) {
-                    transaction {
-                        MangaTable.update({ MangaTable.id eq localManga.id }) {
-                            it[inLibrary] = nonFavorite.favorite
-                        }
-                    }.apply {
-                        handleMangaThumbnail(localManga.id, nonFavorite.favorite)
-                    }
-                }
-            }
-        }
-    }
-
-    sealed class SyncState(
-        open val startDate: Instant,
-    ) {
-        data class Started(
-            override val startDate: Instant,
-        ) : SyncState(startDate)
-
-        data class CreatingBackup(
-            override val startDate: Instant,
-        ) : SyncState(startDate)
-
-        data class Downloading(
-            override val startDate: Instant,
-        ) : SyncState(startDate)
-
-        data class Merging(
-            override val startDate: Instant,
-        ) : SyncState(startDate)
-
-        data class Uploading(
-            override val startDate: Instant,
-        ) : SyncState(startDate)
-
-        data class Restoring(
-            override val startDate: Instant,
-            val restoreId: String,
-        ) : SyncState(startDate)
-
-        data class Success(
-            override val startDate: Instant,
-            val endDate: Instant = Clock.System.now(),
-        ) : SyncState(startDate)
-
-        data class Error(
-            override val startDate: Instant,
-            val message: String,
-            val endDate: Instant = Clock.System.now(),
-        ) : SyncState(startDate)
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/global/impl/sync/SyncYomiSyncService.kt

@@ -1,596 +0,0 @@
-package suwayomi.tachidesk.global.impl.sync
-
-import android.app.Application
-import android.content.Context
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.NetworkHelper
-import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.PUT
-import eu.kanade.tachiyomi.network.await
-import io.github.oshai.kotlinlogging.KotlinLogging
-import io.javalin.http.HttpStatus
-import kotlinx.coroutines.CancellationException
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.SerializationException
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.protobuf.ProtoBuf
-import okhttp3.Headers
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.RequestBody.Companion.toRequestBody
-import suwayomi.tachidesk.manga.impl.backup.proto.models.Backup
-import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupCategory
-import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupChapter
-import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupManga
-import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupSource
-import suwayomi.tachidesk.server.serverConfig
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
-import uy.kohesive.injekt.injectLazy
-import kotlin.time.Duration.Companion.milliseconds
-import kotlin.time.Duration.Companion.seconds
-import kotlin.time.Instant
-
-object SyncYomiSyncService {
-    private val syncPreferences = Injekt.get<Application>().getSharedPreferences("sync", Context.MODE_PRIVATE)
-
-    private val network: NetworkHelper by injectLazy()
-    private val logger = KotlinLogging.logger {}
-
-    private class SyncYomiException(
-        message: String?,
-    ) : Exception(message)
-
-    @Serializable
-    private data class SyncEvent(
-        val event: SyncEventStatus,
-        val device_Name: String? = null,
-        val message: String? = null,
-    )
-
-    @Serializable
-    private enum class SyncEventStatus {
-        SYNC_STARTED,
-        SYNC_SUCCESS,
-        SYNC_FAILED,
-        SYNC_ERROR,
-        SYNC_CANCELLED,
-    }
-
-    suspend fun doSync(
-        syncData: SyncData,
-        startDate: Instant,
-        setSyncState: (SyncManager.SyncState) -> Unit,
-    ): Backup? {
-        reportSyncEvent(SyncEventStatus.SYNC_STARTED)
-        setSyncState(SyncManager.SyncState.Downloading(startDate))
-
-        return try {
-            val (remoteData, etag) = pullSyncData()
-
-            val finalSyncData =
-                if (remoteData != null) {
-                    require(etag.isNotEmpty()) { "ETag should never be empty if remote data is not null" }
-                    logger.debug { "Try update remote data with ETag($etag)" }
-                    setSyncState(SyncManager.SyncState.Merging(startDate))
-                    mergeSyncData(syncData, remoteData)
-                } else {
-                    // init or overwrite remote data
-                    logger.debug { "Try overwrite remote data with ETag($etag)" }
-                    syncData
-                }
-
-            if (finalSyncData.backup != null) {
-                setSyncState(SyncManager.SyncState.Uploading(startDate))
-            }
-
-            val success = pushSyncData(finalSyncData, etag)
-            if (success) {
-                reportSyncEvent(SyncEventStatus.SYNC_SUCCESS)
-            } else {
-                reportSyncEvent(SyncEventStatus.SYNC_FAILED, "Failed to push sync data")
-            }
-
-            finalSyncData.backup
-        } catch (e: Exception) {
-            if (e is CancellationException) {
-                reportSyncEvent(SyncEventStatus.SYNC_CANCELLED, e.message)
-                throw e
-            }
-            logger.error { "Error syncing: ${e.message}" }
-            reportSyncEvent(SyncEventStatus.SYNC_ERROR, e.message)
-            throw e
-        }
-    }
-
-    private suspend fun pullSyncData(): Pair<SyncData?, String> {
-        val host = serverConfig.syncYomiHost.value
-        val apiKey = serverConfig.syncYomiApiKey.value
-        val downloadUrl = "$host/api/sync/content"
-
-        val headersBuilder = Headers.Builder().add("X-API-Token", apiKey)
-        val lastETag = syncPreferences.getString("last_sync_etag", "") ?: ""
-        if (lastETag != "") {
-            headersBuilder.add("If-None-Match", lastETag)
-        }
-        val headers = headersBuilder.build()
-
-        val downloadRequest =
-            GET(
-                url = downloadUrl,
-                headers = headers,
-            )
-
-        val response = network.client.newCall(downloadRequest).await()
-
-        if (response.code == HttpStatus.NOT_MODIFIED.code) {
-            // not modified
-            require(lastETag.isNotEmpty())
-            logger.info { "Remote server not modified" }
-            return Pair(null, lastETag)
-        } else if (response.code == HttpStatus.NOT_FOUND.code) {
-            // maybe got deleted from remote
-            return Pair(null, "")
-        }
-
-        if (response.isSuccessful) {
-            val newETag =
-                response.headers["ETag"]
-                    ?.takeIf { it.isNotEmpty() } ?: throw SyncYomiException("Missing ETag")
-
-            val byteArray =
-                response.body.byteStream().use {
-                    return@use it.readBytes()
-                }
-
-            return try {
-                val backup = ProtoBuf.decodeFromByteArray(Backup.serializer(), byteArray)
-                return Pair(SyncData(backup = backup), newETag)
-            } catch (_: SerializationException) {
-                logger.info { "Bad content responsed from server" }
-                // the body is invalid
-                // return default value so we can overwrite it
-                Pair(null, "")
-            }
-        } else {
-            val responseBody = response.body.string()
-            logger.error { "SyncError: $responseBody" }
-            throw SyncYomiException("Failed to download sync data: $responseBody")
-        }
-    }
-
-    private suspend fun pushSyncData(
-        syncData: SyncData,
-        eTag: String,
-    ): Boolean {
-        val backup = syncData.backup ?: return true
-
-        val host = serverConfig.syncYomiHost.value
-        val apiKey = serverConfig.syncYomiApiKey.value
-        val uploadUrl = "$host/api/sync/content"
-
-        val headersBuilder = Headers.Builder().add("X-API-Token", apiKey)
-        if (eTag.isNotEmpty()) {
-            headersBuilder.add("If-Match", eTag)
-        }
-        val headers = headersBuilder.build()
-
-        // Set timeout to 30 seconds
-        val timeout = 30.seconds
-        val client =
-            network.client
-                .newBuilder()
-                .connectTimeout(timeout)
-                .readTimeout(timeout)
-                .writeTimeout(timeout)
-                .build()
-
-        val byteArray = ProtoBuf.encodeToByteArray(Backup.serializer(), backup)
-        if (byteArray.isEmpty()) {
-            throw IllegalStateException("Empty backup error")
-        }
-        val body = byteArray.toRequestBody("application/octet-stream".toMediaType())
-
-        val uploadRequest =
-            PUT(
-                url = uploadUrl,
-                headers = headers,
-                body = body,
-            )
-
-        val response = client.newCall(uploadRequest).await()
-
-        return if (response.isSuccessful) {
-            val newETag =
-                response.headers["ETag"]
-                    ?.takeIf { it.isNotEmpty() } ?: throw SyncYomiException("Missing ETag")
-            syncPreferences
-                .edit()
-                .putString("last_sync_etag", newETag)
-                .apply()
-            logger.debug { "SyncYomi sync completed" }
-            true
-        } else if (response.code == HttpStatus.PRECONDITION_FAILED.code) {
-            // other clients updated remote data, will try next time
-            logger.debug { "SyncYomi sync failed with 412" }
-            false
-        } else {
-            val responseBody = response.body.string()
-            logger.error { "SyncError: $responseBody" }
-            false
-        }
-    }
-
-    private suspend fun reportSyncEvent(
-        event: SyncEventStatus,
-        message: String? = null,
-    ) {
-        try {
-            val host = serverConfig.syncYomiHost.value
-            val apiKey = serverConfig.syncYomiApiKey.value
-            val url = "$host/api/sync/event"
-
-            val headers = Headers.Builder().add("X-API-Token", apiKey).build()
-
-            // Use a fixed server name.
-            val bodyObj =
-                SyncEvent(
-                    event = event,
-                    device_Name = "Suwayomi Server",
-                    message = message,
-                )
-
-            val jsonBody = Json.encodeToString(SyncEvent.serializer(), bodyObj)
-            val requestBody = jsonBody.toRequestBody("application/json; charset=utf-8".toMediaType())
-
-            val request =
-                POST(
-                    url = url,
-                    headers = headers,
-                    body = requestBody,
-                )
-
-            network.client
-                .newCall(request)
-                .await()
-                .close()
-        } catch (e: Exception) {
-            logger.error { "Failed to report sync event: ${e.message}" }
-        }
-    }
-
-    fun mergeSyncData(
-        localSyncData: SyncData,
-        remoteSyncData: SyncData,
-    ): SyncData {
-        val mergedCategoriesList =
-            mergeCategoriesLists(localSyncData.backup?.backupCategories, remoteSyncData.backup?.backupCategories)
-
-        val mergedMangaList =
-            mergeMangaLists(
-                localSyncData.backup?.backupManga,
-                remoteSyncData.backup?.backupManga,
-                localSyncData.backup?.backupCategories ?: emptyList(),
-                remoteSyncData.backup?.backupCategories ?: emptyList(),
-                mergedCategoriesList,
-            )
-
-        val mergedSourcesList =
-            mergeSourcesLists(localSyncData.backup?.backupSources, remoteSyncData.backup?.backupSources)
-
-        // Create the merged Backup object
-        val mergedBackup =
-            Backup(
-                backupManga = mergedMangaList,
-                backupCategories = mergedCategoriesList,
-                backupSources = mergedSourcesList,
-                meta = emptyMap(),
-                serverSettings = null,
-            )
-
-        // Create the merged SData object
-        return SyncData(
-            backup = mergedBackup,
-        )
-    }
-
-    private fun mergeMangaLists(
-        localMangaList: List<BackupManga>?,
-        remoteMangaList: List<BackupManga>?,
-        localCategories: List<BackupCategory>,
-        remoteCategories: List<BackupCategory>,
-        mergedCategories: List<BackupCategory>,
-    ): List<BackupManga> {
-        val localMangaListSafe = localMangaList.orEmpty()
-        val remoteMangaListSafe = remoteMangaList.orEmpty()
-
-        logger.debug { "Starting merge. Local list size: ${localMangaListSafe.size}, Remote list size: ${remoteMangaListSafe.size}" }
-
-        fun mangaCompositeKey(manga: BackupManga): String = "${manga.source}|${manga.url}"
-
-        // Create maps using composite keys
-        val localMangaMap = localMangaListSafe.associateBy { mangaCompositeKey(it) }
-        val remoteMangaMap = remoteMangaListSafe.associateBy { mangaCompositeKey(it) }
-
-        val localCategoriesMapByOrder = localCategories.associateBy { it.order }
-        val remoteCategoriesMapByOrder = remoteCategories.associateBy { it.order }
-        val mergedCategoriesMapByName = mergedCategories.associateBy { it.name }
-
-        fun updateCategories(
-            theManga: BackupManga,
-            theMap: Map<Int, BackupCategory>,
-        ): BackupManga =
-            theManga.copy(
-                categories =
-                    theManga.categories.mapNotNull {
-                        theMap[it]?.let { category ->
-                            mergedCategoriesMapByName[category.name]?.order
-                        }
-                    },
-            )
-
-        val lastSyncTime = syncPreferences.getLong("last_sync_timestamp", 0).milliseconds.inWholeSeconds
-
-        val mergedList =
-            (localMangaMap.keys + remoteMangaMap.keys).distinct().mapNotNull { compositeKey ->
-                val local = localMangaMap[compositeKey]
-                val remote = remoteMangaMap[compositeKey]
-
-                // New version comparison logic
-                when {
-                    local != null && remote == null -> {
-                        if (lastSyncTime == 0L || local.lastModifiedAt > lastSyncTime) {
-                            updateCategories(local, localCategoriesMapByOrder)
-                        } else {
-                            logger.debug { "Dropping local manga deleted on remote: ${local.title}." }
-                            null
-                        }
-                    }
-
-                    local == null && remote != null -> {
-                        if (lastSyncTime == 0L || remote.lastModifiedAt > lastSyncTime) {
-                            updateCategories(remote, remoteCategoriesMapByOrder)
-                        } else {
-                            logger.debug { "Dropping deleted remote manga: ${remote.title}." }
-                            null
-                        }
-                    }
-
-                    local != null && remote != null -> {
-                        // Compare versions to decide which manga to keep
-                        if (local.version >= remote.version) {
-                            logger.debug { "Keeping local version of ${local.title} with merged chapters." }
-                            updateCategories(
-                                local.copy(
-                                    chapters =
-                                        mergeChapters(
-                                            local.chapters,
-                                            remote.chapters,
-                                            lastSyncTime,
-                                            serverConfig.syncDataChapters.value,
-                                        ),
-                                ),
-                                localCategoriesMapByOrder,
-                            )
-                        } else {
-                            logger.debug { "Keeping remote version of ${remote.title} with merged chapters." }
-                            updateCategories(
-                                remote.copy(
-                                    chapters =
-                                        mergeChapters(
-                                            local.chapters,
-                                            remote.chapters,
-                                            lastSyncTime,
-                                            serverConfig.syncDataChapters.value,
-                                        ),
-                                ),
-                                remoteCategoriesMapByOrder,
-                            )
-                        }
-                    }
-
-                    else -> {
-                        null
-                    } // No manga found for key
-                }
-            }
-
-        // Counting favorites and non-favorites
-        val (favorites, nonFavorites) = mergedList.partition { it.favorite }
-
-        logger.debug {
-            "Merge completed. Total merged manga: ${mergedList.size}, Favorites: ${favorites.size}, Non-Favorites: ${nonFavorites.size}"
-        }
-
-        return mergedList
-    }
-
-    private fun mergeChapters(
-        localChapters: List<BackupChapter>,
-        remoteChapters: List<BackupChapter>,
-        lastSyncTime: Long,
-        syncingChapters: Boolean,
-    ): List<BackupChapter> {
-        if (!syncingChapters) {
-            return remoteChapters // If not syncing chapters, keep remote untouched
-        }
-
-        fun chapterCompositeKey(chapter: BackupChapter): String = chapter.url
-
-        val localChapterMap = localChapters.associateBy { chapterCompositeKey(it) }
-        val remoteChapterMap = remoteChapters.associateBy { chapterCompositeKey(it) }
-
-        logger.debug { "Starting chapter merge. Local chapters: ${localChapters.size}, Remote chapters: ${remoteChapters.size}" }
-
-        // Merge both chapter maps based on version numbers
-        val mergedChapters =
-            (localChapterMap.keys + remoteChapterMap.keys).distinct().mapNotNull { compositeKey ->
-                val localChapter = localChapterMap[compositeKey]
-                val remoteChapter = remoteChapterMap[compositeKey]
-
-                logger.debug {
-                    "Processing chapter key: $compositeKey. Local chapter: ${localChapter != null}, Remote chapter: ${remoteChapter != null}"
-                }
-
-                when {
-                    localChapter != null && remoteChapter == null -> {
-                        if (lastSyncTime == 0L || localChapter.lastModifiedAt > lastSyncTime) {
-                            logger.debug { "Keeping local chapter: ${localChapter.name}." }
-                            localChapter
-                        } else {
-                            logger.debug { "Dropping local chapter deleted on remote: ${localChapter.name}." }
-                            null
-                        }
-                    }
-
-                    localChapter == null && remoteChapter != null -> {
-                        if (lastSyncTime == 0L || remoteChapter.lastModifiedAt > lastSyncTime) {
-                            logger.debug { "Taking remote chapter: ${remoteChapter.name}." }
-                            remoteChapter
-                        } else {
-                            logger.debug { "Dropping deleted remote chapter: ${remoteChapter.name}." }
-                            null
-                        }
-                    }
-
-                    localChapter != null && remoteChapter != null -> {
-                        // Use version number to decide which chapter to keep
-                        val chosenChapter =
-                            if (localChapter.version >= remoteChapter.version) {
-                                // If there are more chapter on remote, local sourceOrder will need to be updated to maintain correct source order.
-                                if (localChapters.size < remoteChapters.size) {
-                                    localChapter.copy(sourceOrder = remoteChapter.sourceOrder)
-                                } else {
-                                    localChapter
-                                }
-                            } else {
-                                remoteChapter
-                            }
-                        logger.debug {
-                            "Merging chapter: ${chosenChapter.name}. Chosen version from: ${if (localChapter.version >= remoteChapter.version) "Local" else "Remote"}, Local version: ${localChapter.version}, Remote version: ${remoteChapter.version}."
-                        }
-                        chosenChapter
-                    }
-
-                    else -> {
-                        logger.debug { "No chapter found for composite key: $compositeKey. Skipping." }
-                        null
-                    }
-                }
-            }
-
-        logger.debug { "Chapter merge completed. Total merged chapters: ${mergedChapters.size}" }
-
-        return mergedChapters
-    }
-
-    private fun mergeCategoriesLists(
-        localCategoriesList: List<BackupCategory>?,
-        remoteCategoriesList: List<BackupCategory>?,
-    ): List<BackupCategory> {
-        if (localCategoriesList == null) return remoteCategoriesList ?: emptyList()
-        if (remoteCategoriesList == null) return localCategoriesList
-        val result = mutableListOf<BackupCategory>()
-        val processedLocals = mutableSetOf<BackupCategory>()
-
-        val localMapByUid = localCategoriesList.filter { it.uid != 0L }.associateBy { it.uid }
-        val localMapByName = localCategoriesList.associateBy { it.name }
-
-        val lastSyncTime = syncPreferences.getLong("last_sync_timestamp", 0)
-
-        remoteCategoriesList.forEach { remote ->
-            var localMatch: BackupCategory? = null
-
-            // 1. Try match by UID
-            if (remote.uid != 0L) {
-                localMatch = localMapByUid[remote.uid]
-            }
-
-            // 2. Try match by Name (fallback)
-            if (localMatch == null) {
-                localMatch = localMapByName[remote.name]
-            }
-
-            if (localMatch != null) {
-                processedLocals.add(localMatch)
-                // Conflict resolution
-                if (localMatch.version >= remote.version) {
-                    logger.debug { "Keeping local category: ${localMatch.name} (UID: ${localMatch.uid})" }
-                    result.add(localMatch)
-                } else {
-                    logger.debug { "Keeping remote category: ${remote.name} (UID: ${remote.uid})" }
-                    // Preserve Local UID if Remote was 0
-                    if (remote.uid == 0L) {
-                        remote.uid = localMatch.uid
-                    }
-                    result.add(remote)
-                }
-            } else {
-                val remoteModifiedTimeMillis = remote.lastModifiedAt.seconds.inWholeMilliseconds
-                if (lastSyncTime == 0L || remoteModifiedTimeMillis > lastSyncTime) {
-                    logger.debug { "Adding new remote category: ${remote.name} (UID: ${remote.uid})" }
-                    result.add(remote)
-                } else {
-                    logger.debug { "Dropping deleted remote category: ${remote.name} (UID: ${remote.uid})" }
-                }
-            }
-        }
-
-        // Add remaining Local Categories
-        localCategoriesList.forEach { local ->
-            if (local !in processedLocals) {
-                val localModifiedTimeMillis = local.lastModifiedAt.seconds.inWholeMilliseconds
-                if (lastSyncTime == 0L || localModifiedTimeMillis > lastSyncTime) {
-                    logger.debug { "Keeping local only category: ${local.name} (UID: ${local.uid})" }
-                    result.add(local)
-                } else {
-                    logger.debug { "Dropping local category deleted on remote: ${local.name} (UID: ${local.uid})" }
-                }
-            }
-        }
-
-        return result.sortedBy { it.order }
-    }
-
-    private fun mergeSourcesLists(
-        localSources: List<BackupSource>?,
-        remoteSources: List<BackupSource>?,
-    ): List<BackupSource> {
-        // Create maps using sourceId as key
-        val localSourceMap = localSources?.associateBy { it.sourceId } ?: emptyMap()
-        val remoteSourceMap = remoteSources?.associateBy { it.sourceId } ?: emptyMap()
-
-        logger.debug { "Starting source merge. Local sources: ${localSources?.size}, Remote sources: ${remoteSources?.size}" }
-
-        // Merge both source maps
-        val mergedSources =
-            (localSourceMap.keys + remoteSourceMap.keys).distinct().mapNotNull { sourceId ->
-                val localSource = localSourceMap[sourceId]
-                val remoteSource = remoteSourceMap[sourceId]
-
-                logger.debug {
-                    "Processing source ID: $sourceId. Local source: ${localSource != null}, Remote source: ${remoteSource != null}"
-                }
-
-                when {
-                    localSource != null && remoteSource == null -> {
-                        logger.debug { "Using local source: ${localSource.name}." }
-                        localSource
-                    }
-
-                    remoteSource != null && localSource == null -> {
-                        logger.debug { "Using remote source: ${remoteSource.name}." }
-                        remoteSource
-                    }
-
-                    else -> {
-                        logger.debug { "Remote and local have the same source ID: $sourceId. Keeping local." }
-                        localSource
-                    }
-                }
-            }
-
-        logger.debug { "Source merge completed. Total merged sources: ${mergedSources.size}" }
-
-        return mergedSources
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/global/model/table/GlobalMetaTable.kt

@@ -7,12 +7,12 @@ package suwayomi.tachidesk.global.model.table
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
+import org.jetbrains.exposed.dao.id.IntIdTable
 
 /**
  * Metadata storage for clients, server/global level.
  */
 object GlobalMetaTable : IntIdTable() {
-    val key = varchar("meta_key", 256)
+    val key = varchar("key", 256)
     val value = varchar("value", 4096)
 }

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()
+}

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> {
+class CustomCacheMap<K, V> : CacheMap<K, V> {
-    private val cache: MutableMap<K, CompletableFuture<V>> = HashMap()
+    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
 }

server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/CategoryDataLoader.kt

@@ -11,10 +11,10 @@ import com.expediagroup.graphql.dataloader.KotlinDataLoader
 import graphql.GraphQLContext
 import org.dataloader.DataLoader
 import org.dataloader.DataLoaderFactory
-import org.jetbrains.exposed.v1.core.Slf4jSqlDebugLogger
+import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.addLogger
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.graphql.types.CategoryNodeList
 import suwayomi.tachidesk.graphql.types.CategoryNodeList.Companion.toNodeList
 import suwayomi.tachidesk.graphql.types.CategoryType

server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/ChapterDataLoader.kt

@@ -11,28 +11,24 @@ import com.expediagroup.graphql.dataloader.KotlinDataLoader
 import graphql.GraphQLContext
 import org.dataloader.DataLoader
 import org.dataloader.DataLoaderFactory
-import org.jetbrains.exposed.v1.core.Slf4jSqlDebugLogger
+import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.sql.addLogger
-import org.jetbrains.exposed.v1.core.count
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.count
-import org.jetbrains.exposed.v1.core.greater
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.core.greaterEq
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.core.inList
-import org.jetbrains.exposed.v1.jdbc.select
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.graphql.types.ChapterNodeList
 import suwayomi.tachidesk.graphql.types.ChapterNodeList.Companion.toNodeList
 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> =
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType?> =
-        DataLoaderFactory.newDataLoader { ids ->
+        DataLoaderFactory.newDataLoader<Int, ChapterType> { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)
@@ -52,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)
@@ -72,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)
@@ -94,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)
@@ -116,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)
@@ -161,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> =
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType?> =
-        DataLoaderFactory.newDataLoader { ids ->
+        DataLoaderFactory.newDataLoader<Int, ChapterType?> { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)
@@ -181,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> =
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType?> =
-        DataLoaderFactory.newDataLoader { ids ->
+        DataLoaderFactory.newDataLoader<Int, ChapterType?> { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)
@@ -201,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> =
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType?> =
-        DataLoaderFactory.newDataLoader { ids ->
+        DataLoaderFactory.newDataLoader<Int, ChapterType?> { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)
@@ -221,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> =
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType?> =
-        DataLoaderFactory.newDataLoader { ids ->
+        DataLoaderFactory.newDataLoader<Int, ChapterType?> { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)
@@ -241,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> =
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType?> =
-        DataLoaderFactory.newDataLoader { ids ->
+        DataLoaderFactory.newDataLoader<Int, ChapterType?> { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)
@@ -261,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> =
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType?> =
-        DataLoaderFactory.newDataLoader { ids ->
+        DataLoaderFactory.newDataLoader<Int, ChapterType?> { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)

server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/ExtensionDataLoader.kt

@@ -11,19 +11,19 @@ import com.expediagroup.graphql.dataloader.KotlinDataLoader
 import graphql.GraphQLContext
 import org.dataloader.DataLoader
 import org.dataloader.DataLoaderFactory
-import org.jetbrains.exposed.v1.core.Slf4jSqlDebugLogger
+import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.addLogger
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.graphql.types.ExtensionType
 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 {

server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/ExtensionStoreDataLoader.kt

@@ -1,57 +0,0 @@
-package suwayomi.tachidesk.graphql.dataLoaders
-
-import com.expediagroup.graphql.dataloader.KotlinDataLoader
-import graphql.GraphQLContext
-import org.dataloader.DataLoader
-import org.dataloader.DataLoaderFactory
-import org.jetbrains.exposed.v1.core.Slf4jSqlDebugLogger
-import org.jetbrains.exposed.v1.core.inList
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
-import suwayomi.tachidesk.graphql.types.ExtensionNodeList
-import suwayomi.tachidesk.graphql.types.ExtensionNodeList.Companion.toNodeList
-import suwayomi.tachidesk.graphql.types.ExtensionStoreType
-import suwayomi.tachidesk.graphql.types.ExtensionType
-import suwayomi.tachidesk.manga.model.table.ExtensionStoreTable
-import suwayomi.tachidesk.manga.model.table.ExtensionTable
-import suwayomi.tachidesk.server.JavalinSetup.future
-
-class ExtensionStoreDataLoader : KotlinDataLoader<String, ExtensionStoreType> {
-    override val dataLoaderName = "ExtensionStoreDataLoader"
-
-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<String, ExtensionStoreType> =
-        DataLoaderFactory.newDataLoader { ids ->
-            future {
-                transaction {
-                    addLogger(Slf4jSqlDebugLogger)
-                    val extensionStoreByIndexUrl =
-                        ExtensionStoreTable
-                            .selectAll()
-                            .where { ExtensionStoreTable.indexUrl inList ids }
-                            .map { ExtensionStoreType(it) }
-                            .associateBy { it.indexUrl }
-                    ids.map { extensionStoreByIndexUrl[it] }
-                }
-            }
-        }
-}
-
-class ExtensionsForExtensionStore : KotlinDataLoader<String, ExtensionNodeList> {
-    override val dataLoaderName = "ExtensionsForExtensionStore"
-
-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<String, ExtensionNodeList> =
-        DataLoaderFactory.newDataLoader<String, ExtensionNodeList> { ids ->
-            future {
-                transaction {
-                    addLogger(Slf4jSqlDebugLogger)
-                    val extensionByIndexUrl =
-                        ExtensionTable
-                            .selectAll()
-                            .where { ExtensionTable.storeIndexUrl inList ids }
-                            .map { ExtensionType(it) }
-                            .groupBy { it.storeIndexUrl }
-                    ids.map { (extensionByIndexUrl[it] ?: emptyList()).toNodeList() }
-                }
-            }
-        }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/MangaDataLoader.kt

@@ -12,13 +12,11 @@ import graphql.GraphQLContext
 import org.dataloader.DataLoader
 import org.dataloader.DataLoaderFactory
 import org.dataloader.DataLoaderOptions
-import org.jetbrains.exposed.v1.core.Slf4jSqlDebugLogger
+import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.addLogger
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.andWhere
-import org.jetbrains.exposed.v1.core.isNull
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.andWhere
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.graphql.cache.CustomCacheMap
 import suwayomi.tachidesk.graphql.types.MangaNodeList
 import suwayomi.tachidesk.graphql.types.MangaNodeList.Companion.toNodeList
@@ -27,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 {
@@ -124,6 +122,6 @@ class MangaForIdsDataLoader : KotlinDataLoader<List<Int>, MangaNodeList> {
                     }
                 }
             },
-            DataLoaderOptions.newOptions().setCacheMap(CustomCacheMap<List<Int>, MangaNodeList>()).build(),
+            DataLoaderOptions.newOptions().setCacheMap(CustomCacheMap<List<Int>, MangaNodeList>()),
         )
 }

server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/MetaDataLoader.kt

@@ -4,10 +4,10 @@ import com.expediagroup.graphql.dataloader.KotlinDataLoader
 import graphql.GraphQLContext
 import org.dataloader.DataLoader
 import org.dataloader.DataLoaderFactory
-import org.jetbrains.exposed.v1.core.Slf4jSqlDebugLogger
+import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.addLogger
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.global.model.table.GlobalMetaTable
 import suwayomi.tachidesk.graphql.types.CategoryMetaType
 import suwayomi.tachidesk.graphql.types.ChapterMetaType
@@ -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> =
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<String, GlobalMetaType?> =
-        DataLoaderFactory.newDataLoader<String, GlobalMetaType> { ids ->
+        DataLoaderFactory.newDataLoader<String, GlobalMetaType?> { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)

server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/SourceDataLoader.kt

@@ -11,10 +11,10 @@ import com.expediagroup.graphql.dataloader.KotlinDataLoader
 import graphql.GraphQLContext
 import org.dataloader.DataLoader
 import org.dataloader.DataLoaderFactory
-import org.jetbrains.exposed.v1.core.Slf4jSqlDebugLogger
+import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.addLogger
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.graphql.types.SourceNodeList
 import suwayomi.tachidesk.graphql.types.SourceNodeList.Companion.toNodeList
 import suwayomi.tachidesk.graphql.types.SourceType
@@ -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 {

server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/TrackDataLoader.kt

@@ -11,10 +11,10 @@ import com.expediagroup.graphql.dataloader.KotlinDataLoader
 import graphql.GraphQLContext
 import org.dataloader.DataLoader
 import org.dataloader.DataLoaderFactory
-import org.jetbrains.exposed.v1.core.Slf4jSqlDebugLogger
+import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.addLogger
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.graphql.types.TrackRecordNodeList
 import suwayomi.tachidesk.graphql.types.TrackRecordNodeList.Companion.toNodeList
 import suwayomi.tachidesk.graphql.types.TrackRecordType

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

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/CategoryMutation.kt

@@ -1,23 +1,21 @@
-@file:Suppress("RedundantNullableReturnType", "unused")
-
 package suwayomi.tachidesk.graphql.mutations
 
-import org.jetbrains.exposed.v1.core.LikePattern
+import graphql.execution.DataFetcherResult
-import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.sql.LikePattern
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
-import org.jetbrains.exposed.v1.core.greaterEq
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.like
-import org.jetbrains.exposed.v1.core.lessEq
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.minus
-import org.jetbrains.exposed.v1.core.like
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.plus
-import org.jetbrains.exposed.v1.core.minus
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.core.or
+import org.jetbrains.exposed.sql.deleteWhere
-import org.jetbrains.exposed.v1.core.plus
+import org.jetbrains.exposed.sql.insertAndGetId
-import org.jetbrains.exposed.v1.jdbc.deleteWhere
+import org.jetbrains.exposed.sql.or
-import org.jetbrains.exposed.v1.jdbc.insertAndGetId
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.update
-import org.jetbrains.exposed.v1.jdbc.update
+import suwayomi.tachidesk.graphql.asDataFetcherResult
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.CategoryMetaType
 import suwayomi.tachidesk.graphql.types.CategoryType
@@ -44,13 +42,14 @@ class CategoryMutation {
     )
 
     @RequireAuth
-    fun setCategoryMeta(input: SetCategoryMetaInput): SetCategoryMetaPayload? {
+    fun setCategoryMeta(input: SetCategoryMetaInput): DataFetcherResult<SetCategoryMetaPayload?> =
-        val (clientMutationId, meta) = input
+        asDataFetcherResult {
+            val (clientMutationId, meta) = input
 
-        Category.modifyMeta(meta.categoryId, meta.key, meta.value)
+            Category.modifyMeta(meta.categoryId, meta.key, meta.value)
 
-        return SetCategoryMetaPayload(clientMutationId, meta)
+            SetCategoryMetaPayload(clientMutationId, meta)
-    }
+        }
 
     data class DeleteCategoryMetaInput(
         val clientMutationId: String? = null,
@@ -65,33 +64,34 @@ class CategoryMutation {
     )
 
     @RequireAuth
-    fun deleteCategoryMeta(input: DeleteCategoryMetaInput): DeleteCategoryMetaPayload? {
+    fun deleteCategoryMeta(input: DeleteCategoryMetaInput): DataFetcherResult<DeleteCategoryMetaPayload?> =
-        val (clientMutationId, categoryId, key) = input
+        asDataFetcherResult {
+            val (clientMutationId, categoryId, key) = input
 
-        val (meta, category) =
+            val (meta, category) =
-            transaction {
+                transaction {
-                val meta =
+                    val meta =
-                    CategoryMetaTable
+                        CategoryMetaTable
-                        .selectAll()
+                            .selectAll()
-                        .where { (CategoryMetaTable.ref eq categoryId) and (CategoryMetaTable.key eq key) }
+                            .where { (CategoryMetaTable.ref eq categoryId) and (CategoryMetaTable.key eq key) }
-                        .firstOrNull()
+                            .firstOrNull()
 
-                CategoryMetaTable.deleteWhere { (CategoryMetaTable.ref eq categoryId) and (CategoryMetaTable.key eq key) }
+                    CategoryMetaTable.deleteWhere { (CategoryMetaTable.ref eq categoryId) and (CategoryMetaTable.key eq key) }
 
-                val category =
+                    val category =
-                    transaction {
+                        transaction {
-                        CategoryType(CategoryTable.selectAll().where { CategoryTable.id eq categoryId }.first())
+                            CategoryType(CategoryTable.selectAll().where { CategoryTable.id eq categoryId }.first())
-                    }
+                        }
 
-                if (meta != null) {
+                    if (meta != null) {
-                    CategoryMetaType(meta)
+                        CategoryMetaType(meta)
-                } else {
+                    } else {
-                    null
+                        null
-                } to category
+                    } to category
-            }
+                }
 
-        return DeleteCategoryMetaPayload(clientMutationId, meta, category)
+            DeleteCategoryMetaPayload(clientMutationId, meta, category)
-    }
+        }
 
     data class SetCategoryMetasItem(
         val categoryIds: List<Int>,
@@ -110,42 +110,43 @@ class CategoryMutation {
     )
 
     @RequireAuth
-    fun setCategoryMetas(input: SetCategoryMetasInput): SetCategoryMetasPayload? {
+    fun setCategoryMetas(input: SetCategoryMetasInput): DataFetcherResult<SetCategoryMetasPayload?> =
-        val (clientMutationId, items) = input
+        asDataFetcherResult {
+            val (clientMutationId, items) = input
 
-        val metaByCategoryId =
+            val metaByCategoryId =
-            items
+                items
-                .flatMap { item ->
+                    .flatMap { item ->
-                    val metaMap = item.metas.associate { it.key to it.value }
+                        val metaMap = item.metas.associate { it.key to it.value }
-                    item.categoryIds.map { categoryId -> categoryId to metaMap }
+                        item.categoryIds.map { categoryId -> categoryId to metaMap }
-                }.groupBy({ it.first }, { it.second })
+                    }.groupBy({ it.first }, { it.second })
-                .mapValues { (_, maps) -> maps.reduce { acc, map -> acc + map } }
+                    .mapValues { (_, maps) -> maps.reduce { acc, map -> acc + map } }
 
-        Category.modifyCategoriesMetas(metaByCategoryId)
+            Category.modifyCategoriesMetas(metaByCategoryId)
 
-        val allCategoryIds = metaByCategoryId.keys
+            val allCategoryIds = metaByCategoryId.keys
-        val allMetaKeys = metaByCategoryId.values.flatMap { item -> item.keys }.distinct()
+            val allMetaKeys = metaByCategoryId.values.flatMap { item -> item.keys }.distinct()
 
-        val (updatedMetas, categories) =
+            val (updatedMetas, categories) =
-            transaction {
+                transaction {
-                val updatedMetas =
+                    val updatedMetas =
-                    CategoryMetaTable
+                        CategoryMetaTable
-                        .selectAll()
+                            .selectAll()
-                        .where { (CategoryMetaTable.ref inList allCategoryIds) and (CategoryMetaTable.key inList allMetaKeys) }
+                            .where { (CategoryMetaTable.ref inList allCategoryIds) and (CategoryMetaTable.key inList allMetaKeys) }
-                        .map { CategoryMetaType(it) }
+                            .map { CategoryMetaType(it) }
 
-                val categories =
+                    val categories =
-                    CategoryTable
+                        CategoryTable
-                        .selectAll()
+                            .selectAll()
-                        .where { CategoryTable.id inList allCategoryIds }
+                            .where { CategoryTable.id inList allCategoryIds }
-                        .map { CategoryType(it) }
+                            .map { CategoryType(it) }
-                        .distinctBy { it.id }
+                            .distinctBy { it.id }
 
-                updatedMetas to categories
+                    updatedMetas to categories
-            }
+                }
 
-        return SetCategoryMetasPayload(clientMutationId, updatedMetas, categories)
+            SetCategoryMetasPayload(clientMutationId, updatedMetas, categories)
-    }
+        }
 
     data class DeleteCategoryMetasItem(
         val categoryIds: List<Int>,
@@ -165,63 +166,64 @@ class CategoryMutation {
     )
 
     @RequireAuth
-    fun deleteCategoryMetas(input: DeleteCategoryMetasInput): DeleteCategoryMetasPayload? {
+    fun deleteCategoryMetas(input: DeleteCategoryMetasInput): DataFetcherResult<DeleteCategoryMetasPayload?> =
-        val (clientMutationId, items) = input
+        asDataFetcherResult {
+            val (clientMutationId, items) = input
 
-        items.forEach { item ->
+            items.forEach { item ->
-            require(!item.keys.isNullOrEmpty() || !item.prefixes.isNullOrEmpty()) {
+                require(!item.keys.isNullOrEmpty() || !item.prefixes.isNullOrEmpty()) {
-                "Either 'keys' or 'prefixes' must be provided for each item"
+                    "Either 'keys' or 'prefixes' must be provided for each item"
+                }
             }
-        }
 
-        val (allDeletedMetas, allCategoryIds) =
+            val (allDeletedMetas, allCategoryIds) =
-            transaction {
+                transaction {
-                val deletedMetas = mutableListOf<CategoryMetaType>()
+                    val deletedMetas = mutableListOf<CategoryMetaType>()
-                val categoryIds = mutableSetOf<Int>()
+                    val categoryIds = mutableSetOf<Int>()
 
-                items.forEach { item ->
+                    items.forEach { item ->
-                    val keyCondition: Op<Boolean>? =
+                        val keyCondition: Op<Boolean>? =
-                        item.keys?.takeIf { it.isNotEmpty() }?.let { CategoryMetaTable.key inList it }
+                            item.keys?.takeIf { it.isNotEmpty() }?.let { CategoryMetaTable.key inList it }
 
-                    val prefixCondition: Op<Boolean>? =
+                        val prefixCondition: Op<Boolean>? =
-                        item.prefixes
+                            item.prefixes
-                            ?.filter { it.isNotEmpty() }
+                                ?.filter { it.isNotEmpty() }
-                            ?.map { (CategoryMetaTable.key like LikePattern("$it%")) as Op<Boolean> }
+                                ?.map { (CategoryMetaTable.key like LikePattern("$it%")) as Op<Boolean> }
-                            ?.reduceOrNull { acc, op -> acc or op }
+                                ?.reduceOrNull { acc, op -> acc or op }
 
-                    val metaKeyCondition =
+                        val metaKeyCondition =
-                        if (keyCondition != null && prefixCondition != null) {
+                            if (keyCondition != null && prefixCondition != null) {
-                            keyCondition or prefixCondition
+                                keyCondition or prefixCondition
-                        } else {
+                            } else {
-                            keyCondition ?: prefixCondition!!
+                                keyCondition ?: prefixCondition!!
-                        }
+                            }
 
-                    val condition = (CategoryMetaTable.ref inList item.categoryIds) and metaKeyCondition
+                        val condition = (CategoryMetaTable.ref inList item.categoryIds) and metaKeyCondition
 
-                    deletedMetas +=
+                        deletedMetas +=
-                        CategoryMetaTable
+                            CategoryMetaTable
-                            .selectAll()
+                                .selectAll()
-                            .where { condition }
+                                .where { condition }
-                            .map { CategoryMetaType(it) }
+                                .map { CategoryMetaType(it) }
 
-                    CategoryMetaTable.deleteWhere { condition }
+                        CategoryMetaTable.deleteWhere { condition }
-                    categoryIds += item.categoryIds
+                        categoryIds += item.categoryIds
+                    }
+
+                    deletedMetas to categoryIds
                 }
 
-                deletedMetas to categoryIds
+            val categories =
-            }
+                transaction {
+                    CategoryTable
+                        .selectAll()
+                        .where { CategoryTable.id inList allCategoryIds }
+                        .map { CategoryType(it) }
+                        .distinctBy { it.id }
+                }
 
-        val categories =
+            DeleteCategoryMetasPayload(clientMutationId, allDeletedMetas, categories)
-            transaction {
+        }
-                CategoryTable
-                    .selectAll()
-                    .where { CategoryTable.id inList allCategoryIds }
-                    .map { CategoryType(it) }
-                    .distinctBy { it.id }
-            }
-
-        return DeleteCategoryMetasPayload(clientMutationId, allDeletedMetas, categories)
-    }
 
     data class UpdateCategoryPatch(
         val name: String? = null,
@@ -289,38 +291,40 @@ class CategoryMutation {
     }
 
     @RequireAuth
-    fun updateCategory(input: UpdateCategoryInput): UpdateCategoryPayload? {
+    fun updateCategory(input: UpdateCategoryInput): DataFetcherResult<UpdateCategoryPayload?> =
-        val (clientMutationId, id, patch) = input
+        asDataFetcherResult {
+            val (clientMutationId, id, patch) = input
 
-        updateCategories(listOf(id), patch)
+            updateCategories(listOf(id), patch)
 
-        val category =
+            val category =
-            transaction {
+                transaction {
-                CategoryType(CategoryTable.selectAll().where { CategoryTable.id eq id }.first())
+                    CategoryType(CategoryTable.selectAll().where { CategoryTable.id eq id }.first())
-            }
+                }
 
-        return UpdateCategoryPayload(
+            UpdateCategoryPayload(
-            clientMutationId = clientMutationId,
+                clientMutationId = clientMutationId,
-            category = category,
+                category = category,
-        )
+            )
-    }
+        }
 
     @RequireAuth
-    fun updateCategories(input: UpdateCategoriesInput): UpdateCategoriesPayload? {
+    fun updateCategories(input: UpdateCategoriesInput): DataFetcherResult<UpdateCategoriesPayload?> =
-        val (clientMutationId, ids, patch) = input
+        asDataFetcherResult {
+            val (clientMutationId, ids, patch) = input
 
-        updateCategories(ids, patch)
+            updateCategories(ids, patch)
 
-        val categories =
+            val categories =
-            transaction {
+                transaction {
-                CategoryTable.selectAll().where { CategoryTable.id inList ids }.map { CategoryType(it) }
+                    CategoryTable.selectAll().where { CategoryTable.id inList ids }.map { CategoryType(it) }
-            }
+                }
 
-        return UpdateCategoriesPayload(
+            UpdateCategoriesPayload(
-            clientMutationId = clientMutationId,
+                clientMutationId = clientMutationId,
-            categories = categories,
+                categories = categories,
-        )
+            )
-    }
+        }
 
     data class UpdateCategoryOrderPayload(
         val clientMutationId: String?,
@@ -334,48 +338,49 @@ class CategoryMutation {
     )
 
     @RequireAuth
-    fun updateCategoryOrder(input: UpdateCategoryOrderInput): UpdateCategoryOrderPayload? {
+    fun updateCategoryOrder(input: UpdateCategoryOrderInput): DataFetcherResult<UpdateCategoryOrderPayload?> =
-        val (clientMutationId, categoryId, position) = input
+        asDataFetcherResult {
-        require(position > 0) {
+            val (clientMutationId, categoryId, position) = input
-            "'order' must not be <= 0"
+            require(position > 0) {
-        }
+                "'order' must not be <= 0"
-
-        transaction {
-            val currentOrder =
-                CategoryTable
-                    .selectAll()
-                    .where { CategoryTable.id eq categoryId }
-                    .first()[CategoryTable.order]
-
-            if (currentOrder != position) {
-                if (position < currentOrder) {
-                    CategoryTable.update({ CategoryTable.order greaterEq position }) {
-                        it[CategoryTable.order] = CategoryTable.order + 1
-                    }
-                } else {
-                    CategoryTable.update({ CategoryTable.order lessEq position }) {
-                        it[CategoryTable.order] = CategoryTable.order - 1
-                    }
-                }
-
-                CategoryTable.update({ CategoryTable.id eq categoryId }) {
-                    it[CategoryTable.order] = position
-                }
             }
-        }
 
-        Category.normalizeCategories()
-
-        val categories =
             transaction {
-                CategoryTable.selectAll().orderBy(CategoryTable.order).map { CategoryType(it) }
+                val currentOrder =
+                    CategoryTable
+                        .selectAll()
+                        .where { CategoryTable.id eq categoryId }
+                        .first()[CategoryTable.order]
+
+                if (currentOrder != position) {
+                    if (position < currentOrder) {
+                        CategoryTable.update({ CategoryTable.order greaterEq position }) {
+                            it[CategoryTable.order] = CategoryTable.order + 1
+                        }
+                    } else {
+                        CategoryTable.update({ CategoryTable.order lessEq position }) {
+                            it[CategoryTable.order] = CategoryTable.order - 1
+                        }
+                    }
+
+                    CategoryTable.update({ CategoryTable.id eq categoryId }) {
+                        it[CategoryTable.order] = position
+                    }
+                }
             }
 
-        return UpdateCategoryOrderPayload(
+            Category.normalizeCategories()
-            clientMutationId = clientMutationId,
+
-            categories = categories,
+            val categories =
-        )
+                transaction {
-    }
+                    CategoryTable.selectAll().orderBy(CategoryTable.order).map { CategoryType(it) }
+                }
+
+            UpdateCategoryOrderPayload(
+                clientMutationId = clientMutationId,
+                categories = categories,
+            )
+        }
 
     data class CreateCategoryInput(
         val clientMutationId: String? = null,
@@ -392,52 +397,53 @@ class CategoryMutation {
     )
 
     @RequireAuth
-    fun createCategory(input: CreateCategoryInput): CreateCategoryPayload? {
+    fun createCategory(input: CreateCategoryInput): DataFetcherResult<CreateCategoryPayload?> =
-        val (clientMutationId, name, order, default, includeInUpdate, includeInDownload) = input
+        asDataFetcherResult {
-        transaction {
+            val (clientMutationId, name, order, default, includeInUpdate, includeInDownload) = input
-            require(CategoryTable.selectAll().where { CategoryTable.name eq input.name }.isEmpty()) {
-                "'name' must be unique"
-            }
-        }
-        require(!name.equals(Category.DEFAULT_CATEGORY_NAME, ignoreCase = true)) {
-            "'name' must not be ${Category.DEFAULT_CATEGORY_NAME}"
-        }
-        if (order != null) {
-            require(order > 0) {
-                "'order' must not be <= 0"
-            }
-        }
-
-        val category =
             transaction {
-                if (order != null) {
+                require(CategoryTable.selectAll().where { CategoryTable.name eq input.name }.isEmpty()) {
-                    CategoryTable.update({ CategoryTable.order greaterEq order }) {
+                    "'name' must be unique"
-                        it[CategoryTable.order] = CategoryTable.order + 1
+                }
+            }
+            require(!name.equals(Category.DEFAULT_CATEGORY_NAME, ignoreCase = true)) {
+                "'name' must not be ${Category.DEFAULT_CATEGORY_NAME}"
+            }
+            if (order != null) {
+                require(order > 0) {
+                    "'order' must not be <= 0"
+                }
+            }
+
+            val category =
+                transaction {
+                    if (order != null) {
+                        CategoryTable.update({ CategoryTable.order greaterEq order }) {
+                            it[CategoryTable.order] = CategoryTable.order + 1
+                        }
                     }
+
+                    val id =
+                        CategoryTable.insertAndGetId {
+                            it[CategoryTable.name] = input.name
+                            it[CategoryTable.order] = order ?: Int.MAX_VALUE
+                            if (default != null) {
+                                it[CategoryTable.isDefault] = default
+                            }
+                            if (includeInUpdate != null) {
+                                it[CategoryTable.includeInUpdate] = includeInUpdate.value
+                            }
+                            if (includeInDownload != null) {
+                                it[CategoryTable.includeInDownload] = includeInDownload.value
+                            }
+                        }
+
+                    Category.normalizeCategories()
+
+                    CategoryType(CategoryTable.selectAll().where { CategoryTable.id eq id }.first())
                 }
 
-                val id =
+            CreateCategoryPayload(clientMutationId, category)
-                    CategoryTable.insertAndGetId {
+        }
-                        it[CategoryTable.name] = input.name
-                        it[CategoryTable.order] = order ?: Int.MAX_VALUE
-                        if (default != null) {
-                            it[CategoryTable.isDefault] = default
-                        }
-                        if (includeInUpdate != null) {
-                            it[CategoryTable.includeInUpdate] = includeInUpdate.value
-                        }
-                        if (includeInDownload != null) {
-                            it[CategoryTable.includeInDownload] = includeInDownload.value
-                        }
-                    }
-
-                Category.normalizeCategories()
-
-                CategoryType(CategoryTable.selectAll().where { CategoryTable.id eq id }.first())
-            }
-
-        return CreateCategoryPayload(clientMutationId, category)
-    }
 
     data class DeleteCategoryInput(
         val clientMutationId: String? = null,
@@ -451,45 +457,47 @@ class CategoryMutation {
     )
 
     @RequireAuth
-    fun deleteCategory(input: DeleteCategoryInput): DeleteCategoryPayload? {
+    fun deleteCategory(input: DeleteCategoryInput): DataFetcherResult<DeleteCategoryPayload?> {
-        val (clientMutationId, categoryId) = input
+        return asDataFetcherResult {
-        if (categoryId == 0) { // Don't delete default category
+            val (clientMutationId, categoryId) = input
-            return DeleteCategoryPayload(
+            if (categoryId == 0) { // Don't delete default category
-                clientMutationId,
+                return@asDataFetcherResult DeleteCategoryPayload(
-                null,
+                    clientMutationId,
-                emptyList(),
+                    null,
-            )
+                    emptyList(),
-        }
+                )
-
-        val (category, mangas) =
-            transaction {
-                val category =
-                    CategoryTable
-                        .selectAll()
-                        .where { CategoryTable.id eq categoryId }
-                        .firstOrNull()
-
-                val mangas =
-                    transaction {
-                        MangaTable
-                            .innerJoin(CategoryMangaTable)
-                            .selectAll()
-                            .where { CategoryMangaTable.category eq categoryId }
-                            .map { MangaType(it) }
-                    }
-
-                CategoryTable.deleteWhere { CategoryTable.id eq categoryId }
-
-                Category.normalizeCategories()
-
-                if (category != null) {
-                    CategoryType(category)
-                } else {
-                    null
-                } to mangas
             }
 
-        return DeleteCategoryPayload(clientMutationId, category, mangas)
+            val (category, mangas) =
+                transaction {
+                    val category =
+                        CategoryTable
+                            .selectAll()
+                            .where { CategoryTable.id eq categoryId }
+                            .firstOrNull()
+
+                    val mangas =
+                        transaction {
+                            MangaTable
+                                .innerJoin(CategoryMangaTable)
+                                .selectAll()
+                                .where { CategoryMangaTable.category eq categoryId }
+                                .map { MangaType(it) }
+                        }
+
+                    CategoryTable.deleteWhere { CategoryTable.id eq categoryId }
+
+                    Category.normalizeCategories()
+
+                    if (category != null) {
+                        CategoryType(category)
+                    } else {
+                        null
+                    } to mangas
+                }
+
+            DeleteCategoryPayload(clientMutationId, category, mangas)
+        }
     }
 
     data class UpdateMangaCategoriesPatch(
@@ -539,36 +547,38 @@ class CategoryMutation {
     }
 
     @RequireAuth
-    fun updateMangaCategories(input: UpdateMangaCategoriesInput): UpdateMangaCategoriesPayload? {
+    fun updateMangaCategories(input: UpdateMangaCategoriesInput): DataFetcherResult<UpdateMangaCategoriesPayload?> =
-        val (clientMutationId, id, patch) = input
+        asDataFetcherResult {
+            val (clientMutationId, id, patch) = input
 
-        updateMangas(listOf(id), patch)
+            updateMangas(listOf(id), patch)
 
-        val manga =
+            val manga =
-            transaction {
+                transaction {
-                MangaType(MangaTable.selectAll().where { MangaTable.id eq id }.first())
+                    MangaType(MangaTable.selectAll().where { MangaTable.id eq id }.first())
-            }
+                }
 
-        return UpdateMangaCategoriesPayload(
+            UpdateMangaCategoriesPayload(
-            clientMutationId = clientMutationId,
+                clientMutationId = clientMutationId,
-            manga = manga,
+                manga = manga,
-        )
+            )
-    }
+        }
 
     @RequireAuth
-    fun updateMangasCategories(input: UpdateMangasCategoriesInput): UpdateMangasCategoriesPayload? {
+    fun updateMangasCategories(input: UpdateMangasCategoriesInput): DataFetcherResult<UpdateMangasCategoriesPayload?> =
-        val (clientMutationId, ids, patch) = input
+        asDataFetcherResult {
+            val (clientMutationId, ids, patch) = input
 
-        updateMangas(ids, patch)
+            updateMangas(ids, patch)
 
-        val mangas =
+            val mangas =
-            transaction {
+                transaction {
-                MangaTable.selectAll().where { MangaTable.id inList ids }.map { MangaType(it) }
+                    MangaTable.selectAll().where { MangaTable.id inList ids }.map { MangaType(it) }
-            }
+                }
 
-        return UpdateMangasCategoriesPayload(
+            UpdateMangasCategoriesPayload(
-            clientMutationId = clientMutationId,
+                clientMutationId = clientMutationId,
-            mangas = mangas,
+                mangas = mangas,
-        )
+            )
-    }
+        }
 }

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ChapterMutation.kt

@@ -1,32 +1,28 @@
-@file:Suppress("RedundantNullableReturnType", "unused")
-
 package suwayomi.tachidesk.graphql.mutations
 
-import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated
+import graphql.execution.DataFetcherResult
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
-import org.jetbrains.exposed.v1.core.LikePattern
+import org.jetbrains.exposed.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.sql.LikePattern
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.like
-import org.jetbrains.exposed.v1.core.like
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.core.or
+import org.jetbrains.exposed.sql.deleteWhere
-import org.jetbrains.exposed.v1.core.statements.BatchUpdateStatement
+import org.jetbrains.exposed.sql.or
-import org.jetbrains.exposed.v1.jdbc.deleteWhere
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.select
+import org.jetbrains.exposed.sql.statements.BatchUpdateStatement
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.statements.toExecutable
+import org.jetbrains.exposed.sql.update
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import suwayomi.tachidesk.graphql.asDataFetcherResult
-import org.jetbrains.exposed.v1.jdbc.update
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.ChapterMetaType
 import suwayomi.tachidesk.graphql.types.ChapterType
 import suwayomi.tachidesk.graphql.types.MetaInput
 import suwayomi.tachidesk.graphql.types.SyncConflictInfoType
 import suwayomi.tachidesk.manga.impl.Chapter
-import suwayomi.tachidesk.manga.impl.Manga
 import suwayomi.tachidesk.manga.impl.chapter.getChapterDownloadReadyById
 import suwayomi.tachidesk.manga.impl.sync.KoreaderSyncService
 import suwayomi.tachidesk.manga.model.table.ChapterMetaTable
@@ -94,23 +90,22 @@ class ChapterMutation {
             if (patch.isRead != null || patch.isBookmarked != null || patch.lastPageRead != null) {
                 val now = Instant.now().epochSecond
 
-                BatchUpdateStatement(ChapterTable)
+                BatchUpdateStatement(ChapterTable).apply {
-                    .apply {
+                    ids.forEach { chapterId ->
-                        ids.forEach { chapterId ->
+                        addBatch(EntityID(chapterId, ChapterTable))
-                            addBatch(EntityID(chapterId, ChapterTable))
+                        patch.isRead?.also {
-                            patch.isRead?.also {
+                            this[ChapterTable.isRead] = it
-                                this[ChapterTable.isRead] = it
-                            }
-                            patch.isBookmarked?.also {
-                                this[ChapterTable.isBookmarked] = it
-                            }
-                            patch.lastPageRead?.also {
-                                this[ChapterTable.lastPageRead] = it.coerceAtMost(chapterIdToPageCount[chapterId] ?: 0).coerceAtLeast(0)
-                                this[ChapterTable.lastReadAt] = now
-                            }
                         }
-                    }.toExecutable()
+                        patch.isBookmarked?.also {
-                    .execute(this@transaction)
+                            this[ChapterTable.isBookmarked] = it
+                        }
+                        patch.lastPageRead?.also {
+                            this[ChapterTable.lastPageRead] = it.coerceAtMost(chapterIdToPageCount[chapterId] ?: 0).coerceAtLeast(0)
+                            this[ChapterTable.lastReadAt] = now
+                        }
+                    }
+                    execute(this@transaction)
+                }
             }
         }
 
@@ -125,38 +120,40 @@ class ChapterMutation {
     }
 
     @RequireAuth
-    fun updateChapter(input: UpdateChapterInput): UpdateChapterPayload? {
+    fun updateChapter(input: UpdateChapterInput): DataFetcherResult<UpdateChapterPayload?> =
-        val (clientMutationId, id, patch) = input
+        asDataFetcherResult {
+            val (clientMutationId, id, patch) = input
 
-        updateChapters(listOf(id), patch)
+            updateChapters(listOf(id), patch)
 
-        val chapter =
+            val chapter =
-            transaction {
+                transaction {
-                ChapterType(ChapterTable.selectAll().where { ChapterTable.id eq id }.first())
+                    ChapterType(ChapterTable.selectAll().where { ChapterTable.id eq id }.first())
-            }
+                }
 
-        return UpdateChapterPayload(
+            UpdateChapterPayload(
-            clientMutationId = clientMutationId,
+                clientMutationId = clientMutationId,
-            chapter = chapter,
+                chapter = chapter,
-        )
+            )
-    }
+        }
 
     @RequireAuth
-    fun updateChapters(input: UpdateChaptersInput): UpdateChaptersPayload? {
+    fun updateChapters(input: UpdateChaptersInput): DataFetcherResult<UpdateChaptersPayload?> =
-        val (clientMutationId, ids, patch) = input
+        asDataFetcherResult {
+            val (clientMutationId, ids, patch) = input
 
-        updateChapters(ids, patch)
+            updateChapters(ids, patch)
 
-        val chapters =
+            val chapters =
-            transaction {
+                transaction {
-                ChapterTable.selectAll().where { ChapterTable.id inList ids }.map { ChapterType(it) }
+                    ChapterTable.selectAll().where { ChapterTable.id inList ids }.map { ChapterType(it) }
-            }
+                }
 
-        return UpdateChaptersPayload(
+            UpdateChaptersPayload(
-            clientMutationId = clientMutationId,
+                clientMutationId = clientMutationId,
-            chapters = chapters,
+                chapters = chapters,
-        )
+            )
-    }
+        }
 
     data class FetchChaptersInput(
         val clientMutationId: String? = null,
@@ -169,26 +166,27 @@ class ChapterMutation {
     )
 
     @RequireAuth
-    @GraphQLDeprecated("Deprecated in Tachiyomix 1.6", ReplaceWith("fetchMangaAndChapters"))
+    fun fetchChapters(input: FetchChaptersInput): CompletableFuture<DataFetcherResult<FetchChaptersPayload?>> {
-    fun fetchChapters(input: FetchChaptersInput): CompletableFuture<FetchChaptersPayload?> {
         val (clientMutationId, mangaId) = input
 
         return future {
-            Manga.updateMangaAndChapters(mangaId, updateManga = false)
+            asDataFetcherResult {
+                Chapter.fetchChapterList(mangaId)
 
-            val chapters =
+                val chapters =
-                transaction {
+                    transaction {
-                    ChapterTable
+                        ChapterTable
-                        .selectAll()
+                            .selectAll()
-                        .where { ChapterTable.manga eq mangaId }
+                            .where { ChapterTable.manga eq mangaId }
-                        .orderBy(ChapterTable.sourceOrder)
+                            .orderBy(ChapterTable.sourceOrder)
-                        .map { ChapterType(it) }
+                            .map { ChapterType(it) }
-                }
+                    }
 
-            FetchChaptersPayload(
+                FetchChaptersPayload(
-                clientMutationId = clientMutationId,
+                    clientMutationId = clientMutationId,
-                chapters = chapters,
+                    chapters = chapters,
-            )
+                )
+            }
         }
     }
 
@@ -203,13 +201,14 @@ class ChapterMutation {
     )
 
     @RequireAuth
-    fun setChapterMeta(input: SetChapterMetaInput): SetChapterMetaPayload? {
+    fun setChapterMeta(input: SetChapterMetaInput): DataFetcherResult<SetChapterMetaPayload?> =
-        val (clientMutationId, meta) = input
+        asDataFetcherResult {
+            val (clientMutationId, meta) = input
 
-        Chapter.modifyChapterMeta(meta.chapterId, meta.key, meta.value)
+            Chapter.modifyChapterMeta(meta.chapterId, meta.key, meta.value)
 
-        return SetChapterMetaPayload(clientMutationId, meta)
+            SetChapterMetaPayload(clientMutationId, meta)
-    }
+        }
 
     data class DeleteChapterMetaInput(
         val clientMutationId: String? = null,
@@ -224,33 +223,34 @@ class ChapterMutation {
     )
 
     @RequireAuth
-    fun deleteChapterMeta(input: DeleteChapterMetaInput): DeleteChapterMetaPayload? {
+    fun deleteChapterMeta(input: DeleteChapterMetaInput): DataFetcherResult<DeleteChapterMetaPayload?> =
-        val (clientMutationId, chapterId, key) = input
+        asDataFetcherResult {
+            val (clientMutationId, chapterId, key) = input
 
-        val (meta, chapter) =
+            val (meta, chapter) =
-            transaction {
+                transaction {
-                val meta =
+                    val meta =
-                    ChapterMetaTable
+                        ChapterMetaTable
-                        .selectAll()
+                            .selectAll()
-                        .where { (ChapterMetaTable.ref eq chapterId) and (ChapterMetaTable.key eq key) }
+                            .where { (ChapterMetaTable.ref eq chapterId) and (ChapterMetaTable.key eq key) }
-                        .firstOrNull()
+                            .firstOrNull()
 
-                ChapterMetaTable.deleteWhere { (ChapterMetaTable.ref eq chapterId) and (ChapterMetaTable.key eq key) }
+                    ChapterMetaTable.deleteWhere { (ChapterMetaTable.ref eq chapterId) and (ChapterMetaTable.key eq key) }
 
-                val chapter =
+                    val chapter =
-                    transaction {
+                        transaction {
-                        ChapterType(ChapterTable.selectAll().where { ChapterTable.id eq chapterId }.first())
+                            ChapterType(ChapterTable.selectAll().where { ChapterTable.id eq chapterId }.first())
-                    }
+                        }
 
-                if (meta != null) {
+                    if (meta != null) {
-                    ChapterMetaType(meta)
+                        ChapterMetaType(meta)
-                } else {
+                    } else {
-                    null
+                        null
-                } to chapter
+                    } to chapter
-            }
+                }
 
-        return DeleteChapterMetaPayload(clientMutationId, meta, chapter)
+            DeleteChapterMetaPayload(clientMutationId, meta, chapter)
-    }
+        }
 
     data class SetChapterMetasItem(
         val chapterIds: List<Int>,
@@ -269,42 +269,43 @@ class ChapterMutation {
     )
 
     @RequireAuth
-    fun setChapterMetas(input: SetChapterMetasInput): SetChapterMetasPayload? {
+    fun setChapterMetas(input: SetChapterMetasInput): DataFetcherResult<SetChapterMetasPayload?> =
-        val (clientMutationId, items) = input
+        asDataFetcherResult {
+            val (clientMutationId, items) = input
 
-        val metaByChapterId =
+            val metaByChapterId =
-            items
+                items
-                .flatMap { item ->
+                    .flatMap { item ->
-                    val metaMap = item.metas.associate { it.key to it.value }
+                        val metaMap = item.metas.associate { it.key to it.value }
-                    item.chapterIds.map { chapterId -> chapterId to metaMap }
+                        item.chapterIds.map { chapterId -> chapterId to metaMap }
-                }.groupBy({ it.first }, { it.second })
+                    }.groupBy({ it.first }, { it.second })
-                .mapValues { (_, maps) -> maps.reduce { acc, map -> acc + map } }
+                    .mapValues { (_, maps) -> maps.reduce { acc, map -> acc + map } }
 
-        Chapter.modifyChaptersMetas(metaByChapterId)
+            Chapter.modifyChaptersMetas(metaByChapterId)
 
-        val allChapterIds = metaByChapterId.keys
+            val allChapterIds = metaByChapterId.keys
-        val allMetaKeys = metaByChapterId.values.flatMap { it.keys }.distinct()
+            val allMetaKeys = metaByChapterId.values.flatMap { it.keys }.distinct()
 
-        val (updatedMetas, chapters) =
+            val (updatedMetas, chapters) =
-            transaction {
+                transaction {
-                val updatedMetas =
+                    val updatedMetas =
-                    ChapterMetaTable
+                        ChapterMetaTable
-                        .selectAll()
+                            .selectAll()
-                        .where { (ChapterMetaTable.ref inList allChapterIds) and (ChapterMetaTable.key inList allMetaKeys) }
+                            .where { (ChapterMetaTable.ref inList allChapterIds) and (ChapterMetaTable.key inList allMetaKeys) }
-                        .map { ChapterMetaType(it) }
+                            .map { ChapterMetaType(it) }
 
-                val chapters =
+                    val chapters =
-                    ChapterTable
+                        ChapterTable
-                        .selectAll()
+                            .selectAll()
-                        .where { ChapterTable.id inList allChapterIds }
+                            .where { ChapterTable.id inList allChapterIds }
-                        .map { ChapterType(it) }
+                            .map { ChapterType(it) }
-                        .distinctBy { it.id }
+                            .distinctBy { it.id }
 
-                updatedMetas to chapters
+                    updatedMetas to chapters
-            }
+                }
 
-        return SetChapterMetasPayload(clientMutationId, updatedMetas, chapters)
+            SetChapterMetasPayload(clientMutationId, updatedMetas, chapters)
-    }
+        }
 
     data class DeleteChapterMetasItem(
         val chapterIds: List<Int>,
@@ -324,63 +325,64 @@ class ChapterMutation {
     )
 
     @RequireAuth
-    fun deleteChapterMetas(input: DeleteChapterMetasInput): DeleteChapterMetasPayload? {
+    fun deleteChapterMetas(input: DeleteChapterMetasInput): DataFetcherResult<DeleteChapterMetasPayload?> =
-        val (clientMutationId, items) = input
+        asDataFetcherResult {
+            val (clientMutationId, items) = input
 
-        items.forEach { item ->
+            items.forEach { item ->
-            require(!item.keys.isNullOrEmpty() || !item.prefixes.isNullOrEmpty()) {
+                require(!item.keys.isNullOrEmpty() || !item.prefixes.isNullOrEmpty()) {
-                "Either 'keys' or 'prefixes' must be provided for each item"
+                    "Either 'keys' or 'prefixes' must be provided for each item"
+                }
             }
-        }
 
-        val (allDeletedMetas, allChapterIds) =
+            val (allDeletedMetas, allChapterIds) =
-            transaction {
+                transaction {
-                val deletedMetas = mutableListOf<ChapterMetaType>()
+                    val deletedMetas = mutableListOf<ChapterMetaType>()
-                val chapterIds = mutableSetOf<Int>()
+                    val chapterIds = mutableSetOf<Int>()
 
-                items.forEach { item ->
+                    items.forEach { item ->
-                    val keyCondition: Op<Boolean>? =
+                        val keyCondition: Op<Boolean>? =
-                        item.keys?.takeIf { it.isNotEmpty() }?.let { ChapterMetaTable.key inList it }
+                            item.keys?.takeIf { it.isNotEmpty() }?.let { ChapterMetaTable.key inList it }
 
-                    val prefixCondition: Op<Boolean>? =
+                        val prefixCondition: Op<Boolean>? =
-                        item.prefixes
+                            item.prefixes
-                            ?.filter { it.isNotEmpty() }
+                                ?.filter { it.isNotEmpty() }
-                            ?.map { (ChapterMetaTable.key like LikePattern("$it%")) as Op<Boolean> }
+                                ?.map { (ChapterMetaTable.key like LikePattern("$it%")) as Op<Boolean> }
-                            ?.reduceOrNull { acc, op -> acc or op }
+                                ?.reduceOrNull { acc, op -> acc or op }
 
-                    val metaKeyCondition =
+                        val metaKeyCondition =
-                        if (keyCondition != null && prefixCondition != null) {
+                            if (keyCondition != null && prefixCondition != null) {
-                            keyCondition or prefixCondition
+                                keyCondition or prefixCondition
-                        } else {
+                            } else {
-                            keyCondition ?: prefixCondition!!
+                                keyCondition ?: prefixCondition!!
-                        }
+                            }
 
-                    val condition = (ChapterMetaTable.ref inList item.chapterIds) and metaKeyCondition
+                        val condition = (ChapterMetaTable.ref inList item.chapterIds) and metaKeyCondition
 
-                    deletedMetas +=
+                        deletedMetas +=
-                        ChapterMetaTable
+                            ChapterMetaTable
-                            .selectAll()
+                                .selectAll()
-                            .where { condition }
+                                .where { condition }
-                            .map { ChapterMetaType(it) }
+                                .map { ChapterMetaType(it) }
 
-                    ChapterMetaTable.deleteWhere { condition }
+                        ChapterMetaTable.deleteWhere { condition }
-                    chapterIds += item.chapterIds
+                        chapterIds += item.chapterIds
+                    }
+
+                    deletedMetas to chapterIds
                 }
 
-                deletedMetas to chapterIds
+            val chapters =
-            }
+                transaction {
+                    ChapterTable
+                        .selectAll()
+                        .where { ChapterTable.id inList allChapterIds }
+                        .map { ChapterType(it) }
+                        .distinctBy { it.id }
+                }
 
-        val chapters =
+            DeleteChapterMetasPayload(clientMutationId, allDeletedMetas, chapters)
-            transaction {
+        }
-                ChapterTable
-                    .selectAll()
-                    .where { ChapterTable.id inList allChapterIds }
-                    .map { ChapterType(it) }
-                    .distinctBy { it.id }
-            }
-
-        return DeleteChapterMetasPayload(clientMutationId, allDeletedMetas, chapters)
-    }
 
     data class FetchChapterPagesInput(
         val clientMutationId: String? = null,
@@ -403,65 +405,67 @@ 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 {
-            var chapter = getChapterDownloadReadyById(chapterId)
+            asDataFetcherResult {
-            val syncResult = KoreaderSyncService.checkAndPullProgress(chapter.id)
+                var chapter = getChapterDownloadReadyById(chapterId)
-            var syncConflictInfo: SyncConflictInfoType? = null
+                val syncResult = KoreaderSyncService.checkAndPullProgress(chapter.id)
+                var syncConflictInfo: SyncConflictInfoType? = null
 
-            if (syncResult != null) {
+                if (syncResult != null) {
-                if (syncResult.isConflict) {
+                    if (syncResult.isConflict) {
-                    syncConflictInfo =
+                        syncConflictInfo =
-                        SyncConflictInfoType(
+                            SyncConflictInfoType(
-                            deviceName = syncResult.device,
+                                deviceName = syncResult.device,
-                            remotePage = syncResult.pageRead,
+                                remotePage = syncResult.pageRead,
+                            )
+                    }
+
+                    if (syncResult.shouldUpdate) {
+                        // Update DB for SILENT and RECEIVE
+                        transaction {
+                            ChapterTable.update({ ChapterTable.id eq chapter.id }) {
+                                it[lastPageRead] = syncResult.pageRead
+                                it[lastReadAt] = syncResult.timestamp
+                            }
+                        }
+                    }
+                    // For PROMPT, SILENT, and RECEIVE, return the remote progress
+                    chapter =
+                        chapter.copy(
+                            lastPageRead = if (syncResult.shouldUpdate) syncResult.pageRead else chapter.lastPageRead,
+                            lastReadAt = if (syncResult.shouldUpdate) syncResult.timestamp else chapter.lastReadAt,
                         )
                 }
 
-                if (syncResult.shouldUpdate) {
+                val params =
-                    // Update DB for SILENT and RECEIVE
+                    buildString {
-                    transaction {
+                        if (paramsMap.isNotEmpty()) {
-                        ChapterTable.update({ ChapterTable.id eq chapter.id }) {
+                            append("?")
-                            it[lastPageRead] = syncResult.pageRead
+                            paramsMap.entries.forEach { entry ->
-                            it[lastReadAt] = syncResult.timestamp
+                                if (length > 1) {
-                        }
+                                    append("&")
-                    }
+                                }
-                }
+                                append(entry.key)
-                // For PROMPT, SILENT, and RECEIVE, return the remote progress
+                                append("=")
-                chapter =
+                                append(URLEncoder.encode(entry.value, Charsets.UTF_8))
-                    chapter.copy(
-                        lastPageRead = if (syncResult.shouldUpdate) syncResult.pageRead else chapter.lastPageRead,
-                        lastReadAt = if (syncResult.shouldUpdate) syncResult.timestamp else chapter.lastReadAt,
-                    )
-            }
-
-            val params =
-                buildString {
-                    if (paramsMap.isNotEmpty()) {
-                        append("?")
-                        paramsMap.entries.forEach { entry ->
-                            if (length > 1) {
-                                append("&")
                             }
-                            append(entry.key)
-                            append("=")
-                            append(URLEncoder.encode(entry.value, Charsets.UTF_8))
                         }
                     }
-                }
 
-            FetchChapterPagesPayload(
+                FetchChapterPagesPayload(
-                clientMutationId = clientMutationId,
+                    clientMutationId = clientMutationId,
-                pages =
+                    pages =
-                    List(chapter.pageCount) { index ->
+                        List(chapter.pageCount) { index ->
-                        "/api/v1/manga/${chapter.mangaId}/chapter/${chapter.index}/page/${index}$params"
+                            "/api/v1/manga/${chapter.mangaId}/chapter/${chapter.index}/page/${index}$params"
-                    },
+                        },
-                chapter = ChapterType(chapter),
+                    chapter = ChapterType(chapter),
-                syncConflict = syncConflictInfo,
+                    syncConflict = syncConflictInfo,
-            )
+                )
+            }
         }
     }
 }

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/DownloadMutation.kt

@@ -1,13 +1,11 @@
-@file:Suppress("RedundantNullableReturnType", "unused")
-
 package suwayomi.tachidesk.graphql.mutations
 
+import graphql.execution.DataFetcherResult
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.withTimeout
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import suwayomi.tachidesk.graphql.asDataFetcherResult
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.ChapterType
 import suwayomi.tachidesk.graphql.types.DownloadStatus
@@ -32,21 +30,23 @@ class DownloadMutation {
     )
 
     @RequireAuth
-    fun deleteDownloadedChapters(input: DeleteDownloadedChaptersInput): DeleteDownloadedChaptersPayload? {
+    fun deleteDownloadedChapters(input: DeleteDownloadedChaptersInput): DataFetcherResult<DeleteDownloadedChaptersPayload?> {
         val (clientMutationId, chapters) = input
 
-        Chapter.deleteChapters(chapters)
+        return asDataFetcherResult {
+            Chapter.deleteChapters(chapters)
 
-        return DeleteDownloadedChaptersPayload(
+            DeleteDownloadedChaptersPayload(
-            clientMutationId = clientMutationId,
+                clientMutationId = clientMutationId,
-            chapters =
+                chapters =
-                transaction {
+                    transaction {
-                    ChapterTable
+                        ChapterTable
-                        .selectAll()
+                            .selectAll()
-                        .where { ChapterTable.id inList chapters }
+                            .where { ChapterTable.id inList chapters }
-                        .map { ChapterType(it) }
+                            .map { ChapterType(it) }
-                },
+                    },
-        )
+            )
+        }
     }
 
     data class DeleteDownloadedChapterInput(
@@ -60,18 +60,20 @@ class DownloadMutation {
     )
 
     @RequireAuth
-    fun deleteDownloadedChapter(input: DeleteDownloadedChapterInput): DeleteDownloadedChapterPayload? {
+    fun deleteDownloadedChapter(input: DeleteDownloadedChapterInput): DataFetcherResult<DeleteDownloadedChapterPayload?> {
         val (clientMutationId, chapter) = input
 
-        Chapter.deleteChapters(listOf(chapter))
+        return asDataFetcherResult {
+            Chapter.deleteChapters(listOf(chapter))
 
-        return DeleteDownloadedChapterPayload(
+            DeleteDownloadedChapterPayload(
-            clientMutationId = clientMutationId,
+                clientMutationId = clientMutationId,
-            chapters =
+                chapters =
-                transaction {
+                    transaction {
-                    ChapterType(ChapterTable.selectAll().where { ChapterTable.id eq chapter }.first())
+                        ChapterType(ChapterTable.selectAll().where { ChapterTable.id eq chapter }.first())
-                },
+                    },
-        )
+            )
+        }
     }
 
     data class EnqueueChapterDownloadsInput(
@@ -85,24 +87,28 @@ class DownloadMutation {
     )
 
     @RequireAuth
-    fun enqueueChapterDownloads(input: EnqueueChapterDownloadsInput): CompletableFuture<EnqueueChapterDownloadsPayload?> {
+    fun enqueueChapterDownloads(
+        input: EnqueueChapterDownloadsInput,
+    ): CompletableFuture<DataFetcherResult<EnqueueChapterDownloadsPayload?>> {
         val (clientMutationId, chapters) = input
 
         return future {
-            DownloadManager.enqueue(DownloadManager.EnqueueInput(chapters))
+            asDataFetcherResult {
+                DownloadManager.enqueue(DownloadManager.EnqueueInput(chapters))
 
-            EnqueueChapterDownloadsPayload(
+                EnqueueChapterDownloadsPayload(
-                clientMutationId = clientMutationId,
+                    clientMutationId = clientMutationId,
-                downloadStatus =
+                    downloadStatus =
-                    withTimeout(30.seconds) {
+                        withTimeout(30.seconds) {
-                        DownloadStatus(
+                            DownloadStatus(
-                            DownloadManager.updates
+                                DownloadManager.updates
-                                .first {
+                                    .first {
-                                    DownloadManager.getStatus().queue.any { it.chapterId in chapters }
+                                        DownloadManager.getStatus().queue.any { it.chapterId in chapters }
-                                }.let { DownloadManager.getStatus() },
+                                    }.let { DownloadManager.getStatus() },
-                        )
+                            )
-                    },
+                        },
-            )
+                )
+            }
         }
     }
 
@@ -117,23 +123,25 @@ class DownloadMutation {
     )
 
     @RequireAuth
-    fun enqueueChapterDownload(input: EnqueueChapterDownloadInput): CompletableFuture<EnqueueChapterDownloadPayload?> {
+    fun enqueueChapterDownload(input: EnqueueChapterDownloadInput): CompletableFuture<DataFetcherResult<EnqueueChapterDownloadPayload?>> {
         val (clientMutationId, chapter) = input
 
         return future {
-            DownloadManager.enqueue(DownloadManager.EnqueueInput(listOf(chapter)))
+            asDataFetcherResult {
+                DownloadManager.enqueue(DownloadManager.EnqueueInput(listOf(chapter)))
 
-            EnqueueChapterDownloadPayload(
+                EnqueueChapterDownloadPayload(
-                clientMutationId = clientMutationId,
+                    clientMutationId = clientMutationId,
-                downloadStatus =
+                    downloadStatus =
-                    withTimeout(30.seconds) {
+                        withTimeout(30.seconds) {
-                        DownloadStatus(
+                            DownloadStatus(
-                            DownloadManager.updates
+                                DownloadManager.updates
-                                .first { it.updates.any { it.downloadQueueItem.chapterId == chapter } }
+                                    .first { it.updates.any { it.downloadQueueItem.chapterId == chapter } }
-                                .let { DownloadManager.getStatus() },
+                                    .let { DownloadManager.getStatus() },
-                        )
+                            )
-                    },
+                        },
-            )
+                )
+            }
         }
     }
 
@@ -148,26 +156,30 @@ class DownloadMutation {
     )
 
     @RequireAuth
-    fun dequeueChapterDownloads(input: DequeueChapterDownloadsInput): CompletableFuture<DequeueChapterDownloadsPayload?> {
+    fun dequeueChapterDownloads(
+        input: DequeueChapterDownloadsInput,
+    ): CompletableFuture<DataFetcherResult<DequeueChapterDownloadsPayload?>> {
         val (clientMutationId, chapters) = input
 
         return future {
-            DownloadManager.dequeue(DownloadManager.EnqueueInput(chapters))
+            asDataFetcherResult {
+                DownloadManager.dequeue(DownloadManager.EnqueueInput(chapters))
 
-            DequeueChapterDownloadsPayload(
+                DequeueChapterDownloadsPayload(
-                clientMutationId = clientMutationId,
+                    clientMutationId = clientMutationId,
-                downloadStatus =
+                    downloadStatus =
-                    withTimeout(30.seconds) {
+                        withTimeout(30.seconds) {
-                        DownloadStatus(
+                            DownloadStatus(
-                            DownloadManager.updates
+                                DownloadManager.updates
-                                .first {
+                                    .first {
-                                    it.updates.any {
+                                        it.updates.any {
-                                        it.downloadQueueItem.chapterId in chapters && it.type == DEQUEUED
+                                            it.downloadQueueItem.chapterId in chapters && it.type == DEQUEUED
-                                    }
+                                        }
-                                }.let { DownloadManager.getStatus() },
+                                    }.let { DownloadManager.getStatus() },
-                        )
+                            )
-                    },
+                        },
-            )
+                )
+            }
         }
     }
 
@@ -182,26 +194,28 @@ class DownloadMutation {
     )
 
     @RequireAuth
-    fun dequeueChapterDownload(input: DequeueChapterDownloadInput): CompletableFuture<DequeueChapterDownloadPayload?> {
+    fun dequeueChapterDownload(input: DequeueChapterDownloadInput): CompletableFuture<DataFetcherResult<DequeueChapterDownloadPayload?>> {
         val (clientMutationId, chapter) = input
 
         return future {
-            DownloadManager.dequeue(DownloadManager.EnqueueInput(listOf(chapter)))
+            asDataFetcherResult {
+                DownloadManager.dequeue(DownloadManager.EnqueueInput(listOf(chapter)))
 
-            DequeueChapterDownloadPayload(
+                DequeueChapterDownloadPayload(
-                clientMutationId = clientMutationId,
+                    clientMutationId = clientMutationId,
-                downloadStatus =
+                    downloadStatus =
-                    withTimeout(30.seconds) {
+                        withTimeout(30.seconds) {
-                        DownloadStatus(
+                            DownloadStatus(
-                            DownloadManager.updates
+                                DownloadManager.updates
-                                .first {
+                                    .first {
-                                    it.updates.any {
+                                        it.updates.any {
-                                        it.downloadQueueItem.chapterId == chapter && it.type == DEQUEUED
+                                            it.downloadQueueItem.chapterId == chapter && it.type == DEQUEUED
-                                    }
+                                        }
-                                }.let { DownloadManager.getStatus() },
+                                    }.let { DownloadManager.getStatus() },
-                        )
+                            )
-                    },
+                        },
-            )
+                )
+            }
         }
     }
 
@@ -215,21 +229,23 @@ class DownloadMutation {
     )
 
     @RequireAuth
-    fun startDownloader(input: StartDownloaderInput): CompletableFuture<StartDownloaderPayload?> =
+    fun startDownloader(input: StartDownloaderInput): CompletableFuture<DataFetcherResult<StartDownloaderPayload?>> =
         future {
-            DownloadManager.start()
+            asDataFetcherResult {
+                DownloadManager.start()
 
-            StartDownloaderPayload(
+                StartDownloaderPayload(
-                input.clientMutationId,
+                    input.clientMutationId,
-                downloadStatus =
+                    downloadStatus =
-                    withTimeout(30.seconds) {
+                        withTimeout(30.seconds) {
-                        DownloadStatus(
+                            DownloadStatus(
-                            DownloadManager.updates
+                                DownloadManager.updates
-                                .first { it.status == Status.Started }
+                                    .first { it.status == Status.Started }
-                                .let { DownloadManager.getStatus() },
+                                    .let { DownloadManager.getStatus() },
-                        )
+                            )
-                    },
+                        },
-            )
+                )
+            }
         }
 
     data class StopDownloaderInput(
@@ -242,21 +258,23 @@ class DownloadMutation {
     )
 
     @RequireAuth
-    fun stopDownloader(input: StopDownloaderInput): CompletableFuture<StopDownloaderPayload?> =
+    fun stopDownloader(input: StopDownloaderInput): CompletableFuture<DataFetcherResult<StopDownloaderPayload?>> =
         future {
-            DownloadManager.stop()
+            asDataFetcherResult {
+                DownloadManager.stop()
 
-            StopDownloaderPayload(
+                StopDownloaderPayload(
-                input.clientMutationId,
+                    input.clientMutationId,
-                downloadStatus =
+                    downloadStatus =
-                    withTimeout(30.seconds) {
+                        withTimeout(30.seconds) {
-                        DownloadStatus(
+                            DownloadStatus(
-                            DownloadManager.updates
+                                DownloadManager.updates
-                                .first { it.status == Status.Stopped }
+                                    .first { it.status == Status.Stopped }
-                                .let { DownloadManager.getStatus() },
+                                    .let { DownloadManager.getStatus() },
-                        )
+                            )
-                    },
+                        },
-            )
+                )
+            }
         }
 
     data class ClearDownloaderInput(
@@ -269,21 +287,23 @@ class DownloadMutation {
     )
 
     @RequireAuth
-    fun clearDownloader(input: ClearDownloaderInput): CompletableFuture<ClearDownloaderPayload?> =
+    fun clearDownloader(input: ClearDownloaderInput): CompletableFuture<DataFetcherResult<ClearDownloaderPayload?>> =
         future {
-            DownloadManager.clear()
+            asDataFetcherResult {
+                DownloadManager.clear()
 
-            ClearDownloaderPayload(
+                ClearDownloaderPayload(
-                input.clientMutationId,
+                    input.clientMutationId,
-                downloadStatus =
+                    downloadStatus =
-                    withTimeout(30.seconds) {
+                        withTimeout(30.seconds) {
-                        DownloadStatus(
+                            DownloadStatus(
-                            DownloadManager.updates
+                                DownloadManager.updates
-                                .first { it.status == Status.Stopped }
+                                    .first { it.status == Status.Stopped }
-                                .let { DownloadManager.getStatus() },
+                                    .let { DownloadManager.getStatus() },
-                        )
+                            )
-                    },
+                        },
-            )
+                )
+            }
         }
 
     data class ReorderChapterDownloadInput(
@@ -298,23 +318,25 @@ class DownloadMutation {
     )
 
     @RequireAuth
-    fun reorderChapterDownload(input: ReorderChapterDownloadInput): CompletableFuture<ReorderChapterDownloadPayload?> {
+    fun reorderChapterDownload(input: ReorderChapterDownloadInput): CompletableFuture<DataFetcherResult<ReorderChapterDownloadPayload?>> {
         val (clientMutationId, chapter, to) = input
 
         return future {
-            DownloadManager.reorder(chapter, to)
+            asDataFetcherResult {
+                DownloadManager.reorder(chapter, to)
 
-            ReorderChapterDownloadPayload(
+                ReorderChapterDownloadPayload(
-                clientMutationId,
+                    clientMutationId,
-                downloadStatus =
+                    downloadStatus =
-                    withTimeout(30.seconds) {
+                        withTimeout(30.seconds) {
-                        DownloadStatus(
+                            DownloadStatus(
-                            DownloadManager.updates
+                                DownloadManager.updates
-                                .first { it.updates.indexOfFirst { it.downloadQueueItem.chapterId == chapter } <= to }
+                                    .first { it.updates.indexOfFirst { it.downloadQueueItem.chapterId == chapter } <= to }
-                                .let { DownloadManager.getStatus() },
+                                    .let { DownloadManager.getStatus() },
-                        )
+                            )
-                    },
+                        },
-            )
+                )
+            }
         }
     }
 }

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ExtensionMutation.kt

@@ -1,20 +1,15 @@
-@file:Suppress("RedundantNullableReturnType", "unused")
-
 package suwayomi.tachidesk.graphql.mutations
 
 import eu.kanade.tachiyomi.source.local.LocalSource
+import graphql.execution.DataFetcherResult
 import io.javalin.http.UploadedFile
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.core.neq
+import suwayomi.tachidesk.graphql.asDataFetcherResult
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.graphql.directives.RequireAuth
-import suwayomi.tachidesk.graphql.types.ExtensionStoreType
 import suwayomi.tachidesk.graphql.types.ExtensionType
 import suwayomi.tachidesk.manga.impl.extension.Extension
 import suwayomi.tachidesk.manga.impl.extension.ExtensionsList
-import suwayomi.tachidesk.manga.model.table.ExtensionStoreTable
 import suwayomi.tachidesk.manga.model.table.ExtensionTable
 import suwayomi.tachidesk.server.JavalinSetup.future
 import java.util.concurrent.CompletableFuture
@@ -80,47 +75,51 @@ class ExtensionMutation {
     }
 
     @RequireAuth
-    fun updateExtension(input: UpdateExtensionInput): CompletableFuture<UpdateExtensionPayload?> {
+    fun updateExtension(input: UpdateExtensionInput): CompletableFuture<DataFetcherResult<UpdateExtensionPayload?>> {
         val (clientMutationId, id, patch) = input
 
         return future {
-            updateExtensions(listOf(id), patch)
+            asDataFetcherResult {
+                updateExtensions(listOf(id), patch)
 
-            val extension =
+                val extension =
-                transaction {
+                    transaction {
-                    ExtensionTable
+                        ExtensionTable
-                        .selectAll()
+                            .selectAll()
-                        .where { ExtensionTable.pkgName eq id }
+                            .where { ExtensionTable.pkgName eq id }
-                        .firstOrNull()
+                            .firstOrNull()
-                        ?.let { ExtensionType(it) }
+                            ?.let { ExtensionType(it) }
-                }
+                    }
 
-            UpdateExtensionPayload(
+                UpdateExtensionPayload(
-                clientMutationId = clientMutationId,
+                    clientMutationId = clientMutationId,
-                extension = extension,
+                    extension = extension,
-            )
+                )
+            }
         }
     }
 
     @RequireAuth
-    fun updateExtensions(input: UpdateExtensionsInput): CompletableFuture<UpdateExtensionsPayload?> {
+    fun updateExtensions(input: UpdateExtensionsInput): CompletableFuture<DataFetcherResult<UpdateExtensionsPayload?>> {
         val (clientMutationId, ids, patch) = input
 
         return future {
-            updateExtensions(ids, patch)
+            asDataFetcherResult {
+                updateExtensions(ids, patch)
 
-            val extensions =
+                val extensions =
-                transaction {
+                    transaction {
-                    ExtensionTable
+                        ExtensionTable
-                        .selectAll()
+                            .selectAll()
-                        .where { ExtensionTable.pkgName inList ids }
+                            .where { ExtensionTable.pkgName inList ids }
-                        .map { ExtensionType(it) }
+                            .map { ExtensionType(it) }
-                }
+                    }
 
-            UpdateExtensionsPayload(
+                UpdateExtensionsPayload(
-                clientMutationId = clientMutationId,
+                    clientMutationId = clientMutationId,
-                extensions = extensions,
+                    extensions = extensions,
-            )
+                )
+            }
         }
     }
 
@@ -131,36 +130,29 @@ class ExtensionMutation {
     data class FetchExtensionsPayload(
         val clientMutationId: String?,
         val extensions: List<ExtensionType>,
-        val extensionStores: List<ExtensionStoreType>,
     )
 
     @RequireAuth
-    fun fetchExtensions(input: FetchExtensionsInput): CompletableFuture<FetchExtensionsPayload?> {
+    fun fetchExtensions(input: FetchExtensionsInput): CompletableFuture<DataFetcherResult<FetchExtensionsPayload?>> {
         val (clientMutationId) = input
 
         return future {
-            ExtensionsList.fetchExtensions()
+            asDataFetcherResult {
+                ExtensionsList.fetchExtensions()
 
-            val extensions =
+                val extensions =
-                transaction {
+                    transaction {
-                    ExtensionTable
+                        ExtensionTable
-                        .selectAll()
+                            .selectAll()
-                        .where { ExtensionTable.name neq LocalSource.EXTENSION_NAME }
+                            .where { ExtensionTable.name neq LocalSource.EXTENSION_NAME }
-                        .map { ExtensionType(it) }
+                            .map { ExtensionType(it) }
-                }
+                    }
 
-            val extensionStores =
+                FetchExtensionsPayload(
-                transaction {
+                    clientMutationId = clientMutationId,
-                    ExtensionStoreTable
+                    extensions = extensions,
-                        .selectAll()
+                )
-                        .map { ExtensionStoreType(it) }
+            }
-                }
-
-            FetchExtensionsPayload(
-                clientMutationId = clientMutationId,
-                extensions = extensions,
-                extensionStores = extensionStores,
-            )
         }
     }
 
@@ -175,19 +167,23 @@ class ExtensionMutation {
     )
 
     @RequireAuth
-    fun installExternalExtension(input: InstallExternalExtensionInput): CompletableFuture<InstallExternalExtensionPayload?> {
+    fun installExternalExtension(
+        input: InstallExternalExtensionInput,
+    ): CompletableFuture<DataFetcherResult<InstallExternalExtensionPayload?>> {
         val (clientMutationId, extensionFile) = input
 
         return future {
-            Extension.installExternalExtension(extensionFile.content(), extensionFile.filename())
+            asDataFetcherResult {
+                Extension.installExternalExtension(extensionFile.content(), extensionFile.filename())
 
-            val dbExtension =
+                val dbExtension =
-                transaction { ExtensionTable.selectAll().where { ExtensionTable.apkName eq extensionFile.filename() }.first() }
+                    transaction { ExtensionTable.selectAll().where { ExtensionTable.apkName eq extensionFile.filename() }.first() }
 
-            InstallExternalExtensionPayload(
+                InstallExternalExtensionPayload(
-                clientMutationId,
+                    clientMutationId,
-                extension = ExtensionType(dbExtension),
+                    extension = ExtensionType(dbExtension),
-            )
+                )
+            }
         }
     }
 }

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ExtensionStoreMutation.kt

@@ -1,104 +0,0 @@
-package suwayomi.tachidesk.graphql.mutations
-
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-import org.jetbrains.exposed.v1.core.eq
-import org.jetbrains.exposed.v1.jdbc.deleteWhere
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
-import suwayomi.tachidesk.graphql.directives.RequireAuth
-import suwayomi.tachidesk.graphql.types.ExtensionStoreType
-import suwayomi.tachidesk.manga.impl.extension.ExtensionStoreService
-import suwayomi.tachidesk.manga.model.table.ExtensionStoreTable
-import suwayomi.tachidesk.server.JavalinSetup.future
-import java.util.concurrent.CompletableFuture
-
-class ExtensionStoreMutation {
-    data class AddExtensionStoreInput(
-        val clientMutationId: String? = null,
-        val indexUrl: String,
-    )
-
-    data class AddExtensionStorePayload(
-        val clientMutationId: String?,
-        val extensionStore: ExtensionStoreType,
-    )
-
-    @RequireAuth
-    fun addExtensionStore(input: AddExtensionStoreInput): CompletableFuture<AddExtensionStorePayload?> {
-        val (clientMutationId, indexUrl) = input
-        return future {
-            val store = ExtensionStoreService.fetch(indexUrl)
-
-            ExtensionStoreService.upsert(store)
-            ExtensionStoreService.syncDbToPrefs()
-            val row =
-                transaction {
-                    ExtensionStoreTable
-                        .selectAll()
-                        .where { ExtensionStoreTable.indexUrl eq store.indexUrl }
-                        .first()
-                }
-
-            AddExtensionStorePayload(
-                clientMutationId = clientMutationId,
-                extensionStore = ExtensionStoreType(row),
-            )
-        }
-    }
-
-    data class RemoveExtensionStoreInput(
-        val clientMutationId: String? = null,
-        val indexUrl: String,
-    )
-
-    data class RemoveExtensionStorePayload(
-        val clientMutationId: String?,
-        val extensionStore: ExtensionStoreType?,
-    )
-
-    @RequireAuth
-    fun removeExtensionStore(input: RemoveExtensionStoreInput): CompletableFuture<RemoveExtensionStorePayload?> {
-        val (clientMutationId, indexUrl) = input
-        return future {
-            val store =
-                transaction {
-                    ExtensionStoreTable
-                        .selectAll()
-                        .where { ExtensionStoreTable.indexUrl eq indexUrl }
-                        .firstOrNull()
-                        ?.let { ExtensionStoreType(it) }
-                }
-
-            store?.let {
-                transaction {
-                    ExtensionStoreTable.deleteWhere { ExtensionStoreTable.indexUrl eq indexUrl }
-                }
-            }
-
-            ExtensionStoreService.syncDbToPrefs()
-
-            RemoveExtensionStorePayload(
-                clientMutationId = clientMutationId,
-                extensionStore =
-                    store?.let {
-                        ExtensionStoreType(
-                            name = it.name,
-                            badgeLabel = it.badgeLabel,
-                            signingKey = it.signingKey,
-                            contactWebsite = it.contactWebsite,
-                            contactDiscord = it.contactDiscord,
-                            indexUrl = it.indexUrl,
-                            isLegacy = it.isLegacy,
-                            extensionListUrl = it.extensionListUrl,
-                        )
-                    },
-            )
-        }
-    }
-}

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

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/InfoMutation.kt

@@ -1,9 +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
@@ -26,51 +26,55 @@ class InfoMutation {
     )
 
     @RequireAuth
-    fun updateWebUI(input: WebUIUpdateInput): CompletableFuture<WebUIUpdatePayload?> {
+    fun updateWebUI(input: WebUIUpdateInput): CompletableFuture<DataFetcherResult<WebUIUpdatePayload?>> {
         return future {
-            withTimeout(30.seconds) {
+            asDataFetcherResult {
-                if (WebInterfaceManager.status.value.state === DOWNLOADING) {
+                withTimeout(30.seconds) {
-                    return@withTimeout WebUIUpdatePayload(input.clientMutationId, WebInterfaceManager.status.value)
+                    if (WebInterfaceManager.status.value.state === DOWNLOADING) {
-                }
+                        return@withTimeout WebUIUpdatePayload(input.clientMutationId, WebInterfaceManager.status.value)
+                    }
 
-                val flavor = WebUIFlavor.current
+                    val flavor = WebUIFlavor.current
 
-                val (version, updateAvailable) = WebInterfaceManager.isUpdateAvailable(flavor)
+                    val (version, updateAvailable) = WebInterfaceManager.isUpdateAvailable(flavor)
 
-                if (!updateAvailable) {
+                    if (!updateAvailable) {
-                    val didUpdateCheckFail = version.isEmpty()
+                        val didUpdateCheckFail = version.isEmpty()
 
-                    return@withTimeout WebUIUpdatePayload(
+                        return@withTimeout WebUIUpdatePayload(
+                            input.clientMutationId,
+                            WebInterfaceManager.getStatus(version, if (didUpdateCheckFail) ERROR else IDLE),
+                        )
+                    }
+                    try {
+                        WebInterfaceManager.startDownloadInScope(flavor, version)
+                    } catch (e: Exception) {
+                        // ignore since we use the status anyway
+                    }
+
+                    WebUIUpdatePayload(
                         input.clientMutationId,
-                        WebInterfaceManager.getStatus(version, if (didUpdateCheckFail) ERROR else IDLE),
+                        updateStatus = WebInterfaceManager.status.first { it.state == DOWNLOADING },
                     )
                 }
-                try {
-                    WebInterfaceManager.startDownloadInScope(flavor, version)
-                } catch (e: Exception) {
-                    // ignore since we use the status anyway
-                }
-
-                WebUIUpdatePayload(
-                    input.clientMutationId,
-                    updateStatus = WebInterfaceManager.status.first { it.state == DOWNLOADING },
-                )
             }
         }
     }
 
     @RequireAuth
-    fun resetWebUIUpdateStatus(): CompletableFuture<WebUIUpdateStatus?> =
+    fun resetWebUIUpdateStatus(): CompletableFuture<DataFetcherResult<WebUIUpdateStatus?>> =
         future {
-            withTimeout(30.seconds) {
+            asDataFetcherResult {
-                val isUpdateFinished = WebInterfaceManager.status.value.state != DOWNLOADING
+                withTimeout(30.seconds) {
-                if (!isUpdateFinished) {
+                    val isUpdateFinished = WebInterfaceManager.status.value.state != DOWNLOADING
-                    throw Exception("Status reset is not allowed during status \"$DOWNLOADING\"")
+                    if (!isUpdateFinished) {
+                        throw Exception("Status reset is not allowed during status \"$DOWNLOADING\"")
+                    }
+
+                    WebInterfaceManager.resetStatus()
+
+                    WebInterfaceManager.status.first { it.state == IDLE }
                 }
-
-                WebInterfaceManager.resetStatus()
-
-                WebInterfaceManager.status.first { it.state == IDLE }
             }
         }
 }