Merge branch 'master' into poststable480

.github/workflows/pull_request.yml

@@ -26,11 +26,6 @@ jobs:
         cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
         cache-read-only: false
 
-    - name: Ensure binary compatibility
-      # This is to ensure that your code is backwards compatible.
-      # If this fails you need to add a @Prerelease annotation to new code.
-      run: ./gradlew library:checkKotlinAbi
-
     - name: Run Gradle
       run: ./gradlew assemblePrereleaseDebug lint check
 

COMPOSE.md

@@ -1,21 +0,0 @@
-# Migration guide to Compose
-
-### 1. MVI instead of MVVM 
-
-The current design of CloudStream loosely uses the MVVM architecture.
-
-This means that the UI invokes the viewmodel with function calls, and it responds with LiveData fields that are observed. While this has worked, it generates a lot of boilerplate and has created some friction.
-
-To make it easier to work with Compose, the new architecture will be based on MVI. In short this means that the viewmodel exposes a singular immutable class that is observed, and receives all UI events with a singular event that is a sealed class. All the UI should be able to be recreated based on this singular state class, and all interactions should be able to be replayed using only the event callback.
-
-For a more detailed overview, see: https://www.youtube.com/watch?v=b2z1jvD4VMQ
-
-This is part of the effort to make CloudStream cross platform, as it allows us to decouple UI and logic.
-
-### 2. KMP-compatible libraries
-
-We plan to leverage Kotlin's KMP project to compile our code to different architectures. However, this requires us to only use KMP-compatible libraries, no Java. Therefore any pull requests must ensure that they use KMP-compatible libraries only.
-
-### 3. UI Changes
-
-While migrating to the new compose UI, you also have the opportunity to change the UI. However, this should only be to freshen up the UI, not completely redesign it. It is also important to stress that this process should not lose any features of the old UI, and be very conservative with adding new features.

app/src/androidTest/java/com/lagradost/cloudstream3/utils/serializers/SerializerTest.kt

@@ -0,0 +1,157 @@
+package com.lagradost.cloudstream3.utils.serializers
+
+import android.net.Uri
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import com.lagradost.cloudstream3.utils.AppUtils.toJson
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.KeepGeneratedSerializer
+import kotlinx.serialization.Serializable
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+@OptIn(ExperimentalSerializationApi::class)
+@KeepGeneratedSerializer
+@Serializable(with = NonEmptyData.Serializer::class)
+data class NonEmptyData(
+    val title: String = "",
+    val tags: List<String> = emptyList(),
+    val meta: Map<String, String> = emptyMap(),
+    val name: String = "hello",
+) {
+    object Serializer : NonEmptySerializer<NonEmptyData>(NonEmptyData.generatedSerializer())
+}
+
+@OptIn(ExperimentalSerializationApi::class)
+@KeepGeneratedSerializer
+@Serializable(with = WriteOnlyData.Serializer::class)
+data class WriteOnlyData(
+    val fieldA: String = "",
+    val fieldB: String = "",
+) {
+    object Serializer : WriteOnlySerializer<WriteOnlyData>(
+        WriteOnlyData.generatedSerializer(),
+        setOf("fieldB"),
+    )
+}
+
+@OptIn(ExperimentalSerializationApi::class)
+@KeepGeneratedSerializer
+@Serializable(with = MultiWriteOnly.Serializer::class)
+data class MultiWriteOnly(
+    val fieldA: String = "",
+    val fieldB: String = "",
+    val fieldC: String = "",
+) {
+    object Serializer : WriteOnlySerializer<MultiWriteOnly>(
+        MultiWriteOnly.generatedSerializer(),
+        setOf("fieldB", "fieldC"),
+    )
+}
+
+@Serializable
+data class UriData(
+    @Serializable(with = UriSerializer::class)
+    val uri: Uri = Uri.EMPTY,
+)
+
+class SerializerTest {
+
+    @Test
+    fun nonEmptySerializerOmitsEmptyStrings() {
+        val data = NonEmptyData(title = "", name = "hello")
+        val result = data.toJson()
+        assertFalse(result.contains("title"))
+        assertTrue(result.contains("name"))
+    }
+
+    @Test
+    fun nonEmptySerializerOmitsEmptyLists() {
+        val data = NonEmptyData(tags = emptyList(), name = "hello")
+        val result = data.toJson()
+        assertFalse(result.contains("tags"))
+    }
+
+    @Test
+    fun nonEmptySerializerOmitsEmptyMaps() {
+        val data = NonEmptyData(meta = emptyMap(), name = "hello")
+        val result = data.toJson()
+        assertFalse(result.contains("meta"))
+    }
+
+    @Test
+    fun nonEmptySerializerKeepsNonEmptyFields() {
+        val data = NonEmptyData(title = "hello", tags = listOf("a"), meta = mapOf("k" to "v"))
+        val result = data.toJson()
+        assertTrue(result.contains("title"))
+        assertTrue(result.contains("tags"))
+        assertTrue(result.contains("meta"))
+    }
+
+    @Test
+    fun nonEmptySerializerDoesNotAffectDeserialization() {
+        val input = """{"title":"hello","tags":["a"],"meta":{"k":"v"},"name":"world"}"""
+        val result = parseJson<NonEmptyData>(input)
+        assertEquals("hello", result.title)
+        assertEquals(listOf("a"), result.tags)
+        assertEquals(mapOf("k" to "v"), result.meta)
+        assertEquals("world", result.name)
+    }
+
+    @Test
+    fun writeOnlySerializerOmitsFieldOnSerialize() {
+        val data = WriteOnlyData(fieldA = "hello", fieldB = "secret")
+        val result = data.toJson()
+        assertTrue(result.contains("fieldA"))
+        assertFalse(result.contains("fieldB"))
+    }
+
+    @Test
+    fun writeOnlySerializerDeserializesNormally() {
+        val input = """{"fieldA":"hello","fieldB":"secret"}"""
+        val result = parseJson<WriteOnlyData>(input)
+        assertEquals("hello", result.fieldA)
+        assertEquals("secret", result.fieldB)
+    }
+
+    @Test
+    fun writeOnlySerializerDeserializesMissingAsDefault() {
+        val input = """{"fieldA":"hello"}"""
+        val result = parseJson<WriteOnlyData>(input)
+        assertEquals("hello", result.fieldA)
+        assertEquals("", result.fieldB)
+    }
+
+    @Test
+    fun writeOnlySerializerHandlesMultipleKeys() {
+        val data = MultiWriteOnly(fieldA = "hello", fieldB = "secret1", fieldC = "secret2")
+        val result = data.toJson()
+        assertTrue(result.contains("fieldA"))
+        assertFalse(result.contains("fieldB"))
+        assertFalse(result.contains("fieldC"))
+    }
+
+    @Test
+    fun uriSerializerSerializesUriToString() {
+        val data = UriData(uri = Uri.parse("https://example.com/path?query=1"))
+        val result = data.toJson()
+        assertTrue(result.contains("https://example.com/path?query=1"))
+    }
+
+    @Test
+    fun uriSerializerDeserializesStringToUri() {
+        val input = """{"uri":"https://example.com/path?query=1"}"""
+        val result = parseJson<UriData>(input)
+        assertEquals(Uri.parse("https://example.com/path?query=1"), result.uri)
+    }
+
+    @Test
+    fun uriSerializerRoundtripsCorrectly() {
+        val data = UriData(uri = Uri.parse("https://example.com/path?query=1"))
+        val encoded = data.toJson()
+        val decoded = parseJson<UriData>(encoded)
+        assertEquals(data.uri, decoded.uri)
+    }
+}

app/src/androidTest/java/com/lagradost/cloudstream3/utils/serializers/UriSerializerTest.kt

