fix: pass through correct disconnect reason (#428)

* fix: pass through correct disconnect reason

* changeset

* update submodule

Author: davidzhao

.changeset/curly-rice-wonder.md

@@ -0,0 +1,5 @@
+---
+'@livekit/rtc-node': patch
+---
+
+fix: pass through correct disconnect reason

packages/livekit-rtc/rust-sdks

@@ -2,48 +2,48 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-export { Room, RoomEvent, ConnectError, type RoomOptions, type RtcConfiguration } from './room.js';
-export { Participant, RemoteParticipant, LocalParticipant } from './participant.js';
-export {
-  Track,
-  type LocalTrack,
-  type RemoteTrack,
-  type VideoTrack,
-  LocalAudioTrack,
-  LocalVideoTrack,
-  RemoteAudioTrack,
-  RemoteVideoTrack,
-  type AudioTrack,
-} from './track.js';
-export { VideoFrame } from './video_frame.js';
 export { AudioFrame, combineAudioFrames } from './audio_frame.js';
-export { AudioStream } from './audio_stream.js';
 export { AudioResampler, AudioResamplerQuality } from './audio_resampler.js';
-export { VideoStream, type VideoFrameEvent } from './video_stream.js';
 export { AudioSource } from './audio_source.js';
-export { VideoSource } from './video_source.js';
-export {
-  TrackPublication,
-  RemoteTrackPublication,
-  LocalTrackPublication,
-} from './track_publication.js';
-export type { Transcription, TranscriptionSegment } from './transcription.js';
-export { E2EEManager, KeyProvider, FrameCryptor } from './e2ee.js';
-export type { E2EEOptions, KeyProviderOptions } from './e2ee.js';
+export { AudioStream } from './audio_stream.js';
 export * from './data_streams/index.js';
+export { E2EEManager, FrameCryptor, KeyProvider } from './e2ee.js';
+export type { E2EEOptions, KeyProviderOptions } from './e2ee.js';
+export { dispose } from './ffi_client.js';
+export { LocalParticipant, Participant, RemoteParticipant } from './participant.js';
+export { EncryptionState, EncryptionType } from './proto/e2ee_pb.js';
+export { DisconnectReason, ParticipantKind } from './proto/participant_pb.js';
 export {
   ConnectionQuality,
+  ConnectionState,
+  ContinualGatheringPolicy,
+  DataPacketKind,
   IceServer,
   IceTransportType,
-  DataPacketKind,
-  ContinualGatheringPolicy,
   TrackPublishOptions,
-  ConnectionState,
 } from './proto/room_pb.js';
-export { RpcError, type RpcInvocationData, type PerformRpcParams } from './rpc.js';
-export { EncryptionType, EncryptionState } from './proto/e2ee_pb.js';
 export { StreamState, TrackKind, TrackSource } from './proto/track_pb.js';
-export { VideoBufferType, VideoRotation, VideoCodec } from './proto/video_frame_pb.js';
-export { ParticipantKind } from './proto/participant_pb.js';
-export { dispose } from './ffi_client.js';
+export { VideoBufferType, VideoCodec, VideoRotation } from './proto/video_frame_pb.js';
+export { ConnectError, Room, RoomEvent, type RoomOptions, type RtcConfiguration } from './room.js';
+export { RpcError, type PerformRpcParams, type RpcInvocationData } from './rpc.js';
+export {
+  LocalAudioTrack,
+  LocalVideoTrack,
+  RemoteAudioTrack,
+  RemoteVideoTrack,
+  Track,
+  type AudioTrack,
+  type LocalTrack,
+  type RemoteTrack,
+  type VideoTrack,
+} from './track.js';
+export {
+  LocalTrackPublication,
+  RemoteTrackPublication,
+  TrackPublication,
+} from './track_publication.js';
+export type { Transcription, TranscriptionSegment } from './transcription.js';
 export type { ChatMessage } from './types.js';
+export { VideoFrame } from './video_frame.js';
+export { VideoSource } from './video_source.js';
+export { VideoStream, type VideoFrameEvent } from './video_stream.js';

packages/livekit-rtc/src/index.ts

@@ -20,7 +20,7 @@
 import type { BinaryReadOptions, FieldList, JsonReadOptions, JsonValue, PartialMessage, PlainMessage } from "@bufbuild/protobuf";
 import { Message, proto2 } from "@bufbuild/protobuf";
 import { ConnectCallback, ConnectRequest, ConnectResponse, DisconnectCallback, DisconnectRequest, DisconnectResponse, EditChatMessageRequest, GetSessionStatsCallback, GetSessionStatsRequest, GetSessionStatsResponse, PublishDataCallback, PublishDataRequest, PublishDataResponse, PublishSipDtmfCallback, PublishSipDtmfRequest, PublishSipDtmfResponse, PublishTrackCallback, PublishTrackRequest, PublishTrackResponse, PublishTranscriptionCallback, PublishTranscriptionRequest, PublishTranscriptionResponse, RoomEvent, SendChatMessageCallback, SendChatMessageRequest, SendChatMessageResponse, SendStreamChunkCallback, SendStreamChunkRequest, SendStreamChunkResponse, SendStreamHeaderCallback, SendStreamHeaderRequest, SendStreamHeaderResponse, SendStreamTrailerCallback, SendStreamTrailerRequest, SendStreamTrailerResponse, SetDataChannelBufferedAmountLowThresholdRequest, SetDataChannelBufferedAmountLowThresholdResponse, SetLocalAttributesCallback, SetLocalAttributesRequest, SetLocalAttributesResponse, SetLocalMetadataCallback, SetLocalMetadataRequest, SetLocalMetadataResponse, SetLocalNameCallback, SetLocalNameRequest, SetLocalNameResponse, SetSubscribedRequest, SetSubscribedResponse, UnpublishTrackCallback, UnpublishTrackRequest, UnpublishTrackResponse } from "./room_pb.js";
-import { CreateAudioTrackRequest, CreateAudioTrackResponse, CreateVideoTrackRequest, CreateVideoTrackResponse, EnableRemoteTrackRequest, EnableRemoteTrackResponse, GetStatsCallback, GetStatsRequest, GetStatsResponse, LocalTrackMuteRequest, LocalTrackMuteResponse, TrackEvent } from "./track_pb.js";
+import { CreateAudioTrackRequest, CreateAudioTrackResponse, CreateVideoTrackRequest, CreateVideoTrackResponse, EnableRemoteTrackRequest, EnableRemoteTrackResponse, GetStatsCallback, GetStatsRequest, GetStatsResponse, LocalTrackMuteRequest, LocalTrackMuteResponse, SetTrackSubscriptionPermissionsRequest, SetTrackSubscriptionPermissionsResponse, TrackEvent } from "./track_pb.js";
 import { CaptureVideoFrameRequest, CaptureVideoFrameResponse, NewVideoSourceRequest, NewVideoSourceResponse, NewVideoStreamRequest, NewVideoStreamResponse, VideoConvertRequest, VideoConvertResponse, VideoStreamEvent, VideoStreamFromParticipantRequest, VideoStreamFromParticipantResponse } from "./video_frame_pb.js";
 import { AudioStreamEvent, AudioStreamFromParticipantRequest, AudioStreamFromParticipantResponse, CaptureAudioFrameCallback, CaptureAudioFrameRequest, CaptureAudioFrameResponse, ClearAudioBufferRequest, ClearAudioBufferResponse, FlushSoxResamplerRequest, FlushSoxResamplerResponse, NewAudioResamplerRequest, NewAudioResamplerResponse, NewAudioSourceRequest, NewAudioSourceResponse, NewAudioStreamRequest, NewAudioStreamResponse, NewSoxResamplerRequest, NewSoxResamplerResponse, PushSoxResamplerRequest, PushSoxResamplerResponse, RemixAndResampleRequest, RemixAndResampleResponse } from "./audio_frame_pb.js";
 import { E2eeRequest, E2eeResponse } from "./e2ee_pb.js";
@@ -187,6 +187,12 @@ export class FfiRequest extends Message<FfiRequest> {
      */
     value: GetStatsRequest;
     case: "getStats";
+  } | {
+    /**
+     * @generated from field: livekit.proto.SetTrackSubscriptionPermissionsRequest set_track_subscription_permissions = 48;
+     */
+    value: SetTrackSubscriptionPermissionsRequest;
+    case: "setTrackSubscriptionPermissions";
   } | {
     /**
      * Video
@@ -395,6 +401,7 @@ export class FfiRequest extends Message<FfiRequest> {
     { no: 17, name: "local_track_mute", kind: "message", T: LocalTrackMuteRequest, oneof: "message" },
     { no: 18, name: "enable_remote_track", kind: "message", T: EnableRemoteTrackRequest, oneof: "message" },
     { no: 19, name: "get_stats", kind: "message", T: GetStatsRequest, oneof: "message" },
+    { no: 48, name: "set_track_subscription_permissions", kind: "message", T: SetTrackSubscriptionPermissionsRequest, oneof: "message" },
     { no: 20, name: "new_video_stream", kind: "message", T: NewVideoStreamRequest, oneof: "message" },
     { no: 21, name: "new_video_source", kind: "message", T: NewVideoSourceRequest, oneof: "message" },
     { no: 22, name: "capture_video_frame", kind: "message", T: CaptureVideoFrameRequest, oneof: "message" },
@@ -563,6 +570,12 @@ export class FfiResponse extends Message<FfiResponse> {
      */
     value: GetStatsResponse;
     case: "getStats";
+  } | {
+    /**
+     * @generated from field: livekit.proto.SetTrackSubscriptionPermissionsResponse set_track_subscription_permissions = 47;
+     */
+    value: SetTrackSubscriptionPermissionsResponse;
+    case: "setTrackSubscriptionPermissions";
   } | {
     /**
      * Video
@@ -765,6 +778,7 @@ export class FfiResponse extends Message<FfiResponse> {
     { no: 17, name: "local_track_mute", kind: "message", T: LocalTrackMuteResponse, oneof: "message" },
     { no: 18, name: "enable_remote_track", kind: "message", T: EnableRemoteTrackResponse, oneof: "message" },
     { no: 19, name: "get_stats", kind: "message", T: GetStatsResponse, oneof: "message" },
+    { no: 47, name: "set_track_subscription_permissions", kind: "message", T: SetTrackSubscriptionPermissionsResponse, oneof: "message" },
     { no: 20, name: "new_video_stream", kind: "message", T: NewVideoStreamResponse, oneof: "message" },
     { no: 21, name: "new_video_source", kind: "message", T: NewVideoSourceResponse, oneof: "message" },
     { no: 22, name: "capture_video_frame", kind: "message", T: CaptureVideoFrameResponse, oneof: "message" },

packages/livekit-rtc/src/proto/ffi_pb.ts

@@ -2986,6 +2986,11 @@ export class ParticipantDisconnected extends Message<ParticipantDisconnected> {
    */
   participantIdentity?: string;
 
+  /**
+   * @generated from field: required livekit.proto.DisconnectReason disconnect_reason = 2;
+   */
+  disconnectReason?: DisconnectReason;
+
   constructor(data?: PartialMessage<ParticipantDisconnected>) {
     super();
     proto2.util.initPartial(data, this);
@@ -2995,6 +3000,7 @@ export class ParticipantDisconnected extends Message<ParticipantDisconnected> {
   static readonly typeName = "livekit.proto.ParticipantDisconnected";
   static readonly fields: FieldList = proto2.util.newFieldList(() => [
     { no: 1, name: "participant_identity", kind: "scalar", T: 9 /* ScalarType.STRING */, req: true },
+    { no: 2, name: "disconnect_reason", kind: "enum", T: proto2.getEnumType(DisconnectReason), req: true },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): ParticipantDisconnected {

packages/livekit-rtc/src/proto/room_pb.ts

@@ -845,3 +845,138 @@ export class EnableRemoteTrackResponse extends Message<EnableRemoteTrackResponse
   }
 }
 
+/**
+ * @generated from message livekit.proto.SetTrackSubscriptionPermissionsRequest
+ */
+export class SetTrackSubscriptionPermissionsRequest extends Message<SetTrackSubscriptionPermissionsRequest> {
+  /**
+   * @generated from field: required uint64 local_participant_handle = 1;
+   */
+  localParticipantHandle?: bigint;
+
+  /**
+   * @generated from field: required bool all_participants_allowed = 2;
+   */
+  allParticipantsAllowed?: boolean;
+
+  /**
+   * @generated from field: repeated livekit.proto.ParticipantTrackPermission permissions = 3;
+   */
+  permissions: ParticipantTrackPermission[] = [];
+
+  constructor(data?: PartialMessage<SetTrackSubscriptionPermissionsRequest>) {
+    super();
+    proto2.util.initPartial(data, this);
+  }
+
+  static readonly runtime: typeof proto2 = proto2;
+  static readonly typeName = "livekit.proto.SetTrackSubscriptionPermissionsRequest";
+  static readonly fields: FieldList = proto2.util.newFieldList(() => [
+    { no: 1, name: "local_participant_handle", kind: "scalar", T: 4 /* ScalarType.UINT64 */, req: true },
+    { no: 2, name: "all_participants_allowed", kind: "scalar", T: 8 /* ScalarType.BOOL */, req: true },
+    { no: 3, name: "permissions", kind: "message", T: ParticipantTrackPermission, repeated: true },
+  ]);
+
+  static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): SetTrackSubscriptionPermissionsRequest {
+    return new SetTrackSubscriptionPermissionsRequest().fromBinary(bytes, options);
+  }
+
+  static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): SetTrackSubscriptionPermissionsRequest {
+    return new SetTrackSubscriptionPermissionsRequest().fromJson(jsonValue, options);
+  }
+
+  static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): SetTrackSubscriptionPermissionsRequest {
+    return new SetTrackSubscriptionPermissionsRequest().fromJsonString(jsonString, options);
+  }
+
+  static equals(a: SetTrackSubscriptionPermissionsRequest | PlainMessage<SetTrackSubscriptionPermissionsRequest> | undefined, b: SetTrackSubscriptionPermissionsRequest | PlainMessage<SetTrackSubscriptionPermissionsRequest> | undefined): boolean {
+    return proto2.util.equals(SetTrackSubscriptionPermissionsRequest, a, b);
+  }
+}
+
+/**
+ * @generated from message livekit.proto.ParticipantTrackPermission
+ */
+export class ParticipantTrackPermission extends Message<ParticipantTrackPermission> {
+  /**
+   * The participant identity this permission applies to.
+   *
+   * @generated from field: required string participant_identity = 1;
+   */
+  participantIdentity?: string;
+
+  /**
+   * Grant permission to all all tracks. Takes precedence over allowedTrackSids.
+   *
+   * @generated from field: optional bool allow_all = 2;
+   */
+  allowAll?: boolean;
+
+  /**
+   * List of track sids to grant permission to.
+   *
+   * @generated from field: repeated string allowed_track_sids = 3;
+   */
+  allowedTrackSids: string[] = [];
+
+  constructor(data?: PartialMessage<ParticipantTrackPermission>) {
+    super();
+    proto2.util.initPartial(data, this);
+  }
+
+  static readonly runtime: typeof proto2 = proto2;
+  static readonly typeName = "livekit.proto.ParticipantTrackPermission";
+  static readonly fields: FieldList = proto2.util.newFieldList(() => [
+    { no: 1, name: "participant_identity", kind: "scalar", T: 9 /* ScalarType.STRING */, req: true },
+    { no: 2, name: "allow_all", kind: "scalar", T: 8 /* ScalarType.BOOL */, opt: true },
+    { no: 3, name: "allowed_track_sids", kind: "scalar", T: 9 /* ScalarType.STRING */, repeated: true },
+  ]);
+
+  static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): ParticipantTrackPermission {
+    return new ParticipantTrackPermission().fromBinary(bytes, options);
+  }
+
+  static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): ParticipantTrackPermission {
+    return new ParticipantTrackPermission().fromJson(jsonValue, options);
+  }
+
+  static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): ParticipantTrackPermission {
+    return new ParticipantTrackPermission().fromJsonString(jsonString, options);
+  }
+
+  static equals(a: ParticipantTrackPermission | PlainMessage<ParticipantTrackPermission> | undefined, b: ParticipantTrackPermission | PlainMessage<ParticipantTrackPermission> | undefined): boolean {
+    return proto2.util.equals(ParticipantTrackPermission, a, b);
+  }
+}
+
+/**
+ * @generated from message livekit.proto.SetTrackSubscriptionPermissionsResponse
+ */
+export class SetTrackSubscriptionPermissionsResponse extends Message<SetTrackSubscriptionPermissionsResponse> {
+  constructor(data?: PartialMessage<SetTrackSubscriptionPermissionsResponse>) {
+    super();
+    proto2.util.initPartial(data, this);
+  }
+
+  static readonly runtime: typeof proto2 = proto2;
+  static readonly typeName = "livekit.proto.SetTrackSubscriptionPermissionsResponse";
+  static readonly fields: FieldList = proto2.util.newFieldList(() => [
+  ]);
+
+  static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): SetTrackSubscriptionPermissionsResponse {
+    return new SetTrackSubscriptionPermissionsResponse().fromBinary(bytes, options);
+  }
+
+  static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): SetTrackSubscriptionPermissionsResponse {
+    return new SetTrackSubscriptionPermissionsResponse().fromJson(jsonValue, options);
+  }
+
+  static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): SetTrackSubscriptionPermissionsResponse {
+    return new SetTrackSubscriptionPermissionsResponse().fromJsonString(jsonString, options);
+  }
+
+  static equals(a: SetTrackSubscriptionPermissionsResponse | PlainMessage<SetTrackSubscriptionPermissionsResponse> | undefined, b: SetTrackSubscriptionPermissionsResponse | PlainMessage<SetTrackSubscriptionPermissionsResponse> | undefined): boolean {
+    return proto2.util.equals(SetTrackSubscriptionPermissionsResponse, a, b);
+  }
+}
+

