@100mslive/hms-video-store 0.2.64 → 0.2.65

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.2.64",
+  "version": "0.2.65",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -55,11 +55,11 @@
     "zustand": "3.5.7"
   },
   "peerDependencies": {
-    "@100mslive/hms-video": "^0.0.210",
+    "@100mslive/hms-video": "^0.1.0",
     "events": "^3.3.0"
   },
   "devDependencies": {
-    "@100mslive/hms-video": "^0.0.210",
+    "@100mslive/hms-video": "^0.1.0",
     "@size-limit/file": "^5.0.3",
     "events": "^3.3.0",
     "husky": "^6.0.0",

package/src/core/hmsSDKStore/HMSSDKActions.ts

@@ -731,8 +731,8 @@ export class HMSSDKActions implements IHMSActions {
     track: SDKHMSTrack,
     peer: sdkTypes.HMSPeer,
   ) {
-    // this check is needed because for track removed case, the store does not have
-    // the track info to be sent as notification
+    // this check is needed because for track removed case, the notification needs to
+    // be send before the track is removed from store
     if (type === sdkTypes.HMSTrackUpdate.TRACK_REMOVED) {
       this.hmsNotifications.sendTrackUpdate(type, track.trackId);
       this.handleTrackRemove(track, peer);
@@ -1124,7 +1124,6 @@ export class HMSSDKActions implements IHMSActions {
     track: SDKHMSTrack,
     peer: sdkTypes.HMSPeer,
   ) => {
-    console.time('trackUpdate');
     this.setState(draftStore => {
       let draftPeer = draftStore.peers[peer.peerId];
       /**

package/src/core/hmsSDKStore/adapter.ts

@@ -1,27 +1,28 @@
 import {
-  HMSTrack as SDKHMSTrack,
-  HMSLocalVideoTrack as SDKHMSLocalVideoTrack,
   HMSLocalAudioTrack as SDKHMSLocalAudioTrack,
+  HMSLocalVideoTrack as SDKHMSLocalVideoTrack,
   HMSRemoteAudioTrack as SDKHMSRemoteAudioTrack,
   HMSRemoteVideoTrack as SDKHMSRemoteVideoTrack,
   HMSRoleChangeRequest as SDKHMSRoleChangeRequest,
+  HMSTrack as SDKHMSTrack,
 } from '@100mslive/hms-video';
 import {
-  HMSPeer,
-  HMSMessage,
-  HMSTrack,
-  HMSRoom,
-  HMSRoleChangeStoreRequest,
-  HMSException,
   HMSDeviceChangeEvent,
+  HMSException,
+  HMSMessage,
+  HMSPeer,
+  HMSPeerID,
   HMSPlaylistItem,
   HMSPlaylistType,
-  HMSPeerID,
+  HMSRole,
+  HMSRoleChangeStoreRequest,
+  HMSRoleName,
+  HMSRoom,
+  HMSTrack,
 } from '../schema';
 
 import * as sdkTypes from './sdkTypes';
 import { areArraysEqual } from './sdkUtils/storeMergeUtils';
-import { HMSRole, HMSRoleName } from '../schema';
 
 export class SDKToHMS {
   static convertPeer(sdkPeer: sdkTypes.HMSPeer): Partial<HMSPeer> & Pick<HMSPeer, 'id'> {
@@ -61,10 +62,10 @@ export class SDKToHMS {
     track.width = mediaSettings.width;
     track.deviceID = mediaSettings.deviceId;
     if (sdkTrack instanceof SDKHMSRemoteAudioTrack) {
-      const volume = sdkTrack.getVolume() || 0;
-      track.volume = volume;
+      track.volume = sdkTrack.getVolume() || 0;
     }
     SDKToHMS.enrichVideoTrack(track, sdkTrack);
+    SDKToHMS.enrichPluginsDetails(track, sdkTrack);
   }
 
   static enrichVideoTrack(track: HMSTrack, sdkTrack: SDKHMSTrack) {
@@ -75,6 +76,9 @@ export class SDKToHMS {
         track.layerDefinitions = sdkTrack.getSimulcastDefinitions();
       }
     }
+  }
+
+  static enrichPluginsDetails(track: HMSTrack, sdkTrack: SDKHMSTrack) {
     if (sdkTrack instanceof SDKHMSLocalVideoTrack || sdkTrack instanceof SDKHMSLocalAudioTrack) {
       if (!areArraysEqual(sdkTrack.getPlugins(), track.plugins)) {
         track.plugins = sdkTrack.getPlugins();

package/src/core/hmsSDKStore/sdkUtils/storeMergeUtils.ts

@@ -44,6 +44,7 @@ export const mergeNewTracksInDraft = (
     const oldTrack = draftTracks[trackID];
     const newTrack = newTracks[trackID];
     if (isEntityUpdated(oldTrack, newTrack)) {
+      mergeTrackArrayFields(oldTrack, newTrack);
       Object.assign(oldTrack, newTrack);
     } else if (isEntityRemoved(oldTrack, newTrack)) {
       delete draftTracks[trackID];
@@ -53,13 +54,28 @@ export const mergeNewTracksInDraft = (
   }
 };
 
+/**
+ * array's are usually created with new reference, avoid that update if both arrays are same
+ */
+const mergeTrackArrayFields = (oldTrack: HMSTrack, newTrack: Partial<HMSTrack>) => {
+  if (oldTrack.plugins && areArraysEqual(oldTrack.plugins, newTrack.plugins)) {
+    newTrack.plugins = oldTrack.plugins;
+  }
+  if (
+    oldTrack.layerDefinitions &&
+    areArraysEqual(oldTrack.layerDefinitions, newTrack.layerDefinitions)
+  ) {
+    newTrack.layerDefinitions = oldTrack.layerDefinitions;
+  }
+};
+
 const isEntityUpdated = <T>(oldItem: T, newItem: T) => oldItem && newItem;
 const isEntityRemoved = <T>(oldItem: T, newItem: T) => oldItem && !newItem;
 const isEntityAdded = <T>(oldItem: T, newItem: T) => !oldItem && newItem;
 
 // eslint-disable-next-line complexity
 export const areArraysEqual = <T>(arr1: T[], arr2?: T[]): boolean => {
-  if (arr1 === arr2) {
+  if (arr1 === arr2 || (arr1.length === 0 && arr2?.length === 0)) {
     // reference check
     return true;
   }