@100mslive/hms-video-store 0.2.43 → 0.2.44

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

@@ -1,11 +1,10 @@
-import { HMSPlaylistItem, HMSPlaylistType, HMSStore, IHMSPlaylistActions } from '../schema';
+import { HMSPlaylistItem, HMSPlaylistType, IHMSPlaylistActions } from '../schema';
 import { HMSPlaylistManager } from './sdkTypes';
 export declare class HMSPlaylist implements IHMSPlaylistActions {
     private playlistManager;
-    private syncRoomState;
-    private setState;
+    private syncPlaylistState;
     private type;
-    constructor(playlistManager: HMSPlaylistManager, type: HMSPlaylistType, syncRoomState: (name: string) => void, setState: (fn: (store: HMSStore) => void, name: string) => void);
+    constructor(playlistManager: HMSPlaylistManager, type: HMSPlaylistType, syncPlaylistState: (action: string) => void);
     play(id: string): Promise<void>;
     pause(id: string): Promise<void>;
     playNext(): Promise<void>;
@@ -15,5 +14,4 @@ export declare class HMSPlaylist implements IHMSPlaylistActions {
     setVolume(volume: number): void;
     setList<T>(list: HMSPlaylistItem<T>[]): void;
     stop(): Promise<void>;
-    getCurrentTime(): number;
 }

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

@@ -136,6 +136,7 @@ export declare class HMSSDKActions implements IHMSActions {
     private onRoleUpdate;
     private getStoreLocalTrackIDfromSDKTrack;
     private setProgress;
+    private syncPlaylistState;
     /**
      * setState is separate so any future changes to how state change can be done from one place.
      * @param fn

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

@@ -23,6 +23,7 @@ export declare class SDKToHMS {
             };
             progress: number;
             volume: number;
+            currentTime: number;
         };
         video: {
             list: Record<string, HMSPlaylistItem<any>>;
@@ -33,6 +34,7 @@ export declare class SDKToHMS {
             };
             progress: number;
             volume: number;
+            currentTime: number;
         };
     };
     private static getConvertedPlaylistType;

package/dist/core/schema/playlist.d.ts

@@ -24,12 +24,14 @@ export interface HMSPlaylist<T> {
         selection: HMSPlaylistSelection;
         progress: number;
         volume: number;
+        currentTime: number;
     };
     video: {
         list: Record<string, HMSPlaylistItem<T>>;
         selection: HMSPlaylistSelection;
         progress: number;
         volume: number;
+        currentTime: number;
     };
 }
 export interface IHMSPlaylistActions {
@@ -75,10 +77,6 @@ export interface IHMSPlaylistActions {
      * Stop the current playback and remove the tracks
      */
     stop(): Promise<void>;
-    /**
-     * Get current time of the current playing item
-     */
-    getCurrentTime(): number;
 }
 export interface HMSPlaylistSelector {
     list: <T>(store: HMSStore) => HMSPlaylistItem<T>[];
@@ -94,4 +92,5 @@ export interface HMSPlaylistSelector {
     selectedItem: <T>(store: HMSStore) => HMSPlaylistItem<T>;
     progress: (store: HMSStore) => number;
     volume: (store: HMSStore) => number;
+    currentTime: (store: HMSStore) => number;
 }

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

@@ -898,7 +898,8 @@ var createDefaultStoreState = function createDefaultStoreState() {
           hasNext: false
         },
         progress: 0,
-        volume: 0
+        volume: 0,
+        currentTime: 0
       },
       video: {
         list: {},
@@ -908,7 +909,8 @@ var createDefaultStoreState = function createDefaultStoreState() {
           hasNext: false
         },
         progress: 0,
-        volume: 0
+        volume: 0,
+        currentTime: 0
       }
     },
     messages: {
@@ -1245,10 +1247,10 @@ var SDKToHMS = /*#__PURE__*/function () {
     var volume = playlistManager.getVolume(type);
     var list = playlistManager.getList(type);
     var currentIndex = playlistManager.getCurrentIndex(type);
-    playlistManager.getList(type).forEach(function (value) {
-      var isSelected = value.url === (currentSelection == null ? void 0 : currentSelection.url);
-      convertedPlaylist[value.id] = _extends({}, value, {
-        type: value.type,
+    playlistManager.getList(type).forEach(function (playlistItem) {
+      var isSelected = playlistItem.url === (currentSelection == null ? void 0 : currentSelection.url);
+      convertedPlaylist[playlistItem.id] = _extends({}, playlistItem, {
+        type: playlistItem.type,
         selected: isSelected,
         playing: isSelected && isPlaying
       });
@@ -1261,7 +1263,8 @@ var SDKToHMS = /*#__PURE__*/function () {
         hasNext: currentIndex < list.length - 1
       },
       progress: progress,
-      volume: volume
+      volume: volume,
+      currentTime: playlistManager.getCurrentTime(type)
     };
   };
 
@@ -1754,6 +1757,16 @@ var selectPlaylistProgress = function selectPlaylistProgress(type) {
   };
 };
 
+var selectPlaylistCurrentTime = function selectPlaylistCurrentTime(type) {
+  if (type === void 0) {
+    type = exports.HMSPlaylistType.audio;
+  }
+
+  return function (store) {
+    return store.playlist[type].currentTime;
+  };
+};
+
 var selectPlaylistVolume = function selectPlaylistVolume(type) {
   if (type === void 0) {
     type = exports.HMSPlaylistType.audio;
@@ -1793,38 +1806,20 @@ var selectPlaylistSelectedItem = function selectPlaylistSelectedItem(type) {
 };
 
 var selectAudioPlaylist = {
-  selection: /*#__PURE__*/reselect.createSelector( /*#__PURE__*/selectPlaylistSelection(exports.HMSPlaylistType.audio), function (selection) {
-    return selection;
-  }),
-  progress: /*#__PURE__*/reselect.createSelector( /*#__PURE__*/selectPlaylistProgress(exports.HMSPlaylistType.audio), function (progress) {
-    return progress;
-  }),
-  volume: /*#__PURE__*/reselect.createSelector( /*#__PURE__*/selectPlaylistVolume(exports.HMSPlaylistType.audio), function (volume) {
-    return volume;
-  }),
-  list: /*#__PURE__*/reselect.createSelector( /*#__PURE__*/selectPlaylist(exports.HMSPlaylistType.audio), function (list) {
-    return list;
-  }),
-  selectedItem: /*#__PURE__*/reselect.createSelector( /*#__PURE__*/selectPlaylistSelectedItem(exports.HMSPlaylistType.audio), function (selectedItem) {
-    return selectedItem;
-  })
+  selection: /*#__PURE__*/selectPlaylistSelection(exports.HMSPlaylistType.audio),
+  progress: /*#__PURE__*/selectPlaylistProgress(exports.HMSPlaylistType.audio),
+  currentTime: /*#__PURE__*/selectPlaylistCurrentTime(exports.HMSPlaylistType.audio),
+  volume: /*#__PURE__*/selectPlaylistVolume(exports.HMSPlaylistType.audio),
+  list: /*#__PURE__*/selectPlaylist(exports.HMSPlaylistType.audio),
+  selectedItem: /*#__PURE__*/selectPlaylistSelectedItem(exports.HMSPlaylistType.audio)
 };
 var selectVideoPlaylist = {
-  selection: /*#__PURE__*/reselect.createSelector( /*#__PURE__*/selectPlaylistSelection(exports.HMSPlaylistType.video), function (selection) {
-    return selection;
-  }),
-  progress: /*#__PURE__*/reselect.createSelector( /*#__PURE__*/selectPlaylistProgress(exports.HMSPlaylistType.video), function (progress) {
-    return progress;
-  }),
-  volume: /*#__PURE__*/reselect.createSelector( /*#__PURE__*/selectPlaylistVolume(exports.HMSPlaylistType.video), function (volume) {
-    return volume;
-  }),
-  list: /*#__PURE__*/reselect.createSelector( /*#__PURE__*/selectPlaylist(exports.HMSPlaylistType.video), function (list) {
-    return list;
-  }),
-  selectedItem: /*#__PURE__*/reselect.createSelector( /*#__PURE__*/selectPlaylistSelectedItem(exports.HMSPlaylistType.video), function (selectedItem) {
-    return selectedItem;
-  })
+  selection: /*#__PURE__*/selectPlaylistSelection(exports.HMSPlaylistType.video),
+  progress: /*#__PURE__*/selectPlaylistProgress(exports.HMSPlaylistType.video),
+  currentTime: /*#__PURE__*/selectPlaylistCurrentTime(exports.HMSPlaylistType.audio),
+  volume: /*#__PURE__*/selectPlaylistVolume(exports.HMSPlaylistType.video),
+  list: /*#__PURE__*/selectPlaylist(exports.HMSPlaylistType.video),
+  selectedItem: /*#__PURE__*/selectPlaylistSelectedItem(exports.HMSPlaylistType.video)
 };
 
 var HMS_STORE_TAG = 'HMS-Store:';
@@ -2385,10 +2380,9 @@ function isRemoteTrack(track) {
 }
 
 var HMSPlaylist = /*#__PURE__*/function () {
-  function HMSPlaylist(playlistManager, type, syncRoomState, setState) {
+  function HMSPlaylist(playlistManager, type, syncPlaylistState) {
     this.playlistManager = playlistManager;
-    this.syncRoomState = syncRoomState;
-    this.setState = setState;
+    this.syncPlaylistState = syncPlaylistState;
     this.type = type;
   }
 
@@ -2416,9 +2410,6 @@ var HMSPlaylist = /*#__PURE__*/function () {
               });
 
             case 5:
-              this.syncRoomState("playOn" + this.type + "Playlist");
-
-            case 6:
             case "end":
               return _context.stop();
           }
@@ -2455,7 +2446,7 @@ var HMSPlaylist = /*#__PURE__*/function () {
               });
 
             case 5:
-              this.syncRoomState("pauseOn" + this.type + "Playlist");
+              this.syncPlaylistState("pauseOn" + this.type + "Playlist");
 
             case 6:
             case "end":
@@ -2482,9 +2473,6 @@ var HMSPlaylist = /*#__PURE__*/function () {
               return this.playlistManager.playNext(this.type);
 
             case 2:
-              this.syncRoomState("playPreviousOn" + this.type + "Playlist");
-
-            case 3:
             case "end":
               return _context3.stop();
           }
@@ -2509,9 +2497,6 @@ var HMSPlaylist = /*#__PURE__*/function () {
               return this.playlistManager.playPrevious(this.type);
 
             case 2:
-              this.syncRoomState("playPreviousOn" + this.type + "Playlist");
-
-            case 3:
             case "end":
               return _context4.stop();
           }
@@ -2527,35 +2512,23 @@ var HMSPlaylist = /*#__PURE__*/function () {
   }();
 
   _proto.seek = function seek(seekValue) {
-    var _this = this;
-
     this.playlistManager.seek(seekValue, this.type);
-    this.setState(function (draftStore) {
-      draftStore.playlist[_this.type].progress = SDKToHMS.convertPlaylist(_this.playlistManager)[_this.type].progress;
-    }, "seekOn" + this.type + "Playlist");
+    this.syncPlaylistState("seekOn" + this.type + "Playlist");
   };
 
   _proto.seekTo = function seekTo(seekValue) {
-    var _this2 = this;
-
     this.playlistManager.seekTo(seekValue, this.type);
-    this.setState(function (draftStore) {
-      draftStore.playlist[_this2.type].progress = SDKToHMS.convertPlaylist(_this2.playlistManager)[_this2.type].progress;
-    }, "seekToOn" + this.type + "Playlist");
+    this.syncPlaylistState("seekToOn" + this.type + "Playlist");
   };
 
   _proto.setVolume = function setVolume(volume) {
-    var _this3 = this;
-
     this.playlistManager.setVolume(volume, this.type);
-    this.setState(function (draftStore) {
-      draftStore.playlist[_this3.type].volume = SDKToHMS.convertPlaylist(_this3.playlistManager)[_this3.type].volume;
-    }, "setVolumeOn" + this.type + "Playlist");
+    this.syncPlaylistState("setVolumeOn" + this.type + "Playlist");
   };
 
   _proto.setList = function setList(list) {
     this.playlistManager.setList(list);
-    this.syncRoomState("setListOn" + this.type + "Playlist");
+    this.syncPlaylistState("setListOn" + this.type + "Playlist");
   };
 
   _proto.stop = /*#__PURE__*/function () {
@@ -2568,7 +2541,7 @@ var HMSPlaylist = /*#__PURE__*/function () {
               return this.playlistManager.stop(this.type);
 
             case 2:
-              this.syncRoomState("stop" + this.type + "Playlist");
+              this.syncPlaylistState("stop" + this.type + "Playlist");
 
             case 3:
             case "end":
@@ -2585,10 +2558,6 @@ var HMSPlaylist = /*#__PURE__*/function () {
     return stop;
   }();
 
-  _proto.getCurrentTime = function getCurrentTime() {
-    return this.playlistManager.getCurrentTime(this.type);
-  };
-
   return HMSPlaylist;
 }();
 
@@ -2627,8 +2596,36 @@ var HMSSDKActions = /*#__PURE__*/function () {
 
       _this.setState(function (draftStore) {
         draftStore.playlist[type].progress = progress;
+        draftStore.playlist[type].currentTime = _this.sdk.getPlaylistManager().getCurrentTime(type);
       }, 'playlistProgress');
     };
+
+    this.syncPlaylistState = function (action) {
+      var sdkPeers = _this.sdk.getPeers();
+
+      var newHmsTracks = {};
+
+      for (var _iterator = _createForOfIteratorHelperLoose(sdkPeers), _step; !(_step = _iterator()).done;) {
+        var sdkPeer = _step.value;
+        var sdkTracks = [sdkPeer.audioTrack, sdkPeer.videoTrack].concat(sdkPeer.auxiliaryTracks);
+
+        for (var _iterator2 = _createForOfIteratorHelperLoose(sdkTracks), _step2; !(_step2 = _iterator2()).done;) {
+          var sdkTrack = _step2.value;
+
+          if (!sdkTrack) {
+            continue;
+          }
+
+          var hmsTrack = SDKToHMS.convertTrack(sdkTrack);
+          newHmsTracks[hmsTrack.id] = hmsTrack;
+        }
+      }
+
+      _this.setState(function (draftStore) {
+        mergeNewTracksInDraft(draftStore.tracks, newHmsTracks);
+        Object.assign(draftStore.playlist, SDKToHMS.convertPlaylist(_this.sdk.getPlaylistManager()));
+      }, action);
+    };
     /**
      * setState is separate so any future changes to how state change can be done from one place.
      * @param fn
@@ -3940,16 +3937,16 @@ var HMSSDKActions = /*#__PURE__*/function () {
     var newMediaSettings = {};
     var sdkPeers = this.sdk.getPeers(); // first convert everything in the new format
 
-    for (var _iterator = _createForOfIteratorHelperLoose(sdkPeers), _step; !(_step = _iterator()).done;) {
-      var sdkPeer = _step.value;
+    for (var _iterator3 = _createForOfIteratorHelperLoose(sdkPeers), _step3; !(_step3 = _iterator3()).done;) {
+      var sdkPeer = _step3.value;
       var hmsPeer = SDKToHMS.convertPeer(sdkPeer);
       newHmsPeers[hmsPeer.id] = hmsPeer;
       newHmsPeerIDs.push(hmsPeer.id);
       this.hmsSDKPeers[hmsPeer.id] = sdkPeer;
       var sdkTracks = [sdkPeer.audioTrack, sdkPeer.videoTrack].concat(sdkPeer.auxiliaryTracks);
 
-      for (var _iterator2 = _createForOfIteratorHelperLoose(sdkTracks), _step2; !(_step2 = _iterator2()).done;) {
-        var sdkTrack = _step2.value;
+      for (var _iterator4 = _createForOfIteratorHelperLoose(sdkTracks), _step4; !(_step4 = _iterator4()).done;) {
+        var sdkTrack = _step4.value;
 
         if (!sdkTrack) {
           continue;
@@ -3991,15 +3988,23 @@ var HMSSDKActions = /*#__PURE__*/function () {
   };
 
   _proto.onJoin = function onJoin(sdkRoom) {
+    var _this9 = this;
+
     this.setState(function (store) {
       Object.assign(store.room, SDKToHMS.convertRoom(sdkRoom));
       store.room.isConnected = true;
       store.room.roomState = exports.HMSRoomState.Connected;
     }, 'joined');
-    this.audioPlaylist = new HMSPlaylist(this.sdk.getPlaylistManager(), exports.HMSPlaylistType.audio, this.syncRoomState.bind(this), this.setState.bind(this));
-    this.videoPlaylist = new HMSPlaylist(this.sdk.getPlaylistManager(), exports.HMSPlaylistType.video, this.syncRoomState.bind(this), this.setState.bind(this));
+    this.audioPlaylist = new HMSPlaylist(this.sdk.getPlaylistManager(), exports.HMSPlaylistType.audio, this.syncPlaylistState.bind(this));
+    this.videoPlaylist = new HMSPlaylist(this.sdk.getPlaylistManager(), exports.HMSPlaylistType.video, this.syncRoomState.bind(this));
     this.syncRoomState('joinSync');
     this.sdk.getPlaylistManager().onProgress(this.setProgress);
+    this.sdk.getPlaylistManager().onNewTrackStart(function (item) {
+      _this9.syncPlaylistState("playOn" + item.type + "Playlist");
+    });
+    this.sdk.getPlaylistManager().onPlaylistEnded(function (type) {
+      _this9.syncPlaylistState(type + "PlaylistEnded");
+    });
   };
 
   _proto.onRoomUpdate = function onRoomUpdate() {
@@ -4051,10 +4056,10 @@ var HMSSDKActions = /*#__PURE__*/function () {
   };
 
   _proto.onHMSMessage = function onHMSMessage(hmsMessage) {
-    var _this9 = this;
+    var _this10 = this;
 
     this.setState(function (store) {
-      hmsMessage.id = String(_this9.store.getState(selectHMSMessagesCount) + 1);
+      hmsMessage.id = String(_this10.store.getState(selectHMSMessagesCount) + 1);
       store.messages.byID[hmsMessage.id] = hmsMessage;
       store.messages.allIDs.push(hmsMessage.id);
     }, 'newMessage');
@@ -4169,26 +4174,26 @@ var HMSSDKActions = /*#__PURE__*/function () {
   };
 
   _proto.handleTrackRemove = function handleTrackRemove(sdkTrack, sdkPeer) {
-    var _this10 = this;
+    var _this11 = this;
 
     this.setState(function (draftStore) {
       var hmsPeer = draftStore.peers[sdkPeer.peerId];
       var draftTracks = draftStore.tracks; // find and remove the exact track from hmsPeer
 
-      if (_this10.isSameStoreSDKTrack(sdkTrack.trackId, hmsPeer == null ? void 0 : hmsPeer.audioTrack)) {
+      if (_this11.isSameStoreSDKTrack(sdkTrack.trackId, hmsPeer == null ? void 0 : hmsPeer.audioTrack)) {
         hmsPeer == null ? true : delete hmsPeer.audioTrack;
-      } else if (_this10.isSameStoreSDKTrack(sdkTrack.trackId, hmsPeer == null ? void 0 : hmsPeer.videoTrack)) {
+      } else if (_this11.isSameStoreSDKTrack(sdkTrack.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);
 
-        if (auxiliaryIndex > -1 && _this10.isSameStoreSDKTrack(sdkTrack.trackId, hmsPeer == null ? void 0 : hmsPeer.auxiliaryTracks[auxiliaryIndex])) {
+        if (auxiliaryIndex > -1 && _this11.isSameStoreSDKTrack(sdkTrack.trackId, hmsPeer == null ? void 0 : hmsPeer.auxiliaryTracks[auxiliaryIndex])) {
           hmsPeer == null ? void 0 : hmsPeer.auxiliaryTracks.splice(auxiliaryIndex, 1);
         }
       }
 
       delete draftTracks[sdkTrack.trackId];
-      delete _this10.hmsSDKTracks[sdkTrack.trackId];
+      delete _this11.hmsSDKTracks[sdkTrack.trackId];
     }, 'trackRemoved');
   };
 
@@ -4548,11 +4553,11 @@ var HMSSDKActions = /*#__PURE__*/function () {
   };
 
   _proto.getStoreLocalTrackIDfromSDKTrack = function getStoreLocalTrackIDfromSDKTrack(sdkTrack) {
-    var _this11 = this;
+    var _this12 = this;
 
     var trackIDs = this.store.getState(selectLocalTrackIDs);
     return trackIDs.find(function (trackID) {
-      return _this11.hmsSDKTracks[trackID].trackId === sdkTrack.trackId;
+      return _this12.hmsSDKTracks[trackID].trackId === sdkTrack.trackId;
     });
   };