fix: set attributes of remote participants earlier

Otherwise the attributes are not set during the "ParticipantConnected" event
livekit · Dec 5, 2024 · 462f7f3 · 462f7f3
1 parent 23aceba
commit 462f7f3
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/src/room/Room.ts b/src/room/Room.ts
@@ -1733,10 +1733,18 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
         loggerName: this.options.loggerName,
       });
     } else {
-      participant = new RemoteParticipant(this.engine.client, '', identity, undefined, undefined, {
-        loggerContextCb: () => this.logContext,
-        loggerName: this.options.loggerName,
-      });
+      participant = new RemoteParticipant(
+        this.engine.client,
+        '',
+        identity,
+        undefined,
+        undefined,
+        undefined,
+        {
+          loggerContextCb: () => this.logContext,
+          loggerName: this.options.loggerName,
+        },
+      );
     }
     if (this.options.webAudioMix) {
       participant.setAudioContext(this.audioContext);

diff --git a/src/room/participant/LocalParticipant.test.ts b/src/room/participant/LocalParticipant.test.ts
@@ -47,6 +47,7 @@ describe('LocalParticipant', () => {
         'Remote Participant',
         '',
         undefined,
+        undefined,
         ParticipantKind.STANDARD,
       );
 
@@ -92,6 +93,7 @@ describe('LocalParticipant', () => {
         'Remote Participant',
         '',
         undefined,
+        undefined,
         ParticipantKind.STANDARD,
       );
 
@@ -134,6 +136,7 @@ describe('LocalParticipant', () => {
         'Remote Participant',
         '',
         undefined,
+        undefined,
         ParticipantKind.STANDARD,
       );
 
@@ -196,6 +199,7 @@ describe('LocalParticipant', () => {
         'Remote Participant',
         '',
         undefined,
+        undefined,
         ParticipantKind.STANDARD,
       );
     });

diff --git a/src/room/participant/LocalParticipant.ts b/src/room/participant/LocalParticipant.ts
@@ -144,7 +144,7 @@ export default class LocalParticipant extends Participant {
 
   /** @internal */
   constructor(sid: string, identity: string, engine: RTCEngine, options: InternalRoomOptions) {
-    super(sid, identity, undefined, undefined, {
+    super(sid, identity, undefined, undefined, undefined, {
       loggerName: options.loggerName,
       loggerContextCb: () => this.engine.logContext,
     });

diff --git a/src/room/participant/Participant.ts b/src/room/participant/Participant.ts
@@ -126,6 +126,7 @@ export default class Participant extends (EventEmitter as new () => TypedEmitter
     identity: string,
     name?: string,
     metadata?: string,
+    attributes?: Record<string, string>,
     loggerOptions?: LoggerOptions,
     kind: ParticipantKind = ParticipantKind.STANDARD,
   ) {
@@ -143,7 +144,7 @@ export default class Participant extends (EventEmitter as new () => TypedEmitter
     this.videoTrackPublications = new Map();
     this.trackPublications = new Map();
     this._kind = kind;
-    this._attributes = {};
+    this._attributes = attributes ?? {};
   }
 
   getTrackPublications(): TrackPublication[] {

diff --git a/src/room/participant/RemoteParticipant.ts b/src/room/participant/RemoteParticipant.ts
@@ -44,6 +44,7 @@ export default class RemoteParticipant extends Participant {
       pi.identity,
       pi.name,
       pi.metadata,
+      pi.attributes,
       loggerOptions,
       pi.kind,
     );
@@ -64,10 +65,11 @@ export default class RemoteParticipant extends Participant {
     identity?: string,
     name?: string,
     metadata?: string,
+    attributes?: Record<string, string>,
     loggerOptions?: LoggerOptions,
     kind: ParticipantKind = ParticipantKind.STANDARD,
   ) {
-    super(sid, identity || '', name, metadata, loggerOptions, kind);
+    super(sid, identity || '', name, metadata, attributes, loggerOptions, kind);
     this.signalClient = signalClient;
     this.trackPublications = new Map();
     this.audioTrackPublications = new Map();