Merge branch 'release/1.3'

Apollo.xcodeproj/project.pbxproj

@@ -786,7 +786,6 @@
 		E69BEDA52798B86D00000D10 /* InputObjectTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E69BEDA42798B86D00000D10 /* InputObjectTemplate.swift */; };
 		E69BEDA72798B89600000D10 /* InputObjectTemplateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E69BEDA62798B89600000D10 /* InputObjectTemplateTests.swift */; };
 		E69F436C29B81182006FF548 /* InterceptorRequestChain.swift in Sources */ = {isa = PBXBuildFile; fileRef = E69F436B29B81182006FF548 /* InterceptorRequestChain.swift */; };
-		E69F436E29B812FC006FF548 /* ApolloInterceptorReentrantWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = E69F436D29B812FC006FF548 /* ApolloInterceptorReentrantWrapper.swift */; };
 		E69F437229BBD958006FF548 /* MultipartResponseParsingInterceptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = E69F437129BBD958006FF548 /* MultipartResponseParsingInterceptor.swift */; };
 		E6A6866427F63AEF008A1D13 /* FileGeneratorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6A6866327F63AEF008A1D13 /* FileGeneratorTests.swift */; };
 		E6A6866627F63BDC008A1D13 /* FileGenerator_ResolvePath_Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6A6866527F63BDC008A1D13 /* FileGenerator_ResolvePath_Tests.swift */; };
@@ -1971,7 +1970,6 @@
 		E69BEDA42798B86D00000D10 /* InputObjectTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InputObjectTemplate.swift; sourceTree = "<group>"; };
 		E69BEDA62798B89600000D10 /* InputObjectTemplateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InputObjectTemplateTests.swift; sourceTree = "<group>"; };
 		E69F436B29B81182006FF548 /* InterceptorRequestChain.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InterceptorRequestChain.swift; sourceTree = "<group>"; };
-		E69F436D29B812FC006FF548 /* ApolloInterceptorReentrantWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApolloInterceptorReentrantWrapper.swift; sourceTree = "<group>"; };
 		E69F437129BBD958006FF548 /* MultipartResponseParsingInterceptor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultipartResponseParsingInterceptor.swift; sourceTree = "<group>"; };
 		E6A6866327F63AEF008A1D13 /* FileGeneratorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileGeneratorTests.swift; sourceTree = "<group>"; };
 		E6A6866527F63BDC008A1D13 /* FileGenerator_ResolvePath_Tests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileGenerator_ResolvePath_Tests.swift; sourceTree = "<group>"; };
@@ -2329,7 +2327,6 @@
 			children = (
 				9BC742AF24D09F880029282C /* DefaultInterceptors */,
 				9B260BEA245A020300562176 /* ApolloInterceptor.swift */,
-				E69F436D29B812FC006FF548 /* ApolloInterceptorReentrantWrapper.swift */,
 				9BC742AB24CFB2FF0029282C /* ApolloErrorInterceptor.swift */,
 				9B260C07245A437400562176 /* InterceptorProvider.swift */,
 			);
@@ -5513,7 +5510,6 @@
 				DE100B18287F3FB100BE11C2 /* Documentation.docc in Sources */,
 				9FA6F3681E65DF4700BF8D73 /* GraphQLResultAccumulator.swift in Sources */,
 				9FF90A651DDDEB100034C3B6 /* GraphQLExecutor.swift in Sources */,
-				E69F436E29B812FC006FF548 /* ApolloInterceptorReentrantWrapper.swift in Sources */,
 				9BDE43DF22C6708600FD7C7F /* GraphQLHTTPRequestError.swift in Sources */,
 				9B1CCDD92360F02C007C9032 /* Bundle+Helpers.swift in Sources */,
 				9B260BF5245A028D00562176 /* HTTPResponse.swift in Sources */,

Sources/Apollo/ApolloInterceptor.swift

@@ -4,6 +4,8 @@ import ApolloAPI
 
 /// A protocol to set up a chainable unit of networking work.
 public protocol ApolloInterceptor {
+
+  var id: String { get set }
 
   /// Called when this interceptor should do its work.
   ///

Sources/Apollo/AutomaticPersistedQueryInterceptor.swift

@@ -23,6 +23,8 @@ public struct AutomaticPersistedQueryInterceptor: ApolloInterceptor {
       }
     }
   }
+
+  public var id: String = UUID().uuidString
 
   /// Designated initializer
   public init() {}
