fix(dingtalk): close SDK websocket on disconnect (systemd stop-sigterm hang)#11556
Merged
Conversation
This was referenced Apr 17, 2026
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
Salvages #10070 (Asunfly — authorship preserved). Fixes a real systemd-level hang:
hermes-gateway.servicecan get stuck instop-sigtermand be SIGKILLed on restart when DingTalk is configured, because the adapter'sdisconnect()cancels the stream task but never closes the SDK websocket — it just waits for the remote side to time out.Changes (from Asunfly's commit)
await stream_client.websocket.close()at the start ofdisconnect()so the SDK's internal recv loop exits promptly.asyncio.wait_for(..., timeout=2.0)instead of an unboundedawait, and catchTimeoutErrorso disconnect never hangs.test_disconnect_closes_session_websocket— mocks a websocket on_stream_client, kicks a blocked stream task, callsdisconnect(), assertswebsocket.closewas awaited exactly once and the task reference was cleared.Tests
tests/gateway/test_dingtalk.py: 29 passed (includes the new regression test + the 8 we added in fix(dingtalk): support dingtalk-stream 0.24+ SDK (async process, CallbackMessage, oapi webhooks, TextContent) #11471).process()/_extract_textchanges.Authorship
Commit
7099c557preservesAsunfly <Asunfly@users.noreply.github.com>as author. Merge with--rebaseto keep attribution. Also adds Asunfly toscripts/release.pyAUTHOR_MAP so the release CI doesn't block on unmapped email.Closes
Closes #10070 on merge with credit.