From 2c094e254d5425fbd015ad5eab4bb644a7804c69 Mon Sep 17 00:00:00 2001 From: zstrike Date: Sun, 15 Nov 2026 16:19:18 -0500 Subject: [PATCH] playback improvements, dependancy updates, and updated SDK --- .../tv/vyla/app/ui/screens/PlayerScreen.kt | 229 ++++- package-lock.json | 899 ++++++++++-------- package.json | 10 +- scripts/build-android.mjs | 40 +- scripts/empty-shim.js | 1 + 5 files changed, 704 insertions(+), 475 deletions(-) create mode 100644 scripts/empty-shim.js diff --git a/android/app/src/main/java/tv/vyla/app/ui/screens/PlayerScreen.kt b/android/app/src/main/java/tv/vyla/app/ui/screens/PlayerScreen.kt index 52a7212..2a85556 100644 --- a/android/app/src/main/java/tv/vyla/app/ui/screens/PlayerScreen.kt +++ b/android/app/src/main/java/tv/vyla/app/ui/screens/PlayerScreen.kt @@ -152,6 +152,7 @@ fun PlayerScreen( } } } + fun showControlsAndFocusPlay() { areControlsVisible = true resetHideTimer() @@ -162,6 +163,7 @@ fun PlayerScreen( } catch (_: Exception) {} } } + val exoPlayer = remember { ExoPlayer.Builder(context).build().apply { playWhenReady = true @@ -172,6 +174,7 @@ fun PlayerScreen( durationMs = duration.coerceAtLeast(0L) } } + override fun onIsPlayingChanged(playing: Boolean) { isPlaying = playing if (playing) { @@ -226,32 +229,36 @@ fun PlayerScreen( 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...") + 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) + 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() } - } 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) + } } - exoPlayer.addListener(errorListener) - - onDispose { - exoPlayer.removeListener(errorListener) - } -} suspend fun focusEpisodeCard() { var tries = 0 while (tries < 15) { @@ -260,9 +267,11 @@ fun PlayerScreen( try { episodeFocusRequester.requestFocus() return - } catch (_: Exception) {} + } catch (_: Exception) { + } } } + fun loadSeasonEpisodes(seasonNum: Int, focusFirst: Boolean = false) { selectedSeasonNum = seasonNum coroutineScope.launch { @@ -367,26 +376,31 @@ fun PlayerScreen( } BackHandler { - when { - activeMenu != ActivePlayerMenu.NONE -> { - val closedMenu = activeMenu - activeMenu = ActivePlayerMenu.NONE - areControlsVisible = true - 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) {} + fun closeActiveMenu() { + val closedMenu = activeMenu + activeMenu = ActivePlayerMenu.NONE + areControlsVisible = true + 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) { } } + } + when { + activeMenu != ActivePlayerMenu.NONE -> { + closeActiveMenu() + } + isEpisodesDrawerOpen -> { isEpisodesDrawerOpen = false areControlsVisible = true @@ -395,12 +409,20 @@ fun PlayerScreen( delay(50) try { episodesButtonFocusRequester.requestFocus() - } catch (_: Exception) {} + } catch (_: Exception) { + } } } + areControlsVisible -> { + hideControlsJob?.cancel() areControlsVisible = false + try { + playerContainerFocusRequester.requestFocus() + } catch (_: Exception) { + } } + else -> onBack() } } @@ -412,6 +434,7 @@ fun PlayerScreen( idx >= 0 && (idx + 1 < allEpisodes.size || seasons.any { it.seasonNumber > ep.seasonNumber }) } } + fun playNextEpisode() { val ep = currentEpisode ?: return val idx = allEpisodes.indexOfFirst { it.episodeNumber == ep.episodeNumber } @@ -450,6 +473,25 @@ fun PlayerScreen( 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( modifier = modifier .fillMaxSize() @@ -461,10 +503,14 @@ fun PlayerScreen( val code = event.nativeKeyEvent.keyCode if (!areControlsVisible) { + if (code == KeyEvent.KEYCODE_BACK || code == KeyEvent.KEYCODE_ESCAPE) { // defer to backhandler + return@onKeyEvent false + } val pendingSegment = activeSegment val isConfirm = code == KeyEvent.KEYCODE_DPAD_CENTER || code == KeyEvent.KEYCODE_ENTER || code == KeyEvent.KEYCODE_NUMPAD_ENTER + if (pendingSegment != null && isConfirm && activeMenu == ActivePlayerMenu.NONE && !isEpisodesDrawerOpen) { skipSegment(pendingSegment) return@onKeyEvent true @@ -476,41 +522,70 @@ fun PlayerScreen( 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) { KeyEvent.KEYCODE_MEDIA_PLAY -> { exoPlayer.play() showControlsAndFocusPlay() return@onKeyEvent true } + KeyEvent.KEYCODE_MEDIA_PAUSE -> { exoPlayer.pause() showControlsAndFocusPlay() return@onKeyEvent true } + KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE -> { if (exoPlayer.isPlaying) exoPlayer.pause() else exoPlayer.play() showControlsAndFocusPlay() return@onKeyEvent true } + KeyEvent.KEYCODE_MEDIA_FAST_FORWARD -> { exoPlayer.seekTo((exoPlayer.currentPosition + 10000).coerceAtMost(exoPlayer.duration)) resetHideTimer() return@onKeyEvent true } + KeyEvent.KEYCODE_MEDIA_REWIND -> { exoPlayer.seekTo((exoPlayer.currentPosition - 10000).coerceAtLeast(0)) resetHideTimer() return@onKeyEvent true } + KeyEvent.KEYCODE_SPACE -> { if (exoPlayer.isPlaying) exoPlayer.pause() else exoPlayer.play() showControlsAndFocusPlay() return@onKeyEvent true } + KeyEvent.KEYCODE_BACK -> { resetHideTimer() return@onKeyEvent false } + KeyEvent.KEYCODE_DPAD_CENTER -> { resetHideTimer() return@onKeyEvent false @@ -529,7 +604,8 @@ fun PlayerScreen( isFocusable = false isFocusableInTouchMode = false 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( ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT @@ -781,7 +857,8 @@ fun PlayerScreen( onLeftPress = { try { seekbarFocusRequester.requestFocus() - } catch (_: Exception) {} + } catch (_: Exception) { + } }, onUpPress = { try { @@ -800,6 +877,7 @@ fun PlayerScreen( } } if (activeMenu != ActivePlayerMenu.NONE) { + var menuHasFocus by remember { mutableStateOf(false) } Box( modifier = Modifier .align(Alignment.TopEnd) @@ -811,6 +889,30 @@ fun PlayerScreen( .border(1.dp, Color(0x33FFFFFF), RoundedCornerShape(18.dp)) .padding(14.dp) .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()) { when (activeMenu) { @@ -846,6 +948,7 @@ fun PlayerScreen( } } } + ActivePlayerMenu.SUBTITLES -> { item { MenuSectionHeader("Subtitles") @@ -900,7 +1003,11 @@ fun PlayerScreen( horizontalArrangement = Arrangement.spacedBy(8.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( text = name, isSelected = subtitleColorHex == hex, @@ -910,6 +1017,7 @@ fun PlayerScreen( } } } + ActivePlayerMenu.VOLUME -> { item { MenuSectionHeader("Volume Control") @@ -961,14 +1069,16 @@ fun PlayerScreen( ) } } + ActivePlayerMenu.SETTINGS -> { item { MenuSectionHeader("Available Sources (${resolvedStreams.size})") } - items(resolvedStreams) { stream -> + itemsIndexed(resolvedStreams) { index, stream -> MenuItemRow( label = stream.label, isSelected = ((activeStream?.provider == stream.provider) && (activeStream?.primaryUrl == stream.primaryUrl)), + focusRequester = if (index == 0) menuFirstItemFocusRequester else null, onClick = { activeStream = stream playStream(stream.primaryUrl, stream.headers) @@ -1014,6 +1124,7 @@ fun PlayerScreen( ) } } + ActivePlayerMenu.MORE -> { item { MenuSectionHeader("Library") @@ -1038,6 +1149,7 @@ fun PlayerScreen( ) } } + else -> {} } } @@ -1104,7 +1216,8 @@ fun PlayerScreen( delay(50) try { episodesButtonFocusRequester.requestFocus() - } catch (_: Exception) {} + } catch (_: Exception) { + } } } ) @@ -1135,6 +1248,7 @@ fun PlayerScreen( } } } + @Composable private fun PlayerCircleButton( icon: androidx.compose.ui.graphics.vector.ImageVector, @@ -1155,6 +1269,8 @@ private fun PlayerCircleButton( .videoTint(isFocused, isSelected) .then(if (focusRequester != null) Modifier.focusRequester(focusRequester) else Modifier) .onFocusChanged { isFocused = it.isFocused } + .focusable() + .videoTint(isFocused, isSelected) .onKeyEvent { event -> if (event.type == KeyEventType.KeyDown && event.nativeKeyEvent.keyCode == KeyEvent.KEYCODE_DPAD_DOWN && onDownPress != null) { onDownPress() @@ -1162,7 +1278,6 @@ private fun PlayerCircleButton( } false } - .focusable() .clickable( interactionSource = remember { MutableInteractionSource() }, indication = null @@ -1176,6 +1291,7 @@ private fun PlayerCircleButton( ) } } + @Composable private fun PlayerEpisodesButton( focusRequester: FocusRequester, @@ -1201,6 +1317,7 @@ private fun PlayerEpisodesButton( onLeftPress() return@onKeyEvent true } + KeyEvent.KEYCODE_DPAD_UP -> { onUpPress() return@onKeyEvent true @@ -1223,6 +1340,7 @@ private fun PlayerEpisodesButton( ) } } + @Composable private fun PlayerCenterPlayButton( isPlaying: Boolean, @@ -1262,6 +1380,7 @@ private fun PlayerCenterPlayButton( ) } } + @Composable private fun PlayerPillButton( text: String, @@ -1309,6 +1428,7 @@ private fun PlayerPillButton( ) } } + @Composable private fun PlayerSeekBar( currentPositionMs: Long, @@ -1327,7 +1447,10 @@ private fun PlayerSeekBar( if (!isFocused) isScrubbingMode = false } 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 bufferFraction = if (durationMs > 0) (bufferedPositionMs.toFloat() / durationMs).coerceIn(0f, 1f) else 0f Box( @@ -1343,12 +1466,14 @@ private fun PlayerSeekBar( onUpPress() return@onKeyEvent true } + KeyEvent.KEYCODE_DPAD_DOWN -> { if (onRequestEpisodesFocus != null) { onRequestEpisodesFocus() return@onKeyEvent true } } + KeyEvent.KEYCODE_DPAD_RIGHT -> { if (isScrubbingMode) { onSeekRight() @@ -1363,10 +1488,12 @@ private fun PlayerSeekBar( } } } + KeyEvent.KEYCODE_DPAD_LEFT -> { onSeekLeft() return@onKeyEvent true } + KeyEvent.KEYCODE_DPAD_CENTER, KeyEvent.KEYCODE_ENTER -> { isScrubbingMode = !isScrubbingMode return@onKeyEvent true @@ -1434,6 +1561,7 @@ private fun PlayerSeekBar( } } } + @Composable private fun MenuSectionHeader(title: String) { Text( @@ -1445,6 +1573,7 @@ private fun MenuSectionHeader(title: String) { modifier = Modifier.padding(start = 12.dp, end = 12.dp, top = 12.dp, bottom = 6.dp) ) } + @Composable private fun MenuItemRow( label: String, @@ -1489,6 +1618,7 @@ private fun MenuItemRow( } } } + @Composable private fun MiniSelectButton( text: String, @@ -1523,6 +1653,7 @@ private fun MiniSelectButton( ) } } + @Composable private fun DrawerEpisodeCard( episode: Episode, @@ -1629,6 +1760,7 @@ private fun DrawerEpisodeCard( } } } + @Composable private fun SeasonSelectChip( season: Season, @@ -1658,6 +1790,7 @@ private fun SeasonSelectChip( ) } } + private fun formatTime(ms: Long): String { val totalSeconds = (ms / 1000).coerceAtLeast(0) val hours = totalSeconds / 3600 diff --git a/package-lock.json b/package-lock.json index aa39f31..752feaf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,9 +9,9 @@ "version": "1.0.8", "license": "ISC", "dependencies": { - "@vyla-entertainment/sdk": "^1.20.0", + "@vyla-entertainment/sdk": "^1.29.0", "dotenv": "^16.4.5", - "express": "^4.19.2", + "express": "^4.22.3", "hls.js": "^1.7.3" }, "devDependencies": { @@ -19,6 +19,431 @@ "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": { "version": "0.25.12", "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.12.tgz", @@ -36,315 +461,10 @@ "node": ">=18" } }, - "node_modules/@napi-rs/nice": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@napi-rs/nice/-/nice-1.1.1.tgz", - "integrity": "sha512-xJIPs+bYuc9ASBl+cvGsKbGrJmS6fAKaSZCnT0lhahT5rhA2VVy9/EcIgd2JhtEuFOJNx7UHNn/qiTPTY4nrQw==", - "license": "MIT", - "optional": true, - "engines": { - "node": ">= 10" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/Brooooooklyn" - }, - "optionalDependencies": { - "@napi-rs/nice-android-arm-eabi": "1.1.1", - "@napi-rs/nice-android-arm64": "1.1.1", - "@napi-rs/nice-darwin-arm64": "1.1.1", - "@napi-rs/nice-darwin-x64": "1.1.1", - "@napi-rs/nice-freebsd-x64": "1.1.1", - "@napi-rs/nice-linux-arm-gnueabihf": "1.1.1", - "@napi-rs/nice-linux-arm64-gnu": "1.1.1", - "@napi-rs/nice-linux-arm64-musl": "1.1.1", - "@napi-rs/nice-linux-ppc64-gnu": "1.1.1", - "@napi-rs/nice-linux-riscv64-gnu": "1.1.1", - "@napi-rs/nice-linux-s390x-gnu": "1.1.1", - "@napi-rs/nice-linux-x64-gnu": "1.1.1", - "@napi-rs/nice-linux-x64-musl": "1.1.1", - "@napi-rs/nice-openharmony-arm64": "1.1.1", - "@napi-rs/nice-win32-arm64-msvc": "1.1.1", - "@napi-rs/nice-win32-ia32-msvc": "1.1.1", - "@napi-rs/nice-win32-x64-msvc": "1.1.1" - } - }, - "node_modules/@napi-rs/nice-android-arm-eabi": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-android-arm-eabi/-/nice-android-arm-eabi-1.1.1.tgz", - "integrity": "sha512-kjirL3N6TnRPv5iuHw36wnucNqXAO46dzK9oPb0wj076R5Xm8PfUVA9nAFB5ZNMmfJQJVKACAPd/Z2KYMppthw==", - "cpu": [ - "arm" - ], - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@napi-rs/nice-android-arm64": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-android-arm64/-/nice-android-arm64-1.1.1.tgz", - "integrity": "sha512-blG0i7dXgbInN5urONoUCNf+DUEAavRffrO7fZSeoRMJc5qD+BJeNcpr54msPF6qfDD6kzs9AQJogZvT2KD5nw==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@napi-rs/nice-darwin-arm64": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-darwin-arm64/-/nice-darwin-arm64-1.1.1.tgz", - "integrity": "sha512-s/E7w45NaLqTGuOjC2p96pct4jRfo61xb9bU1unM/MJ/RFkKlJyJDx7OJI/O0ll/hrfpqKopuAFDV8yo0hfT7A==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@napi-rs/nice-darwin-x64": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-darwin-x64/-/nice-darwin-x64-1.1.1.tgz", - "integrity": "sha512-dGoEBnVpsdcC+oHHmW1LRK5eiyzLwdgNQq3BmZIav+9/5WTZwBYX7r5ZkQC07Nxd3KHOCkgbHSh4wPkH1N1LiQ==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@napi-rs/nice-freebsd-x64": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-freebsd-x64/-/nice-freebsd-x64-1.1.1.tgz", - "integrity": "sha512-kHv4kEHAylMYmlNwcQcDtXjklYp4FCf0b05E+0h6nDHsZ+F0bDe04U/tXNOqrx5CmIAth4vwfkjjUmp4c4JktQ==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@napi-rs/nice-linux-arm-gnueabihf": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-arm-gnueabihf/-/nice-linux-arm-gnueabihf-1.1.1.tgz", - "integrity": "sha512-E1t7K0efyKXZDoZg1LzCOLxgolxV58HCkaEkEvIYQx12ht2pa8hoBo+4OB3qh7e+QiBlp1SRf+voWUZFxyhyqg==", - "cpu": [ - "arm" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@napi-rs/nice-linux-arm64-gnu": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-arm64-gnu/-/nice-linux-arm64-gnu-1.1.1.tgz", - "integrity": "sha512-CIKLA12DTIZlmTaaKhQP88R3Xao+gyJxNWEn04wZwC2wmRapNnxCUZkVwggInMJvtVElA+D4ZzOU5sX4jV+SmQ==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@napi-rs/nice-linux-arm64-musl": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-arm64-musl/-/nice-linux-arm64-musl-1.1.1.tgz", - "integrity": "sha512-+2Rzdb3nTIYZ0YJF43qf2twhqOCkiSrHx2Pg6DJaCPYhhaxbLcdlV8hCRMHghQ+EtZQWGNcS2xF4KxBhSGeutg==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@napi-rs/nice-linux-ppc64-gnu": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-ppc64-gnu/-/nice-linux-ppc64-gnu-1.1.1.tgz", - "integrity": "sha512-4FS8oc0GeHpwvv4tKciKkw3Y4jKsL7FRhaOeiPei0X9T4Jd619wHNe4xCLmN2EMgZoeGg+Q7GY7BsvwKpL22Tg==", - "cpu": [ - "ppc64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@napi-rs/nice-linux-riscv64-gnu": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-riscv64-gnu/-/nice-linux-riscv64-gnu-1.1.1.tgz", - "integrity": "sha512-HU0nw9uD4FO/oGCCk409tCi5IzIZpH2agE6nN4fqpwVlCn5BOq0MS1dXGjXaG17JaAvrlpV5ZeyZwSon10XOXw==", - "cpu": [ - "riscv64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@napi-rs/nice-linux-s390x-gnu": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-s390x-gnu/-/nice-linux-s390x-gnu-1.1.1.tgz", - "integrity": "sha512-2YqKJWWl24EwrX0DzCQgPLKQBxYDdBxOHot1KWEq7aY2uYeX+Uvtv4I8xFVVygJDgf6/92h9N3Y43WPx8+PAgQ==", - "cpu": [ - "s390x" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@napi-rs/nice-linux-x64-gnu": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-x64-gnu/-/nice-linux-x64-gnu-1.1.1.tgz", - "integrity": "sha512-/gaNz3R92t+dcrfCw/96pDopcmec7oCcAQ3l/M+Zxr82KT4DljD37CpgrnXV+pJC263JkW572pdbP3hP+KjcIg==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@napi-rs/nice-linux-x64-musl": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-x64-musl/-/nice-linux-x64-musl-1.1.1.tgz", - "integrity": "sha512-xScCGnyj/oppsNPMnevsBe3pvNaoK7FGvMjT35riz9YdhB2WtTG47ZlbxtOLpjeO9SqqQ2J2igCmz6IJOD5JYw==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@napi-rs/nice-openharmony-arm64": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-openharmony-arm64/-/nice-openharmony-arm64-1.1.1.tgz", - "integrity": "sha512-6uJPRVwVCLDeoOaNyeiW0gp2kFIM4r7PL2MczdZQHkFi9gVlgm+Vn+V6nTWRcu856mJ2WjYJiumEajfSm7arPQ==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "openharmony" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@napi-rs/nice-win32-arm64-msvc": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-win32-arm64-msvc/-/nice-win32-arm64-msvc-1.1.1.tgz", - "integrity": "sha512-uoTb4eAvM5B2aj/z8j+Nv8OttPf2m+HVx3UjA5jcFxASvNhQriyCQF1OB1lHL43ZhW+VwZlgvjmP5qF3+59atA==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@napi-rs/nice-win32-ia32-msvc": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-win32-ia32-msvc/-/nice-win32-ia32-msvc-1.1.1.tgz", - "integrity": "sha512-CNQqlQT9MwuCsg1Vd/oKXiuH+TcsSPJmlAFc5frFyX/KkOh0UpBLEj7aoY656d5UKZQMQFP7vJNa1DNUNORvug==", - "cpu": [ - "ia32" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@napi-rs/nice-win32-x64-msvc": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-win32-x64-msvc/-/nice-win32-x64-msvc-1.1.1.tgz", - "integrity": "sha512-vB+4G/jBQCAh0jelMTY3+kgFy00Hlx2f2/1zjMoH821IbplbWZOkLiTYXQkygNTzQJTq5cvwBDgn2ppHD+bglQ==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10" - } - }, "node_modules/@vyla-entertainment/sdk": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/@vyla-entertainment/sdk/-/sdk-1.18.0.tgz", - "integrity": "sha512-rxenC6VzgcQmfoXOjz6/BGyW1ZILEpm/690yEGdZJkT2hpxPCM+DrUBed1ebdx49NimbIr7AYDAU0mgzyMZrAA==", + "version": "1.29.0", + "resolved": "https://registry.npmjs.org/@vyla-entertainment/sdk/-/sdk-1.29.0.tgz", + "integrity": "sha512-lg4YPEvYg9FOij2ZrFFV09Tict411VLQ5daRTrM8OaCjpZ2B5sgaC4UlaNBBhpxI6pMKib2/zOhEbo3krsDuUw==", "license": "CC-BY-NC-4.0", "dependencies": { "node-tls-client": "^2.1.0" @@ -414,21 +534,6 @@ "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": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", @@ -522,31 +627,21 @@ "node": ">= 0.6" } }, - "node_modules/cookie-parser": { - "version": "1.4.7", - "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.7.tgz", - "integrity": "sha512-nGUvgXnotP3BsjiLX2ypbQnWoGUPIIfHQNZkkC668ntrzGWEZVW70HDEB1qnNGMicPje6EttlIgzo51YSwNQGw==", - "license": "MIT", - "dependencies": { - "cookie": "0.7.2", - "cookie-signature": "1.0.6" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/cookie-parser/node_modules/cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", - "license": "MIT" - }, "node_modules/cookie-signature": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz", "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==", "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": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", @@ -599,12 +694,16 @@ "license": "MIT" }, "node_modules/encodeurl": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", - "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.3.tgz", + "integrity": "sha512-mIteYONiEfc4xWf2F1WXovh1c8npzS00vNeiUPdwFF+QlVJni+gNvpQltLMQhob8rew/bWWc/bGTuUr0EUGt0w==", "license": "MIT", "engines": { "node": ">= 0.8" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/es-define-property": { @@ -740,21 +839,6 @@ "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": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.2.tgz", @@ -773,21 +857,6 @@ "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": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -889,9 +958,9 @@ } }, "node_modules/hls.js": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/hls.js/-/hls.js-1.7.3.tgz", - "integrity": "sha512-MsPlx6yVW4Qv4C7mEVou4/gk/5cN2dVxOTnrNjPSmyH2f0Ln+/UkG10Ax1PE6OvrmTVPKgQYozTtBaPOuCzq7A==", + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/hls.js/-/hls.js-1.7.4.tgz", + "integrity": "sha512-3GlxGdPvT2YHvQYOt+yOzT/DEior/qJVNIylHA77kgeoBTdQQqi70GwefNEUmHQeNGyjC8U62+bruqW/Tpm+tg==", "license": "Apache-2.0" }, "node_modules/http-errors": { @@ -963,9 +1032,9 @@ } }, "node_modules/koffi": { - "version": "2.16.3", - "resolved": "https://registry.npmjs.org/koffi/-/koffi-2.16.3.tgz", - "integrity": "sha512-E9y1AsgYGlaxMhcZzHr8y96QF2U5XzA12GGVAfbWqIubTwPNMXQarfBzePNXHe0xtIEtNd6ifAv3GAKYGUeBAQ==", + "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": { @@ -1042,9 +1111,9 @@ } }, "node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "license": "MIT" }, "node_modules/negotiator": { @@ -1057,15 +1126,16 @@ } }, "node_modules/node-tls-client": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/node-tls-client/-/node-tls-client-2.1.0.tgz", - "integrity": "sha512-b1Y2WFdQ7BJXa5CT6qRafCFeaNiTsZP+UFqNy+8hrHExlPHe3ccEtFkKt3WDGzGIfNvb4Ws9EEQmzFS9Jztisg==", + "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": { - "cookie-parser": "^1.4.7", - "koffi": "^2.8.9", - "piscina": "^5.1.1", + "koffi": "^2.15.2", "tough-cookie": "^4.1.4" + }, + "engines": { + "node": ">=20" } }, "node_modules/object-inspect": { @@ -1081,15 +1151,19 @@ } }, "node_modules/on-finished": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.2.tgz", + "integrity": "sha512-ATWUv387i+nLD49EiDoOft5scf32Vsdz3ktrQJG9bi7jRFmaXTssvyvj1EmeKVVgvesbqUtvQQvaS2TpTukAZQ==", "license": "MIT", "dependencies": { "ee-first": "1.1.1" }, "engines": { "node": ">= 0.8" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/parseurl": { @@ -1107,18 +1181,6 @@ "integrity": "sha512-A/AGNMFN3c8bOlvV9RreMdrv7jsmF9XIfDeCd87+I8RNg6s78BhJxMu69NEMHBSJFxKidViTEdruRwEk/WIKqA==", "license": "MIT" }, - "node_modules/piscina": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/piscina/-/piscina-5.3.2.tgz", - "integrity": "sha512-vv7l/mM7B9WgrhDaudIqv1x6v4LOBRYYmpWGdWushhpbCmVHp11sUB2v4hj1CAeTGXVxuZFz6xOU1RalAiPKfQ==", - "license": "MIT", - "engines": { - "node": ">=20.x" - }, - "optionalDependencies": { - "@napi-rs/nice": "^1.0.4" - } - }, "node_modules/proxy-addr": { "version": "2.0.8", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.8.tgz", @@ -1158,9 +1220,9 @@ } }, "node_modules/qs": { - "version": "6.16.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.16.0.tgz", - "integrity": "sha512-h6fhOIaRrID2CbEY2fqs+7t+UXZo+MLAnU5gRIq85uFtdiUPCdsApMlHhXogKVM4HM2DVbIjGNTTYH2OcmP1vA==", + "version": "6.16.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.16.2.tgz", + "integrity": "sha512-VYdnB5S7/0IeXzBacUtwNAaM6d7Y/PgYnNC7bJCI6meqA/OgnsQbZMtVW8Dt2D1PHgbHGtYmhSoEIgvt7xZ2ZA==", "license": "BSD-3-Clause", "dependencies": { "es-define-property": "^1.0.1", @@ -1259,19 +1321,10 @@ "node": ">= 0.8.0" } }, - "node_modules/send/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/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==", + "node_modules/send/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "license": "MIT" }, "node_modules/serve-static": { diff --git a/package.json b/package.json index ed65387..63306b8 100644 --- a/package.json +++ b/package.json @@ -9,9 +9,9 @@ "android": "node scripts/build-android.mjs" }, "dependencies": { - "@vyla-entertainment/sdk": "^1.20.0", + "@vyla-entertainment/sdk": "^1.29.0", "dotenv": "^16.4.5", - "express": "^4.19.2", + "express": "^4.22.3", "hls.js": "^1.7.3" }, "devDependencies": { @@ -21,5 +21,9 @@ "main": "server.js", "keywords": [], "author": "", - "license": "ISC" + "license": "ISC", + "allowScripts": { + "esbuild@0.25.12": true, + "koffi@2.16.4": true + } } diff --git a/scripts/build-android.mjs b/scripts/build-android.mjs index 766ac6e..13ab36d 100644 --- a/scripts/build-android.mjs +++ b/scripts/build-android.mjs @@ -56,14 +56,52 @@ globalThis.VylaLocal = { `; 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({ entryPoints: [path.join(tmp, 'entry.js')], bundle: true, format: 'iife', target: 'chrome70', platform: 'browser', + plugins: [nodeStubPlugin], minify: true, - alias: { 'node:crypto': path.join(shim, 'crypto.js') }, + alias: { + 'node:crypto': path.join(shim, 'crypto.js') + }, inject: [path.join(shim, 'inject.js')], outfile: path.join(www, 'js/vyla-local.js'), logLevel: 'info' diff --git a/scripts/empty-shim.js b/scripts/empty-shim.js new file mode 100644 index 0000000..7c645e4 --- /dev/null +++ b/scripts/empty-shim.js @@ -0,0 +1 @@ +export default {}; \ No newline at end of file