react-native-theoplayer 1.5.0 → 1.6.1

package/android/src/main/java/com/theoplayer/ReactTHEOplayerView.java

@@ -210,7 +210,9 @@ public class ReactTHEOplayerView extends FrameLayout implements LifecycleEventLi
           player.play();
         }
 
-        seekTo(this.seekTime);
+        if (this.seekTime != TIME_UNSET) {
+          seekTo(this.seekTime);
+        }
       }
     }, 1);
   }

package/ios/THEOplayerRCTDebug.swift

@@ -14,3 +14,6 @@ let DEBUG_THEOPLAYER_INTERACTION = DEBUG && true
 
 // Debug flag to monitor all updates made  on bridged properties
 let DEBUG_PROP_UPDATES = DEBUG && true
+
+// Debug flag to monitor correct SourceDescription buildup
+let DEBUG_SOURCE_DESCRIPTION_BUIDER = DEBUG && true

package/ios/THEOplayerRCTSourceDescriptionBuilder.swift

@@ -0,0 +1,212 @@
+// THEOplayerRCTSourceDescriptionBuilder.swift
+
+import Foundation
+import THEOplayerSDK
+import UIKit
+
+let SD_PROP_SOURCES: String = "sources"
+let SD_PROP_POSTER: String = "poster"
+let SD_PROP_TEXTTRACKS: String = "textTracks"
+let SD_PROP_SRC: String = "src"
+let SD_PROP_TYPE: String = "type"
+let SD_PROP_INTEGRATION: String = "integration"
+let SD_PROP_SRC_LANG: String = "srclang"
+let SD_PROP_DEFAULT: String = "default"
+let SD_PROP_LABEL: String = "label"
+let SD_PROP_KIND: String = "kind"
+let SD_PROP_FORMAT: String = "format"
+let SD_PROP_CONTENT_PROTECTION: String = "contentProtection"
+
+let EXTENSION_HLS: String = ".m3u8"
+let EXTENSION_MP4: String = ".mp4"
+let EXTENSION_MP3: String = ".mp3"
+
+let MIMETYPE_HLS = "application/x-mpegurl"
+let MIMETYPE_MP4 = "video/mp4"
+let MIMETYPE_MP3 = "audio/mpeg"
+
+let DRM_INTEGRATION_ID_EZDRM = "ezdrm"
+let DRM_INTEGRATION_ID_KEYOS = "keyos"
+let DRM_INTEGRATION_ID_VERIMATRIX = "verimatrix"
+
+class THEOplayerRCTSourceDescriptionBuilder {
+    
+    /**
+        Builds a THEOplayer SourceDescription that can be passed as a source for the THEOplayer.
+     - returns: a THEOplayer TypedSource. In case of SSAI we  support GoogleDAITypedSource with GoogleDAIVodConfiguration or GoogleDAILiveConfiguration
+     */
+    static func buildSourceDescription(_ sourceData: NSDictionary) -> SourceDescription? {
+        // 1. Extract "sources"
+        guard let sourcesData = sourceData[SD_PROP_SOURCES] else {
+            return nil
+        }
+        
+        var typedSources: [TypedSource] = []
+        // case: array of source objects
+        if let sourcesDataArray = sourcesData as? [[String:Any]] {
+            for typedSourceData in sourcesDataArray {
+                if let typedSource = THEOplayerRCTSourceDescriptionBuilder.buildTypedSource(typedSourceData) {
+                    typedSources.append(typedSource)
+                } else {
+                    if DEBUG_SOURCE_DESCRIPTION_BUIDER {
+                        print("[NATIVE] Could not create THEOplayer TypedSource from sourceData array")
+                    }
+                    return nil
+                }
+            }
+        }
+        // case: single source object
+        else if let typedSourceData = sourcesData as? [String:Any] {
+            if let typedSource = THEOplayerRCTSourceDescriptionBuilder.buildTypedSource(typedSourceData) {
+                typedSources.append(typedSource)
+            } else {
+                if DEBUG_SOURCE_DESCRIPTION_BUIDER {
+                    print("[NATIVE] Could not create THEOplayer TypedSource from sourceData")
+                }
+                return nil
+            }
+        }
+        
+        // 2. extract 'poster'
+        let poster = sourceData[SD_PROP_POSTER] as? String
+        
+        // 3. extract 'textTracks'
+        var textTrackDescriptions: [TextTrackDescription]?
+        if let textTracksDataArray = sourceData[SD_PROP_TEXTTRACKS] as? [[String:Any]] {
+            textTrackDescriptions = []
+            for textTracksData in textTracksDataArray {
+                if let textTrackDescription = THEOplayerRCTSourceDescriptionBuilder.buildTextTrackDescriptions(textTracksData) {
+                    textTrackDescriptions?.append(textTrackDescription)
+                } else {
+                    if DEBUG_SOURCE_DESCRIPTION_BUIDER {
+                        print("[NATIVE] Could not create THEOplayer TextTrackDescription from textTrackData array")
+                    }
+                    return nil
+                }
+            }
+            
+        }
+        
+        // 4. construct and return SourceDescription
+        return SourceDescription(sources: typedSources,
+                                 textTracks: textTrackDescriptions,
+                                 poster: poster,
+                                 metadata: nil)     // TODO
+    }
+    
+    // MARK: Private build methods
+    
+    /**
+        Creates a THEOplayer TypedSource. This requires a source property for non SSAI strreams (either as a string or as an object contiaining a src property). For SSAI streams the TypeSource can be created from the ssai property.
+     - returns: a THEOplayer TypedSource. In case of SSAI we  support GoogleDAITypedSource with GoogleDAIVodConfiguration or GoogleDAILiveConfiguration
+     */
+    private static func buildTypedSource(_ typedSourceData: [String:Any]) -> TypedSource? {
+        if let src = typedSourceData[SD_PROP_SRC] as? String {
+            // extract the type
+            let type = typedSourceData[SD_PROP_TYPE] as? String ?? THEOplayerRCTSourceDescriptionBuilder.extractMimeType(src)
+            // check for a contentProtection
+            var contentProtection: MultiplatformDRMConfiguration?
+            if let contentProtectionData = typedSourceData[SD_PROP_CONTENT_PROTECTION] as? [String:Any] {
+                contentProtection = THEOplayerRCTSourceDescriptionBuilder.buildContentProtection(contentProtectionData)
+            }
+            
+            return TypedSource(src: src,
+                               type: type,
+                               drm: contentProtection)
+        }
+
+        if DEBUG_SOURCE_DESCRIPTION_BUIDER {
+            print("[NATIVE] THEOplayer TypedSource requires 'src' property in 'sources' description")
+        }
+        return nil
+    }
+    
+    /**
+        Creates a THEOplayer TextTrackDescription. This requires a textTracks property in the RN source description.
+     - returns: a THEOplayer TextTrackDescription
+     */
+    private static func buildTextTrackDescriptions(_ textTracksData: [String:Any]) -> TextTrackDescription? {
+        if let textTrackSrc = textTracksData[SD_PROP_SRC] as? String,
+           let textTrackSrcLang = textTracksData[SD_PROP_SRC_LANG] as? String {
+            let textTrackIsDefault = textTracksData[SD_PROP_DEFAULT] as? Bool
+            let textTrackLabel = textTracksData[SD_PROP_LABEL] as? String
+            let textTrackKind = THEOplayerRCTSourceDescriptionBuilder.extractTextTrackKind(textTracksData[SD_PROP_KIND] as? String)
+            let textTrackFormat = THEOplayerRCTSourceDescriptionBuilder.extractTextTrackFormat(textTracksData[SD_PROP_FORMAT] as? String)
+            print(textTrackKind._rawValue)
+            print(textTrackFormat._rawValue)
+            return TextTrackDescription(src: textTrackSrc,
+                                        srclang: textTrackSrcLang,
+                                        isDefault: textTrackIsDefault,
+                                        kind: textTrackKind,
+                                        label: textTrackLabel,
+                                        format: textTrackFormat)
+        }
+        return nil
+    }
+    
+    /**
+        Creates a THEOplayer DRMConfiguration. This requires a contentProtection property in the RN source description.
+     - returns: a THEOplayer DRMConfiguration
+     */
+    private static func buildContentProtection(_ contentProtectionData: [String:Any]) -> MultiplatformDRMConfiguration? {
+        do {
+            let data = try JSONSerialization.data(withJSONObject: contentProtectionData)
+            if let integration = contentProtectionData[SD_PROP_INTEGRATION] as? String {
+                switch integration {
+                case DRM_INTEGRATION_ID_EZDRM: return try JSONDecoder().decode(EzdrmDRMConfiguration.self, from: data)
+                case DRM_INTEGRATION_ID_KEYOS: return try JSONDecoder().decode(KeyOSDRMConfiguration.self, from: data)
+                case DRM_INTEGRATION_ID_VERIMATRIX: return try JSONDecoder().decode(VerimatrixDRMConfiguration.self, from: data)
+                default: print("[NATIVE] \(integration): unsupported drm integration")
+                }
+            } else {
+                print("[NATIVE] integration type not specified... trying default drm integration")
+                return try JSONDecoder().decode(MultiplatformDRMConfiguration.self, from: data)
+            }
+        } catch {
+            print("[NATIVE] unsupported contentProtection data format")
+        }
+        return nil
+    }
+    
+    
+    // MARK: Helper methods
+    
+    private static func extractMimeType(_ src: String) -> String {
+        if src.suffix(5) == EXTENSION_HLS {
+            return MIMETYPE_HLS
+        } else if src.suffix(4) == EXTENSION_MP4 {
+            return MIMETYPE_MP4
+        } else if src.suffix(4) == EXTENSION_MP3 {
+            return MIMETYPE_MP3
+        }
+        return MIMETYPE_HLS
+    }
+    
+    private static func extractTextTrackKind(_ kindString: String?) -> THEOplayerSDK.TextTrackKind {
+        guard let kind = kindString else {
+            return THEOplayerSDK.TextTrackKind.none
+        }
+        
+        switch kind {
+        case "subtitles": return THEOplayerSDK.TextTrackKind.subtitles
+        case "captions": return THEOplayerSDK.TextTrackKind.captions
+        case "description": return THEOplayerSDK.TextTrackKind.description
+        case "chapters": return THEOplayerSDK.TextTrackKind.chapters
+        case "metadata": return THEOplayerSDK.TextTrackKind.metadata
+        default: return THEOplayerSDK.TextTrackKind.none
+            
+        }
+    }
+    
+    private static func extractTextTrackFormat(_ formatString: String?) -> THEOplayerSDK.TextTrackFormat {
+        guard let format = formatString else {
+            return THEOplayerSDK.TextTrackFormat.none
+        }
+        
+        if format == "webvtt" {
+            return THEOplayerSDK.TextTrackFormat.WebVTT
+        } else {
+            return THEOplayerSDK.TextTrackFormat.none
+        }
+    }
+}

