0.47.0

dankinsoid · Mar 24, 2024 · 6f1fb78 · 6f1fb78
1 parent 9633d73
commit 6f1fb78
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -257,7 +257,7 @@ import PackageDescription
 let package = Package(
   name: "SomeProject",
   dependencies: [
-    .package(url: "https://github.com/dankinsoid/swift-api-client.git", from: "0.46.0")
+    .package(url: "https://github.com/dankinsoid/swift-api-client.git", from: "0.47.0")
   ],
   targets: [
     .target(

diff --git a/Sources/SwiftAPIClient/Modifiers/BackgroundModifiers.swift b/Sources/SwiftAPIClient/Modifiers/BackgroundModifiers.swift
@@ -47,19 +47,23 @@ private struct RetryOnEnterForegroundMiddleware: HTTPClientMiddleware {
 		configs: APIClient.Configs,
 		next: (URLRequest, APIClient.Configs) async throws -> (T, HTTPURLResponse)
 	) async throws -> (T, HTTPURLResponse) {
-		let wasInBackground = WasInBackgroundService()
-		let isInBackground = await UIApplication.shared.applicationState == .background
-		if !isInBackground {
-			await wasInBackground.start()
-		}
-		do {
-			return try await next(request, configs)
-		} catch {
-			if await wasInBackground.wasInBackground {
+		func makeRequest() async throws -> (T, HTTPURLResponse) {
+			let wasInBackground = WasInBackgroundService()
+			var isInBackground = await UIApplication.shared.applicationState == .background
+			if !isInBackground {
+				await wasInBackground.start()
+			}
+			do {
 				return try await next(request, configs)
+			} catch {
+				isInBackground = await UIApplication.shared.applicationState == .background
+				if !isInBackground, await wasInBackground.wasInBackground {
+					return try await makeRequest()
+				}
+				throw error
 			}
-			throw error
 		}
+		return try await makeRequest()
 	}
 }