expo-gliph-player 1.3.14 → 1.3.16

package/android/src/main/java/com/gliphplayer/GliphPlayerModule.kt

@@ -148,33 +148,40 @@ class GliphPlayerModule(
     }
   }
 
-  @ReactMethod
-  override fun skip(index: Double, initialPosition: Double, promise: Promise) {
-    scope.launch {
-      try {
-        playerService?.skip(index.toInt(), if (initialPosition < 0) -1.0 else initialPosition)
-        promise.resolve(null)
-      } catch (e: Exception) { promise.reject("skip_error", e.message, e) }
+    @ReactMethod
+    override fun skip(index: Double, initialPosition: Double, autoPlay: Boolean, promise: Promise) {
+        scope.launch {
+            try {
+                val pos = if (initialPosition < 0) -1.0 else initialPosition
+                playerService?.skip(index.toInt(), pos, autoPlay)
+                promise.resolve(null)
+            } catch (e: Exception) {
+                promise.reject("skip_error", e.message, e)
+            }
+        }
     }
-  }
 
   @ReactMethod
-  override fun skipToNext(initialPosition: Double, promise: Promise) {
+  override fun skipToNext(initialPosition: Double, autoPlay: Boolean, promise: Promise) {
     scope.launch {
       try {
-        playerService?.skipToNext(if (initialPosition < 0) -1.0 else initialPosition)
+        playerService?.skipToNext(if (initialPosition < 0) -1.0 else initialPosition, autoPlay)
         promise.resolve(null)
-      } catch (e: Exception) { promise.reject("skip_error", e.message, e) }
+      } catch (e: Exception) {
+        promise.reject("skip_error", e.message, e)
+      }
     }
   }
 
   @ReactMethod
-  override fun skipToPrevious(initialPosition: Double, promise: Promise) {
+  override fun skipToPrevious(initialPosition: Double, autoPlay: Boolean, promise: Promise) {
     scope.launch {
       try {
-        playerService?.skipToPrevious(if (initialPosition < 0) -1.0 else initialPosition)
+        playerService?.skipToPrevious(if (initialPosition < 0) -1.0 else initialPosition, autoPlay)
         promise.resolve(null)
-      } catch (e: Exception) { promise.reject("skip_error", e.message, e) }
+      } catch (e: Exception) {
+        promise.reject("skip_error", e.message, e)
+      }
     }
   }
 
@@ -357,4 +364,4 @@ class GliphPlayerModule(
   }
 
   override fun getName() = NAME
-}
+}

package/android/src/main/java/com/gliphplayer/GliphPlayerService.kt

@@ -12,6 +12,7 @@ import android.os.IBinder
 import androidx.media3.common.*
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.exoplayer.DefaultLoadControl
 import androidx.media3.exoplayer.source.DefaultMediaSourceFactory
 import androidx.media3.session.*
 import androidx.core.app.NotificationCompat
