Throw ServerAPIError.taskCancelled for task cancellation.

Author: jonnyholland

Sources/ComposableArchitecturePattern/Server.swift

@@ -94,7 +94,7 @@ public extension Server {
 			try Task.checkCancellation()
 		} catch {
 			self.logger.info("\(Date()) - (\(requestUID)) Request to \(String(describing: api.path)) [Cancelled]")
-			throw error
+			throw ServerAPIError.taskCancelled(error: error)
 		}
 
 		let request = try api.request(.GET, in: self.currentEnvironment, additionalHeaders: self.additionalHTTPHeaders, additionalQueries: queries, httpBodyOverride: httpBody, timeoutInterval: timeoutInterval)
@@ -104,7 +104,7 @@ public extension Server {
 			try Task.checkCancellation()
 		} catch {
 			self.logger.info("\(Date()) - (\(requestUID)) Request to \(String(describing: request.url?.description)) [Cancelled]")
-			throw error
+			throw ServerAPIError.taskCancelled(error: error)
 		}
 
 		return decoded
@@ -127,7 +127,7 @@ public extension Server {
 			try Task.checkCancellation()
 		} catch {
 			self.logger.info("\(Date()) - (\(requestUID)) Request to \(String(describing: api.path)) [Cancelled]")
-			throw error
+			throw ServerAPIError.taskCancelled(error: error)
 		}
 
 		let request = try api.request(.POST, in: self.currentEnvironment, additionalHeaders: self.additionalHTTPHeaders, additionalQueries: queries, httpBodyOverride: httpBody, timeoutInterval: timeoutInterval)
@@ -137,7 +137,7 @@ public extension Server {
 			try Task.checkCancellation()
 		} catch {
 			self.logger.info("\(Date()) - (\(requestUID)) Request to \(String(describing: request.url?.description)) [Cancelled]")
-			throw error
+			throw ServerAPIError.taskCancelled(error: error)
 		}
 
 		return decoded
@@ -157,7 +157,7 @@ public extension Server {
 			try Task.checkCancellation()
 		} catch {
 			self.logger.info("\(Date()) - (\(requestUID)) Request to \(String(describing: api.path)) [Cancelled]")
-			throw error
+			throw ServerAPIError.taskCancelled(error: error)
 		}
 
 		let request = try api.request(.POST, in: self.currentEnvironment, additionalHeaders: self.additionalHTTPHeaders, additionalQueries: queries, httpBodyOverride: httpBody, timeoutInterval: timeoutInterval)
@@ -167,7 +167,7 @@ public extension Server {
 			try Task.checkCancellation()
 		} catch {
 			self.logger.info("\(Date()) - (\(requestUID)) Request to \(String(describing: request.url?.description)) [Cancelled]")
-			throw error
+			throw ServerAPIError.taskCancelled(error: error)
 		}
 
 		return wasSuccessful
@@ -191,7 +191,7 @@ public extension Server {
 			try Task.checkCancellation()
 		} catch {
 			self.logger.info("\(Date()) - (\(requestUID)) Request to \(String(describing: api.path)) [Cancelled]")
-			throw error
+			throw ServerAPIError.taskCancelled(error: error)
 		}
 
 		let request = try api.request(.PUT, in: self.currentEnvironment, additionalHeaders: self.additionalHTTPHeaders, additionalQueries: queries, httpBodyOverride: httpBody, timeoutInterval: timeoutInterval)
@@ -201,7 +201,7 @@ public extension Server {
 			try Task.checkCancellation()
 		} catch {
 			self.logger.info("\(Date()) - (\(requestUID)) Request to \(String(describing: request.url?.description)) [Cancelled]")
-			throw error
+			throw ServerAPIError.taskCancelled(error: error)
 		}
 
 		return decoded
@@ -222,7 +222,7 @@ public extension Server {
 			try Task.checkCancellation()
 		} catch {
 			self.logger.info("\(Date()) - (\(requestUID)) Request to \(String(describing: api.path)) [Cancelled]")
-			throw error
+			throw ServerAPIError.taskCancelled(error: error)
 		}
 
 		let request = try api.request(.PUT, in: self.currentEnvironment, additionalHeaders: self.additionalHTTPHeaders, additionalQueries: queries, httpBodyOverride: httpBody, timeoutInterval: timeoutInterval)
@@ -232,7 +232,7 @@ public extension Server {
 			try Task.checkCancellation()
 		} catch {
 			self.logger.info("\(Date()) - (\(requestUID)) Request to \(String(describing: request.url?.description)) [Cancelled]")
-			throw error
+			throw ServerAPIError.taskCancelled(error: error)
 		}
 
 		return wasSuccessful
@@ -255,7 +255,7 @@ public extension Server {
 			try Task.checkCancellation()
 		} catch {
 			self.logger.info("\(Date()) - (\(requestUID)) Request to \(String(describing: api.path)) [Cancelled]")
-			throw error
+			throw ServerAPIError.taskCancelled(error: error)
 		}
 
 		let request = try api.request(.DELETE, in: self.currentEnvironment, additionalHeaders: self.additionalHTTPHeaders, additionalQueries: queries, httpBodyOverride: httpBody, timeoutInterval: timeoutInterval)
@@ -265,7 +265,7 @@ public extension Server {
 			try Task.checkCancellation()
 		} catch {
 			self.logger.info("\(Date()) - (\(requestUID)) Request to \(String(describing: request.url?.description)) [Cancelled]")
-			throw error
+			throw ServerAPIError.taskCancelled(error: error)
 		}
 
 		return decoded
@@ -285,7 +285,7 @@ public extension Server {
 			try Task.checkCancellation()
 		} catch {
 			self.logger.info("\(Date()) - (\(requestUID)) Request to \(String(describing: api.path)) [Cancelled]")
-			throw error
+			throw ServerAPIError.taskCancelled(error: error)
 		}
 
 		let request = try api.request(.DELETE, in: self.currentEnvironment, additionalHeaders: self.additionalHTTPHeaders, additionalQueries: queries, httpBodyOverride: httpBody, timeoutInterval: timeoutInterval)
@@ -295,7 +295,7 @@ public extension Server {
 			try Task.checkCancellation()
 		} catch {
 			self.logger.info("\(Date()) - (\(requestUID)) Request to \(String(describing: request.url?.description)) [Cancelled]")
-			throw error
+			throw ServerAPIError.taskCancelled(error: error)
 		}
 
 		return wasSuccessful

Sources/ComposableArchitecturePattern/ServerAPIError.swift

@@ -21,6 +21,8 @@ public enum ServerAPIError: Error {
 	case notImplemented(description: String? = nil)
 	/// An error occurred with the server.
 	case server(description: String? = nil, httpStatusCode: Int, jsonObject: Any? = nil)
+	/// A task cancellation occurred.
+	case taskCancelled(description: String? = nil, error: Error? = nil)
 	/// An error occurred while attempting to decode.
 	case unableToDecode(description: String? = nil, error: Error? = nil)
 	/// An error occurred while attempting to parse data.