react-native-theoplayer 11.5.0 → 11.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +12 -1
- package/README.md +1 -0
- package/android/src/main/java/com/theoplayer/PlayerEventEmitter.kt +9 -0
- package/android/src/main/java/com/theoplayer/ReactTHEOplayerContext.kt +58 -85
- package/android/src/main/java/com/theoplayer/ReactTHEOplayerPackage.kt +3 -0
- package/android/src/main/java/com/theoplayer/media/MediaControlModule.kt +102 -0
- package/android/src/main/java/com/theoplayer/media/MediaControlProxy.kt +376 -0
- package/android/src/main/java/com/theoplayer/media/MediaNotificationBuilder.kt +78 -34
- package/android/src/main/java/com/theoplayer/media/MediaPlaybackService.kt +53 -20
- package/android/src/main/java/com/theoplayer/media/MediaSessionConfig.kt +6 -6
- package/android/src/main/java/com/theoplayer/media/MediaSessionConfigAdapter.kt +23 -20
- package/android/src/main/java/com/theoplayer/player/PlayerModule.kt +0 -1
- package/android/src/main/java/com/theoplayer/presentation/PipUtils.kt +98 -93
- package/android/src/main/java/com/theoplayer/util/ReadableExtension.kt +14 -0
- package/android/src/main/res/drawable/ic_next.xml +9 -0
- package/android/src/main/res/drawable/ic_prev.xml +9 -0
- package/android/src/main/res/values/strings.xml +4 -0
- package/ios/THEOplayerRCTBridge.m +16 -0
- package/ios/THEOplayerRCTDebug.swift +3 -0
- package/ios/THEOplayerRCTMainEventHandler.swift +17 -0
- package/ios/THEOplayerRCTTypeUtils.swift +30 -0
- package/ios/THEOplayerRCTView.swift +15 -5
- package/ios/backgroundAudio/THEOplayerRCTBackgroundAudioManager.swift +1 -1
- package/ios/backgroundAudio/THEOplayerRCTNowPlayingManager.swift +49 -3
- package/ios/backgroundAudio/THEOplayerRCTRemoteCommandsManager.swift +151 -68
- package/ios/backgroundAudio/THEOplayerRCTView+MediaControlConfig.swift +25 -11
- package/ios/mediaControl/THEOplayerRCTMediaControlAPI.swift +79 -0
- package/ios/mediaControl/THEOplayerRCTMediaControlManager.swift +38 -0
- package/ios/pip/THEOplayerRCTPipControlsManager.swift +9 -12
- package/lib/commonjs/api/event/PlayerEvent.js +8 -0
- package/lib/commonjs/api/event/PlayerEvent.js.map +1 -1
- package/lib/commonjs/api/media/MediaControlAPI.js +14 -0
- package/lib/commonjs/api/media/MediaControlAPI.js.map +1 -0
- package/lib/commonjs/api/media/barrel.js +11 -0
- package/lib/commonjs/api/media/barrel.js.map +1 -1
- package/lib/commonjs/api/player/PlayerEventMap.js +1 -0
- package/lib/commonjs/api/player/PlayerEventMap.js.map +1 -1
- package/lib/commonjs/api/player/THEOplayer.js.map +1 -1
- package/lib/commonjs/internal/THEOplayerView.js +4 -0
- package/lib/commonjs/internal/THEOplayerView.js.map +1 -1
- package/lib/commonjs/internal/adapter/THEOplayerAdapter.js +6 -0
- package/lib/commonjs/internal/adapter/THEOplayerAdapter.js.map +1 -1
- package/lib/commonjs/internal/adapter/THEOplayerWebAdapter.js +9 -9
- package/lib/commonjs/internal/adapter/THEOplayerWebAdapter.js.map +1 -1
- package/lib/commonjs/internal/adapter/WebEventForwarder.js +5 -0
- package/lib/commonjs/internal/adapter/WebEventForwarder.js.map +1 -1
- package/lib/commonjs/internal/adapter/event/PlayerEvents.js +7 -1
- package/lib/commonjs/internal/adapter/event/PlayerEvents.js.map +1 -1
- package/lib/commonjs/internal/adapter/media/MediaControlNativeAdapter.js +42 -0
- package/lib/commonjs/internal/adapter/media/MediaControlNativeAdapter.js.map +1 -0
- package/lib/commonjs/internal/adapter/media/MediaControlWebAdapter.js +32 -0
- package/lib/commonjs/internal/adapter/media/MediaControlWebAdapter.js.map +1 -0
- package/lib/commonjs/internal/adapter/web/WebMediaSession.js +78 -16
- package/lib/commonjs/internal/adapter/web/WebMediaSession.js.map +1 -1
- package/lib/commonjs/manifest.json +1 -1
- package/lib/module/api/event/PlayerEvent.js +9 -0
- package/lib/module/api/event/PlayerEvent.js.map +1 -1
- package/lib/module/api/media/MediaControlAPI.js +10 -0
- package/lib/module/api/media/MediaControlAPI.js.map +1 -0
- package/lib/module/api/media/barrel.js +1 -0
- package/lib/module/api/media/barrel.js.map +1 -1
- package/lib/module/api/player/PlayerEventMap.js +1 -0
- package/lib/module/api/player/PlayerEventMap.js.map +1 -1
- package/lib/module/api/player/THEOplayer.js.map +1 -1
- package/lib/module/internal/THEOplayerView.js +5 -1
- package/lib/module/internal/THEOplayerView.js.map +1 -1
- package/lib/module/internal/adapter/THEOplayerAdapter.js +6 -0
- package/lib/module/internal/adapter/THEOplayerAdapter.js.map +1 -1
- package/lib/module/internal/adapter/THEOplayerWebAdapter.js +9 -9
- package/lib/module/internal/adapter/THEOplayerWebAdapter.js.map +1 -1
- package/lib/module/internal/adapter/WebEventForwarder.js +6 -1
- package/lib/module/internal/adapter/WebEventForwarder.js.map +1 -1
- package/lib/module/internal/adapter/event/PlayerEvents.js +5 -0
- package/lib/module/internal/adapter/event/PlayerEvents.js.map +1 -1
- package/lib/module/internal/adapter/media/MediaControlNativeAdapter.js +37 -0
- package/lib/module/internal/adapter/media/MediaControlNativeAdapter.js.map +1 -0
- package/lib/module/internal/adapter/media/MediaControlWebAdapter.js +27 -0
- package/lib/module/internal/adapter/media/MediaControlWebAdapter.js.map +1 -0
- package/lib/module/internal/adapter/web/WebMediaSession.js +78 -16
- package/lib/module/internal/adapter/web/WebMediaSession.js.map +1 -1
- package/lib/module/manifest.json +1 -1
- package/lib/typescript/api/event/PlayerEvent.d.ts +9 -0
- package/lib/typescript/api/event/PlayerEvent.d.ts.map +1 -1
- package/lib/typescript/api/media/MediaControlAPI.d.ts +30 -0
- package/lib/typescript/api/media/MediaControlAPI.d.ts.map +1 -0
- package/lib/typescript/api/media/MediaControlConfiguration.d.ts +5 -1
- package/lib/typescript/api/media/MediaControlConfiguration.d.ts.map +1 -1
- package/lib/typescript/api/media/barrel.d.ts +1 -0
- package/lib/typescript/api/media/barrel.d.ts.map +1 -1
- package/lib/typescript/api/player/PlayerEventMap.d.ts +7 -2
- package/lib/typescript/api/player/PlayerEventMap.d.ts.map +1 -1
- package/lib/typescript/api/player/THEOplayer.d.ts +5 -0
- package/lib/typescript/api/player/THEOplayer.d.ts.map +1 -1
- package/lib/typescript/internal/THEOplayerView.d.ts +1 -0
- package/lib/typescript/internal/THEOplayerView.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/THEOplayerAdapter.d.ts +3 -1
- package/lib/typescript/internal/adapter/THEOplayerAdapter.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/THEOplayerWebAdapter.d.ts +3 -2
- package/lib/typescript/internal/adapter/THEOplayerWebAdapter.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/WebEventForwarder.d.ts +1 -0
- package/lib/typescript/internal/adapter/WebEventForwarder.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/event/PlayerEvents.d.ts +4 -1
- package/lib/typescript/internal/adapter/event/PlayerEvents.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/event/native/NativePlayerEvent.d.ts +1 -0
- package/lib/typescript/internal/adapter/event/native/NativePlayerEvent.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/media/MediaControlNativeAdapter.d.ts +12 -0
- package/lib/typescript/internal/adapter/media/MediaControlNativeAdapter.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/media/MediaControlWebAdapter.d.ts +14 -0
- package/lib/typescript/internal/adapter/media/MediaControlWebAdapter.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/web/WebMediaSession.d.ts +10 -3
- package/lib/typescript/internal/adapter/web/WebMediaSession.d.ts.map +1 -1
- package/package.json +3 -3
- package/react-native-theoplayer.podspec +1 -1
- package/src/api/event/PlayerEvent.ts +10 -0
- package/src/api/media/MediaControlAPI.ts +33 -0
- package/src/api/media/MediaControlConfiguration.ts +5 -1
- package/src/api/media/barrel.ts +1 -0
- package/src/api/player/PlayerEventMap.ts +7 -0
- package/src/api/player/THEOplayer.ts +6 -0
- package/src/internal/THEOplayerView.tsx +8 -0
- package/src/internal/adapter/THEOplayerAdapter.ts +9 -0
- package/src/internal/adapter/THEOplayerWebAdapter.ts +12 -9
- package/src/internal/adapter/WebEventForwarder.ts +7 -0
- package/src/internal/adapter/event/PlayerEvents.ts +10 -0
- package/src/internal/adapter/event/native/NativePlayerEvent.ts +2 -0
- package/src/internal/adapter/media/MediaControlNativeAdapter.ts +38 -0
- package/src/internal/adapter/media/MediaControlWebAdapter.ts +28 -0
- package/src/internal/adapter/web/WebMediaSession.ts +85 -21
- package/src/manifest.json +1 -1
- package/android/src/main/java/com/theoplayer/media/MediaQueueNavigator.kt +0 -33
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-empty-function */
|
|
2
2
|
import type { ChromelessPlayer } from 'theoplayer';
|
|
3
3
|
import type { THEOplayerWebAdapter } from '../THEOplayerWebAdapter';
|
|
4
|
-
import { MediaControlConfiguration } from 'react-native-theoplayer';
|
|
4
|
+
import { MediaControlAction, MediaControlConfiguration } from 'react-native-theoplayer';
|
|
5
|
+
import { MediaControlWebAdapter } from '../media/MediaControlWebAdapter';
|
|
5
6
|
|
|
6
7
|
const DEFAULT_SKIP_FORWARD_INTERVAL = 5;
|
|
7
8
|
const DEFAULT_SKIP_BACKWARD_INTERVAL = 5;
|
|
@@ -30,19 +31,50 @@ const mediaSession = (function () {
|
|
|
30
31
|
* @link https://w3c.github.io/mediasession
|
|
31
32
|
*/
|
|
32
33
|
export class WebMediaSession {
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
34
|
+
// The session that most recently published to the process-wide navigator.mediaSession.
|
|
35
|
+
// Used to scope clearing so a disabled/destroyed player only clears its own session and never
|
|
36
|
+
// clobbers another (newly-active) owner during a multi-player hand-off.
|
|
37
|
+
private static _currentOwner: WebMediaSession | undefined;
|
|
38
|
+
private readonly _mediaControlAdapter: MediaControlWebAdapter;
|
|
39
|
+
private _enabled: boolean;
|
|
40
|
+
|
|
41
|
+
constructor(
|
|
42
|
+
private readonly _webAdapter: THEOplayerWebAdapter,
|
|
43
|
+
private readonly _player: ChromelessPlayer,
|
|
44
|
+
private readonly _config: MediaControlConfiguration = defaultMediaControlConfiguration,
|
|
45
|
+
) {
|
|
46
|
+
this._enabled = this._config.mediaSessionEnabled !== false;
|
|
41
47
|
this._player.addEventListener('sourcechange', this.onSourceChange);
|
|
48
|
+
this._mediaControlAdapter = new MediaControlWebAdapter(this);
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
get mediaControlAdapter() {
|
|
52
|
+
return this._mediaControlAdapter;
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
setEnabled(enabled: boolean) {
|
|
56
|
+
if (this._enabled === enabled) {
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
this._enabled = enabled;
|
|
60
|
+
if (enabled) {
|
|
61
|
+
this.updateMetadata();
|
|
62
|
+
this.updateMediaSession();
|
|
63
|
+
} else {
|
|
64
|
+
this.clearMediaSession();
|
|
65
|
+
}
|
|
42
66
|
}
|
|
43
67
|
|
|
44
68
|
updateMediaSession() {
|
|
45
|
-
|
|
69
|
+
if (!this._enabled) {
|
|
70
|
+
// A disabled session must not touch the shared navigator.mediaSession on routine events, as this
|
|
71
|
+
// would clobber the state of another player that currently owns the session. Explicit clearing
|
|
72
|
+
// only happens on the setEnabled(false)/destroy() transitions.
|
|
73
|
+
return;
|
|
74
|
+
}
|
|
75
|
+
// This session is now publishing to the shared media session: claim ownership.
|
|
76
|
+
WebMediaSession._currentOwner = this;
|
|
77
|
+
// Update trick-play capabilities
|
|
46
78
|
if (this.isTrickPlayEnabled()) {
|
|
47
79
|
mediaSession.setActionHandler('seekbackward', (event) => {
|
|
48
80
|
const skipTime = event.seekOffset || this._config.skipBackwardInterval || DEFAULT_SKIP_BACKWARD_INTERVAL;
|
|
@@ -67,23 +99,33 @@ export class WebMediaSession {
|
|
|
67
99
|
mediaSession.setActionHandler('seekto', NoOp);
|
|
68
100
|
}
|
|
69
101
|
|
|
70
|
-
//
|
|
102
|
+
// Update play/pause capabilities
|
|
103
|
+
// Prefer a user-registered PLAY/PAUSE handler (called with the THEOplayer instance), and fall back to
|
|
104
|
+
// the default player action when none is set, matching the iOS/Android behavior.
|
|
71
105
|
if (this.isPlayPauseEnabled()) {
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
mediaSession
|
|
76
|
-
this._player?.pause();
|
|
77
|
-
});
|
|
106
|
+
const playHandler = this.mediaControlAdapter.getHandler(MediaControlAction.PLAY);
|
|
107
|
+
mediaSession.setActionHandler('play', () => (playHandler ? playHandler(this._webAdapter) : this._player?.play()));
|
|
108
|
+
const pauseHandler = this.mediaControlAdapter.getHandler(MediaControlAction.PAUSE);
|
|
109
|
+
mediaSession.setActionHandler('pause', () => (pauseHandler ? pauseHandler(this._webAdapter) : this._player?.pause()));
|
|
78
110
|
} else {
|
|
79
111
|
mediaSession.setActionHandler('play', NoOp);
|
|
80
112
|
mediaSession.setActionHandler('pause', NoOp);
|
|
81
113
|
}
|
|
82
114
|
|
|
83
|
-
//
|
|
115
|
+
// Update queue actions
|
|
116
|
+
// There is no default behaviour for these: reset the action handler when the user removed theirs, or
|
|
117
|
+
// the browser keeps presenting the button and dispatching to the removed handler.
|
|
118
|
+
// Note: the browser invokes media session action handlers with a MediaSessionActionDetails argument.
|
|
119
|
+
// Wrap the user handler so it is called with the THEOplayer instance, matching the MediaControlHandler contract.
|
|
120
|
+
const previousTrackHandler = this.mediaControlAdapter.getHandler(MediaControlAction.SKIP_TO_PREVIOUS);
|
|
121
|
+
mediaSession.setActionHandler('previoustrack', previousTrackHandler ? () => previousTrackHandler(this._webAdapter) : NoOp);
|
|
122
|
+
const nextTrackHandler = this.mediaControlAdapter.getHandler(MediaControlAction.SKIP_TO_NEXT);
|
|
123
|
+
mediaSession.setActionHandler('nexttrack', nextTrackHandler ? () => nextTrackHandler(this._webAdapter) : NoOp);
|
|
124
|
+
|
|
125
|
+
// Update playbackState
|
|
84
126
|
mediaSession.playbackState = this._player.paused ? 'paused' : 'playing';
|
|
85
127
|
|
|
86
|
-
//
|
|
128
|
+
// Update position
|
|
87
129
|
this.updatePositionState();
|
|
88
130
|
}
|
|
89
131
|
|
|
@@ -91,11 +133,28 @@ export class WebMediaSession {
|
|
|
91
133
|
this._player.removeEventListener(['play', 'playing'], this.onFirstPlaying);
|
|
92
134
|
this._player.removeEventListener(['play', 'pause', 'loadedmetadata', 'durationchange', 'ratechange'], this.update);
|
|
93
135
|
this._player.ads?.removeEventListener(['adbreakbegin', 'adbreakend'], this.update);
|
|
136
|
+
this.clearMediaSession();
|
|
137
|
+
// Make sure a late updateMediaSession() call, e.g. from a configuration setter, does not
|
|
138
|
+
// republish state for a destroyed player.
|
|
139
|
+
this._enabled = false;
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
private clearMediaSession() {
|
|
143
|
+
// Only clear the shared media session if this player owns it (or nobody does), so a disabled or
|
|
144
|
+
// destroyed player never wipes another (newly-active) owner's session during a hand-off.
|
|
145
|
+
if (WebMediaSession._currentOwner !== undefined && WebMediaSession._currentOwner !== this) {
|
|
146
|
+
return;
|
|
147
|
+
}
|
|
148
|
+
WebMediaSession._currentOwner = undefined;
|
|
94
149
|
mediaSession.setActionHandler('play', NoOp);
|
|
95
150
|
mediaSession.setActionHandler('pause', NoOp);
|
|
96
151
|
mediaSession.setActionHandler('seekbackward', NoOp);
|
|
97
152
|
mediaSession.setActionHandler('seekforward', NoOp);
|
|
98
153
|
mediaSession.setActionHandler('seekto', NoOp);
|
|
154
|
+
mediaSession.setActionHandler('previoustrack', NoOp);
|
|
155
|
+
mediaSession.setActionHandler('nexttrack', NoOp);
|
|
156
|
+
mediaSession.metadata = null;
|
|
157
|
+
mediaSession.playbackState = 'none';
|
|
99
158
|
}
|
|
100
159
|
|
|
101
160
|
private update = () => {
|
|
@@ -113,12 +172,17 @@ export class WebMediaSession {
|
|
|
113
172
|
this._player.removeEventListener(['play', 'playing'], this.onFirstPlaying);
|
|
114
173
|
this._player.removeEventListener(['play', 'pause', 'loadedmetadata', 'durationchange', 'ratechange'], this.update);
|
|
115
174
|
this._player.ads?.removeEventListener(['adbreakbegin', 'adbreakend'], this.update);
|
|
116
|
-
|
|
117
|
-
|
|
175
|
+
if (this._enabled) {
|
|
176
|
+
mediaSession.metadata = null;
|
|
177
|
+
mediaSession.playbackState = 'none';
|
|
178
|
+
}
|
|
118
179
|
this._player.addEventListener(['play', 'playing'], this.onFirstPlaying);
|
|
119
180
|
};
|
|
120
181
|
|
|
121
182
|
private updateMetadata = () => {
|
|
183
|
+
if (!this._enabled) {
|
|
184
|
+
return;
|
|
185
|
+
}
|
|
122
186
|
const source = this._player.source;
|
|
123
187
|
const metadata = source?.metadata;
|
|
124
188
|
const artwork = [metadata?.displayIconUri, source?.poster, ...(metadata?.images ? metadata.images : [])]
|
package/src/manifest.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":"11.
|
|
1
|
+
{"version":"11.6.0","buildDate":"2026-08-06T10:39:32.999Z"}
|
|
@@ -1,33 +0,0 @@
|
|
|
1
|
-
package com.theoplayer.media
|
|
2
|
-
|
|
3
|
-
import com.theoplayer.android.api.player.Player
|
|
4
|
-
import com.theoplayer.android.connector.mediasession.QueueNavigator
|
|
5
|
-
|
|
6
|
-
private const val DEFAULT_ACTIVE_ITEM_ID = 0L
|
|
7
|
-
|
|
8
|
-
class MediaQueueNavigator(private var mediaSessionConfig: MediaSessionConfig): QueueNavigator {
|
|
9
|
-
override fun getActiveQueueItemId(player: Player): Long {
|
|
10
|
-
return DEFAULT_ACTIVE_ITEM_ID
|
|
11
|
-
}
|
|
12
|
-
|
|
13
|
-
override fun getSupportedQueueNavigatorActions(player: Player): Long {
|
|
14
|
-
return QueueNavigator.AVAILABLE_ACTIONS
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
override fun onSkipToNext(player: Player) {
|
|
18
|
-
// Check if we need to treat a MEDIA_NEXT keycode as a MEDIA_FAST_FORWARD
|
|
19
|
-
if (mediaSessionConfig.convertSkipToSeek) {
|
|
20
|
-
player.currentTime += mediaSessionConfig.skipForwardInterval
|
|
21
|
-
}
|
|
22
|
-
}
|
|
23
|
-
|
|
24
|
-
override fun onSkipToPrevious(player: Player) {
|
|
25
|
-
// Check if we need to treat a MEDIA_PREVIOUS keycode as a MEDIA_REWIND
|
|
26
|
-
if (mediaSessionConfig.convertSkipToSeek) {
|
|
27
|
-
player.currentTime -= mediaSessionConfig.skipBackwardInterval
|
|
28
|
-
}
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
override fun onSkipToQueueItem(player: Player, id: Long) {
|
|
32
|
-
}
|
|
33
|
-
}
|