@@ -127,8 +128,8 @@ class GliphPlayerService : MediaLibraryService() {
     when (intent?.action) {
       ACTION_PLAY -> play()
       ACTION_PAUSE -> pause()
-      ACTION_SKIP_NEXT -> skipToNext(-1.0)
-      ACTION_SKIP_PREVIOUS -> skipToPrevious(-1.0)
+      ACTION_SKIP_NEXT -> skipToNext(-1.0, true)
+      ACTION_SKIP_PREVIOUS -> skipToPrevious(-1.0, true)
       ACTION_STOP -> {
         stop()
         stopSelf()
@@ -163,29 +164,39 @@ class GliphPlayerService : MediaLibraryService() {
   // ── Init ────────────────────────────────────────────────────────────────────
 
   private fun initPlayer(opts: ReadableMap? = null) {
-    val minBufferMs  = (getDouble(opts, "minBuffer", 15.0)  * 1000).toInt()
-    val maxBufferMs  = (getDouble(opts, "maxBuffer", 50.0)  * 1000).toInt()
-    val playBufferMs = (getDouble(opts, "playBuffer", 2.5)   * 1000).toInt()
-    val backBufferMs = (getDouble(opts, "backBuffer", 0.0)   * 1000).toInt()
-
-    val loadControl = androidx.media3.exoplayer.DefaultLoadControl.Builder()
-      .setBufferDurationsMs(minBufferMs, maxBufferMs, playBufferMs, playBufferMs)
-      .setBackBuffer(backBufferMs, /* retainBackBufferFromKeyframe= */ false)
-      .build()
+    val playBufferSec = getDouble(opts, "playBuffer", 2.5)
+    val minBufferSec  = getDouble(opts, "minBuffer", 15.0)
+    val maxBufferSec  = getDouble(opts, "maxBuffer", 50.0)
+    val backBufferSec = getDouble(opts, "backBuffer", 0.0)
+
+    val playBufferMs = (playBufferSec * 1000).toInt()    // 2500ms
+    var minBufferMs  = (minBufferSec  * 1000).toInt()    // 15000ms
+    val maxBufferMs  = (maxBufferSec  * 1000).toInt()    // 50000ms
+    val backBufferMs = (backBufferSec * 1000).toInt()    // 0ms
+
+    if (minBufferMs < playBufferMs) {
+        Log.w("GliphPlayer", "minBufferMs ($minBufferMs) < playBufferMs ($playBufferMs), adjusting...")
+        minBufferMs = playBufferMs
+    }
+
+    val loadControl = DefaultLoadControl.Builder()
+        .setBufferDurationsMs(minBufferMs, maxBufferMs, playBufferMs, playBufferMs)
+        .setBackBuffer(backBufferMs, false)
+        .build()
 
     player = ExoPlayer.Builder(this)
-      .setMediaSourceFactory(DefaultMediaSourceFactory(this))
-      .setLoadControl(loadControl)
-      .setHandleAudioBecomingNoisy(true)
-      .setWakeMode(C.WAKE_MODE_NETWORK)
-      .setAudioAttributes(
-        AudioAttributes.Builder()
-          .setUsage(C.USAGE_MEDIA)
-          .setContentType(C.AUDIO_CONTENT_TYPE_MUSIC)
-          .build(),
-        /* handleAudioFocus= */ true
-      )
-      .build()
+        .setMediaSourceFactory(DefaultMediaSourceFactory(this))
+        .setLoadControl(loadControl)
+        .setHandleAudioBecomingNoisy(true)
+        .setWakeMode(C.WAKE_MODE_NETWORK)
+        .setAudioAttributes(
+            AudioAttributes.Builder()
+                .setUsage(C.USAGE_MEDIA)
+                .setContentType(C.AUDIO_CONTENT_TYPE_MUSIC)
+                .build(),
+            true
+        )
+        .build()
 
     player.addListener(playerListener)
 
@@ -384,7 +395,7 @@ class GliphPlayerService : MediaLibraryService() {
       insertBeforeIndex
     }
 
-    val wasEmpty = queue.isEmpty()  // ✅ Сохраняем состояние ДО добавления
+    val wasEmpty = queue.isEmpty()
     val mediaItems = mutableListOf<MediaItem>()
 
     for (i in 0 until tracks.size()) {
@@ -400,7 +411,6 @@ class GliphPlayerService : MediaLibraryService() {
       player.addMediaItems(insertBeforeIndex, mediaItems)
     }
 
-    // ✅ Если очередь была пуста - отправляем событие
     if (wasEmpty && queue.isNotEmpty()) {
       emitActiveTrackChanged()
     }
@@ -432,42 +442,57 @@ class GliphPlayerService : MediaLibraryService() {
     }
   }
 
-  // ✅ ИСПРАВЛЕНО: Добавлено событие
-  fun skip(index: Int, initialPosition: Double) {
-    val lastIndex = player.currentMediaItemIndex
-    player.seekTo(index, if (initialPosition >= 0) (initialPosition * 1000).toLong() else C.TIME_UNSET)
-    player.play()
+    fun skip(index: Int, initialPosition: Double, autoPlay: Boolean = true) {
+        val lastIndex = player.currentMediaItemIndex
 
-    // ✅ Отправляем событие
-    emitActiveTrackChanged(lastIndex)
-    emitPlaybackState("playing")
-  }
+        if (index < 0 || index >= queue.size) {
+            Log.e("GliphPlayer", "skip: index $index out of bounds")
+            return
+        }
 
-  // ✅ ИСПРАВЛЕНО: Добавлено событие
-  fun skipToNext(initialPosition: Double) {
+        player.seekTo(index, if (initialPosition >= 0) (initialPosition * 1000).toLong() else C.TIME_UNSET)
+
+        if (autoPlay) {
+            player.playWhenReady = true
+
+            if (player.playbackState == Player.STATE_IDLE) {
+                player.prepare()
+            }
+
+            player.play()
+            emitPlaybackState("playing")
+        }
+
+        emitActiveTrackChanged(lastIndex)
+    }
+
+  fun skipToNext(initialPosition: Double, autoPlay: Boolean = true) {
     if (player.hasNextMediaItem()) {
       val lastIndex = player.currentMediaItemIndex
       player.seekToNextMediaItem()
       if (initialPosition >= 0) player.seekTo((initialPosition * 1000).toLong())
-      player.play()
 
-      // ✅ Отправляем событие
+      if (autoPlay) {
+        player.play()
+      }
+
       emitActiveTrackChanged(lastIndex)
-      emitPlaybackState("playing")
+      emitPlaybackState(if (autoPlay) "playing" else "paused")
     }
   }
 
-  // ✅ ИСПРАВЛЕНО: Добавлено событие
-  fun skipToPrevious(initialPosition: Double) {
+  fun skipToPrevious(initialPosition: Double, autoPlay: Boolean = true) {
     if (player.hasPreviousMediaItem()) {
       val lastIndex = player.currentMediaItemIndex
       player.seekToPreviousMediaItem()
       if (initialPosition >= 0) player.seekTo((initialPosition * 1000).toLong())
-      player.play()
 
-      // ✅ Отправляем событие
+      if (autoPlay) {
+        player.play()
+      }
+
       emitActiveTrackChanged(lastIndex)
-      emitPlaybackState("playing")
+      emitPlaybackState(if (autoPlay) "playing" else "paused")
     }
   }
 
@@ -480,17 +505,14 @@ class GliphPlayerService : MediaLibraryService() {
 
   // ── Playback control ────────────────────────────────────────────────────────
 
-  // ✅ ИСПРАВЛЕНО: Добавлены события
   fun play() {
     if (player.playbackState == Player.STATE_IDLE) {
       player.prepare()
     }
     player.play()
 
-    // ✅ Отправляем состояние
     emitPlaybackState("playing")
 
-    // ✅ Если есть активный трек - отправляем его
     if (player.currentMediaItemIndex >= 0 && player.currentMediaItemIndex < queue.size) {
       emitActiveTrackChanged()
     }
@@ -498,34 +520,28 @@ class GliphPlayerService : MediaLibraryService() {
     updateMediaNotification()
   }
 
-  // ✅ ИСПРАВЛЕНО: Добавлено событие
   fun pause() {
     player.pause()
 
-    // ✅ Отправляем состояние
     emitPlaybackState("paused")
 
     updateMediaNotification()
   }
 
-  // ✅ ИСПРАВЛЕНО: Добавлено событие
   fun stop() {
     player.stop()
 
-    // ✅ Отправляем состояние
     emitPlaybackState("stopped")
 
     updateMediaNotification()
   }
 
-  // ✅ ИСПРАВЛЕНО: Добавлены события
   fun reset() {
     val lastIndex = player.currentMediaItemIndex
     player.stop()
     player.clearMediaItems()
     queue.clear()
 
-    // ✅ Отправляем событие об очистке
     val map = Arguments.createMap()
     map.putInt("index", -1)
     map.putNull("track")
@@ -766,12 +782,10 @@ class GliphPlayerService : MediaLibraryService() {
       updateMediaNotification()
 
       if (playbackState == Player.STATE_ENDED) {
-        // ✅ Отправляем track-ended
         val map = Arguments.createMap()
         map.putInt("index", player.currentMediaItemIndex)
         eventEmitter?.invoke("playback-track-ended", map)
 
-        // ✅ Отправляем queue-ended
         val queueMap = Arguments.createMap()
         queueMap.putInt("index", player.currentMediaItemIndex)
         queueMap.putDouble("position", player.currentPosition / 1000.0)
@@ -785,7 +799,6 @@ class GliphPlayerService : MediaLibraryService() {
     }
 
     override fun onMediaItemTransition(mediaItem: MediaItem?, reason: Int) {
-      // ✅ Отправляем track-ended для предыдущего трека
       if (reason == Player.MEDIA_ITEM_TRANSITION_REASON_AUTO ||
           reason == Player.MEDIA_ITEM_TRANSITION_REASON_REPEAT) {
         val endedMap = Arguments.createMap()
@@ -811,7 +824,6 @@ class GliphPlayerService : MediaLibraryService() {
         map.putNull("lastTrack")
       }
 
-      // ✅ Отправляем active-track-changed
       eventEmitter?.invoke("playback-active-track-changed", map)
       lastIndex = newIndex
       updateMediaNotification()

package/ios/GliphAudioPlayer.swift

@@ -20,12 +20,16 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
   private var playerItems: [AVPlayerItem] = []
   private var queue: [[String: Any]] = []
   private var currentIndex: Int = -1
-  private var repeatMode: Int = 0
+  private var repeatMode: Int = 0  // 0=off, 1=track, 2=queue
   private var isSetup = false
   private var progressTimer: Timer?
   private var progressInterval: TimeInterval = 1.0
   private var options: [String: Any] = [:]
 
+  // ✅ AVPlayerLooper для повтора трека
+  private var playerLooper: AVPlayerLooper?
+  private var templateItem: AVPlayerItem?
+
   private let eventEmitter: EventEmitter
   private var timeObserver: Any?
   private var playerObservations: [NSKeyValueObservation] = []
@@ -162,6 +166,7 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
   @objc public func skipToIndex(
     _ index: Int,
     initialPosition: Double,
+    autoPlay: Bool = true,
     resolve: @escaping RCTPromiseResolveBlock,
     reject: @escaping RCTPromiseRejectBlock
   ) {
@@ -176,7 +181,10 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
     if initialPosition >= 0 {
       player?.seek(to: CMTime(seconds: initialPosition, preferredTimescale: 1000))
     }
-    player?.play()
+
+    if autoPlay {
+      player?.play()
+    }
 
     emitActiveTrackChanged(lastIndex: lastIndex)
 
@@ -185,6 +193,7 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
 
   @objc public func skipToNext(
     initialPosition: Double,
+    autoPlay: Bool = true,
     resolve: @escaping RCTPromiseResolveBlock,
     reject: @escaping RCTPromiseRejectBlock
   ) {
@@ -192,11 +201,12 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
     guard next < queue.count else {
       reject("skip_error", "No next track", nil); return
     }
-    skipToIndex(next, initialPosition: initialPosition, resolve: resolve, reject: reject)
+    skipToIndex(next, initialPosition: initialPosition, autoPlay: autoPlay, resolve: resolve, reject: reject)
   }
 
   @objc public func skipToPrevious(
     initialPosition: Double,
+    autoPlay: Bool = true,
     resolve: @escaping RCTPromiseResolveBlock,
     reject: @escaping RCTPromiseRejectBlock
   ) {
@@ -204,7 +214,7 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
     guard prev >= 0 else {
       reject("skip_error", "No previous track", nil); return
     }
-    skipToIndex(prev, initialPosition: initialPosition, resolve: resolve, reject: reject)
+    skipToIndex(prev, initialPosition: initialPosition, autoPlay: autoPlay, resolve: resolve, reject: reject)
   }
 
   @objc public func moveFrom(
@@ -254,6 +264,12 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
 
   @objc public func reset(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     player?.pause()
+
+    // ✅ Уничтожаем looper
+    playerLooper?.disableLooping()
+    playerLooper = nil
+    templateItem = nil
+
     player?.removeAllItems()
     queue.removeAll()
     playerItems.removeAll()
@@ -298,8 +314,23 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
 
   @objc public func getRate() -> Float { return player?.rate ?? 1.0 }
 
+  // ✅ ИСПРАВЛЕНО: пересоздаём очередь при смене режима
   @objc public func setRepeatMode(_ mode: Int, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+    let oldMode = repeatMode
     repeatMode = mode
+
+    // ✅ Пересоздаём очередь с учётом нового режима
+    if oldMode != mode {
+      let wasPlaying = player?.timeControlStatus == .playing
+      rebuildPlayerQueue()
+      if wasPlaying {
+        player?.play()
+      }
+    }
+
+    // ✅ Отправляем событие
+    eventEmitter("playback-repeat-mode-changed", ["mode": mode])
+
     resolve(nil)
   }
 
@@ -414,12 +445,40 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
     ])
   }
 
+  // ✅ ИСПРАВЛЕНО: добавлен AVPlayerLooper для повторения трека
   private func rebuildPlayerQueue() {
     guard let player = player else { return }
+
+    // ✅ Уничтожаем старый looper
+    playerLooper?.disableLooping()
+    playerLooper = nil
+    templateItem = nil
+
     player.removeAllItems()
     playerItems.removeAll()
 
     let startIndex = max(0, currentIndex)
+
+    // ✅ РЕЖИМ ПОВТОРА ТРЕКА (RepeatMode.Track = 1)
+    if repeatMode == 1 && startIndex < queue.count {
+      let track = queue[startIndex]
+      guard let urlString = track["url"] as? String,
+            let url = URL(string: urlString) else { return }
+
+      // ✅ Создаём template item
+      let item = AVPlayerItem(url: url)
+      templateItem = item
+      playerItems.append(item)
+
+      // ✅ Создаём looper для бесконечного повтора
+      playerLooper = AVPlayerLooper(player: player, templateItem: item)
+
+      currentIndex = startIndex
+      updateNowPlayingInfo()
+      return
+    }
+
+    // ✅ ОБЫЧНАЯ ОЧЕРЕДЬ (RepeatMode.Off / RepeatMode.Queue)
     for i in startIndex..<queue.count {
       let track = queue[i]
       guard let urlString = track["url"] as? String,
@@ -528,7 +587,7 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
       guard let self = self else { return .commandFailed }
       let next = self.currentIndex + 1
       if next < self.queue.count {
-        self.skipToIndex(next, initialPosition: -1, resolve: { _ in }, reject: { _, _, _ in })
+        self.skipToIndex(next, initialPosition: -1, autoPlay: true, resolve: { _ in }, reject: { _, _, _ in })
       }
       self.eventEmitter("remote-next", nil)
       return .success
@@ -540,7 +599,7 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
       guard let self = self else { return .commandFailed }
       let prev = self.currentIndex - 1
       if prev >= 0 {
-        self.skipToIndex(prev, initialPosition: -1, resolve: { _ in }, reject: { _, _, _ in })
+        self.skipToIndex(prev, initialPosition: -1, autoPlay: true, resolve: { _ in }, reject: { _, _, _ in })
       }
       self.eventEmitter("remote-previous", nil)
       return .success
@@ -626,25 +685,24 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
     }
   }
 
+  // ✅ ИСПРАВЛЕНО: AVPlayerLooper сам обрабатывает повтор трека
   @objc private func playerItemDidFinish(_ notification: Notification) {
     guard let finishedItem = notification.object as? AVPlayerItem,
           finishedItem === player?.currentItem else { return }
 
+    // ✅ Если режим повтора трека - AVPlayerLooper сам обрабатывает, выходим
+    if repeatMode == 1 {
+      return
+    }
+
     let nextIndex = currentIndex + 1
     let currentPosition = CMTimeGetSeconds(player?.currentTime() ?? .zero)
 
-    // ✅ 1. Отправляем событие окончания ТЕКУЩЕГО трека
     eventEmitter("playback-track-ended", [
       "index": currentIndex,
       "position": currentPosition
     ])
 
-    if repeatMode == 1 {
-      player?.seek(to: .zero)
-      player?.play()
-      return
-    }
-
     if nextIndex < queue.count {
       currentIndex = nextIndex
       updateNowPlayingInfo()
@@ -655,6 +713,7 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
         "lastPosition": 0.0,
       ])
     } else if repeatMode == 2 {
+      // ✅ ПОВТОР ВСЕЙ ОЧЕРЕДИ
       currentIndex = 0
       rebuildPlayerQueue()
       player?.play()

package/ios/GliphPlayerModule.mm

@@ -41,6 +41,7 @@ RCT_EXPORT_MODULE(RNGliphPlayer)
     @"playback-queue-ended",
     @"playback-progress-updated",
     @"playback-metadata-received",
+    @"playback-repeat-mode-changed",
     @"remote-play",
     @"remote-pause",
     @"remote-stop",
@@ -96,21 +97,34 @@ RCT_EXPORT_METHOD(removeUpcomingTracks:(RCTPromiseResolveBlock)resolve
 
 RCT_EXPORT_METHOD(skip:(double)index
                   initialPosition:(double)initialPosition
+                  autoPlay:(BOOL)autoPlay
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject) {
-  [_player skipToIndex:(NSInteger)index initialPosition:initialPosition resolve:resolve reject:reject];
+  [_player skipToIndex:(NSInteger)index
+       initialPosition:initialPosition
+              autoPlay:autoPlay
+               resolve:resolve
+                reject:reject];
 }
 
 RCT_EXPORT_METHOD(skipToNext:(double)initialPosition
+                  autoPlay:(BOOL)autoPlay
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject) {
-  [_player skipToNextWithInitialPosition:initialPosition resolve:resolve reject:reject];
+  [_player skipToNextWithInitialPosition:initialPosition
+                                autoPlay:autoPlay
+                                 resolve:resolve
+                                  reject:reject];
 }
 
 RCT_EXPORT_METHOD(skipToPrevious:(double)initialPosition
+                  autoPlay:(BOOL)autoPlay
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject) {
-  [_player skipToPreviousWithInitialPosition:initialPosition resolve:resolve reject:reject];
+  [_player skipToPreviousWithInitialPosition:initialPosition
+                                    autoPlay:autoPlay
+                                     resolve:resolve
+                                      reject:reject];
 }
 
 RCT_EXPORT_METHOD(move:(double)fromIndex