@livedigital/client 3.23.1 → 3.24.0

package/src/engine/handlers/MediaSoupEventHandler.ts

@@ -41,7 +41,9 @@ class MediaSoupEventHandler {
       throw new Error('Socket connection not initialized');
     }
 
-    connection.on(MEDIASOUP_EVENTS.producerClose, (producer: ProducerData) => {
+    this.engine.eventsQueue.subscribeToSocket(connection);
+
+    this.engine.eventsQueue.on(MEDIASOUP_EVENTS.producerClose, (producer: ProducerData) => {
       const peer = this.engine.peers.find((item) => item.id === producer.peerId);
       if (!peer) {
         return;
@@ -50,7 +52,7 @@ class MediaSoupEventHandler {
       peer.observer.safeEmit(MEDIASOUP_EVENTS.producerClose, producer);
     });
 
-    connection.on(MEDIASOUP_EVENTS.newProducer, (producer: ProducerData) => {
+    this.engine.eventsQueue.on(MEDIASOUP_EVENTS.newProducer, (producer: ProducerData) => {
       const peer = this.engine.peers.find((item) => item.id === producer.peerId);
       if (!peer) {
         return;
@@ -59,7 +61,7 @@ class MediaSoupEventHandler {
       peer.observer.safeEmit(MEDIASOUP_EVENTS.newProducer, producer);
     });
 
-    connection.on(MEDIASOUP_EVENTS.closeConsumer, (consumerId: string, peerId: string) => {
+    this.engine.eventsQueue.on(MEDIASOUP_EVENTS.closeConsumer, (consumerId: string, peerId: string) => {
       const peer = this.engine.peers.find((item) => item.id === peerId);
       if (!peer) {
         return;
@@ -68,7 +70,7 @@ class MediaSoupEventHandler {
       peer.observer.safeEmit(MEDIASOUP_EVENTS.closeConsumer, consumerId);
     });
 
-    connection.on(MEDIASOUP_EVENTS.resumeConsumer, (consumerId: string, peerId: string) => {
+    this.engine.eventsQueue.on(MEDIASOUP_EVENTS.resumeConsumer, (consumerId: string, peerId: string) => {
       const peer = this.engine.peers.find((item) => item.id === peerId);
       if (!peer || peer.isMe) {
         return;
@@ -77,7 +79,7 @@ class MediaSoupEventHandler {
       peer.observer.safeEmit(MEDIASOUP_EVENTS.resumeConsumer, consumerId);
     });
 
-    connection.on(MEDIASOUP_EVENTS.pauseConsumer, (consumerId: string, peerId: string) => {
+    this.engine.eventsQueue.on(MEDIASOUP_EVENTS.pauseConsumer, (consumerId: string, peerId: string) => {
       const peer = this.engine.peers.find((item) => item.id === peerId);
       if (!peer || peer.isMe) {
         return;
@@ -86,7 +88,7 @@ class MediaSoupEventHandler {
       peer.observer.safeEmit(MEDIASOUP_EVENTS.pauseConsumer, consumerId);
     });
 
-    connection.on(MEDIASOUP_EVENTS.consumerChangePreferredLayers, ({
+    this.engine.eventsQueue.on(MEDIASOUP_EVENTS.consumerChangePreferredLayers, ({
       peerId, spatialLayer, temporalLayer, consumerId,
     }: ChangePreferredLayersParams) => {
       const peer = this.engine.peers.find((item) => item.id === peerId);
@@ -101,7 +103,7 @@ class MediaSoupEventHandler {
       });
     });
 
-    connection.on(MEDIASOUP_EVENTS.consumerScoreChanged, (payload: ConsumerScoreChangedPayload) => {
+    this.engine.eventsQueue.on(MEDIASOUP_EVENTS.consumerScoreChanged, (payload: ConsumerScoreChangedPayload) => {
       const { consumerPeerId } = payload;
       const peer = this.engine.peers.find((item) => item.id === consumerPeerId);
       if (!peer || peer.isMe) {
@@ -116,7 +118,7 @@ class MediaSoupEventHandler {
       }
     });
 
-    connection.on(MEDIASOUP_EVENTS.producerScoreChanged, (payload: ProducerScoreChangedPayload) => {
+    this.engine.eventsQueue.on(MEDIASOUP_EVENTS.producerScoreChanged, (payload: ProducerScoreChangedPayload) => {
       const peer = this.engine.peers.find((item) => item.isMe);
       if (!peer) {
         return;
@@ -125,7 +127,7 @@ class MediaSoupEventHandler {
       peer.observer.safeEmit(MEDIASOUP_EVENTS.producerScoreChanged, payload);
     });
 
-    connection.on(MEDIASOUP_EVENTS.producerRequestMaxSpatialLayer, async ({
+    this.engine.eventsQueue.on(MEDIASOUP_EVENTS.producerRequestMaxSpatialLayer, async ({
       producerId,
       spatialLayer,
     }: ProducerRequestMaxSpatialLayer) => {
@@ -134,7 +136,7 @@ class MediaSoupEventHandler {
       }, MEDIASOUP_EVENTS.producerRequestMaxSpatialLayer);
     });
 
-    connection.on(MEDIASOUP_EVENTS.producerSetMaxSpatialLayer, async ({
+    this.engine.eventsQueue.on(MEDIASOUP_EVENTS.producerSetMaxSpatialLayer, async ({
       peerId,
       producerId,
       spatialLayer,
@@ -147,7 +149,7 @@ class MediaSoupEventHandler {
       peer.observer.safeEmit(MEDIASOUP_EVENTS.producerSetMaxSpatialLayer, { peerId, producerId, spatialLayer });
     });
 
-    connection.on(MEDIASOUP_EVENTS.transportConnectionTimeout, async ({
+    this.engine.eventsQueue.on(MEDIASOUP_EVENTS.transportConnectionTimeout, async ({
       reason,
       transportId,
       direction,
@@ -174,39 +176,41 @@ class MediaSoupEventHandler {
       });
     });
 
-    connection.on(MEDIASOUP_EVENTS.producerPaused, ({ peerId, producerId }: ChangeProducerStatePayload) => {
-      const peer = this.engine.peers.find((item) => item.id === peerId);
-      const producer = peer?.producers.get(producerId);
-      if (!peer || !producer) {
-        return;
-      }
-
-      producer.paused = true;
-      peer.observer.safeEmit(PEER_EVENTS.publisherPaused, {
-        producerId: producer.id,
-        kind: producer.kind,
-        label: producer.label,
-        paused: producer.paused,
+    this.engine.eventsQueue
+      .on(MEDIASOUP_EVENTS.producerPaused, ({ peerId, producerId }: ChangeProducerStatePayload) => {
+        const peer = this.engine.peers.find((item) => item.id === peerId);
+        const producer = peer?.producers.get(producerId);
+        if (!peer || !producer) {
+          return;
+        }
+
+        producer.paused = true;
+        peer.observer.safeEmit(PEER_EVENTS.publisherPaused, {
+          producerId: producer.id,
+          kind: producer.kind,
+          label: producer.label,
+          paused: producer.paused,
+        });
       });
-    });
-
-    connection.on(MEDIASOUP_EVENTS.producerResumed, ({ peerId, producerId }: ChangeProducerStatePayload) => {
-      const peer = this.engine.peers.find((item) => item.id === peerId);
-      const producer = peer?.producers.get(producerId);
-      if (!peer || !producer) {
-        return;
-      }
 
-      producer.paused = false;
-      peer.observer.safeEmit(PEER_EVENTS.publisherResumed, {
-        producerId: producer.id,
-        kind: producer.kind,
-        label: producer.label,
-        paused: producer.paused,
+    this.engine.eventsQueue
+      .on(MEDIASOUP_EVENTS.producerResumed, ({ peerId, producerId }: ChangeProducerStatePayload) => {
+        const peer = this.engine.peers.find((item) => item.id === peerId);
+        const producer = peer?.producers.get(producerId);
+        if (!peer || !producer) {
+          return;
+        }
+
+        producer.paused = false;
+        peer.observer.safeEmit(PEER_EVENTS.publisherResumed, {
+          producerId: producer.id,
+          kind: producer.kind,
+          label: producer.label,
+          paused: producer.paused,
+        });
       });
-    });
 
-    connection.on(MEDIASOUP_EVENTS.producerForceClosed, async ({ label }: ForceCloseProducerPayload) => {
+    this.engine.eventsQueue.on(MEDIASOUP_EVENTS.producerForceClosed, async ({ label }: ForceCloseProducerPayload) => {
       const track = this.engine.media.getTrack(label);
       if (!track) {
         return;
@@ -220,9 +224,7 @@ class MediaSoupEventHandler {
   }
 
   private removeEventListeners() {
-    const { connection } = this.engine.network.socket;
-
-    if (!connection) {
+    if (!this.engine.eventsQueue) {
       return;
     }
 
@@ -243,7 +245,9 @@ class MediaSoupEventHandler {
       MEDIASOUP_EVENTS.producerForceClosed,
     ];
 
-    eventNames.forEach((x) => connection.removeAllListeners(x));
+    const { connection } = this.engine.network.socket;
+
+    this.engine.eventsQueue.removeAllListeners(eventNames, connection);
   }
 
   public reset() {

package/src/engine/index.ts

@@ -57,6 +57,7 @@ import {
 import ChannelStateSyncEventHandler from './handlers/ChannelStateSyncEventHandler';
 import { getSupportedCodecsMimeTypes } from '../helpers/media';
 import ChannelStateSynchronizer from './ChannelStateSynchronizer';
+import EventsQueue from './EventsQueue';
 import clientMetaProvider from '../ClientMetaProvider';
 
 type EngineParams = {
@@ -89,6 +90,8 @@ class Engine {
 
   public internalEventEmitter: EnhancedEventEmitter<InternalObserverEvents>;
 
+  public eventsQueue: EventsQueue;
+
   public logLevel: LogLevel;
 
   public readonly peersRepository: Map<string, Peer>;
@@ -183,6 +186,7 @@ class Engine {
     this.peersRepository = new Map<string, Peer>();
     this.clientEventEmitter = clientEventEmitter;
     this.internalEventEmitter = internalEventEmitter;
+    this.eventsQueue = new EventsQueue();
     this.channelEventsHandler = dependenciesFactory.createChannelEventHandler({
       engine: this,
       onLogMessage: params.onLogMessage,
@@ -310,6 +314,7 @@ class Engine {
       this.audioObserver?.close();
 
       this.generalDataConsumer?.removeListener('message', this.handleDataChannelEvent);
+      this.eventsQueue.removeListener('message');
       this.generalDataConsumer?.close();
 
       this.channelStateSyncDataConsumer?.removeListener('message', this.handleChannelStateSyncEvent);
@@ -852,7 +857,8 @@ class Engine {
         ordered: true,
       });
 
-      this.generalDataConsumer.on('message', this.handleDataChannelEvent);
+      this.eventsQueue.subscribeToDataChannel(this.generalDataConsumer);
+      this.eventsQueue.on('message', this.handleDataChannelEvent);
       this.logger.debug('Successfully created general data consumer', {
         ...logCtx,
         producerId,

package/src/types/channelStateSyncronizer.ts

@@ -3,10 +3,17 @@ export interface ChannelStateProducer {
   paused: boolean;
 }
 
+export interface ChannelStateConsumer {
+  id: string;
+  paused: boolean;
+  producerId: string;
+}
+
 export interface ChannelStatePeer {
   id: string;
   appDataHash: string;
   producers: ChannelStateProducer[];
+  consumers?: ChannelStateConsumer[];
 }
 
 export interface ChannelState {