@takeoffmedia/react-native-penthera 0.2.17 → 0.2.18

package/ios/Catalog.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 struct Catalog: Codable {
     var id: String = ""
     var url: String = ""
@@ -98,3 +100,44 @@ struct Event: Codable {
     var assetId: String = ""
     var body: String = ""
 }
+
+struct DataInfo: Codable {
+    var id: String = ""
+    var title: String = ""
+    var episodeNumber: Int = 0
+    var duration: Int = 0
+    var seasonId: String = ""
+    var seasonTitle: String = ""
+    var dataOffers: [DataOffer] = []
+
+    struct DataOffer: Codable {
+        var bold: Bool = false
+        var label: String = ""
+    }
+}
+
+struct Subtitle: Codable {
+    var label: String = ""
+    var language: String = ""
+    var href: String? = ""
+    var url: String? = ""
+}
+
+
+struct DownloadItem: Codable {
+    let id: String
+    let title: String
+    let drm: Bool?
+    let path: String?
+    let thumbnails: Thumbnails?
+    let data: String?
+    let subtitles: String
+}
+
+struct AssetData: Codable {
+    let id: String
+    let url: String
+    let certificate: String?
+    let license: String?
+    let subtitles: [Subtitle]?
+}

package/ios/Penthera.swift

@@ -197,12 +197,10 @@ class Penthera: RCTEventEmitter, VirtuosoDownloadEngineNotificationsDelegate {
         }
         return asset
     }
