react-native-nitro-player 1.4.1 → 1.4.3

package/android/src/main/java/com/margelo/nitro/nitroplayer/core/TrackPlayerCore.kt

@@ -244,6 +244,7 @@ class TrackPlayerCore private constructor(
             }
         }
         scope.cancel()
+        com.margelo.nitro.nitroplayer.media.AuthAwareHttpDataSourceFactory.clear()
         // Do NOT stop the service — it owns the player.
         // Unbind so Android can clean up if needed.
         if (serviceBound) {

package/android/src/main/java/com/margelo/nitro/nitroplayer/core/TrackPlayerPlayback.kt

@@ -8,6 +8,7 @@ import com.margelo.nitro.nitroplayer.Reason
 import com.margelo.nitro.nitroplayer.RepeatMode
 import com.margelo.nitro.nitroplayer.TrackPlayerState
 import com.margelo.nitro.nitroplayer.media.NitroPlayerMediaBrowserService
+import com.margelo.nitro.nitroplayer.media.NitroPlayerPlaybackService
 
 /**
  * Playback control — all public functions are suspend and execute on the player thread
@@ -95,6 +96,7 @@ suspend fun TrackPlayerCore.configure(config: PlayerConfig) =
     withPlayerContext {
         config.androidAutoEnabled?.let { NitroPlayerMediaBrowserService.isAndroidAutoEnabled = it }
         config.lookaheadCount?.let { lookaheadCount = it.toInt() }
+        config.androidNotificationIcon?.let { NitroPlayerPlaybackService.notificationSmallIconResName = it }
         mediaSessionManager?.configure(config.androidAutoEnabled, config.carPlayEnabled, config.showInNotification)
     }
 

package/android/src/main/java/com/margelo/nitro/nitroplayer/core/TrackPlayerQueueBuild.kt

@@ -150,6 +150,23 @@ internal fun TrackPlayerCore.makeMediaItem(
 
     val effectiveUrl = downloadManager.getEffectiveUrl(track)
 
+    // Register custom HTTP headers (e.g. Authorization) from extraPayload.headers so they are
+    // injected into the request for this URL. Applies to remote streams only — see ExoPlayerBuilder.
+    track.extraPayload?.let { payload ->
+        try {
+            val headersRaw = payload.toHashMap()["headers"]
+            if (headersRaw is Map<*, *>) {
+                val headers = headersRaw
+                    .mapNotNull { (k, v) -> if (k is String && v is String) k to v else null }
+                    .toMap()
+                if (headers.isNotEmpty()) {
+                    com.margelo.nitro.nitroplayer.media.AuthAwareHttpDataSourceFactory
+                        .setHeadersForUrl(effectiveUrl, headers)
+                }
+            }
+        } catch (_: Exception) {}
+    }
+
     return MediaItem
         .Builder()
         .setMediaId(customMediaId ?: track.id)

package/android/src/main/java/com/margelo/nitro/nitroplayer/media/AuthAwareHttpDataSourceFactory.kt

@@ -0,0 +1,48 @@
+package com.margelo.nitro.nitroplayer.media
+
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.datasource.DataSource
+import androidx.media3.datasource.DefaultHttpDataSource
+import androidx.media3.datasource.ResolvingDataSource
+import java.util.concurrent.ConcurrentHashMap
+
+/**
+ * HTTP [DataSource.Factory] that injects per-URL request headers (e.g. `Authorization`)
+ * into ExoPlayer's HTTP requests, enabling playback from authenticated endpoints.
+ *
+ * Headers are registered per effective URL via [setHeadersForUrl] during MediaItem
+ * construction and applied through a [ResolvingDataSource] just before each request opens.
+ *
+ * The registry is a [ConcurrentHashMap] because it is written on the player thread but
+ * read on ExoPlayer's loader threads.
+ */
+@UnstableApi
+class AuthAwareHttpDataSourceFactory : DataSource.Factory {
+    private val factory =
+        ResolvingDataSource.Factory(
+            DefaultHttpDataSource
+                .Factory()
+                .setAllowCrossProtocolRedirects(true)
+                .setConnectTimeoutMs(15_000)
+                .setReadTimeoutMs(15_000),
+            ResolvingDataSource.Resolver { dataSpec ->
+                val headers = headersMap[dataSpec.uri.toString()]
+                if (headers.isNullOrEmpty()) dataSpec else dataSpec.withAdditionalHeaders(headers)
+            },
+        )
+
+    override fun createDataSource(): DataSource = factory.createDataSource()
+
+    companion object {
+        private val headersMap = ConcurrentHashMap<String, Map<String, String>>()
+
+        fun setHeadersForUrl(url: String, headers: Map<String, String>) {
+            headersMap[url] = headers
+        }
+
+        /** Releases all registered headers. Call when the player is torn down. */
+        fun clear() {
+            headersMap.clear()
+        }
+    }
+}

package/android/src/main/java/com/margelo/nitro/nitroplayer/media/ExoPlayerBuilder.kt

@@ -3,14 +3,18 @@ package com.margelo.nitro.nitroplayer.media
 import android.content.Context
 import androidx.media3.common.AudioAttributes
 import androidx.media3.common.C
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.datasource.DefaultDataSource
 import androidx.media3.exoplayer.DefaultLoadControl
 import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.exoplayer.source.DefaultMediaSourceFactory
 
 /**
  * Builds an [ExoPlayer] with the standard NitroPlayer configuration.
  * The player uses the main application looper so that Media3's
  * [MediaSessionService] notification system works without thread conflicts.
  */
+@UnstableApi
 object ExoPlayerBuilder {
     fun build(context: Context): ExoPlayer {
         val loadControl =
@@ -37,9 +41,15 @@ object ExoPlayerBuilder {
                 .setContentType(C.AUDIO_CONTENT_TYPE_MUSIC)
                 .build()
 
+        // DefaultDataSource routes http/https through AuthAwareHttpDataSourceFactory (so custom
+        // request headers can be injected) while handling file://, content:// and asset:// natively.
+        val dataSourceFactory = DefaultDataSource.Factory(context, AuthAwareHttpDataSourceFactory())
+        val mediaSourceFactory = DefaultMediaSourceFactory(context).setDataSourceFactory(dataSourceFactory)
+
         return ExoPlayer
             .Builder(context)
             .setLoadControl(loadControl)
+            .setMediaSourceFactory(mediaSourceFactory)
             .setAudioAttributes(audioAttrs, /* handleAudioFocus */ true)
             .setHandleAudioBecomingNoisy(true)
             .setWakeMode(C.WAKE_MODE_NETWORK)

package/android/src/main/java/com/margelo/nitro/nitroplayer/media/PlaybackService.kt

@@ -7,6 +7,7 @@ import android.os.IBinder
 import android.os.Looper
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.session.DefaultMediaNotificationProvider
 import androidx.media3.session.MediaSession
 import androidx.media3.session.MediaSessionService
 import com.margelo.nitro.nitroplayer.core.NitroPlayerLogger
@@ -29,11 +30,24 @@ class NitroPlayerPlaybackService : MediaSessionService() {
 
     companion object {
         const val ACTION_LOCAL_BIND = "com.margelo.nitro.nitroplayer.LOCAL_BIND"
+
+        @Volatile
+        var notificationSmallIconResName: String? = null
+            set(value) {
+                field = value
+                instance?.let { service ->
+                    service.mainHandler.post { service.applyNotificationSmallIcon() }
+                }
+            }
+
+        @Volatile
+        private var instance: NitroPlayerPlaybackService? = null
     }
 
     // ── Created in onCreate ────────────────────────────────────────────────
     private lateinit var player: ExoPlayer
     private var mediaSession: MediaSession? = null
+    private var notificationProvider: DefaultMediaNotificationProvider? = null
     private val mainHandler = Handler(Looper.getMainLooper())
 
     @Volatile
@@ -54,6 +68,7 @@ class NitroPlayerPlaybackService : MediaSessionService() {
     override fun onCreate() {
         super.onCreate()
         NitroPlayerLogger.log("PlaybackService") { "onCreate" }
+        instance = this
 
         // Build ExoPlayer on main looper (default)
         player = ExoPlayerBuilder.build(this)
@@ -65,12 +80,35 @@ class NitroPlayerPlaybackService : MediaSessionService() {
             .setCallback(MediaSessionCallbackFactory.create(this, playlistManager))
             .build()
 
-        // Explicitly register the session with the service so that
-        // MediaNotificationManager (created in super.onCreate()) can
-        // connect its internal MediaController and post notifications.
+        val provider = DefaultMediaNotificationProvider.Builder(this).build()
+        notificationProvider = provider
+        applyNotificationSmallIcon()
+        setMediaNotificationProvider(provider)
+
         addSession(mediaSession!!)
+    }
 
-        // Media3 automatically handles the notification via DefaultMediaNotificationProvider.
+    private fun applyNotificationSmallIcon() {
+        val name = notificationSmallIconResName ?: return
+        val provider = notificationProvider ?: return
+        val resId = resources.getIdentifier(name, "drawable", packageName)
+        if (resId == 0) {
+            NitroPlayerLogger.log("PlaybackService") {
+                "androidNotificationIcon '$name' not found in drawable resources — using default"
+            }
+            return
+        }
+        provider.setSmallIcon(resId)
+
+        // Live Refresh :)
+        val session = mediaSession
+        if (session != null && session.player.isPlaying) {
+            try {
+                onUpdateNotification(session, false)
+            } catch (e: Exception) {
+                NitroPlayerLogger.log("PlaybackService") { "notification refresh failed: ${e.message}" }
+            }
+        }
     }
 
     override fun onGetSession(controllerInfo: MediaSession.ControllerInfo): MediaSession? =
@@ -93,6 +131,8 @@ class NitroPlayerPlaybackService : MediaSessionService() {
 
     override fun onDestroy() {
         NitroPlayerLogger.log("PlaybackService") { "onDestroy" }
+        if (instance === this) instance = null
+        notificationProvider = null
         mediaSession?.release()
         mediaSession = null
         player.release()

package/ios/HybridTrackPlayer.swift

@@ -113,7 +113,6 @@ final class HybridTrackPlayer: HybridTrackPlayerSpec {
   }
 
   // MARK: - Playback speed
-
   func setPlaybackSpeed(speed: Double) throws -> Promise<Void> {
     Promise.async { await self.core.setPlaybackSpeed(speed) }
   }

package/ios/core/TrackPlayerQueueBuild.swift

@@ -358,6 +358,37 @@ extension TrackPlayerCore {
     }
   }
 
+  /// Extracts custom HTTP headers (e.g. `Authorization`) from `extraPayload.headers`.
+  /// These are passed to AVURLAsset so authenticated remote streams can be played.
+  /// Returns nil when no string headers are present.
+  func httpHeaders(for track: TrackItem) -> [String: String]? {
+    // AnyMap.toDictionary() returns nested objects as [String: Any?] (optional values),
+    // so cast to that and unwrap each value rather than [String: Any].
+    guard let payload = track.extraPayload?.toDictionary(),
+      let headersValue = payload["headers"],
+      let raw = headersValue as? [String: Any?]
+    else { return nil }
+
+    var headers: [String: String] = [:]
+    for (key, value) in raw {
+      if let stringValue = value as? String {
+        headers[key] = stringValue
+      }
+    }
+    return headers.isEmpty ? nil : headers
+  }
+
+  /// Builds AVURLAsset options, attaching custom HTTP headers for remote (non-local) tracks.
+  private func assetOptions(for track: TrackItem, isLocal: Bool) -> [String: Any] {
+    var options: [String: Any] = [AVURLAssetPreferPreciseDurationAndTimingKey: true]
+    if !isLocal, let headers = httpHeaders(for: track) {
+      // AVURLAssetHTTPHeaderFieldsKey is the de-facto mechanism for per-asset request
+      // headers (also used by react-native-track-player). Applies to non-DRM HTTP(S).
+      options["AVURLAssetHTTPHeaderFieldsKey"] = headers
+    }
+    return options
+  }
+
   /// Creates a gapless-optimized AVPlayerItem with proper buffering configuration
   func createGaplessPlayerItem(for track: TrackItem, isPreload: Bool = false) -> AVPlayerItem? {
     let effectiveUrlString = DownloadManagerCore.shared.getEffectiveUrl(track: track)
@@ -396,9 +427,7 @@ extension TrackPlayerCore {
       asset = preloadedAsset
       NitroPlayerLogger.log("TrackPlayerCore", "🚀 Using preloaded asset for \(track.title)")
     } else {
-      asset = AVURLAsset(url: url, options: [
-        AVURLAssetPreferPreciseDurationAndTimingKey: true
-      ])
+      asset = AVURLAsset(url: url, options: assetOptions(for: track, isLocal: isLocal))
     }
 
     let item = AVPlayerItem(asset: asset)
@@ -463,9 +492,7 @@ extension TrackPlayerCore {
           url = remoteUrl
         }
 
-        let asset = AVURLAsset(url: url, options: [
-          AVURLAssetPreferPreciseDurationAndTimingKey: true
-        ])
+        let asset = AVURLAsset(url: url, options: self.assetOptions(for: track, isLocal: isLocal))
 
         asset.loadValuesAsynchronously(forKeys: Constants.preloadAssetKeys) { [weak self] in
           var allKeysLoaded = true

package/lib/types/PlayerQueue.d.ts

@@ -38,4 +38,5 @@ export interface PlayerConfig {
      * Higher values = more proactive loading, but more network requests
      */
     lookaheadCount?: number;
+    androidNotificationIcon?: string;
 }

package/nitrogen/generated/android/c++/JPlayerConfig.hpp

@@ -11,6 +11,7 @@
 #include "PlayerConfig.hpp"
 
 #include <optional>
+#include <string>
 
 namespace margelo::nitro::nitroplayer {
 
@@ -39,11 +40,14 @@ namespace margelo::nitro::nitroplayer {
       jni::local_ref<jni::JBoolean> showInNotification = this->getFieldValue(fieldShowInNotification);
       static const auto fieldLookaheadCount = clazz->getField<jni::JDouble>("lookaheadCount");
       jni::local_ref<jni::JDouble> lookaheadCount = this->getFieldValue(fieldLookaheadCount);
+      static const auto fieldAndroidNotificationIcon = clazz->getField<jni::JString>("androidNotificationIcon");
+      jni::local_ref<jni::JString> androidNotificationIcon = this->getFieldValue(fieldAndroidNotificationIcon);
       return PlayerConfig(
         androidAutoEnabled != nullptr ? std::make_optional(static_cast<bool>(androidAutoEnabled->value())) : std::nullopt,
         carPlayEnabled != nullptr ? std::make_optional(static_cast<bool>(carPlayEnabled->value())) : std::nullopt,
         showInNotification != nullptr ? std::make_optional(static_cast<bool>(showInNotification->value())) : std::nullopt,
-        lookaheadCount != nullptr ? std::make_optional(lookaheadCount->value()) : std::nullopt
+        lookaheadCount != nullptr ? std::make_optional(lookaheadCount->value()) : std::nullopt,
+        androidNotificationIcon != nullptr ? std::make_optional(androidNotificationIcon->toStdString()) : std::nullopt
       );
     }
 
@@ -53,7 +57,7 @@ namespace margelo::nitro::nitroplayer {
      */
     [[maybe_unused]]
     static jni::local_ref<JPlayerConfig::javaobject> fromCpp(const PlayerConfig& value) {
-      using JSignature = JPlayerConfig(jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JDouble>);
+      using JSignature = JPlayerConfig(jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JString>);
       static const auto clazz = javaClassStatic();
       static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
       return create(
@@ -61,7 +65,8 @@ namespace margelo::nitro::nitroplayer {
         value.androidAutoEnabled.has_value() ? jni::JBoolean::valueOf(value.androidAutoEnabled.value()) : nullptr,
         value.carPlayEnabled.has_value() ? jni::JBoolean::valueOf(value.carPlayEnabled.value()) : nullptr,
         value.showInNotification.has_value() ? jni::JBoolean::valueOf(value.showInNotification.value()) : nullptr,
-        value.lookaheadCount.has_value() ? jni::JDouble::valueOf(value.lookaheadCount.value()) : nullptr
+        value.lookaheadCount.has_value() ? jni::JDouble::valueOf(value.lookaheadCount.value()) : nullptr,
+        value.androidNotificationIcon.has_value() ? jni::make_jstring(value.androidNotificationIcon.value()) : nullptr
       );
     }
   };

package/nitrogen/generated/android/kotlin/com/margelo/nitro/nitroplayer/PlayerConfig.kt

@@ -28,7 +28,10 @@ data class PlayerConfig(
   val showInNotification: Boolean?,
   @DoNotStrip
   @Keep
-  val lookaheadCount: Double?
+  val lookaheadCount: Double?,
+  @DoNotStrip
+  @Keep
+  val androidNotificationIcon: String?
 ) {
   /* primary constructor */
 
@@ -40,8 +43,8 @@ data class PlayerConfig(
     @Keep
     @Suppress("unused")
     @JvmStatic
-    private fun fromCpp(androidAutoEnabled: Boolean?, carPlayEnabled: Boolean?, showInNotification: Boolean?, lookaheadCount: Double?): PlayerConfig {
-      return PlayerConfig(androidAutoEnabled, carPlayEnabled, showInNotification, lookaheadCount)
+    private fun fromCpp(androidAutoEnabled: Boolean?, carPlayEnabled: Boolean?, showInNotification: Boolean?, lookaheadCount: Double?, androidNotificationIcon: String?): PlayerConfig {
+      return PlayerConfig(androidAutoEnabled, carPlayEnabled, showInNotification, lookaheadCount, androidNotificationIcon)
     }
   }
 }

package/nitrogen/generated/ios/swift/PlayerConfig.swift

@@ -18,7 +18,7 @@ public extension PlayerConfig {
   /**
    * Create a new instance of `PlayerConfig`.
    */
-  init(androidAutoEnabled: Bool?, carPlayEnabled: Bool?, showInNotification: Bool?, lookaheadCount: Double?) {
+  init(androidAutoEnabled: Bool?, carPlayEnabled: Bool?, showInNotification: Bool?, lookaheadCount: Double?, androidNotificationIcon: String?) {
     self.init({ () -> bridge.std__optional_bool_ in
       if let __unwrappedValue = androidAutoEnabled {
         return bridge.create_std__optional_bool_(__unwrappedValue)
@@ -43,6 +43,12 @@ public extension PlayerConfig {
       } else {
         return .init()
       }
+    }(), { () -> bridge.std__optional_std__string_ in
+      if let __unwrappedValue = androidNotificationIcon {
+        return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
+      } else {
+        return .init()
+      }
     }())
   }
 
@@ -93,4 +99,16 @@ public extension PlayerConfig {
       }
     }()
   }
+  
+  @inline(__always)
+  var androidNotificationIcon: String? {
+    return { () -> String? in
+      if bridge.has_value_std__optional_std__string_(self.__androidNotificationIcon) {
+        let __unwrapped = bridge.get_std__optional_std__string_(self.__androidNotificationIcon)
+        return String(__unwrapped)
+      } else {
+        return nil
+      }
+    }()
+  }
 }

package/nitrogen/generated/shared/c++/PlayerConfig.hpp

@@ -31,6 +31,7 @@
 
 
 #include <optional>
+#include <string>
 
 namespace margelo::nitro::nitroplayer {
 
@@ -43,10 +44,11 @@ namespace margelo::nitro::nitroplayer {
     std::optional<bool> carPlayEnabled     SWIFT_PRIVATE;
     std::optional<bool> showInNotification     SWIFT_PRIVATE;
     std::optional<double> lookaheadCount     SWIFT_PRIVATE;
+    std::optional<std::string> androidNotificationIcon     SWIFT_PRIVATE;
 
   public:
     PlayerConfig() = default;
-    explicit PlayerConfig(std::optional<bool> androidAutoEnabled, std::optional<bool> carPlayEnabled, std::optional<bool> showInNotification, std::optional<double> lookaheadCount): androidAutoEnabled(androidAutoEnabled), carPlayEnabled(carPlayEnabled), showInNotification(showInNotification), lookaheadCount(lookaheadCount) {}
+    explicit PlayerConfig(std::optional<bool> androidAutoEnabled, std::optional<bool> carPlayEnabled, std::optional<bool> showInNotification, std::optional<double> lookaheadCount, std::optional<std::string> androidNotificationIcon): androidAutoEnabled(androidAutoEnabled), carPlayEnabled(carPlayEnabled), showInNotification(showInNotification), lookaheadCount(lookaheadCount), androidNotificationIcon(androidNotificationIcon) {}
 
   public:
     friend bool operator==(const PlayerConfig& lhs, const PlayerConfig& rhs) = default;
@@ -65,7 +67,8 @@ namespace margelo::nitro {
         JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "androidAutoEnabled"))),
         JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "carPlayEnabled"))),
         JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "showInNotification"))),
-        JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "lookaheadCount")))
+        JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "lookaheadCount"))),
+        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "androidNotificationIcon")))
       );
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::nitroplayer::PlayerConfig& arg) {
@@ -74,6 +77,7 @@ namespace margelo::nitro {
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "carPlayEnabled"), JSIConverter<std::optional<bool>>::toJSI(runtime, arg.carPlayEnabled));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "showInNotification"), JSIConverter<std::optional<bool>>::toJSI(runtime, arg.showInNotification));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "lookaheadCount"), JSIConverter<std::optional<double>>::toJSI(runtime, arg.lookaheadCount));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "androidNotificationIcon"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.androidNotificationIcon));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -88,6 +92,7 @@ namespace margelo::nitro {
       if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "carPlayEnabled")))) return false;
       if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "showInNotification")))) return false;
       if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "lookaheadCount")))) return false;
+      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "androidNotificationIcon")))) return false;
       return true;
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nitro-player",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "description": "A powerful audio player library for React Native with playlist management, playback controls, and support for Android Auto and CarPlay",
   "main": "lib/index",
   "module": "lib/index",

package/src/types/PlayerQueue.ts

@@ -49,4 +49,6 @@ export interface PlayerConfig {
    * Higher values = more proactive loading, but more network requests
    */
   lookaheadCount?: number
+
+  androidNotificationIcon?: string
 }