Draff
/
Tachiyomi-Extensions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove usage of Duktape (#13048)

This commit is contained in:
AntsyLich 2022-08-17 22:14:06 +06:00 committed by GitHub
parent a83e04f237
commit e96fd22d30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/all/comico/build.gradle
View File

@ -6,7 +6,7 @@ ext {
extName = 'Comico'
pkgNameSuffix = 'all.comico'
extClass = '.ComicoFactory'
extVersionCode = 3
extVersionCode = 4
isNsfw = true
}

4
src/all/comico/src/eu/kanade/tachiyomi/extension/all/comico/Comico.kt
View File

@ -1,7 +1,7 @@
package eu.kanade.tachiyomi.extension.all.comico
import android.webkit.CookieManager
import com.squareup.duktape.Duktape
import app.cash.quickjs.QuickJs
import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.network.POST
import eu.kanade.tachiyomi.source.model.FilterList
@ -166,7 +166,7 @@ open class Comico(
private fun paginate(route: String, page: Int) =
GET("$apiUrl/$route?pageNo=${page - 1}&pageSize=25", apiHeaders)
private fun String.decrypt() = Duktape.create().use {
private fun String.decrypt() = QuickJs.create().use {
// javax.crypto.Cipher does not support empty IV
val script = """
const key = CryptoJS.enc.Utf8.parse('$AES_KEY'), iv = {words: []}

2
src/en/mangahere/build.gradle
View File

@ -5,7 +5,7 @@ ext {
extName = 'Mangahere'
pkgNameSuffix = 'en.mangahere'
extClass = '.Mangahere'
extVersionCode = 18
extVersionCode = 19
}
apply from: "$rootDir/common.gradle"

20
src/en/mangahere/src/eu/kanade/tachiyomi/extension/en/mangahere/Mangahere.kt
View File

@ -1,6 +1,6 @@
package eu.kanade.tachiyomi.extension.en.mangahere
import com.squareup.duktape.Duktape
import app.cash.quickjs.QuickJs
import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.source.model.Filter
import eu.kanade.tachiyomi.source.model.FilterList
@ -212,7 +212,7 @@ class Mangahere : ParsedHttpSource() {
override fun pageListParse(document: Document): List<Page> {
val bar = document.select("script[src*=chapter_bar]")
val duktape = Duktape.create()
val quickJs = QuickJs.create()
/*
function to drop last imageUrl if it's broken/unneccesary, working imageUrls are incremental (e.g. t001, t002, etc); if the difference between
@ -236,16 +236,16 @@ class Mangahere : ParsedHttpSource() {
// if-branch is for webtoon reader, else is for page-by-page
return if (bar.isNotEmpty()) {
val script = document.select("script:containsData(function(p,a,c,k,e,d))").html().removePrefix("eval")
val deobfuscatedScript = duktape.evaluate(script).toString()
val deobfuscatedScript = quickJs.evaluate(script).toString()
val urls = deobfuscatedScript.substringAfter("newImgs=['").substringBefore("'];").split("','")
duktape.close()
quickJs.close()
urls.mapIndexed { index, s -> Page(index, "", "https:$s") }
} else {
val html = document.html()
val link = document.location()
var secretKey = extractSecretKey(html, duktape)
var secretKey = extractSecretKey(html, quickJs)
val chapterIdStartLoc = html.indexOf("chapterid")
val chapterId = html.substring(
@ -285,7 +285,7 @@ class Mangahere : ParsedHttpSource() {
secretKey = ""
}
val deobfuscatedScript = duktape.evaluate(responseText.removePrefix("eval")).toString()
val deobfuscatedScript = quickJs.evaluate(responseText.removePrefix("eval")).toString()
val baseLinkStartPos = deobfuscatedScript.indexOf("pix=") + 5
val baseLinkEndPos = deobfuscatedScript.indexOf(";", baseLinkStartPos) - 1
@ -299,15 +299,15 @@ class Mangahere : ParsedHttpSource() {
}
}
.dropLastIfBroken()
.also { duktape.close() }
.also { quickJs.close() }
}
private fun extractSecretKey(html: String, duktape: Duktape): String {
private fun extractSecretKey(html: String, quickJs: QuickJs): String {
val secretKeyScriptLocation = html.indexOf("eval(function(p,a,c,k,e,d)")
val secretKeyScriptEndLocation = html.indexOf("</script>", secretKeyScriptLocation)
val secretKeyScript = html.substring(secretKeyScriptLocation, secretKeyScriptEndLocation).removePrefix("eval")
val secretKeyDeobfuscatedScript = duktape.evaluate(secretKeyScript).toString()
val secretKeyDeobfuscatedScript = quickJs.evaluate(secretKeyScript).toString()
val secretKeyStartLoc = secretKeyDeobfuscatedScript.indexOf("'")
val secretKeyEndLoc = secretKeyDeobfuscatedScript.indexOf(";")
@ -317,7 +317,7 @@ class Mangahere : ParsedHttpSource() {
secretKeyEndLoc
)
return duktape.evaluate(secretKeyResultScript).toString()
return quickJs.evaluate(secretKeyResultScript).toString()
}
override fun imageUrlParse(document: Document): String = throw UnsupportedOperationException("Not used")

2
src/zh/mangabz/build.gradle
View File

@ -5,7 +5,7 @@ ext {
extName = 'Mangabz'
pkgNameSuffix = 'zh.mangabz'
extClass = '.Mangabz'
extVersionCode = 4
extVersionCode = 5
}
dependencies {

4
src/zh/mangabz/src/eu/kanade/tachiyomi/extension/zh/mangabz/Mangabz.kt
View File

@ -2,7 +2,7 @@ package eu.kanade.tachiyomi.extension.zh.mangabz
import android.app.Application
import android.content.SharedPreferences
import com.squareup.duktape.Duktape
import app.cash.quickjs.QuickJs
import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.network.asObservableSuccess
import eu.kanade.tachiyomi.network.interceptor.rateLimitHost
@ -276,7 +276,7 @@ class Mangabz : ConfigurableSource, HttpSource() {
private fun fetchImageUrlListFromAPI(apiUrl: String, requestHeaders: Headers = headers): JSONArray {
val jsEvalPayload = client.newCall(GET(apiUrl, requestHeaders)).execute().body!!.string()
val imgUrlDecode = Duktape.create().use {
val imgUrlDecode = QuickJs.create().use {
it.evaluate("$jsEvalPayload; JSON.stringify(d);") as String
}
return JSONArray(imgUrlDecode)

2
src/zh/manhuagui/build.gradle
View File

@ -6,7 +6,7 @@ ext {
extName = 'ManHuaGui'
pkgNameSuffix = 'zh.manhuagui'
extClass = '.Manhuagui'
extVersionCode = 14
extVersionCode = 15
}
dependencies {

6
src/zh/manhuagui/src/eu/kanade/tachiyomi/extension/zh/manhuagui/Manhuagui.kt
View File

@ -2,7 +2,7 @@ package eu.kanade.tachiyomi.extension.zh.manhuagui
import android.app.Application
import android.content.SharedPreferences
import com.squareup.duktape.Duktape
import app.cash.quickjs.QuickJs
import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.network.POST
import eu.kanade.tachiyomi.network.asObservableSuccess
@ -289,7 +289,7 @@ class Manhuagui : ConfigurableSource, ParsedHttpSource() {
if (hiddenEncryptedChapterList != null) {
if (getShowR18()) {
// Hidden chapter list is LZString encoded
val decodedHiddenChapterList = Duktape.create().use {
val decodedHiddenChapterList = QuickJs.create().use {
it.evaluate(
jsDecodeFunc +
"""LZString.decompressFromBase64('${hiddenEncryptedChapterList.`val`()}');"""
@ -381,7 +381,7 @@ class Manhuagui : ConfigurableSource, ParsedHttpSource() {
val html = document.html()
val imgCode = re.find(html)?.groups?.get(1)?.value
val imgDecode = Duktape.create().use {
val imgDecode = QuickJs.create().use {
it.evaluate(jsDecodeFunc + imgCode) as String
}

2
src/zh/qiximh/build.gradle
View File

@ -6,7 +6,7 @@ ext {
extName = 'QiXiManhua'
pkgNameSuffix = 'zh.qiximh'
extClass = '.Qiximh'
extVersionCode = 4
extVersionCode = 5
}
apply from: "$rootDir/common.gradle"

9
src/zh/qiximh/src/eu/kanade/tachiyomi/extension/zh/qiximh/Qiximh.kt
View File

@ -1,6 +1,6 @@
package eu.kanade.tachiyomi.extension.zh.qiximh
import com.squareup.duktape.Duktape
import app.cash.quickjs.QuickJs
import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.network.POST
import eu.kanade.tachiyomi.source.model.Filter
@ -302,10 +302,11 @@ class Qiximh : HttpSource() {
// Special thanks to author who created Mangahere.kt
val script = document.select("script:containsData(function(p,a,c,k,e,d))").html().removePrefix("eval")
val deobfuscatedScript = Duktape.create().use { it.evaluate(script).toString() }
val urls = deobfuscatedScript.substringAfter("newImgs=[\"").substringBefore("\"]").split("\",\"")
val deobfuscatedScript = QuickJs.create().use { it.evaluate(script).toString() }
val imageUrlListString = deobfuscatedScript.substringAfter("newImgs=").trim()
val imageUrlList = json.parseToJsonElement(imageUrlListString).jsonArray.map { it.jsonPrimitive.content }
return urls.mapIndexed { index, s -> Page(index, "", s) }
return imageUrlList.mapIndexed { index, s -> Page(index, imageUrl = s) }
}
// Unused

2
src/zh/tencentcomics/build.gradle
View File

@ -6,7 +6,7 @@ ext {
extName = 'Tencent Comics (ac.qq.com)'
pkgNameSuffix = 'zh.tencentcomics'
extClass = '.TencentComics'
extVersionCode = 5
extVersionCode = 6
}
apply from: "$rootDir/common.gradle"

4
src/zh/tencentcomics/src/eu/kanade/tachiyomi/extension/zh/tencentcomics/TencentComics.kt
View File

@ -1,7 +1,7 @@
package eu.kanade.tachiyomi.extension.zh.tencentcomics
import android.util.Base64
import com.squareup.duktape.Duktape
import app.cash.quickjs.QuickJs
import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.network.asObservableSuccess
import eu.kanade.tachiyomi.source.model.Filter
@ -146,7 +146,7 @@ class TencentComics : ParsedHttpSource() {
val raw = html.substringAfterLast("var DATA =").substringBefore("PRELOAD_NUM").trim().replace(Regex("^\'|\',$"), "")
val decodePrefix = "var raw = \"$raw\"; var nonce = $nonce"
val full = Duktape.create().use { it.evaluate(decodePrefix + jsDecodeFunction).toString() }
val full = QuickJs.create().use { it.evaluate(decodePrefix + jsDecodeFunction).toString() }
val chapterData = json.parseToJsonElement(String(Base64.decode(full, Base64.DEFAULT))).jsonObject
if (!chapterData["chapter"]!!.jsonObject["canRead"]!!.jsonPrimitive.boolean) throw Exception("[此章节为付费内容]")