-    func getAncillaryFiles(files: [String: AnyObject]) -> [VirtuosoAncillaryFile] {
+    func getAncillaryFiles(files: [String: String]) -> [VirtuosoAncillaryFile] {
         var ancillaryFiles: [VirtuosoAncillaryFile] = []
         files.forEach { file in
-            guard let url = file.value as? String else {
-                return
-            }
+            let url = file.value
             guard let ancillaryFile = VirtuosoAncillaryFile(downloadUrl: url, andTag: file.key) else {
                 return
             }
@@ -211,6 +209,22 @@ class Penthera: RCTEventEmitter, VirtuosoDownloadEngineNotificationsDelegate {
         return ancillaryFiles
     }
 
+    // Función para convertir un String en un objeto DataInfo
+    func stringToSubtitles(_ jsonString: String) -> [Subtitle]? {
+        // Crear un Data a partir del String
+        if let jsonData = jsonString.data(using: .utf8) {
+            do {
+                // Decodificar el Data en un objeto DataInfo
+                let dataInfo = try JSONDecoder().decode([Subtitle].self, from: jsonData)
+                return dataInfo
+            } catch {
+                print("Error al decodificar el String en Subtitle: \(error)")
+            }
+        }
+        return nil
+    }
+
+
     @objc(download:withResolver:withRejecter:)
     func download(catalogString: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
         let virtuoso = VirtuosoDownloadEngine.instance()
@@ -232,6 +246,7 @@ class Penthera: RCTEventEmitter, VirtuosoDownloadEngineNotificationsDelegate {
                 return
             }
 
+
             let assetID = item["id"] as! String? ?? ""
 
             let hasDRM = item["drm"] as! Bool? ?? false
@@ -247,41 +262,56 @@ class Penthera: RCTEventEmitter, VirtuosoDownloadEngineNotificationsDelegate {
                 }
                 // Ancillary Files
                 let thumbnails = item["thumbnails"] as! [String: AnyObject]? ?? [:]
-                let subtitles = item["subtitles"] as! [String: AnyObject]? ?? [:]
-                config.ancillaries = self.getAncillaryFiles(files: thumbnails) + self.getAncillaryFiles(files: subtitles)
-
+                if let subtitlesString = item["subtitles"] as? String {
+                    if let subtitles = self.stringToSubtitles(subtitlesString) {
+                        var ancillarySubtitles: [String: String] = [:]
+
+                        for subtitle in subtitles {
+                            ancillarySubtitles[subtitle.language] = subtitle.href;
+                        }
+                        config.ancillaries =  self.getAncillaryFiles(files: ancillarySubtitles)
+                    }
+                }
 
                 //DRM
-                if(hasDRM) {
 
-                    guard let drm = data!["drm"] as! [String: AnyObject]? else {
-                        reject("No drm", nil, nil)
-                        return
-                    }
+                    if(hasDRM) {
 
-                    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 drm = data!["drm"] as! [String: AnyObject]? else {
+                            reject("No drm", nil, nil)
+                            return
+                        }
 
-                    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
-                    }
+                        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
 
-                    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"]
+
+                if let dataInfoDict = data as? [AnyHashable: Any]  {
+                    asset?.userInfo = dataInfoDict
+                } else {
+                    asset?.userInfo = nil
+                }
+
 
-                let data = item["data"] as! [String: AnyObject]? ?? [:]
 
-                asset?.userInfo = data
 
                 config.ancillaries?.forEach{ file in
                     asset?.add(file)
@@ -290,10 +320,6 @@ class Penthera: RCTEventEmitter, VirtuosoDownloadEngineNotificationsDelegate {
                 queue.append(asset!)
                 resolve(assetID)
             }
-
-
-        } catch {
-            reject("penthera", error.localizedDescription, error)
         }
     }
 
@@ -427,15 +453,46 @@ class Penthera: RCTEventEmitter, VirtuosoDownloadEngineNotificationsDelegate {
 
             let licenseURL = vcHttpServer?.fairPlayLicenseServerURL
             let certificateURL = vcHttpServer?.fairPlayCertificateDataURL(forSubType: nil)
+            var subtitlesResponse: [Subtitle] = []
+            var language: String? = nil, url: String? = nil, label: String? = nil
+            asset.userInfo.map{ userInfo in
+                if  let subtitles = userInfo["subtitles"] as? Array<Dictionary<String, String>> {
+                    for subtitle in subtitles {
+                        for (key, value) in subtitle {
+                            if key == "language" {
+                                url = vcHttpServer?.ancillaryURLForAncillary(withTag: value, usingMime: "")
+                                language = value
+                            }
+                            if key == "label" {
+                                label = value
+                            }
+                            if(label != nil && language != nil && url != nil){
+                                subtitlesResponse.append(
+                                    Subtitle(
+                                        label: label ?? "",
+                                        language: language ?? "",
+                                        url: url
+                                    )
+                                )
+                                label = nil
+                                language = nil
+                                url = nil
+                            }
+                        }
+                    }
+                 }
+            }
+
+            let assetDataObject = AssetData(
+                id: asset.assetID,
+                url: vcHttpServer?.playbackURL ?? "",
+                certificate: certificateURL,
+                license: licenseURL,
+                subtitles: subtitlesResponse
+            )
 
-            let assetData = [
-                "id": asset.assetID,
-                "url": vcHttpServer?.playbackURL ?? "",
-                "certificate": certificateURL ,
-                "license": licenseURL
-            ]
 
-            let data = try decoder.encode(assetData)
+            let data = try decoder.encode(assetDataObject)
             let json = String(data: data, encoding: .utf8)!
             resolve(json)
 
@@ -460,5 +517,4 @@ class Penthera: RCTEventEmitter, VirtuosoDownloadEngineNotificationsDelegate {
         EventEmitter.sharedInstance.dispatch(name: "penthera", code: PentheraEvent.ASSET_RESUME_DOWNLOAD_UPDATED, assetId: asset.assetID, body: "\(asset.isPaused)")
     }
 
-
 }

package/ios/Penthera.xcodeproj/xcuserdata/joseguerreroot.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -16,8 +16,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "18"
             endingLineNumber = "18"
-            landmarkName = "initializeSdk(user:backplaneUrl:publicKey:privateKey:resolve:reject:)"
-            landmarkType = "7">
+            landmarkName = "Penthera"
+            landmarkType = "3">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -32,7 +32,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "25"
             endingLineNumber = "25"
-            landmarkName = "initializeSdk(user:backplaneUrl:publicKey:privateKey:resolve:reject:)"
+            landmarkName = "updateStatusInfo()"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -48,7 +48,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "26"
             endingLineNumber = "26"
-            landmarkName = "initializeSdk(user:backplaneUrl:publicKey:privateKey:resolve:reject:)"
+            landmarkName = "updateStatusInfo()"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -64,7 +64,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "101"
             endingLineNumber = "101"
-            landmarkName = "getDownloads(blank:resolve:reject:)"
+            landmarkName = "initializeSdk(user:backplaneUrl:publicKey:privateKey:resolve:reject:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -80,7 +80,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "149"
             endingLineNumber = "149"
-            landmarkName = "getDownloads(blank:resolve:reject:)"
+            landmarkName = "getDownloadedAsset(assetID:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -96,7 +96,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "148"
             endingLineNumber = "148"
-            landmarkName = "getDownloads(blank:resolve:reject:)"
+            landmarkName = "getDownloadedAsset(assetID:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

package/lib/typescript/hooks/usePenthera/usePenthera.types.d.ts

@@ -16,11 +16,17 @@ type Progress = string;
 export type AssetProgress = {
     [key: string]: Progress;
 };
+export type Subtitle = {
+    url: string;
+    label: string;
+    language: string;
+};
 export interface InterfaceDataPlay {
     url?: string;
     license?: string;
     certificate?: string;
     id?: string;
+    subtitles?: Subtitle[];
 }
 export type PentheraState = {
     assets: PentheraTypes.ItemCatalog[] | [];

package/lib/typescript/hooks/usePenthera/usePenthera.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usePenthera.types.d.ts","sourceRoot":"","sources":["../../../../src/hooks/usePenthera/usePenthera.types.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAEjE,oBAAY,aAAa;IACvB,gBAAgB,qBAAqB;IACrC,qBAAqB,0BAA0B;IAC/C,gBAAgB,qBAAqB;IACrC,iBAAiB,sBAAsB;IACvC,mBAAmB,wBAAwB;IAC3C,6BAA6B,kCAAkC;IAC/D,aAAa,kBAAkB;IAC/B,cAAc,mBAAmB;IACjC,mBAAmB,wBAAwB;CAC5C;AACD,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC;AAC7B,KAAK,QAAQ,GAAG,MAAM,CAAC;AAEvB,MAAM,MAAM,aAAa,GAAG;IAC1B,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAC;CACzB,CAAC;AAEF,MAAM,WAAW,iBAAiB;IAChC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,aAAa,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC;IACzC,cAAc,EAAE,aAAa,GAAG,EAAE,CAAC;IACnC,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,KAAK,CAAC,iBAAiB,CAAC;IAC1D,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,qBAAqB,EAAE,MAAM,CAAC;CAC/B,CAAC,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC;IAC1D,QAAQ,EAAE,CAAC,KAAK,EAAE,aAAa,CAAC,WAAW,KAAK,IAAI,CAAC;IACrD,gBAAgB,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAC/C,oBAAoB,EAAE,CAAC,aAAa,EAAE,aAAa,KAAK,IAAI,CAAC;IAC7D,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,UAAU,EAAE,CAAC,IAAI,EAAE,aAAa,CAAC,cAAc,KAAK,IAAI,CAAC;IACzD,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACvC,eAAe,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,WAAW,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC7D,QAAQ,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,CAAC;IACrC,mBAAmB,EAAE,CAAC,IAAI,EAAE,aAAa,CAAC,iBAAiB,KAAK,IAAI,CAAC;CACtE,CAAC;AAEF,MAAM,MAAM,KAAK,GAAG;IAClB,IAAI,EAAE,aAAa,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC"}
+{"version":3,"file":"usePenthera.types.d.ts","sourceRoot":"","sources":["../../../../src/hooks/usePenthera/usePenthera.types.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAEjE,oBAAY,aAAa;IACvB,gBAAgB,qBAAqB;IACrC,qBAAqB,0BAA0B;IAC/C,gBAAgB,qBAAqB;IACrC,iBAAiB,sBAAsB;IACvC,mBAAmB,wBAAwB;IAC3C,6BAA6B,kCAAkC;IAC/D,aAAa,kBAAkB;IAC/B,cAAc,mBAAmB;IACjC,mBAAmB,wBAAwB;CAC5C;AACD,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC;AAC7B,KAAK,QAAQ,GAAG,MAAM,CAAC;AAEvB,MAAM,MAAM,aAAa,GAAG;IAC1B,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,WAAW,iBAAiB;IAChC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;CACxB;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,aAAa,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC;IACzC,cAAc,EAAE,aAAa,GAAG,EAAE,CAAC;IACnC,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,KAAK,CAAC,iBAAiB,CAAC;IAC1D,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,qBAAqB,EAAE,MAAM,CAAC;CAC/B,CAAC,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC;IAC1D,QAAQ,EAAE,CAAC,KAAK,EAAE,aAAa,CAAC,WAAW,KAAK,IAAI,CAAC;IACrD,gBAAgB,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAC/C,oBAAoB,EAAE,CAAC,aAAa,EAAE,aAAa,KAAK,IAAI,CAAC;IAC7D,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,UAAU,EAAE,CAAC,IAAI,EAAE,aAAa,CAAC,cAAc,KAAK,IAAI,CAAC;IACzD,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACvC,eAAe,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,WAAW,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC7D,QAAQ,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,CAAC;IACrC,mBAAmB,EAAE,CAAC,IAAI,EAAE,aAAa,CAAC,iBAAiB,KAAK,IAAI,CAAC;CACtE,CAAC;AAEF,MAAM,MAAM,KAAK,GAAG;IAClB,IAAI,EAAE,aAAa,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeoffmedia/react-native-penthera",
-  "version": "0.2.17",
+  "version": "0.2.18",
   "description": "test",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/src/hooks/usePenthera/usePenthera.types.ts

@@ -18,11 +18,18 @@ export type AssetProgress = {
   [key: string]: Progress;
 };
 
+export type Subtitle = {
+  url: string;
+  label: string;
+  language: string;
+};
+
 export interface InterfaceDataPlay {
   url?: string;
   license?: string;
   certificate?: string;
   id?: string;
+  subtitles?: Subtitle[];
 }
 
 export type PentheraState = {