Merge branch 'master' of gitlab.futo.org:videostreaming/grayjay

app/src/androidTest/java/com/futo/platformplayer/CSSColorTests.kt

@@ -0,0 +1,38 @@
+package com.futo.platformplayer
+
+import android.graphics.Color
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import toAndroidColor
+
+class CSSColorTests {
+    @Test
+    fun test1() {
+        val androidHex = "#80336699"
+        val androidColorInt = Color.parseColor(androidHex)
+
+        val cssHex = "#33669980"
+        val cssColor = CSSColor.parseColor(cssHex)
+
+        assertEquals(
+            "CSSColor($cssHex).toAndroidColor() should equal Color.parseColor($androidHex)",
+            androidColorInt,
+            cssColor.toAndroidColor(),
+        )
+    }
+
+    @Test
+    fun test2() {
+        val androidHex = "#123ABC"
+        val androidColorInt = Color.parseColor(androidHex)
+
+        val cssHex = "#123ABCFF"
+        val cssColor = CSSColor.parseColor(cssHex)
+
+        assertEquals(
+            "CSSColor($cssHex).toAndroidColor() should equal Color.parseColor($androidHex)",
+            androidColorInt,
+            cssColor.toAndroidColor()
+        )
+    }
+}

app/src/main/assets/scripts/source.js

@@ -707,11 +707,12 @@ class LiveEventViewCount extends LiveEvent {
     }
 }
 class LiveEventRaid extends LiveEvent {
-    constructor(targetUrl, targetName, targetThumbnail) {
+    constructor(targetUrl, targetName, targetThumbnail, isOutgoing) {
         super(100);
         this.targetUrl = targetUrl;
         this.targetName = targetName;
         this.targetThumbnail = targetThumbnail;
+        this.isOutgoing = isOutgoing ?? true;
     }
 }
 

app/src/main/java/com/futo/platformplayer/CSSColor.kt

@@ -0,0 +1,319 @@
+import kotlin.math.*
+
+class CSSColor(r: Float, g: Float, b: Float, a: Float = 1f) {
+    init {
+        require(r in 0f..1f && g in 0f..1f && b in 0f..1f && a in 0f..1f) {
+            "RGBA channels must be in [0,1]"
+        }
+    }
+
+    // -- RGB(A) channels stored 0–1 --
+    var r: Float = r.coerceIn(0f, 1f)
+        set(v) { field = v.coerceIn(0f, 1f); _hslDirty = true }
+    var g: Float = g.coerceIn(0f, 1f)
+        set(v) { field = v.coerceIn(0f, 1f); _hslDirty = true }
+    var b: Float = b.coerceIn(0f, 1f)
+        set(v) { field = v.coerceIn(0f, 1f); _hslDirty = true }
+    var a: Float = a.coerceIn(0f, 1f)
+        set(v) { field = v.coerceIn(0f, 1f) }
+
+    // -- Int views of RGBA 0–255 --
+    var red: Int
+        get() = (r * 255).roundToInt()
+        set(v) { r = (v.coerceIn(0, 255) / 255f) }
+    var green: Int
+        get() = (g * 255).roundToInt()
+        set(v) { g = (v.coerceIn(0, 255) / 255f) }
+    var blue: Int
+        get() = (b * 255).roundToInt()
+        set(v) { b = (v.coerceIn(0, 255) / 255f) }
+    var alpha: Int
+        get() = (a * 255).roundToInt()
+        set(v) { a = (v.coerceIn(0, 255) / 255f) }
+
+    // -- HSLA storage & lazy recompute flags --
+    private var _h: Float = 0f
+    private var _s: Float = 0f
+    private var _l: Float = 0f
+    private var _hslDirty = true
+
+    /** Hue [0...360) */
+    var hue: Float
+        get() { computeHslIfNeeded(); return _h }
+        set(v) { setHsl(v, saturation, lightness) }
+
+    /** Saturation [0...1] */
+    var saturation: Float
+        get() { computeHslIfNeeded(); return _s }
+        set(v) { setHsl(hue, v, lightness) }
+
+    /** Lightness [0...1] */
+    var lightness: Float
+        get() { computeHslIfNeeded(); return _l }
+        set(v) { setHsl(hue, saturation, v) }
+
+    private fun computeHslIfNeeded() {
+        if (!_hslDirty) return
+        val max = max(max(r, g), b)
+        val min = min(min(r, g), b)
+        val d   = max - min
+        _l      = (max + min) / 2f
+        _s      = if (d == 0f) 0f else d / (1f - abs(2f * _l - 1f))
+        _h      = when {
+            d == 0f    -> 0f
+            max == r   -> ((g - b) / d % 6f) * 60f
+            max == g   -> (((b - r) / d) + 2f) * 60f
+            else       -> (((r - g) / d) + 4f) * 60f
+        }.let { if (it < 0f) it + 360f else it }
+        _hslDirty = false
+    }
+
+    /**
+     * Set all three HSL channels at once.
+     * Hue in degrees [0...360), s/l [0...1].
+     */
+    fun setHsl(h: Float, s: Float, l: Float) {
+        val hh = ((h % 360f) + 360f) % 360f
+        val cc = (1f - abs(2f * l - 1f)) * s
+        val x  = cc * (1f - abs((hh / 60f) % 2f - 1f))
+        val m  = l - cc / 2f
+
+        val (rp, gp, bp) = when {
+            hh < 60f -> Triple(cc, x, 0f)
+            hh < 120f -> Triple(x, cc, 0f)
+            hh < 180f -> Triple(0f, cc, x)
+            hh < 240f -> Triple(0f, x, cc)
+            hh < 300f -> Triple(x, 0f, cc)
+            else -> Triple(cc, 0f, x)
+        }
+
+        r = rp + m; g = gp + m; b = bp + m
+        _h = hh; _s = s; _l = l; _hslDirty = false
+    }
+
+    /** Return 0xRRGGBBAA int */
+    fun toRgbaInt(): Int {
+        val ai = (a * 255).roundToInt() and 0xFF
+        val ri = (r * 255).roundToInt() and 0xFF
+        val gi = (g * 255).roundToInt() and 0xFF
+        val bi = (b * 255).roundToInt() and 0xFF
+        return (ri shl 24) or (gi shl 16) or (bi shl 8) or ai
+    }
+
+    /** Return 0xAARRGGBB int */
+    fun toArgbInt(): Int {
+        val ai = (a * 255).roundToInt() and 0xFF
+        val ri = (r * 255).roundToInt() and 0xFF
+        val gi = (g * 255).roundToInt() and 0xFF
+        val bi = (b * 255).roundToInt() and 0xFF
+        return (ai shl 24) or (ri shl 16) or (gi shl 8) or bi
+    }
+
+    // — Convenience modifiers (chainable) — 
+
+    /** Lighten by fraction [0...1] */
+    fun lighten(fraction: Float): CSSColor = apply {
+        lightness = (lightness + fraction).coerceIn(0f, 1f)
+    }
+
+    /** Darken by fraction [0...1] */
+    fun darken(fraction: Float): CSSColor = apply {
+        lightness = (lightness - fraction).coerceIn(0f, 1f)
+    }
+
+    /** Increase saturation by fraction [0...1] */
+    fun saturate(fraction: Float): CSSColor = apply {
+        saturation = (saturation + fraction).coerceIn(0f, 1f)
+    }
+
+    /** Decrease saturation by fraction [0...1] */
+    fun desaturate(fraction: Float): CSSColor = apply {
+        saturation = (saturation - fraction).coerceIn(0f, 1f)
+    }
+
+    /** Rotate hue by degrees (can be negative) */
+    fun rotateHue(degrees: Float): CSSColor = apply {
+        hue = (hue + degrees) % 360f
+    }
+
+    companion object {
+        /** Create from Android 0xAARRGGBB */
+        @JvmStatic fun fromArgb(color: Int): CSSColor {
+            val a = ((color ushr 24) and 0xFF) / 255f
+            val r = ((color ushr 16) and 0xFF) / 255f
+            val g = ((color ushr 8)  and 0xFF) / 255f
+            val b = ( color and 0xFF) / 255f
+            return CSSColor(r, g, b, a)
+        }
+
+        /** Create from Android 0xRRGGBBAA */
+        @JvmStatic fun fromRgba(color: Int): CSSColor {
+            val r = ((color ushr 24) and 0xFF) / 255f
+            val g = ((color ushr 16) and 0xFF) / 255f
+            val b = ((color ushr 8)  and 0xFF) / 255f
+            val a = ( color and 0xFF) / 255f
+            return CSSColor(r, g, b, a)
+        }
+
+        @JvmStatic fun fromAndroidColor(color: Int): CSSColor {
+            return fromArgb(color)
+        }
+
+        private val NAMED_HEX = mapOf(
+            "aliceblue" to "F0F8FF", "antiquewhite" to "FAEBD7", "aqua" to "00FFFF",
+            "aquamarine" to "7FFFD4", "azure" to "F0FFFF", "beige" to "F5F5DC",
+            "bisque" to "FFE4C4", "black" to "000000", "blanchedalmond" to "FFEBCD",
+            "blue" to "0000FF", "blueviolet" to "8A2BE2", "brown" to "A52A2A",
+            "burlywood" to "DEB887", "cadetblue" to "5F9EA0", "chartreuse" to "7FFF00",
+            "chocolate" to "D2691E", "coral" to "FF7F50", "cornflowerblue" to "6495ED",
+            "cornsilk" to "FFF8DC", "crimson" to "DC143C", "cyan" to "00FFFF",
+            "darkblue" to "00008B", "darkcyan" to "008B8B", "darkgoldenrod" to "B8860B",
+            "darkgray" to "A9A9A9", "darkgreen" to "006400", "darkgrey" to "A9A9A9",
+            "darkkhaki" to "BDB76B", "darkmagenta" to "8B008B", "darkolivegreen" to "556B2F",
+            "darkorange" to "FF8C00", "darkorchid" to "9932CC", "darkred" to "8B0000",
+            "darksalmon" to "E9967A", "darkseagreen" to "8FBC8F", "darkslateblue" to "483D8B",
+            "darkslategray" to "2F4F4F", "darkslategrey" to "2F4F4F", "darkturquoise" to "00CED1",
+            "darkviolet" to "9400D3", "deeppink" to "FF1493", "deepskyblue" to "00BFFF",
+            "dimgray" to "696969", "dimgrey" to "696969", "dodgerblue" to "1E90FF",
+            "firebrick" to "B22222", "floralwhite" to "FFFAF0", "forestgreen" to "228B22",
+            "fuchsia" to "FF00FF", "gainsboro" to "DCDCDC", "ghostwhite" to "F8F8FF",
+            "gold" to "FFD700", "goldenrod" to "DAA520", "gray" to "808080",
+            "green" to "008000", "greenyellow" to "ADFF2F", "grey" to "808080",
+            "honeydew" to "F0FFF0", "hotpink" to "FF69B4", "indianred" to "CD5C5C",
+            "indigo" to "4B0082", "ivory" to "FFFFF0", "khaki" to "F0E68C",
+            "lavender" to "E6E6FA", "lavenderblush" to "FFF0F5", "lawngreen" to "7CFC00",
+            "lemonchiffon" to "FFFACD", "lightblue" to "ADD8E6", "lightcoral" to "F08080",
+            "lightcyan" to "E0FFFF", "lightgoldenrodyellow" to "FAFAD2", "lightgray" to "D3D3D3",
+            "lightgreen" to "90EE90", "lightgrey" to "D3D3D3", "lightpink" to "FFB6C1",
+            "lightsalmon" to "FFA07A", "lightseagreen" to "20B2AA", "lightskyblue" to "87CEFA",
+            "lightslategray" to "778899", "lightslategrey" to "778899", "lightsteelblue" to "B0C4DE",
+            "lightyellow" to "FFFFE0", "lime" to "00FF00", "limegreen" to "32CD32",
+            "linen" to "FAF0E6", "magenta" to "FF00FF", "maroon" to "800000",
+            "mediumaquamarine" to "66CDAA", "mediumblue" to "0000CD", "mediumorchid" to "BA55D3",
+            "mediumpurple" to "9370DB", "mediumseagreen" to "3CB371", "mediumslateblue" to "7B68EE",
+            "mediumspringgreen" to "00FA9A", "mediumturquoise" to "48D1CC", "mediumvioletred" to "C71585",
+            "midnightblue" to "191970", "mintcream" to "F5FFFA", "mistyrose" to "FFE4E1",
+            "moccasin" to "FFE4B5", "navajowhite" to "FFDEAD", "navy" to "000080",
+            "oldlace" to "FDF5E6", "olive" to "808000", "olivedrab" to "6B8E23",
+            "orange" to "FFA500", "orangered" to "FF4500", "orchid" to "DA70D6",
+            "palegoldenrod" to "EEE8AA", "palegreen" to "98FB98", "paleturquoise" to "AFEEEE",
+            "palevioletred" to "DB7093", "papayawhip" to "FFEFD5", "peachpuff" to "FFDAB9",
+            "peru" to "CD853F", "pink" to "FFC0CB", "plum" to "DDA0DD",
+            "powderblue" to "B0E0E6", "purple" to "800080", "rebeccapurple" to "663399",
+            "red" to "FF0000", "rosybrown" to "BC8F8F", "royalblue" to "4169E1",
+            "saddlebrown" to "8B4513", "salmon" to "FA8072", "sandybrown" to "F4A460",
+            "seagreen" to "2E8B57", "seashell" to "FFF5EE", "sienna" to "A0522D",
+            "silver" to "C0C0C0", "skyblue" to "87CEEB", "slateblue" to "6A5ACD",
+            "slategray" to "708090", "slategrey" to "708090", "snow" to "FFFAFA",
+            "springgreen" to "00FF7F", "steelblue" to "4682B4", "tan" to "D2B48C",
+            "teal" to "008080", "thistle" to "D8BFD8", "tomato" to "FF6347",
+            "turquoise" to "40E0D0", "violet" to "EE82EE", "wheat" to "F5DEB3",
+            "white" to "FFFFFF", "whitesmoke" to "F5F5F5", "yellow" to "FFFF00",
+            "yellowgreen" to "9ACD32"
+        )
+        private val NAMED: Map<String, Int> = NAMED_HEX
+            .mapValues { (_, hexRgb) ->
+                // parse hexRgb ("RRGGBB") to Int, then OR in 0xFF000000 for full opacity
+                val rgb = hexRgb.toInt(16)
+                (rgb shl 8) or 0xFF
+            } + ("transparent" to 0x00000000)
+
+        private val HEX_REGEX = Regex("^#([0-9a-fA-F]{3,8})$", RegexOption.IGNORE_CASE)
+        private val RGB_REGEX = Regex("^rgba?\\(([^)]+)\\)\$", RegexOption.IGNORE_CASE)
+        private val HSL_REGEX = Regex("^hsla?\\(([^)]+)\\)\$", RegexOption.IGNORE_CASE)
+
+        @JvmStatic
+        fun parseColor(s: String): CSSColor {
+            val str = s.trim()
+            // named
+            NAMED[str.lowercase()]?.let { return it.RGBAtoCSSColor() }
+
+            // hex
+            HEX_REGEX.matchEntire(str)?.groupValues?.get(1)?.let { part ->
+                return parseHexPart(part)
+            }
+
+            // rgb/rgba
+            RGB_REGEX.matchEntire(str)?.groupValues?.get(1)?.let {
+                return parseRgbParts(it.split(',').map(String::trim))
+            }
+
+            // hsl/hsla
+            HSL_REGEX.matchEntire(str)?.groupValues?.get(1)?.let {
+                return parseHslParts(it.split(',').map(String::trim))
+            }
+
+            error("Cannot parse color: \"$s\"")
+        }
+
+        private fun parseHexPart(p: String): CSSColor {
+            // expand shorthand like "RGB" or "RGBA" to full 8-chars "RRGGBBAA"
+            val hex = when (p.length) {
+                3 -> p.map { "$it$it" }.joinToString("") + "FF"
+                4 -> p.map { "$it$it" }.joinToString("")
+                6 -> p + "FF"
+                8 -> p
+                else -> error("Invalid hex color: #$p")
+            }
+
+            val parsed = hex.toLong(16).toInt()
+            val alpha = (parsed and 0xFF) shl 24
+            val rgbOnly = (parsed ushr 8) and 0x00FFFFFF
+            val argb = alpha or rgbOnly
+            return fromArgb(argb)
+        }
+
+        private fun parseRgbParts(parts: List<String>): CSSColor {
+            require(parts.size == 3 || parts.size == 4) { "rgb/rgba needs 3 or 4 parts" }
+
+            // r/g/b: "128" → 128/255, "50%" → 0.5
+            fun channel(ch: String): Float =
+                if (ch.endsWith("%")) ch.removeSuffix("%").toFloat() / 100f
+                else ch.toFloat().coerceIn(0f, 255f) / 255f
+
+            // alpha: "0.5" → 0.5, "50%" → 0.5
+            fun alpha(a: String): Float =
+                if (a.endsWith("%")) a.removeSuffix("%").toFloat() / 100f
+                else a.toFloat().coerceIn(0f, 1f)
+
+            val r = channel(parts[0])
+            val g = channel(parts[1])
+            val b = channel(parts[2])
+            val a = if (parts.size == 4) alpha(parts[3]) else 1f
+
+            return CSSColor(r, g, b, a)
+        }
+
+        private fun parseHslParts(parts: List<String>): CSSColor {
+            require(parts.size == 3 || parts.size == 4) { "hsl/hsla needs 3 or 4 parts" }
+
+            fun hueOf(h: String): Float = when {
+                h.endsWith("deg")  -> h.removeSuffix("deg").toFloat()
+                h.endsWith("grad") -> h.removeSuffix("grad").toFloat() * 0.9f
+                h.endsWith("rad")  -> h.removeSuffix("rad").toFloat() * (180f / PI.toFloat())
+                h.endsWith("turn") -> h.removeSuffix("turn").toFloat() * 360f
+                else               -> h.toFloat()
+            }
+
+            // for s and l you only ever see percentages
+            fun pct(p: String): Float =
+                p.removeSuffix("%").toFloat().coerceIn(0f, 100f) / 100f
+
+            // alpha: "0.5" → 0.5, "50%" → 0.5
+            fun alpha(a: String): Float =
+                if (a.endsWith("%")) pct(a)
+                else a.toFloat().coerceIn(0f, 1f)
+
+            val h = hueOf(parts[0])
+            val s = pct(parts[1])
+            val l = pct(parts[2])
+            val a = if (parts.size == 4) alpha(parts[3]) else 1f
+
+            return CSSColor(0f, 0f, 0f, a).apply { setHsl(h, s, l) }
+        }
+    }
+}
+
+fun Int.RGBAtoCSSColor(): CSSColor = CSSColor.fromRgba(this)
+fun Int.ARGBtoCSSColor(): CSSColor = CSSColor.fromArgb(this)
+fun CSSColor.toAndroidColor(): Int = toArgbInt()

app/src/main/java/com/futo/platformplayer/Extensions_V8.kt

@@ -2,12 +2,30 @@ package com.futo.platformplayer
 
 import com.caoccao.javet.values.V8Value
 import com.caoccao.javet.values.primitive.*
+import com.caoccao.javet.values.reference.IV8ValuePromise
 import com.caoccao.javet.values.reference.V8ValueArray
+import com.caoccao.javet.values.reference.V8ValueError
 import com.caoccao.javet.values.reference.V8ValueObject
+import com.caoccao.javet.values.reference.V8ValuePromise
 import com.futo.platformplayer.engine.IV8PluginConfig
 import com.futo.platformplayer.engine.V8Plugin
+import com.futo.platformplayer.engine.exceptions.ScriptExecutionException
 import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
 import com.futo.platformplayer.logging.Logger
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.async
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.selects.SelectClause0
+import kotlinx.coroutines.selects.SelectClause1
+import java.util.concurrent.CancellationException
+import java.util.concurrent.CountDownLatch
+import kotlin.coroutines.AbstractCoroutineContextElement
+import kotlin.coroutines.CoroutineContext
+import kotlin.reflect.jvm.internal.impl.load.kotlin.JvmType
 
 
 //V8
@@ -174,4 +192,137 @@ fun V8ObjectToHashMap(obj: V8ValueObject?): HashMap<String, String> {
     for(prop in obj.ownPropertyNames.keys.map { obj.ownPropertyNames.get<V8Value>(it).toString() })
         map.put(prop, obj.getString(prop));
     return map;
+}
+
+
+fun <T: V8Value> V8ValuePromise.toV8ValueBlocking(plugin: V8Plugin): T {
+    val latch = CountDownLatch(1);
+    var promiseResult: T? = null;
+    var promiseException: Throwable? = null;
+    plugin.busy {
+        this.register(object: IV8ValuePromise.IListener {
+            override fun onFulfilled(p0: V8Value?) {
+                if(p0 is V8ValueError)
+                    promiseException = ScriptExecutionException(plugin.config, p0.message);
+                else
+                    promiseResult = p0 as T;
+                latch.countDown();
+            }
+            override fun onRejected(p0: V8Value?) {
+                promiseException = (NotImplementedError("onRejected promise not implemented.."));
+                latch.countDown();
+            }
+            override fun onCatch(p0: V8Value?) {
+                promiseException = (NotImplementedError("onCatch promise not implemented.."));
+                latch.countDown();
+            }
+        });
+    }
+
+    plugin.registerPromise(this) {
+        promiseException =  CancellationException("Cancelled by system");
+        latch.countDown();
+    }
+    plugin.unbusy {
+        latch.await();
+    }
+    if(promiseException != null)
+        throw promiseException!!;
+    return promiseResult!!;
+}
+fun <T: V8Value> V8ValuePromise.toV8ValueAsync(plugin: V8Plugin): V8Deferred<T> {
+    val underlyingDef = CompletableDeferred<T>();
+    val def = if(this.has("estDuration"))
+        V8Deferred(underlyingDef,
+            this.getOrDefault(plugin.config, "estDuration", "toV8ValueAsync", -1) ?: -1);
+    else
+        V8Deferred<T>(underlyingDef);
+
+    if(def.estDuration > 0)
+        Logger.i("V8", "Promise with duration: [${def.estDuration}]");
+
+    val promise = this;
+    plugin.busy {
+        this.register(object: IV8ValuePromise.IListener {
+            override fun onFulfilled(p0: V8Value?) {
+                plugin.resolvePromise(promise);
+                underlyingDef.complete(p0 as T);
+            }
+            override fun onRejected(p0: V8Value?) {
+                plugin.resolvePromise(promise);
+                underlyingDef.completeExceptionally(NotImplementedError("onRejected promise not implemented.."));
+            }
+            override fun onCatch(p0: V8Value?) {
+                plugin.resolvePromise(promise);
+                underlyingDef.completeExceptionally(NotImplementedError("onCatch promise not implemented.."));
+            }
+        });
+    }
+    plugin.registerPromise(promise) {
+        if(def.isActive)
+            def.cancel("Cancelled by system");
+    }
+    return def;
+}
+
+class V8Deferred<T>(val deferred: Deferred<T>, val estDuration: Int = -1): Deferred<T> by deferred {
+
+    fun <R> convert(conversion: (result: T)->R): V8Deferred<R>{
+        val newDef = CompletableDeferred<R>()
+        this.invokeOnCompletion { 
+            if(it != null)
+                newDef.completeExceptionally(it);
+            else
+                newDef.complete(conversion(this@V8Deferred.getCompleted()));
+        }
+        
+        return V8Deferred<R>(newDef, estDuration);
+    }
+
+
+    companion object {
+        fun <T, R> merge(scope: CoroutineScope, defs: List<V8Deferred<T>>, conversion: (result: List<T>)->R): V8Deferred<R> {
+
+            var amount = -1;
+            for(def in defs)
+                amount = Math.max(amount, def.estDuration);
+
+            val def = scope.async {
+                val results = defs.map { it.await() };
+                return@async conversion(results);
+            }
+            return V8Deferred(def, amount);
+        }
+    }
+}
+
+
+fun <T: V8Value> V8ValueObject.invokeV8(method: String, vararg obj: Any?): T {
+    var result = this.invoke<V8Value>(method, *obj);
+    if(result is V8ValuePromise) {
+        return result.toV8ValueBlocking(this.getSourcePlugin()!!);
+    }
+    return result as T;
+}
+fun <T: V8Value> V8ValueObject.invokeV8Async(method: String, vararg obj: Any?): V8Deferred<T> {
+    var result = this.invoke<V8Value>(method, *obj);
+    if(result is V8ValuePromise) {
+        return result.toV8ValueAsync(this.getSourcePlugin()!!);
+    }
+    return V8Deferred(CompletableDeferred(result as T));
+}
+fun V8ValueObject.invokeV8Void(method: String, vararg obj: Any?): V8Value {
+    var result = this.invoke<V8Value>(method, *obj);
+    if(result is V8ValuePromise) {
+        return result.toV8ValueBlocking(this.getSourcePlugin()!!);
+    }
+    return result;
+}
+fun V8ValueObject.invokeV8VoidAsync(method: String, vararg obj: Any?): V8Deferred<V8Value> {
+    var result = this.invoke<V8Value>(method, *obj);
+    if(result is V8ValuePromise) {
+        val result = result.toV8ValueAsync<V8Value>(this.getSourcePlugin()!!);
+        return result;
+    }
+    return V8Deferred(CompletableDeferred(result));
 }

app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt

@@ -32,7 +32,6 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentContainerView
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.whenStateAtLeast
 import androidx.lifecycle.withStateAtLeast
 import androidx.media3.common.util.UnstableApi
 import com.futo.platformplayer.BuildConfig
@@ -114,7 +113,6 @@ import java.io.PrintWriter
 import java.io.StringWriter
 import java.lang.reflect.InvocationTargetException
 import java.util.LinkedList
-import java.util.Queue
 import java.util.UUID
 import java.util.concurrent.ConcurrentLinkedQueue
 
@@ -610,6 +608,8 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
                 }, UIDialogs.ActionStyle.PRIMARY)
             )
         }
