@livedigital/client 3.41.0-test-rejoins.4 → 3.41.1

package/dist/types/channelStateSyncronizer.d.ts

@@ -1,16 +1,10 @@
 import type { ChannelStateShortPeer } from '../proto/generated/channel/channel_state_short';
-export interface LocalChannelStatePeerProducer {
-    id: string;
-    paused: boolean;
-    stateChangedAt: number;
-}
 export interface LocalChannelStatePeerConsumer {
     id: string;
     paused: boolean;
     producerId: string;
 }
 export interface LocalChannelStatePeer extends ChannelStateShortPeer {
-    producers: LocalChannelStatePeerProducer[];
     consumers?: LocalChannelStatePeerConsumer[];
 }
 export interface LocalChannelState {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@livedigital/client",
   "author": "vlprojects",
   "license": "MIT",
-  "version": "3.41.0-test-rejoins.4",
+  "version": "3.41.1",
   "private": false,
   "bugs": {
     "url": "https://github.com/vlprojects/livedigital-sdk/issues"
@@ -51,7 +51,7 @@
     "hash-sum": "^2.0.0",
     "inversify": "^6.0.2",
     "load-script": "^2.0.0",
-    "mediasoup-client": "3.11",
+    "mediasoup-client": "3.15.6",
     "message-batcher": "^0.0.2",
     "qs": "^6.11.0",
     "reflect-metadata": "^0.2.2",

package/src/constants/common.ts

@@ -2,7 +2,7 @@
 
 import type { LogLevel } from '../types/common';
 
-export const SIGNALING_API_VERSION = 7;
+export const SIGNALING_API_VERSION = 6;
 
 export const LOG_LEVEL_ERROR: LogLevel = 3;
 export const LOG_LEVEL_WARN: LogLevel = 4;

package/src/engine/ChannelStateSynchronizer/ChannelStateSynchronizer.ts

@@ -361,7 +361,7 @@ class ChannelStateSynchronizer {
       const { paused } = clusterPeerProducer;
 
       if (localProducer.paused !== paused) {
-        localProducer.setPaused(paused);
+        localProducer.paused = paused;
         const producerStateEvent = localProducer.paused ? PEER_EVENTS.publisherPaused : PEER_EVENTS.publisherResumed;
         localPeer.observer.safeEmit(producerStateEvent, {
           producerId: localProducer.id,

package/src/engine/PeerProducer.ts

@@ -19,8 +19,6 @@ class PeerProducer {
 
   readonly trackTransformParams?: TrackTransformParams;
 
-  #stateChangedAt: number;
-
   constructor(params: ProducerData) {
     const {
       id, kind, peerId, label, paused,
@@ -34,16 +32,6 @@ class PeerProducer {
     this.encodings = params.encodings;
     this.trackTransformParams = params.trackTransformParams;
     this.maxSpatialLayer = params.maxSpatialLayer;
-    this.#stateChangedAt = Date.now();
-  }
-
-  setPaused(paused: boolean): void {
-    this.paused = paused;
-    this.#stateChangedAt = Date.now();
-  }
-
-  getStateChangedAt(): number {
-    return this.#stateChangedAt;
   }
 }
 

package/src/engine/handlers/ChannelStateSyncEventHandler/ChannelStateConsistencyChecker.ts

@@ -1,22 +1,18 @@
-import { FIVE_SECONDS_IN_MS } from '../../../constants/common';
 import type {
   ChannelStateShort,
+  ChannelStateShortPeer,
+  ChannelStateShortProducer,
 } from '../../../proto/generated/channel/channel_state_short';
-import type {
-  LocalChannelState,
-  LocalChannelStatePeer,
-  LocalChannelStatePeerConsumer,
-  LocalChannelStatePeerProducer,
-} from '../../../types/channelStateSyncronizer';
+import type { LocalChannelStatePeer, LocalChannelStatePeerConsumer } from '../../../types/channelStateSyncronizer';
 import ChannelStateConsistencyCheckResult from './ChannelStateConsistencyCheckResult';
 
 interface ChannelStateConsistencyCheckerParams {
-  localState: LocalChannelState;
+  localState: ChannelStateShort;
   remoteState: ChannelStateShort;
 }
 
 class ChannelStateConsistencyChecker {
-  private readonly localState: LocalChannelState;
+  private readonly localState: ChannelStateShort;
 
   private readonly remoteState: ChannelStateShort;
 
@@ -53,15 +49,19 @@ class ChannelStateConsistencyChecker {
       }
 
       remotePeer.producers.forEach((remoteProducer) => {
+        const localConsumer = this.findLocalConsumerByProducerId(localPeer, remoteProducer.id);
+
+        if (localConsumer && localConsumer.paused !== remoteProducer.paused) {
+          this.consumersWithInconsistentState.push(localConsumer.id);
+        }
+
         const localProducer = this.findLocalProducerById(localPeer, remoteProducer.id);
 
         if (!localProducer) {
           this.missingProducers.push(remoteProducer.id);
-
-          return;
         }
 
-        if (this.isLocalProducerStateChangedRecently(localProducer)) {
+        if (!localProducer) {
           return;
         }
 
@@ -69,19 +69,6 @@ class ChannelStateConsistencyChecker {
 
         if (isInconsistentState) {
           this.producersWithInconsistentState.push(remoteProducer.id);
-
-          // don't check consumer state while producer state is inconsistent
-          return;
-        }
-
-        const localConsumer = this.findLocalConsumerByProducerId(localPeer, remoteProducer.id);
-
-        if (localConsumer && localConsumer.paused !== remoteProducer.paused) {
-          this.consumersWithInconsistentState.push(localConsumer.id);
-        }
-
-        if (!localProducer) {
-          this.missingProducers.push(remoteProducer.id);
         }
       });
     });
@@ -115,7 +102,7 @@ class ChannelStateConsistencyChecker {
     return this.peersWithInconsistentAppData;
   }
 
-  private findLocalPeerById(id: string): LocalChannelStatePeer | undefined {
+  private findLocalPeerById(id: string): ChannelStateShortPeer | undefined {
     return this.localState.peers.find((item) => item.id === id);
   }
 
@@ -126,7 +113,7 @@ class ChannelStateConsistencyChecker {
     return peer.consumers?.find((item) => item.producerId === producerId);
   }
 
-  private findLocalProducerById(peer: LocalChannelStatePeer, id: string): LocalChannelStatePeerProducer | undefined {
+  private findLocalProducerById(peer: ChannelStateShortPeer, id: string): ChannelStateShortProducer | undefined {
     return peer.producers.find((item) => item.id === id);
   }
 
@@ -137,10 +124,6 @@ class ChannelStateConsistencyChecker {
     this.producersWithInconsistentState = [];
     this.peersWithInconsistentAppData = [];
   }
-
-  private isLocalProducerStateChangedRecently(producer: LocalChannelStatePeerProducer): boolean {
-    return Date.now() - producer.stateChangedAt < FIVE_SECONDS_IN_MS;
-  }
 }
 
 export default ChannelStateConsistencyChecker;

package/src/engine/handlers/ChannelStateSyncEventHandler/index.ts

@@ -274,7 +274,6 @@ class ChannelStateSyncEventHandler {
         producers: peer.getProducers().map((producer) => ({
           id: producer.id,
           paused: producer.paused,
-          stateChangedAt: producer.getStateChangedAt(),
         })),
         consumers: peer.getConsumersState(),
       })),

package/src/engine/handlers/MediaEventHandler.ts

@@ -131,7 +131,7 @@ class MediaEventHandler {
       return;
     }
 
-    producer.setPaused(true);
+    producer.paused = true;
     peer.observer.safeEmit(PEER_EVENTS.publisherPaused, {
       producerId: producer.id,
       kind: producer.kind,
@@ -152,7 +152,7 @@ class MediaEventHandler {
       return;
     }
 
-    producer.setPaused(false);
+    producer.paused = false;
     peer.observer.safeEmit(PEER_EVENTS.publisherResumed, {
       producerId: producer.id,
       kind: producer.kind,

package/src/engine/index.ts

@@ -136,7 +136,7 @@ class Engine {
         this.network.createSendTransport(this.media.mediasoupDevice),
         this.network.createRecvTransport(this.media.mediasoupDevice),
         // @INFO: un-comment to enable signaling tcp transport connection
-        this.network.createSignalingTransport(this.media.mediasoupDevice),
+        // this.network.createSignalingTransport(this.media.mediasoupDevice),
       ]);
 
       this.webRtcIssueDetector?.handleNewPeerConnection(sendTransport.handler._pc, sendTransport.id);
@@ -162,7 +162,7 @@ class Engine {
 
       // @INFO: un-comment to enable signaling tcp transport connection
       // @WARN: must be non-blocking, no await
-      await this.network.createSignalingConsumer();
+      // this.network.createSignalingConsumer();
     } catch (error: unknown) {
       this.#logger.error('initialize()', { error });
 
@@ -887,8 +887,8 @@ class Engine {
       case: 'waitForReconnectOrTriggerRejoinEventIfAppropriate',
     });
 
-    const CHECKS_INTERVAL = 10_000;
-    const REQUIRED_SUCCESSFUL_CHECKS = 6;
+    const CHECKS_INTERVAL = 3_000;
+    const REQUIRED_SUCCESSFUL_CHECKS = 4;
     let continuousNumberOfLoadbalancerSuccessfulChecks = 0;
 
     const checkInterval = setInterval(async () => {

package/src/engine/network/index.ts

@@ -41,6 +41,11 @@ import LivedigitalSDKError from '../../errors/LivedigitalSDKError';
 import { ClientObserverEvents } from '../../types/engine';
 import DataChannelsManager from './DataChannelsManager';
 
+interface IceIntervalTimeouts {
+  send?: ReturnType<typeof setInterval>;
+  recv?: ReturnType<typeof setInterval>;
+}
+
 const TRANSPORT_RESTART_ICE_INTERVAL = 5_000;
 const TRANSPORT_DETAILS_DELAY = 1500;
 
@@ -58,7 +63,10 @@ class Network {
 
   private preferRelay?: boolean;
 
-  readonly #iceIntervalTimeouts = new Map<string, ReturnType<typeof setInterval>>();
+  readonly #iceIntervalTimeouts: IceIntervalTimeouts = {
+    send: undefined,
+    recv: undefined,
+  };
 
   readonly #eventEmitter: EnhancedEventEmitter<NetworkObserverEvents>;
 
@@ -392,7 +400,7 @@ class Network {
     }
 
     this.signalingDataProducer = await transport.produceData({
-      label: 'heart-beater',
+      label: 'signaling-data-channel',
       protocol: 'json',
     });
 
@@ -711,7 +719,8 @@ class Network {
   }
 
   private stopRestartIceAttempts(): void {
-    Array.from(this.#iceIntervalTimeouts.values()).forEach((interval) => clearInterval(interval));
+    clearInterval(this.#iceIntervalTimeouts.send);
+    clearInterval(this.#iceIntervalTimeouts.recv);
   }
 
   private subscribeCommonTransportEvents(transport: Transport): void {
@@ -809,10 +818,10 @@ class Network {
           direction: transport.direction,
         });
 
-        if (this.#iceIntervalTimeouts.has(transport.id)) {
+        if (this.#iceIntervalTimeouts[transport.direction]) {
           this.#logger.debug('Stop receiveTransport.restartIce() retries', { recvTransportId: transport.id });
-          clearInterval(this.#iceIntervalTimeouts.get(transport.id));
-          this.#iceIntervalTimeouts.delete(transport.id);
+          clearInterval(this.#iceIntervalTimeouts[transport.direction]);
+          this.#iceIntervalTimeouts[transport.direction] = undefined;
 
           if (state === 'connected') {
             this.#eventEmitter.safeEmit(NETWORK_OBSERVER_EVENTS.transportState, {
@@ -841,38 +850,29 @@ class Network {
       });
 
       if (['disconnected', 'failed'].includes(state)) {
-        if (this.#iceIntervalTimeouts.has(transport.id)) {
+        if (this.#iceIntervalTimeouts[transport.direction]) {
           return;
         }
 
         if (state === 'failed') {
-          this.#logger.debug(`${ transport.id } transport.restartIce()`, {
-            transportId: transport.id,
-            direction: transport.direction,
-          });
+          this.#logger.debug(`${ transport.direction }Transport.restartIce()`, { recvTransportId: transport.id });
           this.restartIce(transport).catch((error: unknown) => {
             this.#logger.debug('Failed to execute restartIce', {
               error: serializeError(error),
-              transportId: transport.id,
-              direction: transport.direction,
             });
           });
         }
 
-        this.#iceIntervalTimeouts.set(transport.id, setInterval(() => {
+        this.#iceIntervalTimeouts[transport.direction] = setInterval(() => {
           this.restartIce(transport).catch((error: unknown) => {
             this.#logger.debug('Failed to execute restartIce', {
               error: serializeError(error),
-              transportId: transport.id,
-              direction: transport.direction,
             });
           });
-          this.#logger.debug(`${ transport.id } transport.restartIce() attempt`, {
+          this.#logger.debug(`${ transport.direction }Transport.restartIce() attempt`, {
             recvTransportId: transport.id,
-            transportId: transport.id,
-            direction: transport.direction,
           });
-        }, TRANSPORT_RESTART_ICE_INTERVAL));
+        }, TRANSPORT_RESTART_ICE_INTERVAL);
       }
     });
 

package/src/types/channelStateSyncronizer.ts

@@ -1,11 +1,5 @@
 import type { ChannelStateShortPeer } from '../proto/generated/channel/channel_state_short';
 
-export interface LocalChannelStatePeerProducer {
-  id: string;
-  paused: boolean;
-  stateChangedAt: number;
-}
-
 export interface LocalChannelStatePeerConsumer {
   id: string;
   paused: boolean;
@@ -13,7 +7,6 @@ export interface LocalChannelStatePeerConsumer {
 }
 
 export interface LocalChannelStatePeer extends ChannelStateShortPeer {
-  producers: LocalChannelStatePeerProducer[];
   consumers?: LocalChannelStatePeerConsumer[];
 };