mirror of
https://github.com/hexated/cloudstream-extensions-hexated.git
synced 2024-08-15 00:03:22 +00:00
sora: fix UHD
This commit is contained in:
hexated
parent
860fbe2eac
commit
d6777e5ea3
7 changed files with 404 additions and 62 deletions
|
|
@ -1,7 +1,7 @@
|
|||
import org.jetbrains.kotlin.konan.properties.Properties
|
||||
|
||||
// use an integer for version numbers
|
||||
version = 136
|
||||
version = 137
|
||||
|
||||
android {
|
||||
defaultConfig {
|
||||
|
|
|
|||
|
|
@ -518,7 +518,8 @@ object SoraExtractor : SoraStream() {
|
|||
|
||||
val cookiesDoc = mapOf(
|
||||
"G_ENABLED_IDPS" to "google",
|
||||
"wordpress_logged_in_8bf9d5433ac88cc9a3a396d6b154cd01" to (filmxyCookies.wLog ?: return),
|
||||
"wordpress_logged_in_8bf9d5433ac88cc9a3a396d6b154cd01" to (filmxyCookies.wLog
|
||||
?: return),
|
||||
"PHPSESSID" to (filmxyCookies.phpsessid ?: return)
|
||||
)
|
||||
|
||||
|
|
@ -761,7 +762,13 @@ object SoraExtractor : SoraStream() {
|
|||
?.attr("data-id")
|
||||
|
||||
val servers =
|
||||
app.get("$fmoviesAPI/ajax/server/list/${episodeId ?: return}?vrf=${comsumetEncodeVrf(episodeId)}")
|
||||
app.get(
|
||||
"$fmoviesAPI/ajax/server/list/${episodeId ?: return}?vrf=${
|
||||
comsumetEncodeVrf(
|
||||
episodeId
|
||||
)
|
||||
}"
|
||||
)
|
||||
.parsedSafe<FmoviesResult>()?.result?.let { Jsoup.parse(it) }
|
||||
?.select("ul li")?.map { it.attr("data-id") to it.attr("data-link-id") }
|
||||
|
||||
|
|
@ -769,8 +776,9 @@ object SoraExtractor : SoraStream() {
|
|||
it.first == "41" || it.first == "45"
|
||||
}?.apmap { (serverid, linkId) ->
|
||||
delay(2000)
|
||||
val decryptServer = app.get("$fmoviesAPI/ajax/server/$linkId?vrf=${comsumetEncodeVrf(linkId)}")
|
||||
.parsedSafe<FmoviesResponses>()?.result?.url?.let { comsumetDecodeVrf(it) }
|
||||
val decryptServer =
|
||||
app.get("$fmoviesAPI/ajax/server/$linkId?vrf=${comsumetEncodeVrf(linkId)}")
|
||||
.parsedSafe<FmoviesResponses>()?.result?.url?.let { comsumetDecodeVrf(it) }
|
||||
if (serverid == "41") {
|
||||
invokeVizcloud(serverid, decryptServer ?: return@apmap, subtitleCallback, callback)
|
||||
} else {
|
||||
|
|
@ -868,7 +876,12 @@ object SoraExtractor : SoraStream() {
|
|||
callback: (ExtractorLink) -> Unit
|
||||
) {
|
||||
|
||||
val (aniId, malId) = convertTmdbToAnimeId(title, date, airedDate, if(season == null) TvType.AnimeMovie else TvType.Anime)
|
||||
val (aniId, malId) = convertTmdbToAnimeId(
|
||||
title,
|
||||
date,
|
||||
airedDate,
|
||||
if (season == null) TvType.AnimeMovie else TvType.Anime
|
||||
)
|
||||
|
||||
argamap(
|
||||
{
|
||||
|
|
@ -881,7 +894,15 @@ object SoraExtractor : SoraStream() {
|
|||
invokeBiliBili(aniId, episode, subtitleCallback, callback)
|
||||
},
|
||||
{
|
||||
if (season != null) invokeCrunchyroll(aniId, malId, epsTitle, season, episode, subtitleCallback, callback)
|
||||
if (season != null) invokeCrunchyroll(
|
||||
aniId,
|
||||
malId,
|
||||
epsTitle,
|
||||
season,
|
||||
episode,
|
||||
subtitleCallback,
|
||||
callback
|
||||
)
|
||||
}
|
||||
)
|
||||
}
|
||||
|
|
@ -892,18 +913,27 @@ object SoraExtractor : SoraStream() {
|
|||
subtitleCallback: (SubtitleFile) -> Unit,
|
||||
callback: (ExtractorLink) -> Unit
|
||||
) {
|
||||
val res = app.get("$biliBiliAPI/anime/episodes?id=${aniId ?: return}&source_id=bilibili", referer = kaguyaBaseUrl)
|
||||
val res = app.get(
|
||||
"$biliBiliAPI/anime/episodes?id=${aniId ?: return}&source_id=bilibili",
|
||||
referer = kaguyaBaseUrl
|
||||
)
|
||||
.parsedSafe<BiliBiliDetails>()?.episodes?.find {
|
||||
it.episodeNumber == episode
|
||||
} ?: return
|
||||
|
||||
val sources =
|
||||
app.get("$biliBiliAPI/source?episode_id=${res.sourceEpisodeId}&source_media_id=${res.sourceMediaId}&source_id=${res.sourceId}", referer = kaguyaBaseUrl)
|
||||
app.get(
|
||||
"$biliBiliAPI/source?episode_id=${res.sourceEpisodeId}&source_media_id=${res.sourceMediaId}&source_id=${res.sourceId}",
|
||||
referer = kaguyaBaseUrl
|
||||
)
|
||||
.parsedSafe<BiliBiliSourcesResponse>()
|
||||
|
||||
sources?.sources?.apmap { source ->
|
||||
val quality =
|
||||
app.get(source.file ?: return@apmap null, referer = kaguyaBaseUrl).document.selectFirst("Representation")
|
||||
app.get(
|
||||
source.file ?: return@apmap null,
|
||||
referer = kaguyaBaseUrl
|
||||
).document.selectFirst("Representation")
|
||||
?.attr("height")
|
||||
callback.invoke(
|
||||
ExtractorLink(
|
||||
|
|
@ -946,21 +976,23 @@ object SoraExtractor : SoraStream() {
|
|||
}?.select("div.ss-list a")?.find { it.attr("data-number") == "${episode ?: 1}" }
|
||||
?.attr("data-id")
|
||||
|
||||
val servers = app.get("$zoroAPI/ajax/v2/episode/servers?episodeId=${episodeId ?: return@apmap}")
|
||||
.parsedSafe<ZoroResponses>()?.html?.let { Jsoup.parse(it) }
|
||||
?.select("div.item.server-item")?.map {
|
||||
Triple(
|
||||
it.text(),
|
||||
it.attr("data-id"),
|
||||
it.attr("data-type"),
|
||||
)
|
||||
}
|
||||
val servers =
|
||||
app.get("$zoroAPI/ajax/v2/episode/servers?episodeId=${episodeId ?: return@apmap}")
|
||||
.parsedSafe<ZoroResponses>()?.html?.let { Jsoup.parse(it) }
|
||||
?.select("div.item.server-item")?.map {
|
||||
Triple(
|
||||
it.text(),
|
||||
it.attr("data-id"),
|
||||
it.attr("data-type"),
|
||||
)
|
||||
}
|
||||
|
||||
servers?.apmap servers@{ server ->
|
||||
val iframe = app.get("$zoroAPI/ajax/v2/episode/sources?id=${server.second ?: return@servers}")
|
||||
.parsedSafe<ZoroResponses>()?.link ?: return@servers
|
||||
val audio = if(server.third == "sub") "Raw" else "English Dub"
|
||||
if(server.first == "Vidstreaming" || server.first == "Vidcloud") {
|
||||
val iframe =
|
||||
app.get("$zoroAPI/ajax/v2/episode/sources?id=${server.second ?: return@servers}")
|
||||
.parsedSafe<ZoroResponses>()?.link ?: return@servers
|
||||
val audio = if (server.third == "sub") "Raw" else "English Dub"
|
||||
if (server.first == "Vidstreaming" || server.first == "Vidcloud") {
|
||||
extractRabbitStream(
|
||||
"${server.first} [$audio]",
|
||||
iframe,
|
||||
|
|
@ -971,7 +1003,7 @@ object SoraExtractor : SoraStream() {
|
|||
decryptKey = RabbitStream.getZoroKey()
|
||||
) { it }
|
||||
} else {
|
||||
loadExtractor(iframe,"$zoroAPI/", subtitleCallback, callback)
|
||||
loadExtractor(iframe, "$zoroAPI/", subtitleCallback, callback)
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1503,14 +1535,18 @@ object SoraExtractor : SoraStream() {
|
|||
subtitleCallback: (SubtitleFile) -> Unit,
|
||||
callback: (ExtractorLink) -> Unit
|
||||
) {
|
||||
val id = getCrunchyrollId("${aniId ?: return}") ?: getCrunchyrollIdFromMalSync("${malId ?: return}") ?: return
|
||||
val id = getCrunchyrollId("${aniId ?: return}")
|
||||
?: getCrunchyrollIdFromMalSync("${malId ?: return}") ?: return
|
||||
val audioLocal = listOf(
|
||||
"ja-JP",
|
||||
"en-US",
|
||||
"zh-CN",
|
||||
)
|
||||
val headers = getCrunchyrollToken()
|
||||
val seasonIdData = app.get("$crunchyrollAPI/content/v2/cms/series/${id ?: return}/seasons", headers = headers)
|
||||
val seasonIdData = app.get(
|
||||
"$crunchyrollAPI/content/v2/cms/series/${id ?: return}/seasons",
|
||||
headers = headers
|
||||
)
|
||||
.parsedSafe<CrunchyrollResponses>()?.data?.let { s ->
|
||||
if (s.size == 1) {
|
||||
s.firstOrNull()
|
||||
|
|
@ -1897,7 +1933,7 @@ object SoraExtractor : SoraStream() {
|
|||
invokeSmashyDude(it.second, it.first, callback)
|
||||
}
|
||||
it.first.contains("/nflim") -> {
|
||||
invokeSmashyNflim(it.second, it.first, callback)
|
||||
invokeSmashyNflim(it.second, it.first, subtitleCallback, callback)
|
||||
}
|
||||
it.first.contains("/rip") -> {
|
||||
invokeSmashyRip(it.second, it.first, subtitleCallback, callback)
|
||||
|
|
@ -2875,7 +2911,8 @@ object SoraExtractor : SoraStream() {
|
|||
episode: Int? = null,
|
||||
callback: (ExtractorLink) -> Unit
|
||||
) {
|
||||
val apiUrl = base64DecodeAPI("dWI=Y2w=cC4=bXU=ZWE=LWI=Ynk=YmE=bS4=ZWE=dHI=ZXM=aW4=LWM=NDA=MDg=NjE=YmQ=Y2I=MmU=Ly8=czo=dHA=aHQ=")
|
||||
val apiUrl =
|
||||
base64DecodeAPI("dWI=Y2w=cC4=bXU=ZWE=LWI=Ynk=YmE=bS4=ZWE=dHI=ZXM=aW4=LWM=NDA=MDg=NjE=YmQ=Y2I=MmU=Ly8=czo=dHA=aHQ=")
|
||||
val url = if (season == null) {
|
||||
"$apiUrl/stream/movie/$imdbId.json"
|
||||
} else {
|
||||
|
|
@ -2904,7 +2941,7 @@ object SoraExtractor : SoraStream() {
|
|||
) {
|
||||
val referer = "https://2now.tv/"
|
||||
val url = "$nowTvAPI/$tmdbId.mp4"
|
||||
if(!app.get(url, referer = referer).isSuccessful) return
|
||||
if (!app.get(url, referer = referer).isSuccessful) return
|
||||
callback.invoke(
|
||||
ExtractorLink(
|
||||
"NowTv",
|
||||
|
|
@ -3362,5 +3399,5 @@ data class ZoroResponses(
|
|||
)
|
||||
|
||||
data class MalSyncRes(
|
||||
@JsonProperty("Sites") val Sites: Map<String,Map<String,Map<String,String>>>? = null,
|
||||
@JsonProperty("Sites") val Sites: Map<String, Map<String, Map<String, String>>>? = null,
|
||||
)
|
||||
|
|
@ -435,7 +435,8 @@ suspend fun invokeSmashyFfix(
|
|||
callback: (ExtractorLink) -> Unit,
|
||||
) {
|
||||
val script =
|
||||
app.get(url, referer = ref).document.selectFirst("script:containsData(player =)")?.data() ?: return
|
||||
app.get(url, referer = ref).document.selectFirst("script:containsData(player =)")?.data()
|
||||
?: return
|
||||
|
||||
val source =
|
||||
Regex("file:\\s['\"](\\S+?)['|\"]").find(script)?.groupValues?.get(
|
||||
|
|
@ -516,30 +517,38 @@ suspend fun invokeSmashyDude(
|
|||
suspend fun invokeSmashyNflim(
|
||||
name: String,
|
||||
url: String,
|
||||
subtitleCallback: (SubtitleFile) -> Unit,
|
||||
callback: (ExtractorLink) -> Unit,
|
||||
) {
|
||||
val script =
|
||||
app.get(url).document.selectFirst("script:containsData(player =)")?.data() ?: return
|
||||
|
||||
val source =
|
||||
Regex("file:\\s*\"([^\"]+)").find(script)?.groupValues?.get(
|
||||
1
|
||||
) ?: return
|
||||
val sources = Regex("file:\\s*\"([^\"]+)").find(script)?.groupValues?.get(1) ?: return
|
||||
val subtitles = Regex("subtitle:\\s*\"([^\"]+)").find(script)?.groupValues?.get(1) ?: return
|
||||
|
||||
source.split(",").map { links ->
|
||||
sources.split(",").map { links ->
|
||||
val quality = Regex("\\[(\\d+)]").find(links)?.groupValues?.getOrNull(1)?.trim()
|
||||
val trimmedLink = links.removePrefix("[$quality]").trim()
|
||||
callback.invoke(
|
||||
ExtractorLink(
|
||||
"Smashy [$name]",
|
||||
"Smashy [$name]",
|
||||
trimmedLink.substringAfter("url=").substringBefore("&cookie=").trim(),
|
||||
trimmedLink,
|
||||
"",
|
||||
quality?.toIntOrNull() ?: return@map,
|
||||
isM3u8 = true,
|
||||
headers = mapOf(
|
||||
"Cookie" to trimmedLink.substringAfter("&cookie=").trim()
|
||||
)
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
subtitles.split(",").map { sub ->
|
||||
val lang = Regex("\\[(.*?)]").find(sub)?.groupValues?.getOrNull(1)?.trim()
|
||||
val trimmedSubLink = sub.removePrefix("[$lang]").trim()
|
||||
|
||||
subtitleCallback.invoke(
|
||||
SubtitleFile(
|
||||
lang ?: return@map,
|
||||
trimmedSubLink
|
||||
)
|
||||
)
|
||||
}
|
||||
|
|
@ -561,7 +570,7 @@ suspend fun invokeSmashyRip(
|
|||
source?.split(",")?.map { links ->
|
||||
val quality = Regex("\\[(\\d+)]").find(links)?.groupValues?.getOrNull(1)?.trim()
|
||||
val link = links.removePrefix("[$quality]").substringAfter("dev/").trim()
|
||||
if(link.isEmpty()) return@map
|
||||
if (link.isEmpty()) return@map
|
||||
callback.invoke(
|
||||
ExtractorLink(
|
||||
"Smashy [$name]",
|
||||
|
|
@ -743,29 +752,38 @@ suspend fun bypassHrefli(url: String): String? {
|
|||
}
|
||||
|
||||
suspend fun bypassTechmny(url: String): String? {
|
||||
val techRes = app.get(url).document
|
||||
val postUrl = url.substringBefore("?id=").substringAfter("/?")
|
||||
var res = app.post(
|
||||
postUrl, data = mapOf(
|
||||
"_wp_http_c" to url.substringAfter("?id=")
|
||||
val (goUrl, goHeader) = if (techRes.selectFirst("form#landing input[name=_wp_http_c]") != null) {
|
||||
var res = app.post(
|
||||
postUrl, data = mapOf(
|
||||
"_wp_http_c" to url.substringAfter("?id=")
|
||||
)
|
||||
)
|
||||
)
|
||||
val (longC, catC, _) = getTechmnyCookies(res.text)
|
||||
var headers = mapOf("Cookie" to "$longC; $catC")
|
||||
var formLink = res.document.selectFirst("center a")?.attr("href")
|
||||
|
||||
res = app.get(formLink ?: return null, headers = headers)
|
||||
val (longC2, _, postC) = getTechmnyCookies(res.text)
|
||||
headers = mapOf("Cookie" to "$catC; $longC2; $postC")
|
||||
formLink = res.document.selectFirst("center a")?.attr("href")
|
||||
|
||||
res = app.get(formLink ?: return null, headers = headers)
|
||||
val goToken = res.text.substringAfter("?go=").substringBefore("\"")
|
||||
val tokenUrl = "$postUrl?go=$goToken"
|
||||
val newLongC = "$goToken=" + longC2.substringAfter("=")
|
||||
headers = mapOf("Cookie" to "$catC; rdst_post=; $newLongC")
|
||||
val (longC, catC, _) = getTechmnyCookies(res.text)
|
||||
var headers = mapOf("Cookie" to "$longC; $catC")
|
||||
var formLink = res.document.selectFirst("center a")?.attr("href")
|
||||
res = app.get(formLink ?: return null, headers = headers)
|
||||
val (longC2, _, postC) = getTechmnyCookies(res.text)
|
||||
headers = mapOf("Cookie" to "$catC; $longC2; $postC")
|
||||
formLink = res.document.selectFirst("center a")?.attr("href")
|
||||
|
||||
res = app.get(formLink ?: return null, headers = headers)
|
||||
val goToken = res.text.substringAfter("?go=").substringBefore("\"")
|
||||
val tokenUrl = "$postUrl?go=$goToken"
|
||||
val newLongC = "$goToken=" + longC2.substringAfter("=")
|
||||
headers = mapOf("Cookie" to "$catC; rdst_post=; $newLongC")
|
||||
Pair(tokenUrl, headers)
|
||||
} else {
|
||||
val secondPage = techRes.getNextTechPage().document
|
||||
val thirdPage = secondPage.getNextTechPage().text
|
||||
val goToken = thirdPage.substringAfter("?go=").substringBefore("\"")
|
||||
val tokenUrl = "$postUrl?go=$goToken"
|
||||
val headers = mapOf("Cookie" to "$goToken=${secondPage.select("form#landing input[name=_wp_http2]").attr("value")}")
|
||||
Pair(tokenUrl, headers)
|
||||
}
|
||||
val driveUrl =
|
||||
app.get(tokenUrl, headers = headers).document.selectFirst("meta[http-equiv=refresh]")
|
||||
app.get(goUrl, headers = goHeader).document.selectFirst("meta[http-equiv=refresh]")
|
||||
?.attr("content")?.substringAfter("url=")
|
||||
val path = app.get(driveUrl ?: return null).text.substringAfter("replace(\"")
|
||||
.substringBefore("\")")
|
||||
|
|
@ -773,6 +791,15 @@ suspend fun bypassTechmny(url: String): String? {
|
|||
return fixUrl(path, getBaseUrl(driveUrl))
|
||||
}
|
||||
|
||||
private suspend fun Document.getNextTechPage(): NiceResponse {
|
||||
return app.post(
|
||||
this.select("form").attr("action"),
|
||||
data = this.select("form input").mapNotNull {
|
||||
it.attr("name") to it.attr("value")
|
||||
}.toMap().toMutableMap()
|
||||
)
|
||||
}
|
||||
|
||||
suspend fun bypassDriveleech(url: String): String? {
|
||||
val path = app.get(url).text.substringAfter("replace(\"")
|
||||
.substringBefore("\")")
|
||||
|
|
@ -990,7 +1017,8 @@ suspend fun getCrunchyrollIdFromMalSync(aniId: String?): String? {
|
|||
val vrv = res?.get("Vrv")?.map { it.value }?.firstOrNull()?.get("url")
|
||||
val crunchyroll = res?.get("Vrv")?.map { it.value }?.firstOrNull()?.get("url")
|
||||
val regex = Regex("series/(\\w+)/?")
|
||||
return regex.find("$vrv")?.groupValues?.getOrNull(1) ?: regex.find("$crunchyroll")?.groupValues?.getOrNull(1)
|
||||
return regex.find("$vrv")?.groupValues?.getOrNull(1)
|
||||
?: regex.find("$crunchyroll")?.groupValues?.getOrNull(1)
|
||||
}
|
||||
|
||||
suspend fun extractPutlockerSources(url: String?): NiceResponse? {
|
||||
|
|
@ -1118,7 +1146,7 @@ fun getSeason(month: Int?): String? {
|
|||
"Winter", "Winter", "Spring", "Spring", "Spring", "Summer",
|
||||
"Summer", "Summer", "Fall", "Fall", "Fall", "Winter"
|
||||
)
|
||||
if(month == null) return null
|
||||
if (month == null) return null
|
||||
return seasons[month - 1]
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue