fix(mobile): restore lossless seeking and remove duplicate players #55

Merged
joshuafhiggins merged 2 commits from t3/fix-android-native-player-scrubbing into main 2026-11-01 17:32:40 -05:00
4 changed files with 254 additions and 22 deletions

No files matched your search

+3 -19
View File
@@ -1,6 +1,7 @@
import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
import { audioContentTypeForPath } from "@/lib/audio-content-type"
import { seekableLosslessFile } from "@/lib/server-lossless"
import { getConvexClient } from "@/lib/convex-server"
import { ffmpegToReadableStream, streamFile } from "@/lib/server-audio-stream"
import { NextRequest, NextResponse, userAgent } from "next/server"
@@ -169,26 +170,9 @@ export async function GET(
}
}
const ffmpegArgs = [
"-nostdin",
"-i",
song.files[originalCodec],
"-f",
"flac",
"pipe:1",
]
try {
const ffmpegProcess = spawn("ffmpeg", ffmpegArgs)
const stream = ffmpegToReadableStream(ffmpegProcess)
return new NextResponse(stream, {
status: 200,
headers: {
"Content-Type": "audio/flac",
"Cache-Control": "no-cache",
},
})
const file = await seekableLosslessFile(song.files[originalCodec])
return await streamFileResponse(request, file, "audio/flac")
} catch {
return new Response("Server Error", { status: 500 })
}
+82
View File
@@ -0,0 +1,82 @@
import { spawn } from "node:child_process"
import { createHash } from "node:crypto"
import fs from "node:fs/promises"
import os from "node:os"
import path from "node:path"
const conversions = new Map<string, Promise<string>>()
// A completed FLAC file has a duration and supports byte ranges. Piped FLAC does not.
export async function seekableLosslessFile(source: string): Promise<string> {
if (path.extname(source).toLowerCase() === ".flac") return source
const stat = await fs.stat(source)
const key = createHash("sha256")
.update(`${source}:${stat.size}:${stat.mtimeMs}`)
.digest("hex")
const existing = conversions.get(key)
if (existing) return existing
const conversion = convert(source, key)
conversions.set(key, conversion)
try {
return await conversion
} finally {
conversions.delete(key)
}
}
async function convert(source: string, key: string): Promise<string> {
const dir = path.join(os.tmpdir(), "otunes-lossless")
await fs.mkdir(dir, { recursive: true })
const cutoff = Date.now() - 30 * 60 * 1000
await Promise.all(
(await fs.readdir(dir))
.filter((name) => name.endsWith(".flac"))
.map(async (name) => {
const file = path.join(dir, name)
const stat = await fs.stat(file).catch(() => null)
if (stat && stat.mtimeMs < cutoff) await fs.rm(file, { force: true })
})
)
const output = path.join(dir, `${key}.flac`)
try {
await fs.access(output)
return output
} catch {
// Publish only completed conversions so range requests always see a complete file.
}
const temporary = path.join(
await fs.mkdtemp(path.join(dir, "convert-")),
"audio.flac"
)
try {
await new Promise<void>((resolve, reject) => {
const child = spawn(
"ffmpeg",
[
"-nostdin",
"-v",
"error",
"-i",
source,
"-map",
"0:a:0",
"-c:a",
"flac",
temporary,
],
{ stdio: "ignore" }
)
child.on("error", reject)
child.on("close", (code) => {
if (code === 0) resolve()
else reject(new Error(`Lossless conversion failed: ${code}`))
})
})
await fs.rename(temporary, output)
return output
} finally {
await fs.rm(path.dirname(temporary), { recursive: true, force: true })
}
}
+166
View File
@@ -159,3 +159,169 @@ diff --git a/build/Audio.types.d.ts b/build/Audio.types.d.ts
+ /** MIME type for streams whose URL has no file extension, such as HLS. */
+ mimeType?: string;
/**
diff --git a/android/src/main/java/expo/modules/audio/BaseAudioPlayer.kt b/android/src/main/java/expo/modules/audio/BaseAudioPlayer.kt
--- a/android/src/main/java/expo/modules/audio/BaseAudioPlayer.kt
+++ b/android/src/main/java/expo/modules/audio/BaseAudioPlayer.kt
@@ -159,8 +159,16 @@
super.sharedObjectDidRelease()
// Run on GlobalScope (not appContext.mainQueue) so that reloading doesn't cancel the release process
GlobalScope.launch(Dispatchers.Main) {
- releasePlayer()
+ release()
}
+ }
+
+ private var released = false
+
+ fun release() {
+ if (released) return
+ released = true
+ releasePlayer()
}
protected open fun releasePlayer() {
diff --git a/android/src/main/java/expo/modules/audio/AudioModule.kt b/android/src/main/java/expo/modules/audio/AudioModule.kt
--- a/android/src/main/java/expo/modules/audio/AudioModule.kt
+++ b/android/src/main/java/expo/modules/audio/AudioModule.kt
@@ -1105,6 +1105,7 @@
runOnMain {
playlist.clearLockScreenControls()
playlists.remove(playlist.id)
+ playlist.release()
releaseAudioFocusIfUnused()
}
}
diff --git a/android/src/main/java/expo/modules/audio/service/MetadataInjectingPlayer.kt b/android/src/main/java/expo/modules/audio/service/MetadataInjectingPlayer.kt
--- a/android/src/main/java/expo/modules/audio/service/MetadataInjectingPlayer.kt
+++ b/android/src/main/java/expo/modules/audio/service/MetadataInjectingPlayer.kt
@@ -1,5 +1,14 @@
package expo.modules.audio.service
+import androidx.media3.common.AudioAttributes
+import androidx.media3.common.DeviceInfo
+import androidx.media3.common.MediaItem
+import androidx.media3.common.PlaybackException
+import androidx.media3.common.PlaybackParameters
+import androidx.media3.common.Timeline
+import androidx.media3.common.TrackSelectionParameters
+import androidx.media3.common.Tracks
+import androidx.media3.common.VideoSize
import android.os.Handler
import android.os.Looper
import androidx.core.net.toUri
@@ -81,7 +90,114 @@
private inner class MetadataForwardingListener(
private val listener: Player.Listener
- ) : Player.Listener by listener {
+ ) : Player.Listener {
+ // Kotlin delegation does not forward Java default methods on Player.Listener.
+ // Forward each callback so MediaSession receives timeline and duration changes.
+ override fun onTimelineChanged(timeline: Timeline, reason: Int) =
+ listener.onTimelineChanged(timeline, reason)
+
+ override fun onMediaItemTransition(mediaItem: MediaItem?, reason: Int) =
+ listener.onMediaItemTransition(mediaItem, reason)
+
+ override fun onTracksChanged(tracks: Tracks) =
+ listener.onTracksChanged(tracks)
+
+ override fun onPlaylistMetadataChanged(mediaMetadata: MediaMetadata) =
+ listener.onPlaylistMetadataChanged(mediaMetadata)
+
+ override fun onIsLoadingChanged(isLoading: Boolean) =
+ listener.onIsLoadingChanged(isLoading)
+
+ override fun onLoadingChanged(isLoading: Boolean) =
+ listener.onLoadingChanged(isLoading)
+
+ override fun onAvailableCommandsChanged(availableCommands: Player.Commands) =
+ listener.onAvailableCommandsChanged(availableCommands)
+
+ override fun onTrackSelectionParametersChanged(parameters: TrackSelectionParameters) =
+ listener.onTrackSelectionParametersChanged(parameters)
+
+ override fun onPlayerStateChanged(playWhenReady: Boolean, playbackState: Int) =
+ listener.onPlayerStateChanged(playWhenReady, playbackState)
+
+ override fun onPlaybackStateChanged(playbackState: Int) =
+ listener.onPlaybackStateChanged(playbackState)
+
+ override fun onPlayWhenReadyChanged(playWhenReady: Boolean, reason: Int) =
+ listener.onPlayWhenReadyChanged(playWhenReady, reason)
+
+ override fun onPlaybackSuppressionReasonChanged(playbackSuppressionReason: Int) =
+ listener.onPlaybackSuppressionReasonChanged(playbackSuppressionReason)
+
+ override fun onIsPlayingChanged(isPlaying: Boolean) =
+ listener.onIsPlayingChanged(isPlaying)
+
+ override fun onRepeatModeChanged(repeatMode: Int) =
+ listener.onRepeatModeChanged(repeatMode)
+
+ override fun onShuffleModeEnabledChanged(shuffleModeEnabled: Boolean) =
+ listener.onShuffleModeEnabledChanged(shuffleModeEnabled)
+
+ override fun onPlayerError(error: PlaybackException) =
+ listener.onPlayerError(error)
+
+ override fun onPlayerErrorChanged(error: PlaybackException?) =
+ listener.onPlayerErrorChanged(error)
+
+ override fun onPositionDiscontinuity(reason: Int) =
+ listener.onPositionDiscontinuity(reason)
+
+ override fun onPositionDiscontinuity(oldPosition: Player.PositionInfo, newPosition: Player.PositionInfo, reason: Int) =
+ listener.onPositionDiscontinuity(oldPosition, newPosition, reason)
+
+ override fun onPlaybackParametersChanged(playbackParameters: PlaybackParameters) =
+ listener.onPlaybackParametersChanged(playbackParameters)
+
+ override fun onSeekBackIncrementChanged(seekBackIncrementMs: Long) =
+ listener.onSeekBackIncrementChanged(seekBackIncrementMs)
+
+ override fun onSeekForwardIncrementChanged(seekForwardIncrementMs: Long) =
+ listener.onSeekForwardIncrementChanged(seekForwardIncrementMs)
+
+ override fun onMaxSeekToPreviousPositionChanged(maxSeekToPreviousPositionMs: Long) =
+ listener.onMaxSeekToPreviousPositionChanged(maxSeekToPreviousPositionMs)
+
+ override fun onAudioSessionIdChanged(audioSessionId: Int) =
+ listener.onAudioSessionIdChanged(audioSessionId)
+
+ override fun onAudioAttributesChanged(audioAttributes: AudioAttributes) =
+ listener.onAudioAttributesChanged(audioAttributes)
+
+ override fun onVolumeChanged(volume: Float) =
+ listener.onVolumeChanged(volume)
+
+ override fun onSkipSilenceEnabledChanged(skipSilenceEnabled: Boolean) =
+ listener.onSkipSilenceEnabledChanged(skipSilenceEnabled)
+
+ override fun onDeviceInfoChanged(deviceInfo: DeviceInfo) =
+ listener.onDeviceInfoChanged(deviceInfo)
+
+ override fun onDeviceVolumeChanged(volume: Int, muted: Boolean) =
+ listener.onDeviceVolumeChanged(volume, muted)
+
+ override fun onVideoSizeChanged(videoSize: VideoSize) =
+ listener.onVideoSizeChanged(videoSize)
+
+ override fun onSurfaceSizeChanged(width: Int, height: Int) =
+ listener.onSurfaceSizeChanged(width, height)
+
+ override fun onRenderedFirstFrame() =
+ listener.onRenderedFirstFrame()
+
+ override fun onCues(cues: List<androidx.media3.common.text.Cue>) =
+ listener.onCues(cues)
+
+ override fun onCues(cueGroup: androidx.media3.common.text.CueGroup) =
+ listener.onCues(cueGroup)
+
+ override fun onMetadata(metadata: androidx.media3.common.Metadata) =
+ listener.onMetadata(metadata)
+
override fun onMediaMetadataChanged(mediaMetadata: MediaMetadata) {
listener.onMediaMetadataChanged(this@MetadataInjectingPlayer.mediaMetadata)
}
+3 -3
View File
@@ -6,7 +6,7 @@ settings:
patchedDependencies:
expo-audio@58.0.10:
hash: e01ad6e484db76d810c2df5bf9c376eccf8d4c5359736b626868ea8bd8dac566
hash: f7f102c0f17b28e763d828acd4f138d62809f5be576e316a13008c27e84968c5
path: patches/expo-audio@58.0.10.patch
importers:
@@ -63,7 +63,7 @@ importers:
version: 58.0.18(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)(typescript@6.0.3)
expo-audio:
specifier: ~58.0.10
version: 58.0.10(patch_hash=e01ad6e484db76d810c2df5bf9c376eccf8d4c5359736b626868ea8bd8dac566)(expo-asset@58.0.18(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)(typescript@6.0.3))(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
version: 58.0.10(patch_hash=f7f102c0f17b28e763d828acd4f138d62809f5be576e316a13008c27e84968c5)(expo-asset@58.0.18(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)(typescript@6.0.3))(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
expo-blur:
specifier: ~58.0.5
version: 58.0.5(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
@@ -11073,7 +11073,7 @@ snapshots:
- supports-color
- typescript
expo-audio@58.0.10(patch_hash=e01ad6e484db76d810c2df5bf9c376eccf8d4c5359736b626868ea8bd8dac566)(expo-asset@58.0.18(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)(typescript@6.0.3))(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0):
expo-audio@58.0.10(patch_hash=f7f102c0f17b28e763d828acd4f138d62809f5be576e316a13008c27e84968c5)(expo-asset@58.0.18(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)(typescript@6.0.3))(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0):
dependencies:
expo: 58.0.17(@babel/core@7.29.7)(@expo/dom-webview@58.0.2)(@expo/metro-runtime@58.0.15)(expo-router@58.0.25)(react-dom@19.3.0(react@19.3.0))(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)(typescript@6.0.3)
expo-asset: 58.0.18(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)(typescript@6.0.3)