@roitium/expo-orpheus 0.6.0 → 0.7.0

package/README.md

@@ -15,7 +15,7 @@ Orpheus 通过特殊的 uri 识别来自 bilibili 的资源，格式为 `orpheus
 Orpheus 内部有两层缓存：
 
 1. 用户手动下载的缓存
-2. ~~ 边下边播：LRU 缓存，256mb ~~ (移除了这一层缓存，方便响度均衡实现)
+2. 边下边播：LRU 缓存，256mb
 
 ## 下载系统
 

package/android/src/main/java/expo/modules/orpheus/DownloadCache.kt

@@ -3,6 +3,7 @@ package expo.modules.orpheus
 import android.content.Context
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.database.StandaloneDatabaseProvider
+import androidx.media3.datasource.cache.LeastRecentlyUsedCacheEvictor
 import androidx.media3.datasource.cache.NoOpCacheEvictor
 import androidx.media3.datasource.cache.SimpleCache
 import java.io.File
@@ -10,6 +11,7 @@ import java.io.File
 @UnstableApi
 object DownloadCache {
     private var stableCache: SimpleCache? = null
+    private var lruCache: SimpleCache? = null
 
     @Synchronized
     fun getStableCache(context: Context): SimpleCache {
@@ -21,4 +23,15 @@ object DownloadCache {
         }
         return stableCache!!
     }
+
+    @Synchronized
+    fun  getLruCache(context: Context): SimpleCache {
+        if (lruCache == null) {
+            val cacheDir = File(context.cacheDir, "media_cache_lru")
+            val evictor = LeastRecentlyUsedCacheEvictor(256 * 1024 * 1024)
+            val databaseProvider = StandaloneDatabaseProvider(context)
+            lruCache = SimpleCache(cacheDir, evictor, databaseProvider)
+        }
+        return lruCache!!
+    }
 }

package/android/src/main/java/expo/modules/orpheus/ExpoOrpheusModule.kt

@@ -25,7 +25,8 @@ import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
 import expo.modules.orpheus.models.TrackRecord
 import expo.modules.orpheus.utils.DownloadUtil
-import expo.modules.orpheus.utils.Storage
+import expo.modules.orpheus.utils.GeneralStorage
+import expo.modules.orpheus.utils.LoudnessStorage
 import expo.modules.orpheus.utils.toMediaItem
 
 @UnstableApi
@@ -156,12 +157,12 @@ class ExpoOrpheusModule : Module() {
 
         override fun onRepeatModeChanged(repeatMode: Int) {
             super.onRepeatModeChanged(repeatMode)
-            Storage.saveRepeatMode(repeatMode)
+            GeneralStorage.saveRepeatMode(repeatMode)
         }
 
         override fun onShuffleModeEnabledChanged(shuffleModeEnabled: Boolean) {
             super.onShuffleModeEnabledChanged(shuffleModeEnabled)
-            Storage.saveShuffleMode(shuffleModeEnabled)
+            GeneralStorage.saveShuffleMode(shuffleModeEnabled)
         }
     }
 
@@ -181,7 +182,8 @@ class ExpoOrpheusModule : Module() {
 
         OnCreate {
             val context = appContext.reactContext ?: return@OnCreate
-            Storage.initialize(context)
+            GeneralStorage.initialize(context)
+            LoudnessStorage.initialize(context)
             val sessionToken = SessionToken(
                 context,
                 ComponentName(context, OrpheusMusicService::class.java)
@@ -217,11 +219,11 @@ class ExpoOrpheusModule : Module() {
         }
 
         Constant("restorePlaybackPositionEnabled") {
-            Storage.isRestoreEnabled()
+            GeneralStorage.isRestoreEnabled()
         }
 
         Constant("loudnessNormalizationEnabled") {
-            Storage.isLoudnessNormalizationEnabled()
+            GeneralStorage.isLoudnessNormalizationEnabled()
         }
 
         Function("setBilibiliCookie") { cookie: String ->
@@ -229,11 +231,11 @@ class ExpoOrpheusModule : Module() {
         }
 
         Function("setLoudnessNormalizationEnabled") { enabled: Boolean ->
-            Storage.setLoudnessNormalizationEnabled(enabled)
+            GeneralStorage.setLoudnessNormalizationEnabled(enabled)
         }
 
         Function("setRestorePlaybackPositionEnabled") { enabled: Boolean ->
-            Storage.setRestoreEnabled(enabled)
+            GeneralStorage.setRestoreEnabled(enabled)
         }
 
         AsyncFunction("getPosition") {
@@ -302,7 +304,6 @@ class ExpoOrpheusModule : Module() {
             checkPlayer()
             player?.clearMediaItems()
             durationCache.clear()
-            DownloadUtil.itemVolumeMap.clear()
         }.runOnQueue(Queues.MAIN)
 
         AsyncFunction("skipTo") { index: Int ->
@@ -396,7 +397,6 @@ class ExpoOrpheusModule : Module() {
             if (clearQueue == true) {
                 p.clearMediaItems()
                 durationCache.clear()
-                DownloadUtil.itemVolumeMap.clear()
             }
             val initialSize = p.mediaItemCount
             p.addMediaItems(mediaItems)
@@ -714,7 +714,7 @@ class ExpoOrpheusModule : Module() {
     private fun saveCurrentPosition() {
         val p = player ?: return
         if (p.playbackState != Player.STATE_IDLE) {
-            Storage.savePosition(
+            GeneralStorage.savePosition(
                 p.currentMediaItemIndex,
                 p.currentPosition
             )

package/android/src/main/java/expo/modules/orpheus/OrpheusMusicService.kt

@@ -2,6 +2,7 @@ package expo.modules.orpheus
 
 import android.app.PendingIntent
 import android.content.Intent
+import android.util.Log
 import androidx.annotation.OptIn
 import androidx.core.net.toUri
 import androidx.media3.common.AudioAttributes
@@ -15,10 +16,10 @@ import androidx.media3.session.MediaLibraryService
 import androidx.media3.session.MediaSession
 import com.google.common.util.concurrent.Futures
 import com.google.common.util.concurrent.ListenableFuture
-import expo.modules.orpheus.bilibili.VolumeData
 import expo.modules.orpheus.utils.DownloadUtil
 import expo.modules.orpheus.utils.SleepTimeController
-import expo.modules.orpheus.utils.Storage
+import expo.modules.orpheus.utils.GeneralStorage
+import expo.modules.orpheus.utils.LoudnessStorage
 import expo.modules.orpheus.utils.calculateLoudnessGain
 import expo.modules.orpheus.utils.fadeInTo
 import kotlinx.coroutines.Job
@@ -61,7 +62,8 @@ class OrpheusMusicService : MediaLibraryService() {
         super.onCreate()
         instance = this
 
-        Storage.initialize(this)
+        GeneralStorage.initialize(this)
+        LoudnessStorage.initialize(this)
 
 
         val dataSourceFactory = DownloadUtil.getPlayerDataSourceFactory(this)
@@ -111,18 +113,8 @@ class OrpheusMusicService : MediaLibraryService() {
             .setSessionActivity(contentIntent)
             .build()
 
-        restorePlayerState(Storage.isRestoreEnabled())
+        restorePlayerState(GeneralStorage.isRestoreEnabled())
         sleepTimerManager = SleepTimeController(player!!)
-
-        // 当有新的响度数据时，如果是当前这首歌的就直接应用，否则是预加载，等待 onMediaItemTransition 处理
-        scope.launch {
-            DownloadUtil.volumeResolvedEvent.collect { (uri, volumeData) ->
-                val currentUri = player?.currentMediaItem?.localConfiguration?.uri?.toString()
-                if (currentUri == uri) {
-                    applyVolumeForCurrentItem(volumeData)
-                }
-            }
-        }
     }
 
     override fun onGetSession(controllerInfo: MediaSession.ControllerInfo): MediaLibrarySession? {
@@ -187,15 +179,15 @@ class OrpheusMusicService : MediaLibraryService() {
     private fun restorePlayerState(restorePosition: Boolean) {
         val player = player ?: return
 
-        val restoredItems = Storage.restoreQueue()
+        val restoredItems = GeneralStorage.restoreQueue()
 
         if (restoredItems.isNotEmpty()) {
             player.setMediaItems(restoredItems)
 
-            val savedIndex = Storage.getSavedIndex()
-            val savedPosition = Storage.getSavedPosition()
-            val savedShuffleMode = Storage.getShuffleMode()
-            val savedRepeatMode = Storage.getRepeatMode()
+            val savedIndex = GeneralStorage.getSavedIndex()
+            val savedPosition = GeneralStorage.getSavedPosition()
+            val savedShuffleMode = GeneralStorage.getShuffleMode()
+            val savedRepeatMode = GeneralStorage.getRepeatMode()
 
             if (savedIndex >= 0 && savedIndex < restoredItems.size) {
                 player.seekTo(savedIndex, if (restorePosition) savedPosition else C.TIME_UNSET)
@@ -221,10 +213,8 @@ class OrpheusMusicService : MediaLibraryService() {
                 saveCurrentQueue()
                 val uri = mediaItem?.localConfiguration?.uri?.toString() ?: return
 
-                val volumeData = DownloadUtil.itemVolumeMap[uri]
-                if (volumeData != null) {
-                    applyVolumeForCurrentItem(volumeData)
-                }
+                val volumeData = LoudnessStorage.getLoudnessData(uri)
+                applyVolumeForCurrentItem(volumeData)
             }
 
             override fun onTimelineChanged(timeline: Timeline, reason: Int) {
@@ -237,21 +227,20 @@ class OrpheusMusicService : MediaLibraryService() {
         val player = player ?: return
         val queue = List(player.mediaItemCount) { i -> player.getMediaItemAt(i) }
         if (queue.isNotEmpty()) {
-            Storage.saveQueue(queue)
+            GeneralStorage.saveQueue(queue)
         }
     }
 
     @OptIn(UnstableApi::class)
-    private fun applyVolumeForCurrentItem(volumeData: VolumeData) {
+    private fun applyVolumeForCurrentItem(measuredI: Double) {
+        Log.d("LoudnessNormalization", "measuredI: $measuredI")
         val player = player ?: return
         volumeFadeJob?.cancel()
-        val isLoudnessNormalizationEnabled = Storage.isLoudnessNormalizationEnabled()
+        val isLoudnessNormalizationEnabled = GeneralStorage.isLoudnessNormalizationEnabled()
         if (!isLoudnessNormalizationEnabled) return
         val gain = run {
-            val measured = volumeData.measuredI
-            val target = volumeData.targetI
-
-            if (measured == 0.0) 1.0f else calculateLoudnessGain(measured, target)
+            val target = -14.0 // bilibili 的这个值似乎是固定的
+            if (measuredI == 0.0) 1.0f else calculateLoudnessGain(measuredI, target)
         }
 
         val targetVol = 1.0f * gain

package/android/src/main/java/expo/modules/orpheus/utils/DownloadUtil.kt

@@ -1,6 +1,7 @@
 package expo.modules.orpheus.utils
 
 import android.content.Context
+import android.util.Log
 import androidx.core.net.toUri
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.database.StandaloneDatabaseProvider
@@ -35,15 +36,6 @@ object DownloadUtil {
 
     private var downloadNotificationHelper: DownloadNotificationHelper? = null
 
-    var itemVolumeMap: MutableMap<String, VolumeData> = mutableMapOf()
-
-    private val _volumeResolvedEvent = MutableSharedFlow<Pair<String, VolumeData>>(
-        replay = 0,
-        extraBufferCapacity = 1,
-        onBufferOverflow = BufferOverflow.DROP_OLDEST
-    )
-    val volumeResolvedEvent = _volumeResolvedEvent.asSharedFlow()
-
     @Synchronized
     fun getDownloadManager(context: Context): DownloadManager {
         if (downloadManager == null) {
@@ -68,10 +60,16 @@ object DownloadUtil {
             val upstreamFactory = getUpstreamFactory()
 
             val downloadCache = DownloadCache.getStableCache(context)
+            val lruCache = DownloadCache.getLruCache(context)
+
+            val cacheFactory = CacheDataSource.Factory()
+                .setCache(lruCache)
+                .setUpstreamDataSourceFactory(upstreamFactory)
+                .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
 
             val downloadFactory = CacheDataSource.Factory()
                 .setCache(downloadCache)
-                .setUpstreamDataSourceFactory(upstreamFactory)
+                .setUpstreamDataSourceFactory(cacheFactory)
                 .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
                 .setCacheWriteDataSinkFactory(null)
 
@@ -109,10 +107,6 @@ object DownloadUtil {
         return downloadNotificationHelper!!
     }
 
-    suspend fun emitVolumeEvent(uri: String, data: VolumeData) {
-        _volumeResolvedEvent.emit(uri to data)
-    }
-
     private class BilibiliResolver :
         ResolvingDataSource.Resolver {
         override fun resolveDataSpec(dataSpec: DataSpec): DataSpec {
@@ -132,10 +126,8 @@ object DownloadUtil {
                     )
                     // 在这里保存响度均衡数据，并且直接发一个事件，在 OrpheusMusicService 监听
                     if (volume !== null) {
-                        itemVolumeMap[dataSpec.uri.toString()] = volume
-                        CoroutineScope(Dispatchers.IO).launch {
-                            emitVolumeEvent(dataSpec.uri.toString(), volume)
-                        }
+                        Log.d("LoudnessNormalization", "uri: ${dataSpec.uri}, measuredI: ${volume.measuredI}")
+                        LoudnessStorage.setLoudnessData(dataSpec.uri.toString(), volume.measuredI)
                     }
 
                     val headers = HashMap<String, String>()

package/android/src/main/java/expo/modules/orpheus/utils/{Storage.kt → GeneralStorage.kt}

@@ -11,7 +11,7 @@ import com.tencent.mmkv.MMKV
 import expo.modules.orpheus.models.TrackRecord
 
 @OptIn(UnstableApi::class)
-object Storage {
+object GeneralStorage {
     private var kv: MMKV? = null
     private val gson = Gson()
     private const val KEY_RESTORE_POSITION_ENABLED = "config_restore_position_enabled"

package/android/src/main/java/expo/modules/orpheus/utils/LoudnessStorage.kt

@@ -0,0 +1,40 @@
+package expo.modules.orpheus.utils
+
+import android.content.Context
+import android.util.Log
+import com.tencent.mmkv.MMKV
+
+object LoudnessStorage {
+    private var kv: MMKV? = null
+
+
+    @Synchronized
+    fun initialize(context: Context) {
+        if (kv == null) {
+            MMKV.initialize(context)
+            kv = MMKV.mmkvWithID("loudness_normalization_store")
+        }
+    }
+
+    private val safeKv: MMKV
+        get() = kv ?: throw IllegalStateException("LoudnessStorage not initialized")
+
+    fun setLoudnessData(key: String, measuredI: Double) {
+        try {
+            Log.d("LoudnessNormalization", "setLoudnessData: $key, $measuredI")
+            safeKv.encode(key, measuredI)
+        } catch (e: Exception) {
+            Log.e("LoudnessStorage", "Failed to set loudness data", e)
+        }
+    }
+
+    fun getLoudnessData(key: String): Double {
+        try {
+            Log.d("LoudnessNormalization", "getLoudnessData: $key")
+            return safeKv.decodeDouble(key)
+        } catch (e: Exception) {
+            Log.e("LoudnessStorage", "Failed to get loudness data", e)
+            return 0.0
+        }
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@roitium/expo-orpheus",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "A player for bbplayer",
   "main": "build/index.js",
   "types": "build/index.d.ts",