lib update, drm, background audio fix, control lock screen

chaimPaneth · chaimPaneth · commit 9c9f97ceb975 · 2022-03-07T16:34:00.000+02:00
diff --git a/README.md b/README.md
@@ -386,6 +386,7 @@ public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode, Conf
 | **`setSpeed`**             | Sets the player speed.                                                                                                                                                                  | `Double`                      |
 | **`setPlaylistIndex`**     | Sets the current playing item in the loaded playlist.                                                                                                                                   | `Int`                         |
 | **`setControls`**          | Sets the display of the control buttons on the player.                                                                                                                                  | `Boolean`                     |
+| **`setLockScreenControls`**          | *(iOS only)* Sets the locks screen controls for the currently playing media, can be used to control what player to show the controls for.                                                                                                                                  | `Boolean`                     |
 | **`setFullScreen`**        | Set full screen.                                                                                                                                                                        | `Boolean`                     |
 | **`loadPlaylist`**         | Loads a playlist. (Using this function before the player has finished initializing may result in assert crash or blank screen, put in a timeout to make sure JWPlayer is mounted).      | `[PlaylistItems]`             |
 | **`loadPlaylistItem`**     | Loads a playlist item. (Using this function before the player has finished initializing may result in assert crash or blank screen, put in a timeout to make sure JWPlayer is mounted). | [PlaylistItem](#PlaylistItem) |
diff --git a/index.d.ts b/index.d.ts
@@ -121,7 +121,7 @@ declare module "react-native-jw-media-player" {
     | 'audiotracks_submenu'
     | 'casting_menu';
   interface Config {
-    license: string,
+    license: string;
     advertising?: Advertising;
     autostart?: boolean;
     controls?: boolean;
@@ -139,6 +139,9 @@ declare module "react-native-jw-media-player" {
     preload?: Preloads;
     interfaceBehavior?: InterfaceBehaviors;
     hideUIGroup?: UIGroups;
+    processSpcUrl?: string;
+    fairplayCertUrl?: string;
+    contentUUID?: string;
   }
   interface PropsType {
     config: Config;
@@ -175,6 +178,7 @@ declare module "react-native-jw-media-player" {
     setSpeed(speed: number): void;
     setPlaylistIndex(index: number): void;
     setControls(show: boolean): void;
+    setLockScreenControls(show: boolean): void;
     loadPlaylist(playlist: PlaylistItem[]): void;
     loadPlaylistItem(playlistItem: PlaylistItem): void;
     seekTo(time: number): void;
diff --git a/index.js b/index.js
@@ -150,6 +150,9 @@ export default class JWPlayer extends Component {
       forceLandscapeOnFullScreen: PropTypes.bool,
       enableLockScreenControls: PropTypes.bool,
       stretching: PropTypes.oneOf(['uniform', 'exactFit', 'fill', 'none']),
+      processSpcUrl: PropTypes.string,
+      fairplayCertUrl: PropTypes.string,
+      contentUUID: PropTypes.string,
     }),
     onPlayerReady: PropTypes.func,
     onPlaylist: PropTypes.func,
@@ -159,6 +162,7 @@ export default class JWPlayer extends Component {
     setSpeed: PropTypes.func,
     setPlaylistIndex: PropTypes.func,
     setControls: PropTypes.func,
+    setLockScreenControls: PropTypes.func,
     setFullscreen: PropTypes.func,
     setUpCastController: PropTypes.func,
     presentCastDialog: PropTypes.func,
@@ -231,6 +235,11 @@ export default class JWPlayer extends Component {
       RNJWPlayerManager.setControls(this.getRNJWPlayerBridgeHandle(), show);
   }
 
+  setLockScreenControls(show) {
+    if (RNJWPlayerManager && Platform.OS === "ios")
+      RNJWPlayerManager.setLockScreenControls(this.getRNJWPlayerBridgeHandle(), show);
+  }
+
   seekTo(time) {
     if (RNJWPlayerManager)
       RNJWPlayerManager.seekTo(this.getRNJWPlayerBridgeHandle(), time);
diff --git a/ios/RNJWPlayer.podspec b/ios/RNJWPlayer.podspec
@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
   s.platform     = :ios, "10.0"
   s.source       = { :git => "https://github.com/chaimPaneth/react-native-jw-media-player.git", :tag => "v#{s.version}" }
   s.source_files  = "RNJWPlayer/*.{h,m}"
-  s.dependency   'JWPlayerKit', '~> 4.3.0'
+  s.dependency   'JWPlayerKit', '~> 4.4.0'
   s.dependency   'google-cast-sdk', '~> 4.7.0'
   s.dependency   'React'
   # s.static_framework = true
diff --git a/ios/RNJWPlayer/RNJWPlayerView.h b/ios/RNJWPlayer/RNJWPlayerView.h
@@ -9,7 +9,7 @@
 #import <JWPlayerKit/JWPlayerKit-swift.h>
 #import <GoogleCast/GoogleCast.h>
 
-@interface RNJWPlayerView : UIView  <JWPlayerDelegate, JWPlayerStateDelegate, JWAdDelegate, JWCastDelegate, JWAVDelegate, JWPlayerViewDelegate, JWPlayerViewControllerDelegate, AVPictureInPictureControllerDelegate>
+@interface RNJWPlayerView : UIView  <JWPlayerDelegate, JWPlayerStateDelegate, JWAdDelegate, JWCastDelegate, JWAVDelegate, JWPlayerViewDelegate, JWPlayerViewControllerDelegate, JWDRMContentKeyDataSource, AVPictureInPictureControllerDelegate>
 
 @property(nonatomic, strong)JWPlayerViewController* playerViewController;
 @property(nonatomic, strong)JWPlayerView *playerView;
@@ -22,6 +22,11 @@
 
 @property(nonatomic)JWInterfaceBehavior interfaceBehavior;
 
+/* DRM props */
+@property(nonatomic) NSString *fairplayCertUrl;
+@property(nonatomic) NSString *processSpcUrl;
+@property(nonatomic) NSString *contentUUID;
+
 /* casting objects */
 @property(nonatomic, strong)JWCastController *castController;
 @property(nonatomic)BOOL isCasting;
diff --git a/ios/RNJWPlayer/RNJWPlayerView.m b/ios/RNJWPlayer/RNJWPlayerView.m
@@ -90,6 +90,10 @@ -(void)setConfig:(NSDictionary*)config
     } else {
         [self setupPlayerViewController:config :[self getPlayerConfiguration:config]];
     }
+
+    _processSpcUrl = config[@"processSpcUrl"];
+    _fairplayCertUrl = config[@"fairplayCertUrl"];
+    _contentUUID = config[@"contentUUID"];
 }
 
 -(void)setControls:(BOOL)controls
@@ -612,8 +616,8 @@ -(void)setupPlayerViewController:config :(JWPlayerConfiguration*)playerConfig
     }
     
     id enableLockScreenControls = config[@"enableLockScreenControls"];
-    if (enableLockScreenControls != nil && enableLockScreenControls != (id)[NSNull null]) {
-        _playerViewController.enableLockScreenControls = enableLockScreenControls;
+    if ((enableLockScreenControls != nil && enableLockScreenControls != (id)[NSNull null]) || _backgroundAudioEnabled) {
+        _playerViewController.enableLockScreenControls = YES;
     }
     
     id styling = config[@"styling"];
@@ -687,6 +691,7 @@ -(void)presentPlayerViewController:(JWPlayerConfiguration*)configuration
     _playerViewController.player.playbackStateDelegate = self;
     _playerViewController.player.adDelegate = self;
     _playerViewController.player.avDelegate = self;
+    _playerViewController.player.contentKeyDataSource = self;
 }
 
 #pragma mark - JWPlayer View helpers
@@ -700,6 +705,7 @@ -(void)setupPlayerView:config :(JWPlayerConfiguration*)playerConfig
     _playerView.player.playbackStateDelegate = self;
     _playerView.player.adDelegate = self;
     _playerView.player.avDelegate = self;
+    _playerView.player.contentKeyDataSource = self;
     
     [_playerView.player configurePlayerWith:playerConfig];
 
@@ -881,6 +887,36 @@ - (void)playerViewController:(JWPlayerViewController *)controller relatedItemBeg
     
 }
 
+#pragma mark - DRM Delegate
+
+- (void)contentIdentifierForURL:(NSURL * _Nonnull)url completionHandler:(void (^ _Nonnull)(NSData * _Nullable))handler {
+    NSData *uuidData = [_contentUUID dataUsingEncoding:NSUTF8StringEncoding];
+    handler(uuidData);
+}
+
+- (void)appIdentifierForURL:(NSURL * _Nonnull)url completionHandler:(void (^ _Nonnull)(NSData * _Nullable))handler {
+    NSURL *certURL = [NSURL URLWithString:_fairplayCertUrl];
+    NSData *certData = [NSData dataWithContentsOfURL:certURL];
+    handler(certData);
+}
+
+- (void)contentKeyWithSPCData:(NSData * _Nonnull)spcData completionHandler:(void (^ _Nonnull)(NSData * _Nullable, NSDate * _Nullable, NSString * _Nullable))handler {
+    NSMutableURLRequest *ckcRequest = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:_processSpcUrl]];
+    [ckcRequest setHTTPMethod:@"POST"];
+    [ckcRequest setHTTPBody:spcData];
+    [ckcRequest addValue:@"application/octet-stream" forHTTPHeaderField:@"Content-Type"];
+
+    [[[NSURLSession sharedSession] dataTaskWithRequest:ckcRequest completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
+        NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)response;
+        if (error != nil || (httpResponse != nil && httpResponse.statusCode != 200)) {
+            handler(nil, nil, nil);
+            return;
+        }
+
+        handler(data, nil, nil);
+    }] resume];
+}
+
 #pragma mark - AV Picture In Picture Delegate
 
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSString *, id> *)change context:(void *)context
@@ -1438,10 +1474,14 @@ - (void)initializeAudioSession
                                                object: audioSession];
     
     NSError *setCategoryError = nil;
