fix(events): serialize websocket writes per connection - #135
Open
cesar-carlos wants to merge 1 commit into
Open
Conversation
gorilla/websocket allows only one concurrent writer. CallWebhook runs in a goroutine per event, so Produce() could WriteJSON the same Conn from multiple goroutines under load (HistorySync/Receipts) and panic, killing the whole process. Wrap each Conn in wsConn with a write mutex so RLock still protects the client maps while writes are serialized per connection. Closes evolution-foundation#99 Co-authored-by: Cursor <cursoragent@cursor.com>
There was a problem hiding this comment.
Sorry @cesar-carlos, you have reached your weekly rate limit of 500000 diff characters.
Please try again later or upgrade to continue using Sourcery
Reviewer's GuideIntroduces a per-connection wrapper around gorilla/websocket connections to serialize writes and adds race-detector tests that exercise concurrent instance-specific and broadcast websocket event delivery. Sequence diagram for serialized websocket writes via wsConnsequenceDiagram
participant Producer as websocketProducer
participant Map as clients_and_broadcast
participant WsConn as wsConn
participant WS as websocket_Conn
Producer->>Map: Produce(queueName, payload, instanceID)
Map-->>Producer: wsConn for instanceID
Producer->>WsConn: writeJSON(message)
activate WsConn
WsConn->>WsConn: writeMu.Lock()
WsConn->>WS: WriteJSON(message)
WS-->>WsConn: error or nil
WsConn->>WsConn: writeMu.Unlock()
deactivate WsConn
WsConn-->>Producer: error or nil
File-Level Changes
Assessment against linked issues
Possibly linked issues
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
ecosb2b
pushed a commit
to ecosb2b/evo-go-v2
that referenced
this pull request
Aug 5, 2026
Merges the Athene fork, which sits 11 commits ahead of the same upstream base and had already solved — in production — the three problems this fork was working through, plus a batch of upstream PRs we had not picked up. Only pkg/whatsmeow/service/whatsmeow.go conflicted (6 hunks); the other 63 files merged cleanly. Every conflict was resolved in favour of the incoming version, because each one was a place where both forks fixed the same bug and theirs is the one we chose to keep: - Connection leak: their getAuthContainer/sharedAuthContainer replaces our storeContainer/storeContainerHolder. Same fix, but theirs is a backport of upstream PR evolution-foundation#117, so it will converge with upstream instead of conflicting when that PR merges. It also caps SQLite at MaxOpenConns(1), which ours did not. - Reconnection: their runtime supervisor replaces our EnableAutoReconnect=true. Ours stopped the automatic disconnect loop but left ReconnectClient reachable from the API endpoint and the send retry, so those paths could still spawn a second client. Their runtime token refuses to start a second runtime for an instance from any path, waits for the previous goroutine to exit, deduplicates concurrent reconnects, backs off exponentially with jitter, and probes to confirm the reconnect actually connected. - Shared maps: ClientMapsMu closes the "fatal error: concurrent map writes" hole, which was still open on our side and kills the whole process rather than panicking a single request. Also arriving with the merge: upstream PRs evolution-foundation#149, evolution-foundation#135, evolution-foundation#34, evolution-foundation#100, evolution-foundation#143, evolution-foundation#137, evolution-foundation#120, evolution-foundation#130, evolution-foundation#151 and evolution-foundation#122; multi-webhook fan-out; POST /send/product; POST /user/savecontact; GET /server/stats and the dashboard; the whatsmeow update to 20260721; and removal of the 61 MB compiled binary that was tracked in git. Our GHCR workflow did not conflict and is preserved. store_container_test.go was adapted to the incoming implementation: it now exercises getAuthContainer, asserts against their MaxOpenConns of 20, and resets sharedAuthContainer between tests, since that container is a package-level global and would otherwise carry between tests and invalidate the pg_stat_activity measurements. It is kept alongside their auth_container_retry_test.go because it measures something theirs does not: the connection count the server actually sees. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
concurrent write to websocket connectionunder concurrent event dispatch (HistorySync / Receipts).*websocket.Connis wrapped inwsConnwith a per-connection write mutex; map access still usesRLock.Closes #99
Test plan
go test -race ./pkg/events/websocket/...Made with Cursor
Summary by Sourcery
Serialize websocket writes per connection to prevent concurrent write panics and add regression tests exercising concurrent instance and broadcast event delivery.
Bug Fixes:
Tests: