@jwplayer/jwplayer-react-native 1.0.0 → 1.0.2

package/ios/RNJWPlayer/RNJWPlayerViewController.swift

@@ -10,11 +10,14 @@ import AVFoundation
 import AVKit
 import MediaPlayer
 import React
-import GoogleCast
 import JWPlayerKit
 
+#if USE_GOOGLE_CAST
+    import GoogleCast
+#endif
+
 class RNJWPlayerViewController : JWPlayerViewController, JWPlayerViewControllerDelegate, JWDRMContentKeyDataSource {
-    
+
     var parentView:RNJWPlayerView!
 
     func setDelegates() {
@@ -155,27 +158,27 @@ class RNJWPlayerViewController : JWPlayerViewController, JWPlayerViewControllerD
     func playerViewControllerDidDismissFullScreen(_ controller:JWPlayerViewController) {
         parentView?.onFullScreenExit?([:])
     }
-    
+
     func playerViewController(_ controller:JWPlayerViewController, relatedMenuClosedWithMethod method:JWRelatedInteraction) {
 
     }
-    
+
     func playerViewController(_ controller: JWPlayerKit.JWPlayerViewController, relatedMenuOpenedWithItems items: [JWPlayerKit.JWPlayerItem], withMethod method: JWPlayerKit.JWRelatedInteraction) {
-        
+
     }
-    
+
     func playerViewController(_ controller: JWPlayerKit.JWPlayerViewController, relatedItemBeganPlaying item: JWPlayerKit.JWPlayerItem, atIndex index: Int, withMethod method: JWPlayerKit.JWRelatedMethod) {
-        
+
     }
 
     // MARK: Time events
 
-    func onAdTimeEvent(time:JWTimeData) {
+    override func onAdTimeEvent(_ time:JWTimeData) {
         super.onAdTimeEvent(time)
         parentView?.onAdTime?(["position": time.position, "duration": time.duration])
     }
 
-    func onMediaTimeEvent(time:JWTimeData) {
+    override func onMediaTimeEvent(_ time:JWTimeData) {
         super.onMediaTimeEvent(time)
         parentView?.onTime?(["position": time.position, "duration": time.duration])
     }
@@ -191,7 +194,7 @@ class RNJWPlayerViewController : JWPlayerViewController, JWPlayerViewControllerD
         guard let fairplayCertUrlString = parentView?.fairplayCertUrl, let fairplayCertUrl = URL(string: fairplayCertUrlString) else {
             return
         }
-        
+
         let request = URLRequest(url: fairplayCertUrl)
         let task = URLSession.shared.dataTask(with: request) { (data, response, error) in
             if let error = error {
@@ -201,7 +204,7 @@ class RNJWPlayerViewController : JWPlayerViewController, JWPlayerViewControllerD
         }
         task.resume()
     }
-    
+
     func contentKeyWithSPCData(_ spcData: Data, completionHandler handler: @escaping (Data?, Date?, String?) -> Void) {
         if parentView?.processSpcUrl == nil {
             return
@@ -212,21 +215,21 @@ class RNJWPlayerViewController : JWPlayerViewController, JWPlayerViewControllerD
             ckcRequest.httpMethod = "POST"
             ckcRequest.httpBody = spcData
             ckcRequest.addValue("application/octet-stream", forHTTPHeaderField: "Content-Type")
-            
+
             URLSession.shared.dataTask(with: ckcRequest as URLRequest) { (data, response, error) in
                 if let httpResponse = response as? HTTPURLResponse, (error != nil || httpResponse.statusCode != 200) {
                     NSLog("DRM ckc request error - %@", error.debugDescription)
                     handler(nil, nil, nil)
                     return
                 }
-                
+
                 handler(data, nil, "application/octet-stream")
             }.resume()
         }
     }
 
     // MARK: - AV Picture In Picture Delegate
-    
+
     override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
         super.observeValue(forKeyPath: keyPath, of: object, change: change, context: context)
 //        if (keyPath == "playbackLikelyToKeepUp") {
@@ -277,7 +280,7 @@ class RNJWPlayerViewController : JWPlayerViewController, JWPlayerViewControllerD
 
     override func jwplayer(_ player:JWPlayer, didFinishLoadingWithTime loadTime:TimeInterval) {
         super.jwplayer(player, didFinishLoadingWithTime:loadTime)
-        parentView?.onLoaded?([:])
+        parentView?.onLoaded?(["loadTime":loadTime])
     }
 
     override func jwplayer(_ player:JWPlayer, isAttemptingToPlay playlistItem:JWPlayerItem, reason:JWPlayReason) {
@@ -287,7 +290,7 @@ class RNJWPlayerViewController : JWPlayerViewController, JWPlayerViewControllerD
 
     override func jwplayer(_ player:JWPlayer, isPlayingWithReason reason:JWPlayReason) {
         super.jwplayer(player, isPlayingWithReason:reason)
-        
+
         parentView?.onPlay?([:])
 
         parentView?.userPaused = false
@@ -332,7 +335,7 @@ class RNJWPlayerViewController : JWPlayerViewController, JWPlayerViewControllerD
 
     override func jwplayer(_ player:JWPlayer, didLoadPlaylistItem item:JWPlayerItem, at index:UInt) {
         super.jwplayer(player, didLoadPlaylistItem: item, at: index)
-        
+
 //        var sourceDict: [String: Any] = [:]
 //        var file: String?
 //
@@ -393,7 +396,7 @@ class RNJWPlayerViewController : JWPlayerViewController, JWPlayerViewControllerD
 
     override func jwplayer(_ player:JWPlayer, didLoadPlaylist playlist:[JWPlayerItem]) {
         super.jwplayer(player, didLoadPlaylist: playlist)
-        
+
         let playlistArray:NSMutableArray! = NSMutableArray()
 
         for item:JWPlayerItem? in playlist {
@@ -492,7 +495,7 @@ class RNJWPlayerViewController : JWPlayerViewController, JWPlayerViewControllerD
     }
 
     // MARK: - JWPlayer Cast Delegate
-
+#if USE_GOOGLE_CAST
     override func castController(_ controller:JWCastController, castingBeganWithDevice device:JWCastingDevice) {
         super.castController(controller, castingBeganWithDevice:device)
         parentView?.onCasting?([:])
@@ -538,7 +541,7 @@ class RNJWPlayerViewController : JWPlayerViewController, JWPlayerViewControllerD
         super.castController(controller, connectionSuspendedWithDevice:device)
         parentView?.onConnectionTemporarilySuspended?([:])
     }
-    
+
     override func castController(_ controller: JWCastController, devicesAvailable devices:[JWCastingDevice]) {
         super.castController(controller, devicesAvailable:devices)
         parentView?.availableDevices = devices
@@ -566,6 +569,7 @@ class RNJWPlayerViewController : JWPlayerViewController, JWPlayerViewControllerD
         super.castController(controller, disconnectedWithError:error)
         parentView?.onDisconnectedFromCastingDevice?(["error": error as Any])
     }
+#endif
 
     // MARK: - JWPlayer AV Delegate
 
@@ -597,12 +601,12 @@ class RNJWPlayerViewController : JWPlayerViewController, JWPlayerViewControllerD
     override func jwplayer(_ player:JWPlayer, updatedCaptionList options:[JWMediaSelectionOption]) {
         super.jwplayer(player, updatedCaptionList:options)
     }
-    
+
     override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
         super.viewWillTransition(to: size, with: coordinator)
         coordinator.animate(alongsideTransition: { _ in
             let orientation = UIDevice.current.orientation
-            switch orientation {             
+            switch orientation {
             case .portrait, .portraitUpsideDown:
                 if self.parentView?.currentConfig["exitFullScreenOnPortrait"] as? Bool ?? false {
                     super.dismissFullScreen(animated: true)
@@ -612,5 +616,5 @@ class RNJWPlayerViewController : JWPlayerViewController, JWPlayerViewControllerD
             }
         })
     }
-    
+
 }

package/ios/RNJWPlayer/RNJWPlayerViewManager.m

@@ -93,6 +93,8 @@ RCT_EXTERN_METHOD(setVolume: (nonnull NSNumber *)reactTag :(nonnull NSNumber *)v
 
 RCT_EXTERN_METHOD(togglePIP: (nonnull NSNumber *)reactTag)
 
+#if USE_GOOGLE_CAST
+
 RCT_EXTERN_METHOD(setUpCastController: (nonnull NSNumber *)reactTag)
 
 RCT_EXTERN_METHOD(presentCastDialog: (nonnull NSNumber *)reactTag)
@@ -103,6 +105,8 @@ RCT_EXTERN_METHOD(availableDevices: (nonnull NSNumber *)reactTag: (RCTPromiseRes
 
 RCT_EXTERN_METHOD(castState: (nonnull NSNumber *)reactTag :(RCTPromiseResolveBlock)resolve :(RCTPromiseRejectBlock)reject)
 
+#endif
+
 RCT_EXTERN_METHOD(getAudioTracks: (nonnull NSNumber *)reactTag: (RCTPromiseResolveBlock)resolve: (RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(getCurrentAudioTrack: (nonnull NSNumber *)reactTag :(RCTPromiseResolveBlock)resolve :(RCTPromiseRejectBlock)reject)

package/ios/RNJWPlayer/RNJWPlayerViewManager.swift

@@ -172,7 +172,7 @@ class RNJWPlayerViewManager: RCTViewManager {
         }
     }
     
-    @objc func setVolume(_ reactTag: NSNumber, _ volume: Double) {
+    @objc func setVolume(_ reactTag: NSNumber, _ volume: NSNumber) {
         self.bridge.uiManager.addUIBlock { uiManager, viewRegistry in
             guard let view = viewRegistry?[reactTag] as? RNJWPlayerView else {
                 print("Invalid view returned from registry, expecting RNJWPlayerView, got: \(String(describing: viewRegistry?[reactTag]))")
@@ -180,9 +180,9 @@ class RNJWPlayerViewManager: RCTViewManager {
             }
 
             if let playerView = view.playerView {
-                playerView.player.volume = volume
+                playerView.player.volume = volume.doubleValue
             } else if let playerViewController = view.playerViewController {
-                playerViewController.player.volume = volume
+                playerViewController.player.volume = volume.doubleValue
             }
         }
     }
@@ -205,6 +205,7 @@ class RNJWPlayerViewManager: RCTViewManager {
         }
     }
 
+#if USE_GOOGLE_CAST
     @objc func setUpCastController(_ reactTag: NSNumber) {
         self.bridge.uiManager.addUIBlock { uiManager, viewRegistry in
             guard let view = viewRegistry?[reactTag] as? RNJWPlayerView else {
@@ -295,6 +296,7 @@ class RNJWPlayerViewManager: RCTViewManager {
             resolve(view.castState)
         }
     }
+#endif
 
     @objc func getAudioTracks(_ reactTag: NSNumber, _ resolve: @escaping RCTPromiseResolveBlock, _ reject: @escaping RCTPromiseRejectBlock) {
         self.bridge.uiManager.addUIBlock { uiManager, viewRegistry in

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jwplayer/jwplayer-react-native",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "React-native Android/iOS plugin for JWPlayer SDK (https://www.jwplayer.com/)",
   "main": "index.js",
   "types": "./index.d.ts",
@@ -35,11 +35,11 @@
   "license": "MIT",
   "homepage": "https://github.com/jwplayer/jwplayer-react-native#readme",
   "devDependencies": {
-    "lodash": ">= 4.17.21",
+    "badge-maker": "^3.3.1",
     "react": ">= 18.2.0",
     "react-native": ">= 0.72.5"
   },
   "dependencies": {
-    "badge-maker": "^3.3.1"
+    "lodash.isequalwith": "^4.4.0"
   }
 }

package/android/.gradle/config.properties

@@ -1,2 +0,0 @@
-#Fri Apr 19 10:10:39 PDT 2024
-java.home=/Applications/Android Studio.app/Contents/jbr/Contents/Home

package/android/.idea/gradle.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
-        <option name="resolveExternalAnnotations" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

package/android/.idea/migrations.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectMigrations">
-    <option name="MigrateToGradleLocalJavaHome">
-      <set>
-        <option value="$PROJECT_DIR$" />
-      </set>
-    </option>
-  </component>
-</project>

package/android/.idea/misc.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>

package/android/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>

package/android/.idea/workspace.xml

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="NONE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="daffcf00-d6d8-483c-a28f-ba2d6899d4c5" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/../Example/app/jsx/screens/DRMExample.js" beforeDir="false" afterPath="$PROJECT_DIR$/../Example/app/jsx/screens/DRMExample.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Example/ios/Podfile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/../Example/ios/Podfile.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Example/yarn.lock" beforeDir="false" afterPath="$PROJECT_DIR$/../Example/yarn.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../ios/RNJWPlayer/RNJWPlayerView.swift" beforeDir="false" afterPath="$PROJECT_DIR$/../ios/RNJWPlayer/RNJWPlayerView.swift" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="ClangdSettings">
-    <option name="formatViaClangd" value="false" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
-  </component>
-  <component name="ProjectColorInfo"><![CDATA[{
-  "associatedIndex": 5
-}]]></component>
-  <component name="ProjectId" id="2fKP8rLRDpFiPXLGLH4cN1RyMXV" />
-  <component name="ProjectViewState">
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.cidr.known.project.marker": "true",
-    "android.gradle.sync.needed": "true",
-    "cf.first.check.clang-format": "false",
-    "cidr.known.project.marker": "true",
-    "git-widget-placeholder": "release/react-1.0.0",
-    "last_opened_file_path": "/Users/jmilham/source/repos/SDK/react/jwplayer-react-native/android"
-  }
-}]]></component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="daffcf00-d6d8-483c-a28f-ba2d6899d4c5" name="Changes" comment="" />
-      <created>1713546640047</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1713546640047</updated>
-    </task>
-    <servers />
-  </component>
-</project>

package/android/local.properties

@@ -1,8 +0,0 @@
-## This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# Location of the SDK. This is only used by Gradle.
-# For customization when using a Version Control System, please read the
-# header note.
-#Fri Apr 19 10:10:39 PDT 2024
-sdk.dir=/Users/jmilham/Library/Android/sdk