package/ios/THEOplayerRCTView.swift

@@ -70,14 +70,13 @@ class THEOplayerRCTView: UIView {
     // MARK: - Property bridging
     @objc(setSrc:)
     func setSrc(srcDict: NSDictionary) {
-        do {
-            // store sourceDescription
-            let data = try JSONSerialization.data(withJSONObject: srcDict)
-            let sourceDescription = try JSONDecoder().decode(SourceDescription.self, from: data)
-            self.src = sourceDescription
+        // build THEOplayer SourceDescription
+        if let src = THEOplayerRCTSourceDescriptionBuilder.buildSourceDescription(srcDict) {
+            self.src = src
             if DEBUG_PROP_UPDATES  { print("[NATIVE] src prop updated.") }
-        } catch {
-            print(error)
+        } else {
+            if DEBUG_PROP_UPDATES  { print("[NATIVE] failed to update THEOplayer source.") }
+            return
         }
         
         if (self.player == nil) {

package/ios/THEOplayerRCTViewEventHandler.swift

@@ -12,7 +12,7 @@ let REMOVE_CUE: Int = 1
 class THEOplayerRCTViewEventHandler {
     // MARK: Members
     private weak var player: THEOplayer?
-    private var currentPresentationMode = PresentationMode.inline // TheoPlayer's initial presentationMode
+    private var currentPresentationMode = THEOplayerSDK.PresentationMode.inline // TheoPlayer's initial presentationMode
         
     // MARK: Events
     var onNativePlay: RCTDirectEventBlock?

package/lib/typescript/src/__tests__/index.test.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-theoplayer",
-  "version": "1.5.0",
+  "version": "1.6.1",
   "description": "A THEOplayer video component for react-native.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -17,12 +17,10 @@
     "!lib/typescript/example",
     "!android/build",
     "!ios/build",
-    "!**/__tests__",
     "!**/__fixtures__",
     "!**/__mocks__"
   ],
   "scripts": {
-    "test": "jest",
     "typescript": "tsc --noEmit",
     "lint": "eslint \"**/*.{ts,tsx}\"",
     "prepare": "bob build",
@@ -51,7 +49,6 @@
     "@commitlint/config-conventional": "^11.0.0",
     "@react-native-community/eslint-config": "^2.0.0",
     "@release-it/conventional-changelog": "^2.0.0",
-    "@types/jest": "^26.0.0",
     "@types/react": "^17.0.1",
     "@types/react-native": "0.64.2",
     "commitlint": "^11.0.0",
@@ -60,7 +57,6 @@
     "eslint-plugin-prettier": "^3.1.3",
     "eslint-plugin-react-native": "^4.0.0",
     "husky": "^6.0.0",
-    "jest": "^26.0.1",
     "pod-install": "^0.1.0",
     "prettier": "^2.0.5",
     "react": "17.0.1",
@@ -73,13 +69,6 @@
     "react": "*",
     "react-native": "*"
   },
-  "jest": {
-    "preset": "react-native",
-    "modulePathIgnorePatterns": [
-      "<rootDir>/example/node_modules",
-      "<rootDir>/lib/"
-    ]
-  },
   "commitlint": {
     "extends": [
       "@commitlint/config-conventional"

package/src/__tests__/index.test.tsx

@@ -0,0 +1 @@
+export {};