fix(datastore): propagate connectionLost URLError

aws-amplify · Aug 7, 2024 · 7027a44 · 7027a44
1 parent 179fa3f
commit 7027a44
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/AmplifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncRealTimeClient.swift b/AmplifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncRealTimeClient.swift
@@ -224,7 +224,7 @@ actor AppSyncRealTimeClient: AppSyncRealTimeClientProtocol {
             log.debug("[AppSyncRealTimeClient] start subscription failed, could not found subscription with id \(id) ")
             throw APIError.unknown("Could not find a subscription with id \(id)", "", nil)
         }
-        log.debug("[AppSyncRealTimeClient] current number of subscriptions: \(numberOfSubscriptions)")
+
         try await subscription.subscribe()
 
         return AnyCancellable {

diff --git a/AmplifyPlugins/API/Sources/AWSAPIPlugin/Operation/AWSGraphQLSubscriptionTaskRunner.swift b/AmplifyPlugins/API/Sources/AWSAPIPlugin/Operation/AWSGraphQLSubscriptionTaskRunner.swift
@@ -408,14 +408,7 @@ fileprivate func toAPIError<R: Decodable>(_ errors: [Error], type: R.Type) -> AP
         )
 
     case let errors as [WebSocketClient.Error]:
-        if errors.contains(where: { $0 == .connectionCancelled || $0 == .connectionLost}) {
-            return APIError.networkError("WebSocketClient connection aborted", nil, errors.first)
-        }
-        return APIError.operationError(
-            errorDescription(),
-            "",
-            errors.first
-        )
+        return APIError.networkError("WebSocketClient connection aborted", nil, URLError(.networkConnectionLost))
     default:
         return APIError.operationError(
             errorDescription(),

diff --git a/AmplifyPlugins/Core/AWSPluginsCore/WebSocket/AmplifyNetworkMonitor.swift b/AmplifyPlugins/Core/AWSPluginsCore/WebSocket/AmplifyNetworkMonitor.swift
@@ -5,7 +5,6 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-
 import Network
 import Combine
 
@@ -38,6 +37,7 @@ public final class AmplifyNetworkMonitor {
             label: "com.amazonaws.amplify.ios.network.websocket.monitor",
             qos: .userInitiated
         ))
+
     }
 
     public func updateState(_ nextState: State) {
@@ -48,4 +48,5 @@ public final class AmplifyNetworkMonitor {
         subject.send(completion: .finished)
         monitor.cancel()
     }
+
 }
diff --git a/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/RemoteSyncEngine+Retryable.swift b/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/RemoteSyncEngine+Retryable.swift
@@ -16,6 +16,7 @@ extension RemoteSyncEngine {
     }
 
     func scheduleRestartOrTerminate(error: AmplifyError) {
+        Self.log.debug("scheduling restart or terminate on error: \(error)")
         let advice = getRetryAdvice(error: error)
         if advice.shouldRetry {
             scheduleRestart(advice: advice)