@@ -1,41 +0,0 @@
-package com.lagradost.cloudstream3.utils.serializers
-
-import android.net.Uri
-import com.lagradost.cloudstream3.utils.AppUtils.parseJson
-import com.lagradost.cloudstream3.utils.AppUtils.toJson
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
-import org.junit.Test
-
-@Serializable
-data class UriData(
-    @Serializable(with = UriSerializer::class)
-    @SerialName("uri") val uri: Uri = Uri.EMPTY,
-)
-
-class UriSerializerTest {
-
-    @Test
-    fun uriSerializerSerializesUriToString() {
-        val data = UriData(uri = Uri.parse("https://example.com/path?query=1"))
-        val result = data.toJson()
-        assertTrue(result.contains("https://example.com/path?query=1"))
-    }
-
-    @Test
-    fun uriSerializerDeserializesStringToUri() {
-        val input = """{"uri":"https://example.com/path?query=1"}"""
-        val result = parseJson<UriData>(input)
-        assertEquals(Uri.parse("https://example.com/path?query=1"), result.uri)
-    }
-
-    @Test
-    fun uriSerializerRoundtripsCorrectly() {
-        val data = UriData(uri = Uri.parse("https://example.com/path?query=1"))
-        val encoded = data.toJson()
-        val decoded = parseJson<UriData>(encoded)
-        assertEquals(data.uri, decoded.uri)
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt

@@ -1215,7 +1215,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         // backup when we update the app, I don't trust myself to not boot lock users, might want to make this a setting?
         safe {
             val appVer = BuildConfig.VERSION_NAME
-            val lastAppAutoBackup: String = getKey<String>("VERSION_NAME") ?: ""
+            val lastAppAutoBackup: String = getKey("VERSION_NAME") ?: ""
             if (appVer != lastAppAutoBackup) {
                 setKey("VERSION_NAME", BuildConfig.VERSION_NAME)
                 if (lastAppAutoBackup.isEmpty()) return@safe
@@ -2018,7 +2018,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         }
 
         try {
-            if (getKey<Boolean>(HAS_DONE_SETUP_KEY, false) != true) {
+            if (getKey(HAS_DONE_SETUP_KEY, false) != true) {
                 navController.navigate(R.id.navigation_setup_language)
                 // If no plugins bring up extensions screen
             } else if (PluginManager.getPluginsOnline().isEmpty()

app/src/main/java/com/lagradost/cloudstream3/actions/temp/VlcPackage.kt

@@ -60,7 +60,7 @@ open class VlcPackage: OpenInAppAction(
         intent.putExtra("secure_uri", true)
         intent.putExtra("title", video.name)
 
-        val subsLang = getKey<String>(SUBTITLE_AUTO_SELECT_KEY) ?: "en"
+        val subsLang = getKey(SUBTITLE_AUTO_SELECT_KEY) ?: "en"
         result.subs.firstOrNull {
             subsLang == it.languageCode
         }?.let {

app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt

@@ -176,11 +176,11 @@ object PluginManager {
 
 
     fun getPluginsOnline(): Array<PluginData> {
-        return getKey<Array<PluginData>>(PLUGINS_KEY) ?: emptyArray()
+        return getKey(PLUGINS_KEY) ?: emptyArray()
     }
 
     fun getPluginsLocal(): Array<PluginData> {
-        return getKey<Array<PluginData>>(PLUGINS_KEY_LOCAL) ?: emptyArray()
+        return getKey(PLUGINS_KEY_LOCAL) ?: emptyArray()
     }
 
     private val CLOUD_STREAM_FOLDER =

app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt

@@ -98,7 +98,7 @@ data class PluginWrapper(
 object RepositoryManager {
     const val ONLINE_PLUGINS_FOLDER = "Extensions"
     val PREBUILT_REPOSITORIES: Array<RepositoryData> by lazy {
-        getKey<Array<RepositoryData>>("PREBUILT_REPOSITORIES") ?: emptyArray()
+        getKey("PREBUILT_REPOSITORIES") ?: emptyArray()
     }
     private val GH_REGEX =
         Regex("^https://raw.githubusercontent.com/([A-Za-z0-9-]+)/([A-Za-z0-9_.-]+)/(.*)$")
@@ -141,20 +141,12 @@ object RepositoryManager {
             }
         } else if (fixedUrl.matches("^[a-zA-Z0-9!_-]+$".toRegex())) {
             safeAsync {
-                if (fixedUrl.startsWith("!")) {
-                    val response = app.get("https://py.md/${fixedUrl.removePrefix("!")}", allowRedirects = false)
-                    val url = response.headers["Location"] ?: return@safeAsync null
-                    if (url.startsWith("https://py.md/404")) return@safeAsync null
-                    if (url.removeSuffix("/") == "https://py.md") return@safeAsync null
-                    return@safeAsync url
-                } else {
                 val response = app.get("https://cutt.ly/${fixedUrl}", allowRedirects = false)
                 val url = response.headers["Location"] ?: return@safeAsync null
                 if (url.startsWith("https://cutt.ly/404")) return@safeAsync null
                 if (url.removeSuffix("/") == "https://cutt.ly") return@safeAsync null
                 return@safeAsync url
             }
-            }
         } else null
     }
 
@@ -240,7 +232,7 @@ object RepositoryManager {
     }
 
     fun getRepositories(): Array<RepositoryData> {
-        return getKey<Array<RepositoryData>>(REPOSITORIES_KEY) ?: emptyArray()
+        return getKey(REPOSITORIES_KEY) ?: emptyArray()
     }
 
     // Don't want to read before we write in another thread

app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt

@@ -719,7 +719,7 @@ class CS3IPlayer : IPlayer {
          **/
         var preferredAudioTrackLanguage: String? = null
             get() {
-                return field ?: getKey<String>(
+                return field ?: getKey(
                     "$currentAccount/$PREFERRED_AUDIO_LANGUAGE_KEY",
                     field
                 )?.also {

app/src/main/java/com/lagradost/cloudstream3/ui/player/Torrent.kt

@@ -9,8 +9,6 @@ import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
 import com.lagradost.cloudstream3.utils.newExtractorLink
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 import torrServer.TorrServer
 import java.io.File
 import java.net.ConnectException
@@ -41,7 +39,7 @@ object Torrent {
             app.get(
                 "$TORRENT_SERVER_URL/echo",
             ).text.isNotEmpty()
-        } catch (_: ConnectException) {
+        } catch (e: ConnectException) {
             // `Failed to connect to /127.0.0.1:8090` if the server is down
             false
         } catch (t: Throwable) {
@@ -166,7 +164,9 @@ object Torrent {
     /** Gets all the metadata of a torrent, will throw if that hash does not exists
      * https://github.com/Diegopyl1209/torrentserver-aniyomi/blob/c18f58e51b6738f053261bc863177078aa9c1c98/web/api/torrents.go#L126 */
     @Throws
-    suspend fun get(hash: String): TorrentStatus {
+    suspend fun get(
+        hash: String,
+    ): TorrentStatus {
         if(TORRENT_SERVER_URL.isEmpty()) {
             throw ErrorLoadingException("Not initialized")
         }
@@ -278,55 +278,94 @@ object Torrent {
 
     // https://github.com/Diegopyl1209/torrentserver-aniyomi/blob/c18f58e51b6738f053261bc863177078aa9c1c98/web/api/torrents.go#L18
     // https://github.com/Diegopyl1209/torrentserver-aniyomi/blob/main/web/api/route.go#L7
-    @Serializable
     data class TorrentRequest(
-        @JsonProperty("action") @SerialName("action") val action: String,
+        @JsonProperty("action")
-        @JsonProperty("hash") @SerialName("hash") val hash: String = "",
+        val action: String,
-        @JsonProperty("link") @SerialName("link") val link: String = "",
+        @JsonProperty("hash")
-        @JsonProperty("title") @SerialName("title") val title: String = "",
+        val hash: String = "",
-        @JsonProperty("poster") @SerialName("poster") val poster: String = "",
+        @JsonProperty("link")
-        @JsonProperty("data") @SerialName("data") val data: String = "",
+        val link: String = "",
-        @JsonProperty("save_to_db") @SerialName("save_to_db") val saveToDB: Boolean = false,
+        @JsonProperty("title")
+        val title: String = "",
+        @JsonProperty("poster")
+        val poster: String = "",
+        @JsonProperty("data")
+        val data: String = "",
+        @JsonProperty("save_to_db")
+        val saveToDB: Boolean = false,
     )
 
     // https://github.com/Diegopyl1209/torrentserver-aniyomi/blob/c18f58e51b6738f053261bc863177078aa9c1c98/torr/state/state.go#L33
     // omitempty = nullable
-    @Serializable
     data class TorrentStatus(
-        @JsonProperty("title") @SerialName("title") var title: String,
+        @JsonProperty("title")
-        @JsonProperty("poster") @SerialName("poster") var poster: String,
+        var title: String,
-        @JsonProperty("data") @SerialName("data") var data: String?,
+        @JsonProperty("poster")
-        @JsonProperty("timestamp") @SerialName("timestamp") var timestamp: Long,
+        var poster: String,
-        @JsonProperty("name") @SerialName("name") var name: String?,
+        @JsonProperty("data")
-        @JsonProperty("hash") @SerialName("hash") var hash: String?,
+        var data: String?,
-        @JsonProperty("stat") @SerialName("stat") var stat: Int,
+        @JsonProperty("timestamp")
-        @JsonProperty("stat_string") @SerialName("stat_string") var statString: String,
+        var timestamp: Long,
-        @JsonProperty("loaded_size") @SerialName("loaded_size") var loadedSize: Long?,
+        @JsonProperty("name")
-        @JsonProperty("torrent_size") @SerialName("torrent_size") var torrentSize: Long?,
+        var name: String?,
-        @JsonProperty("preloaded_bytes") @SerialName("preloaded_bytes") var preloadedBytes: Long?,
+        @JsonProperty("hash")
-        @JsonProperty("preload_size") @SerialName("preload_size") var preloadSize: Long?,
+        var hash: String?,
-        @JsonProperty("download_speed") @SerialName("download_speed") var downloadSpeed: Double?,
+        @JsonProperty("stat")
-        @JsonProperty("upload_speed") @SerialName("upload_speed") var uploadSpeed: Double?,
+        var stat: Int,
-        @JsonProperty("total_peers") @SerialName("total_peers") var totalPeers: Int?,
+        @JsonProperty("stat_string")
-        @JsonProperty("pending_peers") @SerialName("pending_peers") var pendingPeers: Int?,
+        var statString: String,
-        @JsonProperty("active_peers") @SerialName("active_peers") var activePeers: Int?,
+        @JsonProperty("loaded_size")
-        @JsonProperty("connected_seeders") @SerialName("connected_seeders") var connectedSeeders: Int?,
+        var loadedSize: Long?,
-        @JsonProperty("half_open_peers") @SerialName("half_open_peers") var halfOpenPeers: Int?,
+        @JsonProperty("torrent_size")
-        @JsonProperty("bytes_written") @SerialName("bytes_written") var bytesWritten: Long?,
+        var torrentSize: Long?,
-        @JsonProperty("bytes_written_data") @SerialName("bytes_written_data") var bytesWrittenData: Long?,
+        @JsonProperty("preloaded_bytes")
-        @JsonProperty("bytes_read") @SerialName("bytes_read") var bytesRead: Long?,
+        var preloadedBytes: Long?,
-        @JsonProperty("bytes_read_data") @SerialName("bytes_read_data") var bytesReadData: Long?,
+        @JsonProperty("preload_size")
-        @JsonProperty("bytes_read_useful_data") @SerialName("bytes_read_useful_data") var bytesReadUsefulData: Long?,
+        var preloadSize: Long?,
-        @JsonProperty("chunks_written") @SerialName("chunks_written") var chunksWritten: Long?,
+        @JsonProperty("download_speed")
-        @JsonProperty("chunks_read") @SerialName("chunks_read") var chunksRead: Long?,
+        var downloadSpeed: Double?,
-        @JsonProperty("chunks_read_useful") @SerialName("chunks_read_useful") var chunksReadUseful: Long?,
+        @JsonProperty("upload_speed")
-        @JsonProperty("chunks_read_wasted") @SerialName("chunks_read_wasted") var chunksReadWasted: Long?,
+        var uploadSpeed: Double?,
-        @JsonProperty("pieces_dirtied_good") @SerialName("pieces_dirtied_good") var piecesDirtiedGood: Long?,
+        @JsonProperty("total_peers")
-        @JsonProperty("pieces_dirtied_bad") @SerialName("pieces_dirtied_bad") var piecesDirtiedBad: Long?,
+        var totalPeers: Int?,
-        @JsonProperty("duration_seconds") @SerialName("duration_seconds") var durationSeconds: Double?,
+        @JsonProperty("pending_peers")
-        @JsonProperty("bit_rate") @SerialName("bit_rate") var bitRate: String?,
+        var pendingPeers: Int?,
-        @JsonProperty("file_stats") @SerialName("file_stats") var fileStats: List<TorrentFileStat>?,
+        @JsonProperty("active_peers")
-        @JsonProperty("trackers") @SerialName("trackers") var trackers: List<String>?,
+        var activePeers: Int?,
+        @JsonProperty("connected_seeders")
+        var connectedSeeders: Int?,
+        @JsonProperty("half_open_peers")
+        var halfOpenPeers: Int?,
+        @JsonProperty("bytes_written")
+        var bytesWritten: Long?,
+        @JsonProperty("bytes_written_data")
+        var bytesWrittenData: Long?,
+        @JsonProperty("bytes_read")
+        var bytesRead: Long?,
+        @JsonProperty("bytes_read_data")
+        var bytesReadData: Long?,
+        @JsonProperty("bytes_read_useful_data")
+        var bytesReadUsefulData: Long?,
+        @JsonProperty("chunks_written")
+        var chunksWritten: Long?,
+        @JsonProperty("chunks_read")
+        var chunksRead: Long?,
+        @JsonProperty("chunks_read_useful")
+        var chunksReadUseful: Long?,
+        @JsonProperty("chunks_read_wasted")
+        var chunksReadWasted: Long?,
+        @JsonProperty("pieces_dirtied_good")
+        var piecesDirtiedGood: Long?,
+        @JsonProperty("pieces_dirtied_bad")
+        var piecesDirtiedBad: Long?,
+        @JsonProperty("duration_seconds")
+        var durationSeconds: Double?,
+        @JsonProperty("bit_rate")
+        var bitRate: String?,
+        @JsonProperty("file_stats")
+        var fileStats: List<TorrentFileStat>?,
+        @JsonProperty("trackers")
+        var trackers: List<String>?,
     ) {
         fun streamUrl(url: String): String {
             val fileName =
@@ -342,10 +381,12 @@ object Torrent {
         }
     }
 
-    @Serializable
     data class TorrentFileStat(
-        @JsonProperty("id") @SerialName("id") val id: Int?,
+        @JsonProperty("id")
-        @JsonProperty("path") @SerialName("path") val path: String?,
+        val id: Int?,
-        @JsonProperty("length") @SerialName("length") val length: Long?,
+        @JsonProperty("path")
+        val path: String?,
+        @JsonProperty("length")
+        val length: Long?,
     )
 }

app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityDataHelper.kt

@@ -55,7 +55,7 @@ object QualityDataHelper {
 
     fun getSourcePriority(profile: Int, name: String?): Int {
         if (name == null) return DEFAULT_SOURCE_PRIORITY
-        return getKey<Int>(
+        return getKey(
             "$currentAccount/$VIDEO_SOURCE_PRIORITY/$profile",
             name,
             DEFAULT_SOURCE_PRIORITY
@@ -94,7 +94,7 @@ object QualityDataHelper {
     }
 
     fun getQualityPriority(profile: Int, quality: Qualities): Int {
-        return getKey<Int>(
+        return getKey(
             "$currentAccount/$VIDEO_QUALITY_PRIORITY/$profile",
             quality.value.toString(),
             quality.defaultPriority

app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt

@@ -359,7 +359,7 @@ class SettingsGeneral : BasePreferenceFragmentCompat() {
             } ?: emptyList()
         }
 
-        settingsManager.edit { putBoolean(getString(R.string.jsdelivr_proxy_key), getKey<Boolean>(getString(R.string.jsdelivr_proxy_key), false) ?: false) }
+        settingsManager.edit { putBoolean(getString(R.string.jsdelivr_proxy_key), getKey(getString(R.string.jsdelivr_proxy_key), false) ?: false) }
         getPref(R.string.jsdelivr_proxy_key)?.setOnPreferenceChangeListener { _, newValue ->
             setKey(getString(R.string.jsdelivr_proxy_key), newValue)
             return@setOnPreferenceChangeListener true

app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/ChromecastSubtitlesFragment.kt

@@ -101,7 +101,7 @@ class ChromecastSubtitlesFragment : BaseFragment<ChromecastSubtitleSettingsBindi
         }
 
         fun getCurrentSavedStyle(): SaveChromeCaptionStyle {
-            return getKey<SaveChromeCaptionStyle>(CHROME_SUBTITLE_KEY) ?: defaultState
+            return getKey(CHROME_SUBTITLE_KEY) ?: defaultState
         }
 
         private val defaultState = SaveChromeCaptionStyle()

app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt

@@ -261,7 +261,7 @@ class SubtitlesFragment : BaseDialogFragment<SubtitleSettingsBinding>(
         }
 
         fun getCurrentSavedStyle(): SaveCaptionStyle {
-            return cachedSubtitleStyle ?: (getKey<SaveCaptionStyle>(SUBTITLE_KEY) ?: SaveCaptionStyle(
+            return cachedSubtitleStyle ?: (getKey(SUBTITLE_KEY) ?: SaveCaptionStyle(
                 foregroundColor = getDefColor(0),
                 backgroundColor = getDefColor(2),
                 windowColor = getDefColor(3),
@@ -293,11 +293,11 @@ class SubtitlesFragment : BaseDialogFragment<SubtitleSettingsBinding>(
         }
 
         fun getDownloadSubsLanguageTagIETF(): List<String> {
-            return getKey<List<String>>(SUBTITLE_DOWNLOAD_KEY) ?: listOf("en")
+            return getKey(SUBTITLE_DOWNLOAD_KEY) ?: listOf("en")
         }
 
         fun getAutoSelectLanguageTagIETF(): String {
-            return getKey<String>(SUBTITLE_AUTO_SELECT_KEY) ?: "en"
+            return getKey(SUBTITLE_AUTO_SELECT_KEY) ?: "en"
         }
     }
 

app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt

@@ -1,7 +1,6 @@
 package com.lagradost.cloudstream3.utils
 
 import android.content.Context
-import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.APIHolder.unixTimeMS
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.context
@@ -32,12 +31,6 @@ import com.lagradost.cloudstream3.ui.result.ResultEpisode
 import com.lagradost.cloudstream3.ui.result.VideoWatchState
 import com.lagradost.cloudstream3.utils.AppContextUtils.filterProviderByPreferredMedia
 import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
-import com.lagradost.cloudstream3.utils.serializers.WriteOnlySerializer
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.KeepGeneratedSerializer
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.Transient
 import java.util.Calendar
 import java.util.Date
 import java.util.GregorianCalendar
@@ -50,18 +43,17 @@ const val RESULT_WATCH_STATE = "result_watch_state"
 const val RESULT_WATCH_STATE_DATA = "result_watch_state_data"
 const val RESULT_SUBSCRIBED_STATE_DATA = "result_subscribed_state_data"
 const val RESULT_FAVORITES_STATE_DATA = "result_favorites_state_data"
-const val RESULT_RESUME_WATCHING = "result_resume_watching_2" // Changed due to id changes
+const val RESULT_RESUME_WATCHING = "result_resume_watching_2" // changed due to id changes
 const val RESULT_RESUME_WATCHING_OLD = "result_resume_watching"
 const val RESULT_RESUME_WATCHING_HAS_MIGRATED = "result_resume_watching_migrated"
 const val RESULT_EPISODE = "result_episode"
 const val RESULT_SEASON = "result_season"
 const val RESULT_DUB = "result_dub"
 const val KEY_RESULT_SORT = "result_sort"
-const val USER_PINNED_PROVIDERS = "user_pinned_providers" // Key for pinned user set
+const val USER_PINNED_PROVIDERS = "user_pinned_providers" //key for pinned user set
 
 class UserPreferenceDelegate<T : Any>(
-    private val key: String,
+    private val key: String, private val default: T //, private val klass: KClass<T>
-    private val default: T,
 ) {
     private val klass: KClass<out T> = default::class
     private val realKey get() = "${DataStoreHelper.currentAccount}/$key"
@@ -71,7 +63,7 @@ class UserPreferenceDelegate<T : Any>(
     operator fun setValue(
         self: Any?,
         property: KProperty<*>,
-        t: T?,
+        t: T?
     ) {
         if (t == null) {
             removeKey(realKey)
@@ -90,7 +82,7 @@ object DataStoreHelper {
         R.drawable.profile_bg_pink,
         R.drawable.profile_bg_purple,
         R.drawable.profile_bg_red,
-        R.drawable.profile_bg_teal,
+        R.drawable.profile_bg_teal
     )
 
     private var searchPreferenceProvidersStrings: List<String> by UserPreferenceDelegate(
@@ -120,17 +112,16 @@ object DataStoreHelper {
     private var searchPreferenceTagsStrings: List<String> by UserPreferenceDelegate(
         "search_pref_tags",
         listOf(TvType.Movie, TvType.TvSeries).map { it.name })
-
     var searchPreferenceTags: List<TvType>
         get() = deserializeTv(searchPreferenceTagsStrings)
         set(value) {
             searchPreferenceTagsStrings = serializeTv(value)
         }
 
+
     private var homePreferenceStrings: List<String> by UserPreferenceDelegate(
         "home_pref_homepage",
         listOf(TvType.Movie, TvType.TvSeries).map { it.name })
-
     var homePreference: List<TvType>
         get() = deserializeTv(homePreferenceStrings)
         set(value) {
@@ -141,38 +132,38 @@ object DataStoreHelper {
         "home_bookmarked_last_list",
         IntArray(0)
     )
-
     var playBackSpeed: Float by UserPreferenceDelegate("playback_speed", 1.0f)
     var resizeMode: Int by UserPreferenceDelegate("resize_mode", 0)
     var librarySortingMode: Int by UserPreferenceDelegate(
         "library_sorting_mode",
         ListSorting.AlphabeticalA.ordinal
     )
-
     private var _resultsSortingMode: Int by UserPreferenceDelegate(
         "results_sorting_mode",
         EpisodeSortType.NUMBER_ASC.ordinal
     )
-
     var resultsSortingMode: EpisodeSortType
         get() = EpisodeSortType.entries.getOrNull(_resultsSortingMode) ?: EpisodeSortType.NUMBER_ASC
         set(value) {
             _resultsSortingMode = value.ordinal
         }
 
-    @Serializable
     data class Account(
-        @JsonProperty("keyIndex") @SerialName("keyIndex") val keyIndex: Int,
+        @JsonProperty("keyIndex")
-        @JsonProperty("name") @SerialName("name") val name: String,
+        val keyIndex: Int,
-        @JsonProperty("customImage") @SerialName("customImage") val customImage: String? = null,
+        @JsonProperty("name")
-        @JsonProperty("defaultImageIndex") @SerialName("defaultImageIndex") val defaultImageIndex: Int,
+        val name: String,
-        @JsonProperty("lockPin") @SerialName("lockPin") val lockPin: String? = null,
+        @JsonProperty("customImage")
+        val customImage: String? = null,
+        @JsonProperty("defaultImageIndex")
+        val defaultImageIndex: Int,
+        @JsonProperty("lockPin")
+        val lockPin: String? = null,
     ) {
-        @get:JsonIgnore
+        val image
-        val image get() = customImage?.let { UiImage.Image(it) } ?:
+            get() = customImage?.let { UiImage.Image(it) } ?: profileImages.getOrNull(
-            profileImages.getOrNull(defaultImageIndex)?.let {
+                defaultImageIndex
-                UiImage.Drawable(it)
+            )?.let { UiImage.Drawable(it) } ?: UiImage.Drawable(profileImages.first())
-            } ?: UiImage.Drawable(profileImages.first())
     }
 
     const val TAG = "data_store_helper"
@@ -185,7 +176,7 @@ object DataStoreHelper {
      * Setting this does not automatically reload the homepage.
      */
     var currentHomePage: String?
-        get() = getKey<String>("$currentAccount/$USER_SELECTED_HOMEPAGE_API")
+        get() = getKey("$currentAccount/$USER_SELECTED_HOMEPAGE_API")
         set(value) {
             val key = "$currentAccount/$USER_SELECTED_HOMEPAGE_API"
             if (value == null) {
@@ -197,6 +188,7 @@ object DataStoreHelper {
 
     fun setAccount(account: Account) {
         val homepage = currentHomePage
+
         selectedKeyIndex = account.keyIndex
         AccountManager.updateAccountIds()
         showToast(context?.getString(R.string.logged_account, account.name) ?: account.name)
@@ -214,7 +206,7 @@ object DataStoreHelper {
             currentAccounts.getOrNull(currentAccounts.indexOfFirst { it.keyIndex == 0 }) ?: Account(
                 keyIndex = 0,
                 name = context.getString(R.string.default_account),
-                defaultImageIndex = 0,
+                defaultImageIndex = 0
             )
         }
     }
@@ -240,21 +232,18 @@ object DataStoreHelper {
         }
     }
 
-    @Serializable
     data class PosDur(
-        @JsonProperty("position") @SerialName("position") val position: Long,
+        @JsonProperty("position") val position: Long,
-        @JsonProperty("duration") @SerialName("duration") val duration: Long,
+        @JsonProperty("duration") val duration: Long
     )
 
     fun PosDur.fixVisual(): PosDur {
         if (duration <= 0) return PosDur(0, duration)
         val percentage = position * 100 / duration
-        return when {
+        if (percentage <= 1) return PosDur(0, duration)
-            percentage <= 1 -> PosDur(0, duration)
+        if (percentage <= 5) return PosDur(5 * duration / 100, duration)
-            percentage <= 5 -> PosDur(5 * duration / 100, duration)
+        if (percentage >= 95) return PosDur(duration, duration)
-            percentage >= 95 -> PosDur(duration, duration)
+        return this
-            else -> this
-        }
     }
 
     fun Int.toYear(): Date =
@@ -262,38 +251,28 @@ object DataStoreHelper {
 
     /**
      * Used to display notifications on new episodes and posters in library.
-     */
+     **/
-    @Serializable
     abstract class LibrarySearchResponse(
-       /**
+        @JsonProperty("id") override var id: Int?,
-        * These fields are marked @Transient because this class is only ever serialized through
+        @JsonProperty("latestUpdatedTime") open val latestUpdatedTime: Long,
-        * through its subclasses, which redeclare each property with their own @SerialName
+        @JsonProperty("name") override val name: String,
-        * annotations. Without @Transient here, kotlinx.serialization would try to
+        @JsonProperty("url") override val url: String,
-        * generate a serializer for the abstract base class itself (or double-serialize
+        @JsonProperty("apiName") override val apiName: String,
-        * these fields), which fails/conflicts since these are meant to be overridden,
+        @JsonProperty("type") override var type: TvType?,
-        * not serialized directly from the parent.
+        @JsonProperty("posterUrl") override var posterUrl: String?,
-        */
+        @JsonProperty("year") open val year: Int?,
-        @Transient override var id: Int? = null,
+        @JsonProperty("syncData") open val syncData: Map<String, String>?,
-        @Transient open val latestUpdatedTime: Long = 0L,
+        @JsonProperty("quality") override var quality: SearchQuality?,
-        @Transient override val name: String = "",
+        @JsonProperty("posterHeaders") override var posterHeaders: Map<String, String>?,
-        @Transient override val url: String = "",
+        @JsonProperty("plot") open val plot: String? = null,
-        @Transient override val apiName: String = "",
+        @JsonProperty("score") override var score: Score? = null,
-        @Transient override var type: TvType? = null,
+        @JsonProperty("tags") open val tags: List<String>? = null,
-        @Transient override var posterUrl: String? = null,
-        @Transient open val year: Int? = null,
-        @Transient open val syncData: Map<String, String>? = null,
-        @Transient override var quality: SearchQuality? = null,
-        @Transient override var posterHeaders: Map<String, String>? = null,
-        @Transient open val plot: String? = null,
-        @Transient override var score: Score? = null,
-        @Transient open val tags: List<String>? = null,
     ) : SearchResponse {
         @JsonProperty("rating", access = JsonProperty.Access.WRITE_ONLY)
-        @SerialName("rating")
         @Deprecated(
             "`rating` is the old scoring system, use score instead",
             replaceWith = ReplaceWith("score"),
-            level = DeprecationLevel.ERROR,
+            level = DeprecationLevel.ERROR
         )
         var rating: Int? = null
             set(value) {
@@ -304,26 +283,23 @@ object DataStoreHelper {
             }
     }
 
-    @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-    @KeepGeneratedSerializer
-    @Serializable(with = SubscribedData.Serializer::class)
     data class SubscribedData(
-        @JsonProperty("subscribedTime") @SerialName("subscribedTime") val subscribedTime: Long,
+        @JsonProperty("subscribedTime") val subscribedTime: Long,
-        @JsonProperty("lastSeenEpisodeCount") @SerialName("lastSeenEpisodeCount") val lastSeenEpisodeCount: Map<DubStatus, Int?>,
+        @JsonProperty("lastSeenEpisodeCount") val lastSeenEpisodeCount: Map<DubStatus, Int?>,
-        @JsonProperty("id") @SerialName("id") override var id: Int?,
+        override var id: Int?,
-        @JsonProperty("latestUpdatedTime") @SerialName("latestUpdatedTime") override val latestUpdatedTime: Long,
+        override val latestUpdatedTime: Long,
-        @JsonProperty("name") @SerialName("name") override val name: String,
+        override val name: String,
-        @JsonProperty("url") @SerialName("url") override val url: String,
+        override val url: String,
-        @JsonProperty("apiName") @SerialName("apiName") override val apiName: String,
+        override val apiName: String,
-        @JsonProperty("type") @SerialName("type") override var type: TvType?,
+        override var type: TvType?,
-        @JsonProperty("posterUrl") @SerialName("posterUrl") override var posterUrl: String?,
+        override var posterUrl: String?,
-        @JsonProperty("year") @SerialName("year") override val year: Int?,
+        override val year: Int?,
-        @JsonProperty("syncData") @SerialName("syncData") override val syncData: Map<String, String>? = null,
+        override val syncData: Map<String, String>? = null,
-        @JsonProperty("quality") @SerialName("quality") override var quality: SearchQuality? = null,
+        override var quality: SearchQuality? = null,
-        @JsonProperty("posterHeaders") @SerialName("posterHeaders") override var posterHeaders: Map<String, String>? = null,
+        override var posterHeaders: Map<String, String>? = null,
-        @JsonProperty("plot") @SerialName("plot") override val plot: String? = null,
+        override val plot: String? = null,
-        @JsonProperty("score") @SerialName("score") override var score: Score? = null,
+        override var score: Score? = null,
-        @JsonProperty("tags") @SerialName("tags") override val tags: List<String>? = null,
+        override val tags: List<String>? = null,
     ) : LibrarySearchResponse(
         id,
         latestUpdatedTime,
@@ -338,13 +314,8 @@ object DataStoreHelper {
         posterHeaders,
         plot,
         score,
-        tags,
+        tags
     ) {
-        object Serializer : WriteOnlySerializer<SubscribedData>(
-            SubscribedData.generatedSerializer(),
-            setOf("rating"),
-        )
-
         fun toLibraryItem(): SyncAPI.LibraryItem? {
             return SyncAPI.LibraryItem(
                 name,
@@ -363,30 +334,27 @@ object DataStoreHelper {
                 this.id,
                 plot = this.plot,
                 score = this.score,
-                tags = this.tags,
+                tags = this.tags
             )
         }
     }
 
-    @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-    @KeepGeneratedSerializer
-    @Serializable(with = BookmarkedData.Serializer::class)
     data class BookmarkedData(
-        @JsonProperty("bookmarkedTime") @SerialName("bookmarkedTime") val bookmarkedTime: Long,
+        @JsonProperty("bookmarkedTime") val bookmarkedTime: Long,
-        @JsonProperty("id") @SerialName("id") override var id: Int?,
+        override var id: Int?,
-        @JsonProperty("latestUpdatedTime") @SerialName("latestUpdatedTime") override val latestUpdatedTime: Long,
+        override val latestUpdatedTime: Long,
-        @JsonProperty("name") @SerialName("name") override val name: String,
+        override val name: String,
-        @JsonProperty("url") @SerialName("url") override val url: String,
+        override val url: String,
-        @JsonProperty("apiName") @SerialName("apiName") override val apiName: String,
+        override val apiName: String,
-        @JsonProperty("type") @SerialName("type") override var type: TvType?,
+        override var type: TvType?,
-        @JsonProperty("posterUrl") @SerialName("posterUrl") override var posterUrl: String?,
+        override var posterUrl: String?,
-        @JsonProperty("year") @SerialName("year") override val year: Int?,
+        override val year: Int?,
-        @JsonProperty("syncData") @SerialName("syncData") override val syncData: Map<String, String>? = null,
+        override val syncData: Map<String, String>? = null,
-        @JsonProperty("quality") @SerialName("quality") override var quality: SearchQuality? = null,
+        override var quality: SearchQuality? = null,
-        @JsonProperty("posterHeaders") @SerialName("posterHeaders") override var posterHeaders: Map<String, String>? = null,
+        override var posterHeaders: Map<String, String>? = null,
-        @JsonProperty("plot") @SerialName("plot") override val plot: String? = null,
+        override val plot: String? = null,
-        @JsonProperty("score") @SerialName("score") override var score: Score? = null,
+        override var score: Score? = null,
-        @JsonProperty("tags") @SerialName("tags") override val tags: List<String>? = null,
+        override val tags: List<String>? = null,
     ) : LibrarySearchResponse(
         id,
         latestUpdatedTime,
@@ -399,13 +367,8 @@ object DataStoreHelper {
         syncData,
         quality,
         posterHeaders,
-        plot,
+        plot
     ) {
-        object Serializer : WriteOnlySerializer<BookmarkedData>(
-            BookmarkedData.generatedSerializer(),
-            setOf("rating"),
-        )
-
         fun toLibraryItem(id: String): SyncAPI.LibraryItem {
             return SyncAPI.LibraryItem(
                 name,
@@ -424,30 +387,27 @@ object DataStoreHelper {
                 this.id,
                 plot = this.plot,
                 score = this.score,
-                tags = this.tags,
+                tags = this.tags
             )
         }
     }
 
-    @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-    @KeepGeneratedSerializer
-    @Serializable(with = FavoritesData.Serializer::class)
     data class FavoritesData(
-        @JsonProperty("favoritesTime") @SerialName("favoritesTime") val favoritesTime: Long,
+        @JsonProperty("favoritesTime") val favoritesTime: Long,
-        @JsonProperty("id") @SerialName("id") override var id: Int?,
+        override var id: Int?,
-        @JsonProperty("latestUpdatedTime") @SerialName("latestUpdatedTime") override val latestUpdatedTime: Long,
+        override val latestUpdatedTime: Long,
-        @JsonProperty("name") @SerialName("name") override val name: String,
+        override val name: String,
-        @JsonProperty("url") @SerialName("url") override val url: String,
+        override val url: String,
-        @JsonProperty("apiName") @SerialName("apiName") override val apiName: String,
+        override val apiName: String,
-        @JsonProperty("type") @SerialName("type") override var type: TvType?,
+        override var type: TvType?,
-        @JsonProperty("posterUrl") @SerialName("posterUrl") override var posterUrl: String?,
+        override var posterUrl: String?,
-        @JsonProperty("year") @SerialName("year") override val year: Int?,
+        override val year: Int?,
-        @JsonProperty("syncData") @SerialName("syncData") override val syncData: Map<String, String>? = null,
+        override val syncData: Map<String, String>? = null,
-        @JsonProperty("quality") @SerialName("quality") override var quality: SearchQuality? = null,
+        override var quality: SearchQuality? = null,
-        @JsonProperty("posterHeaders") @SerialName("posterHeaders") override var posterHeaders: Map<String, String>? = null,
+        override var posterHeaders: Map<String, String>? = null,
-        @JsonProperty("plot") @SerialName("plot") override val plot: String? = null,
+        override val plot: String? = null,
-        @JsonProperty("score") @SerialName("score") override var score: Score? = null,
+        override var score: Score? = null,
-        @JsonProperty("tags") @SerialName("tags") override val tags: List<String>? = null,
+        override val tags: List<String>? = null,
     ) : LibrarySearchResponse(
         id,
         latestUpdatedTime,
@@ -460,13 +420,8 @@ object DataStoreHelper {
         syncData,
         quality,
         posterHeaders,
-        plot,
+        plot
     ) {
-        object Serializer : WriteOnlySerializer<FavoritesData>(
-            FavoritesData.generatedSerializer(),
-            setOf("rating"),
-        )
-
         fun toLibraryItem(): SyncAPI.LibraryItem? {
             return SyncAPI.LibraryItem(
                 name,
@@ -485,32 +440,31 @@ object DataStoreHelper {
                 this.id,
                 plot = this.plot,
                 score = this.score,
-                tags = this.tags,
+                tags = this.tags
             )
         }
     }
 
-    @Serializable
     data class ResumeWatchingResult(
-        @JsonProperty("name") @SerialName("name") override val name: String,
+        @JsonProperty("name") override val name: String,
-        @JsonProperty("url") @SerialName("url") override val url: String,
+        @JsonProperty("url") override val url: String,
-        @JsonProperty("apiName") @SerialName("apiName") override val apiName: String,
+        @JsonProperty("apiName") override val apiName: String,
-        @JsonProperty("type") @SerialName("type") override var type: TvType? = null,
+        @JsonProperty("type") override var type: TvType? = null,
-        @JsonProperty("posterUrl") @SerialName("posterUrl") override var posterUrl: String?,
+        @JsonProperty("posterUrl") override var posterUrl: String?,
-        @JsonProperty("watchPos") @SerialName("watchPos") val watchPos: PosDur?,
+        @JsonProperty("watchPos") val watchPos: PosDur?,
-        @JsonProperty("id") @SerialName("id") override var id: Int?,
+        @JsonProperty("id") override var id: Int?,
-        @JsonProperty("parentId") @SerialName("parentId") val parentId: Int?,
+        @JsonProperty("parentId") val parentId: Int?,
-        @JsonProperty("episode") @SerialName("episode") val episode: Int?,
+        @JsonProperty("episode") val episode: Int?,
-        @JsonProperty("season") @SerialName("season") val season: Int?,
+        @JsonProperty("season") val season: Int?,
-        @JsonProperty("isFromDownload") @SerialName("isFromDownload") val isFromDownload: Boolean,
+        @JsonProperty("isFromDownload") val isFromDownload: Boolean,
-        @JsonProperty("quality") @SerialName("quality") override var quality: SearchQuality? = null,
+        @JsonProperty("quality") override var quality: SearchQuality? = null,
-        @JsonProperty("posterHeaders") @SerialName("posterHeaders") override var posterHeaders: Map<String, String>? = null,
+        @JsonProperty("posterHeaders") override var posterHeaders: Map<String, String>? = null,
-        @JsonProperty("score") @SerialName("score") override var score: Score? = null,
+        @JsonProperty("score") override var score: Score? = null,
     ) : SearchResponse
 
     /**
      * A datastore wide account for future implementations of a multiple account system
-     */
+     **/
 
     fun getAllWatchStateIds(): List<Int>? {
         val folder = "$currentAccount/$RESULT_WATCH_STATE"
@@ -546,7 +500,7 @@ object DataStoreHelper {
     }
 
     fun migrateResumeWatching() {
-        // if (getKey<Boolean>(RESULT_RESUME_WATCHING_HAS_MIGRATED, false) != true) {
+        // if (getKey(RESULT_RESUME_WATCHING_HAS_MIGRATED, false) != true) {
         setKey(RESULT_RESUME_WATCHING_HAS_MIGRATED, true)
         getAllResumeStateIdsOld()?.forEach { id ->
             getLastWatchedOld(id)?.let {
@@ -556,7 +510,7 @@ object DataStoreHelper {
                     it.episode,
                     it.season,
                     it.isFromDownload,
-                    it.updateTime,
+                    it.updateTime
                 )
                 removeLastWatchedOld(it.parentId)
             }
@@ -582,7 +536,7 @@ object DataStoreHelper {
                 episode,
                 season,
                 updateTime ?: System.currentTimeMillis(),
-                isFromDownload,
+                isFromDownload
             )
         )
     }
@@ -599,7 +553,7 @@ object DataStoreHelper {
 
     fun getLastWatched(id: Int?): DownloadObjects.ResumeWatching? {
         if (id == null) return null
-        return getKey<DownloadObjects.ResumeWatching>(
+        return getKey(
             "$currentAccount/$RESULT_RESUME_WATCHING",
             id.toString(),
         )
@@ -607,7 +561,7 @@ object DataStoreHelper {
 
     private fun getLastWatchedOld(id: Int?): DownloadObjects.ResumeWatching? {
         if (id == null) return null
-        return getKey<DownloadObjects.ResumeWatching>(
+        return getKey(
             "$currentAccount/$RESULT_RESUME_WATCHING_OLD",
             id.toString(),
         )
@@ -621,18 +575,18 @@ object DataStoreHelper {
 
     fun getBookmarkedData(id: Int?): BookmarkedData? {
         if (id == null) return null
-        return getKey<BookmarkedData>("$currentAccount/$RESULT_WATCH_STATE_DATA", id.toString())
+        return getKey("$currentAccount/$RESULT_WATCH_STATE_DATA", id.toString())
     }
 
     fun getAllBookmarkedData(): List<BookmarkedData> {
         return getKeys("$currentAccount/$RESULT_WATCH_STATE_DATA")?.mapNotNull {
-            getKey<BookmarkedData>(it)
+            getKey(it)
         } ?: emptyList()
     }
 
     fun getAllSubscriptions(): List<SubscribedData> {
         return getKeys("$currentAccount/$RESULT_SUBSCRIBED_STATE_DATA")?.mapNotNull {
-            getKey<SubscribedData>(it)
+            getKey(it)
         } ?: emptyList()
     }
 
@@ -644,12 +598,12 @@ object DataStoreHelper {
 
     /**
      * Set new seen episodes and update time
-     */
+     **/
     fun updateSubscribedData(id: Int?, data: SubscribedData?, episodeResponse: EpisodeResponse?) {
         if (id == null || data == null || episodeResponse == null) return
         val newData = data.copy(
             latestUpdatedTime = unixTimeMS,
-            lastSeenEpisodeCount = episodeResponse.getLatestEpisodes(),
+            lastSeenEpisodeCount = episodeResponse.getLatestEpisodes()
         )
         setKey("$currentAccount/$RESULT_SUBSCRIBED_STATE_DATA", id.toString(), newData)
     }
@@ -662,12 +616,12 @@ object DataStoreHelper {
 
     fun getSubscribedData(id: Int?): SubscribedData? {
         if (id == null) return null
-        return getKey<SubscribedData>("$currentAccount/$RESULT_SUBSCRIBED_STATE_DATA", id.toString())
+        return getKey("$currentAccount/$RESULT_SUBSCRIBED_STATE_DATA", id.toString())
     }
 
     fun getAllFavorites(): List<FavoritesData> {
         return getKeys("$currentAccount/$RESULT_FAVORITES_STATE_DATA")?.mapNotNull {
-            getKey<FavoritesData>(it)
+            getKey(it)
         } ?: emptyList()
     }
 
@@ -685,7 +639,7 @@ object DataStoreHelper {
 
     fun getFavoritesData(id: Int?): FavoritesData? {
         if (id == null) return null
-        return getKey<FavoritesData>("$currentAccount/$RESULT_FAVORITES_STATE_DATA", id.toString())
+        return getKey("$currentAccount/$RESULT_FAVORITES_STATE_DATA", id.toString())
     }
 
     fun setViewPos(id: Int?, pos: Long, dur: Long) {
@@ -694,10 +648,10 @@ object DataStoreHelper {
         setKey("$currentAccount/$VIDEO_POS_DUR", id.toString(), PosDur(pos, dur))
     }
 
-    /**
+    /** Sets the position, duration, and resume data of an episode/movie,
-     * Sets the position, duration, and resume data of an episode/movie,
+     *
-     * If nextEpisode is not specified it will not be able to set the next episode as resumable if progress > NEXT_WATCH_EPISODE_PERCENTAGE
+     * if nextEpisode is not specified it will not be able to set the next episode as resumable if progress > NEXT_WATCH_EPISODE_PERCENTAGE
-     */
+     * */
     fun setViewPosAndResume(id: Int?, position: Long, duration: Long, currentEpisode: Any?, nextEpisode: Any?) {
         setViewPos(id, position, duration)
         if (id != null) {
@@ -733,7 +687,7 @@ object DataStoreHelper {
                         resumeMeta.id,
                         resumeMeta.episode,
                         resumeMeta.season,
-                        isFromDownload = false,
+                        isFromDownload = false
                     )
                 }
 
@@ -743,7 +697,7 @@ object DataStoreHelper {
                         resumeMeta.id,
                         resumeMeta.episode,
                         resumeMeta.season,
-                        isFromDownload = true,
+                        isFromDownload = true
                     )
                 }
             }
@@ -752,16 +706,17 @@ object DataStoreHelper {
 
     fun getViewPos(id: Int?): PosDur? {
         if (id == null) return null
-        return getKey<PosDur>("$currentAccount/$VIDEO_POS_DUR", id.toString(), null)
+        return getKey("$currentAccount/$VIDEO_POS_DUR", id.toString(), null)
     }
 
     fun getVideoWatchState(id: Int?): VideoWatchState? {
         if (id == null) return null
-        return getKey<VideoWatchState>("$currentAccount/$VIDEO_WATCH_STATE", id.toString(), null)
+        return getKey("$currentAccount/$VIDEO_WATCH_STATE", id.toString(), null)
     }
 
     fun setVideoWatchState(id: Int?, watchState: VideoWatchState) {
         if (id == null) return
+
         // None == No key
         if (watchState == VideoWatchState.None) {
             removeKey("$currentAccount/$VIDEO_WATCH_STATE", id.toString())
@@ -772,7 +727,7 @@ object DataStoreHelper {
 
     fun getDub(id: Int): DubStatus? {
         return DubStatus.entries
-            .getOrNull(getKey<Int>("$currentAccount/$RESULT_DUB", id.toString(), -1) ?: -1)
+            .getOrNull(getKey("$currentAccount/$RESULT_DUB", id.toString(), -1) ?: -1)
     }
 
     fun setDub(id: Int, status: DubStatus) {
@@ -793,13 +748,13 @@ object DataStoreHelper {
             getKey<Int>(
                 "$currentAccount/$RESULT_WATCH_STATE",
                 id.toString(),
-                null,
+                null
             )
         )
     }
 
     fun getResultSeason(id: Int): Int? {
-        return getKey<Int>("$currentAccount/$RESULT_SEASON", id.toString(), null)
+        return getKey("$currentAccount/$RESULT_SEASON", id.toString(), null)
     }
 
     fun setResultSeason(id: Int, value: Int?) {
@@ -807,7 +762,7 @@ object DataStoreHelper {
     }
 
     fun getResultEpisode(id: Int): Int? {
-        return getKey<Int>("$currentAccount/$RESULT_EPISODE", id.toString(), null)
+        return getKey("$currentAccount/$RESULT_EPISODE", id.toString(), null)
     }
 
     fun setResultEpisode(id: Int, value: Int?) {
@@ -820,11 +775,12 @@ object DataStoreHelper {
 
     fun getSync(id: Int, idPrefixes: List<String>): List<String?> {
         return idPrefixes.map { idPrefix ->
-            getKey<String>("${idPrefix}_sync", id.toString())
+            getKey("${idPrefix}_sync", id.toString())
         }
     }
 
     var pinnedProviders: Array<String>
-        get() = getKey<Array<String>>(USER_PINNED_PROVIDERS) ?: emptyArray<String>()
+        get() = getKey(USER_PINNED_PROVIDERS) ?: emptyArray<String>()
         set(value) = setKey(USER_PINNED_PROVIDERS, value)
+
 }

app/src/main/java/com/lagradost/cloudstream3/utils/TvChannelUtils.kt

@@ -23,15 +23,15 @@ const val PROGRAM_ID_LIST_KEY = "persistent_program_ids"
 
 object TvChannelUtils {
     fun Context.saveProgramId(programId: Long) {
-        val existing: List<Long> = getKey<List<Long>>(PROGRAM_ID_LIST_KEY) ?: emptyList()
+        val existing: List<Long> = getKey(PROGRAM_ID_LIST_KEY) ?: emptyList()
         val updated = (existing + programId).distinct()
         setKey(PROGRAM_ID_LIST_KEY, updated)
     }
     fun Context.getStoredProgramIds(): List<Long> {
-        return getKey<List<Long>>(PROGRAM_ID_LIST_KEY) ?: emptyList()
+        return getKey(PROGRAM_ID_LIST_KEY) ?: emptyList()
     }
     fun Context.removeProgramId(programId: Long) {
-        val existing: List<Long> = getKey<List<Long>>(PROGRAM_ID_LIST_KEY) ?: emptyList()
+        val existing: List<Long> = getKey(PROGRAM_ID_LIST_KEY) ?: emptyList()
         val updated = existing.filter { it != programId }
         setKey(PROGRAM_ID_LIST_KEY, updated)
     }

app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt

@@ -1640,11 +1640,11 @@ object VideoDownloadManager {
     }
 
     fun getDownloadResumePackage(context: Context, id: Int): DownloadResumePackage? {
-        return context.getKey<DownloadResumePackage>(KEY_RESUME_PACKAGES, id.toString())
+        return context.getKey(KEY_RESUME_PACKAGES, id.toString())
     }
 
     fun getDownloadQueuePackage(context: Context, id: Int): DownloadQueueWrapper? {
-        return context.getKey<DownloadQueueWrapper>(KEY_RESUME_IN_QUEUE, id.toString())
+        return context.getKey(KEY_RESUME_IN_QUEUE, id.toString())
     }
 
     fun getDownloadEpisodeMetadata(

app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadObjects.kt

@@ -1,32 +1,23 @@
 package com.lagradost.cloudstream3.utils.downloader
 
 import android.net.Uri
-import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.Score
-import com.lagradost.cloudstream3.SkipSerializationTest
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.services.DownloadQueueService
 import com.lagradost.cloudstream3.ui.player.SubtitleData
 import com.lagradost.cloudstream3.ui.result.ResultEpisode
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.serializers.UriSerializer
-import com.lagradost.cloudstream3.utils.serializers.WriteOnlySerializer
 import com.lagradost.safefile.SafeFile
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.KeepGeneratedSerializer
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 import java.io.IOException
 import java.io.OutputStream
 import java.util.Objects
 
 object DownloadObjects {
     /** An item can either be something to resume or something new to start */
-    @Serializable
     data class DownloadQueueWrapper(
-        @JsonProperty("resumePackage") @SerialName("resumePackage") val resumePackage: DownloadResumePackage?,
+        @JsonProperty("resumePackage") val resumePackage: DownloadResumePackage?,
-        @JsonProperty("downloadItem") @SerialName("downloadItem") val downloadItem: DownloadQueueItem?,
+        @JsonProperty("downloadItem") val downloadItem: DownloadQueueItem?,
     ) {
         init {
             assert(resumePackage != null || downloadItem != null) {
@@ -35,66 +26,56 @@ object DownloadObjects {
         }
 
         /** Loop through the current download instances to see if it is currently downloading. Also includes link loading. */
-        @JsonIgnore
         fun isCurrentlyDownloading(): Boolean {
             return DownloadQueueService.downloadInstances.value.any { it.downloadQueueWrapper.id == this.id }
         }
 
-        @JsonProperty("id") @SerialName("id")
+        @JsonProperty("id")
         val id = resumePackage?.item?.ep?.id ?: downloadItem!!.episode.id
 
-        @JsonProperty("parentId") @SerialName("parentId")
+        @JsonProperty("parentId")
         val parentId = resumePackage?.item?.ep?.parentId ?: downloadItem!!.episode.parentId
     }
 
     /** General data about the episode and show to start a download from. */
-    @Serializable
     data class DownloadQueueItem(
-        @JsonProperty("episode") @SerialName("episode") val episode: ResultEpisode,
+        @JsonProperty("episode") val episode: ResultEpisode,
-        @JsonProperty("isMovie") @SerialName("isMovie") val isMovie: Boolean,
+        @JsonProperty("isMovie") val isMovie: Boolean,
-        @JsonProperty("resultName") @SerialName("resultName") val resultName: String,
+        @JsonProperty("resultName") val resultName: String,
-        @JsonProperty("resultType") @SerialName("resultType") val resultType: TvType,
+        @JsonProperty("resultType") val resultType: TvType,
-        @JsonProperty("resultPoster") @SerialName("resultPoster") val resultPoster: String?,
+        @JsonProperty("resultPoster") val resultPoster: String?,
-        @JsonProperty("apiName") @SerialName("apiName") val apiName: String,
+        @JsonProperty("apiName") val apiName: String,
-        @JsonProperty("resultId") @SerialName("resultId") val resultId: Int,
+        @JsonProperty("resultId") val resultId: Int,
-        @JsonProperty("resultUrl") @SerialName("resultUrl") val resultUrl: String,
+        @JsonProperty("resultUrl") val resultUrl: String,
-        @JsonProperty("links") @SerialName("links") val links: List<ExtractorLink>? = null,
+        @JsonProperty("links") val links: List<ExtractorLink>? = null,
-        @JsonProperty("subs") @SerialName("subs") val subs: List<SubtitleData>? = null,
+        @JsonProperty("subs") val subs: List<SubtitleData>? = null,
     ) {
         fun toWrapper(): DownloadQueueWrapper {
             return DownloadQueueWrapper(null, this)
         }
     }
 
-    interface DownloadCached {
-        val id: Int
-    }
 
-    @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
+    abstract class DownloadCached(
-    @KeepGeneratedSerializer
+        @JsonProperty("id") open val id: Int,
-    @Serializable(with = DownloadEpisodeCached.Serializer::class)
-    data class DownloadEpisodeCached(
-        @JsonProperty("name") @SerialName("name") val name: String?,
-        @JsonProperty("poster") @SerialName("poster") val poster: String?,
-        @JsonProperty("episode") @SerialName("episode") val episode: Int,
-        @JsonProperty("season") @SerialName("season") val season: Int?,
-        @JsonProperty("parentId") @SerialName("parentId") val parentId: Int,
-        @JsonProperty("score") @SerialName("score") var score: Score? = null,
-        @JsonProperty("description") @SerialName("description") val description: String?,
-        @JsonProperty("cacheTime") @SerialName("cacheTime") val cacheTime: Long,
-        @JsonProperty("id") @SerialName("id") override val id: Int,
-    ) : DownloadCached {
-        object Serializer : WriteOnlySerializer<DownloadEpisodeCached>(
-            DownloadEpisodeCached.generatedSerializer(),
-            setOf("rating"),
     )
 
+    data class DownloadEpisodeCached(
+        @JsonProperty("name") val name: String?,
+        @JsonProperty("poster") val poster: String?,
+        @JsonProperty("episode") val episode: Int,
+        @JsonProperty("season") val season: Int?,
+        @JsonProperty("parentId") val parentId: Int,
+        @JsonProperty("score") var score: Score? = null,
+        @JsonProperty("description") val description: String?,
+        @JsonProperty("cacheTime") val cacheTime: Long,
+        override val id: Int,
+    ) : DownloadCached(id) {
         @JsonProperty("rating", access = JsonProperty.Access.WRITE_ONLY)
-        @SerialName("rating")
         @Deprecated(
             "`rating` is the old scoring system, use score instead",
             replaceWith = ReplaceWith("score"),
-            level = DeprecationLevel.ERROR,
+            level = DeprecationLevel.ERROR
         )
         var rating: Int? = null
             set(value) {
@@ -106,81 +87,74 @@ object DownloadObjects {
     }
 
     /** What to display to the user for a downloaded show/movie. Includes info such as name, poster and url */
-    @Serializable
     data class DownloadHeaderCached(
-        @JsonProperty("apiName") @SerialName("apiName") val apiName: String,
+        @JsonProperty("apiName") val apiName: String,
-        @JsonProperty("url") @SerialName("url") val url: String,
+        @JsonProperty("url") val url: String,
-        @JsonProperty("type") @SerialName("type") val type: TvType,
+        @JsonProperty("type") val type: TvType,
-        @JsonProperty("name") @SerialName("name") val name: String,
+        @JsonProperty("name") val name: String,
-        @JsonProperty("poster") @SerialName("poster") val poster: String?,
+        @JsonProperty("poster") val poster: String?,
-        @JsonProperty("cacheTime") @SerialName("cacheTime") val cacheTime: Long,
+        @JsonProperty("cacheTime") val cacheTime: Long,
-        @JsonProperty("id") @SerialName("id") override val id: Int,
+        override val id: Int,
-    ) : DownloadCached
+    ) : DownloadCached(id)
 
-    @Serializable
     data class DownloadResumePackage(
-        @JsonProperty("item") @SerialName("item") val item: DownloadItem,
+        @JsonProperty("item") val item: DownloadItem,
         /** Tills which link should get resumed */
-        @JsonProperty("linkIndex") @SerialName("linkIndex") val linkIndex: Int?,
+        @JsonProperty("linkIndex") val linkIndex: Int?,
     ) {
         fun toWrapper(): DownloadQueueWrapper {
             return DownloadQueueWrapper(this, null)
         }
     }
 
-    @Serializable
     data class DownloadItem(
-        @JsonProperty("source") @SerialName("source") val source: String?,
+        @JsonProperty("source") val source: String?,
-        @JsonProperty("folder") @SerialName("folder") val folder: String?,
+        @JsonProperty("folder") val folder: String?,
-        @JsonProperty("ep") @SerialName("ep") val ep: DownloadEpisodeMetadata,
+        @JsonProperty("ep") val ep: DownloadEpisodeMetadata,
-        @JsonProperty("links") @SerialName("links") val links: List<ExtractorLink>,
+        @JsonProperty("links") val links: List<ExtractorLink>,
     )
 
     /** Metadata for a specific episode and how to display it. */
-    @Serializable
     data class DownloadEpisodeMetadata(
-        @JsonProperty("id") @SerialName("id") val id: Int,
+        @JsonProperty("id") val id: Int,
-        @JsonProperty("parentId") @SerialName("parentId") val parentId: Int,
+        @JsonProperty("parentId") val parentId: Int,
-        @JsonProperty("mainName") @SerialName("mainName") val mainName: String,
+        @JsonProperty("mainName") val mainName: String,
-        @JsonProperty("sourceApiName") @SerialName("sourceApiName") val sourceApiName: String?,
+        @JsonProperty("sourceApiName") val sourceApiName: String?,
-        @JsonProperty("poster") @SerialName("poster") val poster: String?,
+        @JsonProperty("poster") val poster: String?,
-        @JsonProperty("name") @SerialName("name") val name: String?,
+        @JsonProperty("name") val name: String?,
-        @JsonProperty("season") @SerialName("season") val season: Int?,
+        @JsonProperty("season") val season: Int?,
-        @JsonProperty("episode") @SerialName("episode") val episode: Int?,
+        @JsonProperty("episode") val episode: Int?,
-        @JsonProperty("type") @SerialName("type") val type: TvType?,
+        @JsonProperty("type") val type: TvType?,
     )
 
-    @Serializable
+
     data class DownloadedFileInfo(
-        @JsonProperty("totalBytes") @SerialName("totalBytes") val totalBytes: Long,
+        @JsonProperty("totalBytes") val totalBytes: Long,
-        @JsonProperty("relativePath") @SerialName("relativePath") val relativePath: String,
+        @JsonProperty("relativePath") val relativePath: String,
-        @JsonProperty("displayName") @SerialName("displayName") val displayName: String,
+        @JsonProperty("displayName") val displayName: String,
-        @JsonProperty("extraInfo") @SerialName("extraInfo") val extraInfo: String? = null,
+        @JsonProperty("extraInfo") val extraInfo: String? = null,
-        @JsonProperty("basePath") @SerialName("basePath") val basePath: String? = null, // null is for legacy downloads. See getBasePath()
+        @JsonProperty("basePath") val basePath: String? = null, // null is for legacy downloads. See getBasePath()
         // Hash of the link associated with this DownloadFile, used so not override old data in the DownloadedFileInfo
-        @JsonProperty("linkHash") @SerialName("linkHash") val linkHash: Int? = null,
+        @JsonProperty("linkHash") val linkHash : Int? = null
     )
 
-    @Serializable
-    @SkipSerializationTest // Uri has issues with Jackson
     data class DownloadedFileInfoResult(
-        @JsonProperty("fileLength") @SerialName("fileLength") val fileLength: Long,
+        @JsonProperty("fileLength") val fileLength: Long,
-        @JsonProperty("totalBytes") @SerialName("totalBytes") val totalBytes: Long,
+        @JsonProperty("totalBytes") val totalBytes: Long,
-        @JsonProperty("path") @SerialName("path")
+        @JsonProperty("path") val path: Uri,
-        @Serializable(with = UriSerializer::class)
-        val path: Uri,
     )
 
-    @Serializable
+
     data class ResumeWatching(
-        @JsonProperty("parentId") @SerialName("parentId") val parentId: Int,
+        @JsonProperty("parentId") val parentId: Int,
-        @JsonProperty("episodeId") @SerialName("episodeId") val episodeId: Int?,
+        @JsonProperty("episodeId") val episodeId: Int?,
-        @JsonProperty("episode") @SerialName("episode") val episode: Int?,
+        @JsonProperty("episode") val episode: Int?,
-        @JsonProperty("season") @SerialName("season") val season: Int?,
+        @JsonProperty("season") val season: Int?,
-        @JsonProperty("updateTime") @SerialName("updateTime") val updateTime: Long,
+        @JsonProperty("updateTime") val updateTime: Long,
-        @JsonProperty("isFromDownload") @SerialName("isFromDownload") val isFromDownload: Boolean,
+        @JsonProperty("isFromDownload") val isFromDownload: Boolean,
     )
 
+
     data class DownloadStatus(
         /** if you should retry with the same args and hope for a better result */
         val retrySame: Boolean,
@@ -190,13 +164,14 @@ object DownloadObjects {
         val success: Boolean,
     )
 
+
     data class CreateNotificationMetadata(
         val type: VideoDownloadManager.DownloadType,
         val bytesDownloaded: Long,
         val bytesTotal: Long,
         val hlsProgress: Long? = null,
         val hlsTotal: Long? = null,
-        val bytesPerSecond: Long,
+        val bytesPerSecond: Long
     )
 
     data class StreamData(
@@ -223,11 +198,9 @@ object DownloadObjects {
         val exists: Boolean get() = file.exists() == true
     }
 
-    /**
+
-     * Bytes have the size end-start where the byte range is [start,end)
+    /** bytes have the size end-start where the byte range is [start,end)
-     * note that ByteArray is a pointer and therefore can't be stored
+     * note that ByteArray is a pointer and therefore cant be stored without cloning it */
-     * without cloning it.
-     */
     data class LazyStreamDownloadResponse(
         val bytes: ByteArray,
         val startByte: Long,

library/README.md

@@ -1,15 +0,0 @@
-## CloudStream extension library
-
-This is the official API surface for all CloudStream plugins.
-
-To ensure that all plugins work on both the stable release and pre-release we must have
-binary compatibility on all changes. All new changes must be marked with `@Prerelease` to
-prevent accidental usage among extension developers.
-
-We use Kotlin binary compatibility validation using:
-
-``./gradlew checkKotlinAbi``
-
-If you for some reason must update the binary compatibility then manually edit `api/jvm/library.api` or use:
-
-``./gradlew updateKotlinAbi``

library/build.gradle.kts

@@ -69,6 +69,9 @@ kotlin {
             implementation(libs.rhino) // Run JavaScript
             implementation(libs.tmdb.java) // TMDB API v3 Wrapper Made with RetroFit
             implementation(libs.bundles.cryptography) // Cryptography
+
+            // Deprecated; will be removed once extensions have time to migrate from using it
+            implementation("me.xdrop:fuzzywuzzy:1.4.0")
         }
 
         commonTest.dependencies {
@@ -87,18 +90,6 @@ kotlin {
         androidMain { dependsOn(jvmCommonMain) }
         jvmMain { dependsOn(jvmCommonMain) }
     }
-
-    @OptIn(org.jetbrains.kotlin.gradle.dsl.abi.ExperimentalAbiValidation::class)
-    // https://kotlinlang.org/docs/gradle-binary-compatibility-validation.html
-    abiValidation {
-        enabled.set(true)
-        this.filters {
-            exclude {
-                annotatedWith.add("com.lagradost.cloudstream3.Prerelease")
-                annotatedWith.add("com.lagradost.cloudstream3.InternalAPI")
-            }
-        }
-    }
 }
 
 tasks.withType<KotlinJvmCompile> {

library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt

@@ -799,10 +799,11 @@ fun fixTitle(str: String): String {
     }
 }
 
-@Deprecated(
+// Deprecate after next stable
+/* @Deprecated(
     message = "Use newJsContext or evalJs instead.",
     level = DeprecationLevel.WARNING,
-)
+) */
 suspend fun getRhinoContext(): org.mozilla.javascript.Context {
     return Coroutines.mainWork {
         val rhino = org.mozilla.javascript.Context.enter()
@@ -1823,7 +1824,7 @@ interface LoadResponse {
 
         /** Read the id string to get all other ids */
         fun readIdFromString(idString: String?): Map<SimklSyncServices, String> {
-            return tryParseJson<Map<SimklSyncServices, String>>(idString) ?: return emptyMap()
+            return tryParseJson(idString) ?: return emptyMap()
         }
 
         fun LoadResponse.isMovie(): Boolean {
@@ -2559,10 +2560,11 @@ fun Episode.addDate(date: Instant?) {
     this.date = date?.toEpochMilliseconds()
 }
 
-@Deprecated(
+// Deprecate after next stable
+/* @Deprecated(
     message = "Use addDate with LocalDate, Instant, or String instead.",
     level = DeprecationLevel.WARNING,
-)
+) */
 fun Episode.addDate(date: java.util.Date?) {
     this.date = date?.time
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ByseSX.kt

@@ -86,15 +86,15 @@ open class ByseSX : ExtractorApi() {
     }
 
     @OptIn(DelicateCryptographyApi::class)
-    private suspend fun decryptPlayback(playback: Playback): String? {
+    private fun decryptPlayback(playback: Playback): String? {
         val keyBytes = buildAesKey(playback)
         val ivBytes = b64UrlDecode(playback.iv)
         val cipherBytes = b64UrlDecode(playback.payload)
 
-        val aesKey = aesGcm.keyDecoder().decodeFromByteArray(AES.Key.Format.RAW, keyBytes)
+        val aesKey = aesGcm.keyDecoder().decodeFromByteArrayBlocking(AES.Key.Format.RAW, keyBytes)
         // 128-bit GCM tag (default)
         val cipher = aesKey.cipher()
-        val plainBytes = cipher.decryptWithIv(ivBytes, cipherBytes)
+        val plainBytes = cipher.decryptWithIvBlocking(ivBytes, cipherBytes)
 
         var jsonStr = plainBytes.decodeToString()
         if (jsonStr.startsWith("\uFEFF")) jsonStr = jsonStr.substring(1)

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/EmturbovidExtractor.kt

@@ -8,33 +8,35 @@ import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.newExtractorLink
 
 open class EmturbovidExtractor : ExtractorApi() {
-    override val name = "Emturbovid"
+    override var name = "Emturbovid"
-    override val mainUrl = "https://emturbovid.com"
+    override var mainUrl = "https://emturbovid.com"
     override val requiresReferer = false
 
     override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
-        val response = app.get(url, referer = referer ?: "$mainUrl/")
+        val response = app.get(
-        val playerScript = response.document
+            url, referer = referer ?: "$mainUrl/"
-            .select("script")
+        )
-            .first { it.data().contains("var urlPlay") }
+        val playerScript =
+            response.document.selectXpath("//script[contains(text(),'var urlPlay')]")
                 .html()
 
         val sources = mutableListOf<ExtractorLink>()
         if (playerScript.isNotBlank()) {
-            val m3u8Url = playerScript.substringAfter("var urlPlay = '").substringBefore("'")
+            val m3u8Url =
+                playerScript.substringAfter("var urlPlay = '").substringBefore("'")
+
             sources.add(
                 newExtractorLink(
                     source = name,
                     name = name,
                     url = m3u8Url,
-                    type = ExtractorLinkType.M3U8,
+                    type = ExtractorLinkType.M3U8
                 ) {
                     this.referer = "$mainUrl/"
                     this.quality = Qualities.Unknown.value
                 }
             )
         }
-
         return sources
     }
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Rabbitstream.kt

@@ -133,12 +133,12 @@ open class Rabbitstream : ExtractorApi() {
         return extractedKey to sources
     }
 
-    private inline suspend fun <reified T> decryptMapped(input: String, key: String): T? {
+    private inline fun <reified T> decryptMapped(input: String, key: String): T? {
         val decrypt = decrypt(input, key)
         return AppUtils.tryParseJson(decrypt)
     }
 
-    private suspend fun decrypt(input: String, key: String): String {
+    private fun decrypt(input: String, key: String): String {
         return decryptSourceUrl(
             generateKey(
                 salt = base64DecodeArray(input).copyOfRange(8, 16),
@@ -147,7 +147,7 @@ open class Rabbitstream : ExtractorApi() {
         )
     }
 
-    private suspend fun generateKey(salt: ByteArray, secret: ByteArray): ByteArray {
+    private fun generateKey(salt: ByteArray, secret: ByteArray): ByteArray {
         var key = md5(secret + salt)
         var currentKey = key
         while (currentKey.size < 48) {
@@ -157,18 +157,18 @@ open class Rabbitstream : ExtractorApi() {
         return currentKey
     }
 
-    private suspend fun md5(input: ByteArray): ByteArray =
+    private fun md5(input: ByteArray): ByteArray =
-        md5Hasher.hash(input)
+        md5Hasher.hashBlocking(input)
 
     @OptIn(DelicateCryptographyApi::class)
-    private suspend fun decryptSourceUrl(decryptionKey: ByteArray, sourceUrl: String): String {
+    private fun decryptSourceUrl(decryptionKey: ByteArray, sourceUrl: String): String {
         val cipherData = base64DecodeArray(sourceUrl)
         val encrypted = cipherData.copyOfRange(16, cipherData.size)
         val keyBytes = decryptionKey.copyOfRange(0, 32)
         val ivBytes = decryptionKey.copyOfRange(32, decryptionKey.size)
 
-        val aesKey = aesCbc.keyDecoder().decodeFromByteArray(AES.Key.Format.RAW, keyBytes)
+        val aesKey = aesCbc.keyDecoder().decodeFromByteArrayBlocking(AES.Key.Format.RAW, keyBytes)
-        val decryptedData = aesKey.cipher(padding = true).decryptWithIv(ivBytes, encrypted)
+        val decryptedData = aesKey.cipher(padding = true).decryptWithIvBlocking(ivBytes, encrypted)
         return decryptedData.decodeToString()
     }
 

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/AesHelper.kt

@@ -46,10 +46,11 @@ object AesHelper {
         }
     }
 
-    @Deprecated(
+    // Deprecate after next stable
+    /* @Deprecated(
         message = "Set padding = false for no padding",
         level = DeprecationLevel.WARNING,
-    )
+    ) */
     fun cryptoAESHandler(
         data: String,
         pass: ByteArray,

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/GogoHelper.kt

@@ -39,7 +39,7 @@ object GogoHelper {
     // https://github.com/saikou-app/saikou/blob/45d0a99b8a72665a29a1eadfb38c506b842a29d7/app/src/main/java/ani/saikou/parsers/anime/extractors/GogoCDN.kt#L97
     // No Licence on the function
     @OptIn(DelicateCryptographyApi::class)
-    private suspend fun cryptoHandler(
+    private fun cryptoHandler(
         string: String,
         iv: String,
         secretKeyString: String,
@@ -47,14 +47,14 @@ object GogoHelper {
     ): String {
         val ivBytes = iv.encodeToByteArray()
         val keyBytes = secretKeyString.encodeToByteArray()
-        val aesKey = aesCbc.keyDecoder().decodeFromByteArray(AES.Key.Format.RAW, keyBytes)
+        val aesKey = aesCbc.keyDecoder().decodeFromByteArrayBlocking(AES.Key.Format.RAW, keyBytes)
         val cipher = aesKey.cipher(padding = true)
 
         return if (!encrypt) {
-            val plainBytes = cipher.decryptWithIv(ivBytes, base64DecodeArray(string))
+            val plainBytes = cipher.decryptWithIvBlocking(ivBytes, base64DecodeArray(string))
             plainBytes.decodeToString()
         } else {
-            base64Encode(cipher.encryptWithIv(ivBytes, string.encodeToByteArray()))
+            base64Encode(cipher.encryptWithIvBlocking(ivBytes, string.encodeToByteArray()))
         }
     }
 

library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt

@@ -34,10 +34,6 @@ import com.lagradost.cloudstream3.newTvSeriesLoadResponse
 import com.lagradost.cloudstream3.newTvSeriesSearchResponse
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonNames
 
 open class TraktProvider : MainAPI() {
     override var name = "Trakt"
@@ -50,6 +46,7 @@ open class TraktProvider : MainAPI() {
     )
 
     private val traktApiUrl = "https://api.trakt.tv"
+
     private val traktClientId: String = BuildConfig.TRAKT_CLIENT_ID
 
     override val mainPage = mainPageOf(
@@ -61,21 +58,16 @@ open class TraktProvider : MainAPI() {
 
     override suspend fun getMainPage(page: Int, request: MainPageRequest): HomePageResponse {
         val apiResponse = getApi("${request.data}?extended=full,images&page=$page")
+
         val results = parseJson<List<MediaDetails>>(apiResponse).map { element ->
             element.toSearchResponse()
         }
-
         return newHomePageResponse(request.name, results)
     }
 
     private fun MediaDetails.toSearchResponse(): SearchResponse {
-        val media = this.media ?: MediaSummary(
+
-            title = this.title,
+        val media = this.media ?: this
-            year = this.year,
-            ids = this.ids,
-            rating = this.rating,
-            images = this.images,
-        )
         val mediaType = if (media.ids?.tvdb == null) TvType.Movie else TvType.TvSeries
         val poster = media.images?.poster?.firstOrNull()
         return if (mediaType == TvType.Movie) {
@@ -83,7 +75,7 @@ open class TraktProvider : MainAPI() {
                 name = media.title ?: "",
                 url = Data(
                     type = mediaType,
-                    mediaDetails = this,
+                    mediaDetails = media,
                 ).toJson(),
                 type = TvType.Movie,
             ) {
@@ -95,7 +87,7 @@ open class TraktProvider : MainAPI() {
                 name = media.title ?: "",
                 url = Data(
                     type = mediaType,
-                    mediaDetails = this,
+                    mediaDetails = media,
                 ).toJson(),
                 type = TvType.TvSeries,
             ) {
@@ -106,7 +98,9 @@ open class TraktProvider : MainAPI() {
     }
 
     override suspend fun search(query: String, page: Int): SearchResponseList? {
-        val apiResponse = getApi("$traktApiUrl/search/movie,show?extended=full,images&limit=20&page=$page&query=$query")
+        val apiResponse =
+            getApi("$traktApiUrl/search/movie,show?extended=full,images&limit=20&page=$page&query=$query")
+
         return newSearchResponseList(parseJson<List<MediaDetails>>(apiResponse).map { element ->
             element.toSearchResponse()
         })
@@ -121,7 +115,9 @@ open class TraktProvider : MainAPI() {
         val backDropUrl = fixPath(mediaDetails?.images?.fanart?.firstOrNull())
         val logoUrl = fixPath(mediaDetails?.images?.logo?.firstOrNull())
 
-        val resActor = getApi("$traktApiUrl/$moviesOrShows/${mediaDetails?.ids?.trakt}/people?extended=full,images")
+        val resActor =
+            getApi("$traktApiUrl/$moviesOrShows/${mediaDetails?.ids?.trakt}/people?extended=full,images")
+
         val actors = parseJson<People>(resActor).cast?.map {
             ActorData(
                 Actor(
@@ -132,7 +128,9 @@ open class TraktProvider : MainAPI() {
             )
         }
 
-        val resRelated = getApi("$traktApiUrl/$moviesOrShows/${mediaDetails?.ids?.trakt}/related?extended=full,images&limit=20")
+        val resRelated =
+            getApi("$traktApiUrl/$moviesOrShows/${mediaDetails?.ids?.trakt}/related?extended=full,images&limit=20")
+
         val relatedMedia = parseJson<List<MediaDetails>>(resRelated).map { it.toSearchResponse() }
 
         val isCartoon =
@@ -144,6 +142,7 @@ open class TraktProvider : MainAPI() {
         val uniqueUrl = data.mediaDetails?.ids?.trakt?.toJson() ?: data.toJson()
 
         if (data.type == TvType.Movie) {
+
             val linkData = LinkData(
                 id = mediaDetails?.ids?.tmdb,
                 traktId = mediaDetails?.ids?.trakt,
@@ -191,6 +190,7 @@ open class TraktProvider : MainAPI() {
                 addTMDbId(mediaDetails.ids?.tmdb.toString())
             }
         } else {
+
             val resSeasons =
                 getApi("$traktApiUrl/shows/${mediaDetails?.ids?.trakt.toString()}/seasons?extended=full,images,episodes")
             val episodes = mutableListOf<Episode>()
@@ -198,7 +198,9 @@ open class TraktProvider : MainAPI() {
             var nextAir: NextAiring? = null
 
             seasons.forEach { season ->
+
                 season.episodes?.map { episode ->
+
                     val linkData = LinkData(
                         id = mediaDetails?.ids?.tmdb,
                         traktId = mediaDetails?.ids?.trakt,
@@ -233,6 +235,7 @@ open class TraktProvider : MainAPI() {
                             this.description = episode.overview
                             this.runTime = episode.runtime
                             this.posterUrl = fixPath( episode.images?.screenshot?.firstOrNull())
+                            //this.rating = episode.rating?.times(10)?.roundToInt()
                             this.score = Score.from10(episode.rating)
 
                             this.addDate(episode.firstAired, "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
@@ -304,164 +307,143 @@ open class TraktProvider : MainAPI() {
         return "https://$url"
     }
 
-    @Serializable
     data class Data(
-        @JsonProperty("type") @SerialName("type") val type: TvType? = null,
+        val type: TvType? = null,
-        @JsonProperty("mediaDetails") @SerialName("mediaDetails") val mediaDetails: MediaDetails? = null,
+        val mediaDetails: MediaDetails? = null,
     )
 
-    @Serializable
-    data class MediaSummary(
-        @JsonProperty("title") @SerialName("title") val title: String? = null,
-        @JsonProperty("year") @SerialName("year") val year: Int? = null,
-        @JsonProperty("ids") @SerialName("ids") val ids: Ids? = null,
-        @JsonProperty("rating") @SerialName("rating") val rating: Double? = null,
-        @JsonProperty("images") @SerialName("images") val images: Images? = null,
-    )
-
-    @OptIn(ExperimentalSerializationApi::class) // JsonNames is an experimental annotation for now
-    @Serializable
     data class MediaDetails(
-        @JsonProperty("title") @SerialName("title") val title: String? = null,
+        @JsonProperty("title") val title: String? = null,
-        @JsonProperty("year") @SerialName("year") val year: Int? = null,
+        @JsonProperty("year") val year: Int? = null,
-        @JsonProperty("ids") @SerialName("ids") val ids: Ids? = null,
+        @JsonProperty("ids") val ids: Ids? = null,
-        @JsonProperty("tagline") @SerialName("tagline") val tagline: String? = null,
+        @JsonProperty("tagline") val tagline: String? = null,
-        @JsonProperty("overview") @SerialName("overview") val overview: String? = null,
+        @JsonProperty("overview") val overview: String? = null,
-        @JsonProperty("released") @SerialName("released") val released: String? = null,
+        @JsonProperty("released") val released: String? = null,
-        @JsonProperty("runtime") @SerialName("runtime") val runtime: Int? = null,
+        @JsonProperty("runtime") val runtime: Int? = null,
-        @JsonProperty("country") @SerialName("country") val country: String? = null,
+        @JsonProperty("country") val country: String? = null,
-        @JsonProperty("updatedAt") @SerialName("updatedAt") val updatedAt: String? = null,
+        @JsonProperty("updatedAt") val updatedAt: String? = null,
-        @JsonProperty("trailer") @SerialName("trailer") val trailer: String? = null,
+        @JsonProperty("trailer") val trailer: String? = null,
-        @JsonProperty("homepage") @SerialName("homepage") val homepage: String? = null,
+        @JsonProperty("homepage") val homepage: String? = null,
-        @JsonProperty("status") @SerialName("status") val status: String? = null,
+        @JsonProperty("status") val status: String? = null,
-        @JsonProperty("rating") @SerialName("rating") val rating: Double? = null,
+        @JsonProperty("rating") val rating: Double? = null,
-        @JsonProperty("votes") @SerialName("votes") val votes: Long? = null,
+        @JsonProperty("votes") val votes: Long? = null,
-        @JsonProperty("comment_count") @SerialName("comment_count") val commentCount: Long? = null,
+        @JsonProperty("comment_count") val commentCount: Long? = null,
-        @JsonProperty("language") @SerialName("language") val language: String? = null,
+        @JsonProperty("language") val language: String? = null,
-        @JsonProperty("languages") @SerialName("languages") val languages: List<String>? = null,
+        @JsonProperty("languages") val languages: List<String>? = null,
-        @JsonProperty("available_translations") @SerialName("available_translations") val availableTranslations: List<String>? = null,
+        @JsonProperty("available_translations") val availableTranslations: List<String>? = null,
-        @JsonProperty("genres") @SerialName("genres") val genres: List<String>? = null,
+        @JsonProperty("genres") val genres: List<String>? = null,
-        @JsonProperty("certification") @SerialName("certification") val certification: String? = null,
+        @JsonProperty("certification") val certification: String? = null,
-        @JsonProperty("aired_episodes") @SerialName("aired_episodes") val airedEpisodes: Int? = null,
+        @JsonProperty("aired_episodes") val airedEpisodes: Int? = null,
-        @JsonProperty("first_aired") @SerialName("first_aired") val firstAired: String? = null,
+        @JsonProperty("first_aired") val firstAired: String? = null,
-        @JsonProperty("airs") @SerialName("airs") val airs: Airs? = null,
+        @JsonProperty("airs") val airs: Airs? = null,
-        @JsonProperty("network") @SerialName("network") val network: String? = null,
+        @JsonProperty("network") val network: String? = null,
-        @JsonProperty("images") @SerialName("images") val images: Images? = null,
+        @JsonProperty("images") val images: Images? = null,
-        @JsonProperty("media") @JsonAlias("movie", "show") @SerialName("media") @JsonNames("movie", "show") val media: MediaSummary? = null,
+        @JsonProperty("movie") @JsonAlias("show") val media: MediaDetails? = null
     )
 
-    @Serializable
     data class Airs(
-        @JsonProperty("day") @SerialName("day") val day: String? = null,
+        @JsonProperty("day") val day: String? = null,
-        @JsonProperty("time") @SerialName("time") val time: String? = null,
+        @JsonProperty("time") val time: String? = null,
-        @JsonProperty("timezone") @SerialName("timezone") val timezone: String? = null,
+        @JsonProperty("timezone") val timezone: String? = null,
     )
 
-    @Serializable
     data class Ids(
-        @JsonProperty("trakt") @SerialName("trakt") val trakt: Int? = null,
+        @JsonProperty("trakt") val trakt: Int? = null,
-        @JsonProperty("slug") @SerialName("slug") val slug: String? = null,
+        @JsonProperty("slug") val slug: String? = null,
-        @JsonProperty("tvdb") @SerialName("tvdb") val tvdb: Int? = null,
+        @JsonProperty("tvdb") val tvdb: Int? = null,
-        @JsonProperty("imdb") @SerialName("imdb") val imdb: String? = null,
+        @JsonProperty("imdb") val imdb: String? = null,
-        @JsonProperty("tmdb") @SerialName("tmdb") val tmdb: Int? = null,
+        @JsonProperty("tmdb") val tmdb: Int? = null,
-        @JsonProperty("tvrage") @SerialName("tvrage") val tvrage: String? = null,
+        @JsonProperty("tvrage") val tvrage: String? = null,
     )
 
-    @Serializable
     data class Images(
-        @JsonProperty("poster") @SerialName("poster") val poster: List<String>? = null,
+        @JsonProperty("poster") val poster: List<String>? = null,
-        @JsonProperty("fanart") @SerialName("fanart") val fanart: List<String>? = null,
+        @JsonProperty("fanart") val fanart: List<String>? = null,
-        @JsonProperty("logo") @SerialName("logo") val logo: List<String>? = null,
+        @JsonProperty("logo") val logo: List<String>? = null,
-        @JsonProperty("clearart") @SerialName("clearart") val clearArt: List<String>? = null,
+        @JsonProperty("clearart") val clearArt: List<String>? = null,
-        @JsonProperty("banner") @SerialName("banner") val banner: List<String>? = null,
+        @JsonProperty("banner") val banner: List<String>? = null,
-        @JsonProperty("thumb") @SerialName("thumb") val thumb: List<String>? = null,
+        @JsonProperty("thumb") val thumb: List<String>? = null,
-        @JsonProperty("screenshot") @SerialName("screenshot") val screenshot: List<String>? = null,
+        @JsonProperty("screenshot") val screenshot: List<String>? = null,
-        @JsonProperty("headshot") @SerialName("headshot") val headshot: List<String>? = null,
+        @JsonProperty("headshot") val headshot: List<String>? = null,
     )
 
-    @Serializable
     data class People(
-        @JsonProperty("cast") @SerialName("cast") val cast: List<Cast>? = null,
+        @JsonProperty("cast") val cast: List<Cast>? = null,
     )
 
-    @Serializable
     data class Cast(
-        @JsonProperty("character") @SerialName("character") val character: String? = null,
+        @JsonProperty("character") val character: String? = null,
-        @JsonProperty("characters") @SerialName("characters") val characters: List<String>? = null,
+        @JsonProperty("characters") val characters: List<String>? = null,
-        @JsonProperty("episode_count") @SerialName("episode_count") val episodeCount: Long? = null,
+        @JsonProperty("episode_count") val episodeCount: Long? = null,
-        @JsonProperty("person") @SerialName("person") val person: Person? = null,
+        @JsonProperty("person") val person: Person? = null,
-        @JsonProperty("images") @SerialName("images") val images: Images? = null,
+        @JsonProperty("images") val images: Images? = null,
     )
 
-    @Serializable
     data class Person(
-        @JsonProperty("name") @SerialName("name") val name: String? = null,
+        @JsonProperty("name") val name: String? = null,
-        @JsonProperty("ids") @SerialName("ids") val ids: Ids? = null,
+        @JsonProperty("ids") val ids: Ids? = null,
-        @JsonProperty("images") @SerialName("images") val images: Images? = null,
+        @JsonProperty("images") val images: Images? = null,
     )
 
-    @Serializable
     data class Seasons(
-        @JsonProperty("aired_episodes") @SerialName("aired_episodes") val airedEpisodes: Int? = null,
+        @JsonProperty("aired_episodes") val airedEpisodes: Int? = null,
-        @JsonProperty("episode_count") @SerialName("episode_count") val episodeCount: Int? = null,
+        @JsonProperty("episode_count") val episodeCount: Int? = null,
-        @JsonProperty("episodes") @SerialName("episodes") val episodes: List<TraktEpisode>? = null,
+        @JsonProperty("episodes") val episodes: List<TraktEpisode>? = null,
-        @JsonProperty("first_aired") @SerialName("first_aired") val firstAired: String? = null,
+        @JsonProperty("first_aired") val firstAired: String? = null,
-        @JsonProperty("ids") @SerialName("ids") val ids: Ids? = null,
+        @JsonProperty("ids") val ids: Ids? = null,
-        @JsonProperty("images") @SerialName("images") val images: Images? = null,
+        @JsonProperty("images") val images: Images? = null,
-        @JsonProperty("network") @SerialName("network") val network: String? = null,
+        @JsonProperty("network") val network: String? = null,
-        @JsonProperty("number") @SerialName("number") val number: Int? = null,
+        @JsonProperty("number") val number: Int? = null,
-        @JsonProperty("overview") @SerialName("overview") val overview: String? = null,
+        @JsonProperty("overview") val overview: String? = null,
-        @JsonProperty("rating") @SerialName("rating") val rating: Double? = null,
+        @JsonProperty("rating") val rating: Double? = null,
-        @JsonProperty("title") @SerialName("title") val title: String? = null,
+        @JsonProperty("title") val title: String? = null,
-        @JsonProperty("updated_at") @SerialName("updated_at") val updatedAt: String? = null,
+        @JsonProperty("updated_at") val updatedAt: String? = null,
-        @JsonProperty("votes") @SerialName("votes") val votes: Int? = null,
+        @JsonProperty("votes") val votes: Int? = null,
     )
 
-    @Serializable
     data class TraktEpisode(
-        @JsonProperty("available_translations") @SerialName("available_translations") val availableTranslations: List<String>? = null,
+        @JsonProperty("available_translations") val availableTranslations: List<String>? = null,
-        @JsonProperty("comment_count") @SerialName("comment_count") val commentCount: Int? = null,
+        @JsonProperty("comment_count") val commentCount: Int? = null,
-        @JsonProperty("episode_type") @SerialName("episode_type") val episodeType: String? = null,
+        @JsonProperty("episode_type") val episodeType: String? = null,
-        @JsonProperty("first_aired") @SerialName("first_aired") val firstAired: String? = null,
+        @JsonProperty("first_aired") val firstAired: String? = null,
-        @JsonProperty("ids") @SerialName("ids") val ids: Ids? = null,
+        @JsonProperty("ids") val ids: Ids? = null,
-        @JsonProperty("images") @SerialName("images") val images: Images? = null,
+        @JsonProperty("images") val images: Images? = null,
-        @JsonProperty("number") @SerialName("number") val number: Int? = null,
+        @JsonProperty("number") val number: Int? = null,
-        @JsonProperty("number_abs") @SerialName("number_abs") val numberAbs: Int? = null,
+        @JsonProperty("number_abs") val numberAbs: Int? = null,
-        @JsonProperty("overview") @SerialName("overview") val overview: String? = null,
+        @JsonProperty("overview") val overview: String? = null,
-        @JsonProperty("rating") @SerialName("rating") val rating: Double? = null,
+        @JsonProperty("rating") val rating: Double? = null,
-        @JsonProperty("runtime") @SerialName("runtime") val runtime: Int? = null,
+        @JsonProperty("runtime") val runtime: Int? = null,
-        @JsonProperty("season") @SerialName("season") val season: Int? = null,
+        @JsonProperty("season") val season: Int? = null,
-        @JsonProperty("title") @SerialName("title") val title: String? = null,
+        @JsonProperty("title") val title: String? = null,
-        @JsonProperty("updated_at") @SerialName("updated_at") val updatedAt: String? = null,
+        @JsonProperty("updated_at") val updatedAt: String? = null,
-        @JsonProperty("votes") @SerialName("votes") val votes: Int? = null,
+        @JsonProperty("votes") val votes: Int? = null,
     )
 
-    @Serializable
     data class LinkData(
-        @JsonProperty("id") @SerialName("id") val id: Int? = null,
+        @JsonProperty("id") val id: Int? = null,
-        @JsonProperty("trakt_id") @SerialName("trakt_id") val traktId: Int? = null,
+        @JsonProperty("trakt_id") val traktId: Int? = null,
-        @JsonProperty("trakt_slug") @SerialName("trakt_slug") val traktSlug: String? = null,
+        @JsonProperty("trakt_slug") val traktSlug: String? = null,
-        @JsonProperty("tmdb_id") @SerialName("tmdb_id") val tmdbId: Int? = null,
+        @JsonProperty("tmdb_id") val tmdbId: Int? = null,
-        @JsonProperty("imdb_id") @SerialName("imdb_id") val imdbId: String? = null,
+        @JsonProperty("imdb_id") val imdbId: String? = null,
-        @JsonProperty("tvdb_id") @SerialName("tvdb_id") val tvdbId: Int? = null,
+        @JsonProperty("tvdb_id") val tvdbId: Int? = null,
-        @JsonProperty("tvrage_id") @SerialName("tvrage_id") val tvrageId: String? = null,
+        @JsonProperty("tvrage_id") val tvrageId: String? = null,
-        @JsonProperty("type") @SerialName("type") val type: String? = null,
+        @JsonProperty("type") val type: String? = null,
-        @JsonProperty("season") @SerialName("season") val season: Int? = null,
+        @JsonProperty("season") val season: Int? = null,
-        @JsonProperty("episode") @SerialName("episode") val episode: Int? = null,
+        @JsonProperty("episode") val episode: Int? = null,
-        @JsonProperty("ani_id") @SerialName("ani_id") val aniId: String? = null,
+        @JsonProperty("ani_id") val aniId: String? = null,
-        @JsonProperty("anime_id") @SerialName("anime_id") val animeId: String? = null,
+        @JsonProperty("anime_id") val animeId: String? = null,
-        @JsonProperty("title") @SerialName("title") val title: String? = null,
+        @JsonProperty("title") val title: String? = null,
-        @JsonProperty("year") @SerialName("year") val year: Int? = null,
+        @JsonProperty("year") val year: Int? = null,
-        @JsonProperty("org_title") @SerialName("org_title") val orgTitle: String? = null,
+        @JsonProperty("org_title") val orgTitle: String? = null,
-        @JsonProperty("is_anime") @SerialName("is_anime") val isAnime: Boolean = false,
+        @JsonProperty("is_anime") val isAnime: Boolean = false,
-        @JsonProperty("aired_year") @SerialName("aired_year") val airedYear: Int? = null,
+        @JsonProperty("aired_year") val airedYear: Int? = null,
-        @JsonProperty("last_season") @SerialName("last_season") val lastSeason: Int? = null,
+        @JsonProperty("last_season") val lastSeason: Int? = null,
-        @JsonProperty("eps_title") @SerialName("eps_title") val epsTitle: String? = null,
+        @JsonProperty("eps_title") val epsTitle: String? = null,
-        @JsonProperty("jp_title") @SerialName("jp_title") val jpTitle: String? = null,
+        @JsonProperty("jp_title") val jpTitle: String? = null,
-        @JsonProperty("date") @SerialName("date") val date: String? = null,
+        @JsonProperty("date") val date: String? = null,
-        @JsonProperty("aired_date") @SerialName("aired_date") val airedDate: String? = null,
+        @JsonProperty("aired_date") val airedDate: String? = null,
-        @JsonProperty("is_asian") @SerialName("is_asian") val isAsian: Boolean = false,
+        @JsonProperty("is_asian") val isAsian: Boolean = false,
-        @JsonProperty("is_bollywood") @SerialName("is_bollywood") val isBollywood: Boolean = false,
+        @JsonProperty("is_bollywood") val isBollywood: Boolean = false,
-        @JsonProperty("is_cartoon") @SerialName("is_cartoon") val isCartoon: Boolean = false,
+        @JsonProperty("is_cartoon") val isCartoon: Boolean = false,
     )
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.kt

@@ -72,10 +72,11 @@ object Coroutines {
         return AtomicMutableList(items.toMutableList())
     }
 
-    @Deprecated(
+    // Deprecate after next stable
+    /*@Deprecated(
         message = "Use atomicListOf() instead.",
         replaceWith = ReplaceWith("atomicListOf(*items)"),
         level = DeprecationLevel.WARNING,
-    )
+    )*/
     fun <T> threadSafeListOf(vararg items: T): MutableList<T> = atomicListOf(*items)
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/StringUtils.kt

@@ -13,18 +13,20 @@ object StringUtils {
         return this.encodeURLParameter()
     }
 
-    @Deprecated(
+    // Deprecate after next stable
+
+    /* @Deprecated(
         message = "Use Ktor 'Url' naming convention instead.",
         replaceWith = ReplaceWith("this.encodeUrl()"),
         level = DeprecationLevel.WARNING,
-    )
+    ) */
     fun String.encodeUri(): String = encodeUrl()
 
-    @Deprecated(
+    /* @Deprecated(
         message = "Use Ktor 'Url' naming convention instead.",
         replaceWith = ReplaceWith("this.decodeUrl()"),
         level = DeprecationLevel.WARNING,
-    )
+    ) */
     fun String.decodeUri(): String = decodeUrl()
 }
 

library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/FloatAsIntSerializer.kt

@@ -1,42 +0,0 @@
-package com.lagradost.cloudstream3.utils.serializers
-
-import com.lagradost.cloudstream3.Prerelease
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.descriptors.PrimitiveKind
-import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
-import kotlinx.serialization.descriptors.SerialDescriptor
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
-import kotlinx.serialization.json.JsonDecoder
-import kotlinx.serialization.json.JsonPrimitive
-import kotlinx.serialization.json.doubleOrNull
-import kotlinx.serialization.json.intOrNull
-
-/**
- * Replicates Jackson's ACCEPT_FLOAT_AS_INT behaviour for Int fields.
- * A floating-point JSON number is truncated to Int by dropping the
- * fractional part, exactly like Jackson's default truncation behaviour.
- *
- * Usage:
- *
- *   @Serializable
- *   data class MyData(
- *       @Serializable(with = FloatAsIntSerializer::class)
- *       @SerialName("count") val count: Int = 0,
- *   )
- */
-@Prerelease
-object FloatAsIntSerializer : KSerializer<Int> {
-
-    override val descriptor: SerialDescriptor =
-        PrimitiveSerialDescriptor("FloatAsInt", PrimitiveKind.INT)
-
-    override fun deserialize(decoder: Decoder): Int {
-        val jsonDecoder = decoder as? JsonDecoder ?: return decoder.decodeInt()
-        val element = jsonDecoder.decodeJsonElement()
-        if (element !is JsonPrimitive) return 0
-        return element.intOrNull ?: element.doubleOrNull?.toInt() ?: 0
-    }
-
-    override fun serialize(encoder: Encoder, value: Int) = encoder.encodeInt(value)
-}

library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/FloatAsLongSerializer.kt

@@ -1,42 +0,0 @@
-package com.lagradost.cloudstream3.utils.serializers
-
-import com.lagradost.cloudstream3.Prerelease
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.descriptors.PrimitiveKind
-import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
-import kotlinx.serialization.descriptors.SerialDescriptor
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
-import kotlinx.serialization.json.JsonDecoder
-import kotlinx.serialization.json.JsonPrimitive
-import kotlinx.serialization.json.doubleOrNull
-import kotlinx.serialization.json.longOrNull
-
-/**
- * Replicates Jackson's ACCEPT_FLOAT_AS_INT behaviour for Long fields.
- * A floating-point JSON number is truncated to Long by dropping the
- * fractional part, exactly like Jackson's default truncation behaviour.
- *
- * Usage:
- *
- *   @Serializable
- *   data class MyData(
- *       @Serializable(with = FloatAsLongSerializer::class)
- *       @SerialName("timestamp") val timestamp: Long = 0L,
- *   )
- */
-@Prerelease
-object FloatAsLongSerializer : KSerializer<Long> {
-
-    override val descriptor: SerialDescriptor =
-        PrimitiveSerialDescriptor("FloatAsLong", PrimitiveKind.LONG)
-
-    override fun deserialize(decoder: Decoder): Long {
-        val jsonDecoder = decoder as? JsonDecoder ?: return decoder.decodeLong()
-        val element = jsonDecoder.decodeJsonElement()
-        if (element !is JsonPrimitive) return 0L
-        return element.longOrNull ?: element.doubleOrNull?.toLong() ?: 0L
-    }
-
-    override fun serialize(encoder: Encoder, value: Long) = encoder.encodeLong(value)
-}

library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/JsonTransformSerializer.kt

@@ -1,75 +0,0 @@
-package com.lagradost.cloudstream3.utils.serializers
-
-import com.lagradost.cloudstream3.Prerelease
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.json.JsonArray
-import kotlinx.serialization.json.JsonElement
-import kotlinx.serialization.json.JsonNull
-import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.JsonPrimitive
-import kotlinx.serialization.json.JsonTransformingSerializer
-
-/**
- * Composable deserialize transformer that applies multiple Jackson-equivalent
- * behaviours to specific fields by key. Pass only the sets you need; all
- * default to empty (no-op).
- *
- * Behaviours (applied in order per field):
- *   singleValueAsListKeys ACCEPT_SINGLE_VALUE_AS_ARRAY
- *   emptyStringAsNullKeys ACCEPT_EMPTY_STRING_AS_NULL_OBJECT
- *   emptyArrayAsNullKeys ACCEPT_EMPTY_ARRAY_AS_NULL_OBJECT
- *
- * Usage:
- *
- *   @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
- *   @KeepGeneratedSerializer
- *   @Serializable(with = MyData.Serializer::class)
- *   data class MyData(
- *       @SerialName("title") val title: String? = null,
- *       @SerialName("tags") val tags: List<String>? = null,
- *       @SerialName("meta") val meta: MyMeta? = null,
- *   ) {
- *       object Serializer : JsonTransformSerializer<MyData>(
- *           MyData.generatedSerializer(),
- *           singleValueAsListKeys = setOf("tags"),
- *           emptyStringAsNullKeys = setOf("title", "tags"),
- *           emptyArrayAsNullKeys = setOf("tags", "meta"),
- *       )
- *   }
- */
-@Prerelease
-abstract class JsonTransformSerializer<T : Any>(
-    tSerializer: KSerializer<T>,
-    private val singleValueAsListKeys: Set<String> = emptySet(),
-    private val emptyArrayAsNullKeys: Set<String> = emptySet(),
-    private val emptyStringAsNullKeys: Set<String> = emptySet(),
-) : JsonTransformingSerializer<T>(tSerializer) {
-
-    override fun transformDeserialize(element: JsonElement): JsonElement {
-        if (element !is JsonObject) return element
-        return JsonObject(element.mapValues { (key, value) ->
-            var result = value
-            if (key in singleValueAsListKeys) {
-                result = when (result) {
-                    is JsonArray -> result
-                    JsonNull -> JsonArray(emptyList())
-                    else -> JsonArray(listOf(result))
-                }
-            }
-
-            if (key in emptyStringAsNullKeys) {
-                if (result is JsonPrimitive && result.isString && result.content.isEmpty()) {
-                    result = JsonNull
-                }
-            }
-
-            if (key in emptyArrayAsNullKeys) {
-                if (result is JsonArray && result.isEmpty()) {
-                    result = JsonNull
-                }
-            }
-
-            result
-        })
-    }
-}

library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/NonEmptySerializer.kt

@@ -17,13 +17,13 @@ import kotlinx.serialization.json.JsonTransformingSerializer
  *
  * Usage:
  *
- *   @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
+ *   @OptIn(ExperimentalSerializationApi::class)
  *   @KeepGeneratedSerializer
  *   @Serializable(with = MyData.Serializer::class)
  *   data class MyData(
- *       @SerialName("tags") val tags: List<String> = emptyList(),
+ *       val tags: List<String> = emptyList(),
- *       @SerialName("title") val title: String = "",
+ *       val title: String = "",
- *       @SerialName("meta") val meta: Map<String, String> = emptyMap(),
+ *       val meta: Map<String, String> = emptyMap(),
  *   ) {
  *       object Serializer : NonEmptySerializer<MyData>(MyData.generatedSerializer())
  *   }
@@ -33,6 +33,7 @@ abstract class NonEmptySerializer<T : Any>(tSerializer: KSerializer<T>) :
 
     override fun transformSerialize(element: JsonElement): JsonElement {
         if (element !is JsonObject) return element
+
         return JsonObject(element.filterValues { value ->
             when (value) {
                 is JsonPrimitive -> value.content.isNotEmpty()

library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/NullableStringSerializer.kt

@@ -1,49 +0,0 @@
-package com.lagradost.cloudstream3.utils.serializers
-
-import com.lagradost.cloudstream3.Prerelease
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.builtins.serializer
-import kotlinx.serialization.descriptors.PrimitiveKind
-import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
-import kotlinx.serialization.descriptors.SerialDescriptor
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
-import kotlinx.serialization.json.JsonDecoder
-import kotlinx.serialization.json.JsonNull
-import kotlinx.serialization.json.JsonPrimitive
-import kotlinx.serialization.json.decodeFromJsonElement
-
-/**
- * Convenience serializer for nullable String fields that combines
- * ACCEPT_EMPTY_STRING_AS_NULL_OBJECT with null passthrough.
- * An empty JSON string (`""`) or JSON null is decoded as null.
- *
- * Usage:
- *
- *   @Serializable
- *   data class MyData(
- *       @Serializable(with = NullableStringSerializer::class)
- *       @SerialName("title") val title: String? = null,
- *   )
- */
-@Prerelease
-object NullableStringSerializer : KSerializer<String?> {
-
-    override val descriptor: SerialDescriptor =
-        PrimitiveSerialDescriptor("NullableString", PrimitiveKind.STRING)
-
-    override fun deserialize(decoder: Decoder): String? {
-        val jsonDecoder = decoder as? JsonDecoder ?: return decoder.decodeString()
-        return when (val element = jsonDecoder.decodeJsonElement()) {
-            is JsonPrimitive -> element.content.ifEmpty { null }
-            JsonNull -> null
-            else -> jsonDecoder.json.decodeFromJsonElement(String.serializer(), element)
-        }
-    }
-
-    override fun serialize(encoder: Encoder, value: String?) {
-        @OptIn(ExperimentalSerializationApi::class) // encodeNull is experimental for now
-        if (value == null) encoder.encodeNull() else encoder.encodeString(value)
-    }
-}

library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/WriteOnlySerializer.kt

@@ -12,12 +12,12 @@ import kotlinx.serialization.json.JsonTransformingSerializer
  *
  * Usage:
  *
- *   @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
+ *   @OptIn(ExperimentalSerializationApi::class)
  *   @KeepGeneratedSerializer
  *   @Serializable(with = MyData.Serializer::class)
  *   data class MyData(
- *       @SerialName("fieldA") val fieldA: String = "",
+ *       val fieldA: String = "",
- *       @SerialName("fieldB") val fieldB: String = "",
+ *       val fieldB: String = "",
  *   ) {
  *       object Serializer : WriteOnlySerializer<MyData>(
  *           MyData.generatedSerializer(),

library/src/commonTest/kotlin/com/lagradost/cloudstream3/utils/serializers/SerializersTest.kt

@@ -1,602 +0,0 @@
-package com.lagradost.cloudstream3.utils.serializers
-
-import com.lagradost.cloudstream3.utils.AppUtils.parseJson
-import com.lagradost.cloudstream3.utils.AppUtils.toJson
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.KeepGeneratedSerializer
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlin.test.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertFalse
-import kotlin.test.assertNull
-import kotlin.test.assertTrue
-
-@OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-@KeepGeneratedSerializer
-@Serializable(with = NonEmptyData.Serializer::class)
-data class NonEmptyData(
-    @SerialName("title") val title: String = "",
-    @SerialName("tags") val tags: List<String> = emptyList(),
-    @SerialName("meta") val meta: Map<String, String> = emptyMap(),
-    @SerialName("name") val name: String = "hello",
-) {
-    object Serializer : NonEmptySerializer<NonEmptyData>(NonEmptyData.generatedSerializer())
-}
-
-@OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-@KeepGeneratedSerializer
-@Serializable(with = WriteOnlyData.Serializer::class)
-data class WriteOnlyData(
-    @SerialName("fieldA") val fieldA: String = "",
-    @SerialName("fieldB") val fieldB: String = "",
-) {
-    object Serializer : WriteOnlySerializer<WriteOnlyData>(
-        WriteOnlyData.generatedSerializer(),
-        setOf("fieldB"),
-    )
-}
-
-@OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-@KeepGeneratedSerializer
-@Serializable(with = MultiWriteOnly.Serializer::class)
-data class MultiWriteOnly(
-    @SerialName("fieldA") val fieldA: String = "",
-    @SerialName("fieldB") val fieldB: String = "",
-    @SerialName("fieldC") val fieldC: String = "",
-) {
-    object Serializer : WriteOnlySerializer<MultiWriteOnly>(
-        MultiWriteOnly.generatedSerializer(),
-        setOf("fieldB", "fieldC"),
-    )
-}
-
-@OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-@KeepGeneratedSerializer
-@Serializable(with = SingleValueData.Serializer::class)
-data class SingleValueData(
-    @SerialName("tags") val tags: List<String> = emptyList(),
-    @SerialName("nums") val nums: List<Int> = emptyList(),
-) {
-    object Serializer : JsonTransformSerializer<SingleValueData>(
-        SingleValueData.generatedSerializer(),
-        singleValueAsListKeys = setOf("tags", "nums"),
-    )
-}
-
-@Serializable
-data class NestedMeta(
-    @SerialName("key") val key: String = "",
-)
-
-@OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-@KeepGeneratedSerializer
-@Serializable(with = EmptyArrayData.Serializer::class)
-data class EmptyArrayData(
-    @SerialName("meta") val meta: NestedMeta? = null,
-    @SerialName("other") val other: String = "hello",
-) {
-    object Serializer : JsonTransformSerializer<EmptyArrayData>(
-        EmptyArrayData.generatedSerializer(),
-        emptyArrayAsNullKeys = setOf("meta"),
-    )
-}
-
-@OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-@KeepGeneratedSerializer
-@Serializable(with = EmptyStringData.Serializer::class)
-data class EmptyStringData(
-    @SerialName("title") val title: String? = null,
-    @SerialName("episode") val episode: NestedMeta? = null,
-    @SerialName("keep") val keep: String? = "hello",
-) {
-    object Serializer : JsonTransformSerializer<EmptyStringData>(
-        EmptyStringData.generatedSerializer(),
-        emptyStringAsNullKeys = setOf("title", "episode", "keep"),
-    )
-}
-
-@OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-@KeepGeneratedSerializer
-@Serializable(with = SingleValueOrNullData.Serializer::class)
-data class SingleValueOrNullData(
-    @SerialName("tags") val tags: List<String>? = null,
-    @SerialName("nums") val nums: List<Int>? = null,
-    @SerialName("other") val other: String = "hello",
-) {
-    object Serializer : JsonTransformSerializer<SingleValueOrNullData>(
-        SingleValueOrNullData.generatedSerializer(),
-        singleValueAsListKeys = setOf("tags", "nums"),
-        emptyArrayAsNullKeys = setOf("tags", "nums"),
-    )
-}
-
-@OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-@KeepGeneratedSerializer
-@Serializable(with = NullableFieldsData.Serializer::class)
-data class NullableFieldsData(
-    @SerialName("title") val title: String? = null,
-    @SerialName("meta") val meta: NestedMeta? = null,
-    @SerialName("other") val other: String = "hello",
-) {
-    object Serializer : JsonTransformSerializer<NullableFieldsData>(
-        NullableFieldsData.generatedSerializer(),
-        emptyStringAsNullKeys = setOf("title"),
-        emptyArrayAsNullKeys = setOf("meta"),
-    )
-}
-
-@OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-@KeepGeneratedSerializer
-@Serializable(with = SingleValueOrEmptyStringData.Serializer::class)
-data class SingleValueOrEmptyStringData(
-    @SerialName("tags") val tags: List<String> = emptyList(),
-    @SerialName("title") val title: String? = null,
-) {
-    object Serializer : JsonTransformSerializer<SingleValueOrEmptyStringData>(
-        SingleValueOrEmptyStringData.generatedSerializer(),
-        singleValueAsListKeys = setOf("tags"),
-        emptyStringAsNullKeys = setOf("title"),
-    )
-}
-
-@OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-@KeepGeneratedSerializer
-@Serializable(with = AllTransformsData.Serializer::class)
-data class AllTransformsData(
-    @SerialName("tags") val tags: List<String>? = null,
-    @SerialName("title") val title: String? = null,
-    @SerialName("meta") val meta: NestedMeta? = null,
-    @SerialName("other") val other: String = "hello",
-) {
-    object Serializer : JsonTransformSerializer<AllTransformsData>(
-        AllTransformsData.generatedSerializer(),
-        singleValueAsListKeys = setOf("tags"),
-        emptyArrayAsNullKeys = setOf("tags", "meta"),
-        emptyStringAsNullKeys = setOf("title", "tags"),
-    )
-}
-
-@Serializable
-data class FloatIntData(
-    @Serializable(with = FloatAsIntSerializer::class)
-    @SerialName("count") val count: Int = 0,
-)
-
-@Serializable
-data class FloatLongData(
-    @Serializable(with = FloatAsLongSerializer::class)
-    @SerialName("timestamp") val timestamp: Long = 0L,
-)
-
-@Serializable
-data class NullableStringData(
-    @Serializable(with = NullableStringSerializer::class)
-    @SerialName("title") val title: String? = null,
-)
-
-class SerializersTest {
-
-    @Test
-    fun nonEmptySerializerOmitsEmptyStrings() {
-        val data = NonEmptyData(title = "", name = "hello")
-        val result = data.toJson()
-        assertFalse(result.contains("title"))
-        assertTrue(result.contains("name"))
-    }
-
-    @Test
-    fun nonEmptySerializerOmitsEmptyLists() {
-        val data = NonEmptyData(tags = emptyList(), name = "hello")
-        val result = data.toJson()
-        assertFalse(result.contains("tags"))
-    }
-
-    @Test
-    fun nonEmptySerializerOmitsEmptyMaps() {
-        val data = NonEmptyData(meta = emptyMap(), name = "hello")
-        val result = data.toJson()
-        assertFalse(result.contains("meta"))
-    }
-
-    @Test
-    fun nonEmptySerializerKeepsNonEmptyFields() {
-        val data = NonEmptyData(title = "hello", tags = listOf("a"), meta = mapOf("k" to "v"))
-        val result = data.toJson()
-        assertTrue(result.contains("title"))
-        assertTrue(result.contains("tags"))
-        assertTrue(result.contains("meta"))
-    }
-
-    @Test
-    fun nonEmptySerializerDoesNotAffectDeserialization() {
-        val input = """{"title":"hello","tags":["a"],"meta":{"k":"v"},"name":"world"}"""
-        val result = parseJson<NonEmptyData>(input)
-        assertEquals("hello", result.title)
-        assertEquals(listOf("a"), result.tags)
-        assertEquals(mapOf("k" to "v"), result.meta)
-        assertEquals("world", result.name)
-    }
-
-    @Test
-    fun writeOnlySerializerOmitsFieldOnSerialize() {
-        val data = WriteOnlyData(fieldA = "hello", fieldB = "secret")
-        val result = data.toJson()
-        assertTrue(result.contains("fieldA"))
-        assertFalse(result.contains("fieldB"))
-    }
-
-    @Test
-    fun writeOnlySerializerDeserializesNormally() {
-        val input = """{"fieldA":"hello","fieldB":"secret"}"""
-        val result = parseJson<WriteOnlyData>(input)
-        assertEquals("hello", result.fieldA)
-        assertEquals("secret", result.fieldB)
-    }
-
-    @Test
-    fun writeOnlySerializerDeserializesMissingAsDefault() {
-        val input = """{"fieldA":"hello"}"""
-        val result = parseJson<WriteOnlyData>(input)
-        assertEquals("hello", result.fieldA)
-        assertEquals("", result.fieldB)
-    }
-
-    @Test
-    fun writeOnlySerializerHandlesMultipleKeys() {
-        val data = MultiWriteOnly(fieldA = "hello", fieldB = "secret1", fieldC = "secret2")
-        val result = data.toJson()
-        assertTrue(result.contains("fieldA"))
-        assertFalse(result.contains("fieldB"))
-        assertFalse(result.contains("fieldC"))
-    }
-
-    @Test
-    fun singleValueAsListDecodesArrayNormally() {
-        val input = """{"tags":["a","b"],"nums":[1,2]}"""
-        val result = parseJson<SingleValueData>(input)
-        assertEquals(listOf("a", "b"), result.tags)
-        assertEquals(listOf(1, 2), result.nums)
-    }
-
-    @Test
-    fun singleValueAsListWrapsBareStringInList() {
-        val input = """{"tags":"a","nums":[1]}"""
-        val result = parseJson<SingleValueData>(input)
-        assertEquals(listOf("a"), result.tags)
-    }
-
-    @Test
-    fun singleValueAsListWrapsBareIntInList() {
-        val input = """{"tags":[],"nums":42}"""
-        val result = parseJson<SingleValueData>(input)
-        assertEquals(listOf(42), result.nums)
-    }
-
-    @Test
-    fun singleValueAsListDecodesNullAsEmptyList() {
-        val input = """{"tags":null,"nums":[]}"""
-        val result = parseJson<SingleValueData>(input)
-        assertEquals(emptyList<String>(), result.tags)
-    }
-
-    @Test
-    fun singleValueAsListRoundtripsCorrectly() {
-        val data = SingleValueData(tags = listOf("x", "y"), nums = listOf(1, 2))
-        val encoded = data.toJson()
-        val decoded = parseJson<SingleValueData>(encoded)
-        assertEquals(data, decoded)
-    }
-
-    @Test
-    fun emptyArrayAsNullDecodesEmptyArrayAsNull() {
-        val input = """{"meta":[],"other":"hello"}"""
-        val result = parseJson<EmptyArrayData>(input)
-        assertNull(result.meta)
-    }
-
-    @Test
-    fun emptyArrayAsNullDecodesNullAsNull() {
-        val input = """{"meta":null,"other":"hello"}"""
-        val result = parseJson<EmptyArrayData>(input)
-        assertNull(result.meta)
-    }
-
-    @Test
-    fun emptyArrayAsNullDecodesObjectNormally() {
-        val input = """{"meta":{"key":"value"},"other":"hello"}"""
-        val result = parseJson<EmptyArrayData>(input)
-        assertEquals(NestedMeta("value"), result.meta)
-    }
-
-    @Test
-    fun emptyArrayAsNullDoesNotAffectOtherFields() {
-        val input = """{"meta":[],"other":"world"}"""
-        val result = parseJson<EmptyArrayData>(input)
-        assertEquals("world", result.other)
-    }
-
-    @Test
-    fun emptyArrayAsNullRoundtripsCorrectly() {
-        val data = EmptyArrayData(meta = NestedMeta("test"), other = "hello")
-        val encoded = data.toJson()
-        val decoded = parseJson<EmptyArrayData>(encoded)
-        assertEquals(data, decoded)
-    }
-
-    @Test
-    fun emptyStringAsNullDecodesEmptyStringAsNull() {
-        val input = """{"title":"","episode":null,"keep":"hello"}"""
-        val result = parseJson<EmptyStringData>(input)
-        assertNull(result.title)
-    }
-
-    @Test
-    fun emptyStringAsNullDecodesNullAsNull() {
-        val input = """{"title":null,"episode":null,"keep":"hello"}"""
-        val result = parseJson<EmptyStringData>(input)
-        assertNull(result.title)
-    }
-
-    @Test
-    fun emptyStringAsNullKeepsNonEmptyString() {
-        val input = """{"title":"hello","episode":null,"keep":"world"}"""
-        val result = parseJson<EmptyStringData>(input)
-        assertEquals("hello", result.title)
-    }
-
-    @Test
-    fun emptyStringAsNullDecodesObjectNormally() {
-        val input = """{"title":null,"episode":{"key":"value"},"keep":"hello"}"""
-        val result = parseJson<EmptyStringData>(input)
-        assertEquals(NestedMeta("value"), result.episode)
-    }
-
-    @Test
-    fun emptyStringAsNullDoesNotAffectNonEmptyFields() {
-        val input = """{"title":"","episode":null,"keep":"world"}"""
-        val result = parseJson<EmptyStringData>(input)
-        assertEquals("world", result.keep)
-    }
-
-    @Test
-    fun emptyStringAsNullRoundtripsCorrectly() {
-        val data = EmptyStringData(title = "hello", episode = NestedMeta("x"), keep = "world")
-        val encoded = data.toJson()
-        val decoded = parseJson<EmptyStringData>(encoded)
-        assertEquals(data, decoded)
-    }
-
-    @Test
-    fun singleValueOrNullWrapsBareValueInList() {
-        val input = """{"tags":"a","nums":1,"other":"hello"}"""
-        val result = parseJson<SingleValueOrNullData>(input)
-        assertEquals(listOf("a"), result.tags)
-        assertEquals(listOf(1), result.nums)
-    }
-
-    @Test
-    fun singleValueOrNullTreatsEmptyArrayAsNull() {
-        val input = """{"tags":[],"nums":[],"other":"hello"}"""
-        val result = parseJson<SingleValueOrNullData>(input)
-        assertNull(result.tags)
-        assertNull(result.nums)
-    }
-
-    @Test
-    fun singleValueOrNullDecodesArrayNormally() {
-        val input = """{"tags":["a","b"],"nums":[1,2],"other":"hello"}"""
-        val result = parseJson<SingleValueOrNullData>(input)
-        assertEquals(listOf("a", "b"), result.tags)
-        assertEquals(listOf(1, 2), result.nums)
-    }
-
-    @Test
-    fun singleValueOrNullDoesNotAffectOtherFields() {
-        val input = """{"tags":[],"nums":[],"other":"world"}"""
-        val result = parseJson<SingleValueOrNullData>(input)
-        assertEquals("world", result.other)
-    }
-
-    @Test
-    fun nullableFieldsEmptyStringBecomesNull() {
-        val input = """{"title":"","meta":{"key":"value"},"other":"hello"}"""
-        val result = parseJson<NullableFieldsData>(input)
-        assertNull(result.title)
-        assertEquals(NestedMeta("value"), result.meta)
-    }
-
-    @Test
-    fun nullableFieldsEmptyArrayBecomesNull() {
-        val input = """{"title":"hello","meta":[],"other":"hello"}"""
-        val result = parseJson<NullableFieldsData>(input)
-        assertEquals("hello", result.title)
-        assertNull(result.meta)
-    }
-
-    @Test
-    fun nullableFieldsBothNullAtOnce() {
-        val input = """{"title":"","meta":[],"other":"hello"}"""
-        val result = parseJson<NullableFieldsData>(input)
-        assertNull(result.title)
-        assertNull(result.meta)
-    }
-
-    @Test
-    fun nullableFieldsDoesNotAffectOtherFields() {
-        val input = """{"title":"","meta":[],"other":"world"}"""
-        val result = parseJson<NullableFieldsData>(input)
-        assertEquals("world", result.other)
-    }
-
-    @Test
-    fun nullableFieldsRoundtripsCorrectly() {
-        val data = NullableFieldsData(title = "hello", meta = NestedMeta("x"), other = "world")
-        val encoded = data.toJson()
-        val decoded = parseJson<NullableFieldsData>(encoded)
-        assertEquals(data, decoded)
-    }
-
-    @Test
-    fun singleValueOrEmptyStringWrapsBareString() {
-        val input = """{"tags":"a","title":"hello"}"""
-        val result = parseJson<SingleValueOrEmptyStringData>(input)
-        assertEquals(listOf("a"), result.tags)
-        assertEquals("hello", result.title)
-    }
-
-    @Test
-    fun singleValueOrEmptyStringTurnsEmptyTitleToNull() {
-        val input = """{"tags":["a"],"title":""}"""
-        val result = parseJson<SingleValueOrEmptyStringData>(input)
-        assertEquals(listOf("a"), result.tags)
-        assertNull(result.title)
-    }
-
-    @Test
-    fun singleValueOrEmptyStringRoundtripsCorrectly() {
-        val data = SingleValueOrEmptyStringData(tags = listOf("x"), title = "hello")
-        val encoded = data.toJson()
-        val decoded = parseJson<SingleValueOrEmptyStringData>(encoded)
-        assertEquals(data, decoded)
-    }
-
-    @Test
-    fun allTransformsWrapsBareStringInList() {
-        val input = """{"tags":"a","title":"hello","meta":{"key":"value"},"other":"world"}"""
-        val result = parseJson<AllTransformsData>(input)
-        assertEquals(listOf("a"), result.tags)
-    }
-
-    @Test
-    fun allTransformsEmptyArrayTagsBecomesNull() {
-        val input = """{"tags":[],"title":"hello","meta":{"key":"value"},"other":"world"}"""
-        val result = parseJson<AllTransformsData>(input)
-        assertNull(result.tags)
-    }
-
-    @Test
-    fun allTransformsEmptyMetaBecomesNull() {
-        val input = """{"tags":["a"],"title":"hello","meta":[],"other":"world"}"""
-        val result = parseJson<AllTransformsData>(input)
-        assertNull(result.meta)
-    }
-
-    @Test
-    fun allTransformsEmptyTitleBecomesNull() {
-        val input = """{"tags":["a"],"title":"","meta":{"key":"value"},"other":"world"}"""
-        val result = parseJson<AllTransformsData>(input)
-        assertNull(result.title)
-    }
-
-    @Test
-    fun allTransformsAllNullAtOnce() {
-        val input = """{"tags":[],"title":"","meta":[],"other":"world"}"""
-        val result = parseJson<AllTransformsData>(input)
-        assertNull(result.tags)
-        assertNull(result.title)
-        assertNull(result.meta)
-    }
-
-    @Test
-    fun allTransformsDoesNotAffectOtherFields() {
-        val input = """{"tags":[],"title":"","meta":[],"other":"world"}"""
-        val result = parseJson<AllTransformsData>(input)
-        assertEquals("world", result.other)
-    }
-
-    @Test
-    fun allTransformsRoundtripsCorrectly() {
-        val data = AllTransformsData(tags = listOf("a"), title = "hello", meta = NestedMeta("x"), other = "world")
-        val encoded = data.toJson()
-        val decoded = parseJson<AllTransformsData>(encoded)
-        assertEquals(data, decoded)
-    }
-
-    @Test
-    fun floatAsIntTruncatesFloat() {
-        val input = """{"count":3.9}"""
-        val result = parseJson<FloatIntData>(input)
-        assertEquals(3, result.count)
-    }
-
-    @Test
-    fun floatAsIntDecodesIntNormally() {
-        val input = """{"count":42}"""
-        val result = parseJson<FloatIntData>(input)
-        assertEquals(42, result.count)
-    }
-
-    @Test
-    fun floatAsIntHandlesNegativeFloat() {
-        val input = """{"count":-2.7}"""
-        val result = parseJson<FloatIntData>(input)
-        assertEquals(-2, result.count)
-    }
-
-    @Test
-    fun floatAsIntRoundtripsCorrectly() {
-        val data = FloatIntData(count = 7)
-        val encoded = data.toJson()
-        val decoded = parseJson<FloatIntData>(encoded)
-        assertEquals(data, decoded)
-    }
-
-    @Test
-    fun floatAsLongTruncatesFloat() {
-        val input = """{"timestamp":1234567890.9}"""
-        val result = parseJson<FloatLongData>(input)
-        assertEquals(1234567890L, result.timestamp)
-    }
-
-    @Test
-    fun floatAsLongDecodesLongNormally() {
-        val input = """{"timestamp":9999999999}"""
-        val result = parseJson<FloatLongData>(input)
-        assertEquals(9999999999L, result.timestamp)
-    }
-
-    @Test
-    fun floatAsLongHandlesNegativeFloat() {
-        val input = """{"timestamp":-100.6}"""
-        val result = parseJson<FloatLongData>(input)
-        assertEquals(-100L, result.timestamp)
-    }
-
-    @Test
-    fun floatAsLongRoundtripsCorrectly() {
-        val data = FloatLongData(timestamp = 1700000000L)
-        val encoded = data.toJson()
-        val decoded = parseJson<FloatLongData>(encoded)
-        assertEquals(data, decoded)
-    }
-
-    @Test
-    fun nullableStringDecodesEmptyStringAsNull() {
-        val input = """{"title":""}"""
-        val result = parseJson<NullableStringData>(input)
-        assertNull(result.title)
-    }
-
-    @Test
-    fun nullableStringDecodesNullAsNull() {
-        val input = """{"title":null}"""
-        val result = parseJson<NullableStringData>(input)
-        assertNull(result.title)
-    }
-
-    @Test
-    fun nullableStringKeepsNonEmptyString() {
-        val input = """{"title":"hello"}"""
-        val result = parseJson<NullableStringData>(input)
-        assertEquals("hello", result.title)
-    }
-
-    @Test
-    fun nullableStringRoundtripsCorrectly() {
-        val data = NullableStringData(title = "world")
-        val encoded = data.toJson()
-        val decoded = parseJson<NullableStringData>(encoded)
-        assertEquals(data, decoded)
-    }
-}