-
Notifications
You must be signed in to change notification settings - Fork 110
fix: close stream controllers on room disconnect #633
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
LautaroPetaccio
wants to merge
5
commits into
livekit:main
Choose a base branch
from
LautaroPetaccio:fix/close-stream-controllers-on-disconnect
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+67
−0
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
6c2796d
fix: close stream controllers on room disconnect
LautaroPetaccio dfdf4a0
chore: add changeset
LautaroPetaccio a73572c
chore: add changeset
LautaroPetaccio e351d8e
chore: remove duplicate changeset
LautaroPetaccio cb2daa8
chore: merge main
LautaroPetaccio File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| '@livekit/rtc-node': patch | ||
| --- | ||
|
|
||
| Close in-progress stream controllers on room disconnect to prevent FD leaks |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -283,6 +283,28 @@ export class Room extends (EventEmitter as new () => TypedEmitter<RoomCallbacks> | |
| return ev.message.case == 'disconnect' && ev.message.value.asyncId == res.asyncId; | ||
| }); | ||
|
|
||
| // Close all in-progress stream controllers to prevent FD leaks. | ||
| // Streams that were receiving data but never got a trailer (e.g. the sender | ||
| // disconnected mid-transfer) would otherwise keep their ReadableStream open | ||
| // indefinitely, leaking the underlying controller and any buffered chunks. | ||
| for (const [, streamController] of this.byteStreamControllers) { | ||
| try { | ||
| streamController.controller.close(); | ||
| } catch { | ||
| // controller may already be closed | ||
| } | ||
| } | ||
| this.byteStreamControllers.clear(); | ||
|
|
||
| for (const [, streamController] of this.textStreamControllers) { | ||
| try { | ||
| streamController.controller.close(); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. same here |
||
| } catch { | ||
| // controller may already be closed | ||
| } | ||
| } | ||
| this.textStreamControllers.clear(); | ||
|
|
||
| FfiClient.instance.removeListener(FfiClientEvent.FfiEvent, this.onFfiEvent); | ||
| this.removeAllListeners(); | ||
| } | ||
|
|
||
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it would be more appropriate to trigger call an
controller.error(new Error("Disconnected while receiving")