+
+        //startActivity(Intent(this, TestActivity::class.java))
     }
 
     /*

app/src/main/java/com/futo/platformplayer/activities/TestActivity.kt

@@ -2,12 +2,24 @@ package com.futo.platformplayer.activities
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.R
+import com.futo.platformplayer.views.TargetTapLoaderView
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 
 class TestActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_test);
+
+        val view = findViewById<TargetTapLoaderView>(R.id.test_view)
+        view.startLoader(10000)
+
+        lifecycleScope.launch {
+            delay(5000)
+            view.startLoader()
+        }
     }
 
     companion object {

app/src/main/java/com/futo/platformplayer/api/media/models/live/LiveEventEmojis.kt

@@ -18,8 +18,7 @@ class LiveEventEmojis: IPlatformLiveEvent {
         fun fromV8(config: IV8PluginConfig, obj: V8ValueObject) : LiveEventEmojis {
             obj.ensureIsBusy();
             val contextName = "LiveEventEmojis"
-            return LiveEventEmojis(
-                obj.getOrThrow(config, "emojis", contextName));
+            return LiveEventEmojis(obj.getOrThrow(config, "emojis", contextName));
         }
     }
 }

app/src/main/java/com/futo/platformplayer/api/media/models/live/LiveEventRaid.kt

@@ -3,6 +3,7 @@ package com.futo.platformplayer.api.media.models.live
 import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.engine.IV8PluginConfig
 import com.futo.platformplayer.ensureIsBusy
+import com.futo.platformplayer.getOrDefault
 import com.futo.platformplayer.getOrThrow
 
 class LiveEventRaid: IPlatformLiveEvent {
@@ -11,11 +12,13 @@ class LiveEventRaid: IPlatformLiveEvent {
     val targetName: String;
     val targetThumbnail: String;
     val targetUrl: String;
+    val isOutgoing: Boolean;
 
-    constructor(name: String, url: String, thumbnail: String) {
+    constructor(name: String, url: String, thumbnail: String, isOutgoing: Boolean) {
         this.targetName = name;
         this.targetUrl = url;
         this.targetThumbnail = thumbnail;
+        this.isOutgoing = isOutgoing;
     }
 
     companion object {
@@ -25,7 +28,8 @@ class LiveEventRaid: IPlatformLiveEvent {
             return LiveEventRaid(
                 obj.getOrThrow(config, "targetName", contextName),
                 obj.getOrThrow(config, "targetUrl", contextName),
-                obj.getOrThrow(config, "targetThumbnail", contextName));
+                obj.getOrThrow(config, "targetThumbnail", contextName),
+                obj.getOrDefault<Boolean>(config, "isOutgoing", contextName, true) ?: true);
         }
     }
 }

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/JSClient.kt

@@ -632,7 +632,6 @@ open class JSClient : IPlatformClient {
             plugin.executeTyped("source.getLiveEvents(${Json.encodeToString(url)})"));
     }
 
-
     @JSDocs(19, "source.getContentRecommendations(url)", "Gets recommendations of a content page")
     @JSDocsParameter("url", "Url of content")
     override fun getContentRecommendations(url: String): IPager<IPlatformContent>? = isBusyWith("getContentRecommendations") {

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSArticleDetails.kt

@@ -21,6 +21,7 @@ import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.getOrDefault
 import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.getOrThrowNullableList
+import com.futo.platformplayer.invokeV8
 import com.futo.platformplayer.states.StateDeveloper
 
 open class JSArticleDetails : JSContent, IPlatformArticleDetails, IPluginSourced, IPlatformContentDetails {
@@ -85,12 +86,12 @@ open class JSArticleDetails : JSContent, IPlatformArticleDetails, IPluginSourced
     }
 
     private fun getContentRecommendationsJS(client: JSClient): JSContentPager {
-        val contentPager = _content.invoke<V8ValueObject>("getContentRecommendations", arrayOf<Any>());
+        val contentPager = _content.invokeV8<V8ValueObject>("getContentRecommendations", arrayOf<Any>());
         return JSContentPager(_pluginConfig, client, contentPager);
     }
 
     private fun getCommentsJS(client: JSClient): JSCommentPager {
-        val commentPager = _content.invoke<V8ValueObject>("getComments", arrayOf<Any>());
+        val commentPager = _content.invokeV8<V8ValueObject>("getComments", arrayOf<Any>());
         return JSCommentPager(_pluginConfig, client, commentPager);
     }
 

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSComment.kt

@@ -12,6 +12,7 @@ import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.getOrDefault
 import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.getOrThrowNullable
+import com.futo.platformplayer.invokeV8
 import com.futo.platformplayer.serializers.OffsetDateTimeNullableSerializer
 import java.time.LocalDateTime
 import java.time.OffsetDateTime
@@ -60,7 +61,7 @@ class JSComment : IPlatformComment {
         if(!_hasGetReplies)
             return null;
 
-        val obj = _comment!!.invoke<V8ValueObject>("getReplies", arrayOf<Any>());
+        val obj = _comment!!.invokeV8<V8ValueObject>("getReplies", arrayOf<Any>());
         val plugin = if(client is JSClient) client else throw NotImplementedError("Only implemented for JSClient");
         return JSCommentPager(_config!!, plugin, obj);
     }

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSPager.kt

@@ -10,6 +10,7 @@ import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.getOrDefault
 import com.futo.platformplayer.getOrThrow
+import com.futo.platformplayer.invokeV8
 import com.futo.platformplayer.warnIfMainThread
 
 abstract class JSPager<T> : IPager<T> {
@@ -40,7 +41,7 @@ abstract class JSPager<T> : IPager<T> {
     }
 
     override fun hasMorePages(): Boolean {
-        return _hasMorePages;
+        return _hasMorePages && !pager.isClosed;
     }
 
     override fun nextPage() {
@@ -49,7 +50,7 @@ abstract class JSPager<T> : IPager<T> {
         val pluginV8 = plugin.getUnderlyingPlugin();
         pluginV8.busy {
             pager = pluginV8.catchScriptErrors("[${plugin.config.name}] JSPager", "pager.nextPage()") {
-                pager.invoke("nextPage", arrayOf<Any>());
+                pager.invokeV8("nextPage", arrayOf<Any>());
             };
             _hasMorePages = pager.getOrDefault(config, "hasMore", "Pager", false) ?: false;
             _resultChanged = true;

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSPlaybackTracker.kt

@@ -6,6 +6,7 @@ import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.engine.IV8PluginConfig
 import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
 import com.futo.platformplayer.getOrThrow
+import com.futo.platformplayer.invokeV8Void
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.warnIfMainThread
@@ -57,7 +58,7 @@ class JSPlaybackTracker: IPlaybackTracker {
             _client.busy {
                 if (_hasInit) {
                     Logger.i("JSPlaybackTracker", "onInit (${seconds})");
-                    _obj.invokeVoid("onInit", seconds);
+                    _obj.invokeV8Void("onInit", seconds);
                 }
                 nextRequest = Math.max(100, _obj.getOrThrow(_config, "nextRequest", "PlaybackTracker", false));
                 _hasCalledInit = true;
@@ -73,7 +74,7 @@ class JSPlaybackTracker: IPlaybackTracker {
             else {
                 _client.busy {
                     Logger.i("JSPlaybackTracker", "onProgress (${seconds}, ${isPlaying})");
-                    _obj.invokeVoid("onProgress", Math.floor(seconds), isPlaying);
+                    _obj.invokeV8Void("onProgress", Math.floor(seconds), isPlaying);
                     nextRequest = Math.max(100, _obj.getOrThrow(_config, "nextRequest", "PlaybackTracker", false));
                     _lastRequest = System.currentTimeMillis();
                 }
@@ -86,7 +87,7 @@ class JSPlaybackTracker: IPlaybackTracker {
             synchronized(_obj) {
                 Logger.i("JSPlaybackTracker", "onConcluded");
                 _client.busy {
-                    _obj.invokeVoid("onConcluded", -1);
+                    _obj.invokeV8Void("onConcluded", -1);
                 }
             }
         }

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSPostDetails.kt

@@ -15,6 +15,7 @@ import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.getOrDefault
+import com.futo.platformplayer.invokeV8
 import com.futo.platformplayer.states.StateDeveloper
 
 class JSPostDetails : JSPost, IPlatformPost, IPlatformPostDetails {
@@ -68,12 +69,12 @@ class JSPostDetails : JSPost, IPlatformPost, IPlatformPostDetails {
         return null;
     }
     private fun getContentRecommendationsJS(client: JSClient): JSContentPager {
-        val contentPager = _content.invoke<V8ValueObject>("getContentRecommendations", arrayOf<Any>());
+        val contentPager = _content.invokeV8<V8ValueObject>("getContentRecommendations", arrayOf<Any>());
         return JSContentPager(_pluginConfig, client, contentPager);
     }
 
     private fun getCommentsJS(client: JSClient): JSCommentPager {
-        val commentPager = _content.invoke<V8ValueObject>("getComments", arrayOf<Any>());
+        val commentPager = _content.invokeV8<V8ValueObject>("getComments", arrayOf<Any>());
         return JSCommentPager(_pluginConfig, client, commentPager);
     }
 

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSRequestExecutor.kt

@@ -14,6 +14,8 @@ import com.futo.platformplayer.engine.exceptions.ScriptException
 import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
 import com.futo.platformplayer.getOrDefault
 import com.futo.platformplayer.getOrThrow
+import com.futo.platformplayer.invokeV8
+import com.futo.platformplayer.invokeV8Void
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateDeveloper
 import kotlinx.serialization.Serializable
@@ -55,7 +57,7 @@ class JSRequestExecutor {
                         "[${_config.name}] JSRequestExecutor",
                         "builder.modifyRequest()"
                     ) {
-                        _executor.invoke("executeRequest", url, headers, method, body);
+                        _executor.invokeV8("executeRequest", url, headers, method, body);
                     } as V8Value;
                 }
             else V8Plugin.catchScriptErrors<Any>(
@@ -63,7 +65,7 @@ class JSRequestExecutor {
                 "[${_config.name}] JSRequestExecutor",
                 "builder.modifyRequest()"
             ) {
-                _executor.invoke("executeRequest", url, headers, method, body);
+                _executor.invokeV8("executeRequest", url, headers, method, body);
             } as V8Value;
 
             try {
@@ -110,7 +112,7 @@ class JSRequestExecutor {
                         "[${_config.name}] JSRequestExecutor",
                         "builder.modifyRequest()"
                     ) {
-                        _executor.invokeVoid("cleanup", null);
+                        _executor.invokeV8("cleanup", null);
                     };
                 }
             else V8Plugin.catchScriptErrors<Any>(
@@ -118,7 +120,7 @@ class JSRequestExecutor {
                 "[${_config.name}] JSRequestExecutor",
                 "builder.modifyRequest()"
             ) {
-                _executor.invokeVoid("cleanup", null);
+                _executor.invokeV8("cleanup", null);
             };
         }
     }

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSRequestModifier.kt

@@ -11,6 +11,8 @@ import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
 import com.futo.platformplayer.getOrDefault
 import com.futo.platformplayer.getOrNull
 import com.futo.platformplayer.getOrThrow
+import com.futo.platformplayer.invokeV8
+import com.futo.platformplayer.invokeV8Void
 
 class JSRequestModifier: IRequestModifier {
     private val _plugin: JSClient;
@@ -40,7 +42,7 @@ class JSRequestModifier: IRequestModifier {
 
         return _plugin.busy {
             val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSRequestModifier", "builder.modifyRequest()") {
-                _modifier.invoke("modifyRequest", url, headers);
+                _modifier.invokeV8("modifyRequest", url, headers);
             } as V8ValueObject;
 
             val req = JSRequest(_plugin, result, url, headers);

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSSubtitleSource.kt

@@ -7,6 +7,7 @@ import com.futo.platformplayer.api.media.models.subtitles.ISubtitleSource
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.getSourcePlugin
+import com.futo.platformplayer.invokeV8
 import com.futo.platformplayer.states.StateApp
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -38,7 +39,7 @@ class JSSubtitleSource : ISubtitleSource {
             throw IllegalStateException("This subtitle doesn't support getSubtitles..");
 
         return _obj.getSourcePlugin()?.busy {
-            val v8String = _obj.invoke<V8ValueString>("getSubtitles", arrayOf<Any>());
+            val v8String = _obj.invokeV8<V8ValueString>("getSubtitles", arrayOf<Any>());
             return@busy v8String.value;
         } ?: "";
     }

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSVideoDetails.kt

@@ -24,6 +24,7 @@ import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.getOrDefault
 import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.getOrThrowNullable
+import com.futo.platformplayer.invokeV8
 import com.futo.platformplayer.states.StateDeveloper
 
 class JSVideoDetails : JSVideo, IPlatformVideoDetails {
@@ -86,7 +87,7 @@ class JSVideoDetails : JSVideo, IPlatformVideoDetails {
     private fun getPlaybackTrackerJS(): IPlaybackTracker? {
         return _plugin.busy {
             V8Plugin.catchScriptErrors(_pluginConfig, "VideoDetails", "videoDetails.getPlaybackTracker()") {
-                val tracker = _content.invoke<V8Value>("getPlaybackTracker", arrayOf<Any>())
+                val tracker = _content.invokeV8<V8Value>("getPlaybackTracker", arrayOf<Any>())
                     ?: return@catchScriptErrors null;
                 if(tracker is V8ValueObject)
                     return@catchScriptErrors JSPlaybackTracker(_plugin, tracker);
@@ -111,7 +112,7 @@ class JSVideoDetails : JSVideo, IPlatformVideoDetails {
     }
     private fun getContentRecommendationsJS(client: JSClient): JSContentPager {
         return _plugin.busy {
-            val contentPager = _content.invoke<V8ValueObject>("getContentRecommendations", arrayOf<Any>());
+            val contentPager = _content.invokeV8<V8ValueObject>("getContentRecommendations", arrayOf<Any>());
             return@busy JSContentPager(_pluginConfig, client, contentPager);
         }
     }
@@ -130,7 +131,7 @@ class JSVideoDetails : JSVideo, IPlatformVideoDetails {
 
     private fun getCommentsJS(client: JSClient): IPager<IPlatformComment>? {
         return _plugin.busy {
-            val commentPager = _content.invoke<V8Value>("getComments", arrayOf<Any>());
+            val commentPager = _content.invokeV8<V8Value>("getComments", arrayOf<Any>());
             if (commentPager !is V8ValueObject) //TODO: Maybe handle this better?
                 return@busy null;
 

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/sources/JSAudioUrlWidevineSource.kt

@@ -6,6 +6,8 @@ import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.models.JSRequestExecutor
 import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.getOrThrow
+import com.futo.platformplayer.invokeV8
+import com.futo.platformplayer.invokeV8Void
 
 class JSAudioUrlWidevineSource : JSAudioUrlSource, IAudioUrlWidevineSource {
     override val licenseUri: String
@@ -25,7 +27,7 @@ class JSAudioUrlWidevineSource : JSAudioUrlSource, IAudioUrlWidevineSource {
             return null
 
         val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSAudioUrlWidevineSource", "obj.getLicenseRequestExecutor()") {
-            _obj.invoke("getLicenseRequestExecutor", arrayOf<Any>())
+            _obj.invokeV8("getLicenseRequestExecutor", arrayOf<Any>())
         }
 
         if (result !is V8ValueObject)

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/sources/JSDashManifestRawAudioSource.kt

@@ -1,6 +1,8 @@
 package com.futo.platformplayer.api.media.platforms.js.models.sources
 
+import com.caoccao.javet.values.primitive.V8ValueString
 import com.caoccao.javet.values.reference.V8ValueObject
+import com.futo.platformplayer.V8Deferred
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
 import com.futo.platformplayer.api.media.models.streams.sources.IDashManifestSource
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoUrlSource
@@ -13,8 +15,13 @@ import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.getOrDefault
 import com.futo.platformplayer.getOrNull
 import com.futo.platformplayer.getOrThrow
+import com.futo.platformplayer.invokeV8
+import com.futo.platformplayer.invokeV8Async
 import com.futo.platformplayer.others.Language
 import com.futo.platformplayer.states.StateDeveloper
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
 
 class JSDashManifestRawAudioSource : JSSource, IAudioSource, IJSDashManifestRawSource, IStreamMetaDataSource {
     override val container : String;
@@ -50,6 +57,44 @@ class JSDashManifestRawAudioSource : JSSource, IAudioSource, IJSDashManifestRawS
         hasGenerate = _obj.has("generate");
     }
 
+    override fun generateAsync(scope: CoroutineScope): V8Deferred<String?> {
+        if(!hasGenerate)
+            return V8Deferred(CompletableDeferred(manifest));
+        if(_obj.isClosed)
+            throw IllegalStateException("Source object already closed");
+
+        val plugin = _plugin.getUnderlyingPlugin();
+
+        var result: V8Deferred<V8ValueString>? = null;
+        if(_plugin is DevJSClient)
+            result = StateDeveloper.instance.handleDevCall(_plugin.devID, "DashManifestRaw", false) {
+                _plugin.getUnderlyingPlugin().catchScriptErrors("DashManifestRaw", "dashManifestRaw.generate()") {
+                    _plugin.isBusyWith("dashAudio.generate") {
+                        _obj.invokeV8Async<V8ValueString>("generate");
+                    }
+                }
+            }
+        else
+            result = _plugin.getUnderlyingPlugin().catchScriptErrors("DashManifestRaw", "dashManifestRaw.generate()") {
+                _plugin.isBusyWith("dashAudio.generate") {
+                    _obj.invokeV8Async<V8ValueString>("generate");
+                }
+            }
+
+        return plugin.busy {
+            val initStart = _obj.getOrDefault<Int>(_config, "initStart", "JSDashManifestRawSource", null) ?: 0;
+            val initEnd = _obj.getOrDefault<Int>(_config, "initEnd", "JSDashManifestRawSource", null) ?: 0;
+            val indexStart = _obj.getOrDefault<Int>(_config, "indexStart", "JSDashManifestRawSource", null) ?: 0;
+            val indexEnd = _obj.getOrDefault<Int>(_config, "indexEnd", "JSDashManifestRawSource", null) ?: 0;
+            if(initEnd > 0 && indexStart > 0 && indexEnd > 0) {
+                streamMetaData = StreamMetaData(initStart, initEnd, indexStart, indexEnd);
+            }
+
+            return@busy result.convert {
+                it.value
+            };
+        }
+    }
     override fun generate(): String? {
         if(!hasGenerate)
             return manifest;
@@ -63,14 +108,14 @@ class JSDashManifestRawAudioSource : JSSource, IAudioSource, IJSDashManifestRawS
             result = StateDeveloper.instance.handleDevCall(_plugin.devID, "DashManifestRaw", false) {
                 _plugin.getUnderlyingPlugin().catchScriptErrors("DashManifestRaw", "dashManifestRaw.generate()") {
                     _plugin.isBusyWith("dashAudio.generate") {
-                        _obj.invokeString("generate");
+                        _obj.invokeV8<V8ValueString>("generate").value;
                     }
                 }
             }
         else
             result = _plugin.getUnderlyingPlugin().catchScriptErrors("DashManifestRaw", "dashManifestRaw.generate()") {
                 _plugin.isBusyWith("dashAudio.generate") {
-                    _obj.invokeString("generate");
+                    _obj.invokeV8<V8ValueString>("generate").value;
                 }
             }
 

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/sources/JSDashManifestRawSource.kt

@@ -3,6 +3,7 @@ package com.futo.platformplayer.api.media.platforms.js.models.sources
 import com.caoccao.javet.values.V8Value
 import com.caoccao.javet.values.primitive.V8ValueString
 import com.caoccao.javet.values.reference.V8ValueObject
+import com.futo.platformplayer.V8Deferred
 import com.futo.platformplayer.api.media.models.streams.sources.IDashManifestSource
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoUrlSource
@@ -15,11 +16,18 @@ import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.getOrDefault
 import com.futo.platformplayer.getOrNull
 import com.futo.platformplayer.getOrThrow
+import com.futo.platformplayer.invokeV8
+import com.futo.platformplayer.invokeV8Async
 import com.futo.platformplayer.states.StateDeveloper
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.async
 
 interface IJSDashManifestRawSource {
     val hasGenerate: Boolean;
     var manifest: String?;
+    fun generateAsync(scope: CoroutineScope): Deferred<String?>;
     fun generate(): String?;
 }
 open class JSDashManifestRawSource: JSSource, IVideoSource, IJSDashManifestRawSource, IStreamMetaDataSource {
@@ -57,6 +65,45 @@ open class JSDashManifestRawSource: JSSource, IVideoSource, IJSDashManifestRawSo
         hasGenerate = _obj.has("generate");
     }
 
+    override fun generateAsync(scope: CoroutineScope): V8Deferred<String?> {
+        if(!hasGenerate)
+            return V8Deferred(CompletableDeferred(manifest));
+        if(_obj.isClosed)
+            throw IllegalStateException("Source object already closed");
+
+        val plugin = _plugin.getUnderlyingPlugin();
+
+        var result: V8Deferred<V8ValueString>? = null;
+        if(_plugin is DevJSClient) {
+            result = StateDeveloper.instance.handleDevCall(_plugin.devID, "DashManifestRawSource.generate()") {
+                _plugin.getUnderlyingPlugin().catchScriptErrors("DashManifestRaw.generate", "generate()", {
+                    _plugin.isBusyWith("dashVideo.generate") {
+                        _obj.invokeV8Async<V8ValueString>("generate");
+                    }
+                });
+            }
+        }
+        else
+            result = _plugin.getUnderlyingPlugin().catchScriptErrors("DashManifestRaw.generate", "generate()", {
+                _plugin.isBusyWith("dashVideo.generate") {
+                    _obj.invokeV8Async<V8ValueString>("generate");
+                }
+            });
+
+        return plugin.busy {
+            val initStart = _obj.getOrDefault<Int>(_config, "initStart", "JSDashManifestRawSource", null) ?: 0;
+            val initEnd = _obj.getOrDefault<Int>(_config, "initEnd", "JSDashManifestRawSource", null) ?: 0;
+            val indexStart = _obj.getOrDefault<Int>(_config, "indexStart", "JSDashManifestRawSource", null) ?: 0;
+            val indexEnd = _obj.getOrDefault<Int>(_config, "indexEnd", "JSDashManifestRawSource", null) ?: 0;
+            if(initEnd > 0 && indexStart > 0 && indexEnd > 0) {
+                streamMetaData = StreamMetaData(initStart, initEnd, indexStart, indexEnd);
+            }
+
+            return@busy result.convert {
+                it.value
+            };
+        }
+    }
     override open fun generate(): String? {
         if(!hasGenerate)
             return manifest;
@@ -68,7 +115,7 @@ open class JSDashManifestRawSource: JSSource, IVideoSource, IJSDashManifestRawSo
             result = StateDeveloper.instance.handleDevCall(_plugin.devID, "DashManifestRawSource.generate()") {
                 _plugin.getUnderlyingPlugin().catchScriptErrors("DashManifestRaw.generate", "generate()", {
                     _plugin.isBusyWith("dashVideo.generate") {
-                        _obj.invokeString("generate");
+                        _obj.invokeV8<V8ValueString>("generate").value;
                     }
                 });
             }
@@ -76,7 +123,7 @@ open class JSDashManifestRawSource: JSSource, IVideoSource, IJSDashManifestRawSo
         else
             result = _plugin.getUnderlyingPlugin().catchScriptErrors("DashManifestRaw.generate", "generate()", {
                 _plugin.isBusyWith("dashVideo.generate") {
-                    _obj.invokeString("generate");
+                    _obj.invokeV8<V8ValueString>("generate").value;
                 }
             });
 
@@ -116,6 +163,32 @@ class JSDashManifestMergingRawSource(
     override val priority: Boolean
         get() = video.priority;
 
+    override fun generateAsync(scope: CoroutineScope): V8Deferred<String?> {
+        val videoDashDef = video.generateAsync(scope);
+        val audioDashDef = audio.generateAsync(scope);
+
+        return V8Deferred.merge(scope, listOf(videoDashDef, audioDashDef)) {
+            val (videoDash: String?, audioDash: String?) = it;
+
+            if (videoDash != null && audioDash == null) return@merge videoDash;
+            if (audioDash != null && videoDash == null) return@merge audioDash;
+            if (videoDash == null) return@merge null;
+
+            //TODO: Temporary simple solution..make more reliable version
+
+            var result: String? = null;
+            val audioAdaptationSet = adaptationSetRegex.find(audioDash!!);
+            if (audioAdaptationSet != null) {
+                result = videoDash.replace(
+                    "</AdaptationSet>",
+                    "</AdaptationSet>\n" + audioAdaptationSet.value
+                )
+            } else
+                result = videoDash;
+
+            return@merge result;
+        };
+    }
     override fun generate(): String? {
         val videoDash = video.generate();
         val audioDash = audio.generate();

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/sources/JSDashManifestWidevineSource.kt

@@ -9,6 +9,8 @@ import com.futo.platformplayer.api.media.platforms.js.models.JSRequestExecutor
 import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.getOrNull
 import com.futo.platformplayer.getOrThrow
+import com.futo.platformplayer.invokeV8
+import com.futo.platformplayer.invokeV8Void
 
 class JSDashManifestWidevineSource : IVideoUrlSource, IDashManifestSource,
     IDashManifestWidevineSource, JSSource {
@@ -45,7 +47,7 @@ class JSDashManifestWidevineSource : IVideoUrlSource, IDashManifestSource,
             return null
 
         val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSDashManifestWidevineSource", "obj.getLicenseRequestExecutor()") {
-            _obj.invoke("getLicenseRequestExecutor", arrayOf<Any>())
+            _obj.invokeV8("getLicenseRequestExecutor", arrayOf<Any>())
         }
 
         if (result !is V8ValueObject)

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/sources/JSSource.kt

@@ -16,6 +16,7 @@ import com.futo.platformplayer.engine.IV8PluginConfig
 import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.ensureIsBusy
 import com.futo.platformplayer.getOrDefault
+import com.futo.platformplayer.invokeV8
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.orNull
 import com.futo.platformplayer.views.video.datasources.JSHttpDataSource
@@ -64,7 +65,7 @@ abstract class JSSource {
             return@isBusyWith null;
 
         val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSVideoUrlSource", "obj.getRequestModifier()") {
-            _obj.invoke("getRequestModifier", arrayOf<Any>());
+            _obj.invokeV8("getRequestModifier", arrayOf<Any>());
         };
 
         if (result !is V8ValueObject)
@@ -78,7 +79,7 @@ abstract class JSSource {
 
         Logger.v("JSSource", "Request executor for [${type}] requesting");
         val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSSource", "obj.getRequestExecutor()") {
-            _obj.invoke("getRequestExecutor", arrayOf<Any>());
+            _obj.invokeV8("getRequestExecutor", arrayOf<Any>());
         };
 
         Logger.v("JSSource", "Request executor for [${type}] received");

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/sources/JSVideoUrlWidevineSource.kt

@@ -6,6 +6,7 @@ import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.models.JSRequestExecutor
 import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.getOrThrow
+import com.futo.platformplayer.invokeV8
 
 class JSVideoUrlWidevineSource : JSVideoUrlSource, IVideoUrlWidevineSource {
     override val licenseUri: String
@@ -25,7 +26,7 @@ class JSVideoUrlWidevineSource : JSVideoUrlSource, IVideoUrlWidevineSource {
             return null
 
         val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSAudioUrlWidevineSource", "obj.getLicenseRequestExecutor()") {
-            _obj.invoke("getLicenseRequestExecutor", arrayOf<Any>())
+            _obj.invokeV8("getLicenseRequestExecutor", arrayOf<Any>())
         }
 
         if (result !is V8ValueObject)

app/src/main/java/com/futo/platformplayer/casting/StateCasting.kt

@@ -64,6 +64,7 @@ import java.net.URLDecoder
 import java.net.URLEncoder
 import java.util.Collections
 import java.util.UUID
+import java.util.concurrent.atomic.AtomicInteger
 
 class StateCasting {
     private val _scopeIO = CoroutineScope(Dispatchers.IO);
@@ -89,6 +90,7 @@ class StateCasting {
     var _resumeCastingDevice: CastingDeviceInfo? = null;
     private var _nsdManager: NsdManager? = null
     val isCasting: Boolean get() = activeDevice != null;
+    private val _castId = AtomicInteger(0)
 
     private val _discoveryListeners = mapOf(
         "_googlecast._tcp" to createDiscoveryListener(::addOrUpdateChromeCastDevice),
@@ -432,129 +434,112 @@ class StateCasting {
         action();
     }
 
-    fun castIfAvailable(contentResolver: ContentResolver, video: IPlatformVideoDetails, videoSource: IVideoSource?, audioSource: IAudioSource?, subtitleSource: ISubtitleSource?, ms: Long = -1, speed: Double?): Boolean {
-        val ad = activeDevice ?: return false;
-        if (ad.connectionState != CastConnectionState.CONNECTED) {
-            return false;
-        }
+    fun cancel() {
+        _castId.incrementAndGet()
+    }
 
-        val resumePosition = if (ms > 0L) (ms.toDouble() / 1000.0) else 0.0;
+    suspend fun castIfAvailable(contentResolver: ContentResolver, video: IPlatformVideoDetails, videoSource: IVideoSource?, audioSource: IAudioSource?, subtitleSource: ISubtitleSource?, ms: Long = -1, speed: Double?, onLoadingEstimate: ((Int) -> Unit)? = null, onLoading: ((Boolean) -> Unit)? = null): Boolean {
+        return withContext(Dispatchers.IO) {
+            val ad = activeDevice ?: return@withContext false;
+            if (ad.connectionState != CastConnectionState.CONNECTED) {
+                return@withContext false;
+            }
 
-        var sourceCount = 0;
-        if (videoSource != null) sourceCount++;
-        if (audioSource != null) sourceCount++;
-        if (subtitleSource != null) sourceCount++;
+            val resumePosition = if (ms > 0L) (ms.toDouble() / 1000.0) else 0.0;
+            val castId = _castId.incrementAndGet()
 
-        if (sourceCount < 1) {
-            throw Exception("At least one source should be specified.");
-        }
+            var sourceCount = 0;
+            if (videoSource != null) sourceCount++;
+            if (audioSource != null) sourceCount++;
+            if (subtitleSource != null) sourceCount++;
 
-        if (sourceCount > 1) {
-            if (videoSource is LocalVideoSource || audioSource is LocalAudioSource || subtitleSource is LocalSubtitleSource) {
-                if (ad is AirPlayCastingDevice) {
-                    Logger.i(TAG, "Casting as local HLS");
-                    castLocalHls(video, videoSource as LocalVideoSource?, audioSource as LocalAudioSource?, subtitleSource as LocalSubtitleSource?, resumePosition, speed);
+            if (sourceCount < 1) {
+                throw Exception("At least one source should be specified.");
+            }
+
+            if (sourceCount > 1) {
+                if (videoSource is LocalVideoSource || audioSource is LocalAudioSource || subtitleSource is LocalSubtitleSource) {
+                    if (ad is AirPlayCastingDevice) {
+                        Logger.i(TAG, "Casting as local HLS");
+                        castLocalHls(video, videoSource as LocalVideoSource?, audioSource as LocalAudioSource?, subtitleSource as LocalSubtitleSource?, resumePosition, speed);
+                    } else {
+                        Logger.i(TAG, "Casting as local DASH");
+                        castLocalDash(video, videoSource as LocalVideoSource?, audioSource as LocalAudioSource?, subtitleSource as LocalSubtitleSource?, resumePosition, speed);
+                    }
                 } else {
-                    Logger.i(TAG, "Casting as local DASH");
-                    castLocalDash(video, videoSource as LocalVideoSource?, audioSource as LocalAudioSource?, subtitleSource as LocalSubtitleSource?, resumePosition, speed);
-                }
-            } else {
-                StateApp.instance.scope.launch(Dispatchers.IO) {
-                    try {
-                        val isRawDash = videoSource is JSDashManifestRawSource || audioSource is JSDashManifestRawAudioSource
-                        if (isRawDash) {
-                            Logger.i(TAG, "Casting as raw DASH");
+                    val isRawDash = videoSource is JSDashManifestRawSource || audioSource is JSDashManifestRawAudioSource
+                    if (isRawDash) {
+                        Logger.i(TAG, "Casting as raw DASH");
 
-                            try {
-                                castDashRaw(contentResolver, video, videoSource as JSDashManifestRawSource?, audioSource as JSDashManifestRawAudioSource?, subtitleSource, resumePosition, speed);
-                            } catch (e: Throwable) {
-                                Logger.e(TAG, "Failed to start casting DASH raw videoSource=${videoSource} audioSource=${audioSource}.", e);
-                            }
+                        castDashRaw(contentResolver, video, videoSource as JSDashManifestRawSource?, audioSource as JSDashManifestRawAudioSource?, subtitleSource, resumePosition, speed, castId, onLoadingEstimate, onLoading);
+                    } else {
+                        if (ad is FCastCastingDevice) {
+                            Logger.i(TAG, "Casting as DASH direct");
+                            castDashDirect(contentResolver, video, videoSource as IVideoUrlSource?, audioSource as IAudioUrlSource?, subtitleSource, resumePosition, speed);
+                        } else if (ad is AirPlayCastingDevice) {
+                            Logger.i(TAG, "Casting as HLS indirect");
+                            castHlsIndirect(contentResolver, video, videoSource as IVideoUrlSource?, audioSource as IAudioUrlSource?, subtitleSource, resumePosition, speed);
                         } else {
-                            if (ad is FCastCastingDevice) {
-                                Logger.i(TAG, "Casting as DASH direct");
-                                castDashDirect(contentResolver, video, videoSource as IVideoUrlSource?, audioSource as IAudioUrlSource?, subtitleSource, resumePosition, speed);
-                            } else if (ad is AirPlayCastingDevice) {
-                                Logger.i(TAG, "Casting as HLS indirect");
-                                castHlsIndirect(contentResolver, video, videoSource as IVideoUrlSource?, audioSource as IAudioUrlSource?, subtitleSource, resumePosition, speed);
-                            } else {
-                                Logger.i(TAG, "Casting as DASH indirect");
-                                castDashIndirect(contentResolver, video, videoSource as IVideoUrlSource?, audioSource as IAudioUrlSource?, subtitleSource, resumePosition, speed);
-                            }
+                            Logger.i(TAG, "Casting as DASH indirect");
+                            castDashIndirect(contentResolver, video, videoSource as IVideoUrlSource?, audioSource as IAudioUrlSource?, subtitleSource, resumePosition, speed);
                         }
-                    } catch (e: Throwable) {
-                        Logger.e(TAG, "Failed to start casting DASH videoSource=${videoSource} audioSource=${audioSource}.", e);
-                    }
-                }
-            }
-        } else {
-            val proxyStreams = Settings.instance.casting.alwaysProxyRequests;
-            val url = getLocalUrl(ad);
-            val id = UUID.randomUUID();
-
-            if (videoSource is IVideoUrlSource) {
-                val videoPath = "/video-${id}"
-                val videoUrl = if(proxyStreams) url + videoPath else videoSource.getVideoUrl();
-                Logger.i(TAG, "Casting as singular video");
-                ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", videoSource.container, videoUrl, resumePosition, video.duration.toDouble(), speed);
-            } else if (audioSource is IAudioUrlSource) {
-                val audioPath = "/audio-${id}"
-                val audioUrl = if(proxyStreams) url + audioPath else audioSource.getAudioUrl();
-                Logger.i(TAG, "Casting as singular audio");
-                ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", audioSource.container, audioUrl, resumePosition, video.duration.toDouble(), speed);
-            } else if(videoSource is IHLSManifestSource) {
-                if (proxyStreams || ad is ChromecastCastingDevice) {
-                    Logger.i(TAG, "Casting as proxied HLS");
-                    castProxiedHls(video, videoSource.url, videoSource.codec, resumePosition, speed);
-                } else {
-                    Logger.i(TAG, "Casting as non-proxied HLS");
-                    ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", videoSource.container, videoSource.url, resumePosition, video.duration.toDouble(), speed);
-                }
-            } else if(audioSource is IHLSManifestAudioSource) {
-                if (proxyStreams || ad is ChromecastCastingDevice) {
-                    Logger.i(TAG, "Casting as proxied audio HLS");
-                    castProxiedHls(video, audioSource.url, audioSource.codec, resumePosition, speed);
-                } else {
-                    Logger.i(TAG, "Casting as non-proxied audio HLS");
-                    ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", audioSource.container, audioSource.url, resumePosition, video.duration.toDouble(), speed);
-                }
-            } else if (videoSource is LocalVideoSource) {
-                Logger.i(TAG, "Casting as local video");
-                castLocalVideo(video, videoSource, resumePosition, speed);
-            } else if (audioSource is LocalAudioSource) {
-                Logger.i(TAG, "Casting as local audio");
-                castLocalAudio(video, audioSource, resumePosition, speed);
-            } else if (videoSource is JSDashManifestRawSource) {
-                Logger.i(TAG, "Casting as JSDashManifestRawSource video");
-
-                StateApp.instance.scope.launch(Dispatchers.IO) {
-                    try {
-                        castDashRaw(contentResolver, video, videoSource as JSDashManifestRawSource?, null, null, resumePosition, speed);
-                    } catch (e: Throwable) {
-                        Logger.e(TAG, "Failed to start casting DASH raw videoSource=${videoSource}.", e);
-                    }
-                }
-            } else if (audioSource is JSDashManifestRawAudioSource) {
-                Logger.i(TAG, "Casting as JSDashManifestRawSource audio");
-
-                StateApp.instance.scope.launch(Dispatchers.IO) {
-                    try {
-                        castDashRaw(contentResolver, video, null, audioSource as JSDashManifestRawAudioSource?, null, resumePosition, speed);
-                    } catch (e: Throwable) {
-                        Logger.e(TAG, "Failed to start casting DASH raw audioSource=${audioSource}.", e);
                     }
                 }
             } else {
-                var str = listOf(
-                    if(videoSource != null) "Video: ${videoSource::class.java.simpleName}" else null,
-                    if(audioSource != null) "Audio: ${audioSource::class.java.simpleName}" else null,
-                    if(subtitleSource != null) "Subtitles: ${subtitleSource::class.java.simpleName}" else null
-                ).filterNotNull().joinToString(", ");
-                throw UnsupportedCastException(str);
-            }
-        }
+                val proxyStreams = Settings.instance.casting.alwaysProxyRequests;
+                val url = getLocalUrl(ad);
+                val id = UUID.randomUUID();
 
-        return true;
+                if (videoSource is IVideoUrlSource) {
+                    val videoPath = "/video-${id}"
+                    val videoUrl = if(proxyStreams) url + videoPath else videoSource.getVideoUrl();
+                    Logger.i(TAG, "Casting as singular video");
+                    ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", videoSource.container, videoUrl, resumePosition, video.duration.toDouble(), speed);
+                } else if (audioSource is IAudioUrlSource) {
+                    val audioPath = "/audio-${id}"
+                    val audioUrl = if(proxyStreams) url + audioPath else audioSource.getAudioUrl();
+                    Logger.i(TAG, "Casting as singular audio");
+                    ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", audioSource.container, audioUrl, resumePosition, video.duration.toDouble(), speed);
+                } else if(videoSource is IHLSManifestSource) {
+                    if (proxyStreams || ad is ChromecastCastingDevice) {
+                        Logger.i(TAG, "Casting as proxied HLS");
+                        castProxiedHls(video, videoSource.url, videoSource.codec, resumePosition, speed);
+                    } else {
+                        Logger.i(TAG, "Casting as non-proxied HLS");
+                        ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", videoSource.container, videoSource.url, resumePosition, video.duration.toDouble(), speed);
+                    }
+                } else if(audioSource is IHLSManifestAudioSource) {
+                    if (proxyStreams || ad is ChromecastCastingDevice) {
+                        Logger.i(TAG, "Casting as proxied audio HLS");
+                        castProxiedHls(video, audioSource.url, audioSource.codec, resumePosition, speed);
+                    } else {
+                        Logger.i(TAG, "Casting as non-proxied audio HLS");
+                        ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", audioSource.container, audioSource.url, resumePosition, video.duration.toDouble(), speed);
+                    }
+                } else if (videoSource is LocalVideoSource) {
+                    Logger.i(TAG, "Casting as local video");
+                    castLocalVideo(video, videoSource, resumePosition, speed);
+                } else if (audioSource is LocalAudioSource) {
+                    Logger.i(TAG, "Casting as local audio");
+                    castLocalAudio(video, audioSource, resumePosition, speed);
+                } else if (videoSource is JSDashManifestRawSource) {
+                    Logger.i(TAG, "Casting as JSDashManifestRawSource video");
+                    castDashRaw(contentResolver, video, videoSource as JSDashManifestRawSource?, null, null, resumePosition, speed, castId, onLoadingEstimate, onLoading);
+                } else if (audioSource is JSDashManifestRawAudioSource) {
+                    Logger.i(TAG, "Casting as JSDashManifestRawSource audio");
+                    castDashRaw(contentResolver, video, null, audioSource as JSDashManifestRawAudioSource?, null, resumePosition, speed, castId, onLoadingEstimate, onLoading);
+                } else {
+                    var str = listOf(
+                        if(videoSource != null) "Video: ${videoSource::class.java.simpleName}" else null,
+                        if(audioSource != null) "Audio: ${audioSource::class.java.simpleName}" else null,
+                        if(subtitleSource != null) "Subtitles: ${subtitleSource::class.java.simpleName}" else null
+                    ).filterNotNull().joinToString(", ");
+                    throw UnsupportedCastException(str);
+                }
+            }
+
+            return@withContext true;
+        }
     }
 
     fun resumeVideo(): Boolean {
@@ -1236,7 +1221,7 @@ class StateCasting {
     }
 
     @OptIn(UnstableApi::class)
-    private suspend fun castDashRaw(contentResolver: ContentResolver, video: IPlatformVideoDetails, videoSource: JSDashManifestRawSource?, audioSource: JSDashManifestRawAudioSource?, subtitleSource: ISubtitleSource?, resumePosition: Double, speed: Double?) : List<String> {
+    private suspend fun castDashRaw(contentResolver: ContentResolver, video: IPlatformVideoDetails, videoSource: JSDashManifestRawSource?, audioSource: JSDashManifestRawAudioSource?, subtitleSource: ISubtitleSource?, resumePosition: Double, speed: Double?, castId: Int, onLoadingEstimate: ((Int) -> Unit)? = null, onLoading: ((Boolean) -> Unit)? = null) : List<String> {
         val ad = activeDevice ?: return listOf();
 
         cleanExecutors()
@@ -1283,20 +1268,48 @@ class StateCasting {
             }
         }
 
-        var dashContent = withContext(Dispatchers.IO) {
+        var dashContent: String = withContext(Dispatchers.IO) {
+            stopVideo()
+
             //TODO: Include subtitlesURl in the future
-            return@withContext if (audioSource != null && videoSource != null) {
-                JSDashManifestMergingRawSource(videoSource, audioSource).generate()
+            val deferred = if (audioSource != null && videoSource != null) {
+                JSDashManifestMergingRawSource(videoSource, audioSource).generateAsync(_scopeIO)
             } else if (audioSource != null) {
-                audioSource.generate()
+                audioSource.generateAsync(_scopeIO)
             } else if (videoSource != null) {
-                videoSource.generate()
+                videoSource.generateAsync(_scopeIO)
             } else {
                 Logger.e(TAG, "Expected at least audio or video to be set")
                 null
             }
+
+            if (deferred != null) {
+                try {
+                    withContext(Dispatchers.Main) {
+                        if (deferred.estDuration >= 0) {
+                            onLoadingEstimate?.invoke(deferred.estDuration)
+                        } else {
+                            onLoading?.invoke(true)
+                        }
+                    }
+                    deferred.await()
+                } finally {
+                    if (castId == _castId.get()) {
+                        withContext(Dispatchers.Main) {
+                            onLoading?.invoke(false)
+                        }
+                    }
+                }
+            } else {
+                return@withContext null
+            }
         } ?: throw Exception("Dash is null")
 
+        if (castId != _castId.get()) {
+            Log.i(TAG, "Get DASH cancelled.")
+            return emptyList()
+        }
+
         for (representation in representationRegex.findAll(dashContent)) {
             val mediaType = representation.groups[1]?.value ?: throw Exception("Media type should be found")
             dashContent = mediaInitializationRegex.replace(dashContent) {

app/src/main/java/com/futo/platformplayer/engine/V8Plugin.kt

@@ -10,7 +10,9 @@ import com.caoccao.javet.values.V8Value
 import com.caoccao.javet.values.primitive.V8ValueBoolean
 import com.caoccao.javet.values.primitive.V8ValueInteger
 import com.caoccao.javet.values.primitive.V8ValueString
+import com.caoccao.javet.values.reference.IV8ValuePromise
 import com.caoccao.javet.values.reference.V8ValueObject
+import com.caoccao.javet.values.reference.V8ValuePromise
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.platforms.js.internal.JSHttpClient
 import com.futo.platformplayer.constructs.Event1
@@ -37,7 +39,15 @@ import com.futo.platformplayer.engine.packages.V8Package
 import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateAssets
+import com.futo.platformplayer.toList
+import com.futo.platformplayer.toV8ValueBlocking
+import com.futo.platformplayer.toV8ValueAsync
 import com.futo.platformplayer.warnIfMainThread
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.Dispatchers.IO
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.withContext
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.locks.ReentrantLock
 import kotlin.concurrent.withLock
@@ -48,6 +58,7 @@ class V8Plugin {
     private val _clientAuth: ManagedHttpClient;
     private val _clientOthers: ConcurrentHashMap<String, JSHttpClient> = ConcurrentHashMap();
 
+    private val _promises = ConcurrentHashMap<V8ValuePromise, ((V8ValuePromise)->Unit)?>();
 
     val httpClient: ManagedHttpClient get() = _client;
     val httpClientAuth: ManagedHttpClient get() = _clientAuth;
@@ -223,37 +234,144 @@ class V8Plugin {
             Logger.i(TAG, "Plugin stopped");
             onStopped.emit(this);
         }
+        cancelAllPromises();
     }
 
     fun isThreadAlreadyBusy(): Boolean {
         return _busyLock.isHeldByCurrentThread;
     }
     fun <T> busy(handle: ()->T): T {
+        _busyLock.lock();
+        try {
+            return handle();
+        }
+        finally {
+            _busyLock.unlock();
+        }
+        /*
         _busyLock.withLock {
             //Logger.i(TAG, "Entered busy: " + Thread.currentThread().stackTrace.drop(3)?.firstOrNull()?.toString() + ", " + Thread.currentThread().stackTrace.drop(4)?.firstOrNull()?.toString());
             return handle();
+        }*/
+    }
+    fun <T> unbusy(handle: ()->T): T {
+        val wasLocked = isThreadAlreadyBusy();
+        if(!wasLocked)
+            return handle();
+        val lockCount = _busyLock.holdCount;
+        for(i in 1..lockCount)
+            _busyLock.unlock();
+        try {
+            Logger.w(TAG, "Unlocking V8 thread for [${config.name}] for a blocking resolve of a promise")
+            return handle();
+        }
+        finally {
+            Logger.w(TAG, "Relocking V8 thread for [${config.name}] for a blocking resolve of a promise")
+
+            for(i in 1..lockCount)
+                _busyLock.lock();
         }
     }
     fun execute(js: String) : V8Value {
         return executeTyped<V8Value>(js);
     }
