Fix: consumer.wait() resolves cleanly on client-initiated close#196
Draft
Fix: consumer.wait() resolves cleanly on client-initiated close#196
Conversation
When client.close() is called, setClosed() was passing an error to all consumers, causing consumer.wait() to reject with "Connection closed by client". This forced callers to catch and distinguish this expected condition from actual errors. Only propagate the error to consumers when the server closed the channel/connection. For client-initiated close, pass undefined so consumer.wait() resolves normally, matching the expected graceful shutdown contract. RPC callbacks and unconfirmed publishes still reject (they represent in-flight operations that didn't complete).
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
1 participant
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.
Problem
When
client.close()is called,AMQPChannel.setClosed()passes an error to all consumers — even though the close was client-initiated and graceful. This causesconsumer.wait()to reject with"Connection closed by client"instead of resolving.Callers are then forced to catch this error and distinguish it from actual failures:
This is especially problematic during graceful shutdown, where there's a race between when
isShuttingDownis set and when the TCP Close-Ok event fires, making reliable detection timing-dependent.Fix
In
setClosed(), only pass the error to consumers when the server closed the channel/connection. For client-initiated close (closedByServer === false), passundefinedsoconsumer.wait()resolves normally.RPC callbacks and unconfirmed publishes still reject — those represent in-flight operations that didn't complete and callers need to know about.
Before / After