packages/livekit-rtc/src/proto/track_pb.ts

@@ -753,7 +753,7 @@ export class VideoBufferInfo extends Message<VideoBufferInfo> {
   /**
    * only for packed formats
    *
-   * @generated from field: required uint32 stride = 6;
+   * @generated from field: optional uint32 stride = 6;
    */
   stride?: number;
 
@@ -774,7 +774,7 @@ export class VideoBufferInfo extends Message<VideoBufferInfo> {
     { no: 2, name: "width", kind: "scalar", T: 13 /* ScalarType.UINT32 */, req: true },
     { no: 3, name: "height", kind: "scalar", T: 13 /* ScalarType.UINT32 */, req: true },
     { no: 4, name: "data_ptr", kind: "scalar", T: 4 /* ScalarType.UINT64 */, req: true },
-    { no: 6, name: "stride", kind: "scalar", T: 13 /* ScalarType.UINT32 */, req: true },
+    { no: 6, name: "stride", kind: "scalar", T: 13 /* ScalarType.UINT32 */, opt: true },
     { no: 7, name: "components", kind: "message", T: VideoBufferInfo_ComponentInfo, repeated: true },
   ]);
 

packages/livekit-rtc/src/proto/video_frame_pb.ts

@@ -21,24 +21,22 @@ import { LocalParticipant, RemoteParticipant } from './participant.js';
 import { EncryptionState } from './proto/e2ee_pb.js';
 import type { FfiEvent } from './proto/ffi_pb.js';
 import type { DisconnectReason, OwnedParticipant } from './proto/participant_pb.js';
