@roitium/expo-orpheus 0.2.1 → 0.2.3

package/android/build.gradle

@@ -14,38 +14,38 @@ useExpoPublishing()
 // Most of the time, you may like to manage the Android SDK versions yourself.
 def useManagedAndroidSdkVersions = false
 if (useManagedAndroidSdkVersions) {
-  useDefaultAndroidSdkVersions()
+    useDefaultAndroidSdkVersions()
 } else {
-  buildscript {
-    // Simple helper that allows the root project to override versions declared by this library.
-    ext.safeExtGet = { prop, fallback ->
-      rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+    buildscript {
+        // Simple helper that allows the root project to override versions declared by this library.
+        ext.safeExtGet = { prop, fallback ->
+            rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+        }
     }
-  }
-  project.android {
-    compileSdkVersion safeExtGet("compileSdkVersion", 36)
-    defaultConfig {
-      minSdkVersion safeExtGet("minSdkVersion", 24)
-      targetSdkVersion safeExtGet("targetSdkVersion", 36)
+    project.android {
+        compileSdkVersion safeExtGet("compileSdkVersion", 36)
+        defaultConfig {
+            minSdkVersion safeExtGet("minSdkVersion", 24)
+            targetSdkVersion safeExtGet("targetSdkVersion", 36)
+        }
     }
-  }
 }
 
 android {
-  namespace "expo.modules.orpheus"
-  defaultConfig {
-    versionCode 1
-    versionName "0.1.0"
-  }
-  lintOptions {
-    abortOnError false
-  }
+    namespace "expo.modules.orpheus"
+    defaultConfig {
+        versionCode 1
+        versionName "0.1.0"
+    }
+    lintOptions {
+        abortOnError false
+    }
 }
 
 dependencies {
     implementation "androidx.media3:media3-exoplayer:1.8.0"
     implementation "androidx.media3:media3-session:1.8.0"
-    implementation "com.squareup.retrofit2:retrofit:3.1.0-SNAPSHOT"
+    implementation "com.squareup.retrofit2:retrofit:2.9.0"
     implementation "com.google.code.gson:gson:2.13.2"
-    implementation "com.squareup.retrofit2:converter-gson:3.1.0-SNAPSHOT"
+    implementation "com.squareup.retrofit2:converter-gson:2.9.0"
 }

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

@@ -0,0 +1,25 @@
+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.SimpleCache
+import java.io.File
+
+@UnstableApi
+object DownloadCache {
+    private var cache: SimpleCache? = null
+
+    @UnstableApi
+    fun get(context: Context): SimpleCache {
+        if (cache == null) {
+            val cacheDir = File(context.cacheDir, "media_cache")
+            val evictor = LeastRecentlyUsedCacheEvictor(256 * 1024 * 1024)
+            val databaseProvider = StandaloneDatabaseProvider(context)
+
+            cache = SimpleCache(cacheDir, evictor, databaseProvider)
+        }
+        return cache!!
+    }
+}

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

@@ -20,10 +20,6 @@ import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
 
 class ExpoOrpheusModule : Module() {
-    companion object {
-        val TAG = "Orpheus"
-    }
-
     private var controllerFuture: ListenableFuture<MediaController>? = null
 
     private var controller: MediaController? = null
@@ -201,7 +197,7 @@ class ExpoOrpheusModule : Module() {
             return@AsyncFunction queue
         }.runOnQueue(Queues.MAIN)
 
-        AsyncFunction("addToEnd") { tracks: List<TrackRecord>, startFromId: String? ->
+        AsyncFunction("addToEnd") { tracks: List<TrackRecord>, startFromId: String?, clearQueue: Boolean? ->
             val mediaItems = tracks.mapNotNull { track ->
                 try {
                     val trackJson = gson.toJson(track)
@@ -229,6 +225,9 @@ class ExpoOrpheusModule : Module() {
                 }
             }
             val player = controller ?: return@AsyncFunction
+            if (clearQueue == true) {
+                player.clearMediaItems()
+            }
             val initialSize = player.mediaItemCount
             player.addMediaItems(mediaItems)
 
@@ -271,8 +270,6 @@ class ExpoOrpheusModule : Module() {
                 .setUri(track.url)
                 .setMediaMetadata(metadata)
                 .build()
-
-            val currentId = player.currentMediaItem?.mediaId
             val targetIndex = player.currentMediaItemIndex + 1
 
             var existingIndex = -1

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

@@ -8,6 +8,7 @@ import androidx.media3.common.util.UnstableApi
 import androidx.media3.datasource.DataSpec
 import androidx.media3.datasource.DefaultHttpDataSource
 import androidx.media3.datasource.ResolvingDataSource
+import androidx.media3.datasource.cache.CacheDataSource
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.exoplayer.source.DefaultMediaSourceFactory
 import androidx.media3.session.MediaLibraryService
@@ -29,8 +30,13 @@ class OrpheusService : MediaLibraryService() {
             .setUserAgent("Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.0.0 Safari/537.36")
             .setAllowCrossProtocolRedirects(true)
 
+        val cacheDataSourceFactory = CacheDataSource.Factory()
+            .setCache(DownloadCache.get(this))
+            .setUpstreamDataSourceFactory(httpDataSourceFactory)
+            .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
+
         val resolvingDataSourceFactory = ResolvingDataSource.Factory(
-            httpDataSourceFactory,
+            cacheDataSourceFactory,
             object : ResolvingDataSource.Resolver {
                 // TODO: maybe we need to add a cache?
                 override fun resolveDataSpec(dataSpec: DataSpec): DataSpec {
@@ -64,6 +70,7 @@ class OrpheusService : MediaLibraryService() {
                             return dataSpec.buildUpon()
                                 .setUri(realUrl.toUri())
                                 .setHttpRequestHeaders(headers)
+                                .setKey(uri.toString())
                                 .build()
                         } catch (e: Exception) {
                             throw IOException("Resolve Url Failed: ${e.message}", e)

package/build/ExpoOrpheusModule.d.ts

@@ -99,8 +99,10 @@ declare class OrpheusModule extends NativeModule<OrpheusEvents> {
     /**
      * 添加到队列末尾，且不去重。
      * @param tracks
+     * @param startFromId 可选，添加后立即播放该 ID 的曲目
+     * @param clearQueue 可选，是否清空当前队列
      */
-    addToEnd(tracks: Track[], startFromId?: string): Promise<void>;
+    addToEnd(tracks: Track[], startFromId?: string, clearQueue?: boolean): Promise<void>;
     /**
      * 播放下一首
      * @param track

package/build/ExpoOrpheusModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoOrpheusModule.d.ts","sourceRoot":"","sources":["../src/ExpoOrpheusModule.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ExpoOrpheusModule.d.ts","sourceRoot":"","sources":["../src/ExpoOrpheusModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtE,oBAAY,aAAa;IACvB,IAAI,IAAI;IACR,SAAS,IAAI;IACb,KAAK,IAAI;IACT,KAAK,IAAI;CACV;AAED,oBAAY,UAAU;IACpB,GAAG,IAAI;IACP,KAAK,IAAI;IACT,KAAK,IAAI;CACV;AAED,oBAAY,gBAAgB;IAC1B,MAAM,IAAI;IACV,IAAI,IAAI;IACR,IAAI,IAAI;IACR,gBAAgB,IAAI;CACrB;AAED,MAAM,WAAW,KAAK;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,sBAAsB,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,aAAa,CAAA;KAAE,GAAG,IAAI,CAAC;IAC9D,iBAAiB,CAAC,KAAK,EAAE;QACvB,cAAc,EAAE,MAAM,CAAC;QACvB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,MAAM,EAAE,gBAAgB,CAAC;KAC1B,GAAG,IAAI,CAAC;IACT,aAAa,CAAC,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAC9D,gBAAgB,CAAC,KAAK,EAAE;QACtB,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;KAClB,GAAG,IAAI,CAAC;IACT,kBAAkB,CAAC,KAAK,EAAE;QAAE,MAAM,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAC;CACtD,CAAC;AAEF,OAAO,OAAO,aAAc,SAAQ,YAAY,CAAC,aAAa,CAAC;IAC7D;;OAEG;IACH,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAE9B;;OAEG;IACH,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAE9B;;OAEG;IACH,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAE9B;;OAEG;IACH,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC;IAEhC;;OAEG;IACH,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC;IAElC;;OAEG;IACH,eAAe,IAAI,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;IAExC;;OAEG;IACH,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAElC;;OAEG;IACH,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;IAEnD,aAAa,IAAI,OAAO,CAAC,UAAU,CAAC;IAEpC,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAEvC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAErB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAEtB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAEtB,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAEpC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAE3B,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAE/B;;;OAGG;IACH,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAEtC,aAAa,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAE9C,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAE/C,QAAQ,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAE5B;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAEpF;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAErC,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAC1C;AAED,eAAO,MAAM,OAAO,eAAgD,CAAC"}

package/build/ExpoOrpheusModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoOrpheusModule.js","sourceRoot":"","sources":["../src/ExpoOrpheusModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAgB,MAAM,mBAAmB,CAAC;AAEtE,MAAM,CAAN,IAAY,aAKX;AALD,WAAY,aAAa;IACvB,iDAAQ,CAAA;IACR,2DAAa,CAAA;IACb,mDAAS,CAAA;IACT,mDAAS,CAAA;AACX,CAAC,EALW,aAAa,KAAb,aAAa,QAKxB;AAED,MAAM,CAAN,IAAY,UAIX;AAJD,WAAY,UAAU;IACpB,yCAAO,CAAA;IACP,6CAAS,CAAA;IACT,6CAAS,CAAA;AACX,CAAC,EAJW,UAAU,KAAV,UAAU,QAIrB;AAED,MAAM,CAAN,IAAY,gBAKX;AALD,WAAY,gBAAgB;IAC1B,2DAAU,CAAA;IACV,uDAAQ,CAAA;IACR,uDAAQ,CAAA;IACR,+EAAoB,CAAA;AACtB,CAAC,EALW,gBAAgB,KAAhB,gBAAgB,QAK3B;AAgHD,MAAM,CAAC,MAAM,OAAO,GAAG,mBAAmB,CAAgB,SAAS,CAAC,CAAC","sourcesContent":["import { requireNativeModule, NativeModule } from \"expo-modules-core\";\n\nexport enum PlaybackState {\n  IDLE = 1,\n  BUFFERING = 2,\n  READY = 3,\n  ENDED = 4,\n}\n\nexport enum RepeatMode {\n  OFF = 0,\n  TRACK = 1,\n  QUEUE = 2,\n}\n\nexport enum TransitionReason {\n  REPEAT = 0,\n  AUTO = 1,\n  SEEK = 2,\n  PLAYLIST_CHANGED = 3,\n}\n\nexport interface Track {\n  id: string;\n  url: string;\n  title?: string;\n  artist?: string;\n  artwork?: string;\n  duration?: number;\n  [key: string]: any;\n}\n\nexport type OrpheusEvents = {\n  onPlaybackStateChanged(event: { state: PlaybackState }): void;\n  onTrackTransition(event: {\n    currentTrackId: string;\n    previousTrackId?: string;\n    reason: TransitionReason;\n  }): void;\n  onPlayerError(event: { code: string; message: string }): void;\n  onPositionUpdate(event: {\n    position: number;\n    duration: number;\n    buffered: number;\n  }): void;\n  onIsPlayingChanged(event: { status: boolean }): void;\n};\n\ndeclare class OrpheusModule extends NativeModule<OrpheusEvents> {\n  /**\n   * 获取当前进度（秒）\n   */\n  getPosition(): Promise<number>;\n\n  /**\n   * 获取总时长（秒）\n   */\n  getDuration(): Promise<number>;\n\n  /**\n   * 获取缓冲进度（秒）\n   */\n  getBuffered(): Promise<number>;\n\n  /**\n   * 获取是否正在播放\n   */\n  getIsPlaying(): Promise<boolean>;\n\n  /**\n   * 获取当前播放索引\n   */\n  getCurrentIndex(): Promise<number>;\n\n  /**\n   * 获取当前播放的 Track 对象\n   */\n  getCurrentTrack(): Promise<Track | null>;\n\n  /**\n   * 获取随机模式状态\n   */\n  getShuffleMode(): Promise<boolean>;\n\n  /**\n   * 获取指定索引的 Track\n   */\n  getIndexTrack(index: number): Promise<Track | null>;\n\n  getRepeatMode(): Promise<RepeatMode>;\n\n  setBilibiliCookie(cookie: string): void;\n\n  play(): Promise<void>;\n\n  pause(): Promise<void>;\n\n  clear(): Promise<void>;\n\n  skipTo(index: number): Promise<void>;\n\n  skipToNext(): Promise<void>;\n\n  skipToPrevious(): Promise<void>;\n\n  /**\n   * 跳转进度\n   * @param seconds 秒数\n   */\n  seekTo(seconds: number): Promise<void>;\n\n  setRepeatMode(mode: RepeatMode): Promise<void>;\n\n  setShuffleMode(enabled: boolean): Promise<void>;\n\n  getQueue(): Promise<Track[]>;\n\n  /**\n   * 添加到队列末尾，且不去重。\n   * @param tracks\n   */\n  addToEnd(tracks: Track[], startFromId?: string): Promise<void>;\n\n  /**\n   * 播放下一首\n   * @param track\n   */\n  playNext(track: Track): Promise<void>;\n\n  removeTrack(index: number): Promise<void>;\n}\n\nexport const Orpheus = requireNativeModule<OrpheusModule>(\"Orpheus\");\n"]}
+{"version":3,"file":"ExpoOrpheusModule.js","sourceRoot":"","sources":["../src/ExpoOrpheusModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAgB,MAAM,mBAAmB,CAAC;AAEtE,MAAM,CAAN,IAAY,aAKX;AALD,WAAY,aAAa;IACvB,iDAAQ,CAAA;IACR,2DAAa,CAAA;IACb,mDAAS,CAAA;IACT,mDAAS,CAAA;AACX,CAAC,EALW,aAAa,KAAb,aAAa,QAKxB;AAED,MAAM,CAAN,IAAY,UAIX;AAJD,WAAY,UAAU;IACpB,yCAAO,CAAA;IACP,6CAAS,CAAA;IACT,6CAAS,CAAA;AACX,CAAC,EAJW,UAAU,KAAV,UAAU,QAIrB;AAED,MAAM,CAAN,IAAY,gBAKX;AALD,WAAY,gBAAgB;IAC1B,2DAAU,CAAA;IACV,uDAAQ,CAAA;IACR,uDAAQ,CAAA;IACR,+EAAoB,CAAA;AACtB,CAAC,EALW,gBAAgB,KAAhB,gBAAgB,QAK3B;AAkHD,MAAM,CAAC,MAAM,OAAO,GAAG,mBAAmB,CAAgB,SAAS,CAAC,CAAC","sourcesContent":["import { requireNativeModule, NativeModule } from \"expo-modules-core\";\n\nexport enum PlaybackState {\n  IDLE = 1,\n  BUFFERING = 2,\n  READY = 3,\n  ENDED = 4,\n}\n\nexport enum RepeatMode {\n  OFF = 0,\n  TRACK = 1,\n  QUEUE = 2,\n}\n\nexport enum TransitionReason {\n  REPEAT = 0,\n  AUTO = 1,\n  SEEK = 2,\n  PLAYLIST_CHANGED = 3,\n}\n\nexport interface Track {\n  id: string;\n  url: string;\n  title?: string;\n  artist?: string;\n  artwork?: string;\n  duration?: number;\n  [key: string]: any;\n}\n\nexport type OrpheusEvents = {\n  onPlaybackStateChanged(event: { state: PlaybackState }): void;\n  onTrackTransition(event: {\n    currentTrackId: string;\n    previousTrackId?: string;\n    reason: TransitionReason;\n  }): void;\n  onPlayerError(event: { code: string; message: string }): void;\n  onPositionUpdate(event: {\n    position: number;\n    duration: number;\n    buffered: number;\n  }): void;\n  onIsPlayingChanged(event: { status: boolean }): void;\n};\n\ndeclare class OrpheusModule extends NativeModule<OrpheusEvents> {\n  /**\n   * 获取当前进度（秒）\n   */\n  getPosition(): Promise<number>;\n\n  /**\n   * 获取总时长（秒）\n   */\n  getDuration(): Promise<number>;\n\n  /**\n   * 获取缓冲进度（秒）\n   */\n  getBuffered(): Promise<number>;\n\n  /**\n   * 获取是否正在播放\n   */\n  getIsPlaying(): Promise<boolean>;\n\n  /**\n   * 获取当前播放索引\n   */\n  getCurrentIndex(): Promise<number>;\n\n  /**\n   * 获取当前播放的 Track 对象\n   */\n  getCurrentTrack(): Promise<Track | null>;\n\n  /**\n   * 获取随机模式状态\n   */\n  getShuffleMode(): Promise<boolean>;\n\n  /**\n   * 获取指定索引的 Track\n   */\n  getIndexTrack(index: number): Promise<Track | null>;\n\n  getRepeatMode(): Promise<RepeatMode>;\n\n  setBilibiliCookie(cookie: string): void;\n\n  play(): Promise<void>;\n\n  pause(): Promise<void>;\n\n  clear(): Promise<void>;\n\n  skipTo(index: number): Promise<void>;\n\n  skipToNext(): Promise<void>;\n\n  skipToPrevious(): Promise<void>;\n\n  /**\n   * 跳转进度\n   * @param seconds 秒数\n   */\n  seekTo(seconds: number): Promise<void>;\n\n  setRepeatMode(mode: RepeatMode): Promise<void>;\n\n  setShuffleMode(enabled: boolean): Promise<void>;\n\n  getQueue(): Promise<Track[]>;\n\n  /**\n   * 添加到队列末尾，且不去重。\n   * @param tracks\n   * @param startFromId 可选，添加后立即播放该 ID 的曲目\n   * @param clearQueue 可选，是否清空当前队列\n   */\n  addToEnd(tracks: Track[], startFromId?: string, clearQueue?: boolean): Promise<void>;\n\n  /**\n   * 播放下一首\n   * @param track\n   */\n  playNext(track: Track): Promise<void>;\n\n  removeTrack(index: number): Promise<void>;\n}\n\nexport const Orpheus = requireNativeModule<OrpheusModule>(\"Orpheus\");\n"]}

package/package.json

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

package/src/ExpoOrpheusModule.ts

@@ -118,8 +118,10 @@ declare class OrpheusModule extends NativeModule<OrpheusEvents> {
   /**
    * 添加到队列末尾，且不去重。
    * @param tracks
+   * @param startFromId 可选，添加后立即播放该 ID 的曲目
+   * @param clearQueue 可选，是否清空当前队列
    */
-  addToEnd(tracks: Track[], startFromId?: string): Promise<void>;
+  addToEnd(tracks: Track[], startFromId?: string, clearQueue?: boolean): Promise<void>;
 
   /**
    * 播放下一首