@webex/plugin-meetings 3.0.0-beta.41 → 3.0.0-beta.410

package/dist/meeting/muteState.js

@@ -5,36 +5,30 @@ var _interopRequireDefault = require("@babel/runtime-corejs2/helpers/interopRequ
 _Object$defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createMuteState = void 0;
+exports.createMuteState = exports.MuteState = void 0;
 var _promise = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/promise"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/defineProperty"));
 var _loggerProxy = _interopRequireDefault(require("../common/logs/logger-proxy"));
 var _parameter = _interopRequireDefault(require("../common/errors/parameter"));
-var _permission = _interopRequireDefault(require("../common/errors/permission"));
 var _util = _interopRequireDefault(require("./util"));
 var _constants = require("../constants");
-/* Certain aspects of server interaction for video muting are not implemented as we currently don't support remote muting of video.
-   If we ever need to support it, search for REMOTE_MUTE_VIDEO_MISSING_IMPLEMENTATION string to find the places that need updating
-*/
-
 // eslint-disable-next-line import/prefer-default-export
-var createMuteState = function createMuteState(type, meeting, mediaDirection) {
-  if (type === _constants.AUDIO && !mediaDirection.sendAudio) {
-    return null;
-  }
-  if (type === _constants.VIDEO && !mediaDirection.sendVideo) {
-    return null;
-  }
+var createMuteState = function createMuteState(type, meeting, enabled) {
+  // todo: remove the meeting argument  (SPARK-399695)
+
   _loggerProxy.default.logger.info("Meeting:muteState#createMuteState --> ".concat(type, ": creating MuteState for meeting id ").concat(meeting === null || meeting === void 0 ? void 0 : meeting.id));
-  return new MuteState(type, meeting);
+  var muteState = new MuteState(type, meeting, enabled);
+  return muteState;
 };
 
 /** The purpose of this class is to manage the local and remote mute state and make sure that the server state always matches
    the last requested state by the client.
 
    More info about Locus muting API: https://sqbu-github.cisco.com/pages/WebExSquared/locus/guides/mute.html#
+
+   This class is exported only for unit tests. It should never be instantiated directly with new MuteState(), instead createMuteState() should be called
 */
 exports.createMuteState = createMuteState;
 var MuteState = /*#__PURE__*/function () {
@@ -43,90 +37,172 @@ var MuteState = /*#__PURE__*/function () {
    *
    * @param {String} type - audio or video
    * @param {Object} meeting - the meeting object (used for reading current remote mute status)
+   * @param {boolean} enabled - whether the client audio/video is enabled at all
    */
-  function MuteState(type, meeting) {
+  function MuteState(type, meeting, enabled) {
+    var _meeting$remoteVideoM, _meeting$unmuteVideoA;
     (0, _classCallCheck2.default)(this, MuteState);
-    (0, _defineProperty2.default)(this, "pendingPromiseReject", void 0);
-    (0, _defineProperty2.default)(this, "pendingPromiseResolve", void 0);
     (0, _defineProperty2.default)(this, "state", void 0);
     (0, _defineProperty2.default)(this, "type", void 0);
+    (0, _defineProperty2.default)(this, "ignoreMuteStateChange", void 0);
     if (type !== _constants.AUDIO && type !== _constants.VIDEO) {
       throw new _parameter.default('Mute state is designed for handling audio or video only');
     }
     this.type = type;
+    this.ignoreMuteStateChange = false;
     this.state = {
       client: {
-        localMute: false
+        enabled: enabled,
+        localMute: true
       },
       server: {
-        localMute: false,
-        // initial values available only for audio (REMOTE_MUTE_VIDEO_MISSING_IMPLEMENTATION)
-        remoteMute: type === _constants.AUDIO ? meeting.remoteMuted : false,
-        unmuteAllowed: type === _constants.AUDIO ? meeting.unmuteAllowed : true
+        localMute: true,
+        // because remoteVideoMuted and unmuteVideoAllowed are updated seperately, they might be undefined
+        remoteMute: type === _constants.AUDIO ? meeting.remoteMuted : (_meeting$remoteVideoM = meeting.remoteVideoMuted) !== null && _meeting$remoteVideoM !== void 0 ? _meeting$remoteVideoM : false,
+        unmuteAllowed: type === _constants.AUDIO ? meeting.unmuteAllowed : (_meeting$unmuteVideoA = meeting.unmuteVideoAllowed) !== null && _meeting$unmuteVideoA !== void 0 ? _meeting$unmuteVideoA : true
       },
       syncToServerInProgress: false
     };
-    // these 2 hold the resolve, reject methods for the promise we returned to the client in last handleClientRequest() call
-    this.pendingPromiseResolve = null;
-    this.pendingPromiseReject = null;
   }
 
   /**
-   * Handles mute/unmute request from the client/user. Returns a promise that's resolved once the server update is completed or
-   * at the point that this request becomese superseded by another client request.
-   *
-   * The client doesn't have to wait for the returned promise to resolve before calling handleClientRequest() again. If
-   * handleClientRequest() is called again before the previous one resolved, the MuteState class will make sure that eventually
-   * the server state will match the last requested state from the client.
+   * Starts the mute state machine. Needs to be called after a new MuteState instance is created.
    *
-   * @public
-   * @memberof MuteState
-   * @param {Object} [meeting] the meeting object
-   * @param {Boolean} [mute] true for muting, false for unmuting request
-   * @returns {Promise}
+   * @param {Object} meeting - the meeting object
+   * @returns {void}
    */
   (0, _createClass2.default)(MuteState, [{
-    key: "handleClientRequest",
-    value: function handleClientRequest(meeting, mute) {
-      var _this = this;
-      _loggerProxy.default.logger.info("Meeting:muteState#handleClientRequest --> ".concat(this.type, ": user requesting new mute state: ").concat(mute));
-      if (!mute && !this.state.server.unmuteAllowed) {
-        return _promise.default.reject(new _permission.default('User is not allowed to unmute self (hard mute feature is being used)'));
+    key: "init",
+    value: function init(meeting) {
+      var _meeting$mediaPropert, _meeting$mediaPropert2;
+      this.applyUnmuteAllowedToStream(meeting);
+
+      // if we are remotely muted, we need to apply that to the local stream now (mute on-entry)
+      if (this.state.server.remoteMute) {
+        this.muteLocalStream(meeting, this.state.server.remoteMute, 'remotelyMuted');
+      }
+      var initialMute = this.type === _constants.AUDIO ? (_meeting$mediaPropert = meeting.mediaProperties.audioStream) === null || _meeting$mediaPropert === void 0 ? void 0 : _meeting$mediaPropert.muted : (_meeting$mediaPropert2 = meeting.mediaProperties.videoStream) === null || _meeting$mediaPropert2 === void 0 ? void 0 : _meeting$mediaPropert2.muted;
+      _loggerProxy.default.logger.info("Meeting:muteState#init --> ".concat(this.type, ": local stream initial mute state: ").concat(initialMute));
+      if (initialMute !== undefined) {
+        this.state.client.localMute = initialMute;
+      } else {
+        // there is no stream, so it's like we are locally muted
+        // (this is important especially for transcoded meetings, in which the SDP m-line direction always stays "sendrecv")
+        this.state.client.localMute = true;
       }
+      this.applyClientStateToServer(meeting);
+    }
 
-      // we don't check if we're already in the same state, because even if we were, we would still have to apply the mute state locally,
-      // because the client may have changed the audio/vidoe tracks
-      this.state.client.localMute = mute;
-      this.applyClientStateLocally(meeting);
-      return new _promise.default(function (resolve, reject) {
-        if (_this.pendingPromiseResolve) {
-          // resolve the last promise we returned to the client as the client has issued a new request that has superseded the previous one
-          _this.pendingPromiseResolve();
-        }
-        _this.pendingPromiseResolve = resolve;
-        _this.pendingPromiseReject = reject;
-        _this.applyClientStateToServer(meeting);
-      });
+    /**
+     * This method needs to be called whenever the local audio/video stream has changed.
+     * It reapplies the remote mute state onto the new stream and also reads the current
+     * local mute state from the stream and updates the internal state machine and sends
+     * any required requests to the server.
+     *
+     * @param {Object} meeting - the meeting object
+     * @returns {void}
+     */
+  }, {
+    key: "handleLocalStreamChange",
+    value: function handleLocalStreamChange(meeting) {
+      return this.init(meeting);
     }
 
     /**
-     * Applies the current mute state to the local track (by enabling or disabling it accordingly)
+     * Enables/disables audio/video
      *
+     * @param {Object} meeting - the meeting object
+     * @param {boolean} enable
+     * @returns {void}
+     */
+  }, {
+    key: "enable",
+    value: function enable(meeting, _enable) {
+      this.state.client.enabled = _enable;
+      this.applyClientStateToServer(meeting);
+    }
+
+    /**
+     * Mutes/unmutes local stream
+     *
+     * @param {Object} meeting - the meeting object
+     * @param {Boolean} mute - true to mute the stream, false to unmute it
+     * @param {ServerMuteReason} reason - reason for muting/unmuting
+     * @returns {void}
+     */
+  }, {
+    key: "muteLocalStream",
+    value: function muteLocalStream(meeting, mute, reason) {
+      this.ignoreMuteStateChange = true;
+      if (this.type === _constants.AUDIO) {
+        var _meeting$mediaPropert3;
+        (_meeting$mediaPropert3 = meeting.mediaProperties.audioStream) === null || _meeting$mediaPropert3 === void 0 ? void 0 : _meeting$mediaPropert3.setServerMuted(mute, reason);
+      } else {
+        var _meeting$mediaPropert4;
+        (_meeting$mediaPropert4 = meeting.mediaProperties.videoStream) === null || _meeting$mediaPropert4 === void 0 ? void 0 : _meeting$mediaPropert4.setServerMuted(mute, reason);
+      }
+      this.ignoreMuteStateChange = false;
+    }
+
+    /**
+     * This method should be called when the local stream mute state is changed
      * @public
-     * @param {Object} [meeting] the meeting object
      * @memberof MuteState
+     * @param {Object} [meeting] the meeting object
+     * @param {Boolean} [mute] true for muting, false for unmuting request
      * @returns {void}
      */
   }, {
-    key: "applyClientStateLocally",
-    value: function applyClientStateLocally(meeting) {
+    key: "handleLocalStreamMuteStateChange",
+    value: function handleLocalStreamMuteStateChange(meeting) {
+      if (this.ignoreMuteStateChange) {
+        return;
+      }
+
+      // either user or system may have triggered a mute state change, but localMute should reflect both
+      var newMuteState;
+      var userMuteState;
+      var systemMuteState;
       if (this.type === _constants.AUDIO) {
-        var _meeting$mediaPropert;
-        (_meeting$mediaPropert = meeting.mediaProperties.audioTrack) === null || _meeting$mediaPropert === void 0 ? void 0 : _meeting$mediaPropert.setMuted(this.state.client.localMute);
+        var _meeting$mediaPropert5, _meeting$mediaPropert6, _meeting$mediaPropert7;
+        newMuteState = (_meeting$mediaPropert5 = meeting.mediaProperties.audioStream) === null || _meeting$mediaPropert5 === void 0 ? void 0 : _meeting$mediaPropert5.muted;
+        userMuteState = (_meeting$mediaPropert6 = meeting.mediaProperties.audioStream) === null || _meeting$mediaPropert6 === void 0 ? void 0 : _meeting$mediaPropert6.userMuted;
+        systemMuteState = (_meeting$mediaPropert7 = meeting.mediaProperties.audioStream) === null || _meeting$mediaPropert7 === void 0 ? void 0 : _meeting$mediaPropert7.systemMuted;
       } else {
-        var _meeting$mediaPropert2;
-        (_meeting$mediaPropert2 = meeting.mediaProperties.videoTrack) === null || _meeting$mediaPropert2 === void 0 ? void 0 : _meeting$mediaPropert2.setMuted(this.state.client.localMute);
+        var _meeting$mediaPropert8, _meeting$mediaPropert9, _meeting$mediaPropert10;
+        newMuteState = (_meeting$mediaPropert8 = meeting.mediaProperties.videoStream) === null || _meeting$mediaPropert8 === void 0 ? void 0 : _meeting$mediaPropert8.muted;
+        userMuteState = (_meeting$mediaPropert9 = meeting.mediaProperties.videoStream) === null || _meeting$mediaPropert9 === void 0 ? void 0 : _meeting$mediaPropert9.userMuted;
+        systemMuteState = (_meeting$mediaPropert10 = meeting.mediaProperties.videoStream) === null || _meeting$mediaPropert10 === void 0 ? void 0 : _meeting$mediaPropert10.systemMuted;
       }
+      _loggerProxy.default.logger.info("Meeting:muteState#handleLocalStreamMuteStateChange --> ".concat(this.type, ": local stream new mute state: ").concat(newMuteState, " (user mute: ").concat(userMuteState, ", system mute: ").concat(systemMuteState, ")"));
+      this.state.client.localMute = newMuteState;
+      this.applyClientStateToServer(meeting);
+    }
+
+    /**
+     * Applies the current mute state to the local stream (by enabling or disabling it accordingly)
+     *
+     * @public
+     * @param {Object} [meeting] the meeting object
+     * @param {ServerMuteReason} reason - reason why we're applying our client state to the local stream
+     * @memberof MuteState
+     * @returns {void}
+     */
+  }, {
+    key: "applyClientStateLocally",
+    value: function applyClientStateLocally(meeting, reason) {
+      this.muteLocalStream(meeting, this.state.client.localMute, reason);
+    }
+
+    /** Returns true if client is locally muted - it takes into account not just the client local mute state,
+     *  but also whether audio/video is enabled at all
+     *
+     * @returns {boolean}
+     */
+  }, {
+    key: "getClientLocalMuteState",
+    value: function getClientLocalMuteState() {
+      return this.state.client.enabled ? this.state.client.localMute : true;
     }
 
     /**
@@ -140,22 +216,18 @@ var MuteState = /*#__PURE__*/function () {
   }, {
     key: "applyClientStateToServer",
     value: function applyClientStateToServer(meeting) {
-      var _this2 = this;
+      var _this = this;
       if (this.state.syncToServerInProgress) {
         _loggerProxy.default.logger.info("Meeting:muteState#applyClientStateToServer --> ".concat(this.type, ": request to server in progress, we need to wait for it to complete"));
         return;
       }
-      var localMuteRequiresSync = this.state.client.localMute !== this.state.server.localMute;
-      var remoteMuteRequiresSync = !this.state.client.localMute && this.state.server.remoteMute;
-      _loggerProxy.default.logger.info("Meeting:muteState#applyClientStateToServer --> ".concat(this.type, ": localMuteRequiresSync: ").concat(localMuteRequiresSync, " (").concat(this.state.client.localMute, " ?= ").concat(this.state.server.localMute, ")"));
+      var localMuteState = this.getClientLocalMuteState();
+      var localMuteRequiresSync = localMuteState !== this.state.server.localMute;
+      var remoteMuteRequiresSync = !localMuteState && this.state.server.remoteMute;
+      _loggerProxy.default.logger.info("Meeting:muteState#applyClientStateToServer --> ".concat(this.type, ": localMuteRequiresSync: ").concat(localMuteRequiresSync, " (").concat(localMuteState, " ?= ").concat(this.state.server.localMute, ")"));
       _loggerProxy.default.logger.info("Meeting:muteState#applyClientStateToServer --> ".concat(this.type, ": remoteMuteRequiresSync: ").concat(remoteMuteRequiresSync));
       if (!localMuteRequiresSync && !remoteMuteRequiresSync) {
         _loggerProxy.default.logger.info("Meeting:muteState#applyClientStateToServer --> ".concat(this.type, ": client state already matching server state, nothing to do"));
-        if (this.pendingPromiseResolve) {
-          this.pendingPromiseResolve();
-        }
-        this.pendingPromiseResolve = null;
-        this.pendingPromiseReject = null;
         return;
       }
       this.state.syncToServerInProgress = true;
@@ -165,21 +237,20 @@ var MuteState = /*#__PURE__*/function () {
       localMuteSyncPromise.then(function () {
         return (
           // then follow it up with remote mute sync
-          remoteMuteRequiresSync ? _this2.sendRemoteMuteRequestToServer(meeting) : _promise.default.resolve()
+          remoteMuteRequiresSync ? _this.sendRemoteMuteRequestToServer(meeting) : _promise.default.resolve()
         );
       }).then(function () {
-        _this2.state.syncToServerInProgress = false;
-        _loggerProxy.default.logger.info("Meeting:muteState#applyClientStateToServer --> ".concat(_this2.type, ": sync with server completed"));
+        _this.state.syncToServerInProgress = false;
+        _loggerProxy.default.logger.info("Meeting:muteState#applyClientStateToServer --> ".concat(_this.type, ": sync with server completed"));
 
         // need to check if a new sync is required, because this.state.client may have changed while we were doing the current sync
-        _this2.applyClientStateToServer(meeting);
+        _this.applyClientStateToServer(meeting);
       }).catch(function (e) {
-        _this2.state.syncToServerInProgress = false;
-        if (_this2.pendingPromiseReject) {
-          _this2.pendingPromiseReject(e);
-        }
-        _this2.pendingPromiseResolve = null;
-        _this2.pendingPromiseReject = null;
+        _this.state.syncToServerInProgress = false;
+        _loggerProxy.default.logger.warn("Meeting:muteState#applyClientStateToServer --> ".concat(_this.type, ": error: ").concat(e));
+
+        // failed to apply client state to server, so revert stream mute state to server state
+        _this.muteLocalStream(meeting, _this.state.server.localMute || _this.state.server.remoteMute, 'clientRequestFailed');
       });
     }
 
@@ -194,19 +265,19 @@ var MuteState = /*#__PURE__*/function () {
   }, {
     key: "sendLocalMuteRequestToServer",
     value: function sendLocalMuteRequestToServer(meeting) {
-      var _meeting$audio,
-        _meeting$video,
-        _this3 = this;
-      var audioMuted = this.type === _constants.AUDIO ? this.state.client.localMute : (_meeting$audio = meeting.audio) === null || _meeting$audio === void 0 ? void 0 : _meeting$audio.state.client.localMute;
-      var videoMuted = this.type === _constants.VIDEO ? this.state.client.localMute : (_meeting$video = meeting.video) === null || _meeting$video === void 0 ? void 0 : _meeting$video.state.client.localMute;
+      var _this2 = this;
+      var audioMuted = this.type === _constants.AUDIO ? this.getClientLocalMuteState() : undefined;
+      var videoMuted = this.type === _constants.VIDEO ? this.getClientLocalMuteState() : undefined;
       _loggerProxy.default.logger.info("Meeting:muteState#sendLocalMuteRequestToServer --> ".concat(this.type, ": sending local mute (audio=").concat(audioMuted, ", video=").concat(videoMuted, ") to server"));
-      return _util.default.remoteUpdateAudioVideo(audioMuted, videoMuted, meeting).then(function (locus) {
-        _loggerProxy.default.logger.info("Meeting:muteState#sendLocalMuteRequestToServer --> ".concat(_this3.type, ": local mute (audio=").concat(audioMuted, ", video=").concat(videoMuted, ") applied to server"));
-        _this3.state.server.localMute = _this3.type === _constants.AUDIO ? audioMuted : videoMuted;
-        meeting.locusInfo.onFullLocus(locus);
+      return _util.default.remoteUpdateAudioVideo(meeting, audioMuted, videoMuted).then(function (locus) {
+        _loggerProxy.default.logger.info("Meeting:muteState#sendLocalMuteRequestToServer --> ".concat(_this2.type, ": local mute (audio=").concat(audioMuted, ", video=").concat(videoMuted, ") applied to server"));
+        _this2.state.server.localMute = _this2.type === _constants.AUDIO ? audioMuted : videoMuted;
+        if (locus) {
+          meeting.locusInfo.handleLocusDelta(locus, meeting);
+        }
         return locus;
       }).catch(function (remoteUpdateError) {
-        _loggerProxy.default.logger.warn("Meeting:muteState#sendLocalMuteRequestToServer --> ".concat(_this3.type, ": failed to apply local mute (audio=").concat(audioMuted, ", video=").concat(videoMuted, ") to server: ").concat(remoteUpdateError));
+        _loggerProxy.default.logger.warn("Meeting:muteState#sendLocalMuteRequestToServer --> ".concat(_this2.type, ": failed to apply local mute (audio=").concat(audioMuted, ", video=").concat(videoMuted, ") to server: ").concat(remoteUpdateError));
         return _promise.default.reject(remoteUpdateError);
       });
     }
@@ -222,22 +293,34 @@ var MuteState = /*#__PURE__*/function () {
   }, {
     key: "sendRemoteMuteRequestToServer",
     value: function sendRemoteMuteRequestToServer(meeting) {
-      var _this4 = this;
+      var _this3 = this;
+      var remoteMute = this.getClientLocalMuteState();
+      _loggerProxy.default.logger.info("Meeting:muteState#sendRemoteMuteRequestToServer --> ".concat(this.type, ": sending remote mute:").concat(remoteMute, " to server"));
+      return meeting.members.muteMember(meeting.members.selfId, remoteMute, this.type === _constants.AUDIO).then(function () {
+        _loggerProxy.default.logger.info("Meeting:muteState#sendRemoteMuteRequestToServer --> ".concat(_this3.type, ": remote mute:").concat(remoteMute, " applied to server"));
+        _this3.state.server.remoteMute = remoteMute;
+      }).catch(function (remoteUpdateError) {
+        _loggerProxy.default.logger.warn("Meeting:muteState#sendRemoteMuteRequestToServer --> ".concat(_this3.type, ": failed to apply remote mute ").concat(remoteMute, " to server: ").concat(remoteUpdateError));
+        return _promise.default.reject(remoteUpdateError);
+      });
+    }
+
+    /** Applies the current value for unmute allowed to the underlying stream
+     *
+     * @param {Meeting} meeting
+     * @returns {void}
+     */
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  }, {
+    key: "applyUnmuteAllowedToStream",
+    value: function applyUnmuteAllowedToStream(meeting) {
       if (this.type === _constants.AUDIO) {
-        var remoteMute = this.state.client.localMute;
-        _loggerProxy.default.logger.info("Meeting:muteState#sendRemoteMuteRequestToServer --> ".concat(this.type, ": sending remote mute:").concat(remoteMute, " to server"));
-        return meeting.members.muteMember(meeting.members.selfId, remoteMute).then(function () {
-          _loggerProxy.default.logger.info("Meeting:muteState#sendRemoteMuteRequestToServer --> ".concat(_this4.type, ": remote mute:").concat(remoteMute, " applied to server"));
-          _this4.state.server.remoteMute = remoteMute;
-        }).catch(function (remoteUpdateError) {
-          _loggerProxy.default.logger.warn("Meeting:muteState#sendRemoteMuteRequestToServer --> ".concat(_this4.type, ": failed to apply remote mute ").concat(remoteMute, " to server: ").concat(remoteUpdateError));
-          return _promise.default.reject(remoteUpdateError);
-        });
+        var _meeting$mediaPropert11;
+        (_meeting$mediaPropert11 = meeting.mediaProperties.audioStream) === null || _meeting$mediaPropert11 === void 0 ? void 0 : _meeting$mediaPropert11.setUnmuteAllowed(this.state.server.unmuteAllowed);
+      } else {
+        var _meeting$mediaPropert12;
+        (_meeting$mediaPropert12 = meeting.mediaProperties.videoStream) === null || _meeting$mediaPropert12 === void 0 ? void 0 : _meeting$mediaPropert12.setUnmuteAllowed(this.state.server.unmuteAllowed);
       }
-
-      // for now we don't need to support remote muting of video (REMOTE_MUTE_VIDEO_MISSING_IMPLEMENTATION)
-      this.state.server.remoteMute = this.state.client.localMute;
-      return _promise.default.resolve();
     }
 
     /**
@@ -245,16 +328,23 @@ var MuteState = /*#__PURE__*/function () {
      *
      * @public
      * @memberof MuteState
+     * @param {Meeting} meeting
      * @param {Boolean} [muted] true if user is remotely muted, false otherwise
      * @param {Boolean} [unmuteAllowed] indicates if user is allowed to unmute self (false when "hard mute" feature is used)
      * @returns {undefined}
      */
   }, {
     key: "handleServerRemoteMuteUpdate",
-    value: function handleServerRemoteMuteUpdate(muted, unmuteAllowed) {
+    value: function handleServerRemoteMuteUpdate(meeting, muted, unmuteAllowed) {
       _loggerProxy.default.logger.info("Meeting:muteState#handleServerRemoteMuteUpdate --> ".concat(this.type, ": updating server remoteMute to (").concat(muted, ")"));
-      this.state.server.remoteMute = muted;
-      this.state.server.unmuteAllowed = unmuteAllowed;
+      if (unmuteAllowed !== undefined) {
+        this.state.server.unmuteAllowed = unmuteAllowed;
+        this.applyUnmuteAllowedToStream(meeting);
+      }
+      if (muted !== undefined) {
+        this.state.server.remoteMute = muted;
+        this.muteLocalStream(meeting, muted, 'remotelyMuted');
+      }
     }
 
     /**
@@ -268,20 +358,30 @@ var MuteState = /*#__PURE__*/function () {
   }, {
     key: "handleServerLocalUnmuteRequired",
     value: function handleServerLocalUnmuteRequired(meeting) {
-      _loggerProxy.default.logger.info("Meeting:muteState#handleServerLocalUnmuteRequired --> ".concat(this.type, ": localAudioUnmuteRequired received -> doing local unmute"));
+      if (!this.state.client.enabled) {
+        _loggerProxy.default.logger.warn("Meeting:muteState#handleServerLocalUnmuteRequired --> ".concat(this.type, ": localAudioUnmuteRequired received while ").concat(this.type, " is disabled -> local unmute will not result in ").concat(this.type, " being sent"));
+      } else {
+        _loggerProxy.default.logger.info("Meeting:muteState#handleServerLocalUnmuteRequired --> ".concat(this.type, ": localAudioUnmuteRequired received -> doing local unmute"));
+      }
+
+      // todo: I'm seeing "you can now unmute yourself " popup  when this happens - but same thing happens on web.w.c so we can ignore for now
       this.state.server.remoteMute = false;
-      this.state.client.localMute = false;
-      if (this.pendingPromiseReject) {
-        this.pendingPromiseReject(new Error('Server requested local unmute - this overrides any client request in progress'));
-        this.pendingPromiseResolve = null;
-        this.pendingPromiseReject = null;
+
+      // change user mute state to false, but keep localMute true if overall mute state is still true
+      this.muteLocalStream(meeting, false, 'localUnmuteRequired');
+      if (this.type === _constants.AUDIO) {
+        var _meeting$mediaPropert13;
+        this.state.client.localMute = (_meeting$mediaPropert13 = meeting.mediaProperties.audioStream) === null || _meeting$mediaPropert13 === void 0 ? void 0 : _meeting$mediaPropert13.muted;
+      } else {
+        var _meeting$mediaPropert14;
+        this.state.client.localMute = (_meeting$mediaPropert14 = meeting.mediaProperties.videoStream) === null || _meeting$mediaPropert14 === void 0 ? void 0 : _meeting$mediaPropert14.muted;
       }
-      this.applyClientStateLocally(meeting);
       this.applyClientStateToServer(meeting);
     }
 
     /**
-     * Returns true if the user is locally or remotely muted
+     * Returns true if the user is locally or remotely muted.
+     * It only checks the mute status, ignoring the fact whether audio/video is enabled.
      *
      * @public
      * @memberof MuteState
@@ -294,45 +394,45 @@ var MuteState = /*#__PURE__*/function () {
     }
 
     /**
-     * Returns true if the user is locally muted
+     * Returns true if the user is remotely muted
      *
      * @public
      * @memberof MuteState
      * @returns {Boolean}
      */
   }, {
-    key: "isLocallyMuted",
-    value: function isLocallyMuted() {
-      return this.state.client.localMute || this.state.server.localMute;
+    key: "isRemotelyMuted",
+    value: function isRemotelyMuted() {
+      return this.state.server.remoteMute;
     }
 
     /**
-     * Returns true if the user is muted as a result of the client request (and not remotely muted)
+     * Returns true if unmute is allowed
      *
      * @public
      * @memberof MuteState
      * @returns {Boolean}
      */
   }, {
-    key: "isSelf",
-    value: function isSelf() {
-      return this.state.client.localMute && !this.state.server.remoteMute;
-    }
-
-    // defined for backwards compatibility with the old AudioStateMachine/VideoStateMachine classes
-  }, {
-    key: "muted",
-    get: function get() {
-      return this.isMuted();
+    key: "isUnmuteAllowed",
+    value: function isUnmuteAllowed() {
+      return this.state.server.unmuteAllowed;
     }
 
-    // defined for backwards compatibility with the old AudioStateMachine/VideoStateMachine classes
+    /**
+     * Returns true if the user is locally muted or audio/video is disabled
+     *
+     * @public
+     * @memberof MuteState
+     * @returns {Boolean}
+     */
   }, {
-    key: "self",
-    get: function get() {
-      return this.isSelf();
+    key: "isLocallyMuted",
+    value: function isLocallyMuted() {
+      return this.getClientLocalMuteState();
     }
   }]);
   return MuteState;
 }();
+exports.MuteState = MuteState;
 //# sourceMappingURL=muteState.js.map