Skip to content

Further simplification #484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Luna712 wants to merge 9 commits into
base: jsinterpreter
Choose a base branch
from
+17 −9
Open

Further simplification #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1a33ede
Further simplification
Luna712 May 25, 2026
259e96d
Fix
Luna712 May 25, 2026
cb69333
Update
Luna712 May 25, 2026
a8b1226
Update
Luna712 May 25, 2026
7c29fa7
Update
Luna712 May 25, 2026
36eaad3
-
Luna712 May 25, 2026
8cfb5c7
-
Luna712 May 25, 2026
7fa4502
Update
Luna712 May 25, 2026
2869f3e
Comment
Luna712 May 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamTape.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package com.lagradost.cloudstream3.extractors
import com.lagradost.cloudstream3.app
import com.lagradost.cloudstream3.utils.ExtractorApi
import com.lagradost.cloudstream3.utils.ExtractorLink
import com.lagradost.cloudstream3.utils.JsContext
import com.lagradost.cloudstream3.utils.Qualities
import com.lagradost.cloudstream3.utils.evalJs
import com.lagradost.cloudstream3.utils.newExtractorLink

class Watchadsontape : StreamTape() {
Expand Down Expand Up @@ -33,11 +33,8 @@ open class StreamTape : ExtractorApi() {
val result =
this.document.select("script").firstOrNull { it.html().contains("botlink').innerHTML") }
?.html()?.lines()?.firstOrNull { it.contains("botlink').innerHTML") }?.let {
val scriptContent =
it.substringAfter(").innerHTML").replaceFirst("=", "var url =")
val ctx = JsContext()
ctx.eval(scriptContent)
ctx["url"]?.toString() ?: ""
val scriptContent = it.substringAfter(").innerHTML").replaceFirst("=", "var url =")
evalJs(scriptContent, "url")?.toString()
}

if (!result.isNullOrEmpty()) {
Expand Down
17 changes: 14 additions & 3 deletions library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/JsInterpreter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,22 @@ class JsContext {
}

/**
* Evaluate [js] and return its last value. Convenience wrapper for one-shot
* evaluations, equivalent to the old `rhino.evaluateString(scope, js, ...)`.
* Evaluate [js] and return its last value, or the value of [variable] if specified.
* Convenience wrapper for one-shot evaluations, equivalent to the old
* `rhino.evaluateString(scope, js, ...)`.
*
* @param js The JavaScript code to evaluate.
* @param variable Optional variable name to retrieve from the scope after evaluation.
* @return The last expression value, or the named variable value if [variable] is specified.
* Returns [Unit] on evaluation failure or when the result is JS undefined.
* JS null is represented as Kotlin null. Use [jsValueToString] to convert to a JS string.
*/
@Prerelease
fun evalJs(js: String): Any? = JsInterpreter().eval(js)
fun evalJs(js: String, variable: String? = null): Any? {
val interpreter = JsInterpreter()
val result = interpreter.eval(js)
return if (variable != null) interpreter.getVar(variable) else result
}

private enum class TT {
NUMBER, STRING, IDENT, PLUS, MINUS, STAR, SLASH, PERCENT, EQ, EQEQ, EQEQEQ,
Expand Down