@100mslive/hms-video-store 0.2.69 → 0.2.70

package/dist/core/hmsSDKStore/HMSNotifications.d.ts

@@ -1,7 +1,7 @@
 import { IHMSNotifications } from '../IHMSNotifications';
 import { IHMSStore } from '../IHMSStore';
 import * as sdkTypes from './sdkTypes';
-import { HMSNotification, HMSPeer, HMSException, HMSMessage, HMSChangeTrackStateRequest, HMSChangeMultiTrackStateRequest, HMSLeaveRoomRequest, HMSDeviceChangeEvent } from '../schema';
+import { HMSNotification, HMSPeer, HMSException, HMSMessage, HMSTrackID, HMSChangeTrackStateRequest, HMSChangeMultiTrackStateRequest, HMSLeaveRoomRequest, HMSDeviceChangeEvent } from '../schema';
 export declare class HMSNotifications implements IHMSNotifications {
     private id;
     private eventEmitter;
@@ -12,7 +12,7 @@ export declare class HMSNotifications implements IHMSNotifications {
     sendLeaveRoom(request: HMSLeaveRoomRequest): void;
     sendPeerList(peers: HMSPeer[]): void;
     sendPeerUpdate(type: sdkTypes.HMSPeerUpdate, peer: HMSPeer | null): void;
-    sendTrackUpdate(type: sdkTypes.HMSTrackUpdate, trackID: string): void;
+    sendTrackUpdate(type: sdkTypes.HMSTrackUpdate, trackID: HMSTrackID): void;
     sendMessageReceived(message: HMSMessage): void;
     sendError(error: HMSException): void;
     sendReconnecting(error: HMSException): void;

package/dist/core/hmsSDKStore/HMSSDKActions.d.ts

@@ -145,15 +145,7 @@ export declare class HMSSDKActions implements IHMSActions {
     private getStoreLocalTrackIDfromSDKTrack;
     private setProgress;
     private syncPlaylistState;
-    /**
-     * Handle store update on remote track changes
-     * @param {string} action - 'trackAdded' | 'trackUpdate'
-     * @param {SDKHMSTrack} track - track added/updated
-     * @param {sdkTypes.HMSPeer}peer - peer on which track is added/updated
-     */
-    private syncRemoteTrackState;
-    private peerUpdateInternal;
-    private updateTracksInPeer;
+    private sendPeerUpdateNotification;
     /**
      * setState is separate so any future changes to how state change can be done from one place.
      * @param fn

package/dist/core/hmsSDKStore/sdkUtils/storeMergeUtils.d.ts

@@ -1,5 +1,4 @@
 import { HMSPeer, HMSPeerID, HMSTrack, HMSTrackID } from '../../schema';
-import { HMSTrack as SDKHMSTrack } from '@100mslive/hms-video';
 /**
  * updates draftPeers with newPeers ensuring minimal reference changes
  * @remarks
@@ -10,6 +9,6 @@ import { HMSTrack as SDKHMSTrack } from '@100mslive/hms-video';
  * @param newHmsTracks this will be update if required
  * @param newHmsSDkTracks this is future value of local hms tacks map
  */
-export declare const mergeNewPeersInDraft: (draftPeers: Record<HMSPeerID, HMSPeer>, newPeers: Record<HMSPeerID, Partial<HMSPeer>>, newHmsTracks: Record<HMSTrackID, Partial<HMSTrack>>, newHmsSDkTracks: Record<HMSTrackID, SDKHMSTrack>) => void;
+export declare const mergeNewPeersInDraft: (draftPeers: Record<HMSPeerID, HMSPeer>, newPeers: Record<HMSPeerID, Partial<HMSPeer>>) => void;
 export declare const mergeNewTracksInDraft: (draftTracks: Record<HMSTrackID, HMSTrack>, newTracks: Record<HMSTrackID, Partial<HMSTrack>>) => void;
 export declare const areArraysEqual: <T>(arr1: T[], arr2?: T[] | undefined) => boolean;

package/dist/hms-video-store.cjs.development.js

@@ -996,7 +996,7 @@ var createDefaultStoreState = function createDefaultStoreState() {
  * @param newHmsTracks this will be update if required
  * @param newHmsSDkTracks this is future value of local hms tacks map
  */
-var mergeNewPeersInDraft = function mergeNewPeersInDraft(draftPeers, newPeers, newHmsTracks, newHmsSDkTracks) {
+var mergeNewPeersInDraft = function mergeNewPeersInDraft(draftPeers, newPeers) {
   var peerIDs = union(Object.keys(draftPeers), Object.keys(newPeers));
 
   for (var _iterator = _createForOfIteratorHelperLoose(peerIDs), _step; !(_step = _iterator()).done;) {
@@ -1009,7 +1009,6 @@ var mergeNewPeersInDraft = function mergeNewPeersInDraft(draftPeers, newPeers, n
         newPeer.auxiliaryTracks = oldPeer.auxiliaryTracks;
       }
 
-      handleLocalVideoReplaceTrack(oldPeer, newPeer, newHmsTracks, newHmsSDkTracks);
       Object.assign(oldPeer, newPeer);
     } else if (isEntityRemoved(oldPeer, newPeer)) {
       delete draftPeers[peerID];
@@ -1097,23 +1096,6 @@ var union = function union(arr1, arr2) {
 
   return Array.from(set);
 };
-/**
- * on replace track, use prev video track id in peer object, this is because we
- * don't want the peer or peers object reference to change, the fact that the video
- * track is changed on mute/unmute because of replace track is abstracted
- */
-
-
-function handleLocalVideoReplaceTrack(oldPeer, newPeer, newHmsTracks, newHmsSDkTracks) {
-  if (oldPeer.isLocal && oldPeer.videoTrack && newPeer.videoTrack && oldPeer.videoTrack !== newPeer.videoTrack) {
-    newHmsSDkTracks[oldPeer.videoTrack] = newHmsSDkTracks[newPeer.videoTrack];
-    delete newHmsSDkTracks[newPeer.videoTrack];
-    newHmsTracks[oldPeer.videoTrack] = newHmsTracks[newPeer.videoTrack];
-    newHmsTracks[oldPeer.videoTrack].id = oldPeer.videoTrack;
-    delete newHmsTracks[newPeer.videoTrack];
-    newPeer.videoTrack = oldPeer.videoTrack;
-  }
-}
 
 var SDKToHMS = /*#__PURE__*/function () {
   function SDKToHMS() {}
@@ -1128,8 +1110,8 @@ var SDKToHMS = /*#__PURE__*/function () {
       isLocal: sdkPeer.isLocal,
       videoTrack: (_sdkPeer$videoTrack = sdkPeer.videoTrack) == null ? void 0 : _sdkPeer$videoTrack.trackId,
       audioTrack: (_sdkPeer$audioTrack = sdkPeer.audioTrack) == null ? void 0 : _sdkPeer$audioTrack.trackId,
-      auxiliaryTracks: sdkPeer.auxiliaryTracks.map(function (t) {
-        return t.trackId;
+      auxiliaryTracks: sdkPeer.auxiliaryTracks.map(function (track) {
+        return track.trackId;
       }),
       customerUserId: sdkPeer.customerUserId,
       customerDescription: sdkPeer.customerDescription
@@ -2715,46 +2697,26 @@ var HMSSDKActions = /*#__PURE__*/function () {
         Object.assign(draftStore.playlist, SDKToHMS.convertPlaylist(_this.sdk.getPlaylistManager()));
       }, action);
     };
-    /**
-     * Handle store update on remote track changes
-     * @param {string} action - 'trackAdded' | 'trackUpdate'
-     * @param {SDKHMSTrack} track - track added/updated
-     * @param {sdkTypes.HMSPeer}peer - peer on which track is added/updated
-     */
-
 
-    this.syncRemoteTrackState = function (action, track, peer) {
-      HMSLogger.time(action + "-" + track.trackId);
+    this.sendPeerUpdateNotification = function (type, sdkPeer) {
+      var peer = _this.store.getState(selectPeerByID(sdkPeer.peerId));
 
-      _this.setState(function (draftStore) {
-        var draftPeer = draftStore.peers[peer.peerId];
-        /**
-         * in preview -> leave -> join flow or join -> leave -> join flow,
-         * since peer will be cleared by leave, set peer again in the store
-         **/
-
-        if (!draftPeer) {
-          var hmsPeer = SDKToHMS.convertPeer(peer);
-          draftStore.peers[peer.peerId] = hmsPeer;
-          draftPeer = hmsPeer;
-        }
+      var actionName = 'peerUpdate';
 
-        var hmsTrack = SDKToHMS.convertTrack(track, peer.peerId);
+      if (type === sdkTypes.HMSPeerUpdate.PEER_JOINED) {
+        actionName = 'peerJoined';
+      } else if (type === sdkTypes.HMSPeerUpdate.PEER_LEFT) {
+        actionName = 'peerLeft';
+      }
 
-        if (action === 'trackAdded') {
-          draftStore.tracks[hmsTrack.id] = hmsTrack;
+      _this.syncRoomState(actionName); // if peer wasn't available before sync(will happen if event is peer join)
 
-          _this.updateTracksInPeer(peer, draftPeer, hmsTrack);
-        } else if (draftStore.tracks[hmsTrack.id]) {
-          Object.assign(draftStore.tracks[hmsTrack.id], hmsTrack);
-        } else {
-          _this.logPossibleInconsistency("track " + hmsTrack.id + " not present, unable to update track");
-        }
 
-        _this.hmsSDKTracks[track.trackId] = track;
-      }, action);
+      if (!peer) {
+        peer = _this.store.getState(selectPeerByID(sdkPeer.peerId));
+      }
 
-      HMSLogger.timeEnd(action + "-" + track.trackId);
+      _this.hmsNotifications.sendPeerUpdate(type, peer);
     };
     /**
      * setState is separate so any future changes to how state change can be done from one place.
@@ -4209,7 +4171,7 @@ var HMSSDKActions = /*#__PURE__*/function () {
       var draftPeers = draftStore.peers;
       var draftTracks = draftStore.tracks; // the order of below statements are important as merge functions are mutating
 
-      mergeNewPeersInDraft(draftPeers, newHmsPeers, newHmsTracks, newHmsSDkTracks);
+      mergeNewPeersInDraft(draftPeers, newHmsPeers);
       mergeNewTracksInDraft(draftTracks, newHmsTracks);
       Object.assign(draftStore.settings, newMediaSettings);
       _this9.hmsSDKTracks = newHmsSDkTracks;
@@ -4256,9 +4218,11 @@ var HMSSDKActions = /*#__PURE__*/function () {
   };
 
   _proto.onPeerUpdate = function onPeerUpdate(type, sdkPeer) {
-    if (type === sdkTypes.HMSPeerUpdate.BECAME_DOMINANT_SPEAKER || type === sdkTypes.HMSPeerUpdate.RESIGNED_DOMINANT_SPEAKER) {
+    if ([sdkTypes.HMSPeerUpdate.BECAME_DOMINANT_SPEAKER, sdkTypes.HMSPeerUpdate.RESIGNED_DOMINANT_SPEAKER].includes(type)) {
       return; // ignore, high frequency update so no point of syncing peers
-    } else if (Array.isArray(sdkPeer)) {
+    }
+
+    if (Array.isArray(sdkPeer)) {
       this.syncRoomState('peersJoined');
       var hmsPeers = [];
 
@@ -4272,9 +4236,10 @@ var HMSSDKActions = /*#__PURE__*/function () {
       }
 
       this.hmsNotifications.sendPeerList(hmsPeers);
-    } else {
-      this.peerUpdateInternal(type, sdkPeer);
+      return;
     }
+
+    this.sendPeerUpdateNotification(type, sdkPeer);
   };
 
   _proto.onTrackUpdate = function onTrackUpdate(type, track, peer) {
@@ -4285,7 +4250,7 @@ var HMSSDKActions = /*#__PURE__*/function () {
       this.handleTrackRemove(track, peer);
     } else {
       var actionName = type === sdkTypes.HMSTrackUpdate.TRACK_ADDED ? 'trackAdded' : 'trackUpdate';
-      this.syncRemoteTrackState(actionName, track, peer);
+      this.syncRoomState(actionName);
       this.hmsNotifications.sendTrackUpdate(type, track.trackId);
     }
   };
@@ -4467,22 +4432,23 @@ var HMSSDKActions = /*#__PURE__*/function () {
 
     this.setState(function (draftStore) {
       var hmsPeer = draftStore.peers[sdkPeer.peerId];
-      var draftTracks = draftStore.tracks; // find and remove the exact track from hmsPeer
+      var draftTracks = draftStore.tracks;
+      var trackId = sdkTrack.trackId; // find and remove the exact track from hmsPeer
 
-      if (_this12.isSameStoreSDKTrack(sdkTrack.trackId, hmsPeer == null ? void 0 : hmsPeer.audioTrack)) {
+      if (_this12.isSameStoreSDKTrack(trackId, hmsPeer == null ? void 0 : hmsPeer.audioTrack)) {
         hmsPeer == null ? true : delete hmsPeer.audioTrack;
-      } else if (_this12.isSameStoreSDKTrack(sdkTrack.trackId, hmsPeer == null ? void 0 : hmsPeer.videoTrack)) {
+      } else if (_this12.isSameStoreSDKTrack(trackId, hmsPeer == null ? void 0 : hmsPeer.videoTrack)) {
         hmsPeer == null ? true : delete hmsPeer.videoTrack;
       } else {
-        var auxiliaryIndex = hmsPeer == null ? void 0 : hmsPeer.auxiliaryTracks.indexOf(sdkTrack.trackId);
+        var auxiliaryIndex = hmsPeer == null ? void 0 : hmsPeer.auxiliaryTracks.indexOf(trackId);
 
-        if (auxiliaryIndex > -1 && _this12.isSameStoreSDKTrack(sdkTrack.trackId, hmsPeer == null ? void 0 : hmsPeer.auxiliaryTracks[auxiliaryIndex])) {
+        if (auxiliaryIndex > -1 && _this12.isSameStoreSDKTrack(trackId, hmsPeer == null ? void 0 : hmsPeer.auxiliaryTracks[auxiliaryIndex])) {
           hmsPeer == null ? void 0 : hmsPeer.auxiliaryTracks.splice(auxiliaryIndex, 1);
         }
       }
 
-      delete draftTracks[sdkTrack.trackId];
-      delete _this12.hmsSDKTracks[sdkTrack.trackId];
+      delete draftTracks[trackId];
+      delete _this12.hmsSDKTracks[trackId];
     }, 'trackRemoved');
   };
 
@@ -4859,64 +4825,6 @@ var HMSSDKActions = /*#__PURE__*/function () {
     });
   };
 
-  _proto.peerUpdateInternal = function peerUpdateInternal(type, sdkPeer) {
-    var _this14 = this;
-
-    // store peer in case it doesn't exist later(will happen if event is peer leave)
-    var peer = this.store.getState(selectPeerByID(sdkPeer.peerId));
-    var actionName = 'peerUpdate';
-
-    if (type === sdkTypes.HMSPeerUpdate.PEER_JOINED) {
-      actionName = 'peerJoined';
-    } else if (type === sdkTypes.HMSPeerUpdate.PEER_LEFT) {
-      actionName = 'peerLeft';
-    }
-
-    HMSLogger.time(actionName + "-" + sdkPeer.peerId);
-    this.setState(function (draftStore) {
-      if (actionName === 'peerLeft') {
-        var index = draftStore.room.peers.indexOf(sdkPeer.peerId);
-
-        if (index > -1) {
-          draftStore.room.peers.splice(index, 1);
-        }
-
-        delete draftStore.peers[sdkPeer.peerId];
-        delete _this14.hmsSDKPeers[sdkPeer.peerId];
-      } else {
-        var hmsPeer = SDKToHMS.convertPeer(sdkPeer);
-
-        if (draftStore.peers[hmsPeer.id]) {
-          Object.assign(draftStore.peers[hmsPeer.id], hmsPeer);
-        } else {
-          draftStore.peers[hmsPeer.id] = hmsPeer;
-          draftStore.room.peers.push(hmsPeer.id);
-        }
-
-        _this14.hmsSDKPeers[sdkPeer.peerId] = sdkPeer;
-      }
-    }, actionName);
-    HMSLogger.time(actionName + "-" + sdkPeer.peerId); // if peer wasn't available before sync(will happen if event is peer join)
-
-    if (!peer) {
-      peer = this.store.getState(selectPeerByID(sdkPeer.peerId));
-    }
-
-    this.hmsNotifications.sendPeerUpdate(type, peer);
-  };
-
-  _proto.updateTracksInPeer = function updateTracksInPeer(peer, draftPeer, hmsTrack) {
-    var _peer$audioTrack, _peer$videoTrack;
-
-    if (((_peer$audioTrack = peer.audioTrack) == null ? void 0 : _peer$audioTrack.trackId) === hmsTrack.id) {
-      draftPeer.audioTrack = hmsTrack.id;
-    } else if (((_peer$videoTrack = peer.videoTrack) == null ? void 0 : _peer$videoTrack.trackId) === hmsTrack.id) {
-      draftPeer.videoTrack = hmsTrack.id;
-    } else if (!draftPeer.auxiliaryTracks.includes(hmsTrack.id)) {
-      draftPeer.auxiliaryTracks.push(hmsTrack.id);
-    }
-  };
-
   return HMSSDKActions;
 }();