expo-gliph-player 1.3.16 → 1.3.18

package/ios/GliphAudioPlayer.swift

@@ -2,47 +2,37 @@ import AVFoundation
 import MediaPlayer
 import UIKit
 
-// MARK: - Type aliases
-
 public typealias EventEmitter = (String, [String: Any]?) -> Void
 
-// React Native's promise block types
 public typealias RCTPromiseResolveBlock = (Any?) -> Void
 public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
 
-// MARK: - GliphAudioPlayer
-
 @objc public class GliphAudioPlayer: NSObject {
 
-  // ── Properties ──────────────────────────────────────────────────────────────
-
   private var player: AVQueuePlayer?
   private var playerItems: [AVPlayerItem] = []
   private var queue: [[String: Any]] = []
   private var currentIndex: Int = -1
-  private var repeatMode: Int = 0  // 0=off, 1=track, 2=queue
+  private var repeatMode: Int = 0
   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 var lastLooperTime: Double = 0
+  private var looperTimeObserver: Any?
 
   private let eventEmitter: EventEmitter
   private var timeObserver: Any?
   private var playerObservations: [NSKeyValueObservation] = []
 
-  // ── Init ────────────────────────────────────────────────────────────────────
-
   @objc public init(eventEmitter: @escaping EventEmitter) {
     self.eventEmitter = eventEmitter
     super.init()
   }
 
-  // ── Thread helper ───────────────────────────────────────────────────────────
-
   private func runOnMain(_ block: () -> Void) {
     if Thread.isMainThread {
       block()
@@ -51,8 +41,6 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
     }
   }
 
-  // ── Setup ───────────────────────────────────────────────────────────────────
-
   @objc public func setupPlayer(
     options: [String: Any],
     resolve: @escaping RCTPromiseResolveBlock,
@@ -99,6 +87,16 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
   @objc public func destroy() {
     stopProgressTimer()
     removeObservers()
+
+    if let obs = looperTimeObserver {
+      player?.removeTimeObserver(obs)
+      looperTimeObserver = nil
+    }
+    playerLooper?.disableLooping()
+    playerLooper = nil
+    templateItem = nil
+    lastLooperTime = 0
+
     player?.pause()
     player?.removeAllItems()
     player = nil
@@ -114,8 +112,6 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
 
   @objc public func isReady() -> Bool { return isSetup }
 
-  // ── Queue management ────────────────────────────────────────────────────────
-
   @objc public func addTracks(
     _ tracks: [[String: Any]],
     insertBeforeIndex: Int,
@@ -233,8 +229,6 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
     resolve(nil)
   }
 
-  // ── Playback control ────────────────────────────────────────────────────────
-
   @objc public func play(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     player?.play()
     startProgressTimer()
@@ -265,10 +259,14 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
   @objc public func reset(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     player?.pause()
 
-    // ✅ Уничтожаем looper
+    if let obs = looperTimeObserver {
+      player?.removeTimeObserver(obs)
+      looperTimeObserver = nil
+    }
     playerLooper?.disableLooping()
     playerLooper = nil
     templateItem = nil
+    lastLooperTime = 0
 
     player?.removeAllItems()
     queue.removeAll()
@@ -314,21 +312,29 @@ 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 oldNeedsLooper = oldMode == 1
+    let newNeedsLooper = mode == 1
+
+    if oldNeedsLooper != newNeedsLooper {
       let wasPlaying = player?.timeControlStatus == .playing
+      let savedPosition = CMTimeGetSeconds(player?.currentTime() ?? .zero)
+      let savedIndex = currentIndex
+
       rebuildPlayerQueue()
+
+      currentIndex = savedIndex
+      if savedPosition > 0 {
+        player?.seek(to: CMTime(seconds: savedPosition, preferredTimescale: 1000))
+      }
       if wasPlaying {
         player?.play()
       }
     }
 
-    // ✅ Отправляем событие
     eventEmitter("playback-repeat-mode-changed", ["mode": mode])
 
     resolve(nil)
@@ -336,8 +342,6 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
 
   @objc public func getRepeatMode() -> Int { return repeatMode }
 
-  // ── Queue getters ───────────────────────────────────────────────────────────
-
   @objc public func getQueue() -> [[String: Any]] { return queue }
 
   @objc public func getActiveTrackIndex() -> NSNumber? {
@@ -357,8 +361,6 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
 
   @objc public func getQueueSize() -> Int { return queue.count }
 
-  // ── State / progress ────────────────────────────────────────────────────────
-
   @objc public func getPlaybackState() -> [String: Any] {
     return ["state": currentStateString()]
   }
@@ -380,8 +382,6 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
     ]
   }
 
-  // ── Metadata ────────────────────────────────────────────────────────────────
-
   @objc public func updateMetadataForTrack(
     _ index: Int,
     metadata: [String: Any],
@@ -431,8 +431,6 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
     resolve(nil)
   }
 
-  // ── Private helpers ─────────────────────────────────────────────────────────
-
   private func emitActiveTrackChanged(lastIndex: Int = -1) {
     let lastPos = CMTimeGetSeconds(player?.currentTime() ?? .zero)
     let track = (currentIndex >= 0 && currentIndex < queue.count) ? queue[currentIndex] : nil
@@ -445,40 +443,55 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
     ])
   }
 
-  // ✅ ИСПРАВЛЕНО: добавлен AVPlayerLooper для повторения трека
   private func rebuildPlayerQueue() {
     guard let player = player else { return }
 
-    // ✅ Уничтожаем старый looper
+    if let obs = looperTimeObserver {
+      player.removeTimeObserver(obs)
+      looperTimeObserver = nil
+    }
     playerLooper?.disableLooping()
     playerLooper = nil
     templateItem = nil
+    lastLooperTime = 0
 
     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)
 
+      let interval = CMTime(seconds: 0.1, preferredTimescale: 1000)
+      looperTimeObserver = player.addPeriodicTimeObserver(forInterval: interval, queue: .main) { [weak self] time in
+        guard let self = self else { return }
+        let timeSeconds = CMTimeGetSeconds(time)
+        guard !timeSeconds.isNaN else { return }
+
+        if self.lastLooperTime > 1.0 && timeSeconds < 0.5 {
+          self.eventEmitter("playback-track-ended", [
+            "index": self.currentIndex,
+            "position": self.lastLooperTime,
+          ])
+        }
+
+        self.lastLooperTime = timeSeconds
+      }
+
       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,
@@ -547,8 +560,6 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
     }
   }
 
-  // ── Remote commands ─────────────────────────────────────────────────────────
-
   private func setupRemoteCommands() {
     let center = MPRemoteCommandCenter.shared()
     UIApplication.shared.beginReceivingRemoteControlEvents()
@@ -638,8 +649,6 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
     }
   }
 
-  // ── Observers ───────────────────────────────────────────────────────────────
-
   private func setupNotificationObservers() {
     NotificationCenter.default.addObserver(
       self,
@@ -685,12 +694,10 @@ 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
     }
@@ -713,7 +720,6 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
         "lastPosition": 0.0,
       ])
     } else if repeatMode == 2 {
-      // ✅ ПОВТОР ВСЕЙ ОЧЕРЕДИ
       currentIndex = 0
       rebuildPlayerQueue()
       player?.play()
@@ -762,8 +768,6 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
     if reason == .oldDeviceUnavailable { player?.pause() }
   }
 
-  // ── Progress timer ──────────────────────────────────────────────────────────
-
   private func startProgressTimer() {
     stopProgressTimer()
     progressTimer = Timer.scheduledTimer(withTimeInterval: progressInterval, repeats: true) { [weak self] _ in
@@ -781,8 +785,6 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
     progressTimer = nil
   }
 
-  // ── Audio session mapping ───────────────────────────────────────────────────
-
   private func mapIOSCategory(_ string: String?) -> AVAudioSession.Category {
     switch string {
     case "playAndRecord": return .playAndRecord

package/ios/GliphPlayerModule.mm

@@ -246,8 +246,6 @@ RCT_EXPORT_METHOD(updateOptions:(NSDictionary *)options
   [_player updateOptions:options resolve:resolve reject:reject];
 }
 
-// ── New Architecture (TurboModule) ────────────────────────────────────────────
-
 #ifdef RCT_NEW_ARCH_ENABLED
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params {

package/package.json

@@ -4,7 +4,7 @@
     "name": "Aleksey Ostrikov",
     "email": "alex303606@gmail.com"
   },
-  "version": "1.3.16",
+  "version": "1.3.18",
   "description": "Fixed version of react-native-gliph-player with Expo compatibility",
   "main": "app.plugin.js",
   "module": "lib/module/index.js",