-    BOOL success = [audioSession setCategory:AVAudioSessionCategoryPlayback error:&setCategoryError];
+    BOOL success = [audioSession setCategory:AVAudioSessionCategoryPlayback withOptions:AVAudioSessionCategoryOptionMixWithOthers|AVAudioSessionCategoryOptionAllowBluetooth|AVAudioSessionCategoryOptionDefaultToSpeaker error:&setCategoryError];
     
     NSError *activationError = nil;
-    success = [audioSession setActive:YES error:&activationError];
+    success = [audioSession setActive:YES withOptions:AVAudioSessionSetActiveOptionNotifyOthersOnDeactivation error:&activationError];
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                                 selector:@selector(applicationWillResignActive:)
+                                                     name:UIApplicationWillResignActiveNotification object:nil];
 }
 
 -(void)audioSessionInterrupted:(NSNotification*)note
@@ -1477,4 +1517,16 @@ -(void)audioInterruptionsEnded:(NSNotification *)note {
     }
 }
 
+// Inactive
+
+-(void)applicationWillResignActive:(NSNotification *)notification {
+    if (!_userPaused && _backgroundAudioEnabled) {
+        if (_playerView != nil) {
+            [_playerView.player play];
+        } else if (_playerViewController != nil) {
+            [_playerViewController.player play];
+        }
+    }
+}
+
 @end
