feat: add headers to ContentInfo and Data requests

eroscai · Aug 14, 2021 · bac3d4d · bac3d4d
1 parent 786b533
commit bac3d4d
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 6 deletions.
diff --git a/Example/SZAVPlayer/AudioView/AudioViewController.swift b/Example/SZAVPlayer/AudioView/AudioViewController.swift
@@ -200,7 +200,15 @@ extension AudioViewController {
             audioPlayer.play()
         } else {
             audioPlayer.pause()
-            let config = SZAVPlayerConfig(urlStr: audio.url, uniqueID: nil)
+            var config = SZAVPlayerConfig(urlStr: audio.url, uniqueID: nil)
+            config.headersForContentInfoRequest = [
+                "header1": "111",
+                "header2": "222"
+            ]
+            config.headersForDataRequest = [
+                "header3": "333",
+                "header4": "444"
+            ]
             audioPlayer.setupPlayer(config: config)
         }
         playerControllerEvent = .playing

diff --git a/Example/SZAVPlayer/VideoView/VideoViewController.swift b/Example/SZAVPlayer/VideoView/VideoViewController.swift
@@ -236,7 +236,15 @@ extension VideoViewController {
             videoPlayer.play()
         } else {
             videoPlayer.pause()
-            let config = SZAVPlayerConfig(urlStr: video.url, uniqueID: nil, isVideo: true, isVideoOutputEnabled: enableVideoOutput)
+            var config = SZAVPlayerConfig(urlStr: video.url, uniqueID: nil, isVideo: true, isVideoOutputEnabled: enableVideoOutput)
+            config.headersForContentInfoRequest = [
+                "header1": "111",
+                "header2": "222"
+            ]
+            config.headersForDataRequest = [
+                "header3": "333",
+                "header4": "444"
+            ]
             videoPlayer.setupPlayer(config: config)
         }
         playerControllerEvent = .playing

diff --git a/SZAVPlayer.podspec b/SZAVPlayer.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'SZAVPlayer'
-  s.version          = '1.3.0'
+  s.version          = '1.3.1'
   s.summary          = 'Swift AVPlayer, based on AVAssetResourceLoaderDelegate, support cache.'
 
 # This description is used to generate tags and improve search results.

