@livedigital/client 2.21.0-update-app-data.1 → 2.21.0

package/package.json

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

package/src/constants/common.ts

@@ -12,7 +12,7 @@ export const LogLevels = {
   Debug: LOG_LEVEL_DEBUG,
 };
 
-export const CONSUMER_CHECK_STATE_TIMEOUT = 5000;
+export const CONSUMER_CHECK_STATE_TIMEOUT = 4500;
 export const PRODUCER_CHECK_STATE_TIMEOUT = 3000;
 
 export const PEER_APP_DATA_MAX_SIZE_BYTES = 1024;

package/src/constants/events.ts

@@ -58,6 +58,7 @@ export const MEDIASOUP_EVENTS = {
   resumeConsumer: 'consumer.resume',
   consumerScoreChanged: 'consumer.scoreChanged',
   consumerChangePreferredLayers: 'consumer.changeConsumerPreferredLayers',
+  consumerRequestKeyFrame: 'consumer.requestKeyFrame',
   setConsumerPriority: 'consumer.setConsumerPriority',
   transportCreate: 'transport.create',
   transportClose: 'transport.close',

package/src/engine/Peer.ts

@@ -131,7 +131,7 @@ class Peer {
         return;
       }
 
-      const { isProducerPaused, consumer } = await this.engine.network.createConsumer({
+      const { consumer } = await this.engine.network.createConsumer({
         producerId: producer.id,
         rtpCapabilities: this.engine.media.mediasoupDevice.rtpCapabilities,
         producerPeerId: this.id,
@@ -148,10 +148,7 @@ class Peer {
         peerEventEmitter: this.observer,
       });
 
-      if (!isProducerPaused) {
-        await track.resume();
-      }
-
+      await track.resume();
       this.tracks.set(track.label, track);
       this.logger.debug(`Subscribed for ${producer.kind}`, { peer: this });
     } catch (error) {

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

@@ -172,7 +172,7 @@ class BaseTrack {
     }
 
     this.logger.debug('createSelfConsumer()', { track: this });
-    const { isProducerPaused, consumer } = await this.#engine.network.createConsumer({
+    const { consumer } = await this.#engine.network.createConsumer({
       producerId: this.producer.id,
       rtpCapabilities: this.#engine.media.mediasoupDevice.rtpCapabilities,
       producerPeerId: this.producer.appData.peerId,
@@ -180,10 +180,8 @@ class BaseTrack {
       channelId: this.#engine.channelId,
     });
 
-    if (!isProducerPaused) {
-      await this.#engine.network.resumeRemoteConsumer(consumer.id);
-    }
-
+    await this.#engine.network.resumeRemoteConsumer(consumer.id);
+    consumer.resume();
     this.#selfConsumer = new PeerConsumer({
       consumer,
       logLevel: this.#engine.logLevel,

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

@@ -1,6 +1,7 @@
 import { MediaKind } from 'mediasoup-client/lib/types';
 import {
-  PreferredLayersParams, SetConsumerPriorityParams,
+  PreferredLayersParams,
+  SetConsumerPriorityParams,
   SpatialLayerParams,
   TrackLabel,
 } from '../../../types/common';
@@ -116,11 +117,12 @@ class PeerTrack {
     if (!this.consumer) {
       this.#paused = false;
       this.#peerEventEmitter.safeEmit(PEER_EVENTS.trackResumed, this);
+      this.#logger.debug('resume()', { track: this, peer: this });
       return;
     }
 
     if (!this.#paused) {
-      this.#logger.debug('resume()', { message: 'Already playing', peer: this, consumer: this.consumer });
+      this.#logger.debug('resume()', { message: 'Already playing', track: this, peer: this });
       return;
     }
 
@@ -130,7 +132,7 @@ class PeerTrack {
       this.#paused = false;
       this.#peerEventEmitter.safeEmit(PEER_EVENTS.trackResumed, this);
       this.checkConsumerState();
-      this.#logger.debug('resume()', { peer: this });
+      this.#logger.debug('resume()', { track: this, peer: this });
     } catch (error) {
       this.#logger.warn('resume()', { error });
     }
@@ -201,6 +203,28 @@ class PeerTrack {
     }
   }
 
+  public async requestKeyFrame(): Promise<void> {
+    if (!this.consumerId) {
+      return;
+    }
+
+    this.#logger.debug('requestKeyFrame()', { track: this });
+
+    try {
+      await this.#engine.network.socket.request(MEDIASOUP_EVENTS.consumerRequestKeyFrame, {
+        consumerId: this.consumerId,
+      });
+    } catch (error: unknown) {
+      this.#logger.error('requestKeyFrame()', {
+        error,
+        peer: this,
+        consumerId: this.consumerId,
+      });
+
+      throw new Error('Failed to request key frame');
+    }
+  }
+
   public getVideoAvailableLayers(): SpatialLayerParams[] | undefined {
     if (!this.consumer) {
       return undefined;
@@ -263,13 +287,21 @@ class PeerTrack {
 
       this.#logger.debug('checkConsumerState()', { track: this });
       const isInboundRTPStreamActive = await this.isInboundRTPStreamActive();
-      if (this.#consumerRestarted && !isInboundRTPStreamActive) {
-        this.#peerEventEmitter.emit(PEER_EVENTS.trackFailed, this);
-        this.#logger.debug('trackFail()', { track: this });
+
+      if (isInboundRTPStreamActive || this.#closed) {
         return;
       }
 
-      if (isInboundRTPStreamActive || this.#closed) {
+      await this.requestKeyFrame();
+      const isActiveAfterKeyFrameRequest = await this.isInboundRTPStreamActive();
+
+      if (isActiveAfterKeyFrameRequest || this.#closed) {
+        return;
+      }
+
+      if (this.#consumerRestarted) {
+        this.#peerEventEmitter.emit(PEER_EVENTS.trackFailed, this);
+        this.#logger.debug('trackFail()', { track: this });
         return;
       }
 
@@ -302,7 +334,7 @@ class PeerTrack {
       this.#peerEventEmitter.emit(PEER_EVENTS.trackEnd, this);
       this.#paused = true;
       await this.closeConsumer();
-      const { isProducerPaused, consumer } = await this.#engine.network.createConsumer({
+      const { consumer } = await this.#engine.network.createConsumer({
         producerId: this.consumer.producerId,
         rtpCapabilities: this.#engine.media.mediasoupDevice.rtpCapabilities,
         producerPeerId: this.consumer.appData.producerData.peerId,
@@ -314,10 +346,7 @@ class PeerTrack {
       this.consumer = new PeerConsumer({ consumer, logLevel: this.#engine.logLevel });
       this.#mediaStreamTrack = consumer.track;
 
-      if (!isProducerPaused) {
-        await this.resume();
-      }
-
+      await this.resume();
       this.#peerEventEmitter.emit(PEER_EVENTS.trackStart, this);
     } catch (error) {
       this.#consumerRestarted = true;

package/src/engine/network/index.ts

@@ -245,11 +245,12 @@ class Network {
     }) as RemoteConsumerOptions;
 
     const consumer = await transport.consume(consumerOptions);
-    this.logger.debug('Consumer created', { consumer });
+    const { producerPaused: isProducerPaused } = consumerOptions;
+    this.logger.debug('Consumer created', { consumer, isProducerPaused });
 
     return {
       consumer,
-      isProducerPaused: consumerOptions.producerPaused,
+      isProducerPaused,
     };
   }