From a79279b8c8fd9dcadeb70633f72d948ed13d4c28 Mon Sep 17 00:00:00 2001
From: Scott Talbot <stalbot@scentregroup.com>
Date: Thu, 2 May 2019 20:36:55 +1000
Subject: [PATCH] Execute more things on the session data task's queue

---
 Sources/DVR/SessionDataTask.swift | 34 ++++++++++++++++---------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/Sources/DVR/SessionDataTask.swift b/Sources/DVR/SessionDataTask.swift
index d7390d5..8afa464 100644
--- a/Sources/DVR/SessionDataTask.swift
+++ b/Sources/DVR/SessionDataTask.swift
@@ -48,16 +48,14 @@ final class SessionDataTask: URLSessionDataTask {
         // Find interaction
         if let interaction = session.cassette?.interactionForRequest(request) {
             self.interaction = interaction
-            // Forward completion
-            if let completion = completion {
-                queue.async {
-                    completion(interaction.responseData, interaction.response, nil)
-                }
-            }
-
             queue.async { [weak self] in
                 guard let self = self else {
-                    return
+                    fatalError("[DVR] Something has gone horribly wrong.")
+                }
+
+                // Forward completion
+                if let completion = self.completion {
+                    completion(interaction.responseData, interaction.response, nil)
                 }
 
                 self._state = .completed
@@ -82,20 +80,24 @@ final class SessionDataTask: URLSessionDataTask {
                 fatalError("[DVR] Failed to record because the task returned a nil response.")
             }
 
-            guard let this = self else {
+            guard let self = self else {
                 fatalError("[DVR] Something has gone horribly wrong.")
             }
 
             // Still call the completion block so the user can chain requests while recording.
-            this.queue.async {
-                this.completion?(data, response, nil)
-            }
+            self.queue.async { [weak self] in
+                guard let self = self else {
+                    fatalError("[DVR] Something has gone horribly wrong.")
+                }
 
-            this._state = .completed
+                self.completion?(data, response, nil)
 
-            // Create interaction
-            this.interaction = Interaction(request: this.request, response: response, responseData: data)
-            this.session.finishTask(this, interaction: this.interaction!, playback: false)
+                self._state = .completed
+
+                // Create interaction
+                self.interaction = Interaction(request: self.request, response: response, responseData: data)
+                self.session.finishTask(self, interaction: self.interaction!, playback: false)
+            }
         })
         task.resume()
     }