Use URLSessionTask.count* properties instead of custom private properties (swiftlang#1138)

Author: Pushkar N Kulkarni

Foundation/NSURLSession/NSURLSession.swift

@@ -178,7 +178,7 @@ fileprivate func nextSessionIdentifier() -> Int32 {
     sessionCounter += 1
     return sessionCounter
 }
-public let URLSessionTransferSizeUnknown: Int64 = -1
+public let NSURLSessionTransferSizeUnknown: Int64 = -1
 
 open class URLSession : NSObject {
     fileprivate let _configuration: _Configuration

Foundation/NSURLSession/NSURLSessionTask.swift

@@ -143,7 +143,7 @@ open class URLSessionTask : NSObject, NSCopying {
      */
 
     /// Number of body bytes already received
-    open fileprivate(set) var countOfBytesReceived: Int64 {
+    open internal(set) var countOfBytesReceived: Int64 {
         get {
             semaphore.wait()
             defer {
@@ -160,7 +160,7 @@ open class URLSessionTask : NSObject, NSCopying {
     fileprivate var _countOfBytesReceived: Int64 = 0
 
     /// Number of body bytes already sent */
-    open fileprivate(set) var countOfBytesSent: Int64 {
+    open internal(set) var countOfBytesSent: Int64 {
         get {
             semaphore.wait()
             defer {
@@ -178,10 +178,10 @@ open class URLSessionTask : NSObject, NSCopying {
     fileprivate var _countOfBytesSent: Int64 = 0
 
     /// Number of body bytes we expect to send, derived from the Content-Length of the HTTP request */
-    open fileprivate(set) var countOfBytesExpectedToSend: Int64 = 0
+    open internal(set) var countOfBytesExpectedToSend: Int64 = 0
 
     /// Number of byte bytes we expect to receive, usually derived from the Content-Length header of an HTTP response. */
-    open fileprivate(set) var countOfBytesExpectedToReceive: Int64 = 0
+    open internal(set) var countOfBytesExpectedToReceive: Int64 = 0
 
     /// The taskDescription property is available for the developer to
     /// provide a descriptive label for the task.

Foundation/NSURLSession/http/EasyHandle.swift

@@ -55,7 +55,6 @@ internal final class _EasyHandle {
     weak var delegate: _EasyHandleDelegate?
     fileprivate var headerList: _CurlStringList?
     fileprivate var pauseState: _PauseState = []
-    internal var fileLength: Int64 = 0
     internal var timeoutTimer: _TimeoutSource!
     #if os(Android)
     static fileprivate var _CAInfoFile: UnsafeMutablePointer<Int8>?
@@ -100,7 +99,7 @@ internal protocol _EasyHandleDelegate: class {
     func didReceive(data: Data) -> _EasyHandle._Action
     /// Handle header data read from the network.
     /// - returns: the action to be taken: abort, proceed, or pause.
-    func didReceive(headerData data: Data) -> _EasyHandle._Action
+    func didReceive(headerData data: Data, contentLength: Int64) -> _EasyHandle._Action
     /// Fill a buffer with data to be sent.
     ///
     /// - parameter data: The buffer to fill
@@ -454,7 +453,7 @@ fileprivate extension _EasyHandle {
             }
             var length = Double()
             try! CFURLSession_easy_getinfo_double(handle.rawHandle, CFURLSessionInfoCONTENT_LENGTH_DOWNLOAD, &length).asError()
-            return handle.didReceive(headerData: data, size: size, nmemb: nmemb, fileLength: length)
+            return handle.didReceive(headerData: data, size: size, nmemb: nmemb, contentLength: length)
         }.asError()
 
         // socket options
@@ -513,11 +512,10 @@ fileprivate extension _EasyHandle {
     /// data.
     ///
     /// - SeeAlso: <https://curl.haxx.se/libcurl/c/CURLOPT_HEADERFUNCTION.html>
-    func didReceive(headerData data: UnsafeMutablePointer<Int8>, size: Int, nmemb: Int, fileLength: Double) -> Int {
-        self.fileLength = Int64(fileLength)
+    func didReceive(headerData data: UnsafeMutablePointer<Int8>, size: Int, nmemb: Int, contentLength: Double) -> Int {
         let d: Int = {
             let buffer = Data(bytes: data, count: size*nmemb)
-            switch delegate?.didReceive(headerData: buffer) {
+            switch delegate?.didReceive(headerData: buffer, contentLength: Int64(contentLength)) {
             case .some(.proceed): return size * nmemb
             case .some(.abort): return 0
             case .some(.pause):

Foundation/NSURLSession/http/HTTPURLProtocol.swift

@@ -13,9 +13,6 @@ import Dispatch
 internal class _HTTPURLProtocol: URLProtocol {
 
     fileprivate var easyHandle: _EasyHandle!
-    fileprivate var totalDownloaded = 0
-    fileprivate var totalUploaded: Int64 = 0
-    fileprivate var requestBodyLength: Int64 = 0
     fileprivate var tempFileURL: URL
 
     public required init(task: URLSessionTask, cachedResponse: CachedURLResponse?, client: URLProtocolClient?) {
@@ -129,7 +126,7 @@ fileprivate extension _HTTPURLProtocol {
                 set(requestBodyLength: .noBody)
             case (_, .some(let length)):
                 set(requestBodyLength: .length(length))
-                requestBodyLength = Int64(length)
+                task!.countOfBytesExpectedToSend = Int64(length)
             case (_, .none):
                 set(requestBodyLength: .unknown)
             }
@@ -469,21 +466,23 @@ extension _HTTPURLProtocol: _EasyHandleDelegate {
             let fileHandle = try! FileHandle(forWritingTo: self.tempFileURL)
             _ = fileHandle.seekToEndOfFile()
             fileHandle.write(data)
-            self.totalDownloaded += data.count
+            task.countOfBytesReceived += Int64(data.count)
 
             s.delegateQueue.addOperation {
-                downloadDelegate.urlSession(s, downloadTask: task, didWriteData: Int64(data.count), totalBytesWritten: Int64(self.totalDownloaded),
-                                            totalBytesExpectedToWrite: Int64(self.easyHandle.fileLength))
+                downloadDelegate.urlSession(s, downloadTask: task, didWriteData: Int64(data.count), totalBytesWritten: task.countOfBytesReceived,
+                                            totalBytesExpectedToWrite: task.countOfBytesExpectedToReceive)
             }
-            if Int(self.easyHandle.fileLength) == self.totalDownloaded {
+            if task.countOfBytesExpectedToReceive == task.countOfBytesReceived {
                 fileHandle.closeFile()
                 self.properties[.temporaryFileURL] = self.tempFileURL
             }
         }
     }
 
-    func didReceive(headerData data: Data) -> _EasyHandle._Action {
-        guard case .transferInProgress(let ts) = internalState else { fatalError("Received body data, but no transfer in progress.") }
+    func didReceive(headerData data: Data, contentLength: Int64) -> _EasyHandle._Action {
+        guard case .transferInProgress(let ts) = internalState else { fatalError("Received header data, but no transfer in progress.") }
+        guard let task = task else { fatalError("Received header data but no task available.") }
+        task.countOfBytesExpectedToReceive = contentLength > 0 ? contentLength : NSURLSessionTransferSizeUnknown
         do {
             let newTS = try ts.byAppending(headerLine: data)
             internalState = .transferInProgress(newTS)
@@ -499,12 +498,13 @@ extension _HTTPURLProtocol: _EasyHandleDelegate {
     }
 
     fileprivate func notifyDelegate(aboutUploadedData count: Int64) {
-        let session = self.task?.session as! URLSession
-        guard case .taskDelegate(let delegate) = session.behaviour(for: self.task!), self.task is URLSessionUploadTask else { return }
-        totalUploaded += count
+        guard let task = self.task as? URLSessionUploadTask,
+            let session = self.task?.session as? URLSession,
+            case .taskDelegate(let delegate) = session.behaviour(for: task) else { return }
+        task.countOfBytesSent += count
         session.delegateQueue.addOperation {
-            delegate.urlSession(session, task: self.task!, didSendBodyData: count,
-                totalBytesSent: self.totalUploaded, totalBytesExpectedToSend: self.requestBodyLength)
+            delegate.urlSession(session, task: task, didSendBodyData: count,
+                totalBytesSent: task.countOfBytesSent, totalBytesExpectedToSend: task.countOfBytesExpectedToSend)
         }
     }