fix: re-subscribe rooms stream after forced socket reopen

[diegolmello]

Proposed changes

After the app sits in the background for a while the DDP socket goes stale, so foregrounding triggers checkAndReopen → forceReopen. forceReopen drops every SDK subscription and reopens the socket without going through connect(), so the module-level roomsSubscription guard in subscribeRooms stays set. The next subscribeRooms() therefore short-circuits and never re-subscribes stream-notify-user, and the rooms list silently stops reflecting subscription/favorite/read changes until a manual reconnect or app restart.

This resets that guard from the socket 'close' listener (via unsubscribeRooms()) — the same teardown connect() already performs at startup — so the resume-login that follows the reopen re-subscribes stream-notify-user. stream-notify-user is the only stream behind that guard; the other streams (permissions, presence, settings, roles) call sdk.subscribe(...) unconditionally and were never affected.

Issue(s)

https://rocketchat.atlassian.net/browse/SUP-1047

How to test or reproduce

1. Log in and open the rooms list.
2. Background the app and cut connectivity (airplane mode) for ~60s so the DDP socket goes stale.
3. Restore connectivity and foreground the app.
4. From another client (or REST), trigger a subscriptions-changed event — e.g. favorite/unfavorite a room or mark one read.

• Before: the rooms list does not update; the change only appears after a manual reconnect / app restart.
• After: the rooms list updates in real time again.

Verified on an Android 16 emulator: after foregrounding, subscribeRooms() re-subscribes stream-notify-user and a favorite toggle then fires the handler and the WatermelonDB write. A regression test in connect.test.ts asserts the 'close' listener calls unsubscribeRooms() (and fails if the call is removed).

Types of changes

• Bugfix (non-breaking change which fixes an issue)
• Improvement (non-breaking change which improves a current function)
• New feature (non-breaking change which adds functionality)
• Documentation update (if none of the other choices apply)

Checklist

• I have read the CONTRIBUTING doc
• I have signed the CLA
• Lint and unit tests pass locally with my changes
• I have added tests that prove my fix is effective or that my feature works (if applicable)
• I have added necessary documentation (if applicable)
• Any dependent changes have been merged and published in downstream modules

Further comments

The fix lives in the 'close' listener rather than in subscribeRooms itself because 'close' is already the place app state is reset for reconnect (it dispatches disconnectAction() to flip Redux meteor.connected → false). The SDK's forceReopen documents this contract: it emits 'close' so connect.ts flips that state, otherwise the next 'connected' short-circuits and the loginRequest → subscribeNotifyUser chain never re-runs. The roomsSubscription guard is just a second piece of "am I subscribed?" state that has to be reset in that same spot.

Summary by CodeRabbit

• Bug Fixes

  • Improved connection recovery so subscriptions are properly reset when VoIP/SDK connections close and reopen, ensuring notifications and real-time updates are re-established after reconnects.

• Tests

  • Added a regression test that verifies cleanup and unsubscribe behavior during connection close events to prevent missed or duplicate subscriptions.

[coderabbitai]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: f5b21bb7-2fee-4167-98f3-9bc5e378a020

📥 Commits

Reviewing files that changed from the base of the PR and between 19944a4 and 6dd8818.

📒 Files selected for processing (2)

• app/lib/services/connect.test.ts
• app/lib/services/connect.ts

✅ Files skipped from review due to trivial changes (1)

• app/lib/services/connect.ts

🚧 Files skipped from review as they are similar to previous changes (1)

• app/lib/services/connect.test.ts

📜 Recent review details

⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (2)

• GitHub Check: ESLint and Test / run-eslint-and-test
• GitHub Check: format

---

Walkthrough

The PR calls unsubscribeRooms() in the socket 'close' handler to reset the rooms-subscription guard and adds a regression test verifying unsubscribeRooms() is invoked when the SDK stream emits a 'close' event after connect().

Changes

Stream Close Unsubscribe Rooms Guard Reset

Layer / File(s)	Summary
Close handler cleanup app/lib/services/connect.ts	The 'close' event handler now calls unsubscribeRooms() to reset the rooms-subscription guard, with comments documenting the checkAndReopen close/reopen scenario.
Regression test for close-event cleanup app/lib/services/connect.test.ts	Adds import of unsubscribeRooms and a regression test that resets mocks/store/stream-stop tracking, runs connect(), invokes the first registered 'close' handler, and asserts unsubscribeRooms() is called exactly once.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

Suggested labels

type: bug

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name	Status	Explanation	Resolution
Docstring Coverage	⚠️ Warning	Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.	Write docstrings for the functions missing them to satisfy the coverage threshold.

✅ Passed checks (4 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title 'fix: re-subscribe rooms stream after forced socket reopen' clearly and concisely summarizes the main change: resetting the rooms subscription guard after socket reopening.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

Warning

Review ran into problems

🔥 Problems

Errors were encountered while retrieving linked issues.

Errors (1)

• SUP-1047: Request failed with status code 401

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[github-actions]

Android Build Available

Rocket.Chat 4.73.0.108999

Internal App Sharing: https://play.google.com/apps/test/RQQ8k09hlnQ/ahAO29uNSzEZLV48QqMLm01fO63uOynryyNiHxSqus-xRmI9xiF90aqh3JWOzuKZ_cCOI-x38Z8tkEGnT-xDQ7OYOc

[github-actions]

iOS Build Available

Rocket.Chat 4.73.0.109000

[OtavioStasiak]

LGTM