@capgo/capacitor-video-player 8.1.23 → 8.1.25

package/ios/Sources/VideoPlayerPlugin/FullscreenVideoPlayer.swift

@@ -14,10 +14,14 @@ class FullscreenVideoPlayer: NSObject {
     private var pipEnabled: Bool
     private var showControls: Bool
     private var chromecast: Bool
+    private var chromecastUrl: String?
     private var title: String?
     private var smallTitle: String?
     private var artwork: String?
     private var rate: Float
+    private var audioCategory: String?
+    private var didActivateAudioSession: Bool = false
+    private var didEmitExit: Bool = false
     private var timeObserver: Any?
     private var onPlay: (() -> Void)?
     private var onPause: (() -> Void)?
@@ -26,6 +30,8 @@ class FullscreenVideoPlayer: NSObject {
     private var onExit: ((Double) -> Void)?
     private var fairplayCertificateUrl: String?
     private var fairplayContentKeySpcUrl: String?
+    private var fairplayAssetId: String?
+    private var widevineLicenseUrl: String?
     private var contentKeySession: AVContentKeySession?
     private var castController: VideoPlayerCastController?
     private weak var presentingViewController: UIViewController?
@@ -42,13 +48,17 @@ class FullscreenVideoPlayer: NSObject {
         pipEnabled: Bool,
         showControls: Bool,
         chromecast: Bool,
+        chromecastUrl: String? = nil,
         title: String? = nil,
         smallTitle: String? = nil,
         artwork: String? = nil,
         subtitleUrl: String? = nil,
         subtitleLanguage: String? = nil,
         fairplayCertificateUrl: String? = nil,
-        fairplayContentKeySpcUrl: String? = nil
+        fairplayContentKeySpcUrl: String? = nil,
+        fairplayAssetId: String? = nil,
+        widevineLicenseUrl: String? = nil,
+        audioCategory: String? = nil
     ) {
         self.playerId = playerId
         self.videoUrl = url
@@ -58,6 +68,7 @@ class FullscreenVideoPlayer: NSObject {
         self.pipEnabled = pipEnabled
         self.showControls = showControls
         self.chromecast = chromecast
+        self.chromecastUrl = chromecastUrl
         self.title = title
         self.smallTitle = smallTitle
         self.artwork = artwork
@@ -65,6 +76,9 @@ class FullscreenVideoPlayer: NSObject {
         self.subtitleLanguage = subtitleLanguage
         self.fairplayCertificateUrl = fairplayCertificateUrl
         self.fairplayContentKeySpcUrl = fairplayContentKeySpcUrl
+        self.fairplayAssetId = fairplayAssetId
+        self.widevineLicenseUrl = widevineLicenseUrl
+        self.audioCategory = audioCategory
         super.init()
     }
 
@@ -74,6 +88,8 @@ class FullscreenVideoPlayer: NSObject {
             return
         }
 
+        configureAudioSession()
+
         guard let subtitleUrlString = subtitleUrl,
               !subtitleUrlString.isEmpty,
               let subtitleURL = URL(string: subtitleUrlString) else {
@@ -113,7 +129,8 @@ class FullscreenVideoPlayer: NSObject {
         hlsResourceLoader = result.resourceLoader
         let asset = result.asset
 
-        if let certUrl = fairplayCertificateUrl, !certUrl.isEmpty {
+        if let certUrl = fairplayCertificateUrl, !certUrl.isEmpty,
+           let spcUrl = fairplayContentKeySpcUrl, !spcUrl.isEmpty {
             let session = AVContentKeySession(keySystem: .fairPlayStreaming)
             session.setDelegate(self, queue: DispatchQueue.global(qos: .default))
             session.addContentKeyRecipient(asset)
@@ -132,9 +149,7 @@ class FullscreenVideoPlayer: NSObject {
         playerViewController?.player = player
         playerViewController?.showsPlaybackControls = showControls
         playerViewController?.allowsPictureInPicturePlayback = pipEnabled
-        if pipEnabled {
-            playerViewController?.delegate = self
-        }
+        playerViewController?.delegate = self
 
         setupChromecast()
         setupObservers()
@@ -147,11 +162,19 @@ class FullscreenVideoPlayer: NSObject {
             return
         }
 
+        let castVideoUrl: String
+        if let chromecastUrl = chromecastUrl, !chromecastUrl.isEmpty {
+            castVideoUrl = chromecastUrl
+        } else {
+            castVideoUrl = videoUrl
+        }
+
         castController = VideoPlayerCastController(
-            videoUrl: videoUrl,
+            videoUrl: castVideoUrl,
             title: title,
             smallTitle: smallTitle,
-            artwork: artwork
+            artwork: artwork,
+            widevineLicenseUrl: widevineLicenseUrl
         )
         castController?.setOnPlay { [weak self] in
             self?.onPlay?()
@@ -235,23 +258,54 @@ class FullscreenVideoPlayer: NSObject {
 
         presentingViewController = viewController
         viewController.present(playerVC, animated: true) {
+            playerVC.presentationController?.delegate = self
             self.play()
             completion()
         }
     }
 
+    func show(on viewController: UIViewController, completion: @escaping () -> Void) {
+        guard let playerVC = playerViewController else {
+            completion()
+            return
+        }
+        if playerVC.presentingViewController != nil {
+            completion()
+            return
+        }
+        presentingViewController = viewController
+        viewController.present(playerVC, animated: true) {
+            playerVC.presentationController?.delegate = self
+            completion()
+        }
+    }
+
+    func hide(completion: @escaping () -> Void) {
+        guard let playerVC = playerViewController else {
+            completion()
+            return
+        }
+        if playerVC.presentingViewController == nil {
+            completion()
+            return
+        }
+        playerVC.dismiss(animated: true) {
+            completion()
+        }
+    }
+
     func dismiss() {
         let currentTime = getCurrentTime()
-        castController?.detach(stopRemoteMedia: true)
         playerViewController?.dismiss(animated: true) { [weak self] in
-            self?.cleanup()
-            self?.onExit?(currentTime)
+            self?.emitExitIfNeeded(currentTime: currentTime)
         }
     }
 
-    private func cleanup() {
-        castController?.detach(stopRemoteMedia: false)
+    private func cleanup(stopRemoteMedia: Bool = false) {
+        castController?.detach(stopRemoteMedia: stopRemoteMedia)
         castController = nil
+        contentKeySession?.setDelegate(nil, queue: nil)
+        contentKeySession = nil
         hlsResourceLoader = nil
         if let observer = timeObserver {
             player?.removeObserver(self, forKeyPath: "rate")
@@ -264,6 +318,58 @@ class FullscreenVideoPlayer: NSObject {
         player = nil
         playerItem = nil
         playerViewController = nil
+        deactivateAudioSessionIfNeeded()
+    }
+
+    private func configureAudioSession() {
+        guard let audioCategory else { return }
+
+        let session = AVAudioSession.sharedInstance()
+        do {
+            switch audioCategory {
+            case "ambient":
+                try session.setCategory(.ambient, mode: .default, options: [.mixWithOthers])
+            case "playback":
+                try session.setCategory(.playback, mode: .default, options: [.mixWithOthers])
+            case "moviePlayback":
+                if #available(iOS 13.0, *) {
+                    try session.setCategory(
+                        .playback,
+                        mode: .moviePlayback,
+                        policy: .longFormVideo,
+                        options: [.mixWithOthers]
+                    )
+                } else {
+                    try session.setCategory(.playback, mode: .moviePlayback, options: [.mixWithOthers])
+                }
+            default:
+                return
+            }
+
+            try session.setActive(true)
+            didActivateAudioSession = true
+        } catch {
+            print("Error configuring AVAudioSession: \(error)")
+        }
+    }
+
+    private func deactivateAudioSessionIfNeeded() {
+        guard didActivateAudioSession else { return }
+        do {
+            try AVAudioSession.sharedInstance().setActive(false, options: [.notifyOthersOnDeactivation])
+            didActivateAudioSession = false
+        } catch {
+            print("Error deactivating AVAudioSession: \(error)")
+        }
+    }
+
+    private func emitExitIfNeeded(currentTime: Double? = nil) {
+        guard !didEmitExit else { return }
+        didEmitExit = true
+
+        let time = currentTime ?? getCurrentTime()
+        cleanup(stopRemoteMedia: true)
+        onExit?(time)
     }
 
     // MARK: - Playback Control
@@ -396,6 +502,19 @@ class FullscreenVideoPlayer: NSObject {
 // MARK: - AVPlayerViewControllerDelegate (Picture in Picture)
 
 extension FullscreenVideoPlayer: AVPlayerViewControllerDelegate {
+    func playerViewControllerWillEndFullScreenPresentation(
+        _ playerViewController: AVPlayerViewController,
+        withAnimationCoordinator coordinator: UIViewControllerTransitionCoordinator
+    ) {
+        coordinator.animate(alongsideTransition: nil) { [weak self] _ in
+            self?.emitExitIfNeeded()
+        }
+    }
+
+    func playerViewControllerDidEndFullScreenPresentation(_ playerViewController: AVPlayerViewController) {
+        emitExitIfNeeded()
+    }
+
     func playerViewControllerShouldAutomaticallyDismissAtPictureInPictureStart(
         _ playerViewController: AVPlayerViewController
     ) -> Bool {
@@ -423,6 +542,14 @@ extension FullscreenVideoPlayer: AVPlayerViewControllerDelegate {
     }
 }
 
+// MARK: - UIAdaptivePresentationControllerDelegate
+
+extension FullscreenVideoPlayer: UIAdaptivePresentationControllerDelegate {
+    func presentationControllerDidDismiss(_ presentationController: UIPresentationController) {
+        emitExitIfNeeded()
+    }
+}
+
 // MARK: - AVContentKeySessionDelegate (FairPlay DRM)
 
 extension FullscreenVideoPlayer: AVContentKeySessionDelegate {
@@ -434,6 +561,61 @@ extension FullscreenVideoPlayer: AVContentKeySessionDelegate {
         handleFairPlayKeyRequest(keyRequest)
     }
 
+    private func fairPlayContentIdentifierData(from identifier: Any?) -> Data? {
+        if let data = identifier as? Data {
+            return data.isEmpty ? nil : data
+        }
+
+        let identifierString: String?
+        if let url = identifier as? URL {
+            identifierString = url.absoluteString
+        } else if let string = identifier as? String {
+            identifierString = string
+        } else {
+            identifierString = nil
+        }
+
+        guard var string = identifierString?.trimmingCharacters(in: .whitespacesAndNewlines),
+              !string.isEmpty else {
+            return nil
+        }
+
+        if string.hasPrefix("skd://") {
+            string.removeFirst("skd://".count)
+        } else if string.hasPrefix("skd:") {
+            string.removeFirst("skd:".count)
+        }
+
+        while string.hasPrefix("/") {
+            string.removeFirst()
+        }
+
+        return string.data(using: .utf8)
+    }
+
+    private func normalizeFairPlayCkcData(_ data: Data) -> Data {
+        if let object = try? JSONSerialization.jsonObject(with: data),
+           let dict = object as? [String: Any] {
+            let candidateKeys = ["ckc", "CKC", "license", "License", "data"]
+            for key in candidateKeys {
+                if let value = dict[key] as? String,
+                   let decoded = Data(base64Encoded: value) {
+                    return decoded
+                }
+            }
+        }
+
+        if let string = String(data: data, encoding: .utf8) {
+            let trimmed = string.trimmingCharacters(in: .whitespacesAndNewlines)
+                .trimmingCharacters(in: CharacterSet(charactersIn: "\"'"))
+            if let decoded = Data(base64Encoded: trimmed) {
+                return decoded
+            }
+        }
+
+        return data
+    }
+
     private func handleFairPlayKeyRequest(_ keyRequest: AVContentKeyRequest) {
         guard let certUrlString = fairplayCertificateUrl,
               let certUrl = URL(string: certUrlString),
@@ -447,7 +629,17 @@ extension FullscreenVideoPlayer: AVContentKeySessionDelegate {
         }
 
         // 1. Fetch the FairPlay certificate
-        URLSession.shared.dataTask(with: certUrl) { certData, _, certError in
+        URLSession.shared.dataTask(with: certUrl) { [self] certData, certResponse, certError in
+            if let httpResponse = certResponse as? HTTPURLResponse,
+               !(200...299).contains(httpResponse.statusCode) {
+                keyRequest.processContentKeyResponseError(
+                    NSError(domain: "VideoPlayer", code: -2, userInfo: [
+                        NSLocalizedDescriptionKey: "Failed to fetch FairPlay certificate (HTTP \(httpResponse.statusCode))"
+                    ])
+                )
+                return
+            }
+
             guard let certData = certData else {
                 keyRequest.processContentKeyResponseError(
                     certError ?? NSError(domain: "VideoPlayer", code: -2,
@@ -457,11 +649,17 @@ extension FullscreenVideoPlayer: AVContentKeySessionDelegate {
             }
 
             // 2. Create SPC (Server Playback Context) using the certificate
-            // contentIdentifier is nil here; override if your license server requires
-            // a specific content ID extracted from the asset URL scheme
+            let contentIdentifier: Data? = {
+                if let assetId = fairplayAssetId?.trimmingCharacters(in: .whitespacesAndNewlines),
+                   !assetId.isEmpty {
+                    return assetId.data(using: .utf8)
+                }
+                return fairPlayContentIdentifierData(from: keyRequest.identifier)
+            }()
+
             keyRequest.makeStreamingContentKeyRequestData(
                 forApp: certData,
-                contentIdentifier: nil,
+                contentIdentifier: contentIdentifier,
                 options: [AVContentKeyRequestProtocolVersionsKey: [1]]
             ) { spcData, spcError in
                 guard let spcData = spcData else {
@@ -478,7 +676,17 @@ extension FullscreenVideoPlayer: AVContentKeySessionDelegate {
                 spcRequest.httpBody = spcData
                 spcRequest.setValue("application/octet-stream", forHTTPHeaderField: "Content-Type")
 
-                URLSession.shared.dataTask(with: spcRequest) { ckcData, _, ckcError in
+                URLSession.shared.dataTask(with: spcRequest) { [self] ckcData, ckcResponse, ckcError in
+                    if let httpResponse = ckcResponse as? HTTPURLResponse,
+                       !(200...299).contains(httpResponse.statusCode) {
+                        keyRequest.processContentKeyResponseError(
+                            NSError(domain: "VideoPlayer", code: -3, userInfo: [
+                                NSLocalizedDescriptionKey: "Failed to obtain FairPlay CKC (HTTP \(httpResponse.statusCode))"
+                            ])
+                        )
+                        return
+                    }
+
                     guard let ckcData = ckcData else {
                         keyRequest.processContentKeyResponseError(
                             ckcError ?? NSError(domain: "VideoPlayer", code: -3,
@@ -488,7 +696,8 @@ extension FullscreenVideoPlayer: AVContentKeySessionDelegate {
                     }
 
                     // 4. Provide the CKC to AVFoundation to decrypt the content
-                    let keyResponse = AVContentKeyResponse(fairPlayStreamingKeyResponseData: ckcData)
+                    let normalizedCkcData = normalizeFairPlayCkcData(ckcData)
+                    let keyResponse = AVContentKeyResponse(fairPlayStreamingKeyResponseData: normalizedCkcData)
                     keyRequest.processContentKeyResponse(keyResponse)
                 }.resume()
             }

package/ios/Sources/VideoPlayerPlugin/HLSSubtitleResourceLoader.swift

@@ -1,5 +1,6 @@
 import AVFoundation
 import Foundation
+import UniformTypeIdentifiers
 
 enum HLSVideoAssetFactory {
     static func isHLSStream(_ url: URL) -> Bool {
@@ -43,11 +44,17 @@ final class HLSSubtitleResourceLoader: NSObject, AVAssetResourceLoaderDelegate {
     static let videoScheme = "capgohls"
     static let subtitlePlaylistScheme = "capgohls-sub"
     private static let subtitleGroupID = "capgosubs"
+    private static let mpegURLContentType = UTType.m3uPlaylist.identifier
 
     private let originalVideoURL: URL
     private let subtitleURL: URL
     private let language: String
 
+    private struct LoadedResource {
+        let data: Data
+        let contentType: String?
+    }
+
     init(videoURL: URL, subtitleURL: URL, language: String) {
         self.originalVideoURL = videoURL
         self.subtitleURL = subtitleURL
@@ -80,8 +87,8 @@ final class HLSSubtitleResourceLoader: NSObject, AVAssetResourceLoaderDelegate {
 
         Task {
             do {
-                let data = try await loadData(for: requestURL)
-                fulfill(loadingRequest, with: data)
+                let resource = try await loadData(for: requestURL)
+                fulfill(loadingRequest, with: resource)
             } catch {
                 loadingRequest.finishLoading(with: error)
             }
@@ -90,25 +97,36 @@ final class HLSSubtitleResourceLoader: NSObject, AVAssetResourceLoaderDelegate {
         return true
     }
 
-    private func loadData(for requestURL: URL) async throws -> Data {
+    private func loadData(for requestURL: URL) async throws -> LoadedResource {
         if requestURL.scheme == Self.subtitlePlaylistScheme {
-            return Data(subtitleMediaPlaylist().utf8)
+            let data = Data(subtitleMediaPlaylist().utf8)
+            return LoadedResource(data: data, contentType: Self.mpegURLContentType)
         }
 
         let fetchURL = originalURL(for: requestURL)
-        let (data, _) = try await URLSession.shared.data(from: fetchURL)
+        let (data, response) = try await URLSession.shared.data(from: fetchURL)
+        if let http = response as? HTTPURLResponse, !(200...299).contains(http.statusCode) {
+            throw URLError(.badServerResponse)
+        }
+
         let manifest = String(data: data, encoding: .utf8) ?? ""
 
         guard hasStreamInfTags(manifest) else {
-            return data
+            let contentType = Self.contentTypeIdentifier(from: response)
+            return LoadedResource(data: data, contentType: contentType)
         }
 
         guard let subtitlePlaylistURI = Self.subtitlePlaylistURL(for: originalVideoURL)?.absoluteString else {
-            return data
+            let contentType = Self.contentTypeIdentifier(from: response) ?? Self.mpegURLContentType
+            return LoadedResource(data: data, contentType: contentType)
         }
 
-        let modified = injectSubtitle(into: manifest, subtitlePlaylistURI: subtitlePlaylistURI)
-        return Data(modified.utf8)
+        let modified = injectSubtitle(
+            into: manifest,
+            subtitlePlaylistURI: subtitlePlaylistURI,
+            baseURL: response.url ?? fetchURL
+        )
+        return LoadedResource(data: Data(modified.utf8), contentType: Self.mpegURLContentType)
     }
 
     private func originalURL(for requestURL: URL) -> URL {
@@ -125,7 +143,22 @@ final class HLSSubtitleResourceLoader: NSObject, AVAssetResourceLoaderDelegate {
         manifest.contains("#EXT-X-STREAM-INF")
     }
 
-    private func injectSubtitle(into manifest: String, subtitlePlaylistURI: String) -> String {
+    private static func contentTypeIdentifier(from response: URLResponse) -> String? {
+        guard let mimeType = (response as? HTTPURLResponse)?.mimeType else {
+            return nil
+        }
+        return UTType(mimeType: mimeType)?.identifier
+    }
+
+    private func absoluteURI(for uri: String, relativeTo baseURL: URL) -> String {
+        let trimmed = uri.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard let url = URL(string: trimmed, relativeTo: baseURL)?.absoluteURL else {
+            return trimmed
+        }
+        return url.absoluteString
+    }
+
+    private func injectSubtitle(into manifest: String, subtitlePlaylistURI: String, baseURL: URL) -> String {
         let mediaTag = """
         #EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID="\(Self.subtitleGroupID)",NAME="Subtitles",DEFAULT=YES,AUTOSELECT=YES,FORCED=NO,LANGUAGE="\(language)",URI="\(subtitlePlaylistURI)"
         """
@@ -133,9 +166,10 @@ final class HLSSubtitleResourceLoader: NSObject, AVAssetResourceLoaderDelegate {
         var lines = manifest.components(separatedBy: .newlines)
         var result: [String] = []
         var insertedMediaTag = false
+        var expectingVariantURI = false
 
         for line in lines {
-            if line.hasPrefix("#EXT-X-STREAM-INF") {
+            if line.hasPrefix("#EXT-X-STREAM-INF") || line.hasPrefix("#EXT-X-I-FRAME-STREAM-INF") {
                 if !insertedMediaTag {
                     result.append(mediaTag)
                     insertedMediaTag = true
@@ -146,9 +180,17 @@ final class HLSSubtitleResourceLoader: NSObject, AVAssetResourceLoaderDelegate {
                 } else {
                     result.append("\(line),SUBTITLES=\"\(Self.subtitleGroupID)\"")
                 }
+                expectingVariantURI = true
                 continue
             }
 
+            if expectingVariantURI, !line.hasPrefix("#"), !line.isEmpty {
+                result.append(absoluteURI(for: line, relativeTo: baseURL))
+                expectingVariantURI = false
+                continue
+            }
+
+            expectingVariantURI = false
             result.append(line)
         }
 
@@ -172,14 +214,16 @@ final class HLSSubtitleResourceLoader: NSObject, AVAssetResourceLoaderDelegate {
         """
     }
 
-    private func fulfill(_ loadingRequest: AVAssetResourceLoadingRequest, with data: Data) {
+    private func fulfill(_ loadingRequest: AVAssetResourceLoadingRequest, with resource: LoadedResource) {
         if let contentRequest = loadingRequest.contentInformationRequest {
-            contentRequest.contentType = "application/vnd.apple.mpegurl"
-            contentRequest.contentLength = Int64(data.count)
+            if let contentType = resource.contentType {
+                contentRequest.contentType = contentType
+            }
+            contentRequest.contentLength = Int64(resource.data.count)
             contentRequest.isByteRangeAccessSupported = false
         }
 
-        loadingRequest.dataRequest?.respond(with: data)
+        loadingRequest.dataRequest?.respond(with: resource.data)
         loadingRequest.finishLoading()
     }
 }

package/ios/Sources/VideoPlayerPlugin/VideoPlayerCastController.swift

@@ -20,6 +20,7 @@ final class VideoPlayerCastController: NSObject {
     private let title: String?
     private let smallTitle: String?
     private let artwork: String?
+    private let widevineLicenseUrl: String?
 
     private weak var player: AVPlayer?
     private weak var playerViewController: AVPlayerViewController?
@@ -52,11 +53,12 @@ final class VideoPlayerCastController: NSObject {
         return GCKCastContext.sharedInstance().sessionManager.currentCastSession?.remoteMediaClient
     }
 
-    init(videoUrl: String, title: String?, smallTitle: String?, artwork: String?) {
+    init(videoUrl: String, title: String?, smallTitle: String?, artwork: String?, widevineLicenseUrl: String?) {
         self.videoUrl = videoUrl
         self.title = title
         self.smallTitle = smallTitle
         self.artwork = artwork
+        self.widevineLicenseUrl = widevineLicenseUrl
         super.init()
     }
 
@@ -529,6 +531,10 @@ private extension VideoPlayerCastController {
         builder.streamType = .buffered
         builder.contentType = contentType(for: url)
         builder.metadata = metadata
+        if let widevineLicenseUrl = widevineLicenseUrl,
+           !widevineLicenseUrl.isEmpty {
+            builder.customData = ["laurl": widevineLicenseUrl]
+        }
         if let duration = player?.currentItem?.duration.seconds,
            duration.isFinite,
            duration > 0 {
@@ -737,7 +743,7 @@ final class VideoPlayerCastController {
         return false
     }
 
-    init(videoUrl: String, title: String?, smallTitle: String?, artwork: String?) {
+    init(videoUrl: String, title: String?, smallTitle: String?, artwork: String?, widevineLicenseUrl: String?) {
         _ = videoUrl
         _ = title
         _ = smallTitle