diff --git a/ios/RNJWPlayer/RNJWPlayerViewManager.m b/ios/RNJWPlayer/RNJWPlayerViewManager.m
@@ -478,4 +478,17 @@ - (UIView*)view
     }];
 }
 
+RCT_EXPORT_METHOD(setLockScreenControls: (nonnull NSNumber *)reactTag: (BOOL)show) {
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, RNJWPlayerView *> *viewRegistry) {
+        RNJWPlayerView *view = viewRegistry[reactTag];
+        if (![view isKindOfClass:[RNJWPlayerView class]] || (view.playerView == nil && view.playerViewController == nil)) {
+            RCTLogError(@"Invalid view returned from registry, expecting RNJWPlayerView, got: %@", view);
+        } else {
+            if (view.playerViewController) {
+                view.playerViewController.enableLockScreenControls = show;
+            }
+        }
+    }];
+}
+
 @end
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-jw-media-player",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "React-native Android/iOS plugin for JWPlayer SDK (https://www.jwplayer.com/)",
   "main": "index.js",
   "types": "./index.d.ts",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "react-native-jw-media-player",`
`3`		`- "version": "0.2.6",`
	`3`	`+ "version": "0.2.7",`
`4`	`4`	`"description": "React-native Android/iOS plugin for JWPlayer SDK (https://www.jwplayer.com/)",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"types": "./index.d.ts",`