@takeoffmedia/react-native-penthera 0.1.8 → 0.1.10

package/ios/Penthera.swift

@@ -3,19 +3,19 @@ import VirtuosoClientDownloadEngine
 @objc(Penthera)
 class Penthera: RCTEventEmitter, VirtuosoDownloadEngineNotificationsDelegate {
     var downloadEngineNotifications: VirtuosoDownloadEngineNotificationManager!
-    
+
     public override init() {
         super.init()
         EventEmitter.sharedInstance.registerEventEmitter(eventEmitter: self)
     }
-    
+
     var statusDownload: StatusDownload = StatusDownload()
-    
+
     @objc(multiply:withB:withResolver:withRejecter:)
     func multiply(a: Float, b: Float, resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) -> Void {
         resolve(a*b)
     }
-    
+
     @objc(initializeSdk:withBackplaneUrl:withPublicKey:withPrivateKey:withResolver:withRejecter:)
     func initializeSdk(user: String, backplaneUrl: String, publicKey: String, privateKey: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
         guard let engineConfig = VirtuosoEngineConfig(
@@ -56,13 +56,13 @@ class Penthera: RCTEventEmitter, VirtuosoDownloadEngineNotificationsDelegate {
             }
         }
     }
-    
+
     @objc(getDownloads:withResolver:withRejecter:)
     func getDownloads(blank: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
         let completedAssets = VirtuosoAsset.completedAssets(withAvailabilityFilter: false)
         let pendingAssets = VirtuosoAsset.pendingAssets(withAvailabilityFilter: false)
         var offlineCatalogs: [OfflineCatalog] = []
-        
+
         for case let va as VirtuosoAsset in completedAssets {
             let thumbnail = va.findAllAncillaries(withTag: "thumbnail").first
             let show = va.findAllAncillaries(withTag: "show").first
@@ -70,7 +70,7 @@ class Penthera: RCTEventEmitter, VirtuosoDownloadEngineNotificationsDelegate {
                 thumbnail: thumbnail?.fileDownloadURL ?? "",
                 show: show?.fileDownloadURL ?? ""
             )
-            
+
             let dataItem = DataItem(
                 title: va.userInfo?["title"] as? String,
                 seasonId: va.userInfo?["seasonId"] as? String,
@@ -88,17 +88,17 @@ class Penthera: RCTEventEmitter, VirtuosoDownloadEngineNotificationsDelegate {
                 isPaused: va.isPaused)
             offlineCatalogs.append(catalog)
         }
-        
-        for case let va as VirtuosoAsset in pendingAssets {
-            let catalog = OfflineCatalog(
-                id: va.assetID,
-                data: DataItem(),
-                isCompleted: false,
-                isPaused: va.isPaused
-            )
-            offlineCatalogs.append(catalog)
-        }
-        
+
+        // for case let va as VirtuosoAsset in pendingAssets {
+        //     let catalog = OfflineCatalog(
+        //         id: va.assetID,
+        //         data: DataItem(),
+        //         isCompleted: false,
+        //         isPaused: va.isPaused
+        //     )
+        //     offlineCatalogs.append(catalog)
+        // }
+
         let decoder = JSONEncoder()
         do {
             let data = try decoder.encode(offlineCatalogs)
@@ -109,7 +109,7 @@ class Penthera: RCTEventEmitter, VirtuosoDownloadEngineNotificationsDelegate {
         }
         //resolve(downloadComplete.map{ ($0 as? VirtuosoAsset)?.assetID })
     }
-    
+
     func getDownloadedAsset(assetID: String) -> VirtuosoAsset? {
         // assets that have finished downloading
         let completedAssets = VirtuosoAsset.completedAssets(withAvailabilityFilter: false)
@@ -118,32 +118,32 @@ class Penthera: RCTEventEmitter, VirtuosoDownloadEngineNotificationsDelegate {
         }
         return asset
     }
-    
+
     public func downloadEngineDidStartDownloadingAsset(_ asset: VirtuosoAsset) {
         EventEmitter.sharedInstance.dispatch(name: "penthera", code: PentheraEvent.DID_START_DOWNLOADING, assetId: asset.assetID, body: "")
     }
-    
+
     public func downloadEngineProgressUpdated(for asset: VirtuosoAsset) {
-        
+
         let thumbnail = asset.findAllAncillaries(withTag: "thumbnail").first
         let show = asset.findAllAncillaries(withTag: "show").first
         let thumbnails = Thumbnails(
             thumbnail: thumbnail?.fileDownloadURL ?? "",
             show: show?.fileDownloadURL ?? ""
         )
-        
+
         let dataParse = StatusDownload(
             id: asset.assetID,
-            title: (asset.userInfo?["title"] as? String)!,
+            title: asset.userInfo?["title"] as? String ?? "",
             dataOffers: parseDataOffer(offer: asset.userInfo?["dataOffers"] as Any),
             thumbnails: thumbnails,
             duration: asset.duration,
             estimatedSize: Int(asset.estimatedSize),
             progress: Int(asset.fractionComplete*100),
-            isCompleted: asset.isPlayable,
+            isCompleted: false,
             isPaused: asset.isPaused
         )
-        
+
         let decoder = JSONEncoder()
         do {
             let data = try decoder.encode(dataParse)
@@ -152,33 +152,33 @@ class Penthera: RCTEventEmitter, VirtuosoDownloadEngineNotificationsDelegate {
             if(percentage.isFinite) {
                 EventEmitter.sharedInstance.dispatch(name: "penthera", code: PentheraEvent.PROGRESS_UPDATED, assetId: asset.assetID, body: json)
             }
-            
+
         } catch {
             print("Error converting to JSON: \(error)")
         }
-        
-        
+
+
     }
-    
+
     public func downloadEngineProgressUpdatedProcessing(for asset: VirtuosoAsset) {
-        
+
     }
-    
+
     public func downloadEngineDidFinishDownloadingAsset(_ asset: VirtuosoAsset) {
         EventEmitter.sharedInstance.dispatch(name: "penthera", code: PentheraEvent.DOWNLOAD_COMPLETE, assetId: asset.assetID, body: "")
     }
-    
+
     public func downloadEngineDidEncounterError(for asset: VirtuosoAsset, error: Error?, task: URLSessionTask?, data: Data?, statusCode: NSNumber?) {
         asset.delete()
         EventEmitter.sharedInstance.dispatch(name: "penthera", code: PentheraEvent.ERROR_DOWNLOAD, assetId: asset.assetID, body: error.debugDescription ?? "Error downloading")
         /*EventEmitter.sharedInstance.dispatch(name: "penthera", body: "\(asset.assetID): Engine did encounter error \(error?.localizedDescription ?? "-")")*/
     }
-    
+
     public func downloadEngineInternalQueueUpdate(asset: VirtuosoAsset) {
         //EventEmitter.sharedInstance.dispatch(name: "penthera", code: "TEST downloadEngineInternalQueueUpdate", body: "Queue updated", assetId: asset.assetID)
         EventEmitter.sharedInstance.dispatch(name: "penthera", code: "TEST downloadEngineInternalQueueUpdate", assetId: asset.assetID, body: "Queue updated")
     }
-    
+
     public func downloadEngineStartupComplete(_ succeeded: Bool, asset: VirtuosoAsset) {
         //EventEmitter.sharedInstance.dispatch(name: "penthera", code: "Test downloadEngineStartupComplete", body: "SDK startup complete", assetId: asset.assetID)
         EventEmitter.sharedInstance.dispatch(name: "penthera", code: "TEST downloadEngineStartupComplete", assetId: asset.assetID, body: "SDK startup complete")
@@ -203,19 +203,19 @@ class Penthera: RCTEventEmitter, VirtuosoDownloadEngineNotificationsDelegate {
         }
         return ancillaryFiles
     }
-    
+
     @objc(download:withResolver:withRejecter:)
     func download(catalogString: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
         let virtuoso = VirtuosoDownloadEngine.instance()
         var queue = virtuoso.assetsInQueue()
-        
+
         //let decoder = JSONDecoder()
-        
+
         do {
-            
-            
+
+
             let data = catalogString.getDictionary()
-            
+
             guard let item = data!["item"] as! [String: AnyObject]? else {
                 reject("No item", nil, nil)
                 return
@@ -224,20 +224,20 @@ class Penthera: RCTEventEmitter, VirtuosoDownloadEngineNotificationsDelegate {
                 reject("No url", nil, nil)
                 return
             }
-            
+
             let assetID = item["id"] as! String? ?? ""
             let hasDRM = item["drm"] as! Bool? ?? false
             let title = item["title"] as! String? ?? ""
-            
+
             let downloadAsset = getDownloadedAsset(assetID: assetID)
             let pendingAsset = getPendingAsset(assetID: assetID)
-            
+
             if (pendingAsset != nil) {
                 EventEmitter.sharedInstance.dispatch(name: "penthera", code: PentheraEvent.PENDING_ASSET_FOUND, assetId: assetID, body: "")
                 pendingAsset?.delete()
                 return
             }
-            
+
             if(downloadAsset == nil && pendingAsset == nil) {
                 DispatchQueue.global(qos: .background).async {
                     guard let config = VirtuosoAssetConfig(url: url,
@@ -251,69 +251,69 @@ class Penthera: RCTEventEmitter, VirtuosoDownloadEngineNotificationsDelegate {
                     let thumbnails = item["thumbnails"] as! [String: AnyObject]? ?? [:]
                     let subtitles = item["subtitles"] as! [String: AnyObject]? ?? [:]
                     config.ancillaries = self.getAncillaryFiles(files: thumbnails) + self.getAncillaryFiles(files: subtitles)
-                    
-                    
+
+
                     //DRM
                     if(hasDRM) {
-                        
+
                         guard let drm = data!["drm"] as! [String: AnyObject]? else {
                             reject("No drm", nil, nil)
                             return
                         }
-                        
+
                         let token = drm["token"] as! String? ?? ""
                         let licenceHttpHeader = drm["licence_server_http_header"] as! String? ?? ""
                         let licence = drm["licence_server"] as! String? ?? ""
                         let cert = drm["fairplay_cert"] as! String? ?? ""
-                        
+
                         guard let drmSetup = FairPlayDrmSetup(assetID: assetID, certificateUrl: cert, licenceUrl: licence, header: licenceHttpHeader, token: token) else {
                             EventEmitter.sharedInstance.dispatch(name: "penthera", code: PentheraEvent.FAIR_PLAY_LICENSE_DELEGATE_ERROR, assetId: "", body: "")
                             return
                         }
-                        
+
                         if !drmSetup.configure() {
                             EventEmitter.sharedInstance.dispatch(name: "penthera", code: PentheraEvent.FAIR_PLAY_LICENSE_DELEGATE_ERROR, assetId: "", body: "")
                             return
                         }
                         config.protectionType = .vde_AssetProtectionTypeFairPlay
-                        
+
                     }
-                    
+
                     let asset = VirtuosoAsset.init(config: config)
-                    
+
                     let data = item["data"] as! [String: AnyObject]? ?? [:]
-                    
+
                     asset?.userInfo = data
-                    
+
                     config.ancillaries?.forEach{ file in
                         asset?.add(file)
                     }
-                    
-                    
+
+
                     //asset?.add(subtitle!)
-                    
+
                     //let calendar = Calendar.current
                     //guard let expiryDate = calendar.date(byAdding: .minute, value: 1, to: Date()) else {
                     //    return
                     //}
-                    
+
                     //asset?.expiryAfterDownload = expiryDate.timeIntervalSinceNow
-                    
+
                     queue.append(asset!)
                     resolve(assetID)
                     //resolve(queue.count)
                 }
             }
-            
+
         } catch {
             reject("penthera", error.localizedDescription, error)
         }
     }
-    
+
     @objc(delete:withResolver:withRejecter:)
     func delete(assetID: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
         //DispatchQueue.global(qos: .background).async {
-        
+
         let downloadComplete = VirtuosoAsset.completedAssets(withAvailabilityFilter: false)
         if(downloadComplete.count > 0) {
             for case let va as VirtuosoAsset in downloadComplete {
@@ -328,14 +328,14 @@ class Penthera: RCTEventEmitter, VirtuosoDownloadEngineNotificationsDelegate {
             EventEmitter.sharedInstance.dispatch(name: "penthera", code: PentheraEvent.ASSET_DELETED, assetId: assetID, body: "")
         }
     }
-    
-    
-    
+
+
+
     @objc(deleteMany:withResolver:withRejecter:)
     func deleteMany(assetIDS: [String], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
         // initialize assetResponse {}. Ex {"123":false, "543":false}
         var assetsResponse: [String: Bool] = Dictionary(uniqueKeysWithValues: assetIDS.map { ($0, false) })
-        
+
         let downloadComplete = VirtuosoAsset.completedAssets(withAvailabilityFilter: false)
         if(downloadComplete.count > 0) {
             var assetsToDelete: [VirtuosoAsset] = []
@@ -348,8 +348,8 @@ class Penthera: RCTEventEmitter, VirtuosoDownloadEngineNotificationsDelegate {
                     }
                 }
             }
-            
-            
+
+
             VirtuosoAsset.delete(assetsToDelete) { () in
                 resolve(assetsResponse)
             }
@@ -361,85 +361,85 @@ class Penthera: RCTEventEmitter, VirtuosoDownloadEngineNotificationsDelegate {
             reject("ASSET_DELETE_ERROR", errorMessage, error)
         }
     }
-    
-    
-    
+
+
+
     @objc open override func supportedEvents() -> [String] {
         return EventEmitter.sharedInstance.allEvents
     }
-    
+
     @objc(playAsset:withResolver:withRejecter:)
     func playAsset(assetID: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-        
+
         let downloadComplete = VirtuosoAsset.completedAssets(withAvailabilityFilter: false)
         guard let asset = downloadComplete.filter({ ($0 as! VirtuosoAsset).assetID == assetID }).first as? VirtuosoAsset else {
             reject("Error streaming asset", "", nil)
             return
         }
-        
+
         let decoder = JSONEncoder()
-        
+
         do {
-            
-            
+
+
             // let subtitle = vcHttpServer?.ancillaryURLForAncillary(withTag: "subtitle", usingMime: "text/vtt")
             // let thumbnailOffline = asset.findAllAncillaries(withTag: "thumbnailOffline").first
             //let wallpaper = asset.findAllAncillaries(withTag: "wallpaper").first
-            
+
             let vcHttpServer = VirtuosoClientHTTPServer(asset: asset)
-            
+
             let licenseURL = vcHttpServer?.fairPlayLicenseServerURL
             let certificateURL = vcHttpServer?.fairPlayCertificateDataURL(forSubType: nil)
-            
+
             //let avContentKeySession = VirtuosoLicenseManager.registeredAVContentKeySession()
-            
+
             //let userInfoData = try encoder.encode(asset.userInfo)
             //let userInfo = String(data: userInfoData, encoding: .utf8)
-            
+
             let assetData = [
                 "id": asset.assetID,
                 "url": vcHttpServer?.playbackURL ?? "",
                 "certificate": certificateURL ,
                 "license": licenseURL
             ]
-            
+
             let data = try decoder.encode(assetData)
             let json = String(data: data, encoding: .utf8)!
             resolve(json)
-            
+
             // let config = PlayerConfig()
             // config.styleConfig.userInterfaceType = .system
             // config.key = "ASSSSSS"
-            
+
             // let player = PlayerFactory.create(playerConfig: config)
-            
+
             // guard let streamUrl = URL(string: vcHttpServer!.playbackURL) else {
             //     return
             // }
-            
+
             // // Create a SourceConfig
             // let sourceConfig = SourceConfig(url: streamUrl, type: .hls)
             // print(streamUrl.absoluteString)
-            
+
             // // Optionally set additional properties
             // sourceConfig.title = "Art of motion"
-            
+
             // DispatchQueue.main.async {
             //     let source = SourceFactory.create(from: sourceConfig)
-            
+
             //     player.load(source: source)
-            
-            
+
+
             //     let viewController = UIApplication.shared.windows.first?.rootViewController as? UIViewController
-            
+
             //     let playerView = PlayerView(player: player, frame: (viewController?.view.bounds)!)
-            
+
             //     // Adding the view to the a container View
             //     viewController?.view.addSubview(playerView)
             //     viewController?.view.bringSubviewToFront(playerView)
             // }
-            
-            
+
+
             /*
              let demoPlayer = DemoPlayerViewController()
              DispatchQueue.main.async {
@@ -447,7 +447,7 @@ class Penthera: RCTEventEmitter, VirtuosoDownloadEngineNotificationsDelegate {
              andPlayer: demoPlayer as VirtuosoPlayer,
              onSuccess: {
              // Present the player
-             
+
              let viewController = UIApplication.shared.windows.first?.rootViewController as? UIViewController
              viewController?.present(demoPlayer, animated: true)
              //self.present(demoPlayer, animated: true, completion: nil)
@@ -456,13 +456,13 @@ class Penthera: RCTEventEmitter, VirtuosoDownloadEngineNotificationsDelegate {
              //self.error = nil
              })
              }*/
-            
+
         } catch {
             reject("penthere", error.localizedDescription, error)
         }
     }
-    
-    
+
+
     @objc(pauseDownload:withResolver:withRejecter:)
     func pauseDownload(assetID: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
         let pendingAsset = getPendingAsset(assetID: assetID)
@@ -470,13 +470,13 @@ class Penthera: RCTEventEmitter, VirtuosoDownloadEngineNotificationsDelegate {
             self.pauseAsset(asset: pendingAsset!)
             return
         }
-        
+
     }
-    
+
     func pauseAsset(asset: VirtuosoAsset) {
         asset.isPaused = !asset.isPaused
         EventEmitter.sharedInstance.dispatch(name: "penthera", code: PentheraEvent.ASSET_RESUME_DOWNLOAD_UPDATED, assetId: asset.assetID, body: "\(asset.isPaused)")
     }
-    
-    
+
+
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeoffmedia/react-native-penthera",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "test",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -163,4 +163,4 @@
       ]
     ]
   }
-}
+}