@webex/plugin-meetings 3.0.0-beta.158 → 3.0.0-beta.159

package/dist/meeting/index.js

@@ -104,7 +104,7 @@ var logRequest = function logRequest(request, _ref) {
 };
 var MEDIA_UPDATE_TYPE = {
   TRANSCODED_MEDIA_CONNECTION: 'TRANSCODED_MEDIA_CONNECTION',
-  LAMBDA: 'LAMBDA',
+  SHARE_FLOOR_REQUEST: 'SHARE_FLOOR_REQUEST',
   UPDATE_MEDIA: 'UPDATE_MEDIA'
 };
 
@@ -882,8 +882,8 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
           case MEDIA_UPDATE_TYPE.TRANSCODED_MEDIA_CONNECTION:
             mediaUpdate = _this.updateTranscodedMediaConnection();
             break;
-          case MEDIA_UPDATE_TYPE.LAMBDA:
-            mediaUpdate = _options2.lambda();
+          case MEDIA_UPDATE_TYPE.SHARE_FLOOR_REQUEST:
+            mediaUpdate = _this.requestScreenShareFloor();
             break;
           case MEDIA_UPDATE_TYPE.UPDATE_MEDIA:
             mediaUpdate = _this.updateMedia(_options2);
@@ -1620,15 +1620,28 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }
 
   /**
-   * Fetches meeting information.
-   * @param {Object} options
-   * @param {String} [options.password] optional
-   * @param {String} [options.captchaCode] optional
-   * @public
+   * returns meeting is joined
+   * @private
    * @memberof Meeting
-   * @returns {Promise}
+   * @returns {Boolean}
    */
   (0, _createClass2.default)(Meeting, [{
+    key: "isJoined",
+    value: function isJoined() {
+      var _this$joinedWith3;
+      return ((_this$joinedWith3 = this.joinedWith) === null || _this$joinedWith3 === void 0 ? void 0 : _this$joinedWith3.state) === 'JOINED';
+    }
+
+    /**
+     * Fetches meeting information.
+     * @param {Object} options
+     * @param {String} [options.password] optional
+     * @param {String} [options.captchaCode] optional
+     * @public
+     * @memberof Meeting
+     * @returns {Promise}
+     */
+  }, {
     key: "fetchMeetingInfo",
     value: function () {
       var _fetchMeetingInfo = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(_ref3) {
@@ -1890,10 +1903,12 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
         }, _constants.EVENT_TRIGGERS.MEETING_BREAKOUTS_UPDATE);
       });
       this.breakouts.on(_constants.BREAKOUTS.EVENTS.ASK_RETURN_TO_MAIN, function () {
-        _triggerProxy.default.trigger(_this4, {
-          file: 'meeting/index',
-          function: 'setUpBreakoutsListener'
-        }, _constants.EVENT_TRIGGERS.MEETING_BREAKOUTS_ASK_RETURN_TO_MAIN);
+        if (_this4.isJoined()) {
+          _triggerProxy.default.trigger(_this4, {
+            file: 'meeting/index',
+            function: 'setUpBreakoutsListener'
+          }, _constants.EVENT_TRIGGERS.MEETING_BREAKOUTS_ASK_RETURN_TO_MAIN);
+        }
       });
       this.breakouts.on(_constants.BREAKOUTS.EVENTS.LEAVE_BREAKOUT, function () {
         _triggerProxy.default.trigger(_this4, {
@@ -4268,7 +4283,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
             case 0:
               // @ts-ignore - Fix type
               _this$locusInfo6 = this.locusInfo, url = _this$locusInfo6.url, _this$locusInfo6$info = _this$locusInfo6.info, _this$locusInfo6$info2 = _this$locusInfo6$info === void 0 ? {} : _this$locusInfo6$info, datachannelUrl = _this$locusInfo6$info2.datachannelUrl;
-              isJoined = this.joinedWith && this.joinedWith.state === 'JOINED'; // @ts-ignore - Fix type
+              isJoined = this.isJoined(); // @ts-ignore - Fix type
               if (!this.webex.internal.llm.isConnected()) {
                 _context11.next = 8;
                 break;
@@ -4866,25 +4881,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
       }).then(function () {
         var _localTracks$screenSh2;
         if (localTracks !== null && localTracks !== void 0 && (_localTracks$screenSh2 = localTracks.screenShare) !== null && _localTracks$screenSh2 !== void 0 && _localTracks$screenSh2.video) {
-          _this35.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.LAMBDA, {
-            lambda: function () {
-              var _lambda = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee15() {
-                return _regenerator.default.wrap(function _callee15$(_context15) {
-                  while (1) switch (_context15.prev = _context15.next) {
-                    case 0:
-                      return _context15.abrupt("return", _this35.requestScreenShareFloor());
-                    case 1:
-                    case "end":
-                      return _context15.stop();
-                  }
-                }, _callee15);
-              }));
-              function lambda() {
-                return _lambda.apply(this, arguments);
-              }
-              return lambda;
-            }()
-          });
+          _this35.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.SHARE_FLOOR_REQUEST);
         }
       }).then(function () {
         return _this35.mediaProperties.getCurrentConnectionType();
@@ -4959,11 +4956,9 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
      */
   }, {
     key: "enqueueMediaUpdate",
-    value: function enqueueMediaUpdate(mediaUpdateType, options) {
+    value: function enqueueMediaUpdate(mediaUpdateType) {
       var _this36 = this;
-      if (mediaUpdateType === MEDIA_UPDATE_TYPE.LAMBDA && typeof (options === null || options === void 0 ? void 0 : options.lambda) !== 'function') {
-        return _promise.default.reject(new Error('lambda must be specified when enqueuing MEDIA_UPDATE_TYPE.LAMBDA'));
-      }
+      var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var canUpdateMediaNow = this.canUpdateMedia();
       return new _promise.default(function (resolve, reject) {
         var queueItem = {
@@ -5005,32 +5000,32 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
      * @memberof Meeting
      */
     function () {
-      var _updateMedia = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee16(options) {
+      var _updateMedia = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee15(options) {
         var audioEnabled, videoEnabled, receiveShare;
-        return _regenerator.default.wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+        return _regenerator.default.wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
               this.checkMediaConnection();
               audioEnabled = options.audioEnabled, videoEnabled = options.videoEnabled, receiveShare = options.receiveShare;
               _loggerProxy.default.logger.log("Meeting:index#updateMedia --> called with options=".concat((0, _stringify.default)(options)));
               if (this.canUpdateMedia()) {
-                _context16.next = 5;
+                _context15.next = 5;
                 break;
               }
-              return _context16.abrupt("return", this.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.UPDATE_MEDIA, options));
+              return _context15.abrupt("return", this.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.UPDATE_MEDIA, options));
             case 5:
               if (!this.isMultistream) {
-                _context16.next = 10;
+                _context15.next = 10;
                 break;
               }
               if (!(videoEnabled !== undefined)) {
-                _context16.next = 8;
+                _context15.next = 8;
                 break;
               }
               throw new Error('enabling/disabling video in a meeting is not supported for multistream, it can only be done upfront when calling addMedia()');
             case 8:
               if (!(receiveShare !== undefined)) {
-                _context16.next = 10;
+                _context15.next = 10;
                 break;
               }
               throw new Error('toggling receiveShare in a multistream meeting is not supported, to control receiving screen share call meeting.remoteMediaManager.setLayout() with appropriate layout');
@@ -5049,28 +5044,28 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
                 this.mediaProperties.mediaDirection.receiveShare = receiveShare;
               }
               if (!this.isMultistream) {
-                _context16.next = 19;
+                _context15.next = 19;
                 break;
               }
               if (!(audioEnabled !== undefined)) {
-                _context16.next = 17;
+                _context15.next = 17;
                 break;
               }
-              _context16.next = 17;
+              _context15.next = 17;
               return this.mediaProperties.webrtcMediaConnection.enableMultistreamAudio(audioEnabled);
             case 17:
-              _context16.next = 21;
+              _context15.next = 21;
               break;
             case 19:
-              _context16.next = 21;
+              _context15.next = 21;
               return this.updateTranscodedMediaConnection();
             case 21:
-              return _context16.abrupt("return", undefined);
+              return _context15.abrupt("return", undefined);
             case 22:
             case "end":
-              return _context16.stop();
+              return _context15.stop();
           }
-        }, _callee16, this);
+        }, _callee15, this);
       }));
       function updateMedia(_x12) {
         return _updateMedia.apply(this, arguments);
@@ -6093,37 +6088,37 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "enableMusicMode",
     value: function () {
-      var _enableMusicMode = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee17(shouldEnableMusicMode) {
-        return _regenerator.default.wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+      var _enableMusicMode = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee16(shouldEnableMusicMode) {
+        return _regenerator.default.wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
               this.checkMediaConnection();
               if (this.isMultistream) {
-                _context17.next = 3;
+                _context16.next = 3;
                 break;
               }
               throw new Error('enableMusicMode() only supported with multistream');
             case 3:
               if (!shouldEnableMusicMode) {
-                _context17.next = 8;
+                _context16.next = 8;
                 break;
               }
-              _context17.next = 6;
+              _context16.next = 6;
               return this.mediaProperties.webrtcMediaConnection.setCodecParameters(_internalMediaCore.MediaType.AudioMain, {
                 maxaveragebitrate: '64000',
                 maxplaybackrate: '48000'
               });
             case 6:
-              _context17.next = 10;
+              _context16.next = 10;
               break;
             case 8:
-              _context17.next = 10;
+              _context16.next = 10;
               return this.mediaProperties.webrtcMediaConnection.deleteCodecParameters(_internalMediaCore.MediaType.AudioMain, ['maxaveragebitrate', 'maxplaybackrate']);
             case 10:
             case "end":
-              return _context17.stop();
+              return _context16.stop();
           }
-        }, _callee17, this);
+        }, _callee16, this);
       }));
       function enableMusicMode(_x13) {
         return _enableMusicMode.apply(this, arguments);
@@ -6144,7 +6139,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
       var LOG_HEADER = 'Meeting:index#updateTranscodedMediaConnection -->';
       _loggerProxy.default.logger.info("".concat(LOG_HEADER, " starting"));
       if (!this.canUpdateMedia()) {
-        return this.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.TRANSCODED_MEDIA_CONNECTION, {});
+        return this.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.TRANSCODED_MEDIA_CONNECTION);
       }
       return this.mediaProperties.webrtcMediaConnection.update({
         localTracks: {
@@ -6181,36 +6176,36 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "publishTrack",
     value: function () {
-      var _publishTrack = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee18(track) {
-        return _regenerator.default.wrap(function _callee18$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+      var _publishTrack = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee17(track) {
+        return _regenerator.default.wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
               if (track) {
-                _context18.next = 2;
+                _context17.next = 2;
                 break;
               }
-              return _context18.abrupt("return");
+              return _context17.abrupt("return");
             case 2:
               if (!this.mediaProperties.webrtcMediaConnection) {
-                _context18.next = 9;
+                _context17.next = 9;
                 break;
               }
               if (!this.isMultistream) {
-                _context18.next = 8;
+                _context17.next = 8;
                 break;
               }
-              _context18.next = 6;
+              _context17.next = 6;
               return this.mediaProperties.webrtcMediaConnection.publishTrack(track);
             case 6:
-              _context18.next = 9;
+              _context17.next = 9;
               break;
             case 8:
               track.setPublished(true); // for multistream, this call is done by WCME
             case 9:
             case "end":
-              return _context18.stop();
+              return _context17.stop();
           }
-        }, _callee18, this);
+        }, _callee17, this);
       }));
       function publishTrack(_x14) {
         return _publishTrack.apply(this, arguments);
@@ -6226,32 +6221,32 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "unpublishTrack",
     value: function () {
-      var _unpublishTrack = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee19(track) {
-        return _regenerator.default.wrap(function _callee19$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+      var _unpublishTrack = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee18(track) {
+        return _regenerator.default.wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
               if (track) {
-                _context19.next = 2;
+                _context18.next = 2;
                 break;
               }
-              return _context19.abrupt("return");
+              return _context18.abrupt("return");
             case 2:
               if (!(this.isMultistream && this.mediaProperties.webrtcMediaConnection)) {
-                _context19.next = 7;
+                _context18.next = 7;
                 break;
               }
-              _context19.next = 5;
+              _context18.next = 5;
               return this.mediaProperties.webrtcMediaConnection.unpublishTrack(track);
             case 5:
-              _context19.next = 8;
+              _context18.next = 8;
               break;
             case 7:
               track.setPublished(false); // for multistream, this call is done by WCME
             case 8:
             case "end":
-              return _context19.stop();
+              return _context18.stop();
           }
-        }, _callee19, this);
+        }, _callee18, this);
       }));
       function unpublishTrack(_x15) {
         return _unpublishTrack.apply(this, arguments);
@@ -6267,83 +6262,62 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "publishTracks",
     value: function () {
-      var _publishTracks = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee21(tracks) {
-        var _tracks$screenShare,
-          _tracks$screenShare2,
-          _tracks$screenShare3,
-          _this48 = this;
+      var _publishTracks = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee19(tracks) {
+        var _tracks$screenShare, _tracks$screenShare2, _tracks$screenShare3;
         var floorRequestNeeded, _tracks$screenShare4;
-        return _regenerator.default.wrap(function _callee21$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+        return _regenerator.default.wrap(function _callee19$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
               this.checkMediaConnection();
               this.annotationInfo = tracks.annotationInfo;
               if (!(!tracks.microphone && !tracks.camera && !((_tracks$screenShare = tracks.screenShare) !== null && _tracks$screenShare !== void 0 && _tracks$screenShare.audio) && !((_tracks$screenShare2 = tracks.screenShare) !== null && _tracks$screenShare2 !== void 0 && _tracks$screenShare2.video))) {
-                _context21.next = 4;
+                _context19.next = 4;
                 break;
               }
-              return _context21.abrupt("return");
+              return _context19.abrupt("return");
             case 4:
               floorRequestNeeded = false;
               if (!((_tracks$screenShare3 = tracks.screenShare) !== null && _tracks$screenShare3 !== void 0 && _tracks$screenShare3.video)) {
-                _context21.next = 9;
+                _context19.next = 9;
                 break;
               }
-              _context21.next = 8;
+              _context19.next = 8;
               return this.setLocalShareTrack((_tracks$screenShare4 = tracks.screenShare) === null || _tracks$screenShare4 === void 0 ? void 0 : _tracks$screenShare4.video);
             case 8:
               floorRequestNeeded = true;
             case 9:
               if (!tracks.microphone) {
-                _context21.next = 12;
+                _context19.next = 12;
                 break;
               }
-              _context21.next = 12;
+              _context19.next = 12;
               return this.setLocalAudioTrack(tracks.microphone);
             case 12:
               if (!tracks.camera) {
-                _context21.next = 15;
+                _context19.next = 15;
                 break;
               }
-              _context21.next = 15;
+              _context19.next = 15;
               return this.setLocalVideoTrack(tracks.camera);
             case 15:
               if (this.isMultistream) {
-                _context21.next = 18;
+                _context19.next = 18;
                 break;
               }
-              _context21.next = 18;
+              _context19.next = 18;
               return this.updateTranscodedMediaConnection();
             case 18:
               if (!floorRequestNeeded) {
-                _context21.next = 21;
+                _context19.next = 21;
                 break;
               }
-              _context21.next = 21;
-              return this.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.LAMBDA, {
-                lambda: function () {
-                  var _lambda2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee20() {
-                    return _regenerator.default.wrap(function _callee20$(_context20) {
-                      while (1) switch (_context20.prev = _context20.next) {
-                        case 0:
-                          return _context20.abrupt("return", _this48.requestScreenShareFloor());
-                        case 1:
-                        case "end":
-                          return _context20.stop();
-                      }
-                    }, _callee20);
-                  }));
-                  function lambda() {
-                    return _lambda2.apply(this, arguments);
-                  }
-                  return lambda;
-                }()
-              });
+              _context19.next = 21;
+              return this.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.SHARE_FLOOR_REQUEST);
             case 21:
             case "end":
-              return _context21.stop();
+              return _context19.stop();
           }
-        }, _callee21, this);
+        }, _callee19, this);
       }));
       function publishTracks(_x16) {
         return _publishTracks.apply(this, arguments);
@@ -6359,10 +6333,10 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "unpublishTracks",
     value: function () {
-      var _unpublishTracks = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee22(tracks) {
+      var _unpublishTracks = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee20(tracks) {
         var promises, _iterator, _step, track;
-        return _regenerator.default.wrap(function _callee22$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+        return _regenerator.default.wrap(function _callee20$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
               this.checkMediaConnection();
               promises = [];
@@ -6395,13 +6369,13 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
               if (!this.isMultistream) {
                 promises.push(this.updateTranscodedMediaConnection());
               }
-              _context22.next = 7;
+              _context20.next = 7;
               return _promise.default.all(promises);
             case 7:
             case "end":
-              return _context22.stop();
+              return _context20.stop();
           }
-        }, _callee22, this);
+        }, _callee20, this);
       }));
       function unpublishTracks(_x17) {
         return _unpublishTracks.apply(this, arguments);