SessionDelegate is now properly called

Author: wpK

Sources/Apollo/GraphQLFile.swift

@@ -10,12 +10,18 @@ public struct GraphQLFile {
   }
 
   public init?(fieldName: String, originalName: String, mimeType: String = "application/octet-stream", fileURL: URL) {
-    if let inputStream = InputStream(url: fileURL) {
-      let contentLength = GraphQLFile.getFileSize(fileURL: fileURL)
-      self.init(fieldName: fieldName, originalName: originalName, mimeType: mimeType, inputStream: inputStream, contentLength: contentLength)
+    // TODO: Better error handling
+    
+    
+    guard let inputStream = InputStream(url: fileURL) else {
+      return nil
+    }
+    
+    guard let contentLength = GraphQLFile.getFileSize(fileURL: fileURL) else {
+      return nil
     }
 
-    return nil
+    self.init(fieldName: fieldName, originalName: originalName, mimeType: mimeType, inputStream: inputStream, contentLength: contentLength)
   }
 
   public init(fieldName: String, originalName: String, mimeType: String = "application/octet-stream", inputStream: InputStream, contentLength: UInt64) {
@@ -27,17 +33,17 @@ public struct GraphQLFile {
     self.contentLength = contentLength
   }
 
-  private static func getFileSize(fileURL: URL) -> UInt64 {
+  private static func getFileSize(fileURL: URL) -> UInt64? {
     let fileSize: UInt64
 
     do {
       guard let fileSize = try FileManager.default.attributesOfItem(atPath: fileURL.path)[.size] as? NSNumber else {
-        return 0
+        return nil
       }
 
       return fileSize.uint64Value
     } catch {
-      return 0
+      return nil
     }
   }
 }

Sources/Apollo/HTTPNetworkTransport.swift

@@ -97,7 +97,7 @@ public class HTTPNetworkTransport: NetworkTransport {
       request.httpBody = try! serializationFormat.serialize(value: body)
     }
 
-    let task = session.dataTask(with: request) { (data: Data?, response: URLResponse?, error: Error?) in
+    func notifyCompletionHandler(data: Data?, response: URLResponse?, error: Error?) {
       if error != nil {
         completionHandler(nil, error)
         return
@@ -128,9 +128,9 @@ public class HTTPNetworkTransport: NetworkTransport {
       }
     }
 
-    if let progressHandler = progressHandler {
-      self.sessionDelegate.add(task: task, progressHandler: progressHandler)
-    }
+    let task = session.dataTask(with: request)
+    
+    self.sessionDelegate.add(task: task, completionHandler: notifyCompletionHandler, progressHandler: progressHandler)
 
     task.resume()
 

Sources/Apollo/SessionDelegate.swift

@@ -1,38 +1,67 @@
 class SessionDelegate: NSObject {
+  class SessionDelegateTask {
+    let completionHandler: (Data?, URLResponse?, Error?) -> Void
+    let progressHandler: ((Progress) -> Void)?
+    var data = Data()
+    
+    init(completionHandler: @escaping  (Data?, URLResponse?, Error?) -> Void, progressHandler: ((Progress) -> Void)? = nil) {
+      self.completionHandler = completionHandler
+      self.progressHandler = progressHandler
+    }
+    
+    func didReceiveData(data: Data) {
+      self.data.append(data)
+    }
+  }
 
-  private var tasks: [Int: (Progress) -> Void] = [:]
-  private let lock = NSLock()
+  private var tasks: [Int: SessionDelegateTask] = [:]
+  private let lock = Mutex()
 
-  func add(task: URLSessionTask, progressHandler: @escaping (Progress) -> Void) {
-    lock.lock()
-    defer { lock.unlock() }
+  func add(task: URLSessionTask, completionHandler: @escaping (Data?, URLResponse?, Error?) -> Void, progressHandler: ((Progress) -> Void)? = nil) {
+    self.lock.lock()
+    defer { self.lock.unlock() }
 
-    self.tasks[task.taskIdentifier] = progressHandler
+    self.tasks[task.taskIdentifier] = SessionDelegateTask(completionHandler: completionHandler, progressHandler: progressHandler)
   }
 
-  func get(task: URLSessionTask) -> ((Progress) -> Void)? {
-    lock.lock()
-    defer { lock.unlock() }
-    
-    return self.tasks[task.taskIdentifier]
+  func get(task: URLSessionTask) -> SessionDelegateTask? {
+    return lock.withLock {
+      return self.tasks[task.taskIdentifier]
+    }
   }
 
   func remove(task: URLSessionTask) {
-    lock.lock()
-    defer { lock.unlock() }
+    self.lock.lock()
+    defer { self.lock.unlock() }
 
     self.tasks.removeValue(forKey: task.taskIdentifier)
   }
 }
 
+extension SessionDelegate: URLSessionDataDelegate {
+  func urlSession(_ session: URLSession, dataTask: URLSessionDataTask, didReceive response: URLResponse, completionHandler: @escaping (URLSession.ResponseDisposition) -> Swift.Void) {
+    completionHandler(URLSession.ResponseDisposition.allow)
+  }
+}
+
 extension SessionDelegate: URLSessionTaskDelegate {
   func urlSession(_ session: URLSession, task: URLSessionTask, didSendBodyData bytesSent: Int64, totalBytesSent: Int64, totalBytesExpectedToSend: Int64) {
-    if let progressHandler = self.get(task: task) {
+    if let sessionTask = self.get(task: task), let progressHandler = sessionTask.progressHandler {
       progressHandler(Progress((totalBytesSent/totalBytesExpectedToSend)) * 100)
     }
   }
 
+  func urlSession(_ session: URLSession, dataTask: URLSessionDataTask, didReceive data: Data) {
+    if let sessionTask = self.get(task: dataTask) {
+      sessionTask.didReceiveData(data: data)
+    }
+  }
+  
   func urlSession(_ session: URLSession, task: URLSessionTask, didCompleteWithError error: Error?) {
-    self.remove(task: task)
+    if let sessionTask = self.get(task: task) {
+      self.remove(task: task)
+      
+      sessionTask.completionHandler(sessionTask.data, task.response, error)
+    }
   }
 }