Skip to content

Do not throw error on idempotent calls to Socket::shutdown #1567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 26, 2025
Merged

Do not throw error on idempotent calls to Socket::shutdown #1567

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7bcd33
Do not throw error on idempotent calls
mobile-bungalow Apr 6, 2025
c781025
shutdown as well
mobile-bungalow Apr 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Sources/LiveViewNative/Coordinators/LiveSessionCoordinator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public class LiveSessionCoordinator<R: RootRegistry>: ObservableObject {
$navigationPath.scan(([LiveNavigationEntry<R>](), [LiveNavigationEntry<R>]()), { ($0.1, $1) }).sink { [weak self] prev, next in
guard let self else { return }
Task {
try await prev.last?.coordinator.disconnect()
try? await prev.last?.coordinator.disconnect()
if prev.count > next.count {
let targetEntry = self.liveSocket!.getEntries()[next.count - 1]
next.last?.coordinator.join(
Expand Down Expand Up @@ -213,7 +213,7 @@ public class LiveSessionCoordinator<R: RootRegistry>: ObservableObject {
.merging(additionalHeaders ?? [:]) { $1 }

if let socket {
try await socket.shutdown()
try? await socket.shutdown()
}

let adapter = ReconnectStrategyAdapter(self.configuration.reconnectBehavior)
Expand Down Expand Up @@ -336,7 +336,7 @@ public class LiveSessionCoordinator<R: RootRegistry>: ObservableObject {
private func disconnect(preserveNavigationPath: Bool = false) async {
do {
for entry in self.navigationPath {
try await entry.coordinator.disconnect()
try? await entry.coordinator.disconnect()
if !preserveNavigationPath {
entry.coordinator.document = nil
}
Expand All @@ -360,7 +360,7 @@ public class LiveSessionCoordinator<R: RootRegistry>: ObservableObject {

self.liveReloadChannel = nil

try await self.socket?.shutdown()
try? await self.socket?.shutdown()
self.socket = nil
self.liveSocket = nil
self.state = .disconnected
Expand Down
Loading