From fc8e7532a980f4c0cb6e51f4a4a59cea1ae1c7ef Mon Sep 17 00:00:00 2001 From: Sir Aguacata <87155550+KillerDogeEmpire@users.noreply.github.com> Date: Wed, 17 Jan 2024 04:28:40 -0800 Subject: [PATCH] fix(en/nineanime): Fix keys with another repo (#2768) --- src/en/nineanime/build.gradle | 4 +- .../nineanime/extractors/VidsrcExtractor.kt | 190 +++++++++--------- 2 files changed, 97 insertions(+), 97 deletions(-) diff --git a/src/en/nineanime/build.gradle b/src/en/nineanime/build.gradle index 93c23e973..d661c83b5 100644 --- a/src/en/nineanime/build.gradle +++ b/src/en/nineanime/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Aniwave' extClass = '.Aniwave' - extVersionCode = 63 + extVersionCode = 64 } apply from: "$rootDir/common.gradle" @@ -11,4 +11,4 @@ dependencies { implementation(project(':lib-mp4upload-extractor')) implementation(project(':lib-streamtape-extractor')) implementation(project(':lib-playlist-utils')) -} \ No newline at end of file +} diff --git a/src/en/nineanime/src/eu/kanade/tachiyomi/animeextension/en/nineanime/extractors/VidsrcExtractor.kt b/src/en/nineanime/src/eu/kanade/tachiyomi/animeextension/en/nineanime/extractors/VidsrcExtractor.kt index caf8be9a6..f8f95b3e1 100644 --- a/src/en/nineanime/src/eu/kanade/tachiyomi/animeextension/en/nineanime/extractors/VidsrcExtractor.kt +++ b/src/en/nineanime/src/eu/kanade/tachiyomi/animeextension/en/nineanime/extractors/VidsrcExtractor.kt @@ -1,42 +1,47 @@ package eu.kanade.tachiyomi.animeextension.en.nineanime.extractors -import android.app.Application -import android.os.Handler -import android.os.Looper -import android.webkit.JavascriptInterface -import android.webkit.WebResourceRequest -import android.webkit.WebResourceResponse -import android.webkit.WebSettings -import android.webkit.WebView -import android.webkit.WebViewClient +import android.util.Base64 +import app.cash.quickjs.QuickJs import eu.kanade.tachiyomi.animeextension.en.nineanime.MediaResponseBody 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.network.GET import eu.kanade.tachiyomi.util.parseAs +import kotlinx.serialization.json.Json +import okhttp3.CacheControl import okhttp3.Headers import okhttp3.HttpUrl.Companion.toHttpUrl import okhttp3.OkHttpClient import uy.kohesive.injekt.injectLazy -import java.io.ByteArrayInputStream import java.net.URLDecoder -import java.util.concurrent.CountDownLatch -import java.util.concurrent.TimeUnit +import javax.crypto.Cipher +import javax.crypto.spec.SecretKeySpec class VidsrcExtractor(private val client: OkHttpClient, private val headers: Headers) { + private val json: Json by injectLazy() + private val playlistUtils by lazy { PlaylistUtils(client, headers) } + private val cacheControl = CacheControl.Builder().noStore().build() + private val noCacheClient = client.newBuilder() + .cache(null) + .build() + + private val keys by lazy { + noCacheClient.newCall( + GET("https://raw.githubusercontent.com/KillerDogeEmpire/vidplay-keys/keys/keys.json", cache = cacheControl), + ).execute().parseAs>() + } + fun videosFromUrl(embedLink: String, name: String, type: String): List