9 Commits

Author SHA1 Message Date
6e738c18d5 1.0.9 2026-11-15 17:53:04 -05:00
2c094e254d playback improvements, dependancy updates, and updated SDK 2026-11-15 16:19:18 -05:00
97c45f14c2 Update SDK version 2026-10-28 10:21:44 -04:00
3d59612d6e Implemented automatic fallback for sources. 2026-10-28 10:20:00 -04:00
bd7d443f21 fixed next episode prompt displaying way too early; update sdk 2026-10-25 22:15:13 -04:00
Devin Bot
8cd9ec3671 updated gitignore 2026-10-24 20:55:11 -07:00
Devin Bot
d6e7ded9ac 1.0.8 2026-10-24 20:53:20 -07:00
Devin Bot
dd2445c86b updated gitignore 2026-10-24 20:52:04 -07:00
Devin Bot
7f68419c2a updated vyla sdk 2026-10-24 20:51:16 -07:00
13 changed files with 812 additions and 167 deletions

4
.gitignore vendored
View File

@@ -7,3 +7,7 @@ android/.gradle/
*.apk *.apk
.env .env
.build .build
www/
android/app/src/main/assets/
release/
android/app/src/main/res/raw/*.crt

View File

@@ -11,7 +11,7 @@ android {
minSdkVersion 24 minSdkVersion 24
targetSdkVersion 34 targetSdkVersion 34
versionCode 1 versionCode 1
versionName "1.0.0" versionName "1.0.9"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }

File diff suppressed because one or more lines are too long

View File

@@ -79,6 +79,7 @@ import kotlinx.coroutines.flow.first
import kotlinx.coroutines.withTimeoutOrNull import kotlinx.coroutines.withTimeoutOrNull
import tv.vyla.app.ui.components.VideoTintSampler import tv.vyla.app.ui.components.VideoTintSampler
import tv.vyla.app.ui.components.videoTint import tv.vyla.app.ui.components.videoTint
import android.util.Log
enum class ActivePlayerMenu { enum class ActivePlayerMenu {
NONE, QUALITY, SUBTITLES, VOLUME, SETTINGS, MORE NONE, QUALITY, SUBTITLES, VOLUME, SETTINGS, MORE
@@ -151,6 +152,7 @@ fun PlayerScreen(
} }
} }
} }
fun showControlsAndFocusPlay() { fun showControlsAndFocusPlay() {
areControlsVisible = true areControlsVisible = true
resetHideTimer() resetHideTimer()
@@ -161,6 +163,7 @@ fun PlayerScreen(
} catch (_: Exception) {} } catch (_: Exception) {}
} }
} }
val exoPlayer = remember { val exoPlayer = remember {
ExoPlayer.Builder(context).build().apply { ExoPlayer.Builder(context).build().apply {
playWhenReady = true playWhenReady = true
@@ -171,6 +174,7 @@ fun PlayerScreen(
durationMs = duration.coerceAtLeast(0L) durationMs = duration.coerceAtLeast(0L)
} }
} }
override fun onIsPlayingChanged(playing: Boolean) { override fun onIsPlayingChanged(playing: Boolean) {
isPlaying = playing isPlaying = playing
if (playing) { if (playing) {
@@ -224,6 +228,37 @@ fun PlayerScreen(
exoPlayer.play() exoPlayer.play()
resetHideTimer() resetHideTimer()
} }
DisposableEffect(exoPlayer) {
val errorListener = object : Player.Listener { // source auto-fallback
override fun onPlayerError(error: androidx.media3.common.PlaybackException) {
val currentIdx = resolvedStreams.indexOf(activeStream)
if (currentIdx != -1 && currentIdx + 1 < resolvedStreams.size) {
// android.widget.Toast.makeText(context, "Source failed. Trying next...", android.widget.Toast.LENGTH_SHORT).show()
Log.e("vyla", "Source failed. Trying next...")
coroutineScope.launch {
delay(1500) // follow rate limits
val nextStream = resolvedStreams[currentIdx + 1]
activeStream = nextStream
playStream(nextStream.primaryUrl, nextStream.headers)
}
} else {
isBuffering = false
Log.e("vyla", "All Sources Failed")
android.widget.Toast.makeText(
context,
"All available sources failed. Please disable any VPN or try again later",
android.widget.Toast.LENGTH_LONG
).show()
}
}
}
exoPlayer.addListener(errorListener)
onDispose {
exoPlayer.removeListener(errorListener)
}
}
suspend fun focusEpisodeCard() { suspend fun focusEpisodeCard() {
var tries = 0 var tries = 0
while (tries < 15) { while (tries < 15) {
@@ -232,9 +267,11 @@ fun PlayerScreen(
try { try {
episodeFocusRequester.requestFocus() episodeFocusRequester.requestFocus()
return return
} catch (_: Exception) {} } catch (_: Exception) {
}
} }
} }
fun loadSeasonEpisodes(seasonNum: Int, focusFirst: Boolean = false) { fun loadSeasonEpisodes(seasonNum: Int, focusFirst: Boolean = false) {
selectedSeasonNum = seasonNum selectedSeasonNum = seasonNum
coroutineScope.launch { coroutineScope.launch {
@@ -300,7 +337,9 @@ fun PlayerScreen(
onFirstPlayable = { stream -> onFirstPlayable = { stream ->
coroutineScope.launch { coroutineScope.launch {
activeStream = stream activeStream = stream
resolvedStreams.add(stream) if (!resolvedStreams.any { it.provider == stream.provider }) {
resolvedStreams.add(stream)
}
playStream(stream.primaryUrl, stream.headers) playStream(stream.primaryUrl, stream.headers)
} }
}, },
@@ -337,26 +376,31 @@ fun PlayerScreen(
} }
BackHandler { BackHandler {
when { fun closeActiveMenu() {
activeMenu != ActivePlayerMenu.NONE -> { val closedMenu = activeMenu
val closedMenu = activeMenu activeMenu = ActivePlayerMenu.NONE
activeMenu = ActivePlayerMenu.NONE areControlsVisible = true
areControlsVisible = true resetHideTimer()
resetHideTimer() coroutineScope.launch {
coroutineScope.launch { delay(50)
delay(50) try {
try { when (closedMenu) {
when (closedMenu) { ActivePlayerMenu.QUALITY -> qualityButtonFocusRequester.requestFocus()
ActivePlayerMenu.QUALITY -> qualityButtonFocusRequester.requestFocus() ActivePlayerMenu.SUBTITLES -> ccButtonFocusRequester.requestFocus()
ActivePlayerMenu.SUBTITLES -> ccButtonFocusRequester.requestFocus() ActivePlayerMenu.VOLUME -> volButtonFocusRequester.requestFocus()
ActivePlayerMenu.VOLUME -> volButtonFocusRequester.requestFocus() ActivePlayerMenu.SETTINGS -> setButtonFocusRequester.requestFocus()
ActivePlayerMenu.SETTINGS -> setButtonFocusRequester.requestFocus() ActivePlayerMenu.MORE -> moreButtonFocusRequester.requestFocus()
ActivePlayerMenu.MORE -> moreButtonFocusRequester.requestFocus() else -> playPauseFocusRequester.requestFocus()
else -> playPauseFocusRequester.requestFocus() }
} } catch (_: Exception) {
} catch (_: Exception) {}
} }
} }
}
when {
activeMenu != ActivePlayerMenu.NONE -> {
closeActiveMenu()
}
isEpisodesDrawerOpen -> { isEpisodesDrawerOpen -> {
isEpisodesDrawerOpen = false isEpisodesDrawerOpen = false
areControlsVisible = true areControlsVisible = true
@@ -365,12 +409,20 @@ fun PlayerScreen(
delay(50) delay(50)
try { try {
episodesButtonFocusRequester.requestFocus() episodesButtonFocusRequester.requestFocus()
} catch (_: Exception) {} } catch (_: Exception) {
}
} }
} }
areControlsVisible -> { areControlsVisible -> {
hideControlsJob?.cancel()
areControlsVisible = false areControlsVisible = false
try {
playerContainerFocusRequester.requestFocus()
} catch (_: Exception) {
}
} }
else -> onBack() else -> onBack()
} }
} }
@@ -382,6 +434,7 @@ fun PlayerScreen(
idx >= 0 && (idx + 1 < allEpisodes.size || seasons.any { it.seasonNumber > ep.seasonNumber }) idx >= 0 && (idx + 1 < allEpisodes.size || seasons.any { it.seasonNumber > ep.seasonNumber })
} }
} }
fun playNextEpisode() { fun playNextEpisode() {
val ep = currentEpisode ?: return val ep = currentEpisode ?: return
val idx = allEpisodes.indexOfFirst { it.episodeNumber == ep.episodeNumber } val idx = allEpisodes.indexOfFirst { it.episodeNumber == ep.episodeNumber }
@@ -420,6 +473,25 @@ fun PlayerScreen(
playerViewRef?.videoSurfaceView playerViewRef?.videoSurfaceView
} }
fun closeActiveMenu() {
val closedMenu = activeMenu
activeMenu = ActivePlayerMenu.NONE
resetHideTimer()
coroutineScope.launch {
delay(50)
try {
when (closedMenu) {
ActivePlayerMenu.QUALITY -> qualityButtonFocusRequester.requestFocus()
ActivePlayerMenu.SUBTITLES -> ccButtonFocusRequester.requestFocus()
ActivePlayerMenu.VOLUME -> volButtonFocusRequester.requestFocus()
ActivePlayerMenu.SETTINGS -> setButtonFocusRequester.requestFocus()
ActivePlayerMenu.MORE -> moreButtonFocusRequester.requestFocus()
else -> playPauseFocusRequester.requestFocus()
}
} catch (_: Exception) {
}
}
}
Box( Box(
modifier = modifier modifier = modifier
.fillMaxSize() .fillMaxSize()
@@ -431,10 +503,14 @@ fun PlayerScreen(
val code = event.nativeKeyEvent.keyCode val code = event.nativeKeyEvent.keyCode
if (!areControlsVisible) { if (!areControlsVisible) {
if (code == KeyEvent.KEYCODE_BACK || code == KeyEvent.KEYCODE_ESCAPE) { // defer to backhandler
return@onKeyEvent false
}
val pendingSegment = activeSegment val pendingSegment = activeSegment
val isConfirm = code == KeyEvent.KEYCODE_DPAD_CENTER || val isConfirm = code == KeyEvent.KEYCODE_DPAD_CENTER ||
code == KeyEvent.KEYCODE_ENTER || code == KeyEvent.KEYCODE_ENTER ||
code == KeyEvent.KEYCODE_NUMPAD_ENTER code == KeyEvent.KEYCODE_NUMPAD_ENTER
if (pendingSegment != null && isConfirm && activeMenu == ActivePlayerMenu.NONE && !isEpisodesDrawerOpen) { if (pendingSegment != null && isConfirm && activeMenu == ActivePlayerMenu.NONE && !isEpisodesDrawerOpen) {
skipSegment(pendingSegment) skipSegment(pendingSegment)
return@onKeyEvent true return@onKeyEvent true
@@ -446,41 +522,70 @@ fun PlayerScreen(
return@onKeyEvent true return@onKeyEvent true
} }
if (code == KeyEvent.KEYCODE_BACK || code == KeyEvent.KEYCODE_ESCAPE) {
when {
activeMenu != ActivePlayerMenu.NONE -> {
return@onKeyEvent false // defer to backhandler
}
isEpisodesDrawerOpen -> {
return@onKeyEvent false // defer to backhandler
}
else -> { // hide controls
hideControlsJob?.cancel()
areControlsVisible = false
try {
playerContainerFocusRequester.requestFocus()
} catch (_: Exception) {
}
return@onKeyEvent true
}
}
}
when (code) { when (code) {
KeyEvent.KEYCODE_MEDIA_PLAY -> { KeyEvent.KEYCODE_MEDIA_PLAY -> {
exoPlayer.play() exoPlayer.play()
showControlsAndFocusPlay() showControlsAndFocusPlay()
return@onKeyEvent true return@onKeyEvent true
} }
KeyEvent.KEYCODE_MEDIA_PAUSE -> { KeyEvent.KEYCODE_MEDIA_PAUSE -> {
exoPlayer.pause() exoPlayer.pause()
showControlsAndFocusPlay() showControlsAndFocusPlay()
return@onKeyEvent true return@onKeyEvent true
} }
KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE -> { KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE -> {
if (exoPlayer.isPlaying) exoPlayer.pause() else exoPlayer.play() if (exoPlayer.isPlaying) exoPlayer.pause() else exoPlayer.play()
showControlsAndFocusPlay() showControlsAndFocusPlay()
return@onKeyEvent true return@onKeyEvent true
} }
KeyEvent.KEYCODE_MEDIA_FAST_FORWARD -> { KeyEvent.KEYCODE_MEDIA_FAST_FORWARD -> {
exoPlayer.seekTo((exoPlayer.currentPosition + 10000).coerceAtMost(exoPlayer.duration)) exoPlayer.seekTo((exoPlayer.currentPosition + 10000).coerceAtMost(exoPlayer.duration))
resetHideTimer() resetHideTimer()
return@onKeyEvent true return@onKeyEvent true
} }
KeyEvent.KEYCODE_MEDIA_REWIND -> { KeyEvent.KEYCODE_MEDIA_REWIND -> {
exoPlayer.seekTo((exoPlayer.currentPosition - 10000).coerceAtLeast(0)) exoPlayer.seekTo((exoPlayer.currentPosition - 10000).coerceAtLeast(0))
resetHideTimer() resetHideTimer()
return@onKeyEvent true return@onKeyEvent true
} }
KeyEvent.KEYCODE_SPACE -> { KeyEvent.KEYCODE_SPACE -> {
if (exoPlayer.isPlaying) exoPlayer.pause() else exoPlayer.play() if (exoPlayer.isPlaying) exoPlayer.pause() else exoPlayer.play()
showControlsAndFocusPlay() showControlsAndFocusPlay()
return@onKeyEvent true return@onKeyEvent true
} }
KeyEvent.KEYCODE_BACK -> { KeyEvent.KEYCODE_BACK -> {
resetHideTimer() resetHideTimer()
return@onKeyEvent false return@onKeyEvent false
} }
KeyEvent.KEYCODE_DPAD_CENTER -> { KeyEvent.KEYCODE_DPAD_CENTER -> {
resetHideTimer() resetHideTimer()
return@onKeyEvent false return@onKeyEvent false
@@ -499,7 +604,8 @@ fun PlayerScreen(
isFocusable = false isFocusable = false
isFocusableInTouchMode = false isFocusableInTouchMode = false
descendantFocusability = ViewGroup.FOCUS_BLOCK_DESCENDANTS descendantFocusability = ViewGroup.FOCUS_BLOCK_DESCENDANTS
resizeMode = if (isFillScreen) AspectRatioFrameLayout.RESIZE_MODE_ZOOM else AspectRatioFrameLayout.RESIZE_MODE_FIT resizeMode =
if (isFillScreen) AspectRatioFrameLayout.RESIZE_MODE_ZOOM else AspectRatioFrameLayout.RESIZE_MODE_FIT
layoutParams = FrameLayout.LayoutParams( layoutParams = FrameLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.MATCH_PARENT ViewGroup.LayoutParams.MATCH_PARENT
@@ -520,7 +626,7 @@ fun PlayerScreen(
} }
} }
val seg = activeSegment val seg = activeSegment
val showNextPrompt = isNextEpAvailable && durationMs > 0 && (durationMs - currentPositionMs) in 1..300000 val showNextPrompt = isNextEpAvailable && durationMs > 0 && (durationMs - currentPositionMs) in 1..30000
if ((seg != null || showNextPrompt) && activeMenu == ActivePlayerMenu.NONE && !isEpisodesDrawerOpen) { if ((seg != null || showNextPrompt) && activeMenu == ActivePlayerMenu.NONE && !isEpisodesDrawerOpen) {
Column( Column(
horizontalAlignment = Alignment.End, horizontalAlignment = Alignment.End,
@@ -751,7 +857,8 @@ fun PlayerScreen(
onLeftPress = { onLeftPress = {
try { try {
seekbarFocusRequester.requestFocus() seekbarFocusRequester.requestFocus()
} catch (_: Exception) {} } catch (_: Exception) {
}
}, },
onUpPress = { onUpPress = {
try { try {
@@ -770,6 +877,7 @@ fun PlayerScreen(
} }
} }
if (activeMenu != ActivePlayerMenu.NONE) { if (activeMenu != ActivePlayerMenu.NONE) {
var menuHasFocus by remember { mutableStateOf(false) }
Box( Box(
modifier = Modifier modifier = Modifier
.align(Alignment.TopEnd) .align(Alignment.TopEnd)
@@ -781,6 +889,30 @@ fun PlayerScreen(
.border(1.dp, Color(0x33FFFFFF), RoundedCornerShape(18.dp)) .border(1.dp, Color(0x33FFFFFF), RoundedCornerShape(18.dp))
.padding(14.dp) .padding(14.dp)
.zIndex(25f) .zIndex(25f)
.onFocusChanged { state ->
if (menuHasFocus && !state.hasFocus) {
// Focus navigated outside the menu popup: dismiss it
activeMenu = ActivePlayerMenu.NONE
resetHideTimer()
}
menuHasFocus = state.hasFocus
}
.onKeyEvent { event ->
if (event.type == KeyEventType.KeyDown) {
when (event.nativeKeyEvent.keyCode) {
KeyEvent.KEYCODE_BACK, KeyEvent.KEYCODE_ESCAPE -> {
closeActiveMenu()
return@onKeyEvent true
}
KeyEvent.KEYCODE_DPAD_LEFT -> {
closeActiveMenu()
return@onKeyEvent true
}
}
}
false
}
) { ) {
LazyColumn(modifier = Modifier.fillMaxWidth()) { LazyColumn(modifier = Modifier.fillMaxWidth()) {
when (activeMenu) { when (activeMenu) {
@@ -816,6 +948,7 @@ fun PlayerScreen(
} }
} }
} }
ActivePlayerMenu.SUBTITLES -> { ActivePlayerMenu.SUBTITLES -> {
item { item {
MenuSectionHeader("Subtitles") MenuSectionHeader("Subtitles")
@@ -870,7 +1003,11 @@ fun PlayerScreen(
horizontalArrangement = Arrangement.spacedBy(8.dp), horizontalArrangement = Arrangement.spacedBy(8.dp),
modifier = Modifier.padding(horizontal = 6.dp, vertical = 4.dp) modifier = Modifier.padding(horizontal = 6.dp, vertical = 4.dp)
) { ) {
listOf("White" to "#FFFFFF", "Yellow" to "#FFD700", "Cyan" to "#00FFFF").forEach { (name, hex) -> listOf(
"White" to "#FFFFFF",
"Yellow" to "#FFD700",
"Cyan" to "#00FFFF"
).forEach { (name, hex) ->
MiniSelectButton( MiniSelectButton(
text = name, text = name,
isSelected = subtitleColorHex == hex, isSelected = subtitleColorHex == hex,
@@ -880,6 +1017,7 @@ fun PlayerScreen(
} }
} }
} }
ActivePlayerMenu.VOLUME -> { ActivePlayerMenu.VOLUME -> {
item { item {
MenuSectionHeader("Volume Control") MenuSectionHeader("Volume Control")
@@ -931,14 +1069,16 @@ fun PlayerScreen(
) )
} }
} }
ActivePlayerMenu.SETTINGS -> { ActivePlayerMenu.SETTINGS -> {
item { item {
MenuSectionHeader("Available Sources (${resolvedStreams.size})") MenuSectionHeader("Available Sources (${resolvedStreams.size})")
} }
items(resolvedStreams) { stream -> itemsIndexed(resolvedStreams) { index, stream ->
MenuItemRow( MenuItemRow(
label = stream.label, label = stream.label,
isSelected = activeStream?.provider == stream.provider, isSelected = ((activeStream?.provider == stream.provider) && (activeStream?.primaryUrl == stream.primaryUrl)),
focusRequester = if (index == 0) menuFirstItemFocusRequester else null,
onClick = { onClick = {
activeStream = stream activeStream = stream
playStream(stream.primaryUrl, stream.headers) playStream(stream.primaryUrl, stream.headers)
@@ -984,6 +1124,7 @@ fun PlayerScreen(
) )
} }
} }
ActivePlayerMenu.MORE -> { ActivePlayerMenu.MORE -> {
item { item {
MenuSectionHeader("Library") MenuSectionHeader("Library")
@@ -1008,6 +1149,7 @@ fun PlayerScreen(
) )
} }
} }
else -> {} else -> {}
} }
} }
@@ -1074,7 +1216,8 @@ fun PlayerScreen(
delay(50) delay(50)
try { try {
episodesButtonFocusRequester.requestFocus() episodesButtonFocusRequester.requestFocus()
} catch (_: Exception) {} } catch (_: Exception) {
}
} }
} }
) )
@@ -1105,6 +1248,7 @@ fun PlayerScreen(
} }
} }
} }
@Composable @Composable
private fun PlayerCircleButton( private fun PlayerCircleButton(
icon: androidx.compose.ui.graphics.vector.ImageVector, icon: androidx.compose.ui.graphics.vector.ImageVector,
@@ -1125,6 +1269,8 @@ private fun PlayerCircleButton(
.videoTint(isFocused, isSelected) .videoTint(isFocused, isSelected)
.then(if (focusRequester != null) Modifier.focusRequester(focusRequester) else Modifier) .then(if (focusRequester != null) Modifier.focusRequester(focusRequester) else Modifier)
.onFocusChanged { isFocused = it.isFocused } .onFocusChanged { isFocused = it.isFocused }
.focusable()
.videoTint(isFocused, isSelected)
.onKeyEvent { event -> .onKeyEvent { event ->
if (event.type == KeyEventType.KeyDown && event.nativeKeyEvent.keyCode == KeyEvent.KEYCODE_DPAD_DOWN && onDownPress != null) { if (event.type == KeyEventType.KeyDown && event.nativeKeyEvent.keyCode == KeyEvent.KEYCODE_DPAD_DOWN && onDownPress != null) {
onDownPress() onDownPress()
@@ -1132,7 +1278,6 @@ private fun PlayerCircleButton(
} }
false false
} }
.focusable()
.clickable( .clickable(
interactionSource = remember { MutableInteractionSource() }, interactionSource = remember { MutableInteractionSource() },
indication = null indication = null
@@ -1146,6 +1291,7 @@ private fun PlayerCircleButton(
) )
} }
} }
@Composable @Composable
private fun PlayerEpisodesButton( private fun PlayerEpisodesButton(
focusRequester: FocusRequester, focusRequester: FocusRequester,
@@ -1171,6 +1317,7 @@ private fun PlayerEpisodesButton(
onLeftPress() onLeftPress()
return@onKeyEvent true return@onKeyEvent true
} }
KeyEvent.KEYCODE_DPAD_UP -> { KeyEvent.KEYCODE_DPAD_UP -> {
onUpPress() onUpPress()
return@onKeyEvent true return@onKeyEvent true
@@ -1193,6 +1340,7 @@ private fun PlayerEpisodesButton(
) )
} }
} }
@Composable @Composable
private fun PlayerCenterPlayButton( private fun PlayerCenterPlayButton(
isPlaying: Boolean, isPlaying: Boolean,
@@ -1232,6 +1380,7 @@ private fun PlayerCenterPlayButton(
) )
} }
} }
@Composable @Composable
private fun PlayerPillButton( private fun PlayerPillButton(
text: String, text: String,
@@ -1279,6 +1428,7 @@ private fun PlayerPillButton(
) )
} }
} }
@Composable @Composable
private fun PlayerSeekBar( private fun PlayerSeekBar(
currentPositionMs: Long, currentPositionMs: Long,
@@ -1297,7 +1447,10 @@ private fun PlayerSeekBar(
if (!isFocused) isScrubbingMode = false if (!isFocused) isScrubbingMode = false
} }
val barHeight by animateDpAsState(if (isFocused || isScrubbingMode) 6.dp else 4.dp, label = "bar_height") val barHeight by animateDpAsState(if (isFocused || isScrubbingMode) 6.dp else 4.dp, label = "bar_height")
val thumbScale by animateFloatAsState(if (isScrubbingMode) 1.5f else if (isFocused) 1.3f else 1.0f, label = "thumb_scale") val thumbScale by animateFloatAsState(
if (isScrubbingMode) 1.5f else if (isFocused) 1.3f else 1.0f,
label = "thumb_scale"
)
val progressFraction = if (durationMs > 0) (currentPositionMs.toFloat() / durationMs).coerceIn(0f, 1f) else 0f val progressFraction = if (durationMs > 0) (currentPositionMs.toFloat() / durationMs).coerceIn(0f, 1f) else 0f
val bufferFraction = if (durationMs > 0) (bufferedPositionMs.toFloat() / durationMs).coerceIn(0f, 1f) else 0f val bufferFraction = if (durationMs > 0) (bufferedPositionMs.toFloat() / durationMs).coerceIn(0f, 1f) else 0f
Box( Box(
@@ -1313,12 +1466,14 @@ private fun PlayerSeekBar(
onUpPress() onUpPress()
return@onKeyEvent true return@onKeyEvent true
} }
KeyEvent.KEYCODE_DPAD_DOWN -> { KeyEvent.KEYCODE_DPAD_DOWN -> {
if (onRequestEpisodesFocus != null) { if (onRequestEpisodesFocus != null) {
onRequestEpisodesFocus() onRequestEpisodesFocus()
return@onKeyEvent true return@onKeyEvent true
} }
} }
KeyEvent.KEYCODE_DPAD_RIGHT -> { KeyEvent.KEYCODE_DPAD_RIGHT -> {
if (isScrubbingMode) { if (isScrubbingMode) {
onSeekRight() onSeekRight()
@@ -1333,10 +1488,12 @@ private fun PlayerSeekBar(
} }
} }
} }
KeyEvent.KEYCODE_DPAD_LEFT -> { KeyEvent.KEYCODE_DPAD_LEFT -> {
onSeekLeft() onSeekLeft()
return@onKeyEvent true return@onKeyEvent true
} }
KeyEvent.KEYCODE_DPAD_CENTER, KeyEvent.KEYCODE_ENTER -> { KeyEvent.KEYCODE_DPAD_CENTER, KeyEvent.KEYCODE_ENTER -> {
isScrubbingMode = !isScrubbingMode isScrubbingMode = !isScrubbingMode
return@onKeyEvent true return@onKeyEvent true
@@ -1404,6 +1561,7 @@ private fun PlayerSeekBar(
} }
} }
} }
@Composable @Composable
private fun MenuSectionHeader(title: String) { private fun MenuSectionHeader(title: String) {
Text( Text(
@@ -1415,6 +1573,7 @@ private fun MenuSectionHeader(title: String) {
modifier = Modifier.padding(start = 12.dp, end = 12.dp, top = 12.dp, bottom = 6.dp) modifier = Modifier.padding(start = 12.dp, end = 12.dp, top = 12.dp, bottom = 6.dp)
) )
} }
@Composable @Composable
private fun MenuItemRow( private fun MenuItemRow(
label: String, label: String,
@@ -1459,6 +1618,7 @@ private fun MenuItemRow(
} }
} }
} }
@Composable @Composable
private fun MiniSelectButton( private fun MiniSelectButton(
text: String, text: String,
@@ -1493,6 +1653,7 @@ private fun MiniSelectButton(
) )
} }
} }
@Composable @Composable
private fun DrawerEpisodeCard( private fun DrawerEpisodeCard(
episode: Episode, episode: Episode,
@@ -1599,6 +1760,7 @@ private fun DrawerEpisodeCard(
} }
} }
} }
@Composable @Composable
private fun SeasonSelectChip( private fun SeasonSelectChip(
season: Season, season: Season,
@@ -1628,6 +1790,7 @@ private fun SeasonSelectChip(
) )
} }
} }
private fun formatTime(ms: Long): String { private fun formatTime(ms: Long): String {
val totalSeconds = (ms / 1000).coerceAtLeast(0) val totalSeconds = (ms / 1000).coerceAtLeast(0)
val hours = totalSeconds / 3600 val hours = totalSeconds / 3600

0
android/gradlew vendored Normal file → Executable file
View File

649
package-lock.json generated
View File

@@ -1,17 +1,17 @@
{ {
"name": "tv", "name": "tv",
"version": "1.0.7", "version": "1.0.9",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "tv", "name": "tv",
"version": "1.0.7", "version": "1.0.9",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@vyla-entertainment/sdk": "^1.14.0", "@vyla-entertainment/sdk": "^1.29.0",
"dotenv": "^16.4.5", "dotenv": "^16.4.5",
"express": "^4.19.2", "express": "^4.22.3",
"hls.js": "^1.7.3" "hls.js": "^1.7.3"
}, },
"devDependencies": { "devDependencies": {
@@ -19,6 +19,431 @@
"esbuild": "^0.25.12" "esbuild": "^0.25.12"
} }
}, },
"node_modules/@esbuild/aix-ppc64": {
"version": "0.25.12",
"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.12.tgz",
"integrity": "sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==",
"cpu": [
"ppc64"
],
"dev": true,
"license": "MIT",
"optional": true,
"os": [
"aix"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/android-arm": {
"version": "0.25.12",
"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.12.tgz",
"integrity": "sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg==",
"cpu": [
"arm"
],
"dev": true,
"license": "MIT",
"optional": true,
"os": [
"android"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/android-arm64": {
"version": "0.25.12",
"resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.12.tgz",
"integrity": "sha512-6AAmLG7zwD1Z159jCKPvAxZd4y/VTO0VkprYy+3N2FtJ8+BQWFXU+OxARIwA46c5tdD9SsKGZ/1ocqBS/gAKHg==",
"cpu": [
"arm64"
],
"dev": true,
"license": "MIT",
"optional": true,
"os": [
"android"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/android-x64": {
"version": "0.25.12",
"resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.12.tgz",
"integrity": "sha512-5jbb+2hhDHx5phYR2By8GTWEzn6I9UqR11Kwf22iKbNpYrsmRB18aX/9ivc5cabcUiAT/wM+YIZ6SG9QO6a8kg==",
"cpu": [
"x64"
],
"dev": true,
"license": "MIT",
"optional": true,
"os": [
"android"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/darwin-arm64": {
"version": "0.25.12",
"resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.12.tgz",
"integrity": "sha512-N3zl+lxHCifgIlcMUP5016ESkeQjLj/959RxxNYIthIg+CQHInujFuXeWbWMgnTo4cp5XVHqFPmpyu9J65C1Yg==",
"cpu": [
"arm64"
],
"dev": true,
"license": "MIT",
"optional": true,
"os": [
"darwin"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/darwin-x64": {
"version": "0.25.12",
"resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.12.tgz",
"integrity": "sha512-HQ9ka4Kx21qHXwtlTUVbKJOAnmG1ipXhdWTmNXiPzPfWKpXqASVcWdnf2bnL73wgjNrFXAa3yYvBSd9pzfEIpA==",
"cpu": [
"x64"
],
"dev": true,
"license": "MIT",
"optional": true,
"os": [
"darwin"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/freebsd-arm64": {
"version": "0.25.12",
"resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.12.tgz",
"integrity": "sha512-gA0Bx759+7Jve03K1S0vkOu5Lg/85dou3EseOGUes8flVOGxbhDDh/iZaoek11Y8mtyKPGF3vP8XhnkDEAmzeg==",
"cpu": [
"arm64"
],
"dev": true,
"license": "MIT",
"optional": true,
"os": [
"freebsd"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/freebsd-x64": {
"version": "0.25.12",
"resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.12.tgz",
"integrity": "sha512-TGbO26Yw2xsHzxtbVFGEXBFH0FRAP7gtcPE7P5yP7wGy7cXK2oO7RyOhL5NLiqTlBh47XhmIUXuGciXEqYFfBQ==",
"cpu": [
"x64"
],
"dev": true,
"license": "MIT",
"optional": true,
"os": [
"freebsd"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/linux-arm": {
"version": "0.25.12",
"resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.12.tgz",
"integrity": "sha512-lPDGyC1JPDou8kGcywY0YILzWlhhnRjdof3UlcoqYmS9El818LLfJJc3PXXgZHrHCAKs/Z2SeZtDJr5MrkxtOw==",
"cpu": [
"arm"
],
"dev": true,
"license": "MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/linux-arm64": {
"version": "0.25.12",
"resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.12.tgz",
"integrity": "sha512-8bwX7a8FghIgrupcxb4aUmYDLp8pX06rGh5HqDT7bB+8Rdells6mHvrFHHW2JAOPZUbnjUpKTLg6ECyzvas2AQ==",
"cpu": [
"arm64"
],
"dev": true,
"license": "MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/linux-ia32": {
"version": "0.25.12",
"resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.12.tgz",
"integrity": "sha512-0y9KrdVnbMM2/vG8KfU0byhUN+EFCny9+8g202gYqSSVMonbsCfLjUO+rCci7pM0WBEtz+oK/PIwHkzxkyharA==",
"cpu": [
"ia32"
],
"dev": true,
"license": "MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/linux-loong64": {
"version": "0.25.12",
"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.12.tgz",
"integrity": "sha512-h///Lr5a9rib/v1GGqXVGzjL4TMvVTv+s1DPoxQdz7l/AYv6LDSxdIwzxkrPW438oUXiDtwM10o9PmwS/6Z0Ng==",
"cpu": [
"loong64"
],
"dev": true,
"license": "MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/linux-mips64el": {
"version": "0.25.12",
"resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.12.tgz",
"integrity": "sha512-iyRrM1Pzy9GFMDLsXn1iHUm18nhKnNMWscjmp4+hpafcZjrr2WbT//d20xaGljXDBYHqRcl8HnxbX6uaA/eGVw==",
"cpu": [
"mips64el"
],
"dev": true,
"license": "MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/linux-ppc64": {
"version": "0.25.12",
"resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.12.tgz",
"integrity": "sha512-9meM/lRXxMi5PSUqEXRCtVjEZBGwB7P/D4yT8UG/mwIdze2aV4Vo6U5gD3+RsoHXKkHCfSxZKzmDssVlRj1QQA==",
"cpu": [
"ppc64"
],
"dev": true,
"license": "MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/linux-riscv64": {
"version": "0.25.12",
"resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.12.tgz",
"integrity": "sha512-Zr7KR4hgKUpWAwb1f3o5ygT04MzqVrGEGXGLnj15YQDJErYu/BGg+wmFlIDOdJp0PmB0lLvxFIOXZgFRrdjR0w==",
"cpu": [
"riscv64"
],
"dev": true,
"license": "MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/linux-s390x": {
"version": "0.25.12",
"resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.12.tgz",
"integrity": "sha512-MsKncOcgTNvdtiISc/jZs/Zf8d0cl/t3gYWX8J9ubBnVOwlk65UIEEvgBORTiljloIWnBzLs4qhzPkJcitIzIg==",
"cpu": [
"s390x"
],
"dev": true,
"license": "MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/linux-x64": {
"version": "0.25.12",
"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.12.tgz",
"integrity": "sha512-uqZMTLr/zR/ed4jIGnwSLkaHmPjOjJvnm6TVVitAa08SLS9Z0VM8wIRx7gWbJB5/J54YuIMInDquWyYvQLZkgw==",
"cpu": [
"x64"
],
"dev": true,
"license": "MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/netbsd-arm64": {
"version": "0.25.12",
"resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.12.tgz",
"integrity": "sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==",
"cpu": [
"arm64"
],
"dev": true,
"license": "MIT",
"optional": true,
"os": [
"netbsd"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/netbsd-x64": {
"version": "0.25.12",
"resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.12.tgz",
"integrity": "sha512-Ld5pTlzPy3YwGec4OuHh1aCVCRvOXdH8DgRjfDy/oumVovmuSzWfnSJg+VtakB9Cm0gxNO9BzWkj6mtO1FMXkQ==",
"cpu": [
"x64"
],
"dev": true,
"license": "MIT",
"optional": true,
"os": [
"netbsd"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/openbsd-arm64": {
"version": "0.25.12",
"resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.12.tgz",
"integrity": "sha512-fF96T6KsBo/pkQI950FARU9apGNTSlZGsv1jZBAlcLL1MLjLNIWPBkj5NlSz8aAzYKg+eNqknrUJ24QBybeR5A==",
"cpu": [
"arm64"
],
"dev": true,
"license": "MIT",
"optional": true,
"os": [
"openbsd"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/openbsd-x64": {
"version": "0.25.12",
"resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.12.tgz",
"integrity": "sha512-MZyXUkZHjQxUvzK7rN8DJ3SRmrVrke8ZyRusHlP+kuwqTcfWLyqMOE3sScPPyeIXN/mDJIfGXvcMqCgYKekoQw==",
"cpu": [
"x64"
],
"dev": true,
"license": "MIT",
"optional": true,
"os": [
"openbsd"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/openharmony-arm64": {
"version": "0.25.12",
"resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.12.tgz",
"integrity": "sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==",
"cpu": [
"arm64"
],
"dev": true,
"license": "MIT",
"optional": true,
"os": [
"openharmony"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/sunos-x64": {
"version": "0.25.12",
"resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.12.tgz",
"integrity": "sha512-3wGSCDyuTHQUzt0nV7bocDy72r2lI33QL3gkDNGkod22EsYl04sMf0qLb8luNKTOmgF/eDEDP5BFNwoBKH441w==",
"cpu": [
"x64"
],
"dev": true,
"license": "MIT",
"optional": true,
"os": [
"sunos"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/win32-arm64": {
"version": "0.25.12",
"resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.12.tgz",
"integrity": "sha512-rMmLrur64A7+DKlnSuwqUdRKyd3UE7oPJZmnljqEptesKM8wx9J8gx5u0+9Pq0fQQW8vqeKebwNXdfOyP+8Bsg==",
"cpu": [
"arm64"
],
"dev": true,
"license": "MIT",
"optional": true,
"os": [
"win32"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/win32-ia32": {
"version": "0.25.12",
"resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.12.tgz",
"integrity": "sha512-HkqnmmBoCbCwxUKKNPBixiWDGCpQGVsrQfJoVGYLPT41XWF8lHuE5N6WhVia2n4o5QK5M4tYr21827fNhi4byQ==",
"cpu": [
"ia32"
],
"dev": true,
"license": "MIT",
"optional": true,
"os": [
"win32"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/win32-x64": { "node_modules/@esbuild/win32-x64": {
"version": "0.25.12", "version": "0.25.12",
"resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.12.tgz", "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.12.tgz",
@@ -37,10 +462,13 @@
} }
}, },
"node_modules/@vyla-entertainment/sdk": { "node_modules/@vyla-entertainment/sdk": {
"version": "1.14.0", "version": "1.29.0",
"resolved": "https://registry.npmjs.org/@vyla-entertainment/sdk/-/sdk-1.14.0.tgz", "resolved": "https://registry.npmjs.org/@vyla-entertainment/sdk/-/sdk-1.29.0.tgz",
"integrity": "sha512-ZZm3xnfuWTDI0IU/UyGnPgFmSCFjPzIyb71EauggrFfRa6ZyjSrjNAAH8onbHyD5uO3TkJFUHF8VIeFJK8t/yA==", "integrity": "sha512-lg4YPEvYg9FOij2ZrFFV09Tict411VLQ5daRTrM8OaCjpZ2B5sgaC4UlaNBBhpxI6pMKib2/zOhEbo3krsDuUw==",
"license": "CC-BY-NC-4.0" "license": "CC-BY-NC-4.0",
"dependencies": {
"node-tls-client": "^2.1.0"
}
}, },
"node_modules/accepts": { "node_modules/accepts": {
"version": "1.3.8", "version": "1.3.8",
@@ -83,9 +511,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/body-parser": { "node_modules/body-parser": {
"version": "1.20.8", "version": "1.20.9",
"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.8.tgz", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.9.tgz",
"integrity": "sha512-JNcyFQ64OiijEkPzUBTCe+hyPXUD/3LEldGQ6iF5LR1w00mx9o7xtDWHXBY2iItjdCFGoilOLNQbH943ut7pHA==", "integrity": "sha512-FISIQxV5u91Y9gvuFq3q/tA/qTqLJn3AhRcEvyozyhJTh5OBFFtv827AdHU7Rbyct4r+Ba1/99oFa1Y3yuFsdw==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"bytes": "~3.1.2", "bytes": "~3.1.2",
@@ -106,21 +534,6 @@
"npm": "1.2.8000 || >= 1.4.16" "npm": "1.2.8000 || >= 1.4.16"
} }
}, },
"node_modules/body-parser/node_modules/debug": {
"version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
"license": "MIT",
"dependencies": {
"ms": "2.0.0"
}
},
"node_modules/body-parser/node_modules/ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
"license": "MIT"
},
"node_modules/buffer": { "node_modules/buffer": {
"version": "6.0.3", "version": "6.0.3",
"resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
@@ -220,6 +633,15 @@
"integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==", "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==",
"license": "MIT" "license": "MIT"
}, },
"node_modules/debug": {
"version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
"license": "MIT",
"dependencies": {
"ms": "2.0.0"
}
},
"node_modules/depd": { "node_modules/depd": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
@@ -272,12 +694,16 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/encodeurl": { "node_modules/encodeurl": {
"version": "2.0.0", "version": "2.0.3",
"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.3.tgz",
"integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "integrity": "sha512-mIteYONiEfc4xWf2F1WXovh1c8npzS00vNeiUPdwFF+QlVJni+gNvpQltLMQhob8rew/bWWc/bGTuUr0EUGt0w==",
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": ">= 0.8" "node": ">= 0.8"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/express"
} }
}, },
"node_modules/es-define-property": { "node_modules/es-define-property": {
@@ -413,21 +839,6 @@
"url": "https://opencollective.com/express" "url": "https://opencollective.com/express"
} }
}, },
"node_modules/express/node_modules/debug": {
"version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
"license": "MIT",
"dependencies": {
"ms": "2.0.0"
}
},
"node_modules/express/node_modules/ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
"license": "MIT"
},
"node_modules/finalhandler": { "node_modules/finalhandler": {
"version": "1.3.2", "version": "1.3.2",
"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.2.tgz", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.2.tgz",
@@ -446,21 +857,6 @@
"node": ">= 0.8" "node": ">= 0.8"
} }
}, },
"node_modules/finalhandler/node_modules/debug": {
"version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
"license": "MIT",
"dependencies": {
"ms": "2.0.0"
}
},
"node_modules/finalhandler/node_modules/ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
"license": "MIT"
},
"node_modules/forwarded": { "node_modules/forwarded": {
"version": "0.2.0", "version": "0.2.0",
"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@@ -562,9 +958,9 @@
} }
}, },
"node_modules/hls.js": { "node_modules/hls.js": {
"version": "1.7.3", "version": "1.7.4",
"resolved": "https://registry.npmjs.org/hls.js/-/hls.js-1.7.3.tgz", "resolved": "https://registry.npmjs.org/hls.js/-/hls.js-1.7.4.tgz",
"integrity": "sha512-MsPlx6yVW4Qv4C7mEVou4/gk/5cN2dVxOTnrNjPSmyH2f0Ln+/UkG10Ax1PE6OvrmTVPKgQYozTtBaPOuCzq7A==", "integrity": "sha512-3GlxGdPvT2YHvQYOt+yOzT/DEior/qJVNIylHA77kgeoBTdQQqi70GwefNEUmHQeNGyjC8U62+bruqW/Tpm+tg==",
"license": "Apache-2.0" "license": "Apache-2.0"
}, },
"node_modules/http-errors": { "node_modules/http-errors": {
@@ -635,6 +1031,16 @@
"node": ">= 0.10" "node": ">= 0.10"
} }
}, },
"node_modules/koffi": {
"version": "2.16.4",
"resolved": "https://registry.npmjs.org/koffi/-/koffi-2.16.4.tgz",
"integrity": "sha512-EE31wJCADvsUntlzrbWvSh9Eii6hRJRWYSREWqWnKT+f3j0PWt7cFp7Gzb6FKtEk/yBIJu/HxfzfDl+FcDp1Sg==",
"hasInstallScript": true,
"license": "MIT",
"funding": {
"url": "https://liberapay.com/Koromix"
}
},
"node_modules/math-intrinsics": { "node_modules/math-intrinsics": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
@@ -705,9 +1111,9 @@
} }
}, },
"node_modules/ms": { "node_modules/ms": {
"version": "2.1.3", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
"license": "MIT" "license": "MIT"
}, },
"node_modules/negotiator": { "node_modules/negotiator": {
@@ -719,6 +1125,19 @@
"node": ">= 0.6" "node": ">= 0.6"
} }
}, },
"node_modules/node-tls-client": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/node-tls-client/-/node-tls-client-2.2.1.tgz",
"integrity": "sha512-/uzT3igKfPmL7nAWR7wz07ASrBr50dd6KyGpOh/WRol2q1NseanGikQCF6OcBwdwZVRsRDBRAwaM3DUYZLPi8Q==",
"license": "GPL-3.0",
"dependencies": {
"koffi": "^2.15.2",
"tough-cookie": "^4.1.4"
},
"engines": {
"node": ">=20"
}
},
"node_modules/object-inspect": { "node_modules/object-inspect": {
"version": "1.13.4", "version": "1.13.4",
"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
@@ -732,15 +1151,19 @@
} }
}, },
"node_modules/on-finished": { "node_modules/on-finished": {
"version": "2.4.1", "version": "2.4.2",
"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.2.tgz",
"integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", "integrity": "sha512-ATWUv387i+nLD49EiDoOft5scf32Vsdz3ktrQJG9bi7jRFmaXTssvyvj1EmeKVVgvesbqUtvQQvaS2TpTukAZQ==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"ee-first": "1.1.1" "ee-first": "1.1.1"
}, },
"engines": { "engines": {
"node": ">= 0.8" "node": ">= 0.8"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/express"
} }
}, },
"node_modules/parseurl": { "node_modules/parseurl": {
@@ -775,10 +1198,31 @@
"url": "https://opencollective.com/express" "url": "https://opencollective.com/express"
} }
}, },
"node_modules/psl": {
"version": "1.15.0",
"resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz",
"integrity": "sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==",
"license": "MIT",
"dependencies": {
"punycode": "^2.3.1"
},
"funding": {
"url": "https://github.com/sponsors/lupomontero"
}
},
"node_modules/punycode": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
"integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
"license": "MIT",
"engines": {
"node": ">=6"
}
},
"node_modules/qs": { "node_modules/qs": {
"version": "6.16.0", "version": "6.16.2",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.16.0.tgz", "resolved": "https://registry.npmjs.org/qs/-/qs-6.16.2.tgz",
"integrity": "sha512-h6fhOIaRrID2CbEY2fqs+7t+UXZo+MLAnU5gRIq85uFtdiUPCdsApMlHhXogKVM4HM2DVbIjGNTTYH2OcmP1vA==", "integrity": "sha512-VYdnB5S7/0IeXzBacUtwNAaM6d7Y/PgYnNC7bJCI6meqA/OgnsQbZMtVW8Dt2D1PHgbHGtYmhSoEIgvt7xZ2ZA==",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"dependencies": { "dependencies": {
"es-define-property": "^1.0.1", "es-define-property": "^1.0.1",
@@ -791,6 +1235,12 @@
"url": "https://github.com/sponsors/ljharb" "url": "https://github.com/sponsors/ljharb"
} }
}, },
"node_modules/querystringify": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
"integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
"license": "MIT"
},
"node_modules/range-parser": { "node_modules/range-parser": {
"version": "1.2.1", "version": "1.2.1",
"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
@@ -815,6 +1265,12 @@
"node": ">= 0.8" "node": ">= 0.8"
} }
}, },
"node_modules/requires-port": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
"integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
"license": "MIT"
},
"node_modules/safe-buffer": { "node_modules/safe-buffer": {
"version": "5.2.1", "version": "5.2.1",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -865,19 +1321,10 @@
"node": ">= 0.8.0" "node": ">= 0.8.0"
} }
}, },
"node_modules/send/node_modules/debug": { "node_modules/send/node_modules/ms": {
"version": "2.6.9", "version": "2.1.3",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
"license": "MIT",
"dependencies": {
"ms": "2.0.0"
}
},
"node_modules/send/node_modules/debug/node_modules/ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
"license": "MIT" "license": "MIT"
}, },
"node_modules/serve-static": { "node_modules/serve-static": {
@@ -991,6 +1438,21 @@
"node": ">=0.6" "node": ">=0.6"
} }
}, },
"node_modules/tough-cookie": {
"version": "4.1.4",
"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz",
"integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
"license": "BSD-3-Clause",
"dependencies": {
"psl": "^1.1.33",
"punycode": "^2.1.1",
"universalify": "^0.2.0",
"url-parse": "^1.5.3"
},
"engines": {
"node": ">=6"
}
},
"node_modules/type-is": { "node_modules/type-is": {
"version": "1.6.18", "version": "1.6.18",
"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
@@ -1004,6 +1466,15 @@
"node": ">= 0.6" "node": ">= 0.6"
} }
}, },
"node_modules/universalify": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
"integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
"license": "MIT",
"engines": {
"node": ">= 4.0.0"
}
},
"node_modules/unpipe": { "node_modules/unpipe": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
@@ -1013,6 +1484,16 @@
"node": ">= 0.8" "node": ">= 0.8"
} }
}, },
"node_modules/url-parse": {
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
"integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
"license": "MIT",
"dependencies": {
"querystringify": "^2.1.1",
"requires-port": "^1.0.0"
}
},
"node_modules/utils-merge": { "node_modules/utils-merge": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",

View File

@@ -1,6 +1,6 @@
{ {
"name": "tv", "name": "tv",
"version": "1.0.7", "version": "1.0.9",
"description": "", "description": "",
"type": "module", "type": "module",
"scripts": { "scripts": {
@@ -9,9 +9,9 @@
"android": "node scripts/build-android.mjs" "android": "node scripts/build-android.mjs"
}, },
"dependencies": { "dependencies": {
"@vyla-entertainment/sdk": "^1.14.0", "@vyla-entertainment/sdk": "^1.29.0",
"dotenv": "^16.4.5", "dotenv": "^16.4.5",
"express": "^4.19.2", "express": "^4.22.3",
"hls.js": "^1.7.3" "hls.js": "^1.7.3"
}, },
"devDependencies": { "devDependencies": {
@@ -21,5 +21,9 @@
"main": "server.js", "main": "server.js",
"keywords": [], "keywords": [],
"author": "", "author": "",
"license": "ISC" "license": "ISC",
"allowScripts": {
"esbuild@0.25.12": true,
"koffi@2.16.4": true
}
} }

View File

@@ -1,6 +0,0 @@
{
"name": "Vyla TV",
"version": "1.0.6",
"package": "Vyla-TV_1.0.6.apk",
"releaseDate": "2026-10-06T03:41:56.445Z"
}

View File

@@ -56,14 +56,52 @@ globalThis.VylaLocal = {
`; `;
fs.writeFileSync(path.join(tmp, 'entry.js'), entry); fs.writeFileSync(path.join(tmp, 'entry.js'), entry);
const nodeStubPlugin = {
name: 'node-stub',
setup(build) {
build.onResolve(
{
filter: /^(node:|fs(\/promises)?$|path$|crypto$|https$|http$|events$|os$|stream$|util$|url$|zlib$|net$|tls$|child_process$|worker_threads$|async_hooks$|perf_hooks$|readline$|koffi$|piscina$|node-tls-client$)/,
},
(args) => ({
path: args.path,
namespace: 'node-stub',
})
);
build.onLoad({ filter: /^node-tls-client$/, namespace: 'node-stub' }, () => ({
contents: `
export const ClientIdentifier = {};
export const destroyTLS = async () => {};
export const initTLS = async () => {};
export class Session {
async get() { throw new Error('node-tls-client not supported in webview'); }
async post() { throw new Error('node-tls-client not supported on webview'); }
async close() {}
}
export default { ClientIdentifier, destroyTLS, initTLS, Session };
`,
loader: 'js',
}));
build.onLoad({ filter: /.*/, namespace: 'node-stub' }, () => ({
contents: 'module.exports = {};',
loader: 'js',
}));
},
};
await build({ await build({
entryPoints: [path.join(tmp, 'entry.js')], entryPoints: [path.join(tmp, 'entry.js')],
bundle: true, bundle: true,
format: 'iife', format: 'iife',
target: 'chrome70', target: 'chrome70',
platform: 'browser', platform: 'browser',
plugins: [nodeStubPlugin],
minify: true, minify: true,
alias: { 'node:crypto': path.join(shim, 'crypto.js') }, alias: {
'node:crypto': path.join(shim, 'crypto.js')
},
inject: [path.join(shim, 'inject.js')], inject: [path.join(shim, 'inject.js')],
outfile: path.join(www, 'js/vyla-local.js'), outfile: path.join(www, 'js/vyla-local.js'),
logLevel: 'info' logLevel: 'info'

1
scripts/empty-shim.js Normal file
View File

@@ -0,0 +1 @@
export default {};

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

4
www/js/hls.min.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long