streamsb: update headers and connect method (#358)

* Update build.gradle

* streamsb: update headers and connect method

update headers and connect method for sources using StreamSBExtractor

* fix vidembed

* remove unused extractor from animexplay
This commit is contained in:
Ahmed gamal
2022-02-24 23:22:10 +02:00
committed by GitHub
parent 63d6acc5ab
commit 6fd982553e
26 changed files with 42 additions and 126 deletions

View File

@ -5,7 +5,7 @@ ext {
extName = 'AnimeLek'
pkgNameSuffix = 'ar.animelek'
extClass = '.AnimeLek'
extVersionCode = 1
extVersionCode = 3
libVersion = '12'
}

View File

@ -108,6 +108,7 @@ class AnimeLek : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
when {
url.contains("viewsb") -> {
val headers = headers.newBuilder()
.set("Referer", url)
.set("User-Agent", "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:96.0) Gecko/20100101 Firefox/96.0")
.set("Accept-Language", "en-US,en;q=0.5")
.set("watchsb", "streamsb")

View File

@ -8,7 +8,6 @@ import kotlinx.serialization.json.JsonObject
import kotlinx.serialization.json.jsonObject
import okhttp3.Headers
import okhttp3.OkHttpClient
import org.jsoup.Jsoup
class StreamSBExtractor(private val client: OkHttpClient) {
@ -32,8 +31,8 @@ class StreamSBExtractor(private val client: OkHttpClient) {
val master = "https://viewsb.com/sources40/566d337678566f743674494a7c7c${bytesToHex}7c7c346b6767586d6934774855537c7c73747265616d7362/6565417268755339773461447c7c346133383438333436313335376136323337373433383634376337633465366534393338373136643732373736343735373237613763376334363733353737303533366236333463353333363534366137633763373337343732363536313664373336327c7c6b586c3163614468645a47617c7c73747265616d7362"
// "https://sbplay2.com/sourcesx38/4f395a53447166635a3836787c7c${bytesToHex}7c7c7965344f61436d467845586c7c7c73747265616d7362/6e56314c77564e6a6c6631737c7c333735383537363836633662373635323636376133343637376337633335346334343332353735343333366633343635346336383763376334313561373633343761346133303665363837363537353937633763373337343732363536313664373336327c7c395239444c3961626d634e6a7c7c73747265616d7362"
val json = Json.decodeFromString<JsonObject>(
Jsoup.connect(master).ignoreContentType(true).header("watchsb", "streamsb").header("accept-language", "en-US,en;q=0.5").header("Referer", url).header("User-Agent", "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:96.0) Gecko/20100101 Firefox/96.0")
.execute().body()
client.newCall(GET(master, headers))
.execute().body!!.string()
)
val masterUrl = json["stream_data"]!!.jsonObject["file"].toString().trim('"')
val masterPlaylist = client.newCall(GET(masterUrl, headers)).execute().body!!.string()

View File

@ -1,43 +0,0 @@
package eu.kanade.tachiyomi.animeextension.en.animixplay.extractors
import eu.kanade.tachiyomi.animesource.model.Video
import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.util.asJsoup
import okhttp3.Headers
import okhttp3.OkHttpClient
class DoodExtractor(private val client: OkHttpClient) {
fun videosFromUrl(serverUrl: String): List<Video> {
val url = client.newCall(GET(serverUrl)).execute().asJsoup()
.select("li.linkserver[data-video*=dood]").attr("data-video")
val response = client.newCall(GET(url)).execute()
val doodTld = url.substringAfter("https://dood.").substringBefore("/")
val content = response.body!!.string()
if (!content.contains("'/pass_md5/")) return emptyList()
val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
val token = md5.substringAfterLast("/")
val randomString = getRandomString()
val expiry = System.currentTimeMillis()
val videoUrlStart = client.newCall(
GET(
"https://dood.$doodTld/pass_md5/$md5",
Headers.headersOf("referer", url)
)
).execute().body!!.string()
val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
return listOf(Video(url, "Doodstream mirror", videoUrl, null, doodHeaders(doodTld)))
}
private fun getRandomString(length: Int = 10): String {
val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
return (1..length)
.map { allowedChars.random() }
.joinToString("")
}
private fun doodHeaders(tld: String) = Headers.Builder().apply {
add("User-Agent", "Aniyomi")
add("Referer", "https://dood.$tld/")
}.build()
}

View File

@ -1,48 +0,0 @@
package eu.kanade.tachiyomi.animeextension.en.animixplay.extractors
import eu.kanade.tachiyomi.animesource.model.Video
import eu.kanade.tachiyomi.network.GET
import kotlinx.serialization.decodeFromString
import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonObject
import kotlinx.serialization.json.jsonObject
import okhttp3.Headers
import okhttp3.OkHttpClient
import org.jsoup.Jsoup
class StreamSbExtractor(private val client: OkHttpClient) {
private val hexArray = "0123456789ABCDEF".toCharArray()
private fun bytesToHex(bytes: ByteArray): String {
val hexChars = CharArray(bytes.size * 2)
for (j in bytes.indices) {
val v = bytes[j].toInt() and 0xFF
hexChars[j * 2] = hexArray[v ushr 4]
hexChars[j * 2 + 1] = hexArray[v and 0x0F]
}
return String(hexChars)
}
fun videosFromUrl(url: String, headers: Headers): List<Video> {
val id = url.substringAfter("e/").substringBefore("?")
val bytes = id.toByteArray()
val bytesToHex = bytesToHex(bytes)
val master = "https://sbplay2.com/sources40/566d337678566f743674494a7c7c${bytesToHex}7c7c346b6767586d6934774855537c7c73747265616d7362/6565417268755339773461447c7c346133383438333436313335376136323337373433383634376337633465366534393338373136643732373736343735373237613763376334363733353737303533366236333463353333363534366137633763373337343732363536313664373336327c7c6b586c3163614468645a47617c7c73747265616d7362"
//"https://sbplay2.com/sourcesx38/4f395a53447166635a3836787c7c${bytesToHex}7c7c7965344f61436d467845586c7c7c73747265616d7362/6e56314c77564e6a6c6631737c7c333735383537363836633662373635323636376133343637376337633335346334343332353735343333366633343635346336383763376334313561373633343761346133303665363837363537353937633763373337343732363536313664373336327c7c395239444c3961626d634e6a7c7c73747265616d7362"
val json = Json.decodeFromString<JsonObject>(
Jsoup.connect(master).ignoreContentType(true).header("watchsb", "streamsb").header("accept-language", "en-US,en;q=0.5").header("Referer", url).header("User-Agent", "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:96.0) Gecko/20100101 Firefox/96.0")
.execute().body()
)
val masterUrl = json["stream_data"]!!.jsonObject["file"].toString().trim('"')
val masterPlaylist = client.newCall(GET(masterUrl, headers)).execute().body!!.string()
val videoList = mutableListOf<Video>()
masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:").forEach {
val quality = "StreamSB:" + it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore(",") + "p"
val videoUrl = it.substringAfter("\n").substringBefore("\n")
videoList.add(Video(videoUrl, quality, videoUrl, null, headers))
}
return videoList
}
}

View File

@ -5,7 +5,7 @@ ext {
extName = 'AsianLoad'
pkgNameSuffix = 'en.asianload'
extClass = '.AsianLoad'
extVersionCode = 7
extVersionCode = 8
libVersion = '12'
}

View File

@ -126,7 +126,7 @@ class AsianLoad : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
val callMaster = client.newCall(GET(master, nheaders)).execute().asJsoup()
Log.i("testt", "$callMaster")*/
val headers = headers.newBuilder()
// .set("Referer", "https://sbplay2.com/")
.set("Referer", url)
.set("User-Agent", "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:96.0) Gecko/20100101 Firefox/96.0")
.set("Accept-Language", "en-US,en;q=0.5")
.set("watchsb", "streamsb")

View File

@ -8,7 +8,6 @@ import kotlinx.serialization.json.JsonObject
import kotlinx.serialization.json.jsonObject
import okhttp3.Headers
import okhttp3.OkHttpClient
import org.jsoup.Jsoup
class StreamSBExtractor(private val client: OkHttpClient) {
@ -32,8 +31,8 @@ class StreamSBExtractor(private val client: OkHttpClient) {
val master = "https://sbplay2.com/sources40/566d337678566f743674494a7c7c${bytesToHex}7c7c346b6767586d6934774855537c7c73747265616d7362/6565417268755339773461447c7c346133383438333436313335376136323337373433383634376337633465366534393338373136643732373736343735373237613763376334363733353737303533366236333463353333363534366137633763373337343732363536313664373336327c7c6b586c3163614468645a47617c7c73747265616d7362"
//"https://sbplay2.com/sourcesx38/4f395a53447166635a3836787c7c${bytesToHex}7c7c7965344f61436d467845586c7c7c73747265616d7362/6e56314c77564e6a6c6631737c7c333735383537363836633662373635323636376133343637376337633335346334343332353735343333366633343635346336383763376334313561373633343761346133303665363837363537353937633763373337343732363536313664373336327c7c395239444c3961626d634e6a7c7c73747265616d7362"
val json = Json.decodeFromString<JsonObject>(
Jsoup.connect(master).ignoreContentType(true).header("watchsb", "streamsb").header("accept-language", "en-US,en;q=0.5").header("Referer", url).header("User-Agent", "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:96.0) Gecko/20100101 Firefox/96.0")
.execute().body()
client.newCall(GET(master, headers))
.execute().body!!.string()
)
val masterUrl = json["stream_data"]!!.jsonObject["file"].toString().trim('"')
val masterPlaylist = client.newCall(GET(masterUrl, headers)).execute().body!!.string()

View File

@ -5,7 +5,7 @@ ext {
extName = 'DramaCool'
pkgNameSuffix = 'en.dramacool'
extClass = '.DramaCool'
extVersionCode = 7
extVersionCode = 8
libVersion = '12'
}

View File

@ -124,7 +124,7 @@ class DramaCool : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
val callMaster = client.newCall(GET(master, nheaders)).execute().asJsoup()
Log.i("testt", "$callMaster")*/
val headers = headers.newBuilder()
// .set("Referer", "https://sbplay2.com/")
.set("Referer", url)
.set("User-Agent", "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:96.0) Gecko/20100101 Firefox/96.0")
.set("Accept-Language", "en-US,en;q=0.5")
.set("watchsb", "streamsb")

View File

@ -8,7 +8,6 @@ import kotlinx.serialization.json.JsonObject
import kotlinx.serialization.json.jsonObject
import okhttp3.Headers
import okhttp3.OkHttpClient
import org.jsoup.Jsoup
class StreamSBExtractor(private val client: OkHttpClient) {
@ -32,8 +31,8 @@ class StreamSBExtractor(private val client: OkHttpClient) {
val master = "https://sbplay2.com/sources40/566d337678566f743674494a7c7c${bytesToHex}7c7c346b6767586d6934774855537c7c73747265616d7362/6565417268755339773461447c7c346133383438333436313335376136323337373433383634376337633465366534393338373136643732373736343735373237613763376334363733353737303533366236333463353333363534366137633763373337343732363536313664373336327c7c6b586c3163614468645a47617c7c73747265616d7362"
//"https://sbplay2.com/sourcesx38/4f395a53447166635a3836787c7c${bytesToHex}7c7c7965344f61436d467845586c7c7c73747265616d7362/6e56314c77564e6a6c6631737c7c333735383537363836633662373635323636376133343637376337633335346334343332353735343333366633343635346336383763376334313561373633343761346133303665363837363537353937633763373337343732363536313664373336327c7c395239444c3961626d634e6a7c7c73747265616d7362"
val json = Json.decodeFromString<JsonObject>(
Jsoup.connect(master).ignoreContentType(true).header("watchsb", "streamsb").header("accept-language", "en-US,en;q=0.5").header("Referer", url).header("User-Agent", "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:96.0) Gecko/20100101 Firefox/96.0")
.execute().body()
client.newCall(GET(master, headers))
.execute().body!!.string()
)
val masterUrl = json["stream_data"]!!.jsonObject["file"].toString().trim('"')
val masterPlaylist = client.newCall(GET(masterUrl, headers)).execute().body!!.string()

View File

@ -5,7 +5,7 @@ ext {
extName = 'Vidembed'
pkgNameSuffix = 'en.vidembed'
extClass = '.Vidembed'
extVersionCode = 6
extVersionCode = 7
libVersion = '12'
}

View File

@ -112,6 +112,7 @@ class Vidembed : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
url.contains("https://sbplay") -> {
val newUrl = url.replace("/d/", "/e/")
val headers = headers.newBuilder()
.set("Referer", url)
.set("User-Agent", "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:96.0) Gecko/20100101 Firefox/96.0")
.set("Accept-Language", "en-US,en;q=0.5")
.set("watchsb", "streamsb")

View File

@ -9,7 +9,6 @@ import kotlinx.serialization.json.JsonObject
import kotlinx.serialization.json.jsonObject
import okhttp3.Headers
import okhttp3.OkHttpClient
import org.jsoup.Jsoup
class StreamSBExtractor(private val client: OkHttpClient) {
@ -35,7 +34,10 @@ class StreamSBExtractor(private val client: OkHttpClient) {
Log.i("bytesToHex", bytesToHex)
val master = "https://sbplay2.com/sources40/566d337678566f743674494a7c7c${bytesToHex}7c7c346b6767586d6934774855537c7c73747265616d7362/6565417268755339773461447c7c346133383438333436313335376136323337373433383634376337633465366534393338373136643732373736343735373237613763376334363733353737303533366236333463353333363534366137633763373337343732363536313664373336327c7c6b586c3163614468645a47617c7c73747265616d7362"
Log.i("master", master)
val json = Json.decodeFromString<JsonObject>(Jsoup.connect(master).ignoreContentType(true).header("watchsb", "streamsb").header("accept-language", "en-US,en;q=0.5").header("Referer", url).header("User-Agent", "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:96.0) Gecko/20100101 Firefox/96.0").execute().body())
val json = Json.decodeFromString<JsonObject>(
client.newCall(GET(master, headers))
.execute().body!!.string()
)
Log.i("json", "$json")
val masterUrl = json["stream_data"]!!.jsonObject["file"].toString().trim('"')
val masterPlaylist = client.newCall(GET(masterUrl, headers)).execute().body!!.string()

View File

@ -5,7 +5,7 @@ ext {
extName = 'AnimeFLV'
pkgNameSuffix = 'es.animeflv'
extClass = '.AnimeFlv'
extVersionCode = 9
extVersionCode = 10
libVersion = '12'
}

View File

@ -114,7 +114,7 @@ class AnimeFlv : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
val quality = server.jsonObject["title"]!!.jsonPrimitive.content
if (quality == "SB") {
val headers = headers.newBuilder()
// .set("Referer", "https://sbplay2.com/")
.set("Referer", url)
.set("User-Agent", "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:96.0) Gecko/20100101 Firefox/96.0")
.set("Accept-Language", "en-US,en;q=0.5")
.set("watchsb", "streamsb")

View File

@ -9,7 +9,6 @@ import kotlinx.serialization.json.JsonObject
import kotlinx.serialization.json.jsonObject
import okhttp3.Headers
import okhttp3.OkHttpClient
import org.jsoup.Jsoup
class StreamSBExtractor(private val client: OkHttpClient) {
@ -37,8 +36,8 @@ class StreamSBExtractor(private val client: OkHttpClient) {
"https://embedsb.com/sources40/566d337678566f743674494a7c7c${bytesToHex}7c7c346b6767586d6934774855537c7c73747265616d7362/6565417268755339773461447c7c346133383438333436313335376136323337373433383634376337633465366534393338373136643732373736343735373237613763376334363733353737303533366236333463353333363534366137633763373337343732363536313664373336327c7c6b586c3163614468645a47617c7c73747265616d7362"
Log.i("master", master)
val json = Json.decodeFromString<JsonObject>(
Jsoup.connect(master).ignoreContentType(true).header("watchsb", "streamsb").header("accept-language", "en-US,en;q=0.5").header("Referer", url).header("User-Agent", "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:96.0) Gecko/20100101 Firefox/96.0").execute()
.body()
client.newCall(GET(master, headers))
.execute().body!!.string()
)
Log.i("json", "$json")
val masterUrl = json["stream_data"]!!.jsonObject["file"].toString().trim('"')

View File

@ -5,7 +5,7 @@ ext {
extName = 'Pelisplushd'
pkgNameSuffix = 'es.pelisplushd'
extClass = '.Pelisplushd'
extVersionCode = 1
extVersionCode = 2
libVersion = '12'
}

View File

@ -119,6 +119,7 @@ class Pelisplushd : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
if (server == "SBFast") {
val url = script.data().substringAfter("video[$option] = '").substringBefore("';")
val headers = headers.newBuilder()
.set("Referer", url)
.set("User-Agent", "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:96.0) Gecko/20100101 Firefox/96.0")
.set("Accept-Language", "en-US,en;q=0.5")
.set("watchsb", "streamsb")

View File

@ -9,7 +9,6 @@ import kotlinx.serialization.json.JsonObject
import kotlinx.serialization.json.jsonObject
import okhttp3.Headers
import okhttp3.OkHttpClient
import org.jsoup.Jsoup
class StreamSBExtractor(private val client: OkHttpClient) {
@ -37,8 +36,8 @@ class StreamSBExtractor(private val client: OkHttpClient) {
"https://embedsb.com/sources40/566d337678566f743674494a7c7c${bytesToHex}7c7c346b6767586d6934774855537c7c73747265616d7362/6565417268755339773461447c7c346133383438333436313335376136323337373433383634376337633465366534393338373136643732373736343735373237613763376334363733353737303533366236333463353333363534366137633763373337343732363536313664373336327c7c6b586c3163614468645a47617c7c73747265616d7362"
Log.i("master", master)
val json = Json.decodeFromString<JsonObject>(
Jsoup.connect(master).ignoreContentType(true).header("watchsb", "streamsb").header("accept-language", "en-US,en;q=0.5").header("Referer", url).header("User-Agent", "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:96.0) Gecko/20100101 Firefox/96.0").execute()
.body()
client.newCall(GET(master, headers))
.execute().body!!.string()
)
Log.i("json", "$json")
val masterUrl = json["stream_data"]!!.jsonObject["file"].toString().trim('"')

View File

@ -5,7 +5,7 @@ ext {
extName = 'AnimeWorld (experimental)'
pkgNameSuffix = 'hi.animeWorld'
extClass = '.AnimeWorld'
extVersionCode = 1
extVersionCode = 2
libVersion = '12'
}

View File

@ -160,7 +160,13 @@ class AnimeWorld : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
val url = iframeElm.attr("data-src")
when {
url.contains("embedsb") || url.contains("cloudemb") -> {
val videos = StreamSBExtractor(client).videosFromUrl(url, headers, language)
val newheaders = headers.newBuilder()
.set("Referer", url)
.set("User-Agent", "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:96.0) Gecko/20100101 Firefox/96.0")
.set("Accept-Language", "en-US,en;q=0.5")
.set("watchsb", "streamsb")
.build()
val videos = StreamSBExtractor(client).videosFromUrl(url, newheaders, language)
videoList.addAll(videos)
}
}

View File

@ -10,7 +10,6 @@ import kotlinx.serialization.json.jsonObject
import kotlinx.serialization.json.jsonPrimitive
import okhttp3.Headers
import okhttp3.OkHttpClient
import org.jsoup.Jsoup
class StreamSBExtractor(private val client: OkHttpClient) {
@ -36,7 +35,10 @@ class StreamSBExtractor(private val client: OkHttpClient) {
Log.i("bytesToHex", bytesToHex)
val master = "https://sbplay2.com/sources40/566d337678566f743674494a7c7c${bytesToHex}7c7c346b6767586d6934774855537c7c73747265616d7362/6565417268755339773461447c7c346133383438333436313335376136323337373433383634376337633465366534393338373136643732373736343735373237613763376334363733353737303533366236333463353333363534366137633763373337343732363536313664373336327c7c6b586c3163614468645a47617c7c73747265616d7362"
Log.i("master", master)
val json = Json.decodeFromString<JsonObject>(Jsoup.connect(master).ignoreContentType(true).header("watchsb", "streamsb").header("accept-language", "en-US,en;q=0.5").header("Referer", url).header("User-Agent", "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:96.0) Gecko/20100101 Firefox/96.0").execute().body())
val json = Json.decodeFromString<JsonObject>(
client.newCall(GET(master, headers))
.execute().body!!.string()
)
Log.i("json", "$json")
val masterUrl = json["stream_data"]!!.jsonObject["file"]!!.jsonPrimitive.content
val masterPlaylist = client.newCall(GET(masterUrl, headers)).execute().body!!.string()

View File

@ -5,7 +5,7 @@ ext {
extName = 'ANIMEWORLD.tv'
pkgNameSuffix = 'it.animeworld'
extClass = '.ANIMEWORLD'
extVersionCode = 3
extVersionCode = 4
libVersion = '12'
}

View File

@ -99,7 +99,7 @@ class ANIMEWORLD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
when {
url.contains("animeworld.biz") -> {
val headers = headers.newBuilder()
// .set("Referer", "https://sbplay2.com/")
.set("Referer", url)
.set("User-Agent", "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:96.0) Gecko/20100101 Firefox/96.0")
.set("Accept-Language", "en-US,en;q=0.5")
.set("watchsb", "streamsb")

View File

@ -9,7 +9,6 @@ import kotlinx.serialization.json.JsonObject
import kotlinx.serialization.json.jsonObject
import okhttp3.Headers
import okhttp3.OkHttpClient
import org.jsoup.Jsoup
class StreamSBExtractor(private val client: OkHttpClient) {
@ -37,8 +36,8 @@ class StreamSBExtractor(private val client: OkHttpClient) {
"https://animeworld.biz/sources40/566d337678566f743674494a7c7c${bytesToHex}7c7c346b6767586d6934774855537c7c73747265616d7362/6565417268755339773461447c7c346133383438333436313335376136323337373433383634376337633465366534393338373136643732373736343735373237613763376334363733353737303533366236333463353333363534366137633763373337343732363536313664373336327c7c6b586c3163614468645a47617c7c73747265616d7362"
Log.i("master", master)
val json = Json.decodeFromString<JsonObject>(
Jsoup.connect(master).ignoreContentType(true).header("watchsb", "streamsb").header("accept-language", "en-US,en;q=0.5").header("Referer", url).header("User-Agent", "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:96.0) Gecko/20100101 Firefox/96.0").execute()
.body()
client.newCall(GET(master, headers))
.execute().body!!.string()
)
Log.i("json", "$json")
val masterUrl = json["stream_data"]!!.jsonObject["file"].toString().trim('"')