+
+    suspend fun <T : V8Value> executeTypedAsync(js: String) : Deferred<T> {
+        warnIfMainThread("V8Plugin.executeTypedAsync");
+        if(isStopped)
+            throw PluginEngineStoppedException(config, "Instance is stopped", js);
+
+        return withContext(IO) {
+            return@withContext busy {
+                try {
+                    val runtime = _runtime ?: throw IllegalStateException("JSPlugin not started yet");
+                    val result = catchScriptErrors<V8Value>("Plugin[${config.name}]", js) {
+                        runtime.getExecutor(js).execute()
+                    };
+
+                    if (result is V8ValuePromise) {
+                        return@busy result.toV8ValueAsync<T>(this@V8Plugin);
+                    } else
+                        return@busy CompletableDeferred(result as T);
+                }
+                catch(ex: Throwable) {
+                    val def = CompletableDeferred<T>();
+                    def.completeExceptionally(ex);
+                    return@busy def;
+                }
+            }
+        }
+    }
     fun <T : V8Value> executeTyped(js: String) : T {
         warnIfMainThread("V8Plugin.executeTyped");
         if(isStopped)
             throw PluginEngineStoppedException(config, "Instance is stopped", js);
 
-        return busy {
-
+        val result = busy {
             val runtime = _runtime ?: throw IllegalStateException("JSPlugin not started yet");
-            return@busy catchScriptErrors("Plugin[${config.name}]", js) {
+            return@busy catchScriptErrors<V8Value>("Plugin[${config.name}]", js) {
                 runtime.getExecutor(js).execute()
             };
+        };
+        if(result is V8ValuePromise) {
+            return result.toV8ValueBlocking(this@V8Plugin);
         }
+        return result as T;
     }
     fun executeBoolean(js: String) : Boolean? = busy { catchScriptErrors("Plugin[${config.name}]") { executeTyped<V8ValueBoolean>(js).value } }
     fun executeString(js: String) : String? = busy { catchScriptErrors("Plugin[${config.name}]") { executeTyped<V8ValueString>(js).value } }
     fun executeInteger(js: String) : Int? = busy { catchScriptErrors("Plugin[${config.name}]") { executeTyped<V8ValueInteger>(js).value } }
 
+
+    fun <T: V8Value> handlePromise(result: V8ValuePromise): CompletableDeferred<T> {
+        val def = CompletableDeferred<T>();
+        result.register(object: IV8ValuePromise.IListener {
+            override fun onFulfilled(p0: V8Value?) {
+                resolvePromise(result);
+                def.complete(p0 as T);
+            }
+            override fun onRejected(p0: V8Value?) {
+                resolvePromise(result);
+                def.completeExceptionally(NotImplementedError("onRejected promise not implemented.."));
+            }
+            override fun onCatch(p0: V8Value?) {
+                resolvePromise(result);
+                def.completeExceptionally(NotImplementedError("onCatch promise not implemented.."));
+            }
+        });
+        registerPromise(result) {
+            if(def.isActive)
+                def.cancel("Cancelled by system");
+        }
+        return def;
+    }
+    fun registerPromise(promise: V8ValuePromise, onCancelled: ((V8ValuePromise)->Unit)? = null) {
+        Logger.v(TAG, "Promise registered for plugin [${config.name}]: ${promise.hashCode()}");
+        if (onCancelled != null) {
+            _promises.put(promise, onCancelled)
+        };
+    }
+    fun resolvePromise(promise: V8ValuePromise, cancelled: Boolean = false) {
+        Logger.v(TAG, "Promise resolved for plugin [${config.name}]: ${promise.hashCode()}");
+        val found = synchronized(_promises) {
+            val found = _promises.getOrDefault(promise, null);
+            _promises.remove(promise);
+            return@synchronized found;
+        };
+        if(found != null && cancelled)
+            found(promise);
+    }
+    fun cancelAllPromises(){
+        val promises = _promises.keys().toList();
+        for(key in promises) {
+            try {
+                resolvePromise(key, true);
+            }
+            catch(ex: Throwable) {}
+        }
+    }
+
+
     private fun getPackage(packageName: String, allowNull: Boolean = false): V8Package? {
         //TODO: Auto get all package types?
         return when(packageName) {

app/src/main/java/com/futo/platformplayer/engine/packages/PackageBridge.kt

@@ -84,7 +84,8 @@ class PackageBridge : V8Package {
     fun supportedFeatures(): Array<String> {
         return arrayOf(
             "ReloadRequiredException",
-            "HttpBatchClient"
+            "HttpBatchClient",
+            "Async"
         );
     }
 
@@ -130,9 +131,12 @@ class PackageBridge : V8Package {
             }
             timeoutMap.remove(id);
             try {
+                Logger.w(TAG, "setTimeout before busy (${timeout}): ${_plugin.isBusy}");
                 _plugin.busy {
+                    Logger.w(TAG, "setTimeout in busy");
                     if (!_plugin.isStopped)
                         funcClone.callVoid(null, arrayOf<Any>());
+                    Logger.w(TAG, "setTimeout after");
                 }
             } catch (ex: Throwable) {
                 Logger.e(TAG, "Failed timeout callback", ex);

app/src/main/java/com/futo/platformplayer/engine/packages/PackageHttp.kt

@@ -17,6 +17,7 @@ import com.futo.platformplayer.engine.IV8PluginConfig
 import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.engine.internal.IV8Convertable
 import com.futo.platformplayer.engine.internal.V8BindObject
+import com.futo.platformplayer.invokeV8Void
 import com.futo.platformplayer.logging.Logger
 import java.net.SocketTimeoutException
 import java.util.concurrent.ForkJoinPool
@@ -668,7 +669,7 @@ class PackageHttp: V8Package {
                         if(hasOpen && _listeners?.isClosed != true) {
                             try {
                                 _package._plugin.busy {
-                                    _listeners?.invokeVoid("open", arrayOf<Any>());
+                                    _listeners?.invokeV8Void("open", arrayOf<Any>());
                                 }
                             }
                             catch(ex: Throwable){
@@ -680,7 +681,7 @@ class PackageHttp: V8Package {
                         if(hasMessage && _listeners?.isClosed != true) {
                             try {
                                 _package._plugin.busy {
-                                    _listeners?.invokeVoid("message", msg);
+                                    _listeners?.invokeV8Void("message", msg);
                                 }
                             }
                             catch(ex: Throwable) {}
@@ -691,7 +692,7 @@ class PackageHttp: V8Package {
                         {
                             try {
                                 _package._plugin.busy {
-                                    _listeners?.invokeVoid("closing", code, reason);
+                                    _listeners?.invokeV8Void("closing", code, reason);
                                 }
                             }
                             catch(ex: Throwable){
@@ -704,7 +705,7 @@ class PackageHttp: V8Package {
                         if(hasClosed && _listeners?.isClosed != true) {
                             try {
                                 _package._plugin.busy {
-                                    _listeners?.invokeVoid("closed", code, reason);
+                                    _listeners?.invokeV8Void("closed", code, reason);
                                 }
                             }
                             catch(ex: Throwable){
@@ -722,7 +723,7 @@ class PackageHttp: V8Package {
                         if(hasFailure &&  _listeners?.isClosed != true) {
                             try {
                                 _package._plugin.busy {
-                                    _listeners?.invokeVoid("failure", exception.message);
+                                    _listeners?.invokeV8Void("failure", exception.message);
                                 }
                             }
                             catch(ex: Throwable){

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt

@@ -4,6 +4,7 @@ import android.app.PictureInPictureParams
 import android.app.RemoteAction
 import android.content.ClipData
 import android.content.ClipboardManager
+import android.content.ContentResolver
 import android.content.Context
 import android.content.Intent
 import android.content.res.Configuration
@@ -79,7 +80,9 @@ import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
 import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo
 import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
+import com.futo.platformplayer.api.media.platforms.js.models.JSVideo
 import com.futo.platformplayer.api.media.platforms.js.models.JSVideoDetails
+import com.futo.platformplayer.api.media.platforms.js.models.sources.JSSource
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.casting.CastConnectionState
 import com.futo.platformplayer.casting.StateCasting
@@ -806,6 +809,8 @@ class VideoDetailView : ConstraintLayout {
             _lastVideoSource = null;
             _lastAudioSource = null;
             _lastSubtitleSource = null;
+            _cast.cancel()
+            StateCasting.instance.cancel()
             video = null;
             _container_content_liveChat?.close();
             _player.clear();
@@ -1898,11 +1903,46 @@ class VideoDetailView : ConstraintLayout {
     }
     private fun loadCurrentVideoCast(video: IPlatformVideoDetails, videoSource: IVideoSource?, audioSource: IAudioSource?, subtitleSource: ISubtitleSource?, resumePositionMs: Long, speed: Double?) {
         Logger.i(TAG, "loadCurrentVideoCast(video=$video, videoSource=$videoSource, audioSource=$audioSource, resumePositionMs=$resumePositionMs)")
+        castIfAvailable(context.contentResolver, video, videoSource, audioSource, subtitleSource, resumePositionMs, speed)
+    }
 
-        if(StateCasting.instance.castIfAvailable(context.contentResolver, video, videoSource, audioSource, subtitleSource, resumePositionMs, speed)) {
-            _cast.setVideoDetails(video, resumePositionMs / 1000);
-            setCastEnabled(true);
-        } else throw IllegalStateException("Disconnected cast during loading");
+    private fun castIfAvailable(contentResolver: ContentResolver, video: IPlatformVideoDetails, videoSource: IVideoSource?, audioSource: IAudioSource?, subtitleSource: ISubtitleSource?, resumePositionMs: Long, speed: Double?) {
+        fragment.lifecycleScope.launch(Dispatchers.IO) {
+            try {
+                val plugin = if (videoSource is JSSource) videoSource.getUnderlyingPlugin()
+                    else if (audioSource is JSSource) audioSource.getUnderlyingPlugin()
+                    else null
+
+                val startId = plugin?.getUnderlyingPlugin()?.runtimeId
+                try {
+                    val castingSucceeded = StateCasting.instance.castIfAvailable(contentResolver, video, videoSource, audioSource, subtitleSource, resumePositionMs, speed, onLoading = {
+                        _cast.setLoading(it)
+                    }, onLoadingEstimate = {
+                        _cast.setLoading(it)
+                    })
+
+                    if (castingSucceeded) {
+                        withContext(Dispatchers.Main) {
+                            _cast.setVideoDetails(video, resumePositionMs / 1000);
+                            setCastEnabled(true);
+                        }
+                    }
+                } catch (e: ScriptReloadRequiredException) {
+                    Log.i(TAG, "Reload required exception", e)
+                    if (plugin == null)
+                        throw e
+
+                    if (startId != -1 && plugin.getUnderlyingPlugin().runtimeId != startId)
+                        throw e
+
+                    StatePlatform.instance.handleReloadRequired(e, {
+                        fetchVideo()
+                    });
+                }
+            } catch (e: Throwable) {
+                Logger.e(TAG, "loadCurrentVideoCast", e)
+            }
+        }
     }
 
     //Events
@@ -2415,7 +2455,7 @@ class VideoDetailView : ConstraintLayout {
 
         val d = StateCasting.instance.activeDevice;
         if (d != null && d.connectionState == CastConnectionState.CONNECTED)
-            StateCasting.instance.castIfAvailable(context.contentResolver, video, videoSource, _lastAudioSource, _lastSubtitleSource, (d.expectedCurrentTime * 1000.0).toLong(), d.speed);
+            castIfAvailable(context.contentResolver, video, videoSource, _lastAudioSource, _lastSubtitleSource, (d.expectedCurrentTime * 1000.0).toLong(), d.speed);
         else if(!_player.swapSources(videoSource, _lastAudioSource, true, true, true))
             _player.hideControls(false); //TODO: Disable player?
 
@@ -2430,7 +2470,7 @@ class VideoDetailView : ConstraintLayout {
 
         val d = StateCasting.instance.activeDevice;
         if (d != null && d.connectionState == CastConnectionState.CONNECTED)
-            StateCasting.instance.castIfAvailable(context.contentResolver, video, _lastVideoSource, audioSource, _lastSubtitleSource, (d.expectedCurrentTime * 1000.0).toLong(), d.speed);
+            castIfAvailable(context.contentResolver, video, _lastVideoSource, audioSource, _lastSubtitleSource, (d.expectedCurrentTime * 1000.0).toLong(), d.speed)
         else(!_player.swapSources(_lastVideoSource, audioSource, true, true, true))
         _player.hideControls(false); //TODO: Disable player?
 
@@ -2446,7 +2486,7 @@ class VideoDetailView : ConstraintLayout {
 
         val d = StateCasting.instance.activeDevice;
         if (d != null && d.connectionState == CastConnectionState.CONNECTED)
-            StateCasting.instance.castIfAvailable(context.contentResolver, video, _lastVideoSource, _lastAudioSource, toSet, (d.expectedCurrentTime * 1000.0).toLong(), d.speed);
+            castIfAvailable(context.contentResolver, video, _lastVideoSource, _lastAudioSource, toSet, (d.expectedCurrentTime * 1000.0).toLong(), d.speed);
         else
             _player.swapSubtitles(fragment.lifecycleScope, toSet);
 
@@ -2553,8 +2593,7 @@ class VideoDetailView : ConstraintLayout {
             _cast.visibility = View.VISIBLE;
         } else {
             StateCasting.instance.stopVideo();
-            _cast.stopTimeJob();
-            _cast.visibility = View.GONE;
+            _cast.cancel()
 
             if (video?.isLive == false) {
                 _player.setPlaybackRate(Settings.instance.playback.getDefaultPlaybackSpeed());

app/src/main/java/com/futo/platformplayer/states/StatePlatform.kt

@@ -395,8 +395,9 @@ class StatePlatform {
     }
     suspend fun selectClients(afterLoad: (() -> Unit)?, vararg ids: String) {
         withContext(Dispatchers.IO) {
+            var removed: MutableList<IPlatformClient>;
             synchronized(_clientsLock) {
-                val removed = _enabledClients.toMutableList();
+                removed = _enabledClients.toMutableList();
                 _enabledClients.clear();
                 for (id in ids) {
                     val client = getClient(id);
@@ -412,11 +413,11 @@ class StatePlatform {
                 }
                 _enabledClientsPersistent.set(*ids);
                 _enabledClientsPersistent.save();
+            }
 
-                for (oldClient in removed) {
-                    oldClient.disable();
-                    onSourceDisabled.emit(oldClient);
-                }
+            for (oldClient in removed) {
+                oldClient.disable();
+                onSourceDisabled.emit(oldClient);
             }
             afterLoad?.invoke();
         };

app/src/main/java/com/futo/platformplayer/views/TargetTapLoaderView.kt

@@ -0,0 +1,381 @@
+package com.futo.platformplayer.views
+
+import android.content.Context
+import android.graphics.*
+import android.util.AttributeSet
+import android.util.TypedValue
+import android.view.HapticFeedbackConstants
+import android.view.MotionEvent
+import android.view.View
+import android.view.animation.AccelerateDecelerateInterpolator
+import android.view.animation.OvershootInterpolator
+import androidx.core.graphics.ColorUtils
+import androidx.core.graphics.toColorInt
+import kotlin.math.*
+import kotlin.random.Random
+import com.futo.platformplayer.UIDialogs
+
+class TargetTapLoaderView @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null
+) : View(context, attrs) {
+    private val primaryColor = "#2D63ED".toColorInt()
+    private val inactiveGlobalAlpha = 110
+    private val idleSpeedMultiplier = .015f
+    private val overshootInterpolator = OvershootInterpolator(1.5f)
+    private val floatAccel = .03f
+    private val idleMaxSpeed = .35f
+    private val idleInitialTargets = 10
+    private val idleHintText = "Waiting for media to become available"
+
+    private var expectedDurationMs: Long? = null
+    private var loadStartTime = 0L
+    private var playStartTime = 0L
+    private var loaderFinished = false
+    private var forceIndeterminate= false
+    private var lastFrameTime = System.currentTimeMillis()
+
+    private var score = 0
+    private var isPlaying = false
+
+    private val targets = mutableListOf<Target>()
+    private val particles = mutableListOf<Particle>()
+
+    private val textPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        color = Color.argb(0.7f, 1f, 1f, 1f)
+        textSize = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, 12f, resources.displayMetrics)
+        textAlign = Paint.Align.LEFT
+        setShadowLayer(4f, 0f, 0f, Color.BLACK)
+        typeface = Typeface.DEFAULT_BOLD
+    }
+    private val idleHintPaint = Paint(textPaint).apply {
+        textSize = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, 12f, resources.displayMetrics)
+        typeface = Typeface.DEFAULT
+        setShadowLayer(2f, 0f, 0f, Color.BLACK)
+    }
+    private val progressBarPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { color = primaryColor }
+    private val spinnerPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        color = primaryColor; strokeWidth = 12f
+        style = Paint.Style.STROKE; strokeCap = Paint.Cap.ROUND
+    }
+    private val outerRingPaint = Paint(Paint.ANTI_ALIAS_FLAG)
+    private val middleRingPaint = Paint(Paint.ANTI_ALIAS_FLAG)
+    private val centerDotPaint = Paint(Paint.ANTI_ALIAS_FLAG)
+    private val shadowPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { color = Color.argb(50, 0, 0, 0) }
+    private val glowPaint = Paint(Paint.ANTI_ALIAS_FLAG)
+    private val particlePaint = Paint(Paint.ANTI_ALIAS_FLAG)
+    private val backgroundPaint = Paint()
+    private var spinnerShader: SweepGradient? = null
+    private var spinnerAngle = 0f
+    private val MIN_SPAWN_RATE = 1f
+    private val MAX_SPAWN_RATE = 20.0f
+    private val HIT_RATE_INCREMENT = 0.15f
+    private val MISS_RATE_DECREMENT = 0.09f
+    private var spawnRate = MIN_SPAWN_RATE
+
+    private val frameRunnable = object : Runnable {
+        override fun run() { invalidate(); if (!loaderFinished) postDelayed(this, 16L) }
+    }
+
+    init { setOnTouchListener { _, e -> if (e.action == MotionEvent.ACTION_DOWN) handleTap(e.x, e.y); true } }
+
+    fun startLoader(durationMs: Long? = null) {
+        val alreadyRunning = !loaderFinished
+        if (alreadyRunning && durationMs == null) {
+            expectedDurationMs = null
+            forceIndeterminate = true
+            return
+        }
+
+        expectedDurationMs = durationMs?.takeIf { it > 0 }
+        forceIndeterminate = expectedDurationMs == null
+        loaderFinished = false
+        isPlaying = false
+        score = 0
+        particles.clear()
+        spawnRate = MIN_SPAWN_RATE
+
+        post { if (targets.isEmpty()) prepopulateIdleTargets() }
+
+        loadStartTime = System.currentTimeMillis()
+        playStartTime = 0
+        removeCallbacks(frameRunnable)
+        post(frameRunnable)
+
+        if (!isIndeterminate) {
+            postDelayed({
+                if (!loaderFinished) {
+                    forceIndeterminate = true
+                    expectedDurationMs = null
+                }
+            }, expectedDurationMs!!)
+        }
+    }
+
+    fun finishLoader() {
+        loaderFinished = true
+        particles.clear()
+        isPlaying = false
+        invalidate()
+    }
+
+    fun stopAndResetLoader() {
+        if (score > 0) {
+            val elapsed = (System.currentTimeMillis() - (if (playStartTime > 0) playStartTime else loadStartTime)) / 1000.0
+            UIDialogs.toast("Nice! score $score | ${"%.1f".format(score / elapsed)} / s")
+            score = 0
+        }
+        loaderFinished = true
+        isPlaying = false
+        targets.clear()
+        particles.clear()
+        removeCallbacks(frameRunnable)
+        invalidate()
+    }
+
+    private val isIndeterminate get() = forceIndeterminate || expectedDurationMs == null || expectedDurationMs == 0L
+
+    private fun handleTap(x: Float, y: Float) {
+        val idx = targets.indexOfFirst { !it.hit && hypot(x - it.x, y - it.y) <= it.radius }
+        if (idx >= 0) {
+            performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
+            val t = targets[idx]
+            t.hit = true; t.hitTime = System.currentTimeMillis()
+            accelerateSpawnRate()
+            score += if (!isIndeterminate) 10 else 5
+            spawnParticles(t.x, t.y, t.radius)
+
+            if (!isPlaying) {
+                isPlaying = true
+                playStartTime  = System.currentTimeMillis()
+                score = 0
+                spawnRate = MIN_SPAWN_RATE
+                targets.retainAll { it === t }
+                spawnTarget()
+            }
+        } else if (isPlaying) decelerateSpawnRate()
+    }
+
+    private inline fun accelerateSpawnRate() {
+        spawnRate = (spawnRate + HIT_RATE_INCREMENT).coerceAtMost(MAX_SPAWN_RATE)
+    }
+
+    private inline fun decelerateSpawnRate() {
+        spawnRate = (spawnRate - MISS_RATE_DECREMENT).coerceAtLeast(MIN_SPAWN_RATE)
+    }
+
+    private fun spawnTarget() {
+        if (loaderFinished || width == 0 || height == 0) {
+            postDelayed({ spawnTarget() }, 200L); return
+        }
+
+        if (!isPlaying) {
+            postDelayed({ spawnTarget() }, 500L); return
+        }
+
+        val radius = Random.nextInt(40, 80).toFloat()
+        val x = Random.nextFloat() * (width  - 2 * radius) + radius
+        val y = Random.nextFloat() * (height - 2 * radius - 60f) + radius
+
+        val baseSpeed = Random.nextFloat() + .1f
+        val speed = baseSpeed
+        val angle = Random.nextFloat() * TAU
+        val vx = cos(angle) * speed
+        val vy = sin(angle) * speed
+        val alpha = Random.nextInt(150, 255)
+
+        targets += Target(x, y, radius, System.currentTimeMillis(), baseAlpha = alpha, vx = vx, vy = vy)
+
+        val delay = (1000f / spawnRate).roundToLong()
+        postDelayed({ spawnTarget() }, delay)
+    }
+
+    private fun prepopulateIdleTargets() {
+        if (width == 0 || height == 0) {
+            post { prepopulateIdleTargets() }
+            return
+        }
+        repeat(idleInitialTargets) {
+            val radius = Random.nextInt(40, 80).toFloat()
+            val x = Random.nextFloat() * (width  - 2 * radius) + radius
+            val y = Random.nextFloat() * (height - 2 * radius - 60f) + radius
+            val angle = Random.nextFloat() * TAU
+            val speed = (Random.nextFloat() * .3f + .05f) * idleSpeedMultiplier
+            val vx = cos(angle) * speed
+            val vy = sin(angle) * speed
+            val alpha = Random.nextInt(60, 110)
+            targets += Target(x, y, radius, System.currentTimeMillis(), baseAlpha = alpha, vx = vx, vy = vy)
+        }
+    }
+
+    private fun spawnParticles(cx: Float, cy: Float, radius: Float) {
+        repeat(12) {
+            val angle = Random.nextFloat() * TAU
+            val speed = Random.nextFloat() * 5f + 2f
+            val vx = cos(angle) * speed
+            val vy = sin(angle) * speed
+            val col = ColorUtils.setAlphaComponent(primaryColor, Random.nextInt(120, 255))
+            particles += Particle(cx, cy, vx, vy, System.currentTimeMillis(), col)
+        }
+    }
+
+    override fun onDraw(canvas: Canvas) {
+        super.onDraw(canvas)
+
+        val now     = System.currentTimeMillis()
+        val deltaMs = now - lastFrameTime
+        lastFrameTime = now
+
+        drawBackground(canvas)
+        drawTargets(canvas, now)
+        drawParticles(canvas, now)
+
+        if (!loaderFinished) {
+            if (isIndeterminate) drawIndeterminateSpinner(canvas, deltaMs)
+            else drawDeterministicProgressBar(canvas, now)
+        }
+
+        if (isPlaying) {
+            val margin = 24f
+            val scoreTxt = "Score: $score"
+            val speedTxt = "Speed: ${"%.2f".format(spawnRate)}/s"
+            val maxWidth = width - margin
+            val needRight = max(textPaint.measureText(scoreTxt), textPaint.measureText(speedTxt)) > maxWidth
+
+            val alignX = if (needRight) (width - margin) else margin
+            textPaint.textAlign = if (needRight) Paint.Align.RIGHT else Paint.Align.LEFT
+
+            canvas.drawText(scoreTxt, alignX, textPaint.textSize + margin, textPaint)
+            canvas.drawText(speedTxt, alignX, 2*textPaint.textSize + margin + 4f, textPaint)
+            textPaint.textAlign = Paint.Align.LEFT
+        }
+        else if (loaderFinished)
+            canvas.drawText("Loading Complete!", width/2f, height/2f, textPaint.apply { textAlign = Paint.Align.CENTER })
+        else {
+            idleHintPaint.textAlign = Paint.Align.CENTER
+            canvas.drawText(idleHintText, width / 2f, height - 48f, idleHintPaint)
+        }
+    }
+
+    private fun drawBackground(canvas: Canvas) {
+        val colors = intArrayOf(
+            Color.rgb(20, 20, 40),
+            Color.rgb(15, 15, 30),
+            Color.rgb(10, 10, 20),
+            Color.rgb( 5,  5, 10),
+            Color.BLACK
+        )
+        val pos = floatArrayOf(0f, 0.25f, 0.5f, 0.75f, 1f)
+
+        if (backgroundPaint.shader == null) {
+            backgroundPaint.shader = LinearGradient(
+                0f, 0f, 0f, height.toFloat(),
+                colors, pos,
+                Shader.TileMode.CLAMP
+            )
+        }
+
+        canvas.drawRect(0f, 0f, width.toFloat(), height.toFloat(), backgroundPaint)
+    }
+
+    private fun drawTargets(canvas: Canvas, now: Long) {
+        val expireMsActive = if (isIndeterminate) 2500L else 1500L
+        val it = targets.iterator()
+        while (it.hasNext()) {
+            val t = it.next()
+            if (t.hit && now - t.hitTime > 300L) { it.remove(); continue }
+            if (isPlaying && !t.hit && now - t.spawnTime > expireMsActive) {
+                it.remove(); decelerateSpawnRate(); continue
+            }
+            t.x += t.vx; t.y += t.vy
+            t.vx += (Random.nextFloat() - .5f) * floatAccel
+            t.vy += (Random.nextFloat() - .5f) * floatAccel
+            val speedCap = if (isPlaying) Float.MAX_VALUE else idleMaxSpeed
+            val mag = hypot(t.vx, t.vy)
+            if (mag > speedCap) {
+                val s = speedCap / mag
+                t.vx *= s; t.vy *= s
+            }
+            if (t.x - t.radius < 0 || t.x + t.radius > width)  t.vx *= -1
+            if (t.y - t.radius < 0 || t.y + t.radius > height) t.vy *= -1
+            val scale = if (t.hit) 1f - ((now - t.hitTime) / 300f).coerceIn(0f,1f)
+            else {
+                val e = now - t.spawnAnimStart
+                if (e < 300L) overshootInterpolator.getInterpolation(e/300f)
+                else 1f + .02f * sin(((now - t.spawnAnimStart)/1000f)*TAU + t.pulseOffset)
+            }
+            val animAlpha = if (t.hit) ((1f - scale)*255).toInt() else 255
+            val globalAlpha = if (isPlaying) 255 else inactiveGlobalAlpha
+            val alpha = (animAlpha * t.baseAlpha /255f * globalAlpha/255f).toInt().coerceAtMost(255)
+            val r = max(1f, t.radius*scale)
+            val outerCol = ColorUtils.setAlphaComponent(primaryColor, alpha)
+            val midCol = ColorUtils.setAlphaComponent(primaryColor, (alpha*.7f).toInt())
+            val innerCol = ColorUtils.setAlphaComponent(primaryColor, (alpha*.4f).toInt())
+            outerRingPaint.color = outerCol; middleRingPaint.color = midCol; centerDotPaint.color = innerCol
+
+            glowPaint.shader = RadialGradient(t.x, t.y, r, outerCol, Color.TRANSPARENT, Shader.TileMode.CLAMP)
+
+            canvas.drawCircle(t.x, t.y, r*1.2f, glowPaint)
+            canvas.drawCircle(t.x+4f, t.y+4f, r, shadowPaint)
+            canvas.drawCircle(t.x, t.y, r, outerRingPaint)
+            canvas.drawCircle(t.x, t.y, r*.66f, middleRingPaint)
+            canvas.drawCircle(t.x, t.y, r*.33f, centerDotPaint)
+        }
+    }
+
+    private fun drawParticles(canvas: Canvas, now: Long) {
+        val lifespan = 400L
+        val it = particles.iterator()
+        while (it.hasNext()) {
+            val p = it.next()
+            val age = now - p.startTime
+            if (age > lifespan) { it.remove(); continue }
+            val a = ((1f - age/lifespan.toFloat())*255).toInt()
+            particlePaint.color = ColorUtils.setAlphaComponent(p.baseColor, a)
+            p.x += p.vx; p.y += p.vy
+            canvas.drawCircle(p.x, p.y, 6f, particlePaint)
+        }
+    }
+
+    private fun drawDeterministicProgressBar(canvas: Canvas, now: Long) {
+        val dur = expectedDurationMs ?: return
+        val prog = ((now - loadStartTime) / dur.toFloat()).coerceIn(0f, 1f)
+        val eased = AccelerateDecelerateInterpolator().getInterpolation(prog)
+        val h = 20f; val r=10f
+        canvas.drawRoundRect(RectF(0f, height-h, width*eased, height.toFloat()), r, r, progressBarPaint)
+    }
+
+    private fun drawIndeterminateSpinner(canvas: Canvas, dt: Long) {
+        val cx=width/2f; val cy=height/2f; val r=min(width,height)/6f
+        spinnerAngle = (spinnerAngle + .25f*dt)%360f
+        if(spinnerShader == null) spinnerShader = SweepGradient(cx,cy,intArrayOf(Color.TRANSPARENT,Color.WHITE,Color.TRANSPARENT),floatArrayOf(0f,.5f,1f))
+        spinnerPaint.shader = spinnerShader
+        val glow = Paint(spinnerPaint).apply{ maskFilter = BlurMaskFilter(15f,BlurMaskFilter.Blur.SOLID) }
+        val sweep = 270f
+        canvas.drawArc(cx-r,cy-r,cx+r,cy+r,spinnerAngle,sweep,false,glow)
+        canvas.drawArc(cx-r,cy-r,cx+r,cy+r,spinnerAngle,sweep,false,spinnerPaint)
+    }
+
+    private data class Target(
+        var x: Float,
+        var y: Float,
+        val radius: Float,
+        val spawnTime: Long,
+        var hit: Boolean = false,
+        var hitTime: Long = 0L,
+        val baseAlpha: Int = 255,
+        var vx: Float=0f,
+        var vy:Float=0f,
+        val spawnAnimStart: Long = System.currentTimeMillis(),
+        val pulseOffset: Float = Random.nextFloat() * TAU
+    )
+    private data class Particle(
+        var x:Float,
+        var y:Float,
+        val vx:Float,
+        val vy:Float,
+        val startTime:Long,
+        val baseColor:Int
+    )
+
+    private companion object { private const val TAU = (2 * Math.PI).toFloat() }
+}

app/src/main/java/com/futo/platformplayer/views/casting/CastView.kt

@@ -30,6 +30,7 @@ import com.futo.platformplayer.constructs.Event2
 import com.futo.platformplayer.formatDuration
 import com.futo.platformplayer.states.StateHistory
 import com.futo.platformplayer.states.StatePlayer
+import com.futo.platformplayer.views.TargetTapLoaderView
 import com.futo.platformplayer.views.behavior.GestureControlView
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -54,6 +55,7 @@ class CastView : ConstraintLayout {
     private val _timeBar: DefaultTimeBar;
     private val _background: FrameLayout;
     private val _gestureControlView: GestureControlView;
+    private val _loaderGame: TargetTapLoaderView
     private var _scope: CoroutineScope = CoroutineScope(Dispatchers.Main);
     private var _updateTimeJob: Job? = null;
     private var _inPictureInPicture: Boolean = false;
@@ -88,6 +90,9 @@ class CastView : ConstraintLayout {
         _timeBar = findViewById(R.id.time_progress);
         _background = findViewById(R.id.layout_background);
         _gestureControlView = findViewById(R.id.gesture_control);
+        _loaderGame = findViewById(R.id.loader_overlay)
+        _loaderGame.visibility = View.GONE
+
         _gestureControlView.fullScreenGestureEnabled = false
         _gestureControlView.setupTouchArea();
         _gestureControlView.onSpeedHoldStart.subscribe {
@@ -197,6 +202,12 @@ class CastView : ConstraintLayout {
         _updateTimeJob = null;
     }
 
+    fun cancel() {
+        stopTimeJob()
+        setLoading(false)
+        visibility = View.GONE
+    }
+
     fun stopAllGestures() {
         _gestureControlView.stopAllGestures();
     }
@@ -279,6 +290,7 @@ class CastView : ConstraintLayout {
         _textDuration.text = (video.duration * 1000).formatDuration();
         _timeBar.setPosition(position);
         _timeBar.setDuration(video.duration);
+        setLoading(false)
     }
 
     @OptIn(UnstableApi::class)
@@ -295,6 +307,7 @@ class CastView : ConstraintLayout {
         _updateTimeJob?.cancel();
         _updateTimeJob = null;
         _scope.cancel();
+        setLoading(false)
     }
 
     private fun getPlaybackStateCompat(): Int {
@@ -305,4 +318,19 @@ class CastView : ConstraintLayout {
             else -> PlaybackStateCompat.STATE_PAUSED;
         }
     }
+
+    fun setLoading(isLoading: Boolean) {
+        if (isLoading) {
+            _loaderGame.visibility = View.VISIBLE
+            _loaderGame.startLoader()
+        } else {
+            _loaderGame.visibility = View.GONE
+            _loaderGame.stopAndResetLoader()
+        }
+    }
+
+    fun setLoading(expectedDurationMs: Int) {
+        _loaderGame.visibility = View.VISIBLE
+        _loaderGame.startLoader(expectedDurationMs.toLong())
+    }
 }

app/src/main/java/com/futo/platformplayer/views/livechat/LiveChatDonationListItem.kt

@@ -1,5 +1,6 @@
 package com.futo.platformplayer.views.livechat
 
+import CSSColor
 import android.graphics.Color
 import android.graphics.drawable.LevelListDrawable
 import android.text.Spannable
@@ -24,6 +25,7 @@ import com.futo.platformplayer.views.adapters.AnyAdapter
 import com.futo.platformplayer.views.overlays.LiveChatOverlay
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import toAndroidColor
 
 class LiveChatDonationListItem(viewGroup: ViewGroup)
     : LiveChatListItem(LayoutInflater.from(viewGroup.context).inflate(R.layout.list_chat_donation, viewGroup, false)) {
@@ -55,10 +57,10 @@ class LiveChatDonationListItem(viewGroup: ViewGroup)
             _amount.text = event.amount.trim();
 
             if(event.colorDonation != null && event.colorDonation.isHexColor()) {
-                val color = Color.parseColor(event.colorDonation);
-                _amountContainer.background.setTint(color);
+                val color = CSSColor.parseColor(event.colorDonation);
+                _amountContainer.background.setTint(color.toAndroidColor());
 
-                if((color.green > 140 || color.red > 140 || color.blue > 140) && (color.red + color.green + color.blue) > 400)
+                if(color.lightness > 0.5)
                     _amount.setTextColor(Color.BLACK);
                 else
                     _amount.setTextColor(Color.WHITE);

app/src/main/java/com/futo/platformplayer/views/livechat/LiveChatDonationPill.kt

@@ -13,6 +13,7 @@ import com.bumptech.glide.Glide
 import com.futo.platformplayer.R
 import com.futo.platformplayer.api.media.models.live.LiveEventDonation
 import com.futo.platformplayer.isHexColor
+import toAndroidColor
 
 class LiveChatDonationPill: LinearLayout {
     private val _imageAuthor: ImageView;
@@ -33,10 +34,10 @@ class LiveChatDonationPill: LinearLayout {
 
 
         if(donation.colorDonation != null && donation.colorDonation.isHexColor()) {
-            val color = Color.parseColor(donation.colorDonation);
-            root.background.setTint(color);
+            val color = CSSColor.parseColor(donation.colorDonation);
+            root.background.setTint(color.toAndroidColor());
 
-            if((color.green > 140 || color.red > 140 || color.blue > 140) && (color.red + color.green + color.blue) > 400)
+            if(color.lightness > 0.5)
                 _textAmount.setTextColor(Color.BLACK);
             else
                 _textAmount.setTextColor(Color.WHITE);

app/src/main/java/com/futo/platformplayer/views/livechat/LiveChatMessageListItem.kt

@@ -18,6 +18,7 @@ import com.futo.platformplayer.views.adapters.AnyAdapter
 import com.futo.platformplayer.views.overlays.LiveChatOverlay
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import toAndroidColor
 
 class LiveChatMessageListItem(viewGroup: ViewGroup)
     : LiveChatListItem(LayoutInflater.from(viewGroup.context).inflate(R.layout.list_chat_message, viewGroup, false)) {
@@ -75,7 +76,7 @@ class LiveChatMessageListItem(viewGroup: ViewGroup)
 
             if (!event.colorName.isNullOrEmpty()) {
                 try {
-                    _authorName.setTextColor(Color.parseColor(event.colorName));
+                    _authorName.setTextColor(CSSColor.parseColor(event.colorName).toAndroidColor());
                 } catch (ex: Throwable) {
                 }
             } else

app/src/main/java/com/futo/platformplayer/views/overlays/LiveChatOverlay.kt

@@ -14,9 +14,6 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.graphics.blue
-import androidx.core.graphics.green
-import androidx.core.graphics.red
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.LinearSmoothScroller
 import androidx.recyclerview.widget.RecyclerView
@@ -43,6 +40,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
+import toAndroidColor
 
 
 class LiveChatOverlay : LinearLayout {
@@ -66,10 +64,11 @@ class LiveChatOverlay : LinearLayout {
 
     private val _overlayRaid: ConstraintLayout;
     private val _overlayRaid_Name: TextView;
+    private val _overlayRaid_Message: TextView;
     private val _overlayRaid_Thumbnail: ImageView;
 
     private val _overlayRaid_ButtonGo: Button;
-    private val _overlayRaid_ButtonPrevent: Button;
+    private val _overlayRaid_ButtonDismiss: Button;
 
     private val _textViewers: TextView;
 
@@ -148,9 +147,10 @@ class LiveChatOverlay : LinearLayout {
 
         _overlayRaid = findViewById(R.id.overlay_raid);
         _overlayRaid_Name = findViewById(R.id.raid_name);
+        _overlayRaid_Message = findViewById(R.id.textRaidMessage);
         _overlayRaid_Thumbnail = findViewById(R.id.raid_thumbnail);
         _overlayRaid_ButtonGo = findViewById(R.id.raid_button_go);
-        _overlayRaid_ButtonPrevent = findViewById(R.id.raid_button_prevent);
+        _overlayRaid_ButtonDismiss = findViewById(R.id.raid_button_prevent);
 
         _overlayRaid.visibility = View.GONE;
 
@@ -159,7 +159,7 @@ class LiveChatOverlay : LinearLayout {
                 onRaidNow.emit(it);
             }
         }
-        _overlayRaid_ButtonPrevent.setOnClickListener {
+        _overlayRaid_ButtonDismiss.setOnClickListener {
             _currentRaid?.let {
                 _currentRaid = null;
                 _overlayRaid.visibility = View.GONE;
@@ -291,10 +291,10 @@ class LiveChatOverlay : LinearLayout {
             _overlayDonation_Amount.text = donation.amount.trim();
             _overlayDonation.visibility = VISIBLE;
             if(donation.colorDonation != null && donation.colorDonation.isHexColor()) {
-                val color = Color.parseColor(donation.colorDonation);
-                _overlayDonation_AmountContainer.background.setTint(color);
+                val color = CSSColor.parseColor(donation.colorDonation);
+                _overlayDonation_AmountContainer.background.setTint(color.toAndroidColor());
 
-                if((color.green > 140 || color.red > 140 || color.blue > 140) && (color.red + color.green + color.blue) > 400)
+                if(color.lightness > 0.5)
                     _overlayDonation_Amount.setTextColor(Color.BLACK)
                 else
                     _overlayDonation_Amount.setTextColor(Color.WHITE);
@@ -372,6 +372,15 @@ class LiveChatOverlay : LinearLayout {
             }
             else
                 _overlayRaid.visibility = View.GONE;
+
+            if(raid?.isOutgoing ?: false) {
+                _overlayRaid_ButtonGo.visibility = View.VISIBLE
+                _overlayRaid_Message.text = "Viewers are raiding";
+            }
+            else {
+                _overlayRaid_ButtonGo.visibility = View.GONE;
+                _overlayRaid_Message.text = "Raid incoming from";
+            }
         }
     }
     fun setViewCount(viewCount: Int) {

app/src/main/java/com/futo/platformplayer/views/video/FutoVideoPlayer.kt

@@ -1,5 +1,6 @@
 package com.futo.platformplayer.views.video
 
+import android.animation.ValueAnimator
 import android.content.Context
 import android.content.Intent
 import android.content.res.Resources
@@ -43,9 +44,13 @@ import com.futo.platformplayer.formatDuration
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePlayer
+import com.futo.platformplayer.views.TargetTapLoaderView
 import com.futo.platformplayer.views.behavior.GestureControlView
+import com.futo.platformplayer.views.others.ProgressBar
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import java.util.concurrent.Executors
@@ -150,6 +155,8 @@ class FutoVideoPlayer : FutoVideoPlayerBase {
 
     val onChapterClicked = Event1<IChapter>();
 
+    private val _loaderGame: TargetTapLoaderView
+
     @OptIn(UnstableApi::class)
     constructor(context: Context, attrs: AttributeSet? = null) : super(PLAYER_STATE_NAME, context, attrs) {
         LayoutInflater.from(context).inflate(R.layout.video_view, this, true);
@@ -190,6 +197,9 @@ class FutoVideoPlayer : FutoVideoPlayerBase {
         _control_duration_fullscreen = _videoControls_fullscreen.findViewById(R.id.text_duration);
         _control_pause_fullscreen = _videoControls_fullscreen.findViewById(R.id.button_pause);
 
+        _loaderGame = findViewById(R.id.loader_overlay)
+        _loaderGame.visibility = View.GONE
+
         _control_chapter.setOnClickListener {
             _currentChapter?.let {
                 onChapterClicked.emit(it);
@@ -865,4 +875,19 @@ class FutoVideoPlayer : FutoVideoPlayerBase {
     override fun onSurfaceSizeChanged(width: Int, height: Int) {
         gestureControl.resetZoomPan()
     }
+
+    override fun setLoading(isLoading: Boolean) {
+        if (isLoading) {
+            _loaderGame.visibility = View.VISIBLE
+            _loaderGame.startLoader()
+        } else {
+            _loaderGame.visibility = View.GONE
+            _loaderGame.stopAndResetLoader()
+        }
+    }
+
+    override fun setLoading(expectedDurationMs: Int) {
+        _loaderGame.visibility = View.VISIBLE
+        _loaderGame.startLoader(expectedDurationMs.toLong())
+    }
 }

app/src/main/java/com/futo/platformplayer/views/video/FutoVideoPlayerBase.kt

@@ -3,10 +3,12 @@ package com.futo.platformplayer.views.video
 import android.content.Context
 import android.net.Uri
 import android.util.AttributeSet
+import android.view.LayoutInflater
 import android.widget.RelativeLayout
 import androidx.annotation.OptIn
 import androidx.lifecycle.coroutineScope
 import androidx.lifecycle.findViewTreeLifecycleOwner
+import androidx.lifecycle.lifecycleScope
 import androidx.media3.common.C
 import androidx.media3.common.MediaItem
 import androidx.media3.common.PlaybackException
@@ -29,6 +31,8 @@ import androidx.media3.exoplayer.source.ProgressiveMediaSource
 import androidx.media3.exoplayer.source.SingleSampleMediaSource
 import androidx.media3.exoplayer.trackselection.DefaultTrackSelector
 import com.futo.platformplayer.Settings
+import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.api.media.models.PlatformAuthorLink
 import com.futo.platformplayer.api.media.models.chapters.IChapter
 import com.futo.platformplayer.api.media.models.streams.VideoMuxedSourceDescriptor
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
@@ -52,9 +56,14 @@ import com.futo.platformplayer.api.media.platforms.js.models.sources.JSDashManif
 import com.futo.platformplayer.api.media.platforms.js.models.sources.JSHLSManifestAudioSource
 import com.futo.platformplayer.api.media.platforms.js.models.sources.JSSource
 import com.futo.platformplayer.api.media.platforms.js.models.sources.JSVideoUrlRangeSource
+import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.constructs.Event1
+import com.futo.platformplayer.constructs.TaskHandler
+import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.engine.exceptions.ScriptReloadRequiredException
+import com.futo.platformplayer.fragment.mainactivity.main.ChannelFragment
+import com.futo.platformplayer.fragment.mainactivity.main.CreatorSearchResultsFragment
 import com.futo.platformplayer.helpers.VideoHelper
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateApp
@@ -65,10 +74,13 @@ import com.futo.platformplayer.views.video.datasources.JSHttpDataSource
 import getHttpDataSourceFactory
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.io.ByteArrayInputStream
 import java.io.File
+import java.util.concurrent.atomic.AtomicInteger
 import kotlin.math.abs
 
 abstract class FutoVideoPlayerBase : RelativeLayout {
@@ -115,7 +127,8 @@ abstract class FutoVideoPlayerBase : RelativeLayout {
 
     private var _didCallSourceChange = false;
     private var _lastState: Int = -1;
-
+    private val _swapIdAudio = AtomicInteger(0)
+    private val _swapIdVideo = AtomicInteger(0)
 
     var targetTrackVideoHeight = -1
         private set
@@ -434,13 +447,15 @@ abstract class FutoVideoPlayerBase : RelativeLayout {
 
 
     private fun swapSourceInternal(videoSource: IVideoSource?, play: Boolean, resume: Boolean): Boolean {
+        setLoading(false)
+        val swapId = _swapIdVideo.incrementAndGet()
         _lastGeneratedDash = null;
         val didSet = when(videoSource) {
             is LocalVideoSource -> { swapVideoSourceLocal(videoSource); true; }
             is JSVideoUrlRangeSource -> { swapVideoSourceUrlRange(videoSource); true; }
             is IDashManifestWidevineSource -> { swapVideoSourceDashWidevine(videoSource); true }
             is IDashManifestSource -> { swapVideoSourceDash(videoSource); true;}
-            is JSDashManifestRawSource -> swapVideoSourceDashRaw(videoSource, play, resume);
+            is JSDashManifestRawSource -> swapVideoSourceDashRaw(videoSource, play, resume, swapId);
             is IHLSManifestSource -> { swapVideoSourceHLS(videoSource); true; }
             is IVideoUrlWidevineSource -> { swapVideoSourceUrlWidevine(videoSource); true; }
             is IVideoUrlSource -> { swapVideoSourceUrl(videoSource); true; }
@@ -451,11 +466,13 @@ abstract class FutoVideoPlayerBase : RelativeLayout {
         return didSet;
     }
     private fun swapSourceInternal(audioSource: IAudioSource?, play: Boolean, resume: Boolean): Boolean {
+        setLoading(false)
+        val swapId = _swapIdAudio.incrementAndGet()
         val didSet = when(audioSource) {
             is LocalAudioSource -> {swapAudioSourceLocal(audioSource); true; }
             is JSAudioUrlRangeSource -> { swapAudioSourceUrlRange(audioSource); true; }
             is JSHLSManifestAudioSource -> { swapAudioSourceHLS(audioSource); true; }
-            is JSDashManifestRawAudioSource -> swapAudioSourceDashRaw(audioSource, play, resume);
+            is JSDashManifestRawAudioSource -> swapAudioSourceDashRaw(audioSource, play, resume, swapId);
             is IAudioUrlWidevineSource -> { swapAudioSourceUrlWidevine(audioSource); true; }
             is IAudioUrlSource -> { swapAudioSourceUrl(audioSource); true; }
             null -> { _lastAudioMediaSource = null; true; }
@@ -562,16 +579,32 @@ abstract class FutoVideoPlayerBase : RelativeLayout {
             }.createMediaSource(MediaItem.fromUri(videoSource.url))
     }
     @OptIn(UnstableApi::class)
-    private fun swapVideoSourceDashRaw(videoSource: JSDashManifestRawSource, play: Boolean, resume: Boolean): Boolean {
+    private fun swapVideoSourceDashRaw(videoSource: JSDashManifestRawSource, play: Boolean, resume: Boolean, swapId: Int): Boolean {
         Logger.i(TAG, "Loading VideoSource [Dash]");
 
         if(videoSource.hasGenerate) {
             findViewTreeLifecycleOwner()?.lifecycle?.coroutineScope?.launch(Dispatchers.IO) {
+                val scope = this;
                 var startId = -1;
                 try {
                     val plugin = videoSource.getUnderlyingPlugin() ?: return@launch;
                     startId = plugin.getUnderlyingPlugin()?.runtimeId ?: -1;
-                    val generated = plugin.busy { videoSource.generate(); };
+                    val generatedDef = plugin.busy { videoSource.generateAsync(scope); };
+                    withContext(Dispatchers.Main) {
+                        if (generatedDef.estDuration >= 0) {
+                            setLoading(generatedDef.estDuration)
+                        } else {
+                            setLoading(true)
+                        }
+                    }
+                    val generated = generatedDef.await();
+                    if (_swapIdVideo.get() != swapId) {
+                        return@launch
+                    }
+
+                    withContext(Dispatchers.Main) {
+                        setLoading(false)
+                    }
                     if (generated != null) {
                         withContext(Dispatchers.Main) {
                             val dataSource = if(videoSource is JSSource && (videoSource.requiresCustomDatasource))
@@ -608,6 +641,10 @@ abstract class FutoVideoPlayerBase : RelativeLayout {
                 }
                 catch(ex: Throwable) {
                     Logger.e(TAG, "DashRaw generator failed", ex);
+                } finally {
+                    withContext(Dispatchers.Main) {
+                        setLoading(false)
+                    }
                 }
             }
             return false;
@@ -690,14 +727,30 @@ abstract class FutoVideoPlayerBase : RelativeLayout {
     }
 
     @OptIn(UnstableApi::class)
-    private fun swapAudioSourceDashRaw(audioSource: JSDashManifestRawAudioSource, play: Boolean, resume: Boolean): Boolean {
+    private fun swapAudioSourceDashRaw(audioSource: JSDashManifestRawAudioSource, play: Boolean, resume: Boolean, swapId: Int): Boolean {
         Logger.i(TAG, "Loading AudioSource [DashRaw]");
         if(audioSource.hasGenerate) {
             findViewTreeLifecycleOwner()?.lifecycle?.coroutineScope?.launch(Dispatchers.IO) {
+                val scope = this;
                 var startId = -1;
                 try {
+                    val plugin = audioSource.getUnderlyingPlugin() ?: return@launch;
                     startId = audioSource.getUnderlyingPlugin()?.getUnderlyingPlugin()?.runtimeId ?: -1;
-                    val generated = audioSource.generate();
+                    val generatedDef = plugin.busy { audioSource.generateAsync(scope); }
+                    withContext(Dispatchers.Main) {
+                        if (generatedDef.estDuration >= 0) {
+                            setLoading(generatedDef.estDuration)
+                        } else {
+                            setLoading(true)
+                        }
+                    }
+                    val generated = generatedDef.await();
+                    if (_swapIdAudio.get() != swapId) {
+                        return@launch
+                    }
+                    withContext(Dispatchers.Main) {
+                        setLoading(false)
+                    }
                     if(generated != null) {
                         val dataSource = if(audioSource is JSSource && (audioSource.requiresCustomDatasource))
                             audioSource.getHttpDataSourceFactory()
@@ -724,6 +777,10 @@ abstract class FutoVideoPlayerBase : RelativeLayout {
                 }
                 catch(ex: Throwable) {
 
+                } finally {
+                    withContext(Dispatchers.Main) {
+                        setLoading(false)
+                    }
                 }
             }
             return false;
@@ -854,6 +911,9 @@ abstract class FutoVideoPlayerBase : RelativeLayout {
     fun clear() {
         exoPlayer?.player?.stop();
         exoPlayer?.player?.clearMediaItems();
+        setLoading(false)
+        _swapIdVideo.incrementAndGet()
+        _swapIdAudio.incrementAndGet()
         _lastVideoMediaSource = null;
         _lastAudioMediaSource = null;
         _lastSubtitleMediaSource = null;
@@ -933,6 +993,9 @@ abstract class FutoVideoPlayerBase : RelativeLayout {
         }
     }
 
+    protected open fun setLoading(isLoading: Boolean) { }
+    protected open fun setLoading(expectedDurationMs: Int) { }
+
     companion object {
         val DEFAULT_USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0";
 

app/src/main/res/drawable/progress_bar.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
+        <shape>
+            <corners android:radius="5dip" />
+            <gradient
+                android:angle="270"
+                android:centerColor="#ff5a5d5a"
+                android:centerY="0.75"
+                android:endColor="#ff5a5d5a"
+                android:startColor="#ff5a5d5a" />
+        </shape>
+    </item>
+
+    <item android:id="@android:id/secondaryProgress">
+        <clip>
+            <shape>
+                <corners android:radius="5dip" />
+                <gradient
+                    android:angle="270"
+                    android:centerColor="#80ffb600"
+                    android:centerY="0.75"
+                    android:endColor="#80ffd300"
+                    android:startColor="#80ffd300" />
+            </shape>
+        </clip>
+    </item>
+    <item android:id="@android:id/progress">
+        <clip>
+            <shape>
+                <corners android:radius="5dip" />
+                <gradient
+                    android:angle="270"
+                    android:endColor="#3333FF"
+                    android:startColor="#3333FF" />
+            </shape>
+        </clip>
+    </item>
+
+</layer-list>

app/src/main/res/layout/activity_test.xml

@@ -5,9 +5,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/black">
 
-    <com.futo.platformplayer.views.others.CircularProgressBar
+    <com.futo.platformplayer.views.TargetTapLoaderView
+        android:id="@+id/test_view"
         android:layout_width="match_parent"
-        android:layout_height="200dp"
-        app:progress="0%"
-        app:strokeWidth="20dp" />
+        android:layout_height="240dp" />
 </FrameLayout>

app/src/main/res/layout/overlay_livechat.xml

@@ -263,8 +263,8 @@
                 android:textSize="13dp"
                 android:letterSpacing="0"
                 android:fontFamily="@font/inter_regular"
-                android:layout_marginStart="20dp"
-                android:backgroundTint="#2F2F2F"
+                android:layout_marginStart="5dp"
+                android:backgroundTint="@color/colorPrimary"
                 android:layout_marginEnd="5dp"
                 android:text="@string/go_now"/>
             <Button
@@ -277,9 +277,9 @@
                 android:textSize="13dp"
                 android:letterSpacing="0"
                 android:layout_marginStart="5dp"
-                android:layout_marginEnd="20dp"
-                android:backgroundTint="#481414"
-                android:text="@string/prevent"/>
+                android:layout_marginEnd="5dp"
+                android:backgroundTint="#2F2F2F"
+                android:text="@string/dismiss"/>
         </LinearLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/video_view.xml

@@ -64,4 +64,11 @@
             app:controller_layout_id="@layout/video_player_ui_fullscreen"
             android:visibility="gone" />
     </FrameLayout>
+
+    <com.futo.platformplayer.views.TargetTapLoaderView
+        android:id="@+id/loader_overlay"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/view_cast.xml

@@ -189,4 +189,14 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent" />
 
+    <com.futo.platformplayer.views.TargetTapLoaderView
+        android:id="@+id/loader_overlay"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:visibility="gone"/>
+
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/test/java/com/futo/platformplayer/CSSColorTests.kt

@@ -0,0 +1,257 @@
+package com.futo.platformplayer
+
+import CSSColor
+import org.junit.Assert.assertEquals
+import kotlin.math.PI
+import kotlin.math.abs
+import kotlin.test.Test
+import kotlin.test.assertTrue
+
+class CSSColorTest {
+
+    private fun approxEq(expected: Float, actual: Float, eps: Float = 1e-5f) {
+        assertTrue(abs(expected - actual) <= eps, "Expected $expected but got $actual")
+    }
+
+    @Test fun `hex #RRGGBB parses correctly`() {
+        val c = CSSColor.parseColor("#336699")
+        assertEquals(0x33, c.red)
+        assertEquals(0x66, c.green)
+        assertEquals(0x99, c.blue)
+        assertEquals(255, c.alpha)
+    }
+
+    @Test fun `hex #RGB shorthand expands`() {
+        val c = CSSColor.parseColor("#369")
+        assertEquals(0x33, c.red)
+        assertEquals(0x66, c.green)
+        assertEquals(0x99, c.blue)
+    }
+
+    @Test fun `hex #RRGGBBAA parses alpha`() {
+        val c = CSSColor.parseColor("#33669980")
+        assertEquals(0x33, c.red)
+        assertEquals(0x66, c.green)
+        assertEquals(0x99, c.blue)
+        approxEq(128 / 255f, c.a)
+        assertEquals(128, c.alpha)
+    }
+
+    @Test fun `hex #RGBA shorthand expands with alpha`() {
+        val c = CSSColor.parseColor("#3698")
+        assertEquals(0x33, c.red)
+        assertEquals(0x66, c.green)
+        assertEquals(0x99, c.blue)
+        assertEquals(0x88, c.alpha)
+    }
+
+    @Test fun `hex uppercase shorthand parses`() {
+        val c = CSSColor.parseColor("#AbC")
+        // expands to AABBCC
+        assertEquals(0xAA, c.red)
+        assertEquals(0xBB, c.green)
+        assertEquals(0xCC, c.blue)
+    }
+
+    @Test fun `rgb(ints) functional parser`() {
+        val c = CSSColor.parseColor("rgb(255,128,0)")
+        assertEquals(255, c.red)
+        assertEquals(128, c.green)
+        assertEquals(0,   c.blue)
+        assertEquals(255, c.alpha)
+    }
+
+    @Test fun `rgb(percent) functional parser`() {
+        val c = CSSColor.parseColor("rgb(100%,50%,0%)")
+        assertEquals(255, c.red)
+        assertEquals(128, c.green)
+        assertEquals(0,   c.blue)
+    }
+
+    @Test fun `rgba raw‐float alpha functional parser`() {
+        val c = CSSColor.parseColor("rgba(255,0,0,0.5)")
+        assertEquals(255, c.red)
+        assertEquals(0,   c.green)
+        assertEquals(0,   c.blue)
+        approxEq(0.5f, c.a)
+    }
+
+    @Test fun `rgba percent alpha functional parser`() {
+        val c = CSSColor.parseColor("rgba(100%,0%,0%,50%)")
+        assertEquals(255, c.red)
+        assertEquals(0,   c.green)
+        assertEquals(0,   c.blue)
+        approxEq(0.5f, c.a)
+    }
+
+    @Test fun `hsl() functional parser yields correct RGB`() {
+        // pure green: hue=120°, sat=100%, light=50%
+        val c = CSSColor.parseColor("hsl(120,100%,50%)")
+        assertEquals(0,   c.red)
+        assertEquals(255, c.green)
+        assertEquals(0,   c.blue)
+    }
+
+    @Test fun `hsla percent alpha functional parser`() {
+        val c = CSSColor.parseColor("hsla(240,100%,50%,25%)")
+        // pure blue, alpha 25%
+        assertEquals(0,   c.red)
+        assertEquals(0,   c.green)
+        assertEquals(255, c.blue)
+        approxEq(0.25f, c.a)
+    }
+
+    @Test fun `hsla raw‐float alpha functional parser`() {
+        val c = CSSColor.parseColor("hsla(240,100%,50%,0.25)")
+        assertEquals(0,   c.red)
+        assertEquals(0,   c.green)
+        assertEquals(255, c.blue)
+        approxEq(0.25f, c.a)
+    }
+
+    @Test fun `hsl radian unit parsing`() {
+        // 180° = π radians → cyan
+        val c = CSSColor.parseColor("hsl(${PI}rad,100%,50%)")
+        assertEquals(0,   c.red)
+        assertEquals(255, c.green)
+        assertEquals(255, c.blue)
+    }
+
+    @Test fun `hsl turn unit parsing`() {
+        // 0.5 turn = 180° → cyan
+        val c = CSSColor.parseColor("hsl(0.5turn,100%,50%)")
+        assertEquals(0,   c.red)
+        assertEquals(255, c.green)
+        assertEquals(255, c.blue)
+    }
+
+    @Test fun `hsl grad unit parsing`() {
+        // 200 grad = 180° → cyan
+        val c = CSSColor.parseColor("hsl(200grad,100%,50%)")
+        assertEquals(0,   c.red)
+        assertEquals(255, c.green)
+        assertEquals(255, c.blue)
+    }
+
+    @Test fun `named colors parse`() {
+        val red = CSSColor.parseColor("red")
+        assertEquals(255, red.red)
+        assertEquals(0,   red.green)
+        assertEquals(0,   red.blue)
+
+        val rebecca = CSSColor.parseColor("rebeccapurple")
+        assertEquals(0x66, rebecca.red)
+        assertEquals(0x33, rebecca.green)
+        assertEquals(0x99, rebecca.blue)
+
+        val transparent = CSSColor.parseColor("transparent")
+        assertEquals(0, transparent.alpha)
+    }
+
+    @Test fun `round-trip Android Int ↔ CSSColor`() {
+        val original = CSSColor(0.2f, 0.4f, 0.6f, 0.8f)
+        val colorInt = original.toRgbaInt()
+        val back = CSSColor.fromRgba(colorInt)
+        approxEq(original.r, back.r)
+        approxEq(original.g, back.g)
+        approxEq(original.b, back.b)
+        approxEq(original.a, back.a)
+    }
+
+    @Test fun `individual channel setters`() {
+        val c = CSSColor(0f,0f,0f,1f)
+        c.red = 128;   assertEquals(128, c.red);   approxEq(128/255f, c.r)
+        c.green = 64;  assertEquals(64,  c.green); approxEq(64/255f,  c.g)
+        c.blue = 32;   assertEquals(32,  c.blue);  approxEq(32/255f,  c.b)
+        c.alpha = 200; assertEquals(200, c.alpha); approxEq(200/255f, c.a)
+    }
+
+    @Test fun `hsl channel setters update RGB`() {
+        val c = CSSColor.parseColor("hsl(0,100%,50%)") // red
+        c.hue = 120f   // → green
+        assertEquals(0,   c.red)
+        assertEquals(255, c.green)
+        assertEquals(0,   c.blue)
+
+        c.saturation = 0f  // → gray
+        assertTrue(c.red == c.green && c.green == c.blue)
+    }
+
+    @Test fun `convenience modifiers chain as expected`() {
+        val c = CSSColor.parseColor("#888888")
+            .lighten(0.1f)
+            .saturate(0.2f)
+            .rotateHue(45f)
+
+        approxEq(0.633f, c.lightness, eps = 1e-3f)
+        approxEq(0.2f,   c.saturation, eps = 1e-3f)
+        approxEq(45f,    c.hue)
+    }
+
+    @Test
+    fun `invalid formats throw IllegalArgumentException`() {
+        listOf("", "rgb()", "hsl(0,0)", "#12", "rgba(0,0,0,150%)", "hsla(0,0%,0%,2)").forEach { bad ->
+            try {
+                CSSColor.parseColor(bad)
+                assert(false)
+            } catch (e: Throwable) {
+
+            }
+        }
+    }
+
+    @Test fun `out‐of‐range RGB ints clamp`() {
+        val c = CSSColor.parseColor("rgb(300,-20, 260)")
+        assertEquals(255, c.red)
+        assertEquals(0,   c.green)
+        assertEquals(255, c.blue)
+    }
+
+    @Test fun `parser is case- and whitespace-tolerant`() {
+        val a = CSSColor.parseColor("  RgB(  10 ,20,  30 )")
+        assertEquals(10,  a.red)
+        assertEquals(20,  a.green)
+        assertEquals(30,  a.blue)
+
+        val b = CSSColor.parseColor("   ReBeCcaPURple ")
+        assertEquals(0x66, b.red)
+        assertEquals(0x33, b.green)
+        assertEquals(0x99, b.blue)
+    }
+
+    @Test fun `hsl lightness extremes`() {
+        // lightness = 0 → black
+        val black = CSSColor.parseColor("hsl(123,45%,0%)")
+        assertEquals(0, black.red)
+        assertEquals(0, black.green)
+        assertEquals(0, black.blue)
+        // lightness = 100% → white
+        val white = CSSColor.parseColor("hsl(321,55%,100%)")
+        assertEquals(255, white.red)
+        assertEquals(255, white.green)
+        assertEquals(255, white.blue)
+        // saturation = 0 → gray (r==g==b)
+        val gray  = CSSColor.parseColor("hsl(50,0%,60%)")
+        assertTrue(gray.red == gray.green && gray.green == gray.blue)
+    }
+
+    @Test fun `hsl negative and large hues wrap`() {
+        val c1 = CSSColor.parseColor("hsl(-120,100%,50%)")  // → same as 240°
+        assertEquals(0,   c1.red)
+        assertEquals(0,   c1.green)
+        assertEquals(255, c1.blue)
+
+        val c2 = CSSColor.parseColor("hsl(480,100%,50%)")   // → same as 120°
+        assertEquals(0,   c2.red)
+        assertEquals(255, c2.green)
+        assertEquals(0,   c2.blue)
+    }
+
+    @Test fun `lighten then darken returns original`() {
+        val base = CSSColor.parseColor("#123456")
+        val round = base.lighten(0.2f).darken(0.2f)
+        approxEq(base.r, round.r)
+        approxEq(base.g, round.g)
+        approxEq(base.b, round.b)
+    }
+}

app/src/test/java/com/futo/platformplayer/NoiseProtocolTests.kt

@@ -26,7 +26,7 @@ import java.util.Random
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 
-
+/*
 class NoiseProtocolTest {
     constructor() {
         Logger.setLogConsumers(listOf(
@@ -625,4 +625,4 @@ class NoiseProtocolTest {
                 throw Exception("Byte mismatch at index ${i}")
         }
     }
-}
+}*/