diff --git a/Sources/Classes/Model/SZAVPlayerConfig.swift b/Sources/Classes/Model/SZAVPlayerConfig.swift
@@ -21,6 +21,9 @@ public struct SZAVPlayerConfig {
     /// local files or you don't needed custom loading.
     public var disableCustomLoading: Bool = false
 
+    public var headersForContentInfoRequest: [String: String]?
+    public var headersForDataRequest: [String: String]?
+
     public init(urlStr: String, uniqueID: String?, isVideo: Bool = false, isVideoOutputEnabled: Bool = false) {
         self.urlStr = urlStr
         self.uniqueID = uniqueID

diff --git a/Sources/Classes/Request/SZAVPlayerDataLoader.swift b/Sources/Classes/Request/SZAVPlayerDataLoader.swift
@@ -25,11 +25,13 @@ class SZAVPlayerDataLoader: NSObject {
     private lazy var dataLoaderOperationQueue = createOperationQueue(name: "dataLoaderOperationQueue")
     private let uniqueID: String
     private let url: URL
+    private let config: SZAVPlayerConfig
     private var mediaData: Data?
 
-    init(uniqueID: String, url: URL, callbackQueue: DispatchQueue) {
+    init(uniqueID: String, url: URL, config: SZAVPlayerConfig, callbackQueue: DispatchQueue) {
         self.uniqueID = uniqueID
         self.url = url
+        self.config = config
         self.callbackQueue = callbackQueue
         super.init()
     }
@@ -41,6 +43,7 @@ class SZAVPlayerDataLoader: NSObject {
     public func append(requestedRange: SZAVPlayerRange, dataRequest: SZAVPlayerDataRequest) {
         let dataLoaderOperation = SZAVPlayerDataLoaderOperation(uniqueID: uniqueID,
                                                                 url: url,
+                                                                config: config,
                                                                 requestedRange: requestedRange,
                                                                 dataRequest: dataRequest)
         dataLoaderOperation.delegate = self

diff --git a/Sources/Classes/Request/SZAVPlayerDataLoaderOperation.swift b/Sources/Classes/Request/SZAVPlayerDataLoaderOperation.swift
@@ -25,6 +25,7 @@ class SZAVPlayerDataLoaderOperation: Operation {
     private var operationCompletion: CompletionHandler?
     private let uniqueID: String
     private let url: URL
+    private let config: SZAVPlayerConfig
     private let requestedRange: SZAVPlayerRange
     private let dataRequest: SZAVPlayerDataRequest
     private var mediaData: Data?
@@ -39,12 +40,14 @@ class SZAVPlayerDataLoaderOperation: Operation {
 
     init(uniqueID: String,
          url: URL,
+         config: SZAVPlayerConfig,
          requestedRange: SZAVPlayerRange,
          dataRequest: SZAVPlayerDataRequest)
     {
         self.performQueue = DispatchQueue(label: "com.SZAVPlayer.DataLoaderOperation", qos: .background)
         self.uniqueID = uniqueID
         self.url = url
+        self.config = config
         self.requestedRange = requestedRange
         self.dataRequest = dataRequest
         super.init()
@@ -195,7 +198,9 @@ extension SZAVPlayerDataLoaderOperation {
     }
 
     private func remoteRequestOperation(range: SZAVPlayerRange) -> SZAVPlayerRequestOperation {
-        let operation = SZAVPlayerRequestOperation(url: url, range: range)
+        let operation = SZAVPlayerRequestOperation(url: url,
+                                                   range: range,
+                                                   config: config)
         operation.delegate = self
 
         return operation

diff --git a/Sources/Classes/Request/SZAVPlayerRequestOperation.swift b/Sources/Classes/Request/SZAVPlayerRequestOperation.swift
@@ -24,6 +24,7 @@ public class SZAVPlayerRequestOperation: Operation {
     private var requestCompletion: CompletionHandler?
     private lazy var session: URLSession = createSession()
     private var task: URLSessionDataTask?
+    private let config: SZAVPlayerConfig
 
     private var _finished: Bool = false
     private var _executing: Bool = false
@@ -32,7 +33,8 @@ public class SZAVPlayerRequestOperation: Operation {
         SZLogInfo("deinit")
     }
 
-    public init(url: URL, range: SZAVPlayerRange?) {
+    public init(url: URL, range: SZAVPlayerRange?, config: SZAVPlayerConfig) {
+        self.config = config
         self.performQueue = DispatchQueue(label: "com.SZAVPlayer.RequestOperation", qos: .background)
         super.init()
 
@@ -148,6 +150,12 @@ extension SZAVPlayerRequestOperation {
             startOffset = range.lowerBound
         }
 
+        if let headers = config.headersForDataRequest {
+            for (key, value) in headers {
+                request.setValue(value, forHTTPHeaderField: key)
+            }
+        }
+
         return session.dataTask(with: request)
     }
 

diff --git a/Sources/Classes/SZAVPlayerAssetLoader.swift b/Sources/Classes/SZAVPlayerAssetLoader.swift
@@ -367,12 +367,19 @@ extension SZAVPlayerAssetLoader {
             request.setValue(rangeHeader, forHTTPHeaderField: "Range")
         }
 
+        if let headers = config.headersForContentInfoRequest {
+            for (key, value) in headers {
+                request.setValue(value, forHTTPHeaderField: key)
+            }
+        }
+
         return request
     }
 
     private func createDataLoader() -> SZAVPlayerDataLoader {
         let loader = SZAVPlayerDataLoader(uniqueID: uniqueID,
                                           url: url,
+                                          config: config,
                                           callbackQueue: loaderQueue)
         loader.delegate = self