@webex/plugin-meetings 3.0.0-beta.86 → 3.0.0-beta.87

package/dist/meeting/index.js

@@ -40,6 +40,7 @@ var _cloneDeep2 = _interopRequireDefault(require("lodash/cloneDeep"));
 var _uuid = _interopRequireDefault(require("uuid"));
 var _webexCore = require("@webex/webex-core");
 var _internalMediaCore = require("@webex/internal-media-core");
+var _mediaHelpers = require("@webex/media-helpers");
 var _webexErrors = require("../common/errors/webex-errors");
 var _statsAnalyzer = require("../statsAnalyzer");
 var _networkQualityMonitor = _interopRequireDefault(require("../networkQualityMonitor"));
@@ -503,6 +504,8 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "resourceUrl", void 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "selfId", void 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "state", void 0);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "localAudioTrackMuteStateHandler", void 0);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "localVideoTrackMuteStateHandler", void 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "webexMeetingId", void 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "namespace", _constants.MEETINGS);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "processRelayEvent", function (e) {
@@ -999,6 +1002,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
       }
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleShareTrackEnded", /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+      var _this$mediaProperties;
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -1009,11 +1013,11 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
             _this.leave({
               reason: _constants.MEETING_REMOVED_REASON.USER_ENDED_SHARE_STREAMS
             });
-            _context.next = 21;
+            _context.next = 22;
             break;
           case 4:
             if (!_this.isMultistream) {
-              _context.next = 20;
+              _context.next = 21;
               break;
             }
             _context.prev = 5;
@@ -1032,13 +1036,15 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
             _loggerProxy.default.logger.log('Meeting:index#handleShareTrackEnded --> Error stopping share: ', _context.t0);
           case 14:
             _context.prev = 14;
-            _this.setLocalShareTrack(null);
+            // todo: once SPARK-399695 is done, we will be able to just call this.setLocalShareTrack(null); here instead of the next 2 lines:
+            (_this$mediaProperties = _this.mediaProperties.shareTrack) === null || _this$mediaProperties === void 0 ? void 0 : _this$mediaProperties.off(_mediaHelpers.LocalTrackEvents.Ended, _this.handleShareTrackEnded);
+            _this.mediaProperties.setLocalShareTrack(null);
             _this.mediaProperties.mediaDirection.sendShare = false;
             return _context.finish(14);
-          case 18:
-            _context.next = 21;
+          case 19:
+            _context.next = 22;
             break;
-          case 20:
+          case 21:
             // Skip checking for a stable peerConnection
             // to allow immediately stopping screenshare
             _this.stopShare({
@@ -1046,18 +1052,18 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
             }).catch(function (error) {
               _loggerProxy.default.logger.log('Meeting:index#handleShareTrackEnded --> Error stopping share: ', error);
             });
-          case 21:
+          case 22:
             _triggerProxy.default.trigger((0, _assertThisInitialized2.default)(_this), {
               file: 'meeting/index',
               function: 'handleShareTrackEnded'
             }, _constants.EVENT_TRIGGERS.MEETING_STOPPED_SHARING_LOCAL, {
               type: _constants.EVENT_TYPES.LOCAL_SHARE
             });
