Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/soft-olives-clean.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"livekit-client": patch
---

Buffer stream events until connected
1 change: 1 addition & 0 deletions src/room/Room.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2345,6 +2345,7 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
return false;
}
this.state = state;
this.incomingDataStreamManager.setConnected(state === ConnectionState.Connected);
this.emit(RoomEvent.ConnectionStateChanged, this.state);
return true;
}
Expand Down
28 changes: 26 additions & 2 deletions src/room/data-stream/incoming/IncomingDataStreamManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,25 @@ export default class IncomingDataStreamManager {

private textStreamHandlers = new Map<string, TextStreamHandler>();

private isConnected = false;

private bufferedPackets: Array<{ packet: DataPacket; encryptionType: Encryption_Type }> = [];

setConnected(connected: boolean) {
this.isConnected = connected;
if (connected) {
this.flushBufferedPackets();
}
}

private flushBufferedPackets() {
const packets = this.bufferedPackets;
this.bufferedPackets = [];
for (const { packet, encryptionType } of packets) {
this.handleDataStreamPacket(packet, encryptionType);
}
}

registerTextStreamHandler(topic: string, callback: TextStreamHandler) {
if (this.textStreamHandlers.has(topic)) {
throw new DataStreamError(
Expand Down Expand Up @@ -58,6 +77,7 @@ export default class IncomingDataStreamManager {
clearControllers() {
this.byteStreamControllers.clear();
this.textStreamControllers.clear();
this.bufferedPackets = [];
}

validateParticipantHasNoActiveDataStreams(participantIdentity: string) {
Expand Down Expand Up @@ -88,7 +108,11 @@ export default class IncomingDataStreamManager {
}
}

async handleDataStreamPacket(packet: DataPacket, encryptionType: Encryption_Type) {
handleDataStreamPacket(packet: DataPacket, encryptionType: Encryption_Type) {
if (!this.isConnected) {
this.bufferedPackets.push({ packet, encryptionType });
return;
}
switch (packet.value.case) {
case 'streamHeader':
return this.handleStreamHeader(
Expand All @@ -105,7 +129,7 @@ export default class IncomingDataStreamManager {
}
}

private async handleStreamHeader(
private handleStreamHeader(
streamHeader: DataStream_Header,
participantIdentity: string,
encryptionType: Encryption_Type,
Expand Down
Loading