@javascriptcommon/react-native-track-player 1.2.9 → 4.1.4

package/ios/RNTrackPlayer/Models/SessionCategories.swift

@@ -0,0 +1,106 @@
+//
+//  SessionCategory.swift
+//  RNTrackPlayer
+//
+//  Created by Thomas Hessler on 3/12/19.
+//  Copyright © 2019 David Chavez. All rights reserved.
+//
+
+import Foundation
+import MediaPlayer
+import AVFoundation
+
+enum SessionCategory: String {
+    case playAndRecord, multiRoute, playback, ambient, soloAmbient
+    
+    func mapConfigToAVAudioSessionCategory() -> AVAudioSession.Category {
+        switch self {
+        case .playAndRecord:
+            return .playAndRecord
+        case .multiRoute:
+            return .multiRoute
+        case .playback:
+            return .playback
+        case .ambient:
+            return .ambient
+        case .soloAmbient:
+            return .soloAmbient
+        }
+    }
+}
+
+enum SessionCategoryPolicy: String {
+    case `default`, longFormAudio, independent, longFormVideo
+    
+    func mapConfigToAVAudioSessionCategoryPolicy() -> AVAudioSession.RouteSharingPolicy {
+        switch self {
+        case .default:
+            return .default
+        case .longFormAudio:
+            return .longFormAudio
+        case .independent:
+            return .independent
+        case .longFormVideo:
+            if #available(iOS 13.0, *) {
+                return .longFormVideo
+            } else {
+                return .longFormAudio
+            }
+        }
+    }
+}
+
+enum SessionCategoryMode: String {
+    case `default`, gameChat, measurement, moviePlayback, spokenAudio, videoChat, videoRecording, voiceChat, voicePrompt
+    
+    func mapConfigToAVAudioSessionCategoryMode() -> AVAudioSession.Mode {
+        switch self {
+        case .default:
+            return .default
+        case .gameChat:
+            return .gameChat
+        case .measurement:
+            return .measurement
+        case .moviePlayback:
+            return .moviePlayback
+        case .spokenAudio:
+            return .spokenAudio
+        case .videoChat:
+            return .videoChat
+        case .videoRecording:
+            return .videoRecording
+        case .voiceChat:
+            return .voiceChat
+        case .voicePrompt:
+            if #available(iOS 12.0, *) {
+                return .voicePrompt
+            } else {
+                // Do Nothing
+                return .default
+            }
+        }
+    }
+}
+
+enum SessionCategoryOptions : String {
+    case mixWithOthers, duckOthers, interruptSpokenAudioAndMixWithOthers, allowBluetooth, allowBluetoothA2DP, allowAirPlay, defaultToSpeaker
+    
+    func mapConfigToAVAudioSessionCategoryOptions() -> AVAudioSession.CategoryOptions? {
+        switch self {
+        case .mixWithOthers:
+            return .mixWithOthers
+        case .duckOthers:
+            return .duckOthers
+        case .interruptSpokenAudioAndMixWithOthers:
+            return .interruptSpokenAudioAndMixWithOthers
+        case .allowBluetooth:
+            return .allowBluetooth
+        case .allowBluetoothA2DP:
+            return .allowBluetoothA2DP
+        case .allowAirPlay:
+            return .allowAirPlay
+        case .defaultToSpeaker:
+            return .defaultToSpeaker
+        }
+    }
+}

package/ios/RNTrackPlayer/Models/State.swift

@@ -0,0 +1,26 @@
+//
+//  State.swift
+//  RNTrackPlayer
+//
+//  Created by David Chavez on 02.12.21.
+//
+
+import Foundation
+
+enum State: String {
+    case none, ready, playing, paused, stopped, buffering, loading, error, ended
+
+    static func fromPlayerState(state: AVPlayerWrapperState) -> State {
+        switch state {
+        case .paused: return .paused
+        case .buffering: return .buffering
+        case .idle: return .none
+        case .loading: return .loading
+        case .playing: return .playing
+        case .ready: return .ready
+        case .failed: return .error
+        case .stopped: return .stopped
+        case .ended: return .ended
+        }
+    }
+}

package/ios/RNTrackPlayer/Models/Track.swift

@@ -10,111 +10,131 @@ import Foundation
 import MediaPlayer
 import AVFoundation
 