-          case 22:
+          case 23:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[5, 11, 14, 18]]);
+      }, _callee, null, [[5, 11, 14, 19]]);
     })));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "clearMeetingData", function () {
       _this.audio = null;
@@ -1194,8 +1200,8 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
      * helper class for managing receive slots (for multistream media connections)
      */
     _this.receiveSlotManager = new _receiveSlotManager.ReceiveSlotManager(function (mediaType) {
-      var _this$mediaProperties;
-      if (!((_this$mediaProperties = _this.mediaProperties) !== null && _this$mediaProperties !== void 0 && _this$mediaProperties.webrtcMediaConnection)) {
+      var _this$mediaProperties2;
+      if (!((_this$mediaProperties2 = _this.mediaProperties) !== null && _this$mediaProperties2 !== void 0 && _this$mediaProperties2.webrtcMediaConnection)) {
         return _promise.default.reject(new Error('Webrtc media connection is missing'));
       }
       return _this.mediaProperties.webrtcMediaConnection.createReceiveSlot(mediaType);
@@ -1708,6 +1714,12 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
      * helper class for managing remote streams
      */
     _this.remoteMediaManager = null;
+    _this.localAudioTrackMuteStateHandler = function (event) {
+      _this.audio.handleLocalTrackMuteStateChange((0, _assertThisInitialized2.default)(_this), event.trackState.muted);
+    };
+    _this.localVideoTrackMuteStateHandler = function (event) {
+      _this.video.handleLocalTrackMuteStateChange((0, _assertThisInitialized2.default)(_this), event.trackState.muted);
+    };
     return _this;
   }
 
@@ -2064,11 +2076,11 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
     key: "getAnalyzerMetricsPrePayload",
     value: function getAnalyzerMetricsPrePayload(options) {
       if (options) {
-        var event = options.event,
+        var _event = options.event,
           trackingId = options.trackingId,
           _mediaConnections = options.mediaConnections;
-        if (!event) {
-          _loggerProxy.default.logger.error('Meeting:index#getAnalyzerMetricsPrePayload --> Error [Call Analyzer Event', event || '', "]: invalid identifers or event type! ".concat(this.correlationId));
+        if (!_event) {
+          _loggerProxy.default.logger.error('Meeting:index#getAnalyzerMetricsPrePayload --> Error [Call Analyzer Event', _event || '', "]: invalid identifers or event type! ".concat(this.correlationId));
           return null;
         }
         var identifiers = {
@@ -2462,7 +2474,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
       this.locusInfo.on(_constants.EVENTS.LOCUS_INFO_UPDATE_MEDIA_SHARES, /*#__PURE__*/function () {
         var _ref12 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(payload) {
           var _payload$previous, _payload$previous2;
-          var _payload$current, contentShare, whiteboardShare, previousContentShare, previousWhiteboardShare, newShareStatus, _this13$mediaProperti, localShareTrack, oldShareStatus, sendStartedSharingRemote, _this13$mediaProperti2, _this13$mediaProperti3;
+          var _payload$current, contentShare, whiteboardShare, previousContentShare, previousWhiteboardShare, newShareStatus, _this13$mediaProperti, localShareTrack, oldShareStatus, sendStartedSharingRemote, _this13$mediaProperti2;
           return _regenerator.default.wrap(function _callee3$(_context3) {
             while (1) switch (_context3.prev = _context3.next) {
               case 0:
@@ -2489,7 +2501,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
                   _context3.next = 31;
                   break;
                 }
-                // @ts-ignore originalTrack is private - this will be fixed when SPARK-399694 are SPARK-399695 done
+                // @ts-ignore originalTrack is private - this will be fixed when SPARK-399695 is done
                 localShareTrack = (_this13$mediaProperti = _this13.mediaProperties.shareTrack) === null || _this13$mediaProperti === void 0 ? void 0 : _this13$mediaProperti.originalTrack; // todo: remove this block of code and instead make sure we have LocalTrackEvents.Ended listener always registered (SPARK-399695)
                 if (!((localShareTrack === null || localShareTrack === void 0 ? void 0 : localShareTrack.readyState) === 'ended')) {
                   _context3.next = 28;
@@ -2501,7 +2513,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
                   break;
                 }
                 _context3.next = 17;
-                return _this13.unpublishTracks([localShareTrack]);
+                return _this13.unpublishTracks([_this13.mediaProperties.shareTrack]);
               case 17:
                 _context3.next = 21;
                 break;
@@ -2594,7 +2606,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
                   break;
                 }
                 _context3.next = 55;
-                return _this13.unpublishTracks([(_this13$mediaProperti3 = _this13.mediaProperties.shareTrack) === null || _this13$mediaProperti3 === void 0 ? void 0 : _this13$mediaProperti3.originalTrack]);
+                return _this13.unpublishTracks([_this13.mediaProperties.shareTrack]);
               case 55:
                 _context3.next = 59;
                 break;
@@ -2872,7 +2884,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
             var _payload$muted, _payload$unmuteAllowe;
             payload.muted = (_payload$muted = payload.muted) !== null && _payload$muted !== void 0 ? _payload$muted : _this19.video.isRemotelyMuted();
             payload.unmuteAllowed = (_payload$unmuteAllowe = payload.unmuteAllowed) !== null && _payload$unmuteAllowe !== void 0 ? _payload$unmuteAllowe : _this19.video.isUnmuteAllowed();
-            _this19.video.handleServerRemoteMuteUpdate(payload.muted, payload.unmuteAllowed);
+            _this19.video.handleServerRemoteMuteUpdate(_this19, payload.muted, payload.unmuteAllowed);
           }
           _triggerProxy.default.trigger(_this19, {
             file: 'meeting/index',
@@ -2886,7 +2898,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
         if (payload) {
           var _this19$audio;
           if (_this19.audio) {
-            _this19.audio.handleServerRemoteMuteUpdate(payload.muted, payload.unmuteAllowed);
+            _this19.audio.handleServerRemoteMuteUpdate(_this19, payload.muted, payload.unmuteAllowed);
           }
           // with "mute on entry" server will send us remote mute even if we don't have media configured,
           // so if being muted by others, always send the notification,
@@ -3466,10 +3478,10 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
     key: "closeRemoteTracks",
     value: function closeRemoteTracks() {
       var _this22 = this;
-      var _this$mediaProperties2 = this.mediaProperties,
-        remoteAudioTrack = _this$mediaProperties2.remoteAudioTrack,
-        remoteVideoTrack = _this$mediaProperties2.remoteVideoTrack,
-        remoteShare = _this$mediaProperties2.remoteShare;
+      var _this$mediaProperties3 = this.mediaProperties,
+        remoteAudioTrack = _this$mediaProperties3.remoteAudioTrack,
+        remoteVideoTrack = _this$mediaProperties3.remoteVideoTrack,
+        remoteShare = _this$mediaProperties3.remoteShare;
 
       /**
        * Triggers an event to the developer
@@ -3518,13 +3530,13 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "sendLocalMediaReadyEvent",
     value: function sendLocalMediaReadyEvent() {
-      var _this$mediaProperties3, _this$mediaProperties4;
+      var _this$mediaProperties4, _this$mediaProperties5;
       _triggerProxy.default.trigger(this, {
         file: 'meeting/index',
         function: 'sendLocalMediaReadyEvent'
       }, _constants.EVENT_TRIGGERS.MEDIA_READY, {
         type: _constants.EVENT_TYPES.LOCAL,
-        stream: _util4.default.createMediaStream([(_this$mediaProperties3 = this.mediaProperties.audioTrack) === null || _this$mediaProperties3 === void 0 ? void 0 : _this$mediaProperties3.underlyingTrack, (_this$mediaProperties4 = this.mediaProperties.videoTrack) === null || _this$mediaProperties4 === void 0 ? void 0 : _this$mediaProperties4.underlyingTrack])
+        stream: _util4.default.createMediaStream([(_this$mediaProperties4 = this.mediaProperties.audioTrack) === null || _this$mediaProperties4 === void 0 ? void 0 : _this$mediaProperties4.underlyingTrack, (_this$mediaProperties5 = this.mediaProperties.videoTrack) === null || _this$mediaProperties5 === void 0 ? void 0 : _this$mediaProperties5.underlyingTrack])
       });
     }
 
@@ -3540,9 +3552,12 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
     key: "setLocalAudioTrack",
     value: function setLocalAudioTrack(rawAudioTrack) {
       var emitEvent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+      if (this.isMultistream) {
+        throw new Error('this method is only supposed to be used for transcoded meetings');
+      }
       if (rawAudioTrack) {
         var settings = rawAudioTrack.getSettings();
-        var localMicrophoneTrack = new _internalMediaCore.LocalMicrophoneTrack(_util4.default.createMediaStream([rawAudioTrack]));
+        var localMicrophoneTrack = new _mediaHelpers.LocalMicrophoneTrack(_util4.default.createMediaStream([rawAudioTrack]));
         this.mediaProperties.setMediaSettings('audio', {
           echoCancellation: settings.echoCancellation,
           noiseSuppression: settings.noiseSuppression
@@ -3570,6 +3585,9 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
     key: "setLocalVideoTrack",
     value: function setLocalVideoTrack(rawVideoTrack) {
       var emitEvent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+      if (this.isMultistream) {
+        throw new Error('this method is only supposed to be used for transcoded meetings');
+      }
       if (rawVideoTrack) {
         var _rawVideoTrack$getSet = rawVideoTrack.getSettings(),
           aspectRatio = _rawVideoTrack$getSet.aspectRatio,
@@ -3578,7 +3596,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
           width = _rawVideoTrack$getSet.width,
           deviceId = _rawVideoTrack$getSet.deviceId;
         var localQualityLevel = this.mediaProperties.localQualityLevel;
-        var localCameraTrack = new _internalMediaCore.LocalCameraTrack(_util4.default.createMediaStream([rawVideoTrack]));
+        var localCameraTrack = new _mediaHelpers.LocalCameraTrack(_util4.default.createMediaStream([rawVideoTrack]));
         if (Number(localQualityLevel.slice(0, -1)) > height) {
           _loggerProxy.default.logger.warn("Meeting:index#setLocalVideoTrack --> Local video quality of ".concat(localQualityLevel, " not supported,\n         downscaling to highest possible resolution of ").concat(height, "p"));
           this.mediaProperties.setLocalQualityLevel("".concat(height, "p"));
@@ -3639,7 +3657,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
     value: function setLocalShareTrack(rawLocalShareTrack) {
       if (rawLocalShareTrack) {
         var settings = rawLocalShareTrack.getSettings();
-        var localDisplayTrack = new _internalMediaCore.LocalDisplayTrack(_util4.default.createMediaStream([rawLocalShareTrack]));
+        var localDisplayTrack = new _mediaHelpers.LocalDisplayTrack(_util4.default.createMediaStream([rawLocalShareTrack]));
         this.mediaProperties.setLocalShareTrack(localDisplayTrack);
         this.mediaProperties.setMediaSettings('screen', {
           aspectRatio: settings.aspectRatio,
@@ -3652,7 +3670,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
           cursor: settings.cursor
         });
         _loggerProxy.default.logger.log('Meeting:index#setLocalShareTrack --> Screen settings.', (0, _stringify.default)(this.mediaProperties.mediaSettings.screen));
-        localDisplayTrack.on(_internalMediaCore.LocalTrackEvents.Ended, this.handleShareTrackEnded);
+        localDisplayTrack.on(_mediaHelpers.LocalTrackEvents.Ended, this.handleShareTrackEnded);
         _triggerProxy.default.trigger(this, {
           file: 'meeting/index',
           function: 'setLocalShareTrack'
@@ -3661,8 +3679,8 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
           track: rawLocalShareTrack
         });
       } else if (this.mediaProperties.shareTrack) {
-        this.mediaProperties.shareTrack.off(_internalMediaCore.LocalTrackEvents.Ended, this.handleShareTrackEnded);
-        this.mediaProperties.shareTrack.stop(); // todo: this line should be removed once SPARK-399694 are SPARK-399695 are done
+        this.mediaProperties.shareTrack.off(_mediaHelpers.LocalTrackEvents.Ended, this.handleShareTrackEnded);
+        this.mediaProperties.shareTrack.stop(); // todo: this line should be removed once SPARK-399695 is done
         this.mediaProperties.setLocalShareTrack(null);
       }
     }
@@ -3678,9 +3696,9 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
     key: "closeLocalStream",
     value: function closeLocalStream() {
       var _this23 = this;
-      var _this$mediaProperties5 = this.mediaProperties,
-        audioTrack = _this$mediaProperties5.audioTrack,
-        videoTrack = _this$mediaProperties5.videoTrack;
+      var _this$mediaProperties6 = this.mediaProperties,
+        audioTrack = _this$mediaProperties6.audioTrack,
+        videoTrack = _this$mediaProperties6.videoTrack;
       return _media.default.stopTracks(audioTrack).then(function () {
         return _media.default.stopTracks(videoTrack);
       }).then(function () {
@@ -5307,7 +5325,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
                 _this43.mediaProperties.mediaDirection.receiveAudio = receiveAudio;
 
                 // audio state could be undefined if you have not sent audio before
-                _this43.audio = _this43.audio || (0, _muteState.createMuteState)(_constants.AUDIO, _this43, _this43.mediaProperties.mediaDirection);
+                _this43.audio = _this43.audio || (0, _muteState.createMuteState)(_constants.AUDIO, _this43, _this43.mediaProperties.mediaDirection, true);
               }));
             case 11:
             case "end":
@@ -5374,7 +5392,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
         _this44.mediaProperties.mediaDirection.receiveVideo = receiveVideo;
 
         // video state could be undefined if you have not sent video before
-        _this44.video = _this44.video || (0, _muteState.createMuteState)(_constants.VIDEO, _this44, _this44.mediaProperties.mediaDirection);
+        _this44.video = _this44.video || (0, _muteState.createMuteState)(_constants.VIDEO, _this44, _this44.mediaProperties.mediaDirection, true);
       });
     }
 
@@ -5504,10 +5522,12 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
       // TODO wire into default config. There's currently an issue with the stateless plugin or how we register
       // @ts-ignore - config coming from registerPlugin
       this.mediaProperties.setMediaDirection((0, _assign.default)(this.config.mediaSettings, mediaSettings));
-      // add a setup a function move the create and setup media in future
-      // TODO: delete old audio and video if stale
-      this.audio = this.audio || (0, _muteState.createMuteState)(_constants.AUDIO, this, this.mediaProperties.mediaDirection);
-      this.video = this.video || (0, _muteState.createMuteState)(_constants.VIDEO, this, this.mediaProperties.mediaDirection);
+
+      // for multistream, this.audio and this.video are created when publishTracks() is called
+      if (!this.isMultistream) {
+        this.audio = this.audio || (0, _muteState.createMuteState)(_constants.AUDIO, this, this.mediaProperties.mediaDirection, true);
+        this.video = this.video || (0, _muteState.createMuteState)(_constants.VIDEO, this, this.mediaProperties.mediaDirection, true);
+      }
       // Validation is already done in addMedia so no need to check if the lenght is greater then 0
       this.setLocalTracks(localStream);
       if (this.isMultistream && localShare) {
@@ -6011,10 +6031,10 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
       var renderInfo = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var main = renderInfo.main,
         content = renderInfo.content;
-      var _this$mediaProperties6 = this.mediaProperties,
-        mediaDirection = _this$mediaProperties6.mediaDirection,
-        remoteShare = _this$mediaProperties6.remoteShare,
-        remoteVideoTrack = _this$mediaProperties6.remoteVideoTrack;
+      var _this$mediaProperties7 = this.mediaProperties,
+        mediaDirection = _this$mediaProperties7.mediaDirection,
+        remoteShare = _this$mediaProperties7.remoteShare,
+        remoteVideoTrack = _this$mediaProperties7.remoteVideoTrack;
       var layoutInfo = (0, _cloneDeep2.default)(this.lastVideoLayoutInfo);
 
       // TODO: We need a real time value for Audio, Video and Share send indicator
@@ -6202,10 +6222,10 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
       }
 
       // Determine the direction of our current media
-      var _this$mediaProperties7 = this.mediaProperties.mediaDirection,
-        receiveAudio = _this$mediaProperties7.receiveAudio,
-        receiveVideo = _this$mediaProperties7.receiveVideo,
-        sendVideo = _this$mediaProperties7.sendVideo;
+      var _this$mediaProperties8 = this.mediaProperties.mediaDirection,
+        receiveAudio = _this$mediaProperties8.receiveAudio,
+        receiveVideo = _this$mediaProperties8.receiveVideo,
+        sendVideo = _this$mediaProperties8.sendVideo;
       return (sendVideo ? this.setLocalVideoQuality(level) : _promise.default.resolve()).then(function () {
         return receiveAudio || receiveVideo ? _this55.setRemoteQualityLevel(level) : _promise.default.resolve();
       }).catch(function (error) {
@@ -6638,8 +6658,8 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "checkMediaConnection",
     value: function checkMediaConnection() {
-      var _this$mediaProperties8;
-      if ((_this$mediaProperties8 = this.mediaProperties) !== null && _this$mediaProperties8 !== void 0 && _this$mediaProperties8.webrtcMediaConnection) {
+      var _this$mediaProperties9;
+      if ((_this$mediaProperties9 = this.mediaProperties) !== null && _this$mediaProperties9 !== void 0 && _this$mediaProperties9.webrtcMediaConnection) {
         return;
       }
       throw new Error('Webrtc media connection is missing, call addMedia() first');
@@ -6656,47 +6676,75 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
     value: function () {
       var _publishTracks = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee12(tracks) {
         var _tracks$screenShare;
+        var _tracks$screenShare2, oldTrack, localDisplayTrack, _oldTrack, localTrack, _oldTrack2, _localTrack;
         return _regenerator.default.wrap(function _callee12$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
             case 0:
               this.checkMediaConnection();
+              if (this.isMultistream) {
+                _context12.next = 3;
+                break;
+              }
+              throw new Error('publishTracks() only supported with multistream');
+            case 3:
               if (!((_tracks$screenShare = tracks.screenShare) !== null && _tracks$screenShare !== void 0 && _tracks$screenShare.video)) {
-                _context12.next = 8;
+                _context12.next = 14;
                 break;
               }
+              oldTrack = this.mediaProperties.shareTrack;
+              localDisplayTrack = (_tracks$screenShare2 = tracks.screenShare) === null || _tracks$screenShare2 === void 0 ? void 0 : _tracks$screenShare2.video;
+              oldTrack === null || oldTrack === void 0 ? void 0 : oldTrack.off(_mediaHelpers.LocalTrackEvents.Ended, this.handleShareTrackEnded);
+
               // we are starting a screen share
-              this.setLocalShareTrack(tracks.screenShare.video);
-              _context12.next = 5;
+              this.mediaProperties.setLocalShareTrack(localDisplayTrack);
+              localDisplayTrack.on(_mediaHelpers.LocalTrackEvents.Ended, this.handleShareTrackEnded);
+              _context12.next = 11;
               return this.requestScreenShareFloor();
-            case 5:
+            case 11:
               this.mediaProperties.mediaDirection.sendShare = true;
-              _context12.next = 8;
+              _context12.next = 14;
               return this.mediaProperties.webrtcMediaConnection.publishTrack(this.mediaProperties.shareTrack);
-            case 8:
+            case 14:
               if (!tracks.microphone) {
-                _context12.next = 14;
+                _context12.next = 24;
                 break;
               }
-              this.setLocalAudioTrack(tracks.microphone);
+              _oldTrack = this.mediaProperties.audioTrack;
+              localTrack = tracks.microphone;
+              _oldTrack === null || _oldTrack === void 0 ? void 0 : _oldTrack.off(_mediaHelpers.LocalTrackEvents.Muted, this.localAudioTrackMuteStateHandler);
+              this.mediaProperties.setLocalAudioTrack(localTrack);
               this.mediaProperties.mediaDirection.sendAudio = true;
 
               // audio mute state could be undefined if you have not sent audio before
-              this.audio = this.audio || (0, _muteState.createMuteState)(_constants.AUDIO, this, this.mediaProperties.mediaDirection);
-              _context12.next = 14;
+              if (!this.audio) {
+                this.audio = (0, _muteState.createMuteState)(_constants.AUDIO, this, this.mediaProperties.mediaDirection, false);
+              } else {
+                this.audio.handleLocalTrackChange(this);
+              }
+              localTrack.on(_mediaHelpers.LocalTrackEvents.Muted, this.localAudioTrackMuteStateHandler);
+              _context12.next = 24;
               return this.mediaProperties.webrtcMediaConnection.publishTrack(this.mediaProperties.audioTrack);
-            case 14:
+            case 24:
               if (!tracks.camera) {
-                _context12.next = 20;
+                _context12.next = 34;
                 break;
               }
-              this.setLocalVideoTrack(tracks.camera);
+              _oldTrack2 = this.mediaProperties.videoTrack;
+              _localTrack = tracks.camera;
+              _oldTrack2 === null || _oldTrack2 === void 0 ? void 0 : _oldTrack2.off(_mediaHelpers.LocalTrackEvents.Muted, this.localVideoTrackMuteStateHandler);
+              this.mediaProperties.setLocalVideoTrack(_localTrack);
               this.mediaProperties.mediaDirection.sendVideo = true;
 
               // video state could be undefined if you have not sent video before
-              this.video = this.video || (0, _muteState.createMuteState)(_constants.VIDEO, this, this.mediaProperties.mediaDirection);
-              _context12.next = 20;
+              if (!this.video) {
+                this.video = (0, _muteState.createMuteState)(_constants.VIDEO, this, this.mediaProperties.mediaDirection, false);
+              } else {
+                this.video.handleLocalTrackChange(this);
+              }
+              _localTrack.on(_mediaHelpers.LocalTrackEvents.Muted, this.localVideoTrackMuteStateHandler);
+              _context12.next = 34;
               return this.mediaProperties.webrtcMediaConnection.publishTrack(this.mediaProperties.videoTrack);
-            case 20:
+            case 34:
             case "end":
               return _context12.stop();
           }
@@ -6717,39 +6765,42 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
     key: "unpublishTracks",
     value: function () {
       var _unpublishTracks = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee13(tracks) {
-        var unpublishPromises, _iterator, _step, _this$mediaProperties9, _this$mediaProperties10, _this$mediaProperties11, track, localTrackToUnpublish, _localTrackToUnpublish, _localTrackToUnpublish2;
+        var unpublishPromises, _iterator, _step, track;
         return _regenerator.default.wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
               this.checkMediaConnection();
+              if (this.isMultistream) {
+                _context13.next = 3;
+                break;
+              }
+              throw new Error('unpublishTracks() is only supported with multistream');
+            case 3:
               unpublishPromises = [];
-              _iterator = _createForOfIteratorHelper(tracks);
+              _iterator = _createForOfIteratorHelper(tracks.filter(function (t) {
+                return !!t;
+              }));
               try {
                 for (_iterator.s(); !(_step = _iterator.n()).done;) {
                   track = _step.value;
-                  // @ts-ignore originalTrack is private - this will be fixed in SPARK-399694
-                  if (track === ((_this$mediaProperties9 = this.mediaProperties.shareTrack) === null || _this$mediaProperties9 === void 0 ? void 0 : _this$mediaProperties9.originalTrack)) {
-                    localTrackToUnpublish = this.mediaProperties.shareTrack;
-                    this.setLocalShareTrack(null);
+                  if (track === this.mediaProperties.shareTrack) {
+                    this.mediaProperties.setLocalShareTrack(null);
+                    track.off(_mediaHelpers.LocalTrackEvents.Ended, this.handleShareTrackEnded);
                     this.releaseScreenShareFloor(); // we ignore the returned promise here on purpose
                     this.mediaProperties.mediaDirection.sendShare = false;
-                    unpublishPromises.push(this.mediaProperties.webrtcMediaConnection.unpublishTrack(localTrackToUnpublish));
+                    unpublishPromises.push(this.mediaProperties.webrtcMediaConnection.unpublishTrack(track));
                   }
-
-                  // @ts-ignore originalTrack is private - this will be fixed in SPARK-399694
-                  if (track === ((_this$mediaProperties10 = this.mediaProperties.audioTrack) === null || _this$mediaProperties10 === void 0 ? void 0 : _this$mediaProperties10.originalTrack)) {
-                    _localTrackToUnpublish = this.mediaProperties.audioTrack;
-                    this.setLocalAudioTrack(null);
+                  if (track === this.mediaProperties.audioTrack) {
+                    this.mediaProperties.setLocalAudioTrack(null);
                     this.mediaProperties.mediaDirection.sendAudio = false;
-                    unpublishPromises.push(this.mediaProperties.webrtcMediaConnection.unpublishTrack(_localTrackToUnpublish));
+                    track.off(_mediaHelpers.LocalTrackEvents.Muted, this.localAudioTrackMuteStateHandler);
+                    unpublishPromises.push(this.mediaProperties.webrtcMediaConnection.unpublishTrack(track));
                   }
-
-                  // @ts-ignore originalTrack is private - this will be fixed in SPARK-399694
-                  if (track === ((_this$mediaProperties11 = this.mediaProperties.videoTrack) === null || _this$mediaProperties11 === void 0 ? void 0 : _this$mediaProperties11.originalTrack)) {
-                    _localTrackToUnpublish2 = this.mediaProperties.videoTrack;
-                    this.setLocalVideoTrack(null);
+                  if (track === this.mediaProperties.videoTrack) {
+                    this.mediaProperties.setLocalVideoTrack(null);
                     this.mediaProperties.mediaDirection.sendVideo = false;
-                    unpublishPromises.push(this.mediaProperties.webrtcMediaConnection.unpublishTrack(_localTrackToUnpublish2));
+                    track.off(_mediaHelpers.LocalTrackEvents.Muted, this.localVideoTrackMuteStateHandler);
+                    unpublishPromises.push(this.mediaProperties.webrtcMediaConnection.unpublishTrack(track));
                   }
                 }
               } catch (err) {
@@ -6757,9 +6808,9 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
               } finally {
                 _iterator.f();
               }
-              _context13.next = 6;
+              _context13.next = 8;
               return _promise.default.all(unpublishPromises);
-            case 6:
+            case 8:
             case "end":
               return _context13.stop();
           }