@livedigital/client 2.44.0-test-speaker.1 → 2.44.0

package/dist/types/common.d.ts

@@ -157,6 +157,9 @@ export declare type PayloadOfPublishedMedia = {
     label: TrackLabel;
     paused: boolean;
 };
+export declare type TrackForceClosedPayload = {
+    label: TrackLabel;
+};
 export declare type SubscribeOptions = {
     producerId: string;
     muted?: boolean;
@@ -316,6 +319,10 @@ export declare type ChangeProducerStatePayload = {
     peerId: string;
     producerId: string;
 };
+export declare type ForceCloseProducerPayload = {
+    peerId: string;
+    label: TrackLabel;
+};
 export interface TrackWithEncodings {
     getCodecOptions(): ProducerCodecOptions;
     getEncodings(): RtpEncodingParameters[];

package/package.json

@@ -2,7 +2,7 @@
   "name": "@livedigital/client",
   "author": "vlprojects",
   "license": "MIT",
-  "version": "2.44.0-test-speaker.1",
+  "version": "2.44.0",
   "private": false,
   "bugs": {
     "url": "https://github.com/vlprojects/livedigital-sdk/issues"

package/src/constants/events.ts

@@ -22,6 +22,7 @@ export const CLIENT_EVENTS = {
   devicesListUpdated: 'devices-list-updated',
   transportConnectionTimeout: 'transport-connection-timeout',
   trackPublishingFailed: 'track-publishing-failed',
+  trackForceClosed: 'track-force-closed',
   activeSpeakerChanged: 'active-speaker-changed',
 };
 
@@ -68,6 +69,7 @@ export const MEDIASOUP_EVENTS = {
   producerResume: 'producer.resume',
   producerPaused: 'producer.paused',
   producerResumed: 'producer.resumed',
+  producerForceClosed: 'producer.forceClosed',
   producerScoreChanged: 'producer.scoreChanged',
   producerSetMaxSpatialLayer: 'producer.setMaxSpatialLayer',
   producerRequestMaxSpatialLayer: 'producer.requestMaxSpatialLayer',

package/src/engine/handlers/ChannelAudioObserverEventHandler.ts

@@ -73,6 +73,7 @@ class ChannelAudioObserverEventHandler {
   private handleSilence(): void {
     const tracks = this.engine.peers.flatMap((peer) => Array.from(peer.tracks.values()));
     tracks.forEach((track) => track.setVolume(0));
+    this.engine.setActiveSpeakerPeer(undefined);
   }
 
   private static validateEventPayload(payload: AudioObserverEvents): void {

package/src/engine/handlers/MediaSoupEventHandler.ts

@@ -1,16 +1,18 @@
 import { AwaitQueue } from 'awaitqueue';
 import {
   ChangePreferredLayersParams, ChangeProducerStatePayload,
-  ConsumerScoreChangedPayload,
+  ConsumerScoreChangedPayload, ForceCloseProducerPayload,
   LogMessageHandler, PayloadOfPublishedMedia,
   ProducerData,
   ProducerRequestMaxSpatialLayer,
   ProducerScoreChangedPayload,
-  ProducerSetMaxSpatialLayer,
+  ProducerSetMaxSpatialLayer, TrackForceClosedPayload,
   TransportConnectionTimeoutPayload,
 } from '../../types/common';
 import Engine from '../index';
-import { CLIENT_EVENTS, MEDIASOUP_EVENTS, PEER_EVENTS } from '../../constants/events';
+import {
+  CLIENT_EVENTS, INTERNAL_CLIENT_EVENTS, MEDIASOUP_EVENTS, PEER_EVENTS,
+} from '../../constants/events';
 import Logger from '../Logger';
 import VideoTrack from '../media/tracks/VideoTrack';
 
@@ -40,7 +42,7 @@ class MediaSoupEventHandler {
 
     connection.on(MEDIASOUP_EVENTS.producerClose, (producer: ProducerData) => {
       const peer = this.engine.peers.find((item) => item.id === producer.peerId);
-      if (!peer || peer.isMe) {
+      if (!peer) {
         return;
       }
 
@@ -199,6 +201,18 @@ class MediaSoupEventHandler {
         paused: producer.paused,
       } as PayloadOfPublishedMedia);
     });
+
+    connection.on(MEDIASOUP_EVENTS.producerForceClosed, async ({ label }: ForceCloseProducerPayload) => {
+      const track = this.engine.media.getTrack(label);
+      if (!track) {
+        return;
+      }
+
+      track.stopMediaStreamTrack();
+      this.engine.clientEventEmitter.safeEmit(INTERNAL_CLIENT_EVENTS.trackClosed, track);
+      this.engine.clientEventEmitter.emit(CLIENT_EVENTS.trackForceClosed, { label } as TrackForceClosedPayload);
+      await this.engine.media.deleteTrack(track);
+    });
   }
 
   private async handleProducerSetMaxSpatialLayer({

package/src/engine/index.ts

@@ -332,6 +332,7 @@ class Engine {
         }
       }
 
+      this.media.setTrack(track);
       this.logger.debug('createCameraVideoTrack()', { trackParams, track });
       return track;
     } catch (error) {
@@ -361,6 +362,7 @@ class Engine {
         }
       }
 
+      this.media.setTrack(track);
       this.logger.debug('createMicrophoneAudioTrack()', { options, track });
       return track;
     } catch (error) {
@@ -389,7 +391,7 @@ class Engine {
           track.setEncoderConfig(videoTrackParams.encoderConfig);
           const transformParams = Media.getVideoTrackTransformParams(track.mediaStreamTrack);
           track.setTransformParams(transformParams);
-
+          this.media.setTrack(track);
           this.logger.debug('createScreenMediaTrack()', {
             trackParams: videoTrackParams,
             transformParams,
@@ -403,6 +405,7 @@ class Engine {
           track.setEncoderConfig(options.audioEncoderConfig);
         }
 
+        this.media.setTrack(track);
         this.logger.debug('createScreenMediaTrack()', {
           trackParams: options?.audio,
           encoderConfig: options?.audioEncoderConfig,

package/src/engine/media/index.ts

@@ -9,6 +9,7 @@ import {
   CreateVideoTrackParams,
   LogLevel,
   Track,
+  TrackLabel,
   TransformParams,
 } from '../../types/common';
 import Logger from '../Logger';
@@ -26,7 +27,7 @@ class Media {
 
   private device?: Device;
 
-  private tracks: Map<string, Track> = new Map();
+  private tracks: Map<TrackLabel, Track> = new Map();
 
   readonly #logger: Logger;
 
@@ -67,6 +68,10 @@ class Media {
     return !!this.#noiseSuppressor;
   }
 
+  getTrack(label: TrackLabel): Track | undefined {
+    return this.tracks.get(label);
+  }
+
   async loadDevice(routerRtpCapabilities: RtpCapabilities): Promise<void> {
     if (!this.isDeviceLoaded) {
       await this.mediasoupDevice.load({ routerRtpCapabilities });
@@ -111,7 +116,7 @@ class Media {
       const track = mediaStreamTrack.kind === 'audio'
         ? new AudioTrack({ ...params, noiseSuppressor: this.#noiseSuppressor })
         : new VideoTrack(params);
-      this.tracks.set(track.id, track);
+
       this.#logger.debug('createTrack() track created', {
         trackId: track.id,
         kind: track.kind,
@@ -133,11 +138,16 @@ class Media {
 
   async deleteTrack(track: Track) {
     await track.closeProducer();
-    track.mediaStreamTrack.stop();
     if ('disableNoiseSuppression' in track) {
       await track.disableNoiseSuppression();
     }
-    this.tracks.delete(track.id);
+
+    if ('disableBlur' in track) {
+      await track.disableBlur();
+    }
+
+    track.stopMediaStreamTrack();
+    this.tracks.delete(track.getLabel());
     this.#logger.debug('deleteTrack() tack deleted', { trackId: track.id, kind: track.kind });
   }
 
@@ -155,6 +165,10 @@ class Media {
     }
   }
 
+  setTrack(track: Track): void {
+    this.tracks.set(track.getLabel(), track);
+  }
+
   static getVideoTrackTransformParams(track: MediaStreamTrack): TransformParams {
     const caps = track.getSettings();
     return {

package/src/engine/media/tracks/BaseTrack.ts

@@ -141,11 +141,20 @@ class BaseTrack {
       return;
     }
 
-    await this.#engine.network.closeRemoteProducer(this.producer.id);
+    try {
+      await this.#engine.network.closeRemoteProducer(this.producer.id);
+    } catch (error) {
+      this.logger.warn('closeProducer()', {
+        label: this.getLabel(),
+        producerId: this.producerId,
+      });
+    }
+
     this.producer.close();
     this.producer = undefined;
+
     if (stopTrack) {
-      this.#mediaStreamTrack.stop();
+      this.stopMediaStreamTrack();
     }
   }
 
@@ -167,6 +176,7 @@ class BaseTrack {
 
   stopMediaStreamTrack(): void {
     this.mediaStreamTrack.stop();
+    this.mediaStreamTrack.dispatchEvent(new Event('ended'));
   }
 
   private async checkProducerState(): Promise<void> {
@@ -383,7 +393,7 @@ class BaseTrack {
 
       await this.cancelProducerCheckState();
       await this.closeProducer();
-      this.#mediaStreamTrack.stop();
+      this.stopMediaStreamTrack();
       this.clientEventEmitter.emit(INTERNAL_CLIENT_EVENTS.trackUnproduced, this);
       this.#closed = true;
       this.logger.debug('unpublish()', { track: this });

package/src/types/common.ts

@@ -193,6 +193,10 @@ export type PayloadOfPublishedMedia = {
   paused: boolean,
 };
 
+export type TrackForceClosedPayload = {
+  label: TrackLabel,
+};
+
 export type SubscribeOptions = {
   producerId: string,
   muted?: boolean,
@@ -383,6 +387,11 @@ export type ChangeProducerStatePayload = {
   producerId: string,
 };
 
+export type ForceCloseProducerPayload = {
+  peerId: string,
+  label: TrackLabel,
+};
+
 export interface TrackWithEncodings {
   getCodecOptions(): ProducerCodecOptions;
   getEncodings(): RtpEncodingParameters[];