+import type { DataStream_Trailer } from './proto/room_pb.js';
 import {
   type ConnectCallback,
+  ConnectRequest,
   type ConnectResponse,
   type ConnectionQuality,
+  ConnectionState,
+  ContinualGatheringPolicy,
   type DataPacketKind,
   type DataStream_Chunk,
   type DataStream_Header,
-  DataStream_Trailer,
   type DisconnectResponse,
   RoomOptions as FfiRoomOptions,
   type IceServer,
-  type RoomInfo,
-} from './proto/room_pb.js';
-import {
-  ConnectRequest,
-  ConnectionState,
-  ContinualGatheringPolicy,
   IceTransportType,
+  type RoomInfo,
 } from './proto/room_pb.js';
 import { TrackKind } from './proto/track_pb.js';
 import type { LocalTrack, RemoteTrack } from './track.js';
@@ -249,7 +247,8 @@ export class Room extends (EventEmitter as new () => TypedEmitter<RoomCallbacks>
       this.emit(RoomEvent.ParticipantConnected, participant);
     } else if (ev.case == 'participantDisconnected') {
       const participant = this.remoteParticipants.get(ev.value.participantIdentity!);
-      this.remoteParticipants.delete(participant!.identity!);
+      this.remoteParticipants.delete(participant!.identity);
+      participant!.info.disconnectReason = ev.value.disconnectReason;
       this.emit(RoomEvent.ParticipantDisconnected, participant!);
     } else if (ev.case == 'localTrackPublished') {
       const publication = this.localParticipant!.trackPublications.get(ev.value.trackSid!);