react-native-tpstreams 1.0.0 → 1.0.2

package/TPStreamsRNPlayerView.podspec

@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
       'DEFINES_MODULE' => 'YES',
       'CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES' => 'YES'
     }
-  s.dependency "TPStreamsSDK"
+  s.dependency "TPStreamsSDK" , "1.2.8"
 
   
   # Ensure the module is not built as a framework to avoid bridging header conflicts

package/ios/TPStreamsDownloadModule.swift

@@ -11,15 +11,26 @@ private enum PlayerConstants {
     static let statusUnknown = "Unknown"
 }
 
+protocol TokenRequestDelegate: AnyObject {
+    func requestToken(for assetId: String, completion: @escaping (String?) -> Void)
+}
+
 @objc(TPStreamsDownload)
 class TPStreamsDownloadModule: RCTEventEmitter, TPStreamsDownloadDelegate {
     
     private let downloadManager = TPStreamsDownloadManager.shared
     private var isListening = false
+    private var tokenDelegate: TokenRequestDelegate?
+    static var shared: TPStreamsDownloadModule?
     
     override init() {
         super.init()
         downloadManager.setTPStreamsDownloadDelegate(tpStreamsDownloadDelegate: self)
+        TPStreamsDownloadModule.shared = self
+    }
+
+    func setAccessTokenDelegate(_ delegate: TokenRequestDelegate) {
+        self.tokenDelegate = delegate
     }
     
     @objc
@@ -86,6 +97,14 @@ class TPStreamsDownloadModule: RCTEventEmitter, TPStreamsDownloadDelegate {
             notifyDownloadsChange()
         }
     }
