From 1ec8892184e23ce1ab139d9cc99a5a24bb3772d6 Mon Sep 17 00:00:00 2001 From: Zaw <42999156+ImZaw@users.noreply.github.com> Date: Thu, 13 Oct 2022 12:49:28 +0300 Subject: [PATCH] final fix for eggy --- EgyBestProvider/build.gradle.kts | 2 +- .../kotlin/com/egybest/EgyBestProvider.kt | 61 +++++++++---------- 2 files changed, 31 insertions(+), 32 deletions(-) diff --git a/EgyBestProvider/build.gradle.kts b/EgyBestProvider/build.gradle.kts index 6722e02..71d961b 100644 --- a/EgyBestProvider/build.gradle.kts +++ b/EgyBestProvider/build.gradle.kts @@ -1,4 +1,4 @@ -version = 6 +version = 7 cloudstream { description = "If links do not load, try again" diff --git a/EgyBestProvider/src/main/kotlin/com/egybest/EgyBestProvider.kt b/EgyBestProvider/src/main/kotlin/com/egybest/EgyBestProvider.kt index b67e5e0..e6db428 100644 --- a/EgyBestProvider/src/main/kotlin/com/egybest/EgyBestProvider.kt +++ b/EgyBestProvider/src/main/kotlin/com/egybest/EgyBestProvider.kt @@ -1,16 +1,19 @@ package com.egybest -import com.fasterxml.jackson.annotation.JsonProperty +import android.annotation.TargetApi +import android.os.Build import com.lagradost.cloudstream3.* import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer import com.lagradost.cloudstream3.utils.ExtractorLink import com.lagradost.cloudstream3.utils.M3u8Helper -import com.lagradost.cloudstream3.utils.Qualities import com.lagradost.nicehttp.Requests import com.lagradost.nicehttp.Session import okhttp3.HttpUrl.Companion.toHttpUrl import org.jsoup.nodes.Element +import java.util.Base64 +import org.mozilla.javascript.Context +import org.mozilla.javascript.Scriptable class EgyBest : MainAPI() { override var lang = "ar" @@ -181,29 +184,9 @@ class EgyBest : MainAPI() { } } } - data class Sources ( - @JsonProperty("quality") val quality: Int?, - @JsonProperty("link") val link: String - ) - - private fun String.ExtractLinks(): Boolean? { - val list = Regex("#EXT.*\\n.*").findAll(this).toList() - println(list) - list.map { - val url = Regex(".*stream\\.m3u8").find(it.value)?.value.toString() - val quality = Regex("[0-9]{3,4}x[0-9]{3,4}").find(it.value)?.value?.replace(".*x".toRegex(),"")?.toInt() - ExtractorLink( - this@EgyBest.name, - this@EgyBest.name, - url, - this@EgyBest.mainUrl, - quality ?: Qualities.Unknown.value, - true - ) - } - return true - } -override suspend fun loadLinks( + + @TargetApi(Build.VERSION_CODES.O) + override suspend fun loadLinks( data: String, isCasting: Boolean, subtitleCallback: (SubtitleFile) -> Unit, @@ -227,12 +210,28 @@ override suspend fun loadLinks( headers = mapOf("range" to "bytes=0-") ).forEach(callback) } ?: run { - val jsCode = videoSoup.select("script")[1].html() - val javascriptResult = - session.post("https://helper.zr5.repl.co", data = mapOf("data" to jsCode, "baseUrl" to baseURL)).text.split(",") - val adLink = javascriptResult[0] - val verificationLink = javascriptResult[1] - val verificationToken = javascriptResult[2] + var jsCode = videoSoup.select("script")[1].html() + val function = videoSoup.select("script")[2].attr("onload") + val verificationToken = Regex("\\{'[0-9a-zA-Z_]*':'ok'\\}").findAll(jsCode).first().value.replace("\\{'|':.*".toRegex(), "") + val encodedAdLinkVar = Regex("\\([0-9a-zA-Z_]{2,12}\\[Math").findAll(jsCode).first().value.replace("\\(|\\[M.*".toRegex(),"") + val encodingArraysRegEx = Regex(",[0-9a-zA-Z_]{2,12}=\\[]").findAll(jsCode).toList() + val firstEncodingArray = encodingArraysRegEx[1].value.replace(",|=.*".toRegex(),"") + val secondEncodingArray = encodingArraysRegEx[2].value.replace(",|=.*".toRegex(),"") + + jsCode = jsCode.replace("^