Test kotlinx-serialization support

app/build.gradle.kts

@@ -8,6 +8,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.dokka)
+    alias(libs.plugins.kotlin.serialization)
 }
 
 val javaTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())

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

@@ -4,7 +4,8 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
-import com.fasterxml.jackson.annotation.JsonProperty
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.lagradost.cloudstream3.actions.OpenInAppAction
 import com.lagradost.cloudstream3.BuildConfig
 import com.lagradost.cloudstream3.ui.player.ExtractorUri
@@ -22,6 +23,7 @@ import com.lagradost.cloudstream3.utils.newExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.SubtitleHelper.fromCodeToLangTagIETF
 import com.lagradost.cloudstream3.utils.SubtitleHelper.fromLanguageToTagIETF
+import com.lagradost.cloudstream3.utils.serializer.UriSerializer
 import com.lagradost.cloudstream3.utils.txt
 
 /**
@@ -49,18 +51,20 @@ class CloudStreamPackage : OpenInAppAction(
         const val DURATION_EXTRA: String = "dur" // Duration time in MS (Long)
     }
 
+    @Serializable
     data class MinimalVideoLink(
-        @JsonProperty("uri")
+        @SerialName("uri")
+        @Serializable(with = UriSerializer::class)
         val uri: Uri?,
-        @JsonProperty("url")
+        @SerialName("url")
         val url: String?,
-        @JsonProperty("mimeType")
+        @SerialName("mimeType")
         val mimeType: String = "video/mp4",
-        @JsonProperty("name")
+        @SerialName("name")
         val name: String?,
-        @JsonProperty("headers")
+        @SerialName("headers")
         var headers: Map<String, String> = mapOf(),
-        @JsonProperty("quality")
+        @SerialName("quality")
         val quality: Int?,
     ) {
         companion object {
@@ -97,15 +101,15 @@ class CloudStreamPackage : OpenInAppAction(
             }
     }
 
-
+    @Serializable
     data class MinimalSubtitleLink(
-        @JsonProperty("url")
+        @SerialName("url")
         val url: String,
-        @JsonProperty("mimeType")
+        @SerialName("mimeType")
         val mimeType: String = "text/vtt",
-        @JsonProperty("name")
+        @SerialName("name")
         val name: String?,
-        @JsonProperty("headers")
+        @SerialName("headers")
         var headers: Map<String, String> = mapOf(),
     ) {
         companion object {
@@ -159,4 +163,4 @@ class CloudStreamPackage : OpenInAppAction(
     override fun onResult(activity: Activity, intent: Intent?) {
         // No results yet
     }
-}
+}

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

@@ -18,7 +18,8 @@ import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.fragment.app.FragmentActivity
-import com.fasterxml.jackson.annotation.JsonProperty
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.lagradost.cloudstream3.APIHolder
 import com.lagradost.cloudstream3.APIHolder.removePluginMapping
 import com.lagradost.cloudstream3.AllLanguagesName
@@ -73,12 +74,13 @@ const val EXTENSIONS_CHANNEL_NAME = "Extensions"
 const val EXTENSIONS_CHANNEL_DESCRIPT = "Extension notification channel"
 
 // Data class for internal storage
+@Serializable
 data class PluginData(
-    @JsonProperty("internalName") val internalName: String,
-    @JsonProperty("url") val url: String?,
-    @JsonProperty("isOnline") val isOnline: Boolean,
-    @JsonProperty("filePath") val filePath: String,
-    @JsonProperty("version") val version: Int,
+    @SerialName("internalName") val internalName: String,
+    @SerialName("url") val url: String?,
+    @SerialName("isOnline") val isOnline: Boolean,
+    @SerialName("filePath") val filePath: String,
+    @SerialName("version") val version: Int,
 ) {
     @WorkerThread
     fun toSitePlugin(): SitePlugin {
@@ -610,7 +612,7 @@ object PluginManager {
                     return false
                 }
                 InputStreamReader(stream).use { reader ->
-                    manifest = parseJson(reader, BasePlugin.Manifest::class.java)
+                    manifest = parseJson<BasePlugin.Manifest>(reader.readText())
                 }
             }
 

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

@@ -2,7 +2,8 @@ package com.lagradost.cloudstream3.plugins
 
 import android.content.Context
 import androidx.annotation.WorkerThread
-import com.fasterxml.jackson.annotation.JsonProperty
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.context
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
@@ -30,12 +31,13 @@ import java.util.concurrent.atomic.AtomicInteger
  * Comes with the app, always available in the app, non removable.
  * */
 
+@Serializable
 data class Repository(
-    @JsonProperty("iconUrl") val iconUrl: String?,
-    @JsonProperty("name") val name: String,
-    @JsonProperty("description") val description: String?,
-    @JsonProperty("manifestVersion") val manifestVersion: Int,
-    @JsonProperty("pluginLists") val pluginLists: List<String>
+    @SerialName("iconUrl") val iconUrl: String?,
+    @SerialName("name") val name: String,
+    @SerialName("description") val description: String?,
+    @SerialName("manifestVersion") val manifestVersion: Int,
+    @SerialName("pluginLists") val pluginLists: List<String>
 )
 
 /**
@@ -45,32 +47,33 @@ data class Repository(
  * 2: Slow
  * 3: Beta only
  * */
+@Serializable
 data class SitePlugin(
     // Url to the .cs3 file
-    @JsonProperty("url") val url: String,
+    @SerialName("url") val url: String,
     // Status to remotely disable the provider
-    @JsonProperty("status") val status: Int,
+    @SerialName("status") val status: Int,
     // Integer over 0, any change of this will trigger an auto update
-    @JsonProperty("version") val version: Int,
+    @SerialName("version") val version: Int,
     // Unused currently, used to make the api backwards compatible?
     // Set to 1
-    @JsonProperty("apiVersion") val apiVersion: Int,
+    @SerialName("apiVersion") val apiVersion: Int,
     // Name to be shown in app
-    @JsonProperty("name") val name: String,
+    @SerialName("name") val name: String,
     // Name to be referenced internally. Separate to make name and url changes possible
-    @JsonProperty("internalName") val internalName: String,
-    @JsonProperty("authors") val authors: List<String>,
-    @JsonProperty("description") val description: String?,
+    @SerialName("internalName") val internalName: String,
+    @SerialName("authors") val authors: List<String>,
+    @SerialName("description") val description: String?,
     // Might be used to go directly to the plugin repo in the future
-    @JsonProperty("repositoryUrl") val repositoryUrl: String?,
+    @SerialName("repositoryUrl") val repositoryUrl: String?,
     // These types are yet to be mapped and used, ignore for now
-    @JsonProperty("tvTypes") val tvTypes: List<String>?,
+    @SerialName("tvTypes") val tvTypes: List<String>?,
     // Most often a language tag like "en" or "zh-TW"
-    @JsonProperty("language") val language: String?,
-    @JsonProperty("iconUrl") val iconUrl: String?,
+    @SerialName("language") val language: String?,
+    @SerialName("iconUrl") val iconUrl: String?,
     // Automatically generated by the gradle plugin
-    @JsonProperty("fileSize") val fileSize: Long?,
-    @JsonProperty("fileHash") val fileHash: String?,
+    @SerialName("fileSize") val fileSize: Long?,
+    @SerialName("fileHash") val fileHash: String?,
 )
 
 

app/src/main/java/com/lagradost/cloudstream3/syncproviders/AuthAPI.kt

@@ -2,7 +2,8 @@ package com.lagradost.cloudstream3.syncproviders
 
 import android.util.Base64
 import androidx.annotation.WorkerThread
-import com.fasterxml.jackson.annotation.JsonProperty
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.lagradost.cloudstream3.APIHolder.unixTime
 import com.lagradost.cloudstream3.ActorData
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
@@ -56,28 +57,29 @@ data class AuthLoginPage(
     val payload: String? = null,
 )
 
+@Serializable
 data class AuthToken(
     /**
      * This is the general access tokens/api token representing a logged in user.
      *
      * `Access tokens are the thing that applications use to make API requests on behalf of a user.`
      * */
-    @JsonProperty("accessToken")
+    @SerialName("accessToken")
     val accessToken: String? = null,
     /**
      * For OAuth a special refresh token is issues to refresh the access token.
      * */
-    @JsonProperty("refreshToken")
+    @SerialName("refreshToken")
     val refreshToken: String? = null,
     /** In UnixTime (sec) when it expires */
-    @JsonProperty("accessTokenLifetime")
+    @SerialName("accessTokenLifetime")
     val accessTokenLifetime: Long? = null,
     /** In UnixTime (sec) when it expires */
-    @JsonProperty("refreshTokenLifetime")
+    @SerialName("refreshTokenLifetime")
     val refreshTokenLifetime: Long? = null,
     /** Sometimes AuthToken needs to be customized to store e.g. username/password,
      * this acts as a catch all to store text or JSON data. */
-    @JsonProperty("payload")
+    @SerialName("payload")
     val payload: String? = null,
 ) {
     fun isAccessTokenExpired(marginSec: Long = 10L) =
@@ -87,19 +89,20 @@ data class AuthToken(
         refreshTokenLifetime != null && (System.currentTimeMillis() / 1000) + marginSec >= refreshTokenLifetime
 }
 
+@Serializable
 data class AuthUser(
     /** Account display-name, can also be email if name does not exist */
-    @JsonProperty("name")
+    @SerialName("name")
     val name: String?,
     /** Unique account identifier,
      * if a subsequent login is done then it will be refused if another account with the same id exists*/
-    @JsonProperty("id")
+    @SerialName("id")
     val id: Int,
     /** Profile picture URL */
-    @JsonProperty("profilePicture")
+    @SerialName("profilePicture")
     val profilePicture: String? = null,
     /** Profile picture Headers of the URL */
-    @JsonProperty("profilePictureHeader")
+    @SerialName("profilePictureHeader")
     val profilePictureHeaders: Map<String, String>? = null
 )
 
@@ -111,10 +114,11 @@ data class AuthUser(
  * Any local set/get key should use user.id.toString(),
  * as token.accessToken (even hashed) is unsecure, and will rotate.
  * */
+@Serializable
 data class AuthData(
-    @JsonProperty("user")
+    @SerialName("user")
     val user: AuthUser,
-    @JsonProperty("token")
+    @SerialName("token")
     val token: AuthToken,
 )
 
@@ -138,14 +142,15 @@ data class AuthLoginRequirement(
 )
 
 /** What the user responds to the AuthLoginRequirement */
+@Serializable
 data class AuthLoginResponse(
-    @JsonProperty("password")
+    @SerialName("password")
     val password: String?,
-    @JsonProperty("username")
+    @SerialName("username")
     val username: String?,
-    @JsonProperty("email")
+    @SerialName("email")
     val email: String?,
-    @JsonProperty("server")
+    @SerialName("server")
     val server: String?,
 )