-class Track: NSObject {
-    let id: String
-    
-    @objc var title: String
-    @objc var artist: String
-    
+class Track: AudioItem, TimePitching, AssetOptionsProviding {
+    let url: MediaURL
+
+    @objc var title: String?
+    @objc var artist: String?
+
     var date: String?
     var desc: String?
     var genre: String?
     var duration: Double?
-    var skipped: Bool = false
     var artworkURL: MediaURL?
     let headers: [String: Any]?
+    var userAgent: String?
     let pitchAlgorithm: String?
-    
-    @objc var album: String?
-    @objc var artwork: MPMediaItemArtwork?
-    
-    private var originalObject: [String: Any]
-    
+    var isLiveStream: Bool?
+
+    var album: String?
+    var artwork: MPMediaItemArtwork?
+
+    private var originalObject: [String: Any] = [:]
+
     init?(dictionary: [String: Any]) {
-        
-        let id = dictionary["id"] as? String
-        let title = dictionary["title"] as? String
-        let artist = dictionary["artist"] as? String
-        
-        self.id = id ?? "eSound"
-        self.title = title ?? "eSound"
-        self.artist = artist ?? "eSound"
-        
-        self.date = dictionary["date"] as? String
-        self.album = dictionary["album"] as? String
-        self.genre = dictionary["genre"] as? String
-        self.desc = dictionary["description"] as? String
-        self.duration = dictionary["duration"] as? Double
+        guard let url = MediaURL(object: dictionary["url"]) else { return nil }
+        self.url = url
         self.headers = dictionary["headers"] as? [String: Any]
-        self.artworkURL = MediaURL(object: dictionary["artwork"])
+        self.userAgent = dictionary["userAgent"] as? String
         self.pitchAlgorithm = dictionary["pitchAlgorithm"] as? String
-        
-        self.originalObject = dictionary
+
+        updateMetadata(dictionary: dictionary);
     }
-    
-    
+
+
     // MARK: - Public Interface
-    
+
     func toObject() -> [String: Any] {
         return originalObject
     }
-    
+
     func updateMetadata(dictionary: [String: Any]) {
         self.title = (dictionary["title"] as? String) ?? self.title
         self.artist = (dictionary["artist"] as? String) ?? self.artist
-        
         self.date = dictionary["date"] as? String
         self.album = dictionary["album"] as? String
         self.genre = dictionary["genre"] as? String
         self.desc = dictionary["description"] as? String
         self.duration = dictionary["duration"] as? Double
         self.artworkURL = MediaURL(object: dictionary["artwork"])
-        
+        self.isLiveStream = dictionary["isLiveStream"] as? Bool
+
         self.originalObject = self.originalObject.merging(dictionary) { (_, new) in new }
     }
-    
+
     // MARK: - AudioItem Protocol
-    
+
+    func getSourceUrl() -> String {
+        return url.isLocal ? url.value.path : url.value.absoluteString
+    }
+
     func getArtist() -> String? {
         return artist
     }
-    
+
     func getTitle() -> String? {
         return title
     }
-    
+
     func getAlbumTitle() -> String? {
         return album
     }
 
-    
+    func getSourceType() -> SourceType {
+        return url.isLocal ? .file : .stream
+    }
+
     func getArtwork(_ handler: @escaping (UIImage?) -> Void) {
-       if let artworkURL = artworkURL?.value {
+        if let artworkURL = artworkURL?.value {
             if(self.artworkURL?.isLocal ?? false){
-              let image = UIImage.init(contentsOfFile: artworkURL.path);
-              handler(image);
+                let image = UIImage.init(contentsOfFile: artworkURL.path);
+                handler(image);
             } else {
                 URLSession.shared.dataTask(with: artworkURL, completionHandler: { (data, _, error) in
                     if let data = data, let artwork = UIImage(data: data), error == nil {
                         handler(artwork)
+                    } else {
+                        handler(nil)
                     }
-
-                    handler(nil)
                 }).resume()
             }
+        } else {
+            handler(nil)
+        }
+    }
+
+    // MARK: - TimePitching Protocol
+
+    func getPitchAlgorithmType() -> AVAudioTimePitchAlgorithm {
+        if let pitchAlgorithm = pitchAlgorithm {
+            switch pitchAlgorithm {
+            case PitchAlgorithm.linear.rawValue:
+                return .varispeed
+            case PitchAlgorithm.music.rawValue:
+                return .spectral
+            default: // voice
+                return .timeDomain
+            }
         }
-        
-        handler(nil)
+
+        return .timeDomain
     }
-    
+
     // MARK: - Authorizing Protocol
-    
+
     func getAssetOptions() -> [String: Any] {
+        var options: [String: Any] = [:]
         if let headers = headers {
-            return ["AVURLAssetHTTPHeaderFieldsKey": headers]
+            options["AVURLAssetHTTPHeaderFieldsKey"] = headers
+        }
+        if #available(iOS 16, *) {
+            if let userAgent = userAgent {
+                // there is now an official, working way to set the user-agent for every request
+                // https://developer.apple.com/documentation/avfoundation/avurlassethttpuseragentkey
+                options[AVURLAssetHTTPUserAgentKey] = userAgent
+            }
         }
-        
-        return [:]
+        return options
     }
-    
+
 }