@roitium/expo-orpheus 0.1.1 → 0.2.1

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

@@ -79,6 +79,10 @@ class ExpoOrpheusModule : Module() {
             if (d == C.TIME_UNSET) 0.0 else d.toDouble() / 1000.0
         }.runOnQueue(Queues.MAIN)
 
+        AsyncFunction("getBuffered") {
+            controller?.bufferedPosition?.toDouble()?.div(1000.0) ?: 0.0
+        }.runOnQueue(Queues.MAIN)
+
         AsyncFunction("getIsPlaying") {
             controller?.isPlaying ?: false
         }.runOnQueue(Queues.MAIN)
@@ -174,6 +178,16 @@ class ExpoOrpheusModule : Module() {
             controller?.shuffleModeEnabled = enabled
         }.runOnQueue(Queues.MAIN)
 
+        AsyncFunction("getRepeatMode") {
+            controller?.repeatMode
+        }.runOnQueue(Queues.MAIN)
+
+        AsyncFunction("removeTrack") { index: Int ->
+            if (index >= 0 && index < (controller?.mediaItemCount ?: 0)) {
+                controller?.removeMediaItem(index)
+            }
+        }
+
         AsyncFunction("getQueue") {
             val player = controller ?: return@AsyncFunction emptyList<TrackRecord>()
             val count = player.mediaItemCount
@@ -187,9 +201,7 @@ class ExpoOrpheusModule : Module() {
             return@AsyncFunction queue
         }.runOnQueue(Queues.MAIN)
 
-        AsyncFunction("add") { tracks: List<TrackRecord> ->
-            // 1. 【后台线程】执行：JSON 转换、Metadata 构建 (耗时操作在这里做，不卡 UI)
-            // 这里不需要改，继续在当前线程跑
+        AsyncFunction("addToEnd") { tracks: List<TrackRecord>, startFromId: String? ->
             val mediaItems = tracks.mapNotNull { track ->
                 try {
                     val trackJson = gson.toJson(track)
@@ -208,7 +220,7 @@ class ExpoOrpheusModule : Module() {
 
                     MediaItem.Builder()
                         .setMediaId(track.id)
-                        .setUri(track.url ?: "")
+                        .setUri(track.url)
                         .setMediaMetadata(metadata)
                         .build()
                 } catch (e: Exception) {
@@ -216,26 +228,78 @@ class ExpoOrpheusModule : Module() {
                     null
                 }
             }
+            val player = controller ?: return@AsyncFunction
+            val initialSize = player.mediaItemCount
+            player.addMediaItems(mediaItems)
 
-            val player = controller
-            if (player != null) {
-                // 获取 player 真正归属的 Looper
-                val playerLooper = player.applicationLooper
+            if (!startFromId.isNullOrEmpty()) {
+                val relativeIndex = tracks.indexOfFirst { it.id == startFromId }
 
-                if (Looper.myLooper() == playerLooper) {
-                    player.addMediaItems(mediaItems)
-                    if (player.playbackState == Player.STATE_IDLE) {
-                        player.prepare()
-                    }
-                } else {
-                    Handler(playerLooper).post {
-                        player.addMediaItems(mediaItems)
-                        if (player.playbackState == Player.STATE_IDLE) {
-                            player.prepare()
-                        }
-                    }
+                if (relativeIndex != -1) {
+                    val targetIndex = initialSize + relativeIndex
+
+                    player.seekTo(targetIndex, C.TIME_UNSET)
+                    player.prepare()
+                    player.play()
+
+                    return@AsyncFunction
+                }
+            }
+
+            if (player.playbackState == Player.STATE_IDLE) {
+                player.prepare()
+            }
+        }.runOnQueue(Queues.MAIN)
+
+        AsyncFunction("playNext") { track: TrackRecord ->
+            val player = controller ?: return@AsyncFunction
+
+            val trackJson = gson.toJson(track)
+            val extras = Bundle()
+            extras.putString("track_json", trackJson)
+            val artUri = if (!track.artwork.isNullOrEmpty()) track.artwork!!.toUri() else null
+
+            val metadata = MediaMetadata.Builder()
+                .setTitle(track.title)
+                .setArtist(track.artist)
+                .setArtworkUri(artUri)
+                .setExtras(extras)
+                .build()
+
+            val mediaItem = MediaItem.Builder()
+                .setMediaId(track.id)
+                .setUri(track.url)
+                .setMediaMetadata(metadata)
+                .build()
+
+            val currentId = player.currentMediaItem?.mediaId
+            val targetIndex = player.currentMediaItemIndex + 1
+
+            var existingIndex = -1
+            for (i in 0 until player.mediaItemCount) {
+                if (player.getMediaItemAt(i).mediaId == track.id) {
+                    existingIndex = i
+                    break
                 }
             }
+
+            if (existingIndex != -1) {
+                if (existingIndex == player.currentMediaItemIndex) {
+                    return@AsyncFunction
+                }
+                val safeTargetIndex = targetIndex.coerceAtMost(player.mediaItemCount)
+
+                player.moveMediaItem(existingIndex, safeTargetIndex)
+
+            } else {
+                val safeTargetIndex = targetIndex.coerceAtMost(player.mediaItemCount)
+
+                player.addMediaItem(safeTargetIndex, mediaItem)
+            }
+
+            if (player.playbackState == Player.STATE_IDLE) {
+                player.prepare()
+            }
         }.runOnQueue(Queues.MAIN)
     }
 

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

@@ -0,0 +1,68 @@
+package expo.modules.orpheus
+
+import android.os.Handler
+import android.os.Looper
+import android.os.SystemClock
+import androidx.media3.common.Player
+
+class SleepTimerManager(private val player: Player) {
+    private val handler = Handler(Looper.getMainLooper())
+
+    private var targetTimeRaw: Long = 0
+    private var isTimerActive = false
+
+    private val checkRunnable = object : Runnable {
+        override fun run() {
+            if (!isTimerActive) return
+
+            val now = SystemClock.elapsedRealtime()
+            val timeLeft = targetTimeRaw - now
+
+            if (timeLeft <= 0) {
+                performStop()
+            } else {
+                handler.postDelayed(this, timeLeft)
+            }
+        }
+    }
+
+    /**
+     * 开启定时器
+     * @param duration 多少秒后停止
+     */
+    fun start(duration: Long) {
+        if (duration <= 0) {
+            cancel()
+            return
+        }
+
+        targetTimeRaw = SystemClock.elapsedRealtime() + (duration.times(1000L))
+        isTimerActive = true
+
+        handler.removeCallbacks(checkRunnable)
+        handler.postDelayed(checkRunnable, duration)
+    }
+
+    /**
+     * 取消定时器
+     */
+    fun cancel() {
+        isTimerActive = false
+        handler.removeCallbacks(checkRunnable)
+        targetTimeRaw = 0
+    }
+
+    /**
+     * 获取剩余时间（单位：秒）
+     */
+    fun getRemainingTime(): Long {
+        if (!isTimerActive) return -1L
+        val remaining = (targetTimeRaw - SystemClock.elapsedRealtime()).div(1000L)
+        return if (remaining > 0) remaining else 0
+    }
+
+    private fun performStop() {
+        isTimerActive = false
+        player.pause()
+    }
+}

package/build/ExpoOrpheusModule.d.ts

@@ -56,6 +56,10 @@ declare class OrpheusModule extends NativeModule<OrpheusEvents> {
      * 获取总时长（秒）
      */
     getDuration(): Promise<number>;
+    /**
+     * 获取缓冲进度（秒）
+     */
+    getBuffered(): Promise<number>;
     /**
      * 获取是否正在播放
      */
@@ -76,6 +80,7 @@ declare class OrpheusModule extends NativeModule<OrpheusEvents> {
      * 获取指定索引的 Track
      */
     getIndexTrack(index: number): Promise<Track | null>;
+    getRepeatMode(): Promise<RepeatMode>;
     setBilibiliCookie(cookie: string): void;
     play(): Promise<void>;
     pause(): Promise<void>;
@@ -91,7 +96,17 @@ declare class OrpheusModule extends NativeModule<OrpheusEvents> {
     setRepeatMode(mode: RepeatMode): Promise<void>;
     setShuffleMode(enabled: boolean): Promise<void>;
     getQueue(): Promise<Track[]>;
-    add(tracks: Track[]): Promise<void>;
+    /**
+     * 添加到队列末尾，且不去重。
+     * @param tracks
+     */
+    addToEnd(tracks: Track[], startFromId?: string): Promise<void>;
+    /**
+     * 播放下一首
+     * @param track
+     */
+    playNext(track: Track): Promise<void>;
+    removeTrack(index: number): Promise<void>;
 }
 export declare const Orpheus: OrpheusModule;
 export {};

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;;;OAGG;IACH,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAE9D;;;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;AA6FD,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  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  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  add(tracks: Track[]): 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;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"]}

package/build/hooks/useProgress.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useProgress.d.ts","sourceRoot":"","sources":["../../src/hooks/useProgress.ts"],"names":[],"mappings":"AAMA,wBAAgB,WAAW;;;;EAgE1B"}
+{"version":3,"file":"useProgress.d.ts","sourceRoot":"","sources":["../../src/hooks/useProgress.ts"],"names":[],"mappings":"AAMA,wBAAgB,WAAW;;;;EAmE1B"}

package/build/hooks/useProgress.js

@@ -26,12 +26,16 @@ export function useProgress() {
         }
     };
     const manualSync = () => {
-        Promise.all([Orpheus.getPosition(), Orpheus.getDuration()])
-            .then(([pos, dur]) => {
+        Promise.all([
+            Orpheus.getPosition(),
+            Orpheus.getDuration(),
+            Orpheus.getBuffered(),
+        ])
+            .then(([pos, dur, buf]) => {
             setProgress((prev) => ({
-                ...prev,
                 position: pos,
                 duration: dur,
+                buffered: buf,
             }));
         })
             .catch((e) => console.warn("同步最新进度失败", e));
@@ -39,7 +43,6 @@ export function useProgress() {
     useEffect(() => {
         manualSync();
         startListening();
-        // === 监听 App 前后台切换 ===
         const subscription = AppState.addEventListener("change", (nextAppState) => {
             if (nextAppState === "active") {
                 manualSync();

package/build/hooks/useProgress.js.map

@@ -1 +1 @@
-{"version":3,"file":"useProgress.js","sourceRoot":"","sources":["../../src/hooks/useProgress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAkB,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAI/C,MAAM,UAAU,WAAW;IACzB,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC;QACvC,QAAQ,EAAE,CAAC;QACX,QAAQ,EAAE,CAAC;QACX,QAAQ,EAAE,CAAC;KACZ,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,MAAM,CAA6B,IAAI,CAAC,CAAC;IAE7D,MAAM,cAAc,GAAG,GAAG,EAAE;QAC1B,IAAI,WAAW,CAAC,OAAO;YAAE,OAAO;QAEhC,WAAW,CAAC,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,kBAAkB,EAAE,CAAC,KAAK,EAAE,EAAE;YACtE,WAAW,CAAC;gBACV,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;aACzB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,aAAa,GAAG,GAAG,EAAE;QACzB,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YACxB,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YAC7B,WAAW,CAAC,OAAO,GAAG,IAAI,CAAC;QAC7B,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,UAAU,GAAG,GAAG,EAAE;QACtB,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;aACxD,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE;YACnB,WAAW,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBACrB,GAAG,IAAI;gBACP,QAAQ,EAAE,GAAG;gBACb,QAAQ,EAAE,GAAG;aACd,CAAC,CAAC,CAAC;QACN,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;IAC/C,CAAC,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,UAAU,EAAE,CAAC;QACb,cAAc,EAAE,CAAC;QAEjB,uBAAuB;QACvB,MAAM,YAAY,GAAG,QAAQ,CAAC,gBAAgB,CAC5C,QAAQ,EACR,CAAC,YAA4B,EAAE,EAAE;YAC/B,IAAI,YAAY,KAAK,QAAQ,EAAE,CAAC;gBAC9B,UAAU,EAAE,CAAC;gBACb,cAAc,EAAE,CAAC;YACnB,CAAC;iBAAM,CAAC;gBACN,aAAa,EAAE,CAAC;YAClB,CAAC;QACH,CAAC,CACF,CAAC;QAEF,OAAO,GAAG,EAAE;YACV,aAAa,EAAE,CAAC;YAChB,YAAY,CAAC,MAAM,EAAE,CAAC;QACxB,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,QAAQ,CAAC;AAClB,CAAC","sourcesContent":["import { useEffect, useState, useRef } from \"react\";\nimport { AppState, AppStateStatus } from \"react-native\";\nimport { Orpheus } from \"../ExpoOrpheusModule\";\n\ntype OrpheusSubscription = ReturnType<typeof Orpheus.addListener>;\n\nexport function useProgress() {\n  const [progress, setProgress] = useState({\n    position: 0,\n    duration: 0,\n    buffered: 0,\n  });\n\n  const listenerRef = useRef<null | OrpheusSubscription>(null);\n\n  const startListening = () => {\n    if (listenerRef.current) return;\n\n    listenerRef.current = Orpheus.addListener(\"onPositionUpdate\", (event) => {\n      setProgress({\n        position: event.position,\n        duration: event.duration,\n        buffered: event.buffered,\n      });\n    });\n  };\n\n  const stopListening = () => {\n    if (listenerRef.current) {\n      listenerRef.current.remove();\n      listenerRef.current = null;\n    }\n  };\n\n  const manualSync = () => {\n    Promise.all([Orpheus.getPosition(), Orpheus.getDuration()])\n      .then(([pos, dur]) => {\n        setProgress((prev) => ({\n          ...prev,\n          position: pos,\n          duration: dur,\n        }));\n      })\n      .catch((e) => console.warn(\"同步最新进度失败\", e));\n  };\n\n  useEffect(() => {\n    manualSync();\n    startListening();\n\n    // === 监听 App 前后台切换 ===\n    const subscription = AppState.addEventListener(\n      \"change\",\n      (nextAppState: AppStateStatus) => {\n        if (nextAppState === \"active\") {\n          manualSync();\n          startListening();\n        } else {\n          stopListening();\n        }\n      }\n    );\n\n    return () => {\n      stopListening();\n      subscription.remove();\n    };\n  }, []);\n\n  return progress;\n}\n"]}
+{"version":3,"file":"useProgress.js","sourceRoot":"","sources":["../../src/hooks/useProgress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAkB,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAI/C,MAAM,UAAU,WAAW;IACzB,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC;QACvC,QAAQ,EAAE,CAAC;QACX,QAAQ,EAAE,CAAC;QACX,QAAQ,EAAE,CAAC;KACZ,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,MAAM,CAA6B,IAAI,CAAC,CAAC;IAE7D,MAAM,cAAc,GAAG,GAAG,EAAE;QAC1B,IAAI,WAAW,CAAC,OAAO;YAAE,OAAO;QAEhC,WAAW,CAAC,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,kBAAkB,EAAE,CAAC,KAAK,EAAE,EAAE;YACtE,WAAW,CAAC;gBACV,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;aACzB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,aAAa,GAAG,GAAG,EAAE;QACzB,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YACxB,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YAC7B,WAAW,CAAC,OAAO,GAAG,IAAI,CAAC;QAC7B,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,UAAU,GAAG,GAAG,EAAE;QACtB,OAAO,CAAC,GAAG,CAAC;YACV,OAAO,CAAC,WAAW,EAAE;YACrB,OAAO,CAAC,WAAW,EAAE;YACrB,OAAO,CAAC,WAAW,EAAE;SACtB,CAAC;aACC,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE;YACxB,WAAW,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBACrB,QAAQ,EAAE,GAAG;gBACb,QAAQ,EAAE,GAAG;gBACb,QAAQ,EAAE,GAAG;aACd,CAAC,CAAC,CAAC;QACN,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;IAC/C,CAAC,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,UAAU,EAAE,CAAC;QACb,cAAc,EAAE,CAAC;QAEjB,MAAM,YAAY,GAAG,QAAQ,CAAC,gBAAgB,CAC5C,QAAQ,EACR,CAAC,YAA4B,EAAE,EAAE;YAC/B,IAAI,YAAY,KAAK,QAAQ,EAAE,CAAC;gBAC9B,UAAU,EAAE,CAAC;gBACb,cAAc,EAAE,CAAC;YACnB,CAAC;iBAAM,CAAC;gBACN,aAAa,EAAE,CAAC;YAClB,CAAC;QACH,CAAC,CACF,CAAC;QAEF,OAAO,GAAG,EAAE;YACV,aAAa,EAAE,CAAC;YAChB,YAAY,CAAC,MAAM,EAAE,CAAC;QACxB,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,QAAQ,CAAC;AAClB,CAAC","sourcesContent":["import { useEffect, useState, useRef } from \"react\";\nimport { AppState, AppStateStatus } from \"react-native\";\nimport { Orpheus } from \"../ExpoOrpheusModule\";\n\ntype OrpheusSubscription = ReturnType<typeof Orpheus.addListener>;\n\nexport function useProgress() {\n  const [progress, setProgress] = useState({\n    position: 0,\n    duration: 0,\n    buffered: 0,\n  });\n\n  const listenerRef = useRef<null | OrpheusSubscription>(null);\n\n  const startListening = () => {\n    if (listenerRef.current) return;\n\n    listenerRef.current = Orpheus.addListener(\"onPositionUpdate\", (event) => {\n      setProgress({\n        position: event.position,\n        duration: event.duration,\n        buffered: event.buffered,\n      });\n    });\n  };\n\n  const stopListening = () => {\n    if (listenerRef.current) {\n      listenerRef.current.remove();\n      listenerRef.current = null;\n    }\n  };\n\n  const manualSync = () => {\n    Promise.all([\n      Orpheus.getPosition(),\n      Orpheus.getDuration(),\n      Orpheus.getBuffered(),\n    ])\n      .then(([pos, dur, buf]) => {\n        setProgress((prev) => ({\n          position: pos,\n          duration: dur,\n          buffered: buf,\n        }));\n      })\n      .catch((e) => console.warn(\"同步最新进度失败\", e));\n  };\n\n  useEffect(() => {\n    manualSync();\n    startListening();\n\n    const subscription = AppState.addEventListener(\n      \"change\",\n      (nextAppState: AppStateStatus) => {\n        if (nextAppState === \"active\") {\n          manualSync();\n          startListening();\n        } else {\n          stopListening();\n        }\n      }\n    );\n\n    return () => {\n      stopListening();\n      subscription.remove();\n    };\n  }, []);\n\n  return progress;\n}\n"]}

package/package.json

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

package/src/ExpoOrpheusModule.ts

@@ -57,6 +57,11 @@ declare class OrpheusModule extends NativeModule<OrpheusEvents> {
    */
   getDuration(): Promise<number>;
 
+  /**
+   * 获取缓冲进度（秒）
+   */
+  getBuffered(): Promise<number>;
+
   /**
    * 获取是否正在播放
    */
@@ -82,6 +87,8 @@ declare class OrpheusModule extends NativeModule<OrpheusEvents> {
    */
   getIndexTrack(index: number): Promise<Track | null>;
 
+  getRepeatMode(): Promise<RepeatMode>;
+
   setBilibiliCookie(cookie: string): void;
 
   play(): Promise<void>;
@@ -108,7 +115,19 @@ declare class OrpheusModule extends NativeModule<OrpheusEvents> {
 
   getQueue(): Promise<Track[]>;
 
-  add(tracks: Track[]): Promise<void>;
+  /**
+   * 添加到队列末尾，且不去重。
+   * @param tracks
+   */
+  addToEnd(tracks: Track[], startFromId?: string): Promise<void>;
+
+  /**
+   * 播放下一首
+   * @param track
+   */
+  playNext(track: Track): Promise<void>;
+
+  removeTrack(index: number): Promise<void>;
 }
 
 export const Orpheus = requireNativeModule<OrpheusModule>("Orpheus");

package/src/hooks/useProgress.ts

@@ -33,12 +33,16 @@ export function useProgress() {
   };
 
   const manualSync = () => {
-    Promise.all([Orpheus.getPosition(), Orpheus.getDuration()])
-      .then(([pos, dur]) => {
+    Promise.all([
+      Orpheus.getPosition(),
+      Orpheus.getDuration(),
+      Orpheus.getBuffered(),
+    ])
+      .then(([pos, dur, buf]) => {
         setProgress((prev) => ({
-          ...prev,
           position: pos,
           duration: dur,
+          buffered: buf,
         }));
       })
       .catch((e) => console.warn("同步最新进度失败", e));
@@ -48,7 +52,6 @@ export function useProgress() {
     manualSync();
     startListening();
 
-    // === 监听 App 前后台切换 ===
     const subscription = AppState.addEventListener(
       "change",
       (nextAppState: AppStateStatus) => {