Refactor Connect/Disconnect out to CClient with an explicit connection state - #3805
Refactor Connect/Disconnect out to CClient with an explicit connection state#3805mcfnord wants to merge 7 commits into
Conversation
This is an extract from jamulussoftware#2550 Co-authored-by: ann0see <20726856+ann0see@users.noreply.github.com>
Introduce EConnectionState (disconnected / connecting / connected) owned by CClient as the single source of truth. A connection is 'requested' when the audio stream starts (CS_CONNECTING) and 'established' once the server assigns our channel ID (CS_CONNECTED). Every transition emits ConnectionStateChanged. Rename the Connected(name) signal emitted from Start() to Connecting(name), since at that point the connection is only requested, not established. CClient::Connect() now terminates any current connection first, so connecting while connected behaves as a reconnect. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
|
Thanks. This needs thorough testing as this refactor is definitely non trivial. |
|
I'm just wondering if we should cut a 4.0.0 off where we are on main plus the TCP changes when they land and have these refactorings land onto 4.1.0 (4.0.0dev)? We're currently holding up a feature (raw audio) that benefits all users for work that has infrastructure value. It's definitely good to have them, though. |
It's stalled for a good reason though. Now we know it works (but probably would benefit from PLC) but at the start we didn't. |
|
GUI tested and I can confirm it works as expected. From the code review it also looks fine. I'll still need to do an in depth analysis though. |
There was a problem hiding this comment.
Check if this breaks feedback detection somehow. (Manually).
Free model from open code (Big Pickle) had the following comments (also seem my comments on this)
This one I was already suspicious about:
Bug Assessment
Likely Bug: Stop() emits Disconnected unconditionally
CClient::Stop() now always emits Disconnected() even if the client wasn't connected:
void CClient::Stop()
{
// ... cleanup ...
SetConnectionState ( CS_DISCONNECTED ); // no-op if already disconnected
emit Disconnected(); // <-- ALWAYS emitted
}
This means every Stop() call triggers the full UI teardown chain in OnDisconnect() (reset button text, hide mixer board, clear faders, reset deco). If Stop() is ever called when the client wasn't running, the UI will react to a spurious disconnect. The old code guarded this with if (IsRunning()).
Potential Issue: bDetectFeedback not reset on disconnect
When OnConnecting() starts the feedback detection timer and sets bDetectFeedback = true, neither OnDisconnect() nor Stop() resets it. The single-shot timer will expire, but the flag remains stale. Not a crash bug, but could cause unexpected behavior if bDetectFeedback is checked elsewhere before the next connection.
Fair point. Maybe be problematic - but not sure...
Minor: CS_CONNECTING state during Connect() failure path
In Connect(), the catch block calls Stop(), which transitions CS_CONNECTING → CS_DISCONNECTED and emits Disconnected. Then the catch block also emits ConnectingFailed. So the UI gets both signals in sequence — this works, but ConnectingFailed arrives after the UI has already been torn down by Disconnected, which could be confusing for error display ordering.
Probably really not too bad.
- SIGTERM/SIGINT: route through Disconnect() instead of a raw Stop(), and guard Disconnect() on the connection state rather than IsRunning() (which tracks the audio device). IsRunning() is false while connecting and in headless mode, so the old guard could skip notifying the server on shutdown; the raw Stop() worked around that but also fired a spurious disconnect when idle. Now the server is notified iff a connection is pending or established, via the single Disconnect() path. - Move EConnectionState from util.h to client.h (it is client specific). - Add a doc-comment to SetConnectionState; reword two member comments. Addresses review feedback on jamulussoftware#3805. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
|
I'll look at this later. I'd like to have this in 4.0 not 4.1 as it's crucial for clean connect/disconnect RPC functionality. |
pljones noted the comment explaining why QCoreApplication::instance()->exit() is called here (to trigger OnAboutToQuit) should have stayed through the Disconnect()-guard refactor. Restoring it.
softins
left a comment
There was a problem hiding this comment.
It looks good. There are several places where a QString value parameter could better be a const ref const QString&.
I wondered for a moment whether the signal/slot boundary needed object parameters such as QString to be passed by value. But in fact Qt can handle const refs just fine, copying only when necessary to cross a thread boundary, and it reduces the number of copies, as described here
|
BTW, I've tested my suggested changes. |
|
@mcfnord Please have a look at this Pr again. |
softins noted several QString value parameters that can be const refs. Qt handles const refs across the signal/slot boundary, copying only when an argument has to cross a thread, so this removes copies without changing behaviour. Connect(), SetConnectedServerName(), and the Connecting()/ConnectingFailed() signals now take const QString&. The receiving slots already declared const QString&, so the signatures match exactly rather than relying on conversion. Addresses review feedback on jamulussoftware#3805. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
|
🤖 AI All four suggestions are in, as one commit. The receiving slots already declared Checked while making the change: GUI and headless both build clean. A headless client still connects to a local server end to end: 🤖 This message was written by AI and reviewed by @mcfnord. |
softins
left a comment
There was a problem hiding this comment.
Looks good to me now. Thanks!
Brings the branch up to date with main (97 commits), including the sound-device exception handling in OnSndCrdReinitRequest that this branch predated. No conflicts; the branch's own diff against main is unchanged.
CClient::Stop() calls Init(), which throws from CSound::Init() when JACK has been shut down - before CreateCLDisconnection() runs. On SIGTERM after JACK death the exception escaped the Qt slot and the server was never notified, holding the dead client's slot until the ~30 s timeout. Catch the error so the disconnect message is always sent; the server then frees the slot immediately. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
|
Please don't merge. Updating the branch = rebase. |
| } | ||
| catch ( const CGenErr& ) | ||
| { | ||
| // a dead audio backend (e.g. JACK was shut down) must not prevent the |
There was a problem hiding this comment.
Hmm. Maybe the warning should be logged.
| /// @brief Stops client and disconnects from server | ||
| /// @emit Disconnected | ||
| /// Use to set CClientDlg to show not being connected | ||
| void CClient::Stop() |
There was a problem hiding this comment.
We might even be able to make Stop() private so that everything is forced to go through Disconnect()
| /// @brief Updates the connection state and, if it changed, notifies observers. | ||
| /// @emit ConnectionStateChanged (state) when the state actually changes | ||
| /// @param eNewConnectionState - the state to transition to | ||
| void CClient::SetConnectionState ( const EConnectionState eNewConnectionState ) |
There was a problem hiding this comment.
Probably also worth to make this private
Short description of changes
This picks up and finishes #3372 (@ann0see's extract of @pgScorpio's work in #2550), which had stalled on review discussion. It contains two commits:
The original Refactor Connect and Disconnect functionality out to CClient #3372 refactor, ported onto current
main(authorship preserved):Connect()/Disconnect()move out ofCClientDlgintoCClient, which emits signals the dialog consumes.CClientDlgno longer holds connection logic — it only reacts (OnConnecting,OnConnectingFailed,OnDisconnect). Connect-on-startup moves out of the dialog constructor intomain.cppviaClient.Connect(...), so it now also works identically in--noguimode.An explicit connection state machine, addressing the state-model review comments in Refactor Connect and Disconnect functionality out to CClient #3372: a new
EConnectionState(CS_DISCONNECTED/CS_CONNECTING/CS_CONNECTED) owned byCClientas the single source of truth, with every transition emittingConnectionStateChanged. Following that discussion's definitions: a connection is requested (CS_CONNECTING) when the audio stream starts toward the configured server, and established (CS_CONNECTED) once the server assigns our channel ID. Accordingly, the signal formerly emitted fromStart()asConnected(name)is renamedConnecting(name), since at that point the connection is only requested.CClient::Connect()now terminates any current connection first, so connecting while connected behaves as a clean reconnect.This is a step toward #3801 (CClient as the orchestration layer behind UI and JSON-RPC): a follow-up PR stacked on this one exposes connect/disconnect/state over JSON-RPC as symmetric consumers of the same signals.
Context: Fixes an issue?
Fixes #3367. Supersedes #3372 (both commits build on it; the first preserves its authorship).
Does this change need documentation? What needs to be documented and how?
No user-facing behavior change. The follow-up JSON-RPC PR updates
docs/JSON-RPC.md.Status of this Pull Request
Ready for review.
What is missing until this pull request can be merged?
Review.
Tested: full GUI build and
CONFIG+=headlessbuild on Linux/Qt 5.15; a--noguiclient was driven through connect → reconnect-while-connected → disconnect cycles against a local server, observing theConnecting/ConnectionStateChanged/Disconnectedsignal sequence via the follow-up PR's JSON-RPC notifications (16/16 scripted checks pass); clean SIGTERM shutdown verified.Checklist
AUTOBUILD: Please build all targets
🤖 Generated with Claude Code