From 7fc98fcdf6e63364502c3591909b0dfc9381fb57 Mon Sep 17 00:00:00 2001
From: Harshdeep Singh <6162866+harsh62@users.noreply.github.com>
Date: Tue, 8 Apr 2025 22:35:47 -0400
Subject: [PATCH] fix(api): handle ns error code 57

---
 .../WebSocket/WebSocketClient.swift           | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/AmplifyPlugins/Core/AWSPluginsCore/WebSocket/WebSocketClient.swift b/AmplifyPlugins/Core/AWSPluginsCore/WebSocket/WebSocketClient.swift
index e2e8c85503..81a830d308 100644
--- a/AmplifyPlugins/Core/AWSPluginsCore/WebSocket/WebSocketClient.swift
+++ b/AmplifyPlugins/Core/AWSPluginsCore/WebSocket/WebSocketClient.swift
@@ -201,15 +201,31 @@ public final actor WebSocketClient: NSObject {
             @unknown default:
                 break
             }
+            
+            // Only continue reading if no error occurred
+            await self.startReadMessage()
         } catch {
             if connection.state == .running {
-                subject.send(.error(error))
+                // Check specifically for ENOTCONN errors
+                let nsError = error as NSError
+                if nsError.domain == NSPOSIXErrorDomain, nsError.code == 57 { // ENOTCONN
+                    log.debug("[WebSocketClient] Socket is not connected (ENOTCONN), stopping read loop")
+                    self.subject.send(.error(WebSocketClient.Error.connectionLost))
+                    // Don't recursively call startReadMessage for ENOTCONN
+                    return
+                } else {
+                    subject.send(.error(error))
+                }
             } else {
                 log.debug("[WebSocketClient] read message failed with connection state \(connection.state), error \(error)")
             }
+            
+            // For other errors, we can try again with a small delay to avoid tight loops
+            Task {
+                try? await Task.sleep(nanoseconds: 100_000_000) // 100ms delay
+                await self.startReadMessage()
+            }
         }
-
-        await self.startReadMessage()
     }
 }
 
@@ -249,7 +265,8 @@ extension WebSocketClient: URLSessionWebSocketDelegate {
         let nsError = error as NSError
         switch (nsError.domain, nsError.code) {
         case (NSURLErrorDomain.self, NSURLErrorNetworkConnectionLost), // connection lost
-             (NSPOSIXErrorDomain.self, Int(ECONNABORTED)): // background to foreground
+             (NSPOSIXErrorDomain.self, Int(ECONNABORTED)), // background to foreground
+             (NSPOSIXErrorDomain.self, 57): // ENOTCONN - Socket is not connected
             self.subject.send(.error(WebSocketClient.Error.connectionLost))
             Task { [weak self] in
                 await self?.networkMonitor.updateState(.offline)