@@ -36,35 +38,46 @@ public struct AutomaticPersistedQueryInterceptor: ApolloInterceptor {
       guard let jsonRequest = request as? JSONRequest,
             jsonRequest.autoPersistQueries else {
         // Not a request that handles APQs, continue along
-        chain.proceedAsync(request: request,
-                           response: response,
-                           completion: completion)
+        chain.proceedAsync(
+          request: request,
+          response: response,
+          interceptor: self,
+          completion: completion
+        )
         return
       }
 
       guard let result = response?.parsedResponse else {
         // This is in the wrong order - this needs to be parsed before we can check it.
-        chain.handleErrorAsync(APQError.noParsedResponse,
-                               request: request,
-                               response: response,
-                               completion: completion)
+        chain.handleErrorAsync(
+          APQError.noParsedResponse,
+          request: request,
+          response: response,
+          completion: completion
+        )
         return
       }
 
       guard let errors = result.errors else {
         // No errors were returned so no retry is necessary, continue along.
-        chain.proceedAsync(request: request,
-                           response: response,
-                           completion: completion)
+        chain.proceedAsync(
+          request: request,
+          response: response,
+          interceptor: self,
+          completion: completion
+        )
         return
       }
 
       let errorMessages = errors.compactMap { $0.message }
       guard errorMessages.contains("PersistedQueryNotFound") else {
         // The errors were not APQ errors, continue along.
-        chain.proceedAsync(request: request,
-                           response: response,
-                           completion: completion)
+        chain.proceedAsync(
+          request: request,
+          response: response,
+          interceptor: self,
+          completion: completion
+        )
         return
       }
 
@@ -93,7 +106,6 @@ public struct AutomaticPersistedQueryInterceptor: ApolloInterceptor {
 
       // We need to retry this query with the full body.
       jsonRequest.isPersistedQueryRetry = true
-      chain.retry(request: jsonRequest,
-                  completion: completion)
+      chain.retry(request: jsonRequest, completion: completion)
     }
 }

Sources/Apollo/CacheReadInterceptor.swift

@@ -1,3 +1,4 @@
+import Foundation
 #if !COCOAPODS
 import ApolloAPI
 #endif
@@ -6,6 +7,8 @@ import ApolloAPI
 public struct CacheReadInterceptor: ApolloInterceptor {
 
   private let store: ApolloStore
+
+  public var id: String = UUID().uuidString
 
   /// Designated initializer
   ///
@@ -24,62 +27,86 @@ public struct CacheReadInterceptor: ApolloInterceptor {
       case .mutation,
           .subscription:
         // Mutations and subscriptions don't need to hit the cache.
-        chain.proceedAsync(request: request,
-                           response: response,
-                           completion: completion)
+        chain.proceedAsync(
+          request: request,
+          response: response,
+          interceptor: self,
+          completion: completion
+        )
+
       case .query:
         switch request.cachePolicy {
         case .fetchIgnoringCacheCompletely,
             .fetchIgnoringCacheData:
           // Don't bother with the cache, just keep going
-          chain.proceedAsync(request: request,
-                             response: response,
-                             completion: completion)
+          chain.proceedAsync(
+            request: request,
+            response: response,
+            interceptor: self,
+            completion: completion
+          )
+
         case .returnCacheDataAndFetch:
           self.fetchFromCache(for: request, chain: chain) { cacheFetchResult in
             switch cacheFetchResult {
             case .failure:
               // Don't return a cache miss error, just keep going
               break
             case .success(let graphQLResult):
-              chain.returnValueAsync(for: request,
-                                     value: graphQLResult,
-                                     completion: completion)
+              chain.returnValueAsync(
+                for: request,
+                value: graphQLResult,
+                completion: completion
+              )
             }
 
             // In either case, keep going asynchronously
-            chain.proceedAsync(request: request,
-                               response: response,
-                               completion: completion)
+            chain.proceedAsync(
+              request: request,
+              response: response,
+              interceptor: self,
+              completion: completion
+            )
           }
         case .returnCacheDataElseFetch:
           self.fetchFromCache(for: request, chain: chain) { cacheFetchResult in
             switch cacheFetchResult {
             case .failure:
               // Cache miss, proceed to network without returning error
-              chain.proceedAsync(request: request,
-                                 response: response,
-                                 completion: completion)
+              chain.proceedAsync(
+                request: request,
+                response: response,
+                interceptor: self,
+                completion: completion
+              )
+
             case .success(let graphQLResult):
               // Cache hit! We're done.
-              chain.returnValueAsync(for: request,
-                                     value: graphQLResult,
-                                     completion: completion)
+              chain.returnValueAsync(
+                for: request,
+                value: graphQLResult,
+                completion: completion
+              )
             }
           }
         case .returnCacheDataDontFetch:
           self.fetchFromCache(for: request, chain: chain) { cacheFetchResult in
             switch cacheFetchResult {
             case .failure(let error):
               // Cache miss - don't hit the network, just return the error.
-              chain.handleErrorAsync(error,
-                                     request: request,
-                                     response: response,
-                                     completion: completion)
+              chain.handleErrorAsync(
+                error,
+                request: request,
+                response: response,
+                completion: completion
+              )
+
             case .success(let result):
-              chain.returnValueAsync(for: request,
-                                     value: result,
-                                     completion: completion)
+              chain.returnValueAsync(
+                for: request,
+                value: result,
+                completion: completion
+              )
             }
           }
         }