+
+    func onRequestNewAccessToken(assetId: String, completion: @escaping (String?) -> Void) {
+         if let delegate = tokenDelegate {
+            delegate.requestToken(for: assetId, completion: completion)
+        } else {
+            completion(nil)
+        }
+    }
     
     private func notifyDownloadsChange() {
         DispatchQueue.main.async { [weak self] in
@@ -104,11 +123,12 @@ class TPStreamsDownloadModule: RCTEventEmitter, TPStreamsDownloadDelegate {
         var item: [String: Any] = [:]
         item["videoId"] = asset.assetId
         item["title"] = asset.title
+        item["thumbnailUrl"] = asset.thumbnailURL
         item["totalBytes"] = asset.size
         item["downloadedBytes"] = calculateDownloadedBytes(size: asset.size, progress: asset.percentageCompleted)
         item["progressPercentage"] = asset.percentageCompleted
         item["state"] = mapDownloadStatus(Status(rawValue: asset.status))
-        item["metadata"] = "{}"
+        item["metadata"] = asset.metadata ?? "{}"
         
         return item
     }

package/ios/TPStreamsModule.swift

@@ -13,10 +13,15 @@ class TPStreamsModule: NSObject {
        DispatchQueue.main.async {
         TPStreamsSDK.initialize(withOrgCode: organizationId as String)
         self.isInitialized = true
+        self.initializeDownloadModule()
        }
      }
    }
 
+   private func initializeDownloadModule() {
+     let _ = TPStreamsDownloadModule()
+   }
+
    @objc
    static func requiresMainQueueSetup() -> Bool {
      return true

package/ios/TPStreamsRNPlayerView.swift

@@ -31,6 +31,8 @@ class TPStreamsRNPlayerView: UIView {
     @objc var onIsLoadingChanged: RCTDirectEventBlock?
     @objc var onError: RCTDirectEventBlock?
     @objc var onAccessTokenExpired: RCTDirectEventBlock?
+
+    private var pendingTokenCompletion: ((String?) -> Void)?
     
     override init(frame: CGRect) {
         super.init(frame: frame)
@@ -73,7 +75,7 @@ class TPStreamsRNPlayerView: UIView {
             setupScheduled = false
             return
         }
-
+        setupTokenDelegate()
         configurePlayerView()
         observePlayerChanges()
         setupScheduled = false
@@ -81,14 +83,19 @@ class TPStreamsRNPlayerView: UIView {
     
     private func cleanupPlayer() {
         removeObservers()
+        player?.pause()
+        
         playerViewController?.view.removeFromSuperview()
         playerViewController?.removeFromParent()
         playerViewController = nil
+        
+        player?.replaceCurrentItem(with: nil)
         player = nil
     }
     
     private func removeObservers() {
         playerStatusObserver?.invalidate()
+        playerStatusObserver = nil
     }
     
     private func createOfflinePlayer() -> TPAVPlayer? {
@@ -131,11 +138,13 @@ class TPStreamsRNPlayerView: UIView {
     }
     
     private func createPlayerConfigBuilder() -> TPStreamPlayerConfigurationBuilder {
+        let metadataDict = parseMetadataJSON(from: downloadMetadata)
         let configBuilder = TPStreamPlayerConfigurationBuilder()
             .setPreferredForwardDuration(15)
             .setPreferredRewindDuration(5)
             .setprogressBarThumbColor(.systemBlue)
             .setwatchedProgressTrackColor(.systemBlue)
+            .setDownloadMetadata(metadataDict)
         
         if enableDownload {
             configBuilder.showDownloadOption()
@@ -170,6 +179,24 @@ class TPStreamsRNPlayerView: UIView {
             self.playerStatusObserver = nil
         }
     }
+
+    private func setupTokenDelegate() {
+        TPStreamsDownloadModule.shared?.setAccessTokenDelegate(self)
+    }
+
+    private func parseMetadataJSON(from jsonString: NSString?) -> [String: String]? {
+        guard let metadataString = jsonString as String? else { return nil }
+        
+        guard let data = metadataString.data(using: .utf8) else { return nil }
+        do {
+            if let json = try JSONSerialization.jsonObject(with: data, options: []) as? [String: String] {
+                return json
+            }
+        } catch {
+            print("Error parsing metadata JSON: \(error)")
+        }
+        return nil
+    }
     
     @objc func seekTo(position: Double) {
         guard position >= 0, let player = player else { return }
@@ -214,11 +241,29 @@ class TPStreamsRNPlayerView: UIView {
     }
 
     @objc func setNewAccessToken(_ newToken: String) {
-        print("New access token set: \(newToken)")
-        // TODO: Reinitialize player with new token if needed
+        pendingTokenCompletion?(newToken)
+        pendingTokenCompletion = nil
+    }
+
+    override func willMove(toSuperview newSuperview: UIView?) {
+        if newSuperview == nil {
+            cleanupPlayer()
+        }
+        super.willMove(toSuperview: newSuperview)
     }
     
     deinit {
-        removeObservers()
+        cleanupPlayer()
+    }
+}
+
+extension TPStreamsRNPlayerView: TokenRequestDelegate {
+    func requestToken(for assetId: String, completion: @escaping (String?) -> Void) {
+        guard let onAccessTokenExpired = onAccessTokenExpired else {
+            completion(nil)
+            return
+        }
+        pendingTokenCompletion = completion
+        onAccessTokenExpired(["videoId": assetId])
     }
 }

package/ios/TPStreamsRNPlayerViewManager.m

@@ -34,5 +34,6 @@ RCT_EXTERN_METHOD(getCurrentPosition:(nonnull NSNumber *)node)
 RCT_EXTERN_METHOD(getDuration:(nonnull NSNumber *)node)
 RCT_EXTERN_METHOD(isPlaying:(nonnull NSNumber *)node)
 RCT_EXTERN_METHOD(getPlaybackSpeed:(nonnull NSNumber *)node)
+RCT_EXTERN_METHOD(setNewAccessToken:(nonnull NSNumber *)node newToken:(nonnull NSString *)newToken)
 
 @end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tpstreams",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Video component for TPStreams",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",