Skip to content

Fix HubConnection handshakeRejector force-unwrapped #92

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
Oct 7, 2025
Merged

Fix HubConnection handshakeRejector force-unwrapped #92

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1747830
Update HubConnection.swift
andreiardelean-zenitech Sep 9, 2025
d091a29
Merge branch 'dev' into fix-handshakeRejector-crash
zackliu Oct 7, 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
16 changes: 6 additions & 10 deletions Sources/SignalRClient/HubConnection.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,9 +303,7 @@ public actor HubConnection {
let startTask = self.startTask

stopDuringStartError = SignalRError.connectionAborted
if (handshakeRejector != nil) {
handshakeRejector!(SignalRError.connectionAborted)
}
handshakeRejector?(SignalRError.connectionAborted)

await connection.stop(error: nil)

Expand All @@ -327,9 +325,7 @@ public actor HubConnection {
}

stopDuringStartError = SignalRError.connectionAborted
if (handshakeResolver != nil) {
handshakeRejector!(SignalRError.connectionAborted)
}
handshakeRejector?(SignalRError.connectionAborted)

if (stopping) {
await completeClose(error: error)
Expand Down Expand Up @@ -568,7 +564,7 @@ public actor HubConnection {
try await self.sendMessageInternal(.string(HandshakeProtocol.writeHandshakeRequest(handshakeRequest: handshakeRequest)))
logger.log(level: .debug, message: "Sent handshake request message with version: \(version), protocol: \(hubProtocol.name)")
} catch {
self.handshakeRejector!(error)
self.handshakeRejector?(error)
}
}
}
Expand Down Expand Up @@ -620,20 +616,20 @@ public actor HubConnection {
(remainingData, handshakeResponse) = try HandshakeProtocol.parseHandshakeResponse(data: content)
} catch {
logger.log(level: .error, message: "Error parsing handshake response: \(error)")
handshakeRejector!(error)
handshakeRejector?(error)
throw error
}

if (handshakeResponse.error != nil) {
logger.log(level: .error, message: "Server returned handshake error: \(handshakeResponse.error!)")
let error = SignalRError.handshakeError(handshakeResponse.error!)
handshakeRejector!(error)
handshakeRejector?(error)
throw error
} else {
logger.log(level: .debug, message: "Handshake compeleted")
}

handshakeResolver!(handshakeResponse)
handshakeResolver?(handshakeResponse)
return remainingData
}

Expand Down
Loading