Skip to content

Commit 964d643

Browse files
committed
Revert "fix(api): fix subscription failures (#3998)"
This reverts commit 70f56f6.
1 parent c46cd42 commit 964d643

File tree

1 file changed

+7
-18
lines changed

1 file changed

+7
-18
lines changed

AmplifyPlugins/Core/AWSPluginsCore/WebSocket/WebSocketClient.swift

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -248,13 +248,8 @@ extension WebSocketClient: URLSessionWebSocketDelegate {
248248

249249
let nsError = error as NSError
250250
switch (nsError.domain, nsError.code) {
251-
case (NSURLErrorDomain.self, NSURLErrorNetworkConnectionLost),
252-
(NSURLErrorDomain.self, NSURLErrorCannotConnectToHost),
253-
(NSURLErrorDomain.self, NSURLErrorTimedOut),
254-
(NSURLErrorDomain.self, NSURLErrorNotConnectedToInternet),
255-
(NSURLErrorDomain.self, NSURLErrorDataNotAllowed),
256-
(NSPOSIXErrorDomain.self, Int(ECONNABORTED)),
257-
(NSPOSIXErrorDomain.self, 57):
251+
case (NSURLErrorDomain.self, NSURLErrorNetworkConnectionLost), // connection lost
252+
(NSPOSIXErrorDomain.self, Int(ECONNABORTED)): // background to foreground
258253
self.subject.send(.error(WebSocketClient.Error.connectionLost))
259254
Task { [weak self] in
260255
await self?.networkMonitor.updateState(.offline)
@@ -288,11 +283,11 @@ extension WebSocketClient {
288283
}
289284

290285
switch stateChange {
291-
case (.online, .offline), (.none, .offline), (.online, .none):
292-
log.debug("[WebSocketClient] NetworkMonitor - Device went offline or network status became unknown")
286+
case (.online, .offline):
287+
log.debug("[WebSocketClient] NetworkMonitor - Device went offline")
293288
self.connection?.cancel(with: .invalid, reason: nil)
294289
self.subject.send(.disconnected(.invalid, nil))
295-
case (.offline, .online), (.none, .online):
290+
case (.offline, .online):
296291
log.debug("[WebSocketClient] NetworkMonitor - Device back online")
297292
await self.createConnectionAndRead()
298293
default:
@@ -340,19 +335,13 @@ extension WebSocketClient {
340335
}
341336

342337
switch closeCode {
343-
case .internalServerError,
344-
.abnormalClosure,
345-
.invalid,
346-
.policyViolation:
347-
log.debug("[WebSocketClient] Retrying on closeCode: \(closeCode)")
338+
case .internalServerError:
348339
let delayInMs = await retryWithJitter.next()
349340
Task { [weak self] in
350341
try await Task.sleep(nanoseconds: UInt64(delayInMs) * 1_000_000)
351342
await self?.createConnectionAndRead()
352343
}
353-
default:
354-
log.debug("[WebSocketClient] Not retrying for closeCode: \(closeCode)")
355-
break
344+
default: break
356345
}
357346

358347
}

0 commit comments

Comments
 (0)