fix(lib/lycoris&lulu): big change v1

lib/lulu-extractor/src/main/java/eu/kanade/tachiyomi/lib/luluextractor/LuluExtractor.kt

@@ -7,22 +7,22 @@ import okhttp3.OkHttpClient
 import java.util.regex.Pattern
 
 class LuluExtractor(private val client: OkHttpClient) {
+    //Credit: https://github.com/skoruppa/docchi-stremio-addon/blob/main/app/players/lulustream.py
+    fun videosFromUrl(url: String, prefix: String, headers: Headers): List<Video> {
+        val luluHeaders = headers.newBuilder()
+            .add("Referer", "https://luluvdo.com")
+            .add("Origin", "https://luluvdo.com")
+            .build()
 
-    private val headers = Headers.Builder()
-        .add("Referer", "https://luluvdo.com")
-        .add("Origin", "https://luluvdo.com")
-        .build()
-
-    fun videosFromUrl(url: String, prefix: String): List<Video> {
         val videos = mutableListOf<Video>()
 
         try {
-            val html = client.newCall(GET(url, headers)).execute().use { it.body.string() }
+            val html = client.newCall(GET(url, luluHeaders)).execute().use { it.body.string() }
             val m3u8Url = extractM3u8Url(html) ?: return emptyList()
             val fixedUrl = fixM3u8Link(m3u8Url)
-            val quality = getResolution(fixedUrl)
+            val quality = getResolution(fixedUrl, luluHeaders)
 
-            videos.add(Video(fixedUrl, "${prefix}Lulu - $quality", fixedUrl))
+            videos.add(Video(fixedUrl, "${prefix}Lulu - $quality", fixedUrl, luluHeaders))
         } catch (e: Exception) {
             e.printStackTrace()
         }
@@ -50,37 +50,42 @@ class LuluExtractor(private val client: OkHttpClient) {
 
     private fun fixM3u8Link(link: String): String {
         val paramOrder = listOf("t", "s", "e", "f")
-        val baseUrl = link.split("?").first()
+        val params = Pattern.compile("[?&]([^=]*)=([^&]*)").matcher(link).let { matcher ->
-        val params = link.split("?").getOrNull(1)?.split("&") ?: emptyList()
+            generateSequence { if (matcher.find()) matcher.group(1) to matcher.group(2) else null }.toList()
+        }
 
-        val paramMap = mutableMapOf<String, String>()
+        val paramDict = mutableMapOf<String, String>()
-        val extraParams = mutableMapOf(
+        val extraParams = mutableMapOf<String, String>()
-            "i" to "0.3",
-            "sp" to "0"
-        )
 
-        params.forEachIndexed { index, param ->
+        params.forEachIndexed { index, (key , value) ->
-            val parts = param.split("=")
+            if (key.isNullOrEmpty()) {
-            when {
+                if (index < paramOrder.size) {
-                parts.size == 2 -> {
+                    if (value != null) {
-                    val (key, value) = parts
+                        paramDict[paramOrder[index]] = value
-                    if (key in paramOrder) paramMap[key] = value
+                    }
-                    else extraParams[key] = value
+                }
+            } else {
+                if (value != null) {
+                    extraParams[key] = value
                 }
-                index < paramOrder.size -> paramMap[paramOrder[index]] = parts.firstOrNull() ?: ""
             }
         }
 
-        return buildString {
+        extraParams["i"] = "0.3"
-            append(baseUrl)
+        extraParams["sp"] = "0"
-            append("?")
+
-            append(paramOrder.joinToString("&") { "$it=${paramMap[it]}" })
+        val baseUrl = link.split("?")[0]
-            append("&")
+
-            append(extraParams.map { "${it.key}=${it.value}" }.joinToString("&"))
+        val fixedLink = StringBuilder(baseUrl)
-        }
+        val orderedParams = paramOrder.filter { paramDict.containsKey(it) }.map { "$it=${paramDict[it]}" }
+
+        fixedLink.append("?").append(orderedParams.joinToString("&"))
+        fixedLink.append("&").append(extraParams.entries.joinToString("&") { "${it.key}=${it.value}" })
+
+        return fixedLink.toString()
     }
 
-    private fun getResolution(m3u8Url: String): String {
+    private fun getResolution(m3u8Url: String, headers: Headers): String {
         return try {
             val content = client.newCall(GET(m3u8Url, headers)).execute()
                 .use { it.body.string() }
@@ -98,31 +103,29 @@ class LuluExtractor(private val client: OkHttpClient) {
 }
 
 object JavaScriptUnpacker {
-    private val UNPACK_REGEX = Regex(
+    private val UNPACK_REGEX by lazy {
-        """}\('(.*)', *(\d+), *(\d+), *'(.*?)'\.split\('\|'\)""",
+        Regex("""\}\('(.*)', *(\d+), *(\d+), *'(.*?)'\.split\('\|'\)""")
-        RegexOption.DOT_MATCHES_ALL
-    )
-
-    fun unpack(encodedJs: String): String? {
-        val match = UNPACK_REGEX.find(encodedJs) ?: return null
-        val (payload, radixStr, countStr, symtabStr) = match.destructured
-
-        val radix = radixStr.toIntOrNull() ?: return null
-        val count = countStr.toIntOrNull() ?: return null
-        val symtab = symtabStr.split('|')
-
-        if (symtab.size != count) throw IllegalArgumentException("Invalid symtab size")
-
-        val baseDict = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-            .take(radix)
-            .withIndex()
-            .associate { it.value to it.index }
-
-        return Regex("""\b\w+\b""").replace(payload) { mr ->
-            symtab.getOrNull(unbase(mr.value, radix, baseDict)) ?: mr.value
-        }.replace("\\", "")
     }
+    fun unpack(encodedJs: String): String? {
+            val match = UNPACK_REGEX.find(encodedJs) ?: return null
+            val (payload, radixStr, countStr, symtabStr) = match.destructured
 
+            val radix = radixStr.toIntOrNull() ?: return null
+            val count = countStr.toIntOrNull() ?: return null
+            val symtab = symtabStr.split('|')
+
+            if (symtab.size != count) throw IllegalArgumentException("Invalid symtab size")
+
+            val baseDict = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                .take(radix)
+                .withIndex()
+                .associate { it.value to it.index }
+
+            return Regex("""\b\w+\b""").replace(payload) { mr ->
+                symtab.getOrNull(unbase(mr.value, radix, baseDict)) ?: mr.value
+            }.replace("\\", "")
+
+    }
     private fun unbase(value: String, radix: Int, dict: Map<Char, Int>): Int {
         var result = 0
         var multiplier = 1

lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt

@@ -18,6 +18,16 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
 
     private val GETLNKURL = "https://www.lycoris.cafe/api/watch/getLink"
 
+    private val wordsRegex by lazy {
+        Regex(
+        """\\U([0-9a-fA-F]{8})|""" +     // \UXXXXXXXX
+            """\\u([0-9a-fA-F]{4})|""" +     // \uXXXX
+            """\\x([0-9a-fA-F]{2})|""" +     // \xHH
+            """\\([0-7]{1,3})|""" +          // \OOO (octal)
+            """\\([btnfr"'$\\])"""         // \n, \t, itd.
+        )
+    }
+
     // Credit: https://github.com/skoruppa/docchi-stremio-addon/blob/main/app/players/lycoris.py
     fun getVideosFromUrl(url: String, headers: Headers, prefix: String): List<Video> {
 
@@ -145,17 +155,7 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
         // 1. Obsługa kontynuacji linii (backslash + newline)
         val withoutLineContinuation = text.replace("\\\n", "")
 
-
+        return wordsRegex.replace(withoutLineContinuation) { match ->
-        // 2. Regex do wykrywania wszystkich sekwencji escape
-        val regex = Regex(
-            """\\U([0-9a-fA-F]{8})|""" +     // \UXXXXXXXX
-                """\\u([0-9a-fA-F]{4})|""" +     // \uXXXX
-                """\\x([0-9a-fA-F]{2})|""" +     // \xHH
-                """\\([0-7]{1,3})|""" +          // \OOO (octal)
-                """\\([btnfr"'$\\])"""         // \n, \t, itd.
-        )
-
-        return regex.replace(withoutLineContinuation) { match ->
             val (u8, u4, x2, octal, simple) = match.destructured
             when {
                 u8.isNotEmpty() -> handleUnicode8(u8)

src/pl/docchi/src/eu/kanade/tachiyomi/animeextension/pl/docchi/Docchi.kt

@@ -203,7 +203,7 @@ class Docchi : ConfigurableAnimeSource, AnimeHttpSource() {
                 }
 
                 serverUrl.contains("luluvdo.com") -> {
-                    luluExtractor.videosFromUrl(serverUrl, prefix)
+                    luluExtractor.videosFromUrl(serverUrl, prefix, headers)
                 }
 
                 serverUrl.contains("drive.google.com") -> {