Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/lazy-turkeys-burn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"viem": patch
---

Fixed reconnection logic for WebSocket clients.
48 changes: 23 additions & 25 deletions src/utils/rpc/socket.ts
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,27 @@ export async function getSocketRpcClient<socket extends {}>(
let socket: Socket<{}>
let keepAliveTimer: ReturnType<typeof setInterval> | undefined

let reconnectInProgress = false
function attemptReconnect() {
// Attempt to reconnect.
if (reconnect && reconnectCount < attempts) {
if (reconnectInProgress) return
reconnectInProgress = true
reconnectCount++
// Make sure the previous socket is definitely closed.
socket?.close()
setTimeout(async () => {
await setup().catch(console.error)
reconnectInProgress = false
}, delay)
}
// Otherwise, clear all requests and subscriptions.
else {
requests.clear()
subscriptions.clear()
}
}

// Set up socket implementation.
async function setup() {
const result = await getSocket({
Expand All @@ -142,17 +163,7 @@ export async function getSocketRpcClient<socket extends {}>(
for (const subscription of subscriptions.values())
subscription.onError?.(new SocketClosedError({ url }))

// Attempt to reconnect.
if (reconnect && reconnectCount < attempts)
setTimeout(async () => {
reconnectCount++
await setup().catch(console.error)
}, delay)
// Otherwise, clear all requests and subscriptions.
else {
requests.clear()
subscriptions.clear()
}
attemptReconnect()
},
onError(error_) {
error = error_
Expand All @@ -162,20 +173,7 @@ export async function getSocketRpcClient<socket extends {}>(
for (const subscription of subscriptions.values())
subscription.onError?.(error)

// Make sure socket is definitely closed.
socketClient?.close()

// Attempt to reconnect.
if (reconnect && reconnectCount < attempts)
setTimeout(async () => {
reconnectCount++
await setup().catch(console.error)
}, delay)
// Otherwise, clear all requests and subscriptions.
else {
requests.clear()
subscriptions.clear()
}
attemptReconnect()
},
onOpen() {
error = undefined
Expand Down