expo-gliph-player 1.3.13 → 1.3.15

package/ios/GliphAudioPlayer.swift

@@ -6,29 +6,12 @@ import UIKit
 
 public typealias EventEmitter = (String, [String: Any]?) -> Void
 
-// React Native's promise block types, redeclared locally so this file has
-// no dependency on a bridging header (`import <React/RCTBridgeModule.h>`).
-// Bridging headers are unsupported on framework targets in Xcode, and this
-// pod builds as a static_framework — so this file must never `import React`
-// or rely on one being injected. These signatures are structurally
-// identical to the real `RCTPromiseResolveBlock` / `RCTPromiseRejectBlock`
-// (id -> Any?, NSString* -> String?, NSError* -> Error?), so the resulting
-// @objc blocks are ABI-compatible with what GliphPlayerModule.mm expects.
+// React Native's promise block types
 public typealias RCTPromiseResolveBlock = (Any?) -> Void
 public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
 
 // MARK: - GliphAudioPlayer
 
-/**
- * GliphAudioPlayer
- *
- * Core Swift class that manages:
- *   - AVQueuePlayer for audio playback
- *   - MPRemoteCommandCenter for lock screen / headphone controls
- *   - MPNowPlayingInfoCenter for Now Playing metadata
- *   - Audio session configuration
- *   - Queue management
- */
 @objc public class GliphAudioPlayer: NSObject {
 
   // ── Properties ──────────────────────────────────────────────────────────────
@@ -37,7 +20,7 @@ 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  // 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
@@ -56,12 +39,6 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
 
   // ── Thread helper ───────────────────────────────────────────────────────────
 
-  /// Executes `block` synchronously on the main thread.
-  /// Safe to call from any thread — avoids deadlock if already on main.
-  /// Several AVAudioSession / UIApplication / MPRemoteCommandCenter APIs are
-  /// documented as main-thread-only; the RN bridge does not guarantee that
-  /// native module methods run on main, so every touch of those APIs goes
-  /// through this helper.
   private func runOnMain(_ block: () -> Void) {
     if Thread.isMainThread {
       block()
@@ -145,11 +122,19 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
       ? queue.count
       : insertBeforeIndex
 
+    let wasEmpty = queue.isEmpty
+
     for (i, track) in tracks.enumerated() {
       queue.insert(track, at: insertAt + i)
     }
 
     rebuildPlayerQueue()
+
+    if wasEmpty && !queue.isEmpty {
+      currentIndex = 0
+      emitActiveTrackChanged()
+    }
+
     resolve(insertAt)
   }
 
@@ -177,23 +162,34 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
   @objc public func skipToIndex(
     _ index: Int,
     initialPosition: Double,
+    autoPlay: Bool = true,
     resolve: @escaping RCTPromiseResolveBlock,
     reject: @escaping RCTPromiseRejectBlock
   ) {
     guard index >= 0 && index < queue.count else {
       reject("skip_error", "Index out of bounds", nil); return
     }
+
+    let lastIndex = currentIndex
     currentIndex = index
+
     rebuildPlayerQueue()
     if initialPosition >= 0 {
       player?.seek(to: CMTime(seconds: initialPosition, preferredTimescale: 1000))
     }
-    player?.play()
+
+    if autoPlay {
+      player?.play()
+    }
+
+    emitActiveTrackChanged(lastIndex: lastIndex)
+
     resolve(nil)
   }
 
   @objc public func skipToNext(
     initialPosition: Double,
+    autoPlay: Bool = true,
     resolve: @escaping RCTPromiseResolveBlock,
     reject: @escaping RCTPromiseRejectBlock
   ) {
@@ -201,11 +197,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
   ) {
@@ -213,7 +210,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(
@@ -237,11 +234,19 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
   @objc public func play(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     player?.play()
     startProgressTimer()
+
+    eventEmitter("playback-state", ["state": "playing"])
+
+    if currentIndex >= 0 && currentIndex < queue.count {
+      emitActiveTrackChanged()
+    }
+
     resolve(nil)
   }
 
   @objc public func pause(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     player?.pause()
+    eventEmitter("playback-state", ["state": "paused"])
     resolve(nil)
   }
 
@@ -249,6 +254,7 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
     player?.pause()
     player?.seek(to: .zero)
     stopProgressTimer()
+    eventEmitter("playback-state", ["state": "stopped"])
     resolve(nil)
   }
 
@@ -257,9 +263,19 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
     player?.removeAllItems()
     queue.removeAll()
     playerItems.removeAll()
+    let lastIndex = currentIndex
     currentIndex = -1
     stopProgressTimer()
     MPNowPlayingInfoCenter.default().nowPlayingInfo = nil
+
+    eventEmitter("playback-active-track-changed", [
+      "index": -1,
+      "track": NSNull(),
+      "lastIndex": lastIndex,
+      "lastPosition": 0.0,
+    ] as [String : Any])
+    eventEmitter("playback-state", ["state": "none"])
+
     resolve(nil)
   }
 
@@ -392,6 +408,18 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
 
   // ── Private helpers ─────────────────────────────────────────────────────────
 
+  private func emitActiveTrackChanged(lastIndex: Int = -1) {
+    let lastPos = CMTimeGetSeconds(player?.currentTime() ?? .zero)
+    let track = (currentIndex >= 0 && currentIndex < queue.count) ? queue[currentIndex] : nil
+
+    eventEmitter("playback-active-track-changed", [
+      "index": currentIndex,
+      "track": track as Any,
+      "lastIndex": lastIndex >= 0 ? lastIndex : currentIndex,
+      "lastPosition": lastPos,
+    ])
+  }
+
   private func rebuildPlayerQueue() {
     guard let player = player else { return }
     player.removeAllItems()
@@ -407,7 +435,9 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
       player.insert(item, after: player.items().last)
     }
 
-    if currentIndex < 0 && !queue.isEmpty { currentIndex = 0 }
+    if currentIndex < 0 && !queue.isEmpty {
+      currentIndex = 0
+    }
     updateNowPlayingInfo()
   }
 
@@ -430,7 +460,6 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
     info[MPNowPlayingInfoPropertyElapsedPlaybackTime] = CMTimeGetSeconds(player?.currentTime() ?? .zero)
     info[MPNowPlayingInfoPropertyPlaybackRate] = player?.rate ?? 0.0
 
-    // Artwork
     if let artworkURL = track["artwork"] as? String, !artworkURL.isEmpty {
       loadArtwork(from: artworkURL) { image in
         if let image = image {
@@ -467,10 +496,6 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
 
   // ── Remote commands ─────────────────────────────────────────────────────────
 
-  /// Must always be called on the main thread (see `runOnMain` call sites:
-  /// `setupPlayer` and `updateOptions`). `MPRemoteCommandCenter` and
-  /// `UIApplication.beginReceivingRemoteControlEvents()` are main-thread-only
-  /// APIs.
   private func setupRemoteCommands() {
     let center = MPRemoteCommandCenter.shared()
     UIApplication.shared.beginReceivingRemoteControlEvents()
@@ -509,7 +534,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
@@ -521,7 +546,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
@@ -588,7 +613,6 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
       object: nil
     )
 
-    // Observe player status
     if let player = player {
       let obs = player.observe(\.timeControlStatus, options: [.new]) { [weak self] p, _ in
         self?.eventEmitter("playback-state", ["state": self?.currentStateString() ?? "none"])
@@ -609,16 +633,18 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
   }
 
   @objc private func playerItemDidFinish(_ notification: Notification) {
-    // Only react to notifications for our own player's current item —
-    // `object: nil` on the observer means this fires for *any* AVPlayerItem
-    // in the whole app (e.g. a video player elsewhere), so we must filter here.
     guard let finishedItem = notification.object as? AVPlayerItem,
           finishedItem === player?.currentItem else { return }
 
     let nextIndex = currentIndex + 1
+    let currentPosition = CMTimeGetSeconds(player?.currentTime() ?? .zero)
+
+    eventEmitter("playback-track-ended", [
+      "index": currentIndex,
+      "position": currentPosition
+    ])
 
     if repeatMode == 1 {
-      // Repeat current track
       player?.seek(to: .zero)
       player?.play()
       return
@@ -634,14 +660,16 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
         "lastPosition": 0.0,
       ])
     } else if repeatMode == 2 {
-      // Repeat queue
       currentIndex = 0
       rebuildPlayerQueue()
       player?.play()
+      if !queue.isEmpty {
+        emitActiveTrackChanged()
+      }
     } else {
       eventEmitter("playback-queue-ended", [
         "index": currentIndex,
-        "position": CMTimeGetSeconds(player?.currentTime() ?? .zero),
+        "position": currentPosition,
       ])
     }
   }
@@ -677,7 +705,6 @@ public typealias RCTPromiseRejectBlock = (String?, String?, Error?) -> Void
   @objc private func audioRouteChanged(_ notification: Notification) {
     guard let reasonValue = notification.userInfo?[AVAudioSessionRouteChangeReasonKey] as? UInt,
           let reason = AVAudioSession.RouteChangeReason(rawValue: reasonValue) else { return }
-    // Pause on headphone unplug (standard iOS behavior)
     if reason == .oldDeviceUnavailable { player?.pause() }
   }
 

package/ios/GliphPlayerModule.mm

@@ -37,6 +37,7 @@ RCT_EXPORT_MODULE(RNGliphPlayer)
     @"playback-state",
     @"playback-error",
     @"playback-active-track-changed",
+    @"playback-track-ended",
     @"playback-queue-ended",
     @"playback-progress-updated",
     @"playback-metadata-received",
@@ -95,21 +96,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
@@ -240,4 +254,4 @@ RCT_EXPORT_METHOD(updateOptions:(NSDictionary *)options
 }
 #endif
 
-@end
+@end

package/lib/typescript/src/GliphPlayer.d.ts

@@ -6,20 +6,24 @@
  */
 import type { Track, PlayerOptions, UpdateOptions, Progress, PlaybackState } from './types';
 import { RepeatMode, State } from './types';
+
 declare const GliphPlayer: {
     /**
      * Initialize the player. Must be called once before any other method.
      * Safe to call multiple times — subsequent calls are no-ops.
      */
     setupPlayer(options?: PlayerOptions): Promise<void>;
+
     /**
      * Destroy the player and release all resources.
      */
     destroy(): void;
+
     /**
      * Returns true if the background service is running (Android).
      */
     isServiceRunning(): Promise<boolean>;
+
     /**
      * Add one or more tracks to the queue.
      * @param tracks  Single track or array of tracks.
@@ -27,71 +31,96 @@ declare const GliphPlayer: {
      * @returns The index of the first inserted track.
      */
     add(tracks: Track | Track[], insertBeforeIndex?: number): Promise<number | void>;
+
     /**
      * Remove tracks by their IDs.
      */
     remove(trackIds: string | string[]): Promise<void>;
+
     /**
      * Remove all tracks after the current one.
      */
     removeUpcomingTracks(): Promise<void>;
+
     /**
      * Skip to a specific queue index.
+     * @param index - Index of the track to skip to
+     * @param initialPosition - Position in seconds to start from (default: -1 = start)
+     * @param autoPlay - Whether to automatically start playback (default: true)
      */
-    skip(index: number, initialPosition?: number): Promise<void>;
+    skip(index: number, initialPosition?: number, autoPlay?: boolean): Promise<void>;
+
     /**
      * Skip to the next track.
+     * @param initialPosition - Position in seconds to start from (default: -1 = start)
+     * @param autoPlay - Whether to automatically start playback (default: true)
      */
-    skipToNext(initialPosition?: number): Promise<void>;
+    skipToNext(initialPosition?: number, autoPlay?: boolean): Promise<void>;
+
     /**
      * Skip to the previous track.
+     * @param initialPosition - Position in seconds to start from (default: -1 = start)
+     * @param autoPlay - Whether to automatically start playback (default: true)
      */
-    skipToPrevious(initialPosition?: number): Promise<void>;
+    skipToPrevious(initialPosition?: number, autoPlay?: boolean): Promise<void>;
+
     /**
      * Move a track from one index to another.
      */
     move(fromIndex: number, toIndex: number): Promise<void>;
+
     play(): Promise<void>;
     pause(): Promise<void>;
     stop(): Promise<void>;
+
     /**
      * Stop playback and clear the queue.
      */
     reset(): Promise<void>;
+
     /**
      * Seek to an absolute position in seconds.
      */
     seekTo(position: number): Promise<void>;
+
     /**
      * Seek by a relative offset in seconds (positive = forward, negative = back).
      */
     seekBy(offset: number): Promise<void>;
+
     /**
      * Set volume (0.0 – 1.0).
      */
     setVolume(volume: number): Promise<void>;
     getVolume(): Promise<number>;
+
     /**
      * Set playback rate (1.0 = normal speed).
      */
     setRate(rate: number): Promise<void>;
     getRate(): Promise<number>;
+
     setRepeatMode(mode: RepeatMode): Promise<void>;
     getRepeatMode(): Promise<RepeatMode>;
+
     getQueue(): Promise<Track[]>;
     getActiveTrackIndex(): Promise<number | null>;
     getActiveTrack(): Promise<Track | null>;
     getTrack(index: number): Promise<Track | null>;
     getQueueSize(): Promise<number>;
+
     getPlaybackState(): Promise<PlaybackState>;
     getProgress(): Promise<Progress>;
+
     updateMetadataForTrack(index: number, metadata: Partial<Track>): Promise<void>;
     clearNowPlayingMetadata(): Promise<void>;
     updateNowPlayingMetadata(metadata: Partial<Track>): Promise<void>;
+
     /**
      * Configure notification capabilities, jump intervals, etc.
      */
     updateOptions(options: UpdateOptions): Promise<void>;
+
     /**
      * Subscribe to a player event.
      * Returns an unsubscribe function — call it to remove the listener.
@@ -105,9 +134,10 @@ declare const GliphPlayer: {
      */
     addEventListener<E extends string>(event: E, listener: (data: any) => void): () => void;
 };
+
 export default GliphPlayer;
+
 export declare function isPlaying(state: State): boolean;
 export declare function isPaused(state: State): boolean;
 export declare function isBuffering(state: State): boolean;
-export declare function isStopped(state: State): boolean;
-//# sourceMappingURL=GliphPlayer.d.ts.map
+export declare function isStopped(state: State): boolean;

package/package.json

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