Aniplay (#276)

* Fixed to work with new aniplay server mechanism

* Version bump

src/en/aniplay/build.gradle

@@ -2,7 +2,7 @@ ext {
     extName = 'AniPlay'
     extClass = '.AniPlay'
     themePkg = 'anilist'
-    overrideVersionCode = 2
+    overrideVersionCode = 3
 }
 
 apply from: "$rootDir/common.gradle"

src/en/aniplay/src/eu/kanade/tachiyomi/animeextension/en/aniplay/AniPlay.kt

@@ -1,6 +1,7 @@
 package eu.kanade.tachiyomi.animeextension.en.aniplay
 
 import android.app.Application
+import android.net.Uri
 import android.util.Base64
 import android.util.Log
 import android.widget.Toast
@@ -14,7 +15,6 @@ import eu.kanade.tachiyomi.animesource.model.Track
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
 import eu.kanade.tachiyomi.multisrc.anilist.AniListAnimeHttpSource
-import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.util.parallelFlatMapBlocking
 import eu.kanade.tachiyomi.util.parseAs
@@ -73,14 +73,27 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
         val httpUrl = anime.url.toHttpUrl()
         val animeId = httpUrl.pathSegments[2]
 
-        return GET("$baseUrl/api/anime/episode/$animeId")
+        val requestBody = "[\"${animeId}\",true,false]"
+            .toRequestBody("text/plain;charset=UTF-8".toMediaType())
+
+        val headersWithAction =
+            headers.newBuilder()
+                // next.js stuff I guess
+                .add("Next-Action", HEADER_NEXT_ACTION_EPISODE_LIST_VALUE)
+                .build()
+
+        return POST(url = "$baseUrl/anime/info/$animeId", headersWithAction, requestBody)
     }
 
     override fun episodeListParse(response: Response): List<SEpisode> {
         val isMarkFiller = preferences.getBoolean(PREF_MARK_FILLER_EPISODE_KEY, PREF_MARK_FILLER_EPISODE_DEFAULT)
         val episodeListUrl = response.request.url
-        val animeId = episodeListUrl.pathSegments[3]
+        val animeId = episodeListUrl.pathSegments[2]
-        val providers = response.parseAs<List<EpisodeListResponse>>()
+
+        val responseString = response.body.string()
+        val episodesArrayString = responseString.split("1:").last()
+
+        val providers = episodesArrayString.parseAs<List<EpisodeListResponse>>()
         val episodes = mutableMapOf<Int, EpisodeListResponse.Episode>()
         val episodeExtras = mutableMapOf<Int, List<EpisodeExtra>>()
 
@@ -94,6 +107,7 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
                 val episodeExtra = EpisodeExtra(
                     source = provider.providerId,
                     episodeId = episode.id,
+                    episodeNum = episode.number,
                     hasDub = episode.hasDub,
                 )
                 episodeExtras[episodeNumber] = existingEpisodeExtras + listOf(episodeExtra)
@@ -142,7 +156,7 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
     override suspend fun getVideoList(episode: SEpisode): List<Video> {
         val episodeUrl = episode.url.toHttpUrl()
         val animeId = episodeUrl.queryParameter("id") ?: return emptyList()
-        val episodeNum = episodeUrl.queryParameter("ep") ?: return emptyList()
+        // val episodeNum = episodeUrl.queryParameter("ep") ?: return emptyList()
         val extras = episodeUrl.queryParameter("extras")
             ?.let {
                 try {
@@ -162,33 +176,55 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
             }
             ?: emptyList()
 
+        val headersWithAction =
+            headers.newBuilder()
+                // next.js stuff I guess
+                .add("Next-Action", HEADER_NEXT_ACTION_SOURCES_LIST_VALUE)
+                .build()
+
         val episodeDataList = extras.parallelFlatMapBlocking { extra ->
             val languages = mutableListOf("sub").apply {
                 if (extra.hasDub) add("dub")
             }
-            val url = "$baseUrl/api/anime/source/$animeId"
-
             languages.map { language ->
-                val requestBody = json.encodeToString(
+                val epNum = if (extra.episodeNum == extra.episodeNum.toInt().toFloat()) {
-                    VideoSourceRequest(
+                    extra.episodeNum.toInt().toString() // If it has no fractional part, convert it to an integer
-                        source = extra.source,
+                } else {
-                        episodeId = extra.episodeId,
+                    extra.episodeNum.toString() // If it has a fractional part, leave it as a float
-                        episodeNum = episodeNum,
+                }
-                        subType = language,
-                    ),
-                ).toRequestBody("application/json".toMediaType())
 
+                val requestBody = "[\"$animeId\",\"${extra.source}\",\"${extra.episodeId}\",\"$epNum\",\"$language\"]"
+                    .toRequestBody("application/json".toMediaType())
+
+                val params = mapOf(
+                    "id" to animeId,
+                    "host" to extra.source,
+                    "ep" to epNum,
+                    "type" to language,
+                )
+                val builder = Uri.parse("$baseUrl/anime/watch").buildUpon()
+                params.map { (k, v) -> builder.appendQueryParameter(k, v); }
+                val url = builder.build().toString()
+                Log.i("AniPlay", "Url: $url")
                 try {
-                    val response = client.newCall(POST(url = url, body = requestBody)).execute().parseAs<VideoSourceResponse>()
+                    val request = POST(url, headersWithAction, requestBody)
+                    val response = client.newCall(request).execute()
+
+                    val responseString = response.body.string()
+                    val sourcesString = responseString.split("1:").last()
+                    if (sourcesString.startsWith("null")) return@map null
+                    val data = sourcesString.parseAs<VideoSourceResponse>()
 
                     EpisodeData(
                         source = extra.source,
                         language = language,
-                        response = response,
+                        response = data,
                     )
                 } catch (e: IOException) {
+                    Log.w("AniPlay", "VideoList $url IOException", e)
                     null // Return null to be filtered out
                 } catch (e: Exception) {
+                    Log.w("AniPlay", "VideoList $url Exception", e)
                     null // Return null to be filtered out
                 }
             }.filterNotNull() // Filter out null values due to errors
@@ -384,6 +420,10 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
         private const val PREF_MARK_FILLER_EPISODE_KEY = "mark_filler_episode"
         private const val PREF_MARK_FILLER_EPISODE_DEFAULT = true
 
+        // These values has probably something to do with Next.js server and hydration
+        private const val HEADER_NEXT_ACTION_EPISODE_LIST_VALUE = "f3422af67c84852f5e63d50e1f51718f1c0225c4"
+        private const val HEADER_NEXT_ACTION_SOURCES_LIST_VALUE = "5dbcd21c7c276c4d15f8de29d9ef27aef5ea4a5e"
+
         private val DATE_FORMATTER = SimpleDateFormat("yyyy-MM-dd", Locale.ENGLISH)
     }
 }

src/en/aniplay/src/eu/kanade/tachiyomi/animeextension/en/aniplay/AniPlayDto.kt

@@ -57,6 +57,7 @@ data class VideoSourceResponse(
 @Serializable
 data class EpisodeExtra(
     val source: String,
+    val episodeNum: Float,
     val episodeId: String,
     